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

Fixes assistants spawning naked

Browse Source
This commit is contained in:
oranges
2017-12-30 12:10:41 +13:00
committed by CitadelStationBot
parent 48e0c47410
commit a958de3d96
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/color.dm
+9
View File
@@ -205,9 +205,18 @@
/obj/item/clothing/gloves/color/brown = 1)
var/obj/item/clothing/gloves/color/selected = pick(gloves)
<<<<<<< HEAD
name = initial(selected.name)
desc = initial(selected.desc)
icon_state = initial(selected.icon_state)
item_state = initial(selected.item_state)
item_color = initial(selected.item_color)
=======
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
H.equip_to_slot_or_del(new selected(H), slot_gloves)
else
new selected(loc)
return INITIALIZE_HINT_QDEL
>>>>>>> c063902... Merge pull request #33930 from ShizCalev/undersuit-fix
code/modules/clothing/under/color.dm
+10
View File
@@ -6,11 +6,21 @@
/obj/item/clothing/under/color/random/New()
..()
<<<<<<< HEAD
var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random)
name = initial(C.name)
icon_state = initial(C.icon_state)
item_state = initial(C.item_state)
item_color = initial(C.item_color)
=======
var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
H.equip_to_slot_or_del(new C(H), slot_w_uniform) //or else you end up with naked assistants running around everywhere...
else
new C(loc)
return INITIALIZE_HINT_QDEL
>>>>>>> c063902... Merge pull request #33930 from ShizCalev/undersuit-fix
/obj/item/clothing/under/color/black
name = "black jumpsuit"