shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14649 from TheObserver-sys/BulletPass

Browse Source 
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
This commit is contained in:
silicons
2021-04-28 21:17:55 -06:00
committed by GitHub
parent 914a5c7930 87eee1e15e
commit cb0574a560
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/techweb/nodes/syndicate_nodes.dm
+1 -1
View File
@@ -21,7 +21,7 @@
id = "advanced_illegal_ballistics"
display_name = "Advanced Non-Standard Ballistics"
description = "Ballistic ammunition for non-standard firearms. Usually the ones you don't have nor want to be involved with."
design_ids = list("10mm","10mmap","10mminc","10mmhp","sl357","sl357ap","pistolm9mm","m45","bolt_clip")
design_ids = list("10mm","10mmap","10mminc","10mmhp","sl357","sl357ap","pistolm9mm","m45","bolt_clip","m10apbox","m10firebox","m10hpbox")
prereq_ids = list("ballistic_weapons","syndicate_basic","explosive_weapons")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns from traitors, space, or anything in between.
modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+38 -10
View File
@@ -3,10 +3,9 @@
desc = "A gun magazine. Loaded with rounds which ignite the target.."
id = "10mminc"
build_type = PROTOLATHE
materials = list(/datum/material/plasma = 50000, /datum/material/iron = 18000)
reagents_list = list(/datum/reagent/toxin/plasma = 120, /datum/reagent/napalm = 240)
materials = list(/datum/material/plasma = 5000, /datum/material/iron = 7500)
build_path = /obj/item/ammo_box/magazine/m10mm/fire
category = list("Weapons")
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m10mm
@@ -14,7 +13,7 @@
desc = "A gun magazine."
id = "10mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 55000)
materials = list(/datum/material/iron = 6000)
build_path = /obj/item/ammo_box/magazine/m10mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -24,8 +23,7 @@
desc = "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing."
id = "10mmhp"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 40000, /datum/material/glass = 50000)
reagents_list = list(/datum/reagent/sonic_powder = 280)
materials = list(/datum/material/iron = 7500, /datum/material/glass = 5000)
build_path = /obj/item/ammo_box/magazine/m10mm/hp
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -35,7 +33,7 @@
desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
id = "10mmap"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 40000, /datum/material/titanium = 60000)
materials = list(/datum/material/iron = 7500, /datum/material/titanium = 6500)
build_path = /obj/item/ammo_box/magazine/m10mm/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -54,7 +52,7 @@
name = "handgun magazine (.45)"
id = "m45"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 80000)
materials = list(/datum/material/iron = 8000)
build_path = /obj/item/ammo_box/magazine/m45
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -64,7 +62,7 @@
desc = "A gun magazine."
id = "pistolm9mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 80000)
materials = list(/datum/material/iron = 7500)
build_path = /obj/item/ammo_box/magazine/pistolm9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -84,7 +82,37 @@
desc = "A revolver speedloader. Cuts through like a hot knife through butter."
id = "sl357ap"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 45000)
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000)
build_path = /obj/item/ammo_box/a357/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m10apbox
name = "ammo box (10mm Armour Piercing)"
desc = "A box of ammo containing 20 rounds designed to penetrate armor, at the cost of raw damage."
id = "m10apbox"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 6000)
build_path = /obj/item/ammo_box/c10mm/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m10firebox
name = "ammo box (10mm Incendiary)"
desc = "A box of ammo containing 20 rounds designed to set people ablaze, at the cost of raw damage."
id = "m10firebox"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000, /datum/material/plasma = 6000)
build_path = /obj/item/ammo_box/c10mm/fire
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m10hpbox
name = "ammo box (10mm Hollowpoint)"
desc = "A box of ammo containing 20 rounds designed to tear through unarmored opponents, while being completely ineffective against armor."
id = "m10hpbox"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000, /datum/material/glass = 6000)
build_path = /obj/item/ammo_box/c10mm/hp
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY