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

Uppercases slot defines.

Browse Source
This commit is contained in:
oranges
2018-04-28 13:13:56 +12:00
committed by CitadelStationBot
parent ab3c55ab23
commit 7d45e045a3
207 changed files with 1507 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/traits/_trait.dm
+1 -1
View File
@@ -120,7 +120,7 @@ Use this as a guideline
var/mob/living/carbon/human/H = trait_holder
var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H))
H.put_in_hands(glasses)
H.equip_to_slot(glasses, slot_glasses)
H.equip_to_slot(glasses, SLOT_GLASSES)
H.regenerate_icons()
//This whole proc is called automatically
code/datums/traits/negative.dm
+4 -4
View File
@@ -58,9 +58,9 @@
/obj/item/dice/d20)
heirloom = new heirloom_type(get_turf(trait_holder))
var/list/slots = list(
"in your backpack" = slot_in_backpack,
"in your left pocket" = slot_l_store,
"in your right pocket" = slot_r_store
"in your backpack" = SLOT_IN_BACKPACK,
"in your left pocket" = SLOT_L_STORE,
"in your right pocket" = SLOT_R_STORE
)
var/where = H.equip_in_one_of_slots(heirloom, slots)
if(!where)
@@ -121,7 +121,7 @@
var/mob/living/carbon/human/H = trait_holder
var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H))
H.put_in_hands(glasses)
H.equip_to_slot(glasses, slot_glasses)
H.equip_to_slot(glasses, SLOT_GLASSES)
H.regenerate_icons() //this is to remove the inhand icon, which persists even if it's not in their hands