Applies what my mom taught me about conflict resolution

This commit is contained in:
Dave
2019-03-01 18:51:04 -05:00
committed by Unknown
140 changed files with 2769 additions and 833 deletions
@@ -623,6 +623,14 @@
build_path = /obj/item/ammo_box/foambox
category = list("initial", "Miscellaneous")
/datum/design/foam_dart_sniper
name = "Box of Sniper Foam Darts"
id = "foam_dart_sniper"
build_type = AUTOLATHE
materials = list(MAT_METAL = 900)
build_path = /obj/item/ammo_box/foambox/sniper
category = list("initial", "Miscellaneous")
//hacked autolathe recipes
/datum/design/flamethrower
name = "Flamethrower"
@@ -728,6 +736,14 @@
build_path = /obj/item/ammo_casing/caseless/foam_dart/riot
category = list("hacked", "Security")
/datum/design/riot_dart_sniper
name = "Foam riot sniper dart"
id = "riot_dart_sniper"
build_type = AUTOLATHE
materials = list(MAT_METAL = 1800) //Discount for making individually - no box = less metal!
build_path = /obj/item/ammo_casing/caseless/foam_dart/sniper/riot
category = list("hacked", "Security")
/datum/design/riot_darts
name = "Foam riot dart box"
id = "riot_darts"
@@ -736,6 +752,14 @@
build_path = /obj/item/ammo_box/foambox/riot
category = list("hacked", "Security")
/datum/design/riot_darts_sniper
name = "Foam riot sniper dart box"
id = "riot_darts_sniper"
build_type = AUTOLATHE
materials = list(MAT_METAL = 90000) //Comes with 40 darts
build_path = /obj/item/ammo_box/foambox/sniper/riot
category = list("hacked", "Security")
/datum/design/a357
name = "Ammo Box (.357)"
id = "a357"
@@ -531,6 +531,16 @@
build_path = /obj/item/organ/internal/heart/cybernetic
category = list("Medical")
/datum/design/cybernetic_heart_u
name = "Upgraded Cybernetic Heart"
desc = "An upgraded cybernetic heart."
id = "cybernetic_heart_u"
req_tech = list("biotech" = 5, "materials" = 5, "engineering" = 5)
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 500, MAT_GLASS = 500, MAT_SILVER = 500)
build_path = /obj/item/organ/internal/heart/cybernetic/upgraded
category = list("Medical")
/datum/design/cybernetic_lungs
name = "Cybernetic Lungs"
desc = "A pair of cybernetic lungs."