diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index aa49c6e52b59..a1b10b897db6 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -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 diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index b98d14128e12..a05f79e473c8 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -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" @@ -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 @@ -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() @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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() @@ -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 @@ -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() @@ -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 @@ -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() @@ -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 @@ -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 @@ -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