cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

New masks (#7614)

Browse Source 
Adds new sprites for sterile mask and breath masks.
Adds new colorable cloth mask for civillians and dust mask mostly for industrial jobs.

Masks have been move to their own tab in loadout - namely because they have an entire seperate file for them, but apparently haven't been coded in their own tab. Also, they should equip properly on spawn now.
This commit is contained in:
Wowzewow (Wezzy)
2019-12-21 12:40:58 +02:00
committed by Erki
parent 26f3583fab
commit 01a06d1197
18 changed files with 167 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/chewables.dm
+12 -2
View File
@@ -23,7 +23,9 @@
/obj/item/clothing/mask/chewable/update_icon()
cut_overlays()
if(wrapped)
add_overlay("[initial(icon_state)]_wrapper")
var/mutable_appearance/base_overlay = mutable_appearance(icon, "[initial(icon_state)]_wrapper")
base_overlay.appearance_flags = RESET_COLOR
add_overlay(base_overlay)
obj/item/clothing/mask/chewable/Initialize()
. = ..()
@@ -178,7 +180,15 @@ obj/item/clothing/mask/chewable/Destroy()
/obj/item/trash/lollibutt
name = "popsicle stick"
desc = "A popsicle stick devoid of pop."
icon_state = "pop-stick"
icon_state = "lollipop_stick"
/obj/item/clothing/mask/chewable/candy/lolli/update_icon()
cut_overlays()
var/mutable_appearance/base_overlay = mutable_appearance(icon, "[initial(icon_state)]_stick")
base_overlay.appearance_flags = RESET_COLOR
add_overlay(base_overlay)
if(wrapped)
add_overlay("[initial(icon_state)]_wrapper")
/obj/item/clothing/mask/chewable/candy/lolli/Initialize()
. = ..()
code/game/objects/items/weapons/storage/boxes.dm
+3 -3
View File
@@ -156,10 +156,10 @@
starts_with = list(/obj/item/clothing/gloves/latex = 2, /obj/item/clothing/gloves/latex/nitrile = 5)
/obj/item/storage/box/masks
name = "box of sterile masks"
desc = "This box contains masks of sterility."
name = "box of surgical masks"
desc = "This box contains masks of surgicality."
icon_state = "sterile"
starts_with = list(/obj/item/clothing/mask/surgical = 7)
starts_with = list(/obj/item/clothing/mask/surgical = 4, /obj/item/clothing/mask/surgical/w = 3)
/obj/item/storage/box/syringes
name = "box of syringes"