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

Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head

Browse Source 
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
This commit is contained in:
Ghom
2019-12-26 16:07:45 +01:00
committed by GitHub
parent 4c6673b651 f3fed71e08
commit 12d0a2ee4c
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/uplink_kits.dm
+7 -1
View File
@@ -390,4 +390,10 @@
new /obj/item/seeds/random(src)
if(prob(50))
new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box
new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box
/obj/item/storage/box/syndie_kit/revolver
/obj/item/storage/box/syndie_kit/revolver/PopulateContents()
new /obj/item/gun/ballistic/revolver(src)
new /obj/item/ammo_box/a357(src)
code/modules/research/techweb/all_nodes.dm
+5 -5
View File
@@ -1095,13 +1095,13 @@
continue
boost_item_paths |= UI.item //allows deconning to unlock.
/datum/techweb_node/advanced_illegl_ballistics
/datum/techweb_node/advanced_illegal_ballistics
id = "advanced_illegal_ballistics"
display_name = "Advanced Illegal Ballistics"
description = "Advanced Ballistic for Illegal weaponds."
design_ids = list("10mm","10mmap","10mminc","10mmhp","pistolm9mm","m45","bolt_clip")
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","pistolm9mm","m45","bolt_clip")
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 form traitors or space.
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns from traitors, space, or anything in between.
export_price = 7000
//Helpers for debugging/balancing the techweb in its entirety!
code/modules/uplink/uplink_items.dm
+3 -3
View File
@@ -357,9 +357,9 @@
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/dangerous/revolver
name = "Syndicate Revolver"
desc = "A brutally simple syndicate revolver that fires .357 Magnum rounds and has 7 chambers."
item = /obj/item/gun/ballistic/revolver
name = "Syndicate Revolver Kit"
desc = "A sleek box containing a brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers, and an extra speedloader."
item = /obj/item/storage/box/syndie_kit/revolver
cost = 13
surplus = 50
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+11 -1
View File
@@ -50,7 +50,7 @@
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m45 //Kinda NT in throey
/datum/design/m45 //Kinda NT in theory
name = "handgun magazine (.45)"
id = "m45"
build_type = PROTOLATHE
@@ -68,3 +68,13 @@
build_path = /obj/item/ammo_box/magazine/pistolm9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/sl357
name = "revolver speedloader (.357)"
desc = "A revolver speedloader."
id = "sl357"
build_type = PROTOLATHE
materials = list(MAT_METAL = 30000)
build_path = /obj/item/ammo_box/a357
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY