Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

9mm ammo types to protolathe #2481

Merged
merged 18 commits into from
Aug 25, 2023
Merged

9mm ammo types to protolathe #2481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ce78622
9mm ammo depth
BlueHNT Jul 19, 2023
b325cdd
ammobox colours
BlueHNT Jul 19, 2023
0a28663
forgotten comment
BlueHNT Jul 19, 2023
570a1bd
darkens the ap edges
BlueHNT Jul 19, 2023
fd994f7
indentation fix
BlueHNT Jul 19, 2023
09470b8
Update nsv13/code/modules/jobs/security/weapons.dm
BlueHNT Jul 21, 2023
152cef0
Update nsv13/code/modules/jobs/security/weapons.dm
BlueHNT Jul 21, 2023
fca5e7a
Update nsv13/code/modules/jobs/security/weapons.dm
BlueHNT Jul 21, 2023
ef98cd2
Update nsv13/code/modules/jobs/security/weapons.dm
BlueHNT Jul 21, 2023
a677520
Update nsv13/code/modules/jobs/security/weapons.dm
BlueHNT Jul 21, 2023
33993cb
conflict resolve with master
BlueHNT Jul 21, 2023
2ce07ea
Merge branch
BlueHNT Jul 22, 2023
240eaa5
magazine capitalization
BlueHNT Jul 28, 2023
c7b2192
ammobox capitalization fixes
BlueHNT Jul 28, 2023
d7d4fcf
Merge conflict resolve
BlueHNT Aug 11, 2023
7c6d2ca
ammo department proto fixes
BlueHNT Aug 14, 2023
644a137
I can't read
BlueHNT Aug 14, 2023
7361792
Update nsv13/code/modules/jobs/security/weapons.dm
BlueHNT Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/research/techweb/all_nodes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,13 +935,13 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000

/datum/techweb_node/ballistic_weapons
/datum/techweb_node/ballistic_weapons // NSV13 - glock additions
id = "ballistic_weapons"
tech_tier = 3
display_name = "Ballistic Weaponry"
description = "This isn't research.. This is reverse-engineering!"
prereq_ids = list("weaponry")
design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "mag_oldsmg_rubber")
design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "mag_oldsmg_rubber", "glock_lethalmag", "glock_rubbermag", "glock_apmag", "glock_incmag", "glock_lethalammo", "glock_rubberammo", "glock_apammo", "glock_incammo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000

Expand Down
Binary file modified icons/obj/ammo.dmi
View file
Open in desktop
Binary file not shown.
96 changes: 90 additions & 6 deletions nsv13/code/modules/jobs/security/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,24 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
investigate_flags = ADMIN_INVESTIGATE_TARGET

/datum/design/lethal9mm
name = "9mm Ammo Box"
id = "glock_lethalammo"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000)
build_path = /obj/item/ammo_box/c9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/lethalglockmag
name = "Glock Magazine"
id = "glock_lethalmag"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 16500)
build_path = /obj/item/ammo_box/magazine/glock/lethal
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/rubbershot
name = "9mm rubber Glock round"
id = "glock_ammo"
Expand All @@ -110,6 +128,60 @@
build_path = /obj/item/ammo_casing/c9mm/rubber
category = list("initial", "Security")

/datum/design/rubber9mm
name = "9mm Ammo Box (Rubber)"
id = "glock_rubberammo"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 25000)
build_path = /obj/item/ammo_box/c9mm/rubber
category = list("Ammo")
BlueHNT marked this conversation as resolved.
Show resolved Hide resolved
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/glockmag
name = "Glock Magazine (Rubber)"
id = "glock_rubbermag"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 14000)
build_path = /obj/item/ammo_box/magazine/glock
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/ap9mm
name = "9mm Ammo Box (Armour Piercing)"
id = "glock_apammo"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 25000, /datum/material/titanium = 4000, /datum/material/silver = 1000)
build_path = /obj/item/ammo_box/c9mm/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/apglockmag
name = "Glock Magazine (Armour Piercing)"
id = "glock_apmag"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 14000, /datum/material/titanium = 150, /datum/material/silver = 150)
build_path = /obj/item/ammo_box/magazine/glock/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/inc9mm
name = "9mm Ammo box (Incendiary)"
id = "glock_incammo"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 25000, /datum/material/plasma = 4000, /datum/material/glass = 500, /datum/material/gold = 500)
build_path = /obj/item/ammo_box/c9mm/inc
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/incglockmag
name = "Glock Magazine (Incendiary)"
id = "glock_incmag"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 14000, /datum/material/plasma = 150, /datum/material/glass = 50, /datum/material/gold = 50)
build_path = /obj/item/ammo_box/magazine/glock/inc
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/tazer
name = "3mm electro-shock tazer round"
id = "tazer_ammo"
Expand All @@ -134,18 +206,18 @@
caliber = "9mm"
max_ammo = 15

/obj/item/ammo_box/magazine/glock/lethal_ap // unimplemented
name = "pistol magazine (9mm AP)"
/obj/item/ammo_box/magazine/glock/ap
name = "pistol magazine (9mm Armour Piercing)"
desc = "Loaded with titanium tipped bullets that excel in dealing with armored hostile threats onboard or offboard the ship."
icon_state = "Glock-ap"
ammo_type = /obj/item/ammo_casing/c9mm/ap
caliber = "9mm"
max_ammo = 15

/obj/item/ammo_box/magazine/glock/lethal_inc // unimplemented
name = "pistol magazine (9mm incendiary)"
/obj/item/ammo_box/magazine/glock/inc
name = "pistol magazine (9mm Incendiary)"
desc = "Loaded with plasma tipped bullets that excel in setting any living target on fire."
icon_state = "Glock-inci"
icon_state = "Glock-lethal"
ammo_type = /obj/item/ammo_casing/c9mm/inc
caliber = "9mm"
max_ammo = 15
Expand All @@ -154,14 +226,26 @@
..()
icon_state = "[initial(icon_state)][ammo_count() ? "" : "-0"]"

/obj/item/ammo_box/c9mm/ap // for colouring
name = "ammo box (9mm Armour Piercing)"
icon_state = "45box"
ammo_type = /obj/item/ammo_casing/c9mm/ap
max_ammo = 30

/obj/item/ammo_box/c9mm/inc
name = "ammo box (9mm Incendiary)"
icon_state = "10mmbox"
ammo_type = /obj/item/ammo_casing/c9mm/inc
max_ammo = 30

/obj/item/ammo_casing/c9mm/rubber
name = "9mm rubber bullet casing"
desc = "A 9mm rubber bullet casing."
caliber = "9mm"
projectile_type = /obj/item/projectile/bullet/c9mm/rubber

/obj/item/ammo_box/c9mm/rubber
name = "ammo box (9mm, rubber)"
name = "ammo box (9mm Rubber)"
icon_state = "9mmbox"
ammo_type = /obj/item/ammo_casing/c9mm/rubber
max_ammo = 30
Expand Down
Loading