Merge pull request #380 from Markolie/master

Adds celsius to the freezer/heater, crafting update
This commit is contained in:
ZomgPonies
2015-02-22 08:30:11 -05:00
38 changed files with 745 additions and 780 deletions
@@ -95,6 +95,12 @@
desc = "An incendiary-coated shotgun slug."
icon_state = "ishell"
projectile_type = "/obj/item/projectile/bullet/incendiary/shell"
/obj/item/ammo_casing/shotgun/frag12
name = "FRAG-12 slug"
desc = "A high explosive breaching round for a 12 gauge shotgun."
icon_state = "heshell"
projectile_type = /obj/item/projectile/bullet/frag12
/obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
name = "dragonsbreath shell"
@@ -205,4 +205,9 @@ obj/item/projectile/kinetic/New()
/obj/item/effect/kinetic_blast/New()
spawn(4)
del(src)
del(src)
/obj/item/projectile/bullet/frag12
name ="explosive slug"
damage = 25
weaken = 5