cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +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

14
code/game/objects/structures/crates_lockers/closets/l3closet.dm
View File

@@ -10,7 +10,7 @@
/obj/item/clothing/suit/bio_suit/general = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/general = 2,
/obj/item/weapon/tank/oxygen = 2,
/obj/item/clothing/mask/gas = 2) // CHOMP Block Edit End
/obj/item/clothing/mask/gas/clear = 2) // CHOMP Block Edit End //CHOMPEdit: Clear gas mask implementation
/obj/structure/closet/l3closet/virology
@@ -19,7 +19,7 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/virology = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/virology = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
/obj/item/weapon/tank/oxygen = 2) // CHOMP Block Edit End
@@ -29,7 +29,7 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/security = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/security = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
/obj/item/weapon/tank/oxygen = 2) // CHOMP Block Edit End
/obj/structure/closet/l3closet/janitor
@@ -38,7 +38,7 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/janitor = 2,
/obj/item/clothing/head/bio_hood/janitor = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
/obj/item/weapon/tank/emergency/oxygen/engi = 2)
@@ -48,7 +48,7 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/scientist = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/scientist = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
/obj/item/weapon/tank/oxygen = 2, // CHOMP Block Edit End
/obj/item/weapon/storage/bag/xeno = 1)
@@ -57,7 +57,7 @@
/obj/item/clothing/suit/bio_suit/scientist = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/scientist = 2,
/obj/item/weapon/storage/bag/xeno = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
/obj/item/weapon/tank/oxygen = 2,
/obj/item/weapon/storage/bag/xeno = 2) // CHOMP Block Edit End
@@ -68,5 +68,5 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/general = 3,
/obj/item/clothing/head/bio_hood/general = 3,
/obj/item/clothing/mask/gas = 3, // CHOMP Block Edit Start
/obj/item/clothing/mask/gas/clear = 3, // CHOMP Block Edit Start //CHOMPEdit: Clear gas mask implementation
/obj/item/weapon/tank/oxygen = 3) // CHOMP Block Edit End

2
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
View File

@@ -35,7 +35,7 @@
/obj/structure/closet/secure_closet/hydroponics/sci/Initialize()
starts_with += /obj/item/clothing/head/bio_hood/scientist
starts_with += /obj/item/clothing/suit/bio_suit/scientist
starts_with += /obj/item/clothing/mask/gas // VOREStation Edit: Gasmasks we use are different
starts_with += /obj/item/clothing/mask/gas/clear // VOREStation Edit: Gasmasks we use are different //Chompedit: not anymore!
if(prob(1))
starts_with += /obj/item/weapon/chainsaw

1
code/game/objects/structures/loot_piles.dm
View File

@@ -142,6 +142,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/weapon/cell,
/obj/item/weapon/cell/device,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear, //Chompadd: Proper Implementation of clear gasmasks
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/breath,
/obj/item/weapon/reagent_containers/glass/rag,

1
code/game/objects/structures/trash_pile_vr.dm
View File

@@ -203,6 +203,7 @@
prob(3);/obj/item/clothing/gloves/botanic_leather,
prob(3);/obj/item/clothing/head/hardhat/red,
prob(3);/obj/item/clothing/mask/gas,
prob(3);/obj/item/clothing/mask/gas/clear, //Chompadd: Proper implementation of clear gas masks
prob(3);/obj/item/clothing/suit/storage/apron,
prob(3);/obj/item/clothing/suit/storage/toggle/bomber,
prob(3);/obj/item/clothing/suit/storage/toggle/brown_jacket,