shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "Merge remote-tracking branch 'upstream/master'""

Browse Source 
This reverts commit 1509d9d183.
This commit is contained in:
Fermi
2019-11-24 03:33:02 +00:00
parent ba4fa1ef67
commit 614a462176
186 changed files with 764 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/objects/structures/crates_lockers/closets/fitness.dm
-5
View File
@@ -1,5 +0,0 @@
/obj/structure/closet/athletic_mixed/PopulateContents()
..()
new /obj/item/clothing/under/polychromic/shortpants(src)
new /obj/item/clothing/under/polychromic/shortpants(src)
new /obj/item/clothing/under/polychromic/shortpants(src)
modular_citadel/code/game/objects/structures/crates_lockers/closets/secure/citadel_lockers.dm
-7
View File
@@ -1,7 +0,0 @@
/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
..()
new /obj/item/radio/headset/heads/qm(src)
/obj/structure/closet/secure_closet/CMO/PopulateContents()
..()
new /obj/item/storage/hypospraykit/cmo(src)
modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
-37
View File
@@ -1,37 +0,0 @@
/obj/structure/closet/wardrobe/mixed/PopulateContents()
if(prob(40))
new /obj/item/clothing/suit/jacket(src)
if(prob(40))
new /obj/item/clothing/suit/jacket(src)
new /obj/item/clothing/under/polychromic/jumpsuit(src)
new /obj/item/clothing/under/polychromic/jumpsuit(src)
new /obj/item/clothing/under/polychromic/jumpsuit(src)
new /obj/item/clothing/under/polychromic/shirt(src)
new /obj/item/clothing/under/polychromic/shirt(src)
new /obj/item/clothing/under/polychromic/shirt(src)
new /obj/item/clothing/under/polychromic/kilt(src)
new /obj/item/clothing/under/polychromic/kilt(src)
new /obj/item/clothing/under/polychromic/kilt(src)
new /obj/item/clothing/under/polychromic/skirt(src)
new /obj/item/clothing/under/polychromic/skirt(src)
new /obj/item/clothing/under/polychromic/skirt(src)
new /obj/item/clothing/under/polychromic/shorts(src)
new /obj/item/clothing/under/polychromic/shorts(src)
new /obj/item/clothing/under/polychromic/shorts(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/blue(src)
new /obj/item/clothing/mask/bandana/blue(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/sneakers/white(src)
if(prob(30))
new /obj/item/clothing/suit/hooded/wintercoat(src)
new /obj/item/clothing/shoes/winterboots(src)
return
/obj/structure/closet/wardrobe/curator/PopulateContents()
..()
new /obj/item/clothing/accessory/pocketprotector/full(src)
modular_citadel/code/game/objects/tools.dm
-18
View File
@@ -1,18 +0,0 @@
/*
// OVERRIDES FOR TOOL SPRITES GO HERE
*/
//CROWBAR
/obj/item/crowbar
icon = 'modular_citadel/icons/obj/tools.dmi'
//WIRECUTTERS disabled pending better sprites
/*
/obj/item/wirecutters
icon = 'modular_citadel/icons/obj/tools.dmi'
*/
//WRENCH
/obj/item/wrench
icon = 'modular_citadel/icons/obj/tools.dmi'