diff --git a/_maps/RandomRuins/JungleRuins/jungle_demon.dmm b/_maps/RandomRuins/JungleRuins/jungle_demon.dmm index 3e1476a84861..adbb037af38c 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_demon.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_demon.dmm @@ -514,9 +514,9 @@ "PA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/syndi/scarlet, -/obj/item/clothing/mask/breath, /obj/item/tank/internals/oxygen/red, +/obj/item/clothing/suit/space/hardsuit/syndi, +/obj/item/clothing/mask/gas/syndicate, /turf/open/floor/plasteel/dark, /area/ruin/powered) "QI" = ( diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index 3dce772a1d1f..5c781c36b7a0 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -1705,12 +1705,12 @@ name = "captain's suit storage unit"; req_access = list(20) }, -/obj/item/clothing/suit/space/hardsuit/syndi, -/obj/item/clothing/mask/gas/syndicate, /obj/machinery/light_switch{ dir = 4; pixel_x = -20 }, +/obj/item/clothing/suit/space/hardsuit/syndi/sbg, +/obj/item/clothing/mask/gas/syndicate, /turf/open/floor/carpet/black, /area/ship/bridge) "Ck" = ( @@ -2256,8 +2256,9 @@ req_access = list(56) }, /obj/item/clothing/shoes/magboots/syndie, -/obj/item/clothing/suit/space/hardsuit/syndi/scarlet, /obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, /turf/open/floor/carpet/red, /area/ship/cargo/office) "KX" = ( diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 9859de87adf7..1fa8545e59df 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -2337,12 +2337,12 @@ dir = 4 }, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/hardsuit/syndi/scarlet, /obj/machinery/light_switch{ pixel_x = -13; pixel_y = 22 }, +/obj/item/clothing/suit/space/hardsuit/syndi/hl, +/obj/item/clothing/mask/gas/syndicate, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "vT" = ( @@ -3146,9 +3146,6 @@ }, /obj/item/clothing/under/syndicate/combat, /obj/item/clothing/under/syndicate/aclf, -/obj/item/clothing/suit/armor/vest/security/hos{ - name = "Syndicate jacket" - }, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/clothing/gloves/krav_maga/combatglovesplus, /obj/item/clothing/shoes/jackboots, @@ -3810,8 +3807,8 @@ icon_state = "0-8" }, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/hardsuit/syndi/scarlet, +/obj/item/clothing/suit/space/hardsuit/syndi/hl, +/obj/item/clothing/mask/gas/syndicate, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "JH" = ( @@ -4381,8 +4378,8 @@ /obj/machinery/camera/autoname{ dir = 8 }, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/hardsuit/syndi/scarlet, +/obj/item/clothing/suit/space/hardsuit/syndi/hl, +/obj/item/clothing/mask/gas/syndicate, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "PK" = ( diff --git a/_maps/shuttles/syndicate/syndicate_luxembourg.dmm b/_maps/shuttles/syndicate/syndicate_luxembourg.dmm index 1f8f1132f0d7..6dde77123cba 100644 --- a/_maps/shuttles/syndicate/syndicate_luxembourg.dmm +++ b/_maps/shuttles/syndicate/syndicate_luxembourg.dmm @@ -2517,8 +2517,8 @@ /obj/machinery/suit_storage_unit/inherit{ req_access_txt = "41" }, -/obj/item/clothing/suit/space/hardsuit/syndi/scarlet, -/obj/item/clothing/head/helmet/space/hardsuit/syndi/scarlet, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, /obj/item/clothing/mask/breath, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index b4fa1a1282f6..aa153b233c46 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -420,30 +420,80 @@ var/combat_slowdown = 0 //slowdown when in combat mode var/lightweight = 0 //used for flags when toggling -//Scarlet Syndie suit -/obj/item/clothing/head/helmet/space/hardsuit/syndi/scarlet - name = "scarlet hardsuit helmet" - desc = "A standardized dual-mode helmet derived from more advanced special operations helmets. It is in EVA mode. Manufactured by Donk Co." - alt_desc = "A standardized dual-mode helmet derived from more advanced special operations helmets. It is in combat mode. Manufactured by Donk Co." - icon_state = "hardsuit1-scarlet" - item_state = "scarlet_helm" - hardsuit_type = "scarlet" +//Ramzi Syndie suit +/obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi + name = "rusted-red hardsuit helmet" + desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Gorlex Marauders." + alt_desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in combat mode. Manufactured by Gorlex Marauders." + icon_state = "hardsuit1-ramzi" + item_state = "hardsuit1-ramzi" + hardsuit_type = "ramzi" armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) -/obj/item/clothing/suit/space/hardsuit/syndi/scarlet - name = "scarlet hardsuit" - desc = "A standardized dual-mode hardsuit derived from more advanced special operations hardsuits. It is in EVA mode. Manufactured by Donk Co." - alt_desc = "A standardized dual-mode hardsuit derived from more advanced special operations hardsuits. It is in combat mode. Manufactured by Donk Co." - icon_state = "hardsuit1-scarlet" - item_state = "scarlet_hardsuit" - hardsuit_type = "scarlet" - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/scarlet +/obj/item/clothing/suit/space/hardsuit/syndi/ramzi + name = "rusted-red hardsuit" + desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Gorlex Marauders." + alt_desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in combat mode. Manufactured by Gorlex Marauders." + icon_state = "hardsuit1-ramzi" + item_state = "hardsuit1-ramzi" + hardsuit_type = "ramzi" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi lightweight = 1 jetpack = null armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) combat_slowdown = 0.5 jetpack = null +//2nd Battlegroup Syndie suit +/obj/item/clothing/head/helmet/space/hardsuit/syndi/sbg + name = "beige-red hardsuit helmet" + desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup." + alt_desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in combat mode. Manufactured by Second Battlegroup." + icon_state = "hardsuit1-sbg" + item_state = "hardsuit1-sbg" + hardsuit_type = "sbg" + armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + +/obj/item/clothing/suit/space/hardsuit/syndi/sbg + name = "beige-red hardsuit" + desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup." + alt_desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in combat mode. Manufactured by the Second Battlegroup." + icon_state = "hardsuit1-sbg" + item_state = "hardsuit1-sbg" + hardsuit_type = "sbg" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/sbg + lightweight = 1 + jetpack = null + armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + combat_slowdown = 0 + jetpack = null + + +//Hardliner Syndie suit +/obj/item/clothing/head/helmet/space/hardsuit/syndi/hl + name = "white-red hardsuit helmet" + desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup." + alt_desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in combat mode. Manufactured by Second Battlegroup." + icon_state = "hardsuit1-hl" + item_state = "hardsuit1-hl" + hardsuit_type = "hl" + armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + +/obj/item/clothing/suit/space/hardsuit/syndi/hl + name = "white-red hardsuit" + desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup." + alt_desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in combat mode. Manufactured by the Second Battlegroup." + icon_state = "hardsuit1-hl" + item_state = "hardsuit1-hl" + hardsuit_type = "hl" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl + lightweight = 1 + jetpack = null + armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + combat_slowdown = 0 + jetpack = null + + //Elite Syndie suit /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite name = "elite syndicate hardsuit helmet" diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 04ff8f5f54de..daac95f38ba4 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -46,6 +46,25 @@ r_pocket = /obj/item/tank/internals/emergency_oxygen id = /obj/item/card/id/syndicate +/obj/effect/mob_spawn/human/corpse/syndicateramzi + name = "Ramzi's Clique Commando" + id_job = "Cutthroat" + hairstyle = "Bald" + facial_hairstyle = "Shaved" + outfit = /datum/outfit/syndicateramzicorpse + +/datum/outfit/syndicateramzicorpse + name = "Ramzi's 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 + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + ears = /obj/item/radio/headset + mask = /obj/item/clothing/mask/gas/syndicate + back = /obj/item/tank/jetpack/oxygen + r_pocket = /obj/item/tank/internals/emergency_oxygen + id = /obj/item/card/id/syndicate + /obj/effect/mob_spawn/human/corpse/syndicatestormtrooper name = "Syndicate Stormtrooper" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index bdc4124ed929..1254b33c7341 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -413,12 +413,13 @@ "Miner" = 44, "Waldo" = 3, "Ashwalker" = 7, - "Soldier" = 3, + "Soldier" = 5, "Oldminer" = 8, "Kobold" = 5, "Golem" = 6, "SRM" = 10, - pick("Shadow", "YeOlde", "Operative", "Cultist") = 4 + "Operative" = 5, + pick("Shadow", "YeOlde") = 4 ) ) switch(type) @@ -922,10 +923,12 @@ mask = /obj/item/clothing/mask/breath if("Operative") id_job = "Operative" - if(prob(15)) + if(prob(40)) + outfit = /datum/outfit/syndicatecommandocorpse + else if(prob(5)) outfit = /datum/outfit/syndicatestormtroopercorpse else - outfit = /datum/outfit/syndicatecommandocorpse + outfit = /datum/outfit/syndicateramzicorpse if("Waldo")//WE FINALLY FOUND HIM name = "Waldo" uniform = /obj/item/clothing/under/pants/jeans @@ -1004,20 +1007,6 @@ glasses = /obj/item/clothing/glasses/blindfold back = /obj/item/tank/internals/oxygen mask = /obj/item/clothing/mask/breath - if("Cultist") - uniform = /obj/item/clothing/under/costume/roman - suit = /obj/item/clothing/suit/hooded/cultrobes - suit_store = /obj/item/tome - r_pocket = /obj/item/restraints/legcuffs/bola/cult - l_pocket = /obj/item/melee/cultblade/dagger - glasses = /obj/item/clothing/glasses/hud/health/night/cultblind - back = /obj/item/storage/backpack/cultpack - backpack_contents = list( - /obj/item/reagent_containers/glass/beaker/unholywater = 1, - /obj/item/cult_shift = 1, - /obj/item/flashlight/flare/culttorch = 1, - /obj/item/stack/sheet/runed_metal = 15 - ) if("SRM") uniform = /obj/item/clothing/under/suit/roumain shoes = /obj/item/clothing/shoes/workboots/mining diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 4e9d02e4f448..9e43956fcfd3 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi index 19042f1f08e8..6350fec50200 100644 Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index fb86fe6a7fe4..4816c2bb666f 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi index cde94993e63e..bd8b5e13597f 100644 Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ