cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore

Browse Source 
# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	icons/mob/robots.dmi
This commit is contained in:
Repede
2019-12-28 12:00:22 -05:00
parent a5c15b4573 1fa45a6287
commit 5c33de39c1
16 changed files with 1558 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
View File

@@ -124,6 +124,7 @@
ckeywhitelist = list("blackangelsace")
character_name = list("Strix Hades")
//Plague Doctor Boye
/datum/gear/fluff/kel_plague_box
path = /obj/item/weapon/storage/box/fluff/kelplague
display_name = "Plague Outfit Box"