Merge branch 'master' into upstream-merge-37597

code/modules/projectiles/projectile/reusable/foam_dart.dm

@@ -3,12 +3,12 @@
 	desc = "I hope you're wearing eye protection."
 	damage = 0 // It's a damn toy.
 	damage_type = OXY
-	nodamage = 1
+	nodamage = TRUE
 	icon = 'icons/obj/guns/toy.dmi'
 	icon_state = "foamdart_proj"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	range = 10
-	var/modified = 0
+	var/modified = FALSE
 	var/obj/item/pen/pen = null
 
 /obj/item/projectile/bullet/reusable/foam_dart/handle_drop()

code/modules/projectiles/projectile/special/curse.dm

@@ -4,7 +4,7 @@
 
 /obj/item/projectile/curse_hand
 	name = "curse hand"
-	icon_state = "cursehand"
+	icon_state = "cursehand0"
 	hitsound = 'sound/effects/curse4.ogg'
 	layer = LARGE_MOB_LAYER
 	damage_type = BURN
@@ -19,10 +19,7 @@
 /obj/item/projectile/curse_hand/Initialize(mapload)
 	. = ..()
 	handedness = prob(50)
-	update_icon()
-
-/obj/item/projectile/curse_hand/update_icon()
-	icon_state = "[icon_state][handedness]"
+	icon_state = "cursehand[handedness]"
 
 /obj/item/projectile/curse_hand/fire(setAngle)
 	if(starting)

code/modules/projectiles/projectile/special/mindflayer.dm

@@ -6,4 +6,4 @@
 	if(ishuman(target))
 		var/mob/living/carbon/human/M = target
 		M.adjustBrainLoss(20)
-		M.hallucination += 20
+		M.hallucination += 30