cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes masks use their original, opaque sprite and properly implements polaris clear gasmask subtypes (#8113)

Browse Source
This commit is contained in:
Reo Lozzot
2024-04-04 12:56:48 -05:00
committed by GitHub
parent 7e4149ba21
commit 2ec2879552
39 changed files with 91 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modular_chomp/code/modules/client/preference_setup/loadout/loadout_mask.dm Normal file
View File

@@ -0,0 +1,11 @@
/datum/gear/mask/gas //Greytide Worldwide
display_name = "Gas Mask"
description = "A dangerous gas filtering gas mask. Also conseals your face. Assistant's favorite."
path = /obj/item/clothing/mask/gas
cost = 3 //Plague Doctor's costs 3 due to mechanical advantage, so I'll use that here
/datum/gear/mask/gas_clear
display_name = "Gas Mask, Clear"
description = "A dangerous gas filtering gas mask. Doesn't conseal your face."
path = /obj/item/clothing/mask/gas/clear
cost = 3

19
modular_chomp/code/modules/living/carbon/human/ai_controlled/ai_controlled.dm
View File

@@ -5,22 +5,33 @@
prob(20); /obj/item/weapon/storage/toolbox/emergency,
prob(50); /obj/item/weapon/melee/baton/cattleprod,
)
if(prob(25))
to_wear_mask = /obj/item/clothing/mask/gas/wwii
if(prob(50))
to_wear_mask = /obj/item/clothing/mask/gas
else
to_wear_mask = null
if(prob(5))
to_wear_helmet = /obj/item/clothing/head/cone //Hehe funny cone
else
to_wear_helmet = null
if(prob(70))
to_wear_gloves = pick(
prob(20); /obj/item/clothing/gloves/fyellow,
prob(1); /obj/item/clothing/gloves/yellow //Sometimes they get real glubs
)
else
to_wear_gloves = null
..()
/mob/living/carbon/human/ai_controlled/greytide
name = "John Greytide" //theyll get a normal name on spawn
to_wear_helmet = null
//to_wear_helmet = null
to_wear_glasses = null
//to_wear_mask =
to_wear_l_radio = /obj/item/device/radio/headset
to_wear_r_radio = null
to_wear_uniform = /obj/item/clothing/under/color/grey
to_wear_suit = null
to_wear_gloves = /obj/item/clothing/gloves/fyellow
//to_wear_gloves = /obj/item/clothing/gloves/fyellow
to_wear_shoes = /obj/item/clothing/shoes/black
to_wear_belt = /obj/item/weapon/storage/belt/utility/full
to_wear_l_pocket = /obj/item/weapon/soap