diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 50bb98b94ed..4522ee5f51e 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -12,10 +12,9 @@ /obj/structure/closet/syndicate/personal/New() ..() new /obj/item/clothing/under/syndicate(src) - new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/head/helmet/swat/syndicate(src) - new /obj/item/ammo_box/magazine/m10mm(src) + new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/device/radio/headset/syndicate(src) + new /obj/item/ammo_box/magazine/m10mm(src) new /obj/item/weapon/storage/belt/military(src) new /obj/item/weapon/crowbar/red(src) new /obj/item/clothing/glasses/night(src) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index be721b81b07..5bb7d4473f8 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -130,7 +130,7 @@ corpsegloves = /obj/item/clothing/gloves/combat corpseradio = /obj/item/device/radio/headset corpsemask = /obj/item/clothing/mask/gas - corpsehelmet = /obj/item/clothing/head/helmet/swat/syndicate + corpsehelmet = /obj/item/clothing/head/helmet/swat corpseback = /obj/item/weapon/storage/backpack corpseid = 1 corpseidjob = "Operative" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e91317052e5..1cdaaf78c71 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -61,12 +61,6 @@ armor = list(melee = 25, bullet = 60, laser = 25, energy = 10, bomb = 40, bio = 0, rad = 0) strip_delay = 70 -/obj/item/clothing/head/helmet/swat/syndicate - name = "blood-red helmet" - desc = "An extremely robust, space-worthy helmet that lacks a visor to allow for goggle usage underneath. Property of Gorlex Marauders." - icon_state = "helmetsyndi" - item_state = "helmet" - /obj/item/clothing/head/helmet/thunderdome name = "\improper Thunderdome helmet" desc = "'Let the battle commence!'" diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index b0872270f6a..92f23576991 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -109,22 +109,82 @@ //Syndicate hardsuit /obj/item/clothing/head/helmet/space/hardsuit/syndi name = "blood-red hardsuit helmet" - desc = "An advanced helmet designed for work in special operations. Property of Gorlex Marauders." - icon_state = "hardsuit0-syndi" + desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." + icon_state = "hardsuit1-syndi" item_state = "syndie_helm" item_color = "syndi" armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50) + on = 1 + action_button_name = "Toggle Helmet Mode" + +/obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon() + icon_state = "hardsuit[on]-[item_color]" + +/obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user) + if(!isturf(user.loc)) + user << "You cannot toggle your helmet while in this [user.loc]" //To prevent some lighting anomalities. + return + on = !on + if(on) + user << "You switch your helmet to travel mode." + name = "blood-red hardsuit helmet" + desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." + flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + cold_protection = HEAD + user.AddLuminosity(brightness_on) + else + user << "You switch your helmet to combat mode." + name = "blood-red hardsuit helmet (combat)" + desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." + flags = BLOCKHAIR + flags_inv = HIDEEARS + cold_protection = null + user.AddLuminosity(-brightness_on) + + update_icon() + playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) + user.update_inv_head() /obj/item/clothing/suit/space/hardsuit/syndi - icon_state = "hardsuit-syndi" name = "blood-red hardsuit" - desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders." + desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." + icon_state = "hardsuit1-syndi" item_state = "syndie_hardsuit" + item_color = "syndi" slowdown = 1 w_class = 3 + var/on = 1 + action_button_name = "Toggle Hardsuit Mode" armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50) allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen) +/obj/item/clothing/suit/space/hardsuit/syndi/update_icon() + icon_state = "hardsuit[on]-[item_color]" + +/obj/item/clothing/suit/space/hardsuit/syndi/attack_self(mob/user) + on = !on + if(on) + user << "You switch your hardsuit to travel mode." + name = "blood-red hardsuit helmet" + desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." + slowdown = 1 + flags = STOPSPRESSUREDMAGE | THICKMATERIAL + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS + else + user << "You switch your hardsuit to combat mode." + name = "blood-red hardsuit helmet (combat)" + desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." + slowdown = 0 + flags = BLOCKHAIR + flags_inv = null + cold_protection = null + + update_icon() + playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) + user.update_inv_wear_suit() + user.update_inv_w_uniform() //Wizard hardsuit /obj/item/clothing/head/helmet/space/hardsuit/wizard diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 30f5277c4d8..405b882ea17 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -92,7 +92,7 @@ corpsegloves = /obj/item/clothing/gloves/combat corpseradio = /obj/item/device/radio/headset corpsemask = /obj/item/clothing/mask/gas - corpsehelmet = /obj/item/clothing/head/helmet/swat/syndicate + corpsehelmet = /obj/item/clothing/head/helmet/swat corpseback = /obj/item/weapon/storage/backpack corpseid = 1 corpseidjob = "Operative" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 045ac438a26..b10bcfce92b 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index fbfafed94df..b6923194bb1 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index d258dd1d68c..24f9048fc45 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 81a2fb808b8..30fd1979df8 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ