cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 20:54:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8933 from VOREStation/upstream-merge-7552

Browse Source 
[MIRROR] Adds hailer gas (face) masks.
This commit is contained in:
Novacat
2020-08-31 23:57:14 -04:00
committed by GitHub
parent fe29585641 c024404024
commit d5f18ddb2e
27 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+6 -3
View File
@@ -66,7 +66,7 @@
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
req_access = list(access_hos)
storage_capacity = 2.5 * MOB_MEDIUM
storage_capacity = 2.6 * MOB_MEDIUM
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
starts_with = list(
@@ -102,7 +102,8 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/clothing/mask/gas/half)
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/hos)
/obj/structure/closet/secure_closet/hos/Initialize()
if(prob(50))
@@ -116,6 +117,7 @@
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
storage_capacity = 42
req_access = list(access_armory)
closet_appearance = /decl/closet_appearance/secure_closet/security/warden
@@ -147,7 +149,8 @@
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/device/megaphone,
/obj/item/clothing/mask/gas/half)
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/warden)
/obj/structure/closet/secure_closet/warden/Initialize()
if(prob(50))
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+2 -1
View File
@@ -406,7 +406,8 @@
/obj/item/clothing/gloves/swat,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/mask/bandana/skull = 2)
/obj/item/clothing/mask/bandana/skull = 2,
/obj/item/clothing/mask/gas/sechailer/swat)
/obj/structure/closet/wardrobe/suit
code/modules/clothing/masks/gasmask.dm
+17
View File
@@ -42,6 +42,23 @@
w_class = ITEMSIZE_SMALL
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 55, rad = 0)
//Turn it into a hailer mask
/obj/item/clothing/mask/gas/half/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/device/hailer))
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
user.drop_item(src)
var/obj/item/clothing/mask/gas/sechailer/N = new /obj/item/clothing/mask/gas/sechailer(src.loc)
N.fingerprints = src.fingerprints
N.fingerprintshidden = src.fingerprintshidden
N.fingerprintslast = src.fingerprintslast
N.suit_fibers = src.suit_fibers
N.hailer = I
I.loc = N
if(!isturf(N.loc))
user.put_in_hands(N)
qdel(src)
..()
//Plague Dr suit can be found in clothing/suits/bio.dm
/obj/item/clothing/mask/gas/plaguedoctor
name = "plague doctor mask"