Merge remote-tracking branch 'origin/master' into motivation

code/modules/projectiles/projectile/plasma.dm

@@ -1,4 +1,4 @@
-obj/item/projectile/energy/plasmabolt
+/obj/item/projectile/energy/plasmabolt
 	name = "plasma bolt"
 	icon_state = "plasma"
 	flag = "energy"

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

@@ -20,8 +20,9 @@
 	newcasing.modified = modified
 	var/obj/item/projectile/bullet/reusable/foam_dart/newdart = newcasing.BB
 	newdart.modified = modified
-	newdart.damage = damage
-	newdart.nodamage = nodamage
+	if(modified)
+		newdart.damage = 5
+		newdart.nodamage = FALSE
 	newdart.damage_type = damage_type
 	if(pen)
 		newdart.pen = pen

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

@@ -2,7 +2,7 @@
 	name = "alpha somatoray"
 	icon_state = "energy"
 	damage = 0
-	damage_type = TOX
+	damage_type = TRUE
 	nodamage = 1
 	flag = "energy"
 
@@ -21,5 +21,13 @@
 	icon_state = "energy2"
 	damage = 0
 	damage_type = TOX
-	nodamage = 1
+	nodamage = TRUE
+	flag = "energy"
+
+/obj/item/projectile/energy/florarevolution
+	name = "gamma somatorary"
+	icon_state = "energy3"
+	damage = 0
+	damage_type = TOX
+	nodamage = TRUE
 	flag = "energy"