Uppercases slot defines.

2018-04-28 13:13:56 +12:00
parent ab3c55ab23
commit 7d45e045a3
207 changed files with 1507 additions and 692 deletions
@@ -7,7 +7,7 @@
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	flags_1 = CONDUCT_1
-	slot_flags = SLOT_BACK
+	slot_flags = ITEM_SLOT_BACK
 	w_class = WEIGHT_CLASS_HUGE
 	materials = list(MAT_METAL=10000, MAT_GLASS=2500)
 	var/on = TRUE
@@ -7,8 +7,13 @@
 	subspace_transmission = TRUE
 	canhear_range = 0 // can't hear headsets from very far away

+<<<<<<< HEAD
 	slot_flags = SLOT_EARS
 	var/obj/item/device/encryptionkey/keyslot2 = null
+=======
+	slot_flags = ITEM_SLOT_EARS
+	var/obj/item/encryptionkey/keyslot2 = null
+>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
 	dog_fashion = null

 /obj/item/device/radio/headset/suicide_act(mob/living/carbon/user)
@@ -8,7 +8,7 @@

 	flags_1 = CONDUCT_1 | HEAR_1
 	flags_2 = NO_EMP_WIRES_2
-	slot_flags = SLOT_BELT
+	slot_flags = ITEM_SLOT_BELT
 	throw_speed = 3
 	throw_range = 7
 	w_class = WEIGHT_CLASS_SMALL