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
@@ -78,6 +78,16 @@
build_path = /obj/item/weapon/gun/energy/lasercannon
locked = 1
category = list("Weapons")
/datum/design/receiver
name = "Modular Receiver"
desc = "A prototype modular receiver and trigger assembly for a variety of firearms."
id = "receiver"
req_tech = list("combat" = 5, "materials" = 4)
build_type = PROTOLATHE
materials = list("$metal" = 6500, "$silver" = 500)
build_path = /obj/item/weaponcrafting/receiver
category = list("Weapons")
/datum/design/plasmapistol
name = "Plasma Pistol"