Adv illegal ballistic Third times the charm? (#7426)
* Adds in a new tec node * Fixes it maybe hopefully? * MESSES WITH E-SHOTGUNS If the blaster shotgun is broke then blame me for this * Perhaps properly adds in the node! * Meh * .dm remove * boop * NULL * Readds the files missed re-adding them on my fork * " " * Wait maybe if I try this it all works It has nothing to do with anything and dose not even show me deleting * Back to square one ... * X to doubt [X] * huh * Look back at the past Look were the error is * Maybe that bolt action gun is messing with things * hmm * I know these two ammos are ok * m45? * m45? * I must be doing this .45 ammo wrong * Update pistol.dm * Lets see * Update all_nodes.dm * Maybe? * m9mm * Lets try that * so its linked correctly * Update pistol.dm * removes some spaces * Revert "Testing code"
This commit is contained in:
Trilbyspaceclone
committed by
kevinz000
kevinz000
parent
4661e26947
commit
42c39d8908
@@ -0,0 +1,70 @@
|
||||
/datum/design/m10mm/fire
|
||||
name = "pistol magazine (10mm incendiary)"
|
||||
desc = "A gun magazine. Loaded with rounds which ignite the target.."
|
||||
id = "10mminc"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_PLASMA = 50000, MAT_METAL = 18000)
|
||||
reagents_list = list("plasma" = 120, "napalm" = 240)
|
||||
build_path = /obj/item/ammo_box/magazine/m10mm/fire
|
||||
category = list("Weapons")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
/datum/design/m10mm
|
||||
name = "pistol magazine (10mm)"
|
||||
desc = "A gun magazine."
|
||||
id = "10mm"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 18000)
|
||||
build_path = /obj/item/ammo_box/magazine/m10mm
|
||||
category = list("Weapons")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
/datum/design/m10mm/hp
|
||||
name = "pistol magazine (10mm HP)"
|
||||
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(MAT_METAL = 18000, MAT_GLASS = 25000)
|
||||
reagents_list = list("sonic_powder" = 280)
|
||||
build_path = /obj/item/ammo_box/magazine/m10mm/hp
|
||||
category = list("Weapons")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
/datum/design/m10mm/ap
|
||||
name = "pistol magazine (10mm AP)"
|
||||
desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
|
||||
id = "10mmap"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 18000, MAT_TITANIUM = 22000)
|
||||
build_path = /obj/item/ammo_box/magazine/m10mm/ap
|
||||
category = list("Weapons")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
/datum/design/bolt_clip
|
||||
name = "Surplus Rifle Clip"
|
||||
desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
|
||||
id = "bolt_clip"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 8000)
|
||||
build_path = /obj/item/ammo_box/a762
|
||||
category = list("Weapons")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
/datum/design/m45 //Kinda NT in throey
|
||||
name = "handgun magazine (.45)"
|
||||
id = "m45"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 8000)
|
||||
build_path = /obj/item/ammo_box/magazine/m45
|
||||
category = list("Weapons")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
/datum/design/pistolm9mm
|
||||
name = "pistol magazine (9mm)"
|
||||
desc = "A gun magazine."
|
||||
id = "pistolm9mm"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 16000)
|
||||
build_path = /obj/item/ammo_box/magazine/pistolm9mm
|
||||
category = list("Weapons")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
/obj/item/gun/energy/pumpaction/emp_act(severity) //makes it not rack itself when emp'd
|
||||
cell.use(round(cell.charge / severity))
|
||||
chambered = null //we empty the chamber
|
||||
chambered = 0 //we empty the chamber
|
||||
update_icon()
|
||||
|
||||
/obj/item/gun/energy/pumpaction/process() //makes it not rack itself when self-charging
|
||||
@@ -37,7 +37,7 @@
|
||||
if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired...
|
||||
var/obj/item/ammo_casing/energy/shot = chambered
|
||||
cell.use(shot.e_cost)//... drain the cell cell
|
||||
chambered = null //either way, released the prepared shot
|
||||
chambered = 0 //either way, released the prepared shot
|
||||
|
||||
/obj/item/gun/energy/pumpaction/select_fire(mob/living/user) //makes it so that it doesn't rack itself when changing firing modes unless already racked
|
||||
select++
|
||||
@@ -49,7 +49,7 @@
|
||||
if (shot.select_name)
|
||||
to_chat(user, "<span class='notice'>[src] is now set to [shot.select_name].</span>")
|
||||
if(chambered)
|
||||
chambered = null
|
||||
chambered = 0
|
||||
recharge_newshot(1)
|
||||
update_icon()
|
||||
if(ismob(loc)) //forces inhands to update
|
||||
|
||||
@@ -25,3 +25,12 @@
|
||||
|
||||
/datum/techweb_node/ballistic_weapons
|
||||
design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "mag_oldsmg_tx")
|
||||
|
||||
/datum/techweb_node/advanced_illegl_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")
|
||||
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.
|
||||
export_price = 7000
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
/datum/techweb_node/bluespace_basic/New()
|
||||
. = ..()
|
||||
design_ids += "xenobio_monkeys"
|
||||
|
||||
/datum/techweb_node/practical_bluespace/New()
|
||||
. = ..()
|
||||
design_ids += "xenobio_slimebasic"
|
||||
|
||||
/datum/techweb_node/adv_bluespace/New()
|
||||
. = ..()
|
||||
design_ids += "xenobio_slimeadv"
|
||||
|
||||
/datum/techweb_node/ballistic_weapons/New()
|
||||
. = ..()
|
||||
design_ids += "mag_oldsmg_rubber"
|
||||
|
||||
/datum/techweb_node/computer_board_gaming
|
||||
id = "computer_board_gaming"
|
||||
display_name = "Games and Toys"
|
||||
description = "For the slackers on the station."
|
||||
prereq_ids = list("comptech")
|
||||
design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
|
||||
export_price = 5000
|
||||
|
||||
/datum/techweb_node/advanced_illegl_ballistics
|
||||
id = "advanced_illegal_ballistics"
|
||||
display_name = "Advanced Illegal Ballistics
|
||||
description = "Advanced Ballistic for Illegal weaponds."
|
||||
design_ids = list("10mm","10mmap","10mminc","10mmhp","9mm","point_45","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.
|
||||
export_price = 7000
|
||||
@@ -2857,6 +2857,7 @@
|
||||
#include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\boxes_magazines\external\smg\smg.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\bullets\bullets\smg.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\boxes_magazines\external\pistol.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\pumpenergy.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\toys.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\ballistic\flechette.dm"
|
||||
|
||||
Reference in New Issue
Block a user