Skip to content

Commit

Permalink
Corrects syndicate mob names (#3029)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Quick edit to syndicate mobs to reflect the fact that they are Ramzi
pirates. No custom sprites yet.

## Why It's Good For The Game

please god can we stop getting questions about the syndie mobs

## Changelog

:cl:
tweak: Syndicate mobs have been renamed to Ramzi Clique mobs. New
sprites will come later.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Apogee-dev authored May 28, 2024
1 parent dd87d96 commit c05ab09
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 47 deletions.
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
id = /obj/item/card/id/syndicate

/obj/effect/mob_spawn/human/corpse/syndicateramzi
name = "Ramzi's Clique Commando"
name = "Ramzi Clique Commando"
id_job = "Cutthroat"
hairstyle = "Bald"
facial_hairstyle = "Shaved"
outfit = /datum/outfit/syndicateramzicorpse

/datum/outfit/syndicateramzicorpse
name = "Ramzi's Clique Commando Corpse"
name = "Ramzi Clique Commando Corpse"
uniform = /obj/item/clothing/under/syndicate/gorlex
suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
shoes = /obj/item/clothing/shoes/combat
Expand Down
69 changes: 24 additions & 45 deletions code/modules/mob/living/simple_animal/hostile/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@


/mob/living/simple_animal/hostile/syndicate
name = "Syndicate Operative"
desc = "Death to Nanotrasen."
name = "Ramzi Clique Operative"
desc = "An ex-Syndicate pirate of the Ramzi Clique."
icon = 'icons/mob/simple_human.dmi'
icon_state = "syndicate"
icon_living = "syndicate"
Expand All @@ -39,6 +39,7 @@
a_intent = INTENT_HARM
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
maxbodytemp = 400
unsuitable_atmos_damage = 15
faction = list(FACTION_ANTAG_SYNDICATE)
check_friendly_fire = 1
Expand All @@ -53,11 +54,12 @@
/mob/living/simple_animal/hostile/syndicate/space
icon_state = "syndicate_space"
icon_living = "syndicate_space"
name = "Syndicate Commando"
name = "Ramzi Clique Commando"
maxHealth = 170
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
speed = 1

/mob/living/simple_animal/hostile/syndicate/space/Initialize()
Expand All @@ -68,7 +70,7 @@
/mob/living/simple_animal/hostile/syndicate/space/stormtrooper
icon_state = "syndicate_stormtrooper"
icon_living = "syndicate_stormtrooper"
name = "Syndicate Stormtrooper"
name = "Ramzi Clique Assault Trooper"
maxHealth = 250
health = 250

Expand All @@ -87,11 +89,12 @@
/mob/living/simple_animal/hostile/syndicate/melee/space
icon_state = "syndicate_space_knife"
icon_living = "syndicate_space_knife"
name = "Syndicate Commando"
name = "Ramzi Clique Commando"
maxHealth = 170
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
speed = 1
projectile_deflect_chance = 50

Expand All @@ -103,7 +106,7 @@
/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper
icon_state = "syndicate_stormtrooper_knife"
icon_living = "syndicate_stormtrooper_knife"
name = "Syndicate Stormtrooper"
name = "Ramzi Clique Stormtrooper"
maxHealth = 250
health = 250
projectile_deflect_chance = 50
Expand Down Expand Up @@ -139,11 +142,12 @@
/mob/living/simple_animal/hostile/syndicate/melee/sword/space
icon_state = "syndicate_space_sword"
icon_living = "syndicate_space_sword"
name = "Syndicate Commando"
name = "Ramzi Clique Commando"
maxHealth = 170
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
speed = 1
projectile_deflect_chance = 50

Expand All @@ -160,7 +164,7 @@
/mob/living/simple_animal/hostile/syndicate/melee/sword/space/stormtrooper
icon_state = "syndicate_stormtrooper_sword"
icon_living = "syndicate_stormtrooper_sword"
name = "Syndicate Stormtrooper"
name = "Ramzi Clique Stormtrooper"
maxHealth = 250
health = 250
projectile_deflect_chance = 50
Expand All @@ -186,11 +190,12 @@
/mob/living/simple_animal/hostile/syndicate/ranged/space
icon_state = "syndicate_space_pistol"
icon_living = "syndicate_space_pistol"
name = "Syndicate Commando"
name = "Ramzi Clique Commando"
maxHealth = 170
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
speed = 1

/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize()
Expand All @@ -201,7 +206,7 @@
/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper
icon_state = "syndicate_stormtrooper_pistol"
icon_living = "syndicate_stormtrooper_pistol"
name = "Syndicate Stormtrooper"
name = "Ramzi Clique Stormtrooper"
maxHealth = 250
health = 250

Expand All @@ -213,17 +218,18 @@
projectilesound = 'sound/weapons/gun/smg/shot.ogg'

/mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot //caravan ambush ruin
name = "Syndicate Salvage Pilot"
name = "Ramzi Clique Salvage Pilot"
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)

/mob/living/simple_animal/hostile/syndicate/ranged/smg/space
icon_state = "syndicate_space_smg"
icon_living = "syndicate_space_smg"
name = "Syndicate Commando"
name = "Ramzi Clique Commando"
maxHealth = 170
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
speed = 1

/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/Initialize()
Expand All @@ -234,7 +240,7 @@
/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/stormtrooper
icon_state = "syndicate_stormtrooper_smg"
icon_living = "syndicate_stormtrooper_smg"
name = "Syndicate Stormtrooper"
name = "Ramzi Clique Stormtrooper"
maxHealth = 250
health = 250

Expand All @@ -244,16 +250,17 @@
minimum_distance = 3
icon_state = "syndicate_shotgun"
icon_living = "syndicate_shotgun"
casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot (up to 72.5 brute) fired in a two-round burst
casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot fired in a two-round burst. This will two-tap unarmored players.

/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space
icon_state = "syndicate_space_shotgun"
icon_living = "syndicate_space_shotgun"
name = "Syndicate Commando"
name = "Ramzi Clique Commando"
maxHealth = 170
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
speed = 1

/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/Initialize()
Expand All @@ -264,7 +271,7 @@
/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/stormtrooper
icon_state = "syndicate_stormtrooper_shotgun"
icon_living = "syndicate_stormtrooper_shotgun"
name = "Syndicate Stormtrooper"
name = "Ramzi Clique Stormtrooper"
maxHealth = 250
health = 250

Expand Down Expand Up @@ -302,6 +309,7 @@
faction = list(ROLE_SYNDICATE)
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
mob_size = MOB_SIZE_TINY
movement_type = FLYING
limb_destroyer = 1
Expand All @@ -314,32 +322,3 @@
/mob/living/simple_animal/hostile/viscerator/Initialize()
. = ..()
AddComponent(/datum/component/swarming)

/mob/living/simple_animal/hostile/syndicate/melee/sword/space/oldcode
melee_damage_lower = 20
melee_damage_upper = 20
icon = 'icons/mob/simple_human.dmi'
icon_state = "oldcode_syndicate_csaber"
icon_living = "oldcode_syndicate_csaber"
name = "Syndicate Spaceman"
desc = "Death to IS-Nanotrasen."
maxHealth = 170
health = 170
armour_penetration = 20
light_color = LIGHT_COLOR_BLUE
sord = /obj/effect/light_emitter/blue_energy_sword
projectile_deflect_chance = 10

/mob/living/simple_animal/hostile/syndicate/ranged/space/oldcode
icon = 'icons/mob/simple_human.dmi'
icon_state = "oldcode_syndicate_gun"
icon_living = "oldcode_syndicate_gun"
name = "Syndicate Spaceman"
desc = "Death to IS-Nanotrasen."
maxHealth = 170
health = 170

/obj/effect/light_emitter/blue_energy_sword
set_luminosity = 2
set_cap = 2.5
light_color = LIGHT_COLOR_BLUE

0 comments on commit c05ab09

Please sign in to comment.