cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prepare_stuff_for_second_week

Browse Source
This commit is contained in:
alberyk
2022-01-29 11:45:45 -03:00
parent 8e875dc192 edb1c08178
commit cd07daa559
35 changed files with 208 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+2 -3
View File
@@ -127,7 +127,6 @@
/datum/gear/eyes/blindfolds/New()
..()
var/list/blindfold = list()
blindfold["blindfold, black"] = /obj/item/clothing/glasses/sunglasses/blindfold
blindfold["blindfold, white"] = /obj/item/clothing/glasses/sunglasses/blindfold/white
blindfold["blindfold, transparent white"] = /obj/item/clothing/glasses/sunglasses/blindfold/white/seethrough
blindfold["blindfold"] = /obj/item/clothing/glasses/sunglasses/blindfold/white
blindfold["blindfold, transparent"] = /obj/item/clothing/glasses/sunglasses/blindfold/white/seethrough
gear_tweaks += new /datum/gear_tweak/path(blindfold)
code/modules/client/preference_setup/loadout/loadout_factions.dm
+6
View File
@@ -216,6 +216,12 @@
slot = slot_gloves
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_cloak
display_name = "Zeng-Hu Jargon Division cloak"
path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zavodskoi_patch
display_name = "zavodskoi sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoi