Uppercases slot defines.

This commit is contained in:
oranges
2018-04-27 20:14:39 -05:00
committed by CitadelStationBot
parent ab3c55ab23
commit 7d45e045a3
207 changed files with 1507 additions and 692 deletions
+6 -1
View File
@@ -154,8 +154,13 @@
R.command = TRUE
if(tc)
<<<<<<< HEAD
var/obj/item/device/radio/uplink/U = new uplink_type(H, H.key, tc)
H.equip_to_slot_or_del(U, slot_in_backpack)
=======
var/obj/item/radio/uplink/U = new uplink_type(H, H.key, tc)
H.equip_to_slot_or_del(U, SLOT_IN_BACKPACK)
>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(H)
W.implant(H)
@@ -171,7 +176,7 @@
mask = /obj/item/clothing/mask/gas/syndicate
suit = /obj/item/clothing/suit/space/hardsuit/syndi
r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
internals_slot = slot_r_store
internals_slot = SLOT_R_STORE
belt = /obj/item/storage/belt/military
r_hand = /obj/item/gun/ballistic/automatic/shotgun/bulldog
backpack_contents = list(/obj/item/storage/box/syndie=1,\