diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index e0ff4fb6..e16b4c36 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -13,7 +13,7 @@ ..() sleep(2) new /obj/item/weapon/tank/jetpack/oxygen(src) - new /obj/item/clothing/mask/gas/syndicate(src) + new /obj/item/clothing/mask/gas/voice/syndicate(src) new /obj/item/clothing/under/syndicate(src) new /obj/item/clothing/head/helmet/space/rig/syndi(src) new /obj/item/clothing/suit/space/rig/syndi(src) diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index bd919df8..0309fda3 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -143,7 +143,7 @@ var/global/sent_syndicate_strike_team = 0 equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black(src), slot_head) else equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/red(src), slot_head) - equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), slot_wear_mask) + equip_to_slot_or_del(new /obj/item/clothing/mask/gas/voice/syndicate(src), slot_wear_mask) equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses) equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(src), slot_back) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index e3b51b72..dcd4f187 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -110,7 +110,7 @@ corpseshoes = /obj/item/clothing/shoes/swat corpsegloves = /obj/item/clothing/gloves/swat corpseradio = /obj/item/device/radio/headset - corpsemask = /obj/item/clothing/mask/gas/syndicate + corpsemask = /obj/item/clothing/mask/gas/voice/syndicate corpsehelmet = /obj/item/clothing/head/helmet/space/rig/syndi corpseback = /obj/item/weapon/tank/jetpack/oxygen corpsepocket1 = /obj/item/weapon/tank/emergency_oxygen diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index e8e460cf..6b1266bc 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -25,11 +25,13 @@ icon_state = "swat" siemens_coefficient = 0.7 +/* /obj/item/clothing/mask/gas/syndicate name = "syndicate mask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "swat" siemens_coefficient = 0.7 +*/ /obj/item/clothing/mask/gas/voice name = "gas mask" @@ -47,6 +49,12 @@ vchange = 1 siemens_coefficient = 0.2 +/obj/item/clothing/mask/gas/voice/syndicate + name = "syndicate mask" + desc = "A close-fitting tactical mask that can be connected to an air supply." + icon_state = "swat" + siemens_coefficient = 0.7 + /obj/item/clothing/mask/gas/clown_hat name = "clown wig and mask" desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 25cf042c..4ba38d6e 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -107,7 +107,7 @@ corpseshoes = /obj/item/clothing/shoes/swat corpsegloves = /obj/item/clothing/gloves/swat corpseradio = /obj/item/device/radio/headset - corpsemask = /obj/item/clothing/mask/gas/syndicate + corpsemask = /obj/item/clothing/mask/gas/voice/syndicate corpsehelmet = /obj/item/clothing/head/helmet/space/rig/syndi corpseback = /obj/item/weapon/tank/jetpack/oxygen corpsepocket1 = /obj/item/weapon/tank/emergency_oxygen