Merge branch 'master' into poojgoneplzrevert

modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm

@@ -24,7 +24,7 @@
 /obj/item/electropack/shockcollar/attack_hand(mob/user)
 	if(loc == user)
 		if(slot_flags == SLOT_NECK)
-			if(user.get_item_by_slot(slot_neck))
+			if(user.get_item_by_slot(SLOT_NECK))
 				to_chat(user, "<span class='warning'>The collar is fastened tight! You'll need help taking this off!</span>")
 				return
 	..()

modular_citadel/code/game/objects/items/melee/eutactic_blades.dm

@@ -254,7 +254,7 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
 	resistance_flags = FIRE_PROOF
 	var/brightness_on = 6 //TWICE AS BRIGHT AS A REGULAR ESWORD
-	flags_2 = SLOWS_WHILE_IN_HAND_2
+	item_flags = SLOWS_WHILE_IN_HAND
 
 /obj/item/twohanded/hypereutactic/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
 	altafterattack(A, user, TRUE, params)
@@ -442,7 +442,6 @@
 /obj/item/twohanded/hypereutactic/toy/rainbow
 	name = "\improper Hyper-Euclidean Reciprocating Trigonometric Zweihander"
 	desc = "A custom-built toy with fancy rainbow lights built-in."
-	flags_2 = NONE
 	var/list/rainbow_colors = list("#FF0000", "#FFFF00", "#00FF00", "#00FFFF", "#0000FF","#FF00FF", "#3399ff", "#ff9900", "#fb008b", "#9800ff", "#00ffa3", "#ccff00")
 
 /obj/item/twohanded/hypereutactic/toy/rainbow/process()
@@ -453,4 +452,4 @@
 	update_icon()
 
 /obj/item/twohanded/hypereutactic/toy/rainbow/AltClick(mob/living/user)
-	return
+	return