cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 13:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Straw Stuff + Fixes 2

Browse Source
This commit is contained in:
Chompstation Bot
2021-10-27 21:53:50 +00:00
parent 299511d80d
commit 04835a42c6
9 changed files with 274 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_head.dm
+9 -1
View File
@@ -426,6 +426,14 @@
display_name = "black and gold headdress"
path = /obj/item/clothing/head/blackngoldheaddress
/datum/gear/head/plaguedoctor
display_name = "plague doctor's hat"
path = /obj/item/clothing/head/plaguedoctorhat
/datum/gear/head/plaguedoctor2
display_name = "golden plague doctor's hat"
path = /obj/item/clothing/head/plaguedoctorhat/gold
path = /obj/item/clothing/head/plaguedoctorhat/gold
/datum/gear/head/wheat
display_name = "straw hat"
path = /obj/item/clothing/head/wheat
code/modules/client/preference_setup/loadout/loadout_mask.dm
+57 -4
View File
@@ -22,11 +22,64 @@
path = /obj/item/clothing/mask/surgical
cost = 2
/datum/gear/mask/veil
display_name = "black veil"
path = /obj/item/clothing/mask/veil
/datum/gear/mask/plaguedoctor
display_name = "plague doctor's mask"
path = /obj/item/clothing/mask/gas/plaguedoctor
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
/datum/gear/mask/plaguedoctor2
display_name = "golden plague doctor's mask"
path = /obj/item/clothing/mask/gas/plaguedoctor/gold
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
<<<<<<< HEAD
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
||||||| parent of 23daa38dfa... Merge pull request #11716 from GhostActual/straw_accessories
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
/datum/gear/mask/papermask
display_name = "paper mask"
path = /obj/item/clothing/mask/paper
/datum/gear/mask/emotionalmask
display_name = "emotional mask"
path = /obj/item/clothing/mask/emotions
/datum/gear/mask/gaiter
display_name = "neck gaiter selection"
path = /obj/item/clothing/mask/gaiter
cost = 1
/datum/gear/mask/gaiter/New()
..()
var/list/gaiters = list()
for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter))
var/obj/item/clothing/mask/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
=======
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
/datum/gear/mask/mouthwheat
display_name = "mouth wheat"
path = /obj/item/clothing/mask/mouthwheat
/datum/gear/mask/papermask
display_name = "paper mask"
path = /obj/item/clothing/mask/paper
/datum/gear/mask/emotionalmask
display_name = "emotional mask"
path = /obj/item/clothing/mask/emotions
/datum/gear/mask/gaiter
display_name = "neck gaiter selection"
path = /obj/item/clothing/mask/gaiter
cost = 1
/datum/gear/mask/gaiter/New()
..()
var/list/gaiters = list()
for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter))
var/obj/item/clothing/mask/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
>>>>>>> 23daa38dfa... Merge pull request #11716 from GhostActual/straw_accessories