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

2021-01-29 09:29:55 -05:00
parent 5761417e5b 4d945d5f15
commit a4e933185e
803 changed files with 8615 additions and 5542 deletions
@@ -8,7 +8,7 @@
 	projectile_type = /obj/item/projectile/bullet/shotgun_slug
 	custom_materials = list(/datum/material/iron=4000)

-obj/item/ammo_casing/shotgun/executioner
+/obj/item/ammo_casing/shotgun/executioner
 	name = "executioner slug"
 	desc = "A 12 gauge lead slug purpose built to annihilate flesh on impact."
 	icon_state = "stunshell"
@@ -24,6 +24,11 @@
 	projectile_type = /obj/item/projectile/energy/floramut
 	select_name = "mutation"

+/obj/item/ammo_casing/energy/flora/revolution
+	projectile_type = /obj/item/projectile/energy/florarevolution
+	select_name = "revolution"
+	e_cost = 250
+
 /obj/item/ammo_casing/energy/temp
 	projectile_type = /obj/item/projectile/temp
 	select_name = "freeze"