Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476

[MIRROR] Uppercases slot defines.
This commit is contained in:
LetterJay
2018-05-21 11:23:02 -05:00
committed by GitHub
228 changed files with 1641 additions and 1642 deletions
+1 -1
View File
@@ -430,7 +430,7 @@
var/obj/item/clothing/under/schoolgirl/I = new seifuku
var/olduniform = H.w_uniform
H.temporarilyRemoveItemFromInventory(H.w_uniform, TRUE, FALSE)
H.equip_to_slot_or_del(I, slot_w_uniform)
H.equip_to_slot_or_del(I, SLOT_W_UNIFORM)
qdel(olduniform)
if(droptype == "Yes")
I.flags_1 |= NODROP_1
+2 -2
View File
@@ -1508,8 +1508,8 @@
if(ishuman(L))
var/mob/living/carbon/human/observer = L
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), slot_w_uniform)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), slot_shoes)
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), SLOT_W_UNIFORM)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), SLOT_SHOES)
L.Unconscious(100)
sleep(5)
L.forceMove(pick(GLOB.tdomeobserve))
+1 -1
View File
@@ -480,7 +480,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
id.forceMove(W)
W.update_icon()
else
H.equip_to_slot(id,slot_wear_id)
H.equip_to_slot(id,SLOT_WEAR_ID)
else
alert("Invalid mob")