cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'polaris/master' into pixel_projectiles

Browse Source
This commit is contained in:
kevinz000
2019-01-16 08:13:58 -08:00
parent 171843e7b7 b1860f9baa
commit 0f4b976d43
128 changed files with 2845 additions and 1861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -101,6 +101,9 @@
/obj/item/clothing/under/wedding/bride_white,
/obj/item/weapon/storage/backpack/cultpack,
/obj/item/weapon/storage/fancy/candle_box = 2,
/obj/item/weapon/storage/fancy/whitecandle_box,
/obj/item/weapon/storage/fancy/blackcandle_box,
/obj/item/godfig = 2,
/obj/item/weapon/deck/tarot)
@@ -188,7 +191,7 @@
name = "white wardrobe"
icon_state = "white"
icon_closed = "white"
starts_with = list(
/obj/item/clothing/under/color/white = 3,
/obj/item/clothing/shoes/white = 3,
@@ -254,7 +257,7 @@
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/satchel/tox
return ..()
@@ -340,12 +343,12 @@
name = "grey wardrobe"
icon_state = "grey"
icon_closed = "grey"
starts_with = list(
/obj/item/clothing/under/color/grey = 3,
/obj/item/clothing/shoes/black = 3,
/obj/item/clothing/head/soft/grey = 3)
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"

2
code/game/objects/structures/girders.dm
View File

@@ -54,7 +54,7 @@
color = girder_material.icon_colour
if(girder_material.products_need_process()) //Am I radioactive or some other? Process me!
START_PROCESSING(SSobj, src)
else if(is_processing) //If I happened to be radioactive or s.o. previously, and am not now, stop processing.
else if(datum_flags & DF_ISPROCESSING) //If I happened to be radioactive or s.o. previously, and am not now, stop processing.
STOP_PROCESSING(SSobj, src)
/obj/structure/girder/get_material()