Merge pull request #903 from MalricB/punishesarchie

Entering upon horseback into the desert community known as "Agua Fria" located in the southwestern U.S. state known as New Mexico, a territory formerly under the jurisdiction of Spanish colonizers in 1598, was a man whose name, origin, motivations, and goals were unknown to every member of said desert community, on a particular day classified as "fine," indicating favorable weather conditions.
This commit is contained in:
QuoteFox
2021-01-19 23:39:54 +00:00
committed by GitHub
2 changed files with 47 additions and 3 deletions
@@ -157,6 +157,50 @@
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
////////////////////////////////
//MWS 'Big Iron' Specific Ammo//
////////////////////////////////
/datum/design/xray_mws
name = "X-Ray MWS 'Big Iron' Microbattery"
desc = "An high-tech X-Ray Microbattery for the MWS 'Big Iron'."
id = "mws_xray"
build_type = PROTOLATHE
materials = list(MAT_GOLD = 2500, MAT_URANIUM = 2000, MAT_METAL = 2500, MAT_TITANIUM = 1000, MAT_BLUESPACE = 1000)
build_path = /obj/item/ammo_casing/mws_batt/xray
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/ion_mws
name = "Ion MWS 'Big Iron' Microbattery"
desc = "An mid-tech Ion Microbattery for the MWS 'Big Iron'."
id = "mws_ion"
build_type = PROTOLATHE
materials = list(MAT_SILVER = 3000, MAT_METAL = 4000, MAT_URANIUM = 1000)
build_path = /obj/item/ammo_casing/mws_batt/ion
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/disabler_mws
name = "Disabler MWS 'Big Iron' Microbattery"
desc = "An low-tech Disabler Microbattery for the MWS 'Big Iron'."
id = "mws_stun"
build_type = PROTOLATHE
materials = list(MAT_METAL = 7000, MAT_GLASS = 5000, MAT_GOLD = 1250, MAT_SILVER = 1250)
build_path = /obj/item/ammo_casing/mws_batt/stun
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/lethal_mws
name = "Lethal MWS 'Big Iron' Microbattery"
desc = "An low-tech Lethal Microbattery for the MWS 'Big Iron'."
id = "mws_lethal"
build_type = PROTOLATHE
materials = list(MAT_METAL = 7000, MAT_GLASS = 5000, MAT_GOLD = 1250, MAT_SILVER = 1250)
build_path = /obj/item/ammo_casing/mws_batt/lethal
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
//////////////
//Firing Pins/
//////////////
+3 -3
View File
@@ -657,7 +657,7 @@
display_name = "Weapon Development Technology"
description = "Our researchers have found new to weaponize just about everything now."
prereq_ids = list("engineering")
design_ids = list("pin_testing", "tele_shield", "lasercarbine")
design_ids = list("pin_testing", "tele_shield", "lasercarbine", "mws_stun", "mws_lethal")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
export_price = 5000
@@ -675,7 +675,7 @@
display_name = "Electric Weapons"
description = "Weapons using electric technology"
prereq_ids = list("weaponry", "adv_power" , "emp_basic")
design_ids = list("stunrevolver", "stunshell", "ioncarbine")
design_ids = list("stunrevolver", "stunshell", "ioncarbine", "mws_ion")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3500)
export_price = 5000
@@ -702,7 +702,7 @@
display_name = "Beam Weaponry"
description = "Various basic beam weapons"
prereq_ids = list("adv_weaponry")
design_ids = list("temp_gun", "xray_laser")
design_ids = list("temp_gun", "xray_laser", "mws_xray")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000