From 7678e98fa08d456e3293e43cc6554367ca3ab51b Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 14 Oct 2024 07:32:21 -0700 Subject: [PATCH] nt expeditionary weapons (#6682) --- citadel.dme | 12 +- code/__DEFINES/projectiles/ammo_casing.dm | 2 +- code/__DEFINES/projectiles/ammo_magazine.dm | 28 ++- code/__DEFINES/projectiles/gun.dm | 28 +++ code/__HELPERS/type_processing.dm | 80 +++---- code/datums/components/items/wielding.dm | 10 + code/datums/outfits/spec_op.dm | 2 +- code/datums/outfits/tournament.dm | 2 +- code/datums/repositories/ammomaterial.dm | 18 -- code/game/antagonist/outsider/deathsquad.dm | 2 +- code/game/atoms/atom.dm | 13 +- code/game/backend/world/world_faction.dm | 2 + .../factions/corporations/corporation.dm | 2 +- .../gorlex/items/guns/phoron_spitter.dm | 2 +- .../hephaestus/hephaestus-faction.dm | 17 ++ .../corporations/hephaestus/items/guns/srp.dm | 28 +++ .../guns/nt_expeditionary-antimaterial.dm | 98 +++++++++ .../guns/nt_expeditionary-heavy_rifle.dm | 161 ++++++++++++++ .../guns/nt_expeditionary-heavy_sidearm.dm | 135 ++++++++++++ .../guns/nt_expeditionary-light_rifle.dm | 201 ++++++++++++++++++ .../guns/nt_expeditionary-light_sidearm.dm | 135 ++++++++++++ .../items/guns/nt_expeditionary-shotgun.dm | 67 ++++++ .../nanotrasen/items/guns/nt_expeditionary.dm | 51 +++++ .../items/guns/{pulse.dm => nt_pulse.dm} | 35 +-- .../nanotrasen/nanotrasen-faction.dm | 3 +- .../nanotrasen/nanotrasen-supply.dm | 2 +- code/game/machinery/_machinery_power.dm | 2 + code/game/machinery/colormate.dm | 1 + code/game/machinery/holopad.dm | 2 + code/game/machinery/telecomms/blackbox.dm | 2 + code/game/objects/items/storage/belt.dm | 2 +- code/game/objects/random/misc.dm | 2 +- code/modules/admin/admin.dm | 41 ---- code/modules/admin/admin_verbs.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/admin/verbs/README.md | 13 ++ code/modules/admin/verbs/debug/spawn.dm | 50 +++++ code/modules/awaymissions/loot_vr.dm | 2 +- code/modules/examine/examine.dm | 29 ++- .../station/admin/centcom_officer.dm | 2 +- .../station/admin/emergency_responder.dm | 2 +- code/modules/mapping/map_level.dm | 2 + .../projectiles/ammunition/ammo_casing.dm | 9 + .../projectiles/ammunition/ammo_magazine.dm | 55 +++-- .../ammunition/calibers/normal/a12g.dm | 10 - .../ammunition/calibers/normal/a357.dm | 5 - .../ammunition/calibers/normal/a44.dm | 2 +- .../ammunition/calibers/normal/a5_7mm.dm | 26 +-- .../ammunition/calibers/normal/a5mm.dm | 4 +- .../ammunition/calibers/normal/a7_92mm.dm | 2 +- .../ammunition/calibers/special/pellet.dm | 2 +- code/modules/projectiles/gun.dm | 24 ++- code/modules/projectiles/gun_item_renderer.dm | 18 +- code/modules/projectiles/gun_mob_renderer.dm | 2 +- code/modules/projectiles/guns/ballistic.dm | 56 ++++- .../guns/ballistic/microbattery/medigun.dm | 2 +- .../microbattery/microbattery-magazine.dm | 1 - .../guns/ballistic/microbattery/revolver.dm | 2 +- .../hephaestus/items/guns/protomag/srp.dmi | Bin 0 -> 468 bytes .../guns/expeditionary/antimaterial-ammo.dmi | Bin 0 -> 1319 bytes .../items/guns/expeditionary/antimaterial.dmi | Bin 0 -> 379 bytes .../guns/expeditionary/rifle-heavy-ammo.dmi | Bin 0 -> 2332 bytes .../items/guns/expeditionary/rifle-heavy.dmi | Bin 0 -> 1305 bytes .../guns/expeditionary/rifle-light-ammo.dmi | Bin 0 -> 1322 bytes .../items/guns/expeditionary/rifle-light.dmi | Bin 0 -> 1566 bytes .../items/guns/expeditionary/shotgun-ammo.dmi | Bin 0 -> 967 bytes .../items/guns/expeditionary/shotgun.dmi | Bin 0 -> 728 bytes .../guns/expeditionary/sidearm-heavy-ammo.dmi | Bin 0 -> 1439 bytes .../guns/expeditionary/sidearm-heavy.dmi | Bin 0 -> 2077 bytes .../guns/expeditionary/sidearm-light-ammo.dmi | Bin 0 -> 1368 bytes .../guns/expeditionary/sidearm-light.dmi | Bin 0 -> 1621 bytes .../items/guns/expeditionary/staging_357.dmi | Bin 0 -> 1005 bytes .../items/guns/expeditionary/staging_38.dmi | Bin 0 -> 900 bytes .../items/guns/expeditionary/staging_44.dmi | Bin 0 -> 705 bytes .../items/guns/expeditionary/staging_45.dmi | Bin 0 -> 2431 bytes .../guns/expeditionary/staging_5_56mm.dmi | Bin 0 -> 785 bytes .../guns/expeditionary/staging_5_7mm.dmi | Bin 0 -> 1845 bytes .../guns/expeditionary/staging_7_62mm.dmi | Bin 0 -> 378 bytes .../items/guns/expeditionary/staging_9mm.dmi | Bin 0 -> 2551 bytes .../items/guns/expeditionary/staging_a12g.dmi | Bin 0 -> 696 bytes .../guns/expeditionary/staging_attachies.dmi | Bin 0 -> 821 bytes .../items/guns/{pulse.dmi => nt_pulse.dmi} | Bin .../casings/modular_cased_unused.dmi | Bin 2409 -> 0 bytes .../magazines/modular_magazine_unused.dmi | Bin 8445 -> 2639 bytes .../magazines/modular_speedloader_unused.dmi | Bin 4200 -> 0 bytes .../magazines/modular_stripper_unused.dmi | Bin 1137 -> 0 bytes maps/away_missions/archive/zresearchlabs.dmm | 2 +- maps/rift/levels/rift-11-orbital.dmm | 12 +- maps/sectors/admin_planets_192/croatoan.dmm | 4 +- maps/templates/admin/dhael_centcom.dmm | 10 +- maps/templates/admin/ert.dmm | 12 +- .../shuttles/overmaps/generic/cruiser.dmm | 8 +- .../shuttles/overmaps/generic/shelter_6.dmm | 8 +- maps/triumph/levels/flagship.dmm | 12 +- maps/victory/levels/flagship.dmm | 12 +- 95 files changed, 1348 insertions(+), 244 deletions(-) create mode 100644 code/__DEFINES/projectiles/gun.dm delete mode 100644 code/datums/repositories/ammomaterial.dm create mode 100644 code/game/content/factions/corporations/hephaestus/hephaestus-faction.dm create mode 100644 code/game/content/factions/corporations/hephaestus/items/guns/srp.dm create mode 100644 code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-antimaterial.dm create mode 100644 code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_rifle.dm create mode 100644 code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_sidearm.dm create mode 100644 code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_rifle.dm create mode 100644 code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_sidearm.dm create mode 100644 code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-shotgun.dm create mode 100644 code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary.dm rename code/game/content/factions/corporations/nanotrasen/items/guns/{pulse.dm => nt_pulse.dm} (82%) create mode 100644 code/modules/admin/verbs/README.md create mode 100644 code/modules/admin/verbs/debug/spawn.dm create mode 100644 icons/content/factions/corporations/hephaestus/items/guns/protomag/srp.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/antimaterial-ammo.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/antimaterial.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy-ammo.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-light-ammo.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-light.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/shotgun-ammo.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/shotgun.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-heavy-ammo.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-heavy.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-light-ammo.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-light.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_357.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_38.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_44.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_45.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_5_56mm.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_5_7mm.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_7_62mm.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_9mm.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_a12g.dmi create mode 100644 icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_attachies.dmi rename icons/content/factions/corporations/nanotrasen/items/guns/{pulse.dmi => nt_pulse.dmi} (100%) delete mode 100644 icons/modules/projectiles/casings/modular_cased_unused.dmi delete mode 100644 icons/modules/projectiles/magazines/modular_speedloader_unused.dmi delete mode 100644 icons/modules/projectiles/magazines/modular_stripper_unused.dmi diff --git a/citadel.dme b/citadel.dme index 6475e2a4977..9071340585f 100644 --- a/citadel.dme +++ b/citadel.dme @@ -299,6 +299,7 @@ #include "code\__DEFINES\procs\update_icon.dm" #include "code\__DEFINES\projectiles\ammo_casing.dm" #include "code\__DEFINES\projectiles\ammo_magazine.dm" +#include "code\__DEFINES\projectiles\gun.dm" #include "code\__DEFINES\projectiles\guns.dm" #include "code\__DEFINES\projectiles\projectile.dm" #include "code\__DEFINES\projectiles\system.dm" @@ -902,7 +903,6 @@ #include "code\datums\recipe\stack_recipes\frame.dm" #include "code\datums\recipe\stack_recipes\misc.dm" #include "code\datums\recipe\stack_recipes\structures.dm" -#include "code\datums\repositories\ammomaterial.dm" #include "code\datums\repositories\cameras.dm" #include "code\datums\repositories\crew.dm" #include "code\datums\repositories\decls.dm" @@ -1069,9 +1069,16 @@ #include "code\game\content\factions\corporations\corporation.dm" #include "code\game\content\factions\corporations\gorlex\items\guns\phoron_spitter.dm" #include "code\game\content\factions\corporations\gorlex\items\guns\wild_hunt.dm" +#include "code\game\content\factions\corporations\hephaestus\hephaestus-faction.dm" #include "code\game\content\factions\corporations\nanotrasen\nanotrasen-faction.dm" #include "code\game\content\factions\corporations\nanotrasen\nanotrasen-supply.dm" -#include "code\game\content\factions\corporations\nanotrasen\items\guns\pulse.dm" +#include "code\game\content\factions\corporations\nanotrasen\items\guns\nt_expeditionary-antimaterial.dm" +#include "code\game\content\factions\corporations\nanotrasen\items\guns\nt_expeditionary-heavy_rifle.dm" +#include "code\game\content\factions\corporations\nanotrasen\items\guns\nt_expeditionary-heavy_sidearm.dm" +#include "code\game\content\factions\corporations\nanotrasen\items\guns\nt_expeditionary-light_rifle.dm" +#include "code\game\content\factions\corporations\nanotrasen\items\guns\nt_expeditionary-light_sidearm.dm" +#include "code\game\content\factions\corporations\nanotrasen\items\guns\nt_expeditionary.dm" +#include "code\game\content\factions\corporations\nanotrasen\items\guns\nt_pulse.dm" #include "code\game\content\factions\corporations\nanotrasen\nanotrasen-supply\animals.dm" #include "code\game\content\factions\corporations\nanotrasen\nanotrasen-supply\atmospherics.dm" #include "code\game\content\factions\corporations\nanotrasen\nanotrasen-supply\contraband.dm" @@ -2191,6 +2198,7 @@ #include "code\modules\admin\verbs\debug\fucky_wucky.dm" #include "code\modules\admin\verbs\debug\profiling.dm" #include "code\modules\admin\verbs\debug\reestablish_db_connection.dm" +#include "code\modules\admin\verbs\debug\spawn.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_wrappers.dm" diff --git a/code/__DEFINES/projectiles/ammo_casing.dm b/code/__DEFINES/projectiles/ammo_casing.dm index 87427678b77..c941f70e08d 100644 --- a/code/__DEFINES/projectiles/ammo_casing.dm +++ b/code/__DEFINES/projectiles/ammo_casing.dm @@ -1,5 +1,5 @@ //* This file is explicitly licensed under the MIT license. *// -//* Copyright (c) 2024 silicons *// +//* Copyright (c) 2024 Citadel Station Developers *// //* /obj/item/ammo_casing casing_flags *// diff --git a/code/__DEFINES/projectiles/ammo_magazine.dm b/code/__DEFINES/projectiles/ammo_magazine.dm index 325ded8564a..a7076bcb841 100644 --- a/code/__DEFINES/projectiles/ammo_magazine.dm +++ b/code/__DEFINES/projectiles/ammo_magazine.dm @@ -1,9 +1,11 @@ //* This file is explicitly licensed under the MIT license. *// -//* Copyright (c) 2024 silicons *// +//* Copyright (c) 2024 Citadel Station Developers *// -//* /obj/item/ammo_magazine magazine_type +//* /obj/item/ammo_magazine - magazine_type *// /// normal magazines +/// +/// * basically, straight or curved 'stick' magazines #define MAGAZINE_TYPE_NORMAL (1<<0) /// revolver-like speedloader #define MAGAZINE_TYPE_SPEEDLOADER (1<<1) @@ -12,6 +14,8 @@ /// loose pouch #define MAGAZINE_TYPE_POUCH (1<<3) /// structured box +/// +/// * this refers to LMG-like box magazine, not what we call just generally normal magazines #define MAGAZINE_TYPE_BOX (1<<3) DEFINE_BITFIELD_NEW(ammo_magazine_types, list( @@ -25,3 +29,23 @@ DEFINE_BITFIELD_NEW(ammo_magazine_types, list( BITFIELD_NEW("Ammo Pouch", MAGAZINE_TYPE_POUCH), BITFIELD_NEW("Ammo Box", MAGAZINE_TYPE_BOX), )) + +//* /obj/item/ammo_magazine - magazine_class *// + +/// renders as -mag +/// +/// * if a magazine's class isn't in a gun's render_magazine_overlay, we use this state +#define MAGAZINE_CLASS_GENERIC (1<<0) +/// renders as -mag-drum +#define MAGAZINE_CLASS_DRUM (1<<1) +/// renders as -mag-ext +#define MAGAZINE_CLASS_EXTENDED (1<<2) +/// renders as -mag-box +#define MAGAZINE_CLASS_BOX (1<<3) + +GLOBAL_REAL_LIST(magazine_class_bit_to_state) = list( + "mag", + "mag-drum", + "mag-ext", + "mag-box", +) diff --git a/code/__DEFINES/projectiles/gun.dm b/code/__DEFINES/projectiles/gun.dm new file mode 100644 index 00000000000..445ac24e243 --- /dev/null +++ b/code/__DEFINES/projectiles/gun.dm @@ -0,0 +1,28 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +//* rendering enums - /obj/item/gun/ballistic *// + +//? render_bolt_overlay + +/// do not render bolt state +#define BALLISTIC_RENDER_BOLT_NEVER 0 +/// render `[base state]-bolt` if open +#define BALLISTIC_RENDER_BOLT_OPEN 1 +/// render `[base state]-bolt` if closed +#define BALLISTIC_RENDER_BOLT_CLOSE 2 +/// * render `[base state]-bolt-open` if open +/// * render `[base state]-bolt-close` if closed +#define BALLISTIC_RENDER_BOLT_BOTH 3 + +//? render_break_overlay + +/// do not render break-action state +#define BALLISTIC_RENDER_BREAK_NEVER 0 +/// render `[base state]-break` if open +#define BALLISTIC_RENDER_BREAK_OPEN 1 +/// render `[base state]-break` if closed +#define BALLISTIC_RENDER_BREAK_CLOSE 2 +/// * render `[base state]-break-open` if open +/// * render `[base state]-break-close` if closed +#define BALLISTIC_RENDER_BREAK_BOTH 3 diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm index 1f277ea5e06..93042d3ea1a 100644 --- a/code/__HELPERS/type_processing.dm +++ b/code/__HELPERS/type_processing.dm @@ -1,54 +1,54 @@ +/** + * todo: rename this + * + * Reformat types to be more readable for admin interfaces. + * + * This is done because BYOND is hell and "input in list" is obnoxious. + */ /proc/make_types_fancy(list/types) if (ispath(types)) types = list(types) . = list() + var/static/list/shortcut_lookup = list( + /obj/effect/debris = "//debris", + /obj/item/radio/headset = "//headset", + /obj/item/reagent_containers/food/drinks = "//drink", + /obj/item/reagent_containers/food = "//food", + /obj/machinery/atmospherics = "//atmos", + /obj/machinery/portable_atmospherics = "//port_atmos", + /obj/item/mecha_parts/mecha_equipment/weapon = "//mech_weapon", + /obj/item/mecha_parts = "//mech_part", + /obj/item/organ = "//organ", + /obj/item/gun/ballistic = "//ballistic", + /obj/item/gun/energy = "//energy", + /obj/item/gun/magnetic = "//magnetic", + /obj/item/gun = "//gun", + /obj/item/ammo_casing = "//ammo", + /obj/item/ammo_magazine = "//magazine", + /obj/item = "//item", + /obj/machinery = "//machine", + /obj/effect = "//effect", + /atom/movable = "//movable", + /turf/simulated/floor = "//floor", + /turf/simulated = "//simulated", + /mob/living/carbon = "//carbon", + /mob/living/simple_mob = "//simple", + /mob/living = "//living", + ) for(var/type in types) - var/typename = "[type]" - var/static/list/TYPES_SHORTCUTS = list( - /obj/effect/debris/cleanable = "CLEANABLE", - /obj/item/radio/headset = "HEADSET", - /obj/item/clothing/head/helmet/space = "SPESSHELMET", - // /obj/item/book/manual = "MANUAL", - // /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first - // /obj/item/reagent_containers/food = "FOOD", - // /obj/item/reagent_containers = "REAGENT_CONTAINERS", - /obj/machinery/atmospherics = "ATMOS_MACH", - /obj/machinery/portable_atmospherics = "PORT_ATMOS", - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK", - /obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP", - /obj/item/organ = "ORGAN", - /obj/item = "ITEM", - /obj/machinery = "MACHINERY", - /obj/effect = "EFFECT", - /obj = "O", - /datum = "D", - // /turf/open = "OPEN", - // /turf/closed = "CLOSED", - /turf = "T", - /mob/living/carbon = "CARBON", - /mob/living/simple_animal = "SIMPLE", - /mob/living = "LIVING", - /mob = "M", - ) - for (var/tn in TYPES_SHORTCUTS) - if (copytext(typename,1, length("[tn]/")+1)=="[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ ) - typename = TYPES_SHORTCUTS[tn]+copytext(typename,length("[tn]/")) + var/shortcut + for(var/prefix in shortcut_lookup) + if(ispath(type, prefix)) + shortcut = "[shortcut_lookup[prefix]][copytext("[type]", length("[prefix]") + 1)]" break - .[typename] = type + .[shortcut || "[type]"] = type /proc/get_fancy_list_of_atom_types() - var/static/list/pre_generated_list - if (!pre_generated_list) //init - pre_generated_list = make_types_fancy(typesof(/atom)) - return pre_generated_list + return make_types_fancy(typesof(/atom)) /proc/get_fancy_list_of_datum_types() - var/static/list/pre_generated_list - if (!pre_generated_list) //init - pre_generated_list = make_types_fancy(sortList(typesof(/datum) - typesof(/atom))) - return pre_generated_list - + return make_types_fancy(typesof(/datum) - typesof(/atom)) /proc/filter_fancy_list(list/L, filter as text) var/list/matches = new diff --git a/code/datums/components/items/wielding.dm b/code/datums/components/items/wielding.dm index 96fc1e4bfe7..881d8828bcf 100644 --- a/code/datums/components/items/wielding.dm +++ b/code/datums/components/items/wielding.dm @@ -108,8 +108,18 @@ //* Item Hooks *// +/** + * Called when wielded via wielding component. + * + * * This is a default hook that's always executed, even if there's a callback provided to the component. + */ /obj/item/proc/on_wield(mob/user, hands) return +/** + * Called when wielded via wielding component. + * + * * This is a default hook that's always executed, even if there's a callback provided to the component. + */ /obj/item/proc/on_unwield(mob/user, hands) return diff --git a/code/datums/outfits/spec_op.dm b/code/datums/outfits/spec_op.dm index cfd6065bb75..f9906f7968f 100644 --- a/code/datums/outfits/spec_op.dm +++ b/code/datums/outfits/spec_op.dm @@ -6,7 +6,7 @@ glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana head = /obj/item/clothing/head/beret //deathsquad - belt = /obj/item/gun/energy/pulse_carbine + belt = /obj/item/gun/energy/nt_pulse/carbine back = /obj/item/storage/backpack/satchel shoes = /obj/item/clothing/shoes/boots/combat gloves = /obj/item/clothing/gloves/combat diff --git a/code/datums/outfits/tournament.dm b/code/datums/outfits/tournament.dm index 25b64c6ebda..f6686d92720 100644 --- a/code/datums/outfits/tournament.dm +++ b/code/datums/outfits/tournament.dm @@ -4,7 +4,7 @@ head = /obj/item/clothing/head/helmet/thunderdome suit = /obj/item/clothing/suit/armor/vest l_hand = /obj/item/material/knife - r_hand = /obj/item/gun/energy/pulse_rifle + r_hand = /obj/item/gun/energy/nt_pulse/rifle r_pocket = /obj/item/grenade/smokebomb shoes = /obj/item/clothing/shoes/black diff --git a/code/datums/repositories/ammomaterial.dm b/code/datums/repositories/ammomaterial.dm deleted file mode 100644 index 30eac92515c..00000000000 --- a/code/datums/repositories/ammomaterial.dm +++ /dev/null @@ -1,18 +0,0 @@ -var/global/datum/repository/ammomaterial/ammo_repository = new() - -/datum/repository/ammomaterial - var/list/ammotypes - -/datum/repository/ammomaterial/New() - ammotypes = list() - ..() - -/datum/repository/ammomaterial/proc/get_materials_from_object(obj/item/ammo_casing/I) - - if(!(I in ammotypes)) - ammotypes += I - var/obj/item/ammo_casing/temp = new I - ammotypes[I] = temp.materials_base - qdel(temp) - - return ammotypes[I] diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm index 26517f96697..1d6df3c2731 100644 --- a/code/game/antagonist/outsider/deathsquad.dm +++ b/code/game/antagonist/outsider/deathsquad.dm @@ -47,7 +47,7 @@ var/datum/antagonist/deathsquad/deathsquad else player.equip_to_slot_or_del(new /obj/item/plastique(player), SLOT_ID_LEFT_POCKET) player.equip_to_slot_or_del(new /obj/item/gun/ballistic/revolver/combat(player), SLOT_ID_BELT) - player.equip_to_slot_or_del(new /obj/item/gun/energy/pulse_rifle(player), /datum/inventory_slot/abstract/hand/right) + player.equip_to_slot_or_del(new /obj/item/gun/energy/nt_pulse/rifle(player), /datum/inventory_slot/abstract/hand/right) player.equip_to_slot_or_del(new /obj/item/hardsuit/ert/assetprotection(player), SLOT_ID_BACK) player.equip_to_slot_or_del(new /obj/item/melee/transforming/energy/sword(player), SLOT_ID_SUIT_STORAGE) // player.implant_loyalty() diff --git a/code/game/atoms/atom.dm b/code/game/atoms/atom.dm index 95403d73eb5..ef97e3bb7a1 100644 --- a/code/game/atoms/atom.dm +++ b/code/game/atoms/atom.dm @@ -25,8 +25,6 @@ var/pass_flags_self = NONE //? Unsorted / Legacy - /// Used for changing icon states for different base sprites. - var/base_icon_state /// Holder for the last time we have been bumped. var/last_bumped = 0 /// The higher the germ level, the more germ on the atom. @@ -151,7 +149,16 @@ /// contamination insulation; null defaults to rad_insulation, this is a multiplier. *never* set higher than 1!! var/rad_stickiness = 1 - //? Shieldcalls + //* Rendering *// + + /// Used for changing icon states for different base sprites. + /// + /// * Not used directly, but it's a frequent pattern to need to override this + /// and we don't want to always force usage of initial(icon_state) + var/base_icon_state + + //* Shieldcalls *// + /// sorted priority list of datums for handling shieldcalls with /// we use this instead of signals so we can enforce priorities /// this is horrifying. diff --git a/code/game/backend/world/world_faction.dm b/code/game/backend/world/world_faction.dm index 9d3ec6b06dc..0455747bfac 100644 --- a/code/game/backend/world/world_faction.dm +++ b/code/game/backend/world/world_faction.dm @@ -11,6 +11,8 @@ /// name var/name = "Unknown Faction" + /// public abbreviation; if null, it doesn't have one + var/abbreviation /// id - must be unique var/id /// short description blurb diff --git a/code/game/content/factions/corporations/corporation.dm b/code/game/content/factions/corporations/corporation.dm index 1296f039089..c52c54d6129 100644 --- a/code/game/content/factions/corporations/corporation.dm +++ b/code/game/content/factions/corporations/corporation.dm @@ -1,5 +1,5 @@ //* This file is explicitly licensed under the MIT license. *// -//* Copyright (c) 2024 silicons *// +//* Copyright (c) 2024 Citadel Station Developers *// /datum/world_faction/corporation abstract_type = /datum/world_faction/corporation diff --git a/code/game/content/factions/corporations/gorlex/items/guns/phoron_spitter.dm b/code/game/content/factions/corporations/gorlex/items/guns/phoron_spitter.dm index 59e33a3e936..066fe6512af 100644 --- a/code/game/content/factions/corporations/gorlex/items/guns/phoron_spitter.dm +++ b/code/game/content/factions/corporations/gorlex/items/guns/phoron_spitter.dm @@ -62,7 +62,7 @@ desc = "A compressed matter container meant for the Gorlex SHRAPNEL-SPITTER SMG. Contains a phoron alloy that self-oxidzes and ignites on contact with air. \n \nThey're in good shape for the shape they're in, \nbut God, I wonder how they think they can win, \nwith phoron rolling down their skin." ammo_max = 40 ammo_caliber = /datum/ammo_caliber/phoron_shrap - ammo_type = /obj/item/ammo_casing/phoron_shrap + ammo_preload = /obj/item/ammo_casing/phoron_shrap icon = 'icons/content/factions/corporations/gorlex/items/guns/phoron_spitter.dmi' icon_state = "mag-1" diff --git a/code/game/content/factions/corporations/hephaestus/hephaestus-faction.dm b/code/game/content/factions/corporations/hephaestus/hephaestus-faction.dm new file mode 100644 index 00000000000..58137ca45fa --- /dev/null +++ b/code/game/content/factions/corporations/hephaestus/hephaestus-faction.dm @@ -0,0 +1,17 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +/datum/world_faction/corporation/hephaestus + name = "Hephaestus Industries" + abbreviation = "HI" + id = "hephaestus" + desc = "Hephaestus Industries, the premiere Trans-Stellar Corporation for, as their name implies, \ + industrial and manufacturing needs - as well as their prestigious lines of synthetics often seen serving \ + on many a Frontier locale. Outside of their affinity towards Nanotrasen and Vey-Med, however, they are still at their core \ + a corporation built on cut-throat industrialism, often providing the supplies and the technologies of war utilized in many Frontier conflicts. \ + Nowadays, Hephaestus continues to be a reliable source of industrial supply, albeit tending to be rather dated at times \ + due to their relative lack of adaptation." + + location_ids = list( + /datum/world_location/frontier::id, + ) diff --git a/code/game/content/factions/corporations/hephaestus/items/guns/srp.dm b/code/game/content/factions/corporations/hephaestus/items/guns/srp.dm new file mode 100644 index 00000000000..e6a65a21bbc --- /dev/null +++ b/code/game/content/factions/corporations/hephaestus/items/guns/srp.dm @@ -0,0 +1,28 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +// todo: while this is all valid code, this file is commented out because the current weapon racking/pumping/chamber charging system is not good enough to support this. + +/** + * * Uses restricted NT-protomag antimaterial caliber. + * * Single-shot. + * * Extremely powerful. Non-acquirable by most means. + * * Synchronous Slide Charging is inbuilt and non-replaceable. + */ +/obj/item/gun/ballistic/magnetic/nt_protomag/srp + name = "anti-material rifle" + desc = "A devastating single-shot rifle. Fires ferromagnetic slugs using a bank of internal supercapacitors." + description_fluff = {" + A monstrously powerful rifle made during the peak of the Phoron War, the Hephaestus Industries + "SRP" anti-material rifle was made to counter the development of personal exosuits as well as the + looming proliferation of heavy combat synthetics. As potent as it is unwieldly, the recoil generated + by this rifle is enough to fracture bone and dent a domestic synthetic's chassis - restricting its + use to the few combat androids sturdy enough to use it in sustained fire. The line was discontinued + by treaty after the War, with few surviving prototypes able to be found here and there around the Frontier. + While technically developed in part with the 'Nanotrasen Protomag' series of prototype mag-charged + weapons, this rifle was ultimately abandoned entirely by Nanotrasen due to the existence of their + existing pulse weapons, given the similar penetration of pulse weapons despite having a fraction + of the recoil. + "} + +#warn impl all diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-antimaterial.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-antimaterial.dm new file mode 100644 index 00000000000..93e8a089596 --- /dev/null +++ b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-antimaterial.dm @@ -0,0 +1,98 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +//* Caliber *// + +/datum/ammo_caliber/nt_expedition/antimaterial + caliber = "nt-antimaterial" + diameter = 12 + length = 92 + +//* Ammo Casings *// + +/obj/item/ammo_casing/nt_expedition/antimaterial + name = "ammo casing (NT-12.5-antimaterial)" + desc = "A standardized 12.5x92mm cartridge for NT Expeditionary kinetics. This one seems ridiculously large, and is probably for a very powerful weapon." + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/antimaterial-ammo.dmi' + icon_state = "basic" + icon_spent = TRUE + caliber = /datum/ammo_caliber/nt_expedition/antimaterial + projectile_type = /obj/projectile/bullet/nt_expedition/antimaterial + + /// specifically for /obj/item/ammo_magazine/nt_expedition/antimaterial's + /// + /// * null to default to "[base_icon_state || initial(icon_state)]" + var/magazine_state + +/obj/item/ammo_casing/nt_expedition/antimaterial/penetrator + icon_state = "penetrator" + // todo: implement casing + magazine + +/obj/item/ammo_casing/nt_expedition/antimaterial/emp + icon_state = "emp" + // todo: implement casing + magazine + +/obj/item/ammo_casing/nt_expedition/antimaterial/explosive + icon_state = "explosive" + // todo: implement casing + magazine + +/obj/item/ammo_casing/nt_expedition/antimaterial/titanium + icon_state = "titanium" + // todo: implement casing + magazine + +//* Magazines *// + +/obj/item/ammo_magazine/nt_expedition/antimaterial + name = "ammo magazine (NT-12.5-antimaterial)" + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/antimaterial-ammo.dmi' + icon_state = "magazine" + base_icon_state = "magazine" + ammo_caliber = /datum/ammo_caliber/nt_expedition/antimaterial + ammo_max = 5 + ammo_preload = /obj/item/ammo_casing/nt_expedition/antimaterial + magazine_type = MAGAZINE_TYPE_NORMAL + +/obj/item/ammo_magazine/nt_expedition/antimaterial/update_icon(updates) + cut_overlays() + . = ..() + var/list/overlays_to_add = list() + for(var/i in 1 to min(5, amount_remaining())) + var/obj/item/ammo_casing/nt_expedition/antimaterial/casted_path_of_potential = peek_path_of_position(i) + var/append = "basic" + if(ispath(casted_path_of_potential, /obj/item/ammo_casing/nt_expedition/antimaterial)) + append = initial(casted_path_of_potential.magazine_state) + var/image/overlay = image(icon, "magazine-[append]") + overlay.pixel_x = (i - 1) * -2 + overlay.pixel_y = (i - 1) * 2 + overlays_to_add += overlay + add_overlay(overlays_to_add) + +//* Projectiles *// + +/obj/projectile/bullet/nt_expedition/antimaterial + name = "antimaterial sabot" + damage_force = 55 + damage_tier = LERP(BULLET_TIER_HIGH, BULLET_TIER_EXTREME, 1) + armor_penetration = 75 + +//* Antimaterial Weapons *// + +/obj/item/gun/ballistic/nt_expedition/antimaterial + abstract_type = /obj/item/gun/ballistic/nt_expedition/antimaterial + caliber = /datum/ammo_caliber/nt_expedition/antimaterial + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/antimaterial.dmi' + +// todo: placeholder sprite +/obj/item/gun/ballistic/nt_expedition/antimaterial/singleshot + name = "anti-material rifle" + desc = "The XNR Mk.11 \"Immobilizer\" anti-material rifle; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + A chemical-propelled knockoff of a prototype Hephaestus Industries anti-armour rifle from the days of the Phoron Wars, + the XNR Mk.11 "Immobilizer" is an accurate, long-range weapon intended for use on lighter mecha. Unfortunately, its performance + suffers against heavier armor due to the limitations of using traditional ammunition in such a 'portable' package. + Regardless, its relative ease of handling (and noted ability to be used by an unaugmented soldier) keeps it in the armories of some + corporate militaries and emergency responders. + "} + "
" + icon_state = "rifle" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC + load_method = SINGLE_CASING | MAGAZINE diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_rifle.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_rifle.dm new file mode 100644 index 00000000000..7195b5283cc --- /dev/null +++ b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_rifle.dm @@ -0,0 +1,161 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +//* Caliber *// + +/datum/ammo_caliber/nt_expedition/heavy_rifle + caliber = "nt-heavy-rifle" + diameter = 7.5 + length = 54 + +//* Ammo Casings *// + +/obj/item/ammo_casing/nt_expedition/heavy_rifle + name = "ammo casing (NT-7.5-LR)" + desc = "A standardized 7.5x54mm cartridge for NT Expeditionary kinetics. This one seems to be for heavy rifles." + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy-ammo.dmi' + icon_state = "basic" + icon_spent = TRUE + caliber = /datum/ammo_caliber/nt_expedition/heavy_rifle + projectile_type = /obj/projectile/bullet/nt_expedition/heavy_rifle + + /// specifically for /obj/item/ammo_magazine/nt_expedition/heavy_rifle's + var/stripper_state = "basic" + +/obj/item/ammo_casing/nt_expedition/heavy_rifle/piercing + icon_state = "piercing" + stripper_state = "piercing" + // todo: implement casing + magazine + +/obj/item/ammo_casing/nt_expedition/heavy_rifle/rubber + icon_state = "rubber" + stripper_state = "rubber" + // todo: implement casing + magazine + +//* Magazines *// + +/obj/item/ammo_magazine/nt_expedition/heavy_rifle + name = "ammo magazine (NT-7.5-LR)" + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy-ammo.dmi' + ammo_caliber = /datum/ammo_caliber/nt_expedition/heavy_rifle + ammo_preload = /obj/item/ammo_casing/nt_expedition/heavy_rifle + +/obj/item/ammo_magazine/nt_expedition/heavy_rifle/stripper_clip + name = "stripper clip (NT-7.5-LR)" + icon_state = "stripper" + base_icon_state = "stripper" + ammo_max = 6 + magazine_type = MAGAZINE_TYPE_CLIP + +/obj/item/ammo_magazine/nt_expedition/heavy_rifle/stripper_clip/update_icon(updates) + cut_overlays() + . = ..() + var/list/overlays_to_add = list() + for(var/i in 1 to min(5, amount_remaining())) + var/obj/item/ammo_casing/nt_expedition/heavy_rifle/casted_path_of_potential = peek_path_of_position(i) + var/append = "basic" + if(ispath(casted_path_of_potential, /obj/item/ammo_casing/nt_expedition/heavy_rifle)) + append = initial(casted_path_of_potential.stripper_state) + var/image/overlay = image(icon, "stripper-[append]") + overlay.pixel_x = (i - 1) * -2 - 8 + overlay.pixel_y = (i - 1) * 2 - 8 + overlays_to_add += overlay + add_overlay(overlays_to_add) + +/obj/item/ammo_magazine/nt_expedition/heavy_rifle/stick + name = "ammo magazine (NT-7.5-LR)" + icon_state = "mag-basic-0" + base_icon_state = "mag-basic" + magazine_type = MAGAZINE_TYPE_NORMAL + ammo_max = 16 + +/obj/item/ammo_magazine/nt_expedition/heavy_rifle/stick/extended + name = "extended magazine (NT-7.5-LR)" + icon_state = "mag-ext-basic-0" + base_icon_state = "mag-ext-basic" + ammo_max = 24 + +/obj/item/ammo_magazine/nt_expedition/heavy_rifle/stick/drum + name = "drum magazine (NT-7.5-LR)" + icon_state = "mag-drum-basic-0" + base_icon_state = "mag-drum-basic" + ammo_max = 40 + +//* Projectiles *// + +/obj/projectile/bullet/nt_expedition/heavy_rifle + name = "heavy rifle bullet" + damage_force = 40 + damage_tier = LERP(BULLET_TIER_MEDIUM, BULLET_TIER_HIGH, 1) + armor_penetration = 50 + +//* Heavy Rifles *// + +/obj/item/gun/ballistic/nt_expedition/heavy_rifle + abstract_type = /obj/item/gun/ballistic/nt_expedition/heavy_rifle + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy.dmi' + caliber = /datum/ammo_caliber/nt_expedition/heavy_rifle + +/obj/item/gun/ballistic/nt_expedition/heavy_rifle/singleshot + name = "marksman rifle" + desc = "The XNR(S) Mk.10 \"Old Man\" marksman rifle; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + A single shot, break action rifle chambered in 7.5x54mm, and sporting a 2x magnified optic, + this is the go-to hunting rifle for long-range patrols. + Light, uncomplicated, and rugged, the “Old Man” has nothing fancy about it. + But, time and again, it works, day in, and day out. + "} + "
" + icon_state = "single" + base_icon_state = "single" + item_renderer = /datum/gun_item_renderer/empty_state + load_method = SINGLE_CASING | SPEEDLOADER + +/obj/item/gun/ballistic/nt_expedition/heavy_rifle/semirifle + name = "heavy rifle" + desc = "The XNR Mk.9 \"Ranger\" heavy rifle; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + Using the Mk.4 “Scout” as a baseline, this semiautomatic rifle is akin to holding a monster, + disguised in the skin of a dearly beloved friend in your hands. + Using full-powered rifle rounds (7.5x54mm), this rifle is broken out when you absolutely + positively have to blow a fist-sized hole in something and don't have time to wait. + A scaled-up version of the Scout, with box magazines, this long gun is often seen issued + to hunters looking to take down game to sustain an expedition. + "} + "
" + icon_state = "semi" + base_icon_state = "semi" + item_renderer = /datum/gun_item_renderer/empty_state + load_method = MAGAZINE | SINGLE_CASING + +/obj/item/gun/ballistic/nt_expedition/heavy_rifle/autorifle + name = "heavy automatic rifle" + desc = "The XNR MK.9 Mod.1 \"Auto Ranger\" heavy rifle; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + “What if we just.. Put a bigger magazine in it and a full auto trigger pack?” is the + question that led to the development of the “Auto Ranger”, at first. + Then, after an 'eventful' initial test, a gyroscopic stabilizer was added below + the handguard and a fixed stock was installed to handle the 'roller coaster' as one test + participant described the experience. Limiting the rifle + to burst fire keeps the rifle on target through most situations. + "} + "
" + icon_state = "auto-map" + base_icon_state = "auto" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC + load_method = MAGAZINE | SINGLE_CASING + +/obj/item/gun/ballistic/nt_expedition/heavy_rifle/lmg + name = "light machine gun" + desc = "The XNR Mk.9 Mod.2 \"Hailmaker\" light machine gun; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + The tests of the Mod.2 design quickly turned development towards a + general purpose machine gun (GPMG) version of the Ranger series, the “Hailmaker.”. + Sporting a frame-mounted cryo-stabilized heavy barrel, a feed tray for quickly reloading + via an assistant gunner, a belt box for 100 rounds of 7.5x54mm, and a gyroscopic assist system, + this weapon is seen in the guard towers of base camps and atop vehicles in addition to + dedicated machine gun teams. The patter this weapon makes as it suppresses any hostile + force makes this weapon's name a logical choice. + "} + "
" + icon_state = "lmg" + load_method = MAGAZINE | SINGLE_CASING + + // todo: rendering; how are we going to render both unloaded and open? + // todo: rendering; maybe expand the render additional to allow for generation of a list? diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_sidearm.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_sidearm.dm new file mode 100644 index 00000000000..964bd72c902 --- /dev/null +++ b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_sidearm.dm @@ -0,0 +1,135 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +//* Caliber *// + +/datum/ammo_caliber/nt_expedition/heavy_sidearm + caliber = "nt-heavy-sidearm" + diameter = 9 + length = 34 + +//* Ammo Casings *// + +/obj/item/ammo_casing/nt_expedition/heavy_sidearm + name = "ammo casing (NT-9-magnum)" + desc = "A standardized 9mm cartridge for NT Expeditionary kinetics. This one seems to be for heavy-duty sidearms." + caliber = /datum/ammo_caliber/nt_expedition/heavy_sidearm + projectile_type = /obj/projectile/bullet/nt_expedition/heavy_sidearm + + /// specifically for /obj/item/ammo_magazine/nt_expedition/heavy_rifle's + var/speedloader_state = "basic" + +/obj/item/ammo_casing/nt_expedition/heavy_sidearm/piercing + icon_state = "piercing" + speedloader_state = "piercing" + // todo: implement casing + magazine + +/obj/item/ammo_casing/nt_expedition/heavy_sidearm/rubber + icon_state = "rubber" + speedloader_state = "rubber" + // todo: implement casing + magazine + +//* Magazines *// + +/obj/item/ammo_magazine/nt_expedition/heavy_sidearm + name = "ammo magazine (NT-9-LR)" + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-heavy-ammo.dmi' + rendering_system = GUN_RENDERING_DISABLED + ammo_caliber = /datum/ammo_caliber/nt_expedition/heavy_sidearm + ammo_max = 5 + ammo_preload = /obj/item/ammo_casing/nt_expedition/heavy_sidearm + +/obj/item/ammo_magazine/nt_expedition/heavy_sidearm/speedloader + name = "speedloader (NT-9-LR)" + icon_state = "speedloader" + base_icon_state = "speedloader" + magazine_type = MAGAZINE_TYPE_SPEEDLOADER + +/obj/item/ammo_magazine/nt_expedition/heavy_sidearm/speedloader/update_icon(updates) + cut_overlays() + . = ..() + var/list/overlays_to_add = list() + for(var/i in 1 to min(4, amount_remaining())) + var/obj/item/ammo_casing/nt_expedition/heavy_sidearm/predicted_path = peek_path_of_position(i) + var/append = "basic" + if(ispath(predicted_path, /obj/item/ammo_casing/nt_expedition/heavy_sidearm)) + append = initial(predicted_path.speedloader_state) + var/image/overlay = image(icon, "speedloader-[append]") + overlay.pixel_x = (i - 1) * 2 - 1 + overlay.pixel_y = (i - 1) * -2 + 1 + overlays_to_add += overlay + add_overlay(overlays_to_add) + +/obj/item/ammo_magazine/nt_expedition/heavy_sidearm/pistol + name = "pistol magazine (NT-9-LR)" + icon_state = "magazine-5" + base_icon_state = "magazine" + rendering_static_overlay = "magazine-stripe" + magazine_type = MAGAZINE_TYPE_NORMAL + +/obj/item/ammo_magazine/nt_expedition/heavy_sidearm/smg + name = "smg magazine (NT-9-LR)" + icon_state = "smg-1" + base_icon_state = "smg" + rendering_static_overlay = "smg-stripe" + magazine_type = MAGAZINE_TYPE_NORMAL + +//* Projectiles *// + +/obj/projectile/bullet/nt_expedition/heavy_sidearm + name = "heavy bullet" + damage_force = 35 + damage_tier = LERP(BULLET_TIER_LOW, BULLET_TIER_MEDIUM, 0.95) + armor_penetration = 20 + +//* Heavy Sidearms *// + +/obj/item/gun/ballistic/nt_expedition/heavy_sidearm + abstract_type = /obj/item/gun/ballistic/nt_expedition/heavy_sidearm + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-heavy.dmi' + caliber = /datum/ammo_caliber/nt_expedition/heavy_sidearm + +/obj/item/gun/ballistic/nt_expedition/heavy_sidearm/pistol + name = "heavy pistol" + desc = "The XNP Mk.2 \"Angry Moth\" sidearm; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + Taking the original XNP Mk.1 to the next level, this time upscaling the frame to accept a + magnum 9x34mm cartridge, the “Angry Moth” sidearm is best described + as “Shaking hands with danger”. The recoil it imparts will make it hard to forget + the experience, but the performance on target leaves little to complain about. + Feeding from medium-sized magazines, this full-sized service pistol is seen when + fighting is expected and not simply a possibility. + "} + "
" + load_method = SINGLE_CASING | MAGAZINE + icon_state = "pistol-map" + base_icon_state = "pistol" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC + +/obj/item/gun/ballistic/nt_expedition/heavy_sidearm/revolver + name = "heavy revolver" + desc = "The XNP Mk.5 \"Roller\" revolver; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + Something of a pet project of one member of the XN design team, the “Roller” harkens back + to the revolvers of old, but chambered in the magnum 9x34mm cartridge. + Sporting a medium-capacity cylinder and an inline barrel design to reduce muzzle flip, + this weapon is seen in the hands of those who prefer style over functionality or want + the fine trigger control a triple-action revolver provides. + "} + "
" + load_method = SINGLE_CASING | SPEEDLOADER + icon_state = "revolver" + +/obj/item/gun/ballistic/nt_expedition/heavy_sidearm/smg + name = "submachine gun" + desc = "The XNMP Mk.8 \"Buzzsaw\" submachine gun; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + Taking design notes from the Mk.3 “Buzzer, the “Buzzsaw” sports a longer barrel, + a thicker receiver, and a folding stock typically seen on rifles. + Using the magnum 9x34mm round in long-form magazines, the “Buzzsaw”'s high rate of fire and + punchy ammunition makes its unique sound hard to mistake when seen clearing rooms or + in dense jungle foliage, where the high-velocity rounds batter aside light cover + with relative ease. + "} + "
" + load_method = SINGLE_CASING | MAGAZINE + icon_state = "smg-map" + base_icon_state = "smg" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_rifle.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_rifle.dm new file mode 100644 index 00000000000..2ae6325af48 --- /dev/null +++ b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_rifle.dm @@ -0,0 +1,201 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +//* Caliber *// + +/datum/ammo_caliber/nt_expedition/light_rifle + caliber = "nt-light-rifle" + diameter = 7.5 + length = 39 + +//* Ammo Casings *// + +/obj/item/ammo_casing/nt_expedition/light_rifle + name = "ammo casing (NT-7.5-SR)" + desc = "A standardized 7.5x39mm cartridge for NT Expeditionary kinetics. This one seems to be for lightweight automatics." + caliber = /datum/ammo_caliber/nt_expedition/light_rifle + projectile_type = /obj/projectile/bullet/nt_expedition/light_rifle + icon_state = "basic" + + /// specifically for /obj/item/ammo_magazine/nt_expedition/light_rifle's + var/speedloader_state = "basic" + +/obj/item/ammo_casing/nt_expedition/light_rifle/piercing + icon_state = "piercing" + speedloader_state = "piercing" + // todo: implement casing + magazine + +/obj/item/ammo_casing/nt_expedition/light_rifle/rubber + icon_state = "rubber" + speedloader_state = "rubber" + // todo: implement casing + magazine + +//* Magazines *// + +/obj/item/ammo_magazine/nt_expedition/light_rifle + name = "ammo magazine (NT-7.5)" + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-light-ammo.dmi' + icon_state = "magazine" + base_icon_state = "magazine" + rendering_system = GUN_RENDERING_DISABLED + ammo_caliber = /datum/ammo_caliber/nt_expedition/light_rifle + ammo_max = 5 + ammo_preload = /obj/item/ammo_casing/nt_expedition/light_rifle + +/obj/item/ammo_magazine/nt_expedition/light_rifle/speedloader + name = "speedloader (NT-7.5)" + icon_state = "speedloader" + base_icon_state = "speedloader" + +/obj/item/ammo_magazine/nt_expedition/light_rifle/speedloader/update_icon(updates) + cut_overlays() + . = ..() + var/list/overlays_to_add = list() + var/static/list/pos_x = list( + 2, + 4, + 6, + 1, + 2, + 4, + ) + var/static/list/pos_y = list( + -2, + -4, + -6, + -1, + -2, + -4 + ) + for(var/i in 1 to min(6, amount_remaining())) + var/obj/item/ammo_casing/nt_expedition/light_rifle/predicted_path = peek_path_of_position(i) + var/append = "basic" + if(ispath(predicted_path, /obj/item/ammo_casing/nt_expedition/light_rifle)) + append = initial(predicted_path.speedloader_state) + var/image/overlay = image(icon, "speedloader-[append]") + overlay.pixel_x = pos_x[i] + overlay.pixel_y = pos_y[i] + overlays_to_add += overlay + add_overlay(overlays_to_add) + +/obj/item/ammo_magazine/nt_expedition/light_rifle/stick + name = "ammo magazine (NT-7.5)" + icon_state = "rifle-1" + base_icon_state = "rifle" + rendering_system = GUN_RENDERING_STATES + rendering_count = 1 + rendering_static_overlay = "rifle-stripe" + ammo_max = 16 + +/obj/item/ammo_magazine/nt_expedition/light_rifle/stick/extended + name = "extended magazine (NT-7.5)" + icon_state = "rifle-ext-1" + base_icon_state = "rifle-ext" + rendering_system = GUN_RENDERING_STATES + rendering_count = 1 + rendering_static_overlay = "rifle-ext-stripe" + ammo_max = 24 + +/obj/item/ammo_magazine/nt_expedition/light_rifle/stick/drum + name = "drum magazine (NT-7.5)" + icon_state = "rifle-drum-1" + base_icon_state = "rifle-drum" + rendering_system = GUN_RENDERING_STATES + rendering_count = 1 + rendering_static_overlay = "rifle-drum-stripe" + ammo_max = 40 + +//* Projectiles *// + +/obj/projectile/bullet/nt_expedition/light_rifle + name = "rifle bullet" + damage_force = 35 + damage_tier = LERP(BULLET_TIER_MEDIUM, BULLET_TIER_HIGH, 0.5) + armor_penetration = 35 + +//* Light Rifles *// + +/obj/item/gun/ballistic/nt_expedition/light_rifle + abstract_type = /obj/item/gun/ballistic/nt_expedition/light_rifle + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-light.dmi' + caliber = /datum/ammo_caliber/nt_expedition/light_rifle + +/obj/item/gun/ballistic/nt_expedition/light_rifle/pistol + name = "high-caliber pistol" + desc = "The XNP Mk.9 \"David\" revolver; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + An oddball of a revolver, the Mark 9 was made as little more than a proof of concept. + Chambering 7.5x39mm light rifle ammunition, the "David" sidearm is capable of consistently, + and accurately (for its uncanny size) punching above its paygrade. + Unfortunately, the downsides of using such a heavy caliber in a sidearm package limits its + practical use. This is nonetheless seen now and then in the hands of enthusiasts. + "} + "
" + load_method = SINGLE_CASING | SPEEDLOADER + icon_state = "revolver" + base_icon_state = "revolver" + render_break_overlay = BALLISTIC_RENDER_BREAK_OPEN + +/obj/item/gun/ballistic/nt_expedition/light_rifle/semirifle + name = "semi-automatic rifle" + desc = "The XNR Mk.4 \"Scout\" light rifle; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + The basis of a new family of carbines developed to make use of 7.5x39mm ammunition, + the “Scout is a traditional pattern of semi-automatic rifle with a mid-length barrel and + adjustable stock, using a short stroke gas piston to cycle the action. + The basic design is fitted with a zero magnification optic and comes packaged with + relatively compact magazines. However, larger magazines will also work with this + workhorse of a weapon. + "} + "
" + load_method = SINGLE_CASING | MAGAZINE + icon_state = "semi-map" + base_icon_state = "semi" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC + +/obj/item/gun/ballistic/nt_expedition/light_rifle/autorifle + name = "automatic rifle" + desc = "The XNR Mk.4 Mod.1 \"Auto Scout\" light rifle; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + The first modification of the Mk.4 carbine, the “Auto Scout” is the next logical step + of the platform by adding an automatic fire control group. Still using the same short-stroke + gas piston and featuring a compensator on the end to help control recoil, + this rifle still sports a zero-magnification optic and adds a short vertical grip as + standard to the forward handguard. Issued with larger magazines to make better use of + the automatic fire this weapon is capable of. + "} + "
" + load_method = SINGLE_CASING | MAGAZINE + icon_state = "auto-map" + base_icon_state = "auto" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC + +/obj/item/gun/ballistic/nt_expedition/light_rifle/pdw + name = "personal defense weapon" + desc = "The XNR Mk.4 Mod.2 \"Little Scout\" personal defense weapon; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + Taking the concept of the original “Scout” and chopping the barrel, this weapon is lighter, + more handy, and easier to carry when you need something more than a pistol, + but a rifle would interfere with other duties. Sticking to the semi-automatic fire + control of the parent, but chopping the barrel and adding the compensator of the Mod.1, + this weapon's ability to fold away helps make it easy to package and + store inside cramped cockpits and into survival kits with its compact magazines. + "} + "
" + load_method = SINGLE_CASING | MAGAZINE + icon_state = "pdw-map" + base_icon_state = "pdw" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC + +/obj/item/gun/ballistic/nt_expedition/light_rifle/lmg + name = "squad automatic weapon" + desc = "The XNR Mk.4 Mod.3 \"Machine Scout\" squad automatic weapon; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + The final entry of the “Scout” series, the “Machine Scout” makes use of a heavier barrel, + a recoil compensating gyro on the bottom of the handguard, + and the option to feed from larger box and drum magazines, this gives a heavy punch to + recon teams and security units while keeping a common set of parts + to reduce the complexities of servicing and maintaining the series as a whole. + "} + "
" + load_method = SINGLE_CASING | MAGAZINE + icon_state = "saw-map" + base_icon_state = "saw" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC + render_bolt_overlay = BALLISTIC_RENDER_BOLT_CLOSE + render_break_overlay = BALLISTIC_RENDER_BREAK_BOTH diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_sidearm.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_sidearm.dm new file mode 100644 index 00000000000..b35e71848a3 --- /dev/null +++ b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_sidearm.dm @@ -0,0 +1,135 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +//* Caliber *// + +/datum/ammo_caliber/nt_expedition/light_sidearm + caliber = "nt-light-sidearm" + diameter = 9 + length = 29 + +//* Ammo Casings *// + +/obj/item/ammo_casing/nt_expedition/light_sidearm + name = "ammo casing (NT-9)" + desc = "A standardized 9mm cartridge for NT Expeditionary kinetics. This one seems to be for lightweight pistols and sidearms." + caliber = /datum/ammo_caliber/nt_expedition/light_sidearm + projectile_type = /obj/projectile/bullet/nt_expedition/light_sidearm + + /// specifically for /obj/item/ammo_magazine/nt_expedition/light_sidearm's + var/speedloader_state = "basic" + +//* Magazines *// + +/obj/item/ammo_magazine/nt_expedition/light_sidearm + name = "ammo magazine (NT-9)" + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy-ammo.dmi' + icon_state = "magazine" + base_icon_state = "magazine" + rendering_system = GUN_RENDERING_DISABLED + ammo_caliber = /datum/ammo_caliber/nt_expedition/light_sidearm + ammo_max = 5 + ammo_preload = /obj/item/ammo_casing/nt_expedition/light_sidearm + +/obj/item/ammo_magazine/nt_expedition/light_sidearm/speedloader + icon_state = "speedloader" + base_icon_state = "speedloader" + ammo_max = 6 + +/obj/item/ammo_magazine/nt_expedition/light_sidearm/speedloader/update_icon(updates) + cut_overlays() + . = ..() + var/list/overlays_to_add = list() + // todo: make this look better, this is the lazy locations. + var/static/list/pos_x = list( + 0, + 1, + 2, + 3, + 4, + 5, + ) + var/static/list/pos_y = list( + -0, + -1, + -2, + -3, + -4, + -5, + ) + for(var/i in 1 to min(6, amount_remaining())) + var/obj/item/ammo_casing/nt_expedition/light_sidearm/predicted_path = peek_path_of_position(i) + var/append = "basic" + if(ispath(predicted_path, /obj/item/ammo_casing/nt_expedition/light_sidearm)) + append = initial(predicted_path.speedloader_state) + var/image/overlay = image(icon, "speedloader-[append]") + overlay.pixel_x = pos_x[i] + overlay.pixel_y = pos_y[i] + overlays_to_add += overlay + add_overlay(overlays_to_add) + +/obj/item/ammo_magazine/nt_expedition/light_sidearm/pistol + name = "pistol magazine (NT-9)" + icon_state = "pistol-5" + base_icon_state = "pistol" + rendering_system = GUN_RENDERING_STATES + rendering_count = 5 + rendering_static_overlay = "pistol-stripe" + ammo_max = 8 + +/obj/item/ammo_magazine/nt_expedition/light_sidearm/smg + icon_state = "smg-1" + base_icon_state = "smg" + rendering_system = GUN_RENDERING_STATES + rendering_count = 1 + rendering_static_overlay = "smg-stripe" + ammo_max = 24 + +//* Projectiles *// + +/obj/projectile/bullet/nt_expedition/light_sidearm + name = "bullet" + damage_force = 35 + damage_tier = LERP(BULLET_TIER_LOW, BULLET_TIER_MEDIUM, 0.25) + armor_penetration = 10 + +//* Light Sidearms *// + +/obj/item/gun/ballistic/nt_expedition/light_sidearm + abstract_type = /obj/item/gun/ballistic/nt_expedition/light_sidearm + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-light.dmi' + caliber = /datum/ammo_caliber/nt_expedition/light_sidearm + +//* Pistol *// + +/obj/item/gun/ballistic/nt_expedition/light_sidearm/pistol + name = "light pistol" + desc = "The XNP Mk.1 \"Noisy Moth\" pistol; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + A hold-out semiautomatic pistol designed to fit in the pocket and with an easy-to-use + system of controls, the “Noisy Moth” is chambered in a lengthened version of the classic 9mm, + packing a little more punch than traditional sidearms in this caliber. + A small compensator and internal recoil dampeners make the increase in felt recoil negligible, + while its magazine gives it enough ammunition for those in a pinch to take chance shots. + "} + "
" + load_method = SINGLE_CASING | MAGAZINE + icon_state = "pistol-map" + base_icon_state = "pistol" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC + +//* SMG *// + +/obj/item/gun/ballistic/nt_expedition/light_sidearm/smg + name = "machine pistol" + desc = "The XNMP Mk.3 \"Buzzer\" machine pistol; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + A personal defense weapon with collapsing stock, the “Buzzer” is chambered in 9x29mm. + A short-barreled weapon easily hung on a belt, and feeding from medium-sized magazines to + keep it handy, the simple “Buzzer” does tend to make more sound and fury than an effective + combat weapon, but it will certainly raise the alarm when its shrill report sounds in + the dead of night. + "} + "
" + load_method = SINGLE_CASING | MAGAZINE + icon_state = "smg-map" + base_icon_state = "smg" + render_magazine_overlay = MAGAZINE_CLASS_GENERIC | MAGAZINE_CLASS_EXTENDED diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-shotgun.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-shotgun.dm new file mode 100644 index 00000000000..2c978f00598 --- /dev/null +++ b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-shotgun.dm @@ -0,0 +1,67 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +// todo: while this is all valid code, this file is commented out because the current weapon racking/pumping/chamber charging system is not good enough to support this. + +//* Ammo *// + +/obj/item/ammo_magazine/a12g/nt_expedition + icon = 'icons/content/factions/corporations/nanotrasen/items/gun/expeditionary/shotgun-ammo.dmi' + + #warn restrict to NT-expeditionary + +/obj/item/ammo_magazine/a12g/nt_expedition/slide + name = "XNS slide magazine (a12g)" + +/obj/item/ammo_magazine/a12g/nt_expedition/box + name = "XNS box magazine (12g)" + + #warn slide-mag 0 to 5, box-mag 0 to 1 + +//* Shotguns *// + +/obj/item/gun/ballistic/nt_expedition/shotgun + icon = 'icons/content/factions/corporations/nanotrasen/items/gun/expeditionary/shotgun.dmi' + caliber = /datum/ammo_caliber/a12g + +//* Pump Shotgun *// + +/** + * * Requires pumping. + * * Break action magazine load or single load. + */ +/obj/item/gun/ballistic/nt_expedition/shotgun/pump + name = "pump shotgun" + desc = "The XNS Mk.6 \"Standby\" pump-action shotgun; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + A pump-action design based on the proven pump-action mechanism developed centuries ago, + the XNS Mk.6 or “Standby” is designed around a tube magazine using 12-gauge ammunition. + Rugged, if not fancy, this weapon is a good fallback option for anyone + requiring access to a long arm when out on their own or in small groups. + "} + "
" + icon_state = "pump" + #warn pump-open + +#warn impl + +//* Semi-Automatic Shotgun *// + +/** + * * Magazine loaded. + * * Semi-automatic. + */ +/obj/item/gun/ballistic/nt_expedition/shotgun/semiauto + name = "semi-automatic shotgun" + desc = "The XNS Mk.7 \"Peacemaker\" semi-automatic shotgun; a refined design output by the Nanotrasen Research Division in conjunction with Hephaestus Industries." + description_fluff = {" + A semiautomatic evolution of the XNS Mk.6, using an internal inertial locking system and + muzzle brake. Big, blocky, and using detachable box magazines of 12-gauge ammunition, + the barrel tends to get quite warm if fired without pause. A common sight seen with + specialist security personnel supporting work crews, the somewhat bulky weapon + lives up to its name in helping deter both hostile animals and bandits from + thinking they can make an easy score. + "} + "
" + icon_state = "semiauto" + #warn semiauto-empty (magout) + +#warn impl diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary.dm new file mode 100644 index 00000000000..2d523d40072 --- /dev/null +++ b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary.dm @@ -0,0 +1,51 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +//* Caliber *// + +/datum/ammo_caliber/nt_expedition + abstract_type = /datum/ammo_caliber/nt_expedition + +//* Ammo Casings *// + +/obj/item/ammo_casing/nt_expedition + description_fluff = {" + A casing for the experimental lineage of chemical-primed kinetic weaponry developed as part of a joint effort + between Hephaestus Industries and the Nanotrasen Research Division. Created both to enhance compatibility as well + as well as to improve security on installations operated by the Triumvirate, the 'NT Expeditionary' line boasts an + above-average reliability rating, as well as being easy to restock out on the Frontier. + "} + caliber = /datum/ammo_caliber/nt_expedition + +//* Magazines *// + +/obj/item/ammo_magazine/nt_expedition + description_fluff = {" + A casing for the experimental lineage of chemical-primed kinetic weaponry developed as part of a joint effort + between Hephaestus Industries and the Nanotrasen Research Division. Created both to enhance compatibility as well + as well as to improve security on installations operated by the Triumvirate, the 'NT Expeditionary' line boasts an + above-average reliability rating, as well as being easy to restock out on the Frontier. + "} + ammo_caliber = /datum/ammo_caliber/nt_expedition + +//* Projectiles *// + +/obj/projectile/bullet/nt_expedition + +//* Weapons *// + +/** + * Naming scheme: + * + * XN Mk. + * + * Where 'T' is type, and 'V' is some version. + * + * e.g. XNS Mk.6 -> T = S for shotgun, prototype 6. + */ +/obj/item/gun/ballistic/nt_expedition + description_fluff_categorizer = {" + This weapon is part of the experimental lineage of chemical-primed kinetic weaponry developed as part of a joint effort between Hephaestus Industries and the Nanotrasen Research Division. Created both to enhance compatibility as well as to improve security on installations operated by the Triumvirate, the 'NT Expeditionary' line boasts an above-average reliability rating + in addition to being rather simple to restock out on the Frontier. + "} + render_use_legacy_by_default = FALSE diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/pulse.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_pulse.dm similarity index 82% rename from code/game/content/factions/corporations/nanotrasen/items/guns/pulse.dm rename to code/game/content/factions/corporations/nanotrasen/items/guns/nt_pulse.dm index 05e2ddf2848..94ce7205f12 100644 --- a/code/game/content/factions/corporations/nanotrasen/items/guns/pulse.dm +++ b/code/game/content/factions/corporations/nanotrasen/items/guns/nt_pulse.dm @@ -1,31 +1,34 @@ //* This file is explicitly licensed under the MIT license. *// -//* Copyright (c) 2024 silicons *// +//* Copyright (c) 2024 Citadel Station Developers *// -/datum/firemode/energy/pulse_rifle +/datum/firemode/energy/nt_pulse/rifle -/datum/firemode/energy/pulse_rifle/laser +/datum/firemode/energy/nt_pulse/rifle/laser name = "laser" render_key = "kill" settings = list(mode_name = "lethal", projectile_type = /obj/projectile/beam, charge_cost = 80) -/datum/firemode/energy/pulse_rifle/pulse +/datum/firemode/energy/nt_pulse/rifle/pulse name = "pulse" render_key = "destroy" settings = list(mode_name = "destroy", projectile_type = /obj/projectile/beam/pulse, charge_cost = 180) -/datum/firemode/energy/pulse_carbine +/datum/firemode/energy/nt_pulse/carbine -/datum/firemode/energy/pulse_carbine/laser +/datum/firemode/energy/nt_pulse/carbine/laser name = "laser" render_key = "kill" settings = list(mode_name = "lethal", projectile_type = /obj/projectile/beam, charge_cost = 120) -/datum/firemode/energy/pulse_carbine/pulse +/datum/firemode/energy/nt_pulse/carbine/pulse name = "pulse" render_key = "destroy" settings = list(mode_name = "destroy", projectile_type = /obj/projectile/beam/pulse, charge_cost = 240) -/obj/item/gun/energy/pulse_rifle +/obj/item/gun/energy/nt_pulse + icon = 'icons/content/factions/corporations/nanotrasen/items/guns/nt_pulse.dmi' + +/obj/item/gun/energy/nt_pulse/rifle name = "pulse rifle" desc = "A powerful energy rifle with multiple intensity selectors." // intentionally the same as all pulse weapons to save memory @@ -34,10 +37,9 @@ allowing for a more laminar and cohesive beam than prior thought possible. Closely guarded designs to this day, pulse weapons are some of the only energy-based armaments able to consistently outperform any kinetic alternative. "} - icon = 'icons/content/factions/corporations/nanotrasen/items/guns/pulse.dmi' icon_state = "rifle" base_icon_state = "rifle" - render_mob_base = "pulse" + base_mob_state = "pulse" slot_flags = SLOT_BACK // todo: firemode this one_handed_penalty = 10 @@ -47,8 +49,8 @@ fire_delay = 5 // might need to nerf this to 8 later, this is a very powerful weapon. firemodes = list( - /datum/firemode/energy/pulse_rifle/laser, - /datum/firemode/energy/pulse_rifle/pulse, + /datum/firemode/energy/nt_pulse/rifle/laser, + /datum/firemode/energy/nt_pulse/rifle/pulse, ) item_renderer = /datum/gun_item_renderer/segments{ @@ -64,7 +66,7 @@ empty_state = TRUE; } -/obj/item/gun/energy/pulse_carbine +/obj/item/gun/energy/nt_pulse/carbine name = "pulse carbine" desc = "A powerful energy carbine with multiple intensity selectors." // intentionally the same as all pulse weapons to save memory @@ -73,17 +75,16 @@ allowing for a more laminar and cohesive beam than prior thought possible. Closely guarded designs to this day, pulse weapons are some of the only energy-based armaments able to consistently outperform any kinetic alternative. "} - icon = 'icons/content/factions/corporations/nanotrasen/items/guns/pulse.dmi' icon_state = "carbine" base_icon_state = "carbine" - render_mob_base = "pulse" + base_mob_state = "pulse" slot_flags = SLOT_BELT // todo: firemode this fire_delay = 5 // might need to nerf this to 8 later, this is a very powerful weapon. firemodes = list( - /datum/firemode/energy/pulse_carbine/laser, - /datum/firemode/energy/pulse_carbine/pulse, + /datum/firemode/energy/nt_pulse/carbine/laser, + /datum/firemode/energy/nt_pulse/carbine/pulse, ) item_renderer = /datum/gun_item_renderer/segments{ diff --git a/code/game/content/factions/corporations/nanotrasen/nanotrasen-faction.dm b/code/game/content/factions/corporations/nanotrasen/nanotrasen-faction.dm index c239008843c..654cf6551be 100644 --- a/code/game/content/factions/corporations/nanotrasen/nanotrasen-faction.dm +++ b/code/game/content/factions/corporations/nanotrasen/nanotrasen-faction.dm @@ -1,8 +1,9 @@ //* This file is explicitly licensed under the MIT license. *// -//* Copyright (c) 2024 silicons *// +//* Copyright (c) 2024 Citadel Station Developers *// /datum/world_faction/corporation/nanotrasen name = "Nanotrasen" + abbreviation = "NT" id = "nanotrasen" desc = "Nanotrasen - one of the great Trans-Stellar Corporations from the 2300s. A logistics and prototyping giant whose \ claim to fame was the industrial synthesis of the Artificial Bluespace Crystal, they are one of the most prestigious \ diff --git a/code/game/content/factions/corporations/nanotrasen/nanotrasen-supply.dm b/code/game/content/factions/corporations/nanotrasen/nanotrasen-supply.dm index a7b7800463e..0153cfa4a82 100644 --- a/code/game/content/factions/corporations/nanotrasen/nanotrasen-supply.dm +++ b/code/game/content/factions/corporations/nanotrasen/nanotrasen-supply.dm @@ -1,5 +1,5 @@ //* This file is explicitly licensed under the MIT license. *// -//* Copyright (c) 2024 silicons *// +//* Copyright (c) 2024 Citadel Station Developers *// // todo: supply system /datum/supply_pack/nanotrasen diff --git a/code/game/machinery/_machinery_power.dm b/code/game/machinery/_machinery_power.dm index c3d0c8b4809..efc4cc9b56f 100644 --- a/code/game/machinery/_machinery_power.dm +++ b/code/game/machinery/_machinery_power.dm @@ -165,5 +165,7 @@ if(power_init_complete && use_power == USE_POWER_ACTIVE) // If this is the channel in use REPORT_POWER_CONSUMPTION_CHANGE(old_power, new_power_usage) + pass() // macro used immediately before being undefined; BYOND bug 2072419 + #undef REPORT_POWER_CONSUMPTION_CHANGE #undef POWER_CONSUMPTION diff --git a/code/game/machinery/colormate.dm b/code/game/machinery/colormate.dm index f27729550e8..725a1d8f763 100644 --- a/code/game/machinery/colormate.dm +++ b/code/game/machinery/colormate.dm @@ -299,6 +299,7 @@ COLORTEST("00FF00", cm) COLORTEST("0000FF", cm) COLORTEST("FFFFFF", cm) + pass() // macro used immediately before being undefined; BYOND bug 2072419 #undef COLORTEST if(passed < minimum_matrix_tests) temp = "Matrix is too dark. (passed [passed] out of [minimum_matrix_tests] required tests. Minimum lightness: [minimum_matrix_lightness])." diff --git a/code/game/machinery/holopad.dm b/code/game/machinery/holopad.dm index 7428f6a2b4a..ab12b2c4607 100644 --- a/code/game/machinery/holopad.dm +++ b/code/game/machinery/holopad.dm @@ -1299,6 +1299,8 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) color = HOLO_NORMAL_COLOR alpha = HOLO_NORMAL_ALPHA + pass() // macro used immediately before being undefined; BYOND bug 2072419 + #undef HOLO_NORMAL_COLOR #undef HOLO_VORE_COLOR #undef HOLO_NORMAL_ALPHA diff --git a/code/game/machinery/telecomms/blackbox.dm b/code/game/machinery/telecomms/blackbox.dm index 4c17bae3307..61e83517e4c 100644 --- a/code/game/machinery/telecomms/blackbox.dm +++ b/code/game/machinery/telecomms/blackbox.dm @@ -1,3 +1,5 @@ +// todo: we need a new feedback system + /datum/feedback_variable var/variable var/value diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 2e9fea68495..bbfa11ec62d 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -571,7 +571,7 @@ /obj/item/gun/energy/lasertag, /obj/item/gun/energy/netgun, /obj/item/gun/energy/phasegun/pistol, - /obj/item/gun/energy/pulse_carbine, + /obj/item/gun/energy/nt_pulse/carbine, /obj/item/gun/energy/retro, /obj/item/gun/energy/service, /obj/item/gun/energy/stunrevolver, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index a7ec6ec77a9..5c059aacb9b 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -846,7 +846,7 @@ prob(3);/obj/item/gun/energy/lasercannon, prob(3);/obj/item/gun/ballistic/shotgun/pump/rifle/lever, prob(3);/obj/item/gun/ballistic/automatic/bullpup, - prob(2);/obj/item/gun/energy/pulse_rifle, + prob(2);/obj/item/gun/energy/nt_pulse/rifle, prob(2);/obj/item/gun/energy/gun/nuclear, prob(2);/obj/item/gun/ballistic/automatic/lmg, prob(2);/obj/item/gun/energy/gun/burst, diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index ba9fde122e5..1a13ff02456 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1087,47 +1087,6 @@ var/datum/legacy_announcement/minor/admin_min_announcer = new new /obj/effect/plant(get_turf(usr), SSplants.seeds[seedtype]) log_admin("[key_name(usr)] spawned [seedtype] vines at ([usr.x],[usr.y],[usr.z])") -/datum/admins/proc/spawn_atom(var/object as text) - set category = "Debug" - set desc = "(atom path) Spawn an atom" - set name = "Spawn" - - if(!check_rights(R_SPAWN)) return - - if(!object) - var/choice = alert(src, "You haven't specified anything to match -- this will lock your game up and take a while! \ - It will also return the entire spawn list.", "WARNING!", "Cancel", "Continue") - if(choice == "Cancel") - return - - var/list/types = typesof(/atom) - var/list/matches = new() - - for(var/path in types) - if(findtext("[path]", object)) - CHECK_TICK - matches += path - - if(matches.len==0) - return - - var/chosen - if(matches.len==1) - chosen = matches[1] - else - chosen = input("Select an atom type", "Spawn Atom", matches[1]) as null|anything in matches - if(!chosen) - return - if(ispath(chosen,/turf)) - var/turf/T = get_turf(usr.loc) - T.ChangeTurf(chosen) - else - new chosen(usr.loc) - - log_and_message_admins("spawned [chosen] at ([usr.x],[usr.y],[usr.z])") - feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - /datum/admins/proc/show_traitor_panel(var/mob/M in GLOB.mob_list) set category = "Admin" set desc = "Edit mobs's memory and role" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index a131ef22fcc..1d9bb69cafb 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -150,7 +150,7 @@ var/list/admin_verbs_spawn = list( /datum/admins/proc/spawn_custom_item, /datum/admins/proc/check_custom_items, /datum/admins/proc/spawn_plant, - /datum/admins/proc/spawn_atom, // Allows us to spawn instances, + /client/proc/spawn_atom, // Allows us to spawn instances, /client/proc/respawn_character, /client/proc/spawn_character_mob, /client/proc/virus2_editor, diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 1ad138f9fae..940978d0e11 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1655,7 +1655,7 @@ else if(!ispath(path, /obj) && !ispath(path, /turf) && !ispath(path, /mob)) removed_paths += dirty_path continue - else if(ispath(path, /obj/item/gun/energy/pulse_rifle)) + else if(ispath(path, /obj/item/gun/energy/nt_pulse/rifle)) if(!check_rights(R_FUN,0)) removed_paths += dirty_path continue diff --git a/code/modules/admin/verbs/README.md b/code/modules/admin/verbs/README.md new file mode 100644 index 00000000000..7b8820e4c2f --- /dev/null +++ b/code/modules/admin/verbs/README.md @@ -0,0 +1,13 @@ +# Admin Verbs + +Admin verbs should only be made for absolute necessity. + +BYOND verbs are bad. Secrets panel entries, and verbs that open full panels are much more preferred. + +Verbs are justified for; + +- right click context menu needs (rejuvenate, select equipment, view variables) +- very common actions (delete, spawn) +- low-level debug backends (sdql, restart controller) + +If in doubt, it shouldn't be a verb. diff --git a/code/modules/admin/verbs/debug/spawn.dm b/code/modules/admin/verbs/debug/spawn.dm new file mode 100644 index 00000000000..e51312de7d8 --- /dev/null +++ b/code/modules/admin/verbs/debug/spawn.dm @@ -0,0 +1,50 @@ +/client/proc/spawn_atom(query as text) + set category = "Debug" + set desc = "(atom path) Spawn an atom" + set name = "Spawn" + + if(!check_rights(R_SPAWN)) + return + + if(length(query) < 5) + var/confirm = alert( + src, + "You haven't specified a long enough filter; this will take a while. Are you sure?", + "Mass Query Confirmation", + "No", + "Yes" + ) + if(confirm != "Yes") + return + + var/list/matches = list() + for(var/path in typesof(/atom)) + if(findtext("[path]", query)) + matches += path + CHECK_TICK + + if(!length(matches)) + to_chat(src, SPAN_WARNING("Type query for '[query]' returned nothing.")) + return + + // todo: special prefix handling like # / ! / similar for fast-pathing? + var/path_to_spawn + if(length(matches) == 1) + path_to_spawn = matches[1] + else + var/list/processed_types = make_types_fancy(matches) + var/picked_name = input("Select an atom type", "Spawn Atom", matches[1]) as null|anything in processed_types + if(!picked_name) + return + path_to_spawn = processed_types[picked_name] + + if(!path_to_spawn) + return + + if(ispath(path_to_spawn, /turf)) + var/turf/T = get_turf(mob) + T.ChangeTurf(path_to_spawn) + else + new path_to_spawn(mob.loc) + + log_and_message_admins("spawned [path_to_spawn] at ([usr.x],[usr.y],[usr.z])") diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index 870815cdae8..95610c0cd7e 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -161,7 +161,7 @@ prob(6);/obj/item/gun/ballistic/automatic/lmg,\ prob(6);/obj/item/gun/energy/lasercannon,\ prob(5);/obj/item/gun/ballistic/automatic/bullpup,\ - prob(5);/obj/item/gun/energy/pulse_rifle,\ + prob(5);/obj/item/gun/energy/nt_pulse/rifle,\ /* prob(4);/obj/item/gun/ballistic/automatic/battlerifle,\ */ prob(3);/obj/item/gun/ballistic/deagle/camo,\ prob(3);/obj/item/gun/energy/gun/nuclear,\ diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm index 1b85b08014f..72868544f8b 100644 --- a/code/modules/examine/examine.dm +++ b/code/modules/examine/examine.dm @@ -9,7 +9,24 @@ /atom/ var/description_info = null //Helpful blue text. - var/description_fluff = null //Green text about the atom's fluff, if any exists. + + /** + * Lore fluff. + * + * todo: rename this maybe, rework examines + * + * * "This snowflake weapon made for my Mary Sue was made by the Nanotrasen Department of Deniable Operations and fires 75x400mm artillery shells out of the barrel with the power of bluespace." + */ + var/description_fluff + /** + * Lore fluff, part 2. + * + * todo: rename this maybe, rework examines + * + * * This is appended at the end of [description_fluff]. Useful for things like "this is part of a group of similar blah blah blah's". + */ + var/description_fluff_categorizer + var/description_antag = null //Malicious red text, for the antags. //Override these if you need special behaviour for a specific type. @@ -19,9 +36,13 @@ return /atom/proc/get_description_fluff() - if(description_fluff) - return description_fluff - return + . = description_fluff + if(description_fluff_categorizer) + if(.) + . += "
" + . += description_fluff_categorizer + else + . = description_fluff_categorizer /atom/proc/get_description_antag() if(description_antag) diff --git a/code/modules/jobs/job_types/station/admin/centcom_officer.dm b/code/modules/jobs/job_types/station/admin/centcom_officer.dm index 188a9bdbd35..77a6e64ec02 100644 --- a/code/modules/jobs/job_types/station/admin/centcom_officer.dm +++ b/code/modules/jobs/job_types/station/admin/centcom_officer.dm @@ -34,6 +34,6 @@ uniform = /obj/item/clothing/under/rank/centcom l_ear = /obj/item/radio/headset/centcom shoes = /obj/item/clothing/shoes/laceup - belt = /obj/item/gun/energy/pulse_carbine + belt = /obj/item/gun/energy/nt_pulse/carbine gloves = /obj/item/clothing/gloves/white head = /obj/item/clothing/head/beret/centcom/officer diff --git a/code/modules/jobs/job_types/station/admin/emergency_responder.dm b/code/modules/jobs/job_types/station/admin/emergency_responder.dm index c3cb7e03bd1..934fdd4e448 100644 --- a/code/modules/jobs/job_types/station/admin/emergency_responder.dm +++ b/code/modules/jobs/job_types/station/admin/emergency_responder.dm @@ -36,7 +36,7 @@ glasses = /obj/item/clothing/glasses/sunglasses back = /obj/item/storage/backpack/satchel - belt = /obj/item/gun/energy/pulse_carbine + belt = /obj/item/gun/energy/nt_pulse/carbine flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /datum/outfit/job/station/emergency_responder/post_equip(var/mob/living/carbon/human/H) diff --git a/code/modules/mapping/map_level.dm b/code/modules/mapping/map_level.dm index 9c8436799c1..13f5cac5c0b 100644 --- a/code/modules/mapping/map_level.dm +++ b/code/modules/mapping/map_level.dm @@ -337,6 +337,8 @@ return RESOLVE(link_above) if(DOWN) return RESOLVE(link_below) + else + pass() // macro used immediately before being undefined; BYOND bug 2072419 #undef RESOLVE /** diff --git a/code/modules/projectiles/ammunition/ammo_casing.dm b/code/modules/projectiles/ammunition/ammo_casing.dm index 05876988e72..2504a9d0503 100644 --- a/code/modules/projectiles/ammunition/ammo_casing.dm +++ b/code/modules/projectiles/ammunition/ammo_casing.dm @@ -148,6 +148,15 @@ RETURN_TYPE(/datum/ammo_caliber) return resolve_caliber(caliber) +//* Render *// + +/** + * makes us look messier, basically + */ +/obj/item/ammo_casing/proc/randomize_offsets_after_eject() + pixel_x = rand(-8, 8) + pixel_y = rand(-8, 8) + //* Generic - Spent Subtype *// /obj/item/ammo_casing/spent diff --git a/code/modules/projectiles/ammunition/ammo_magazine.dm b/code/modules/projectiles/ammunition/ammo_magazine.dm index 9157726edaa..4b6b15da13c 100644 --- a/code/modules/projectiles/ammunition/ammo_magazine.dm +++ b/code/modules/projectiles/ammunition/ammo_magazine.dm @@ -28,6 +28,11 @@ /// /// * this is a bitfield var/magazine_type = MAGAZINE_TYPE_NORMAL + /// the class we ask the gun to render us as + /// + /// * uses MAGAZINE_CLASS_* flags + /// * if our requested class isn't on a gun, the gun reserves the right to render us as the default class ('-mag') + var/magazine_class = MAGAZINE_CLASS_GENERIC //* for magazines /// magazine type - must match gun's to be fitted into it, if gun's is @@ -56,7 +61,7 @@ /// sound for loading a piece of ammo var/load_sound = 'sound/weapons/flipblade.ogg' - //* ammo storage *// + //* Ammo *// /// max ammo in us var/ammo_max = 7 /// currently stored ammo; defaults to ammo_max if unset @@ -76,25 +81,30 @@ /// index 1 is the bottom, index ammo_internal.len is the top of the magazine. /// peek/draw will peek/draw the last index first all the way to the first, and after that, /// ammo_current is considered the 'reserve' pool (as just a number). - var/list/ammo_internal + var/list/obj/item/ammo_casing/ammo_internal /// caliber - set to typepath to init var/ammo_caliber /// preloaded ammo type var/ammo_preload - /// if set, only loads ammo of this type - var/ammo_type + /// if set, only loads ammo matching this restrict value + /// + /// * ammo by default has their typepath as the restrict value + /// * ammo can set strings / enums to this too; make sure to #define them. + var/ammo_restrict /// if set, doesn't allow subtypes - var/ammo_picky = FALSE + var/ammo_restrict_no_subtypes = FALSE /// init all contents on initialize instead of lazy-drawing /// /// * used for things like microbatteries / legacy content var/ammo_legacy_init_everything = FALSE - //* Rendering + //* Rendering *// /// use default rendering system /// in state mode, we will be "[base_icon_state]-[count]", from 0 to count (0 for empty) - /// in segements mode, we will repeatedly add "[base_icon_state]-ammo" with given offsets. - /// overlay mode is not supported + /// in segments mode, we will repeatedly add "[base_icon_state]-ammo" with given offsets. + /// + /// * overlays moade is not supported; + /// todo: in overlays mode, we should be "[base_icon_state]-[count]" from 0 to count, overlaid, while we have ammo var/rendering_system = GUN_RENDERING_DISABLED /// number of states var/rendering_count = 0 @@ -110,9 +120,11 @@ var/rendering_segment_y_offset = 0 /// display special "[base_icon_state]-empty" if count == 0 var/rendering_segment_use_empty = FALSE - /// add a specific overlay as "[base_icon_state]-[state]", useful for denoting different magazines + /// add a specific overlay, useful for denoting different magazines /// that look similar with a stripe var/rendering_static_overlay + /// color the static overlay this way + var/rendering_static_overlay_color /obj/item/ammo_magazine/Initialize(mapload) . = ..() @@ -121,7 +133,10 @@ pixel_y = rand(-5, 5) if(!isnull(rendering_static_overlay)) - add_overlay(rendering_static_overlay, TRUE) + var/image/static_overlay = image(icon, rendering_static_overlay) + if(rendering_static_overlay_color) + static_overlay.color = rendering_static_overlay_color + add_overlay(static_overlay, TRUE) if(ammo_legacy_init_everything) instantiate_internal_list() @@ -132,17 +147,17 @@ /obj/item/ammo_magazine/get_containing_worth(flags) . = ..() - var/obj/item/ammo_casing/ammo_casted = ammo_type + var/obj/item/ammo_casing/ammo_casted = ammo_restrict . += (isnull(ammo_current)? ammo_max : ammo_current) * initial(ammo_casted.worth_intrinsic) /obj/item/ammo_magazine/detect_material_base_costs() . = ..() - if(isnull(ammo_type)) + if(isnull(ammo_restrict)) return var/shell_amount = isnull(ammo_current)? ammo_max : ammo_current if(!shell_amount) return - var/obj/item/ammo_casing/casing = new ammo_type + var/obj/item/ammo_casing/casing = new ammo_restrict if(!istype(casing)) qdel(casing) return @@ -214,7 +229,7 @@ /obj/item/ammo_magazine/proc/why_cant_load_casing(obj/item/ammo_casing/casing) if(!loads_caliber(casing.caliber)) return "mismatched caliber" - if(ammo_type && (ammo_picky ? casing.type != ammo_type : !istype(casing, ammo_type))) + if(ammo_restrict && (ammo_restrict_no_subtypes ? casing.type != ammo_restrict : !istype(casing, ammo_restrict))) return "mismatched ammo" /obj/item/ammo_magazine/on_attack_self(datum/event_args/actor/e_args) @@ -430,6 +445,18 @@ /obj/item/ammo_magazine/proc/amount_missing(live_only) return ammo_max - amount_remaining(live_only) +/** + * Gets the predicted typepath of a casing a given index from the top, where 1 is the top. + * + * * Real casings are read. + * * Fake casings are predicted from the type that would have been lazy-generated. + * * Null if something isn't there / left + */ +/obj/item/ammo_magazine/proc/peek_path_of_position(index) + if(index > length(ammo_internal)) + return (index - length(ammo_internal)) >= ammo_current ? ammo_preload : null + return ammo_internal[length(ammo_internal) - index]?.type + //* Caliber *// /obj/item/ammo_magazine/proc/loads_caliber(datum/ammo_caliber/caliberlike) diff --git a/code/modules/projectiles/ammunition/calibers/normal/a12g.dm b/code/modules/projectiles/ammunition/calibers/normal/a12g.dm index beee4fb9faa..6abe19b937c 100644 --- a/code/modules/projectiles/ammunition/calibers/normal/a12g.dm +++ b/code/modules/projectiles/ammunition/calibers/normal/a12g.dm @@ -201,8 +201,6 @@ ammo_max = 2 rendering_system = GUN_RENDERING_STATES rendering_count = 2 - ammo_picky = TRUE - ammo_type = /obj/item/ammo_casing/a12g magazine_type = MAGAZINE_TYPE_CLIP /obj/item/ammo_magazine/a12g/clip/pellet @@ -211,7 +209,6 @@ base_icon_state = "a12-buck" desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with buckshot." ammo_preload = /obj/item/ammo_casing/a12g/pellet - ammo_type = /obj/item/ammo_casing/a12g/pellet /obj/item/ammo_magazine/a12g/clip/beanbag name = "ammo clip (12g beanbag)" @@ -219,7 +216,6 @@ base_icon_state = "a12-bean" desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with beanbags." ammo_preload = /obj/item/ammo_casing/a12g/beanbag - ammo_type = /obj/item/ammo_casing/a12g/beanbag /obj/item/ammo_magazine/a12g/clip/silver name = "ammo clip (12g buckshot)" @@ -227,7 +223,6 @@ base_icon_state = "a12-silver" desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with silver buckshot." ammo_preload = /obj/item/ammo_casing/a12g/silver - ammo_type = /obj/item/ammo_casing/a12g/silver //* Magazines - Pouches @@ -262,28 +257,23 @@ name = "shotgun slug holder (slug)" marking_color = PIPE_COLOR_BLACK ammo_preload = /obj/item/ammo_casing/a12g - ammo_type = /obj/item/ammo_casing/a12g /obj/item/ammo_magazine/a12g/pouch/full/flare name = "shotgun slug holder (flare)" marking_color = COLOR_RED_GRAY ammo_preload = /obj/item/ammo_casing/a12g/flare - ammo_type = /obj/item/ammo_casing/a12g/flare /obj/item/ammo_magazine/a12g/pouch/full/buckshot name = "shotgun slug holder (buckshot)" marking_color = COLOR_RED ammo_preload = /obj/item/ammo_casing/a12g/pellet - ammo_type = /obj/item/ammo_casing/a12g/pellet /obj/item/ammo_magazine/a12g/pouch/full/beanbag name = "shotgun slug holder (beanbag)" marking_color = COLOR_GREEN ammo_preload = /obj/item/ammo_casing/a12g/beanbag - ammo_type = /obj/item/ammo_casing/a12g/beanbag /obj/item/ammo_magazine/a12g/pouch/full/stun name = "shotgun slug holder (stun)" marking_color = PIPE_COLOR_YELLOW ammo_preload = /obj/item/ammo_casing/a12g/stunshell - ammo_type = /obj/item/ammo_casing/a12g/stunshell diff --git a/code/modules/projectiles/ammunition/calibers/normal/a357.dm b/code/modules/projectiles/ammunition/calibers/normal/a357.dm index 220bee919dc..d5d28f7e651 100644 --- a/code/modules/projectiles/ammunition/calibers/normal/a357.dm +++ b/code/modules/projectiles/ammunition/calibers/normal/a357.dm @@ -49,7 +49,6 @@ base_icon_state = "normal" ammo_caliber = /datum/ammo_caliber/a357 ammo_preload = /obj/item/ammo_casing/a357 - ammo_type = /obj/item/ammo_casing/a357 magazine_type = MAGAZINE_TYPE_SPEEDLOADER ammo_max = 6 materials_base = list(MAT_STEEL = 500) @@ -59,7 +58,6 @@ icon_state = "holy-6" base_icon_state = "holy" ammo_preload = /obj/item/ammo_casing/a357/silver - ammo_type = /obj/item/ammo_casing/a357/silver /obj/item/ammo_magazine/a357/speedloader/stun name = "speedloader (.357 stun)" @@ -67,7 +65,6 @@ icon_state = "redtip-6" base_icon_state = "redtip" ammo_preload = /obj/item/ammo_casing/a357/stun - ammo_type = /obj/item/ammo_casing/a357/stun /obj/item/ammo_magazine/a357/speedloader/rubber name = "speedloader (.357 rubber)" @@ -75,7 +72,6 @@ icon_state = "bluetip-6" base_icon_state = "bluetip" ammo_preload = /obj/item/ammo_casing/a357/rubber - ammo_type = /obj/item/ammo_casing/a357/rubber /obj/item/ammo_magazine/a357/speedloader/flash name = "speedloader (.357 flash)" @@ -83,4 +79,3 @@ icon_state = "white-6" base_icon_state = "white" ammo_preload = /obj/item/ammo_casing/a357/flash - ammo_type = /obj/item/ammo_casing/a357/flash diff --git a/code/modules/projectiles/ammunition/calibers/normal/a44.dm b/code/modules/projectiles/ammunition/calibers/normal/a44.dm index d39ac8c73fa..f5e67cb5204 100644 --- a/code/modules/projectiles/ammunition/calibers/normal/a44.dm +++ b/code/modules/projectiles/ammunition/calibers/normal/a44.dm @@ -46,7 +46,7 @@ /obj/item/ammo_magazine/a44/rubber desc = "A magazine for .44 less-than-lethal ammo." - ammo_type = /obj/item/ammo_casing/a44/rubber + ammo_preload = /obj/item/ammo_casing/a44/rubber /obj/item/ammo_magazine/a44/clip name = "ammo clip (.44)" diff --git a/code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm b/code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm index ad7e3d66914..035935c2c86 100644 --- a/code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm +++ b/code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm @@ -47,17 +47,17 @@ /obj/item/ammo_magazine/a5_7mm/nt_les/ap name = "magazine (5.7x28mm armor piercing)" - rendering_static_overlay = "ap" + rendering_static_overlay = "ntles-ap" ammo_preload = /obj/item/ammo_casing/a5_7mm/ap /obj/item/ammo_magazine/a5_7mm/nt_les/hp name = "magazine (5.7x28mm hollow-point)" - rendering_static_overlay = "hp" + rendering_static_overlay = "ntles-hp" ammo_preload = /obj/item/ammo_casing/a5_7mm/hp /obj/item/ammo_magazine/a5_7mm/nt_les/hunter name = "magazine (5.7x28mm hunter)" - rendering_static_overlay = "hunter" + rendering_static_overlay = "ntles-hunter" ammo_preload = /obj/item/ammo_casing/a5_7mm/hunter /obj/item/ammo_magazine/a5_7mm/nt_les/empty @@ -71,16 +71,16 @@ /obj/item/ammo_magazine/a5_7mm/nt_les/highcap/ap name = "high capacity magazine (5.7x28mm armor piercing)" - rendering_static_overlay = "ap" + rendering_static_overlay = "ntles-high-ap" ammo_preload = /obj/item/ammo_casing/a5_7mm/ap /obj/item/ammo_magazine/a5_7mm/nt_les/highcap/hp name = "high capacity magazine (5.7x28mm hollow-point)" - rendering_static_overlay = "hp" + rendering_static_overlay = "ntles-high-hp" ammo_preload = /obj/item/ammo_casing/a5_7mm/hp /obj/item/ammo_magazine/a5_7mm/nt_les/highcap/hunter name = "high capacity magazine (5.7x28mm hunter)" - rendering_static_overlay = "hunter" + rendering_static_overlay = "ntles-high-hunter" ammo_preload = /obj/item/ammo_casing/a5_7mm/hunter /obj/item/ammo_magazine/a5_7mm/nt_les/highcap/empty @@ -99,7 +99,7 @@ /obj/item/ammo_magazine/a5_7mm/harpy_smg/ap name = "NT-SMG-8 magazine (5.7x28mm armor piercing)" - rendering_static_overlay = "ap" + rendering_static_overlay = "harpy-ap" ammo_preload = /obj/item/ammo_casing/a5_7mm/ap //Fiveseven mags @@ -118,17 +118,17 @@ /obj/item/ammo_magazine/a5_7mm/five_seven/ap name = "magazine (5.7x28mm armor piercing)" - rendering_static_overlay = "ap" + rendering_static_overlay = "fiveseven-ap" ammo_preload = /obj/item/ammo_casing/a5_7mm/ap /obj/item/ammo_magazine/a5_7mm/five_seven/hp name = "magazine (5.7x28mm hollow-point)" - rendering_static_overlay = "hp" + rendering_static_overlay = "fiveseven-hp" ammo_preload = /obj/item/ammo_casing/a5_7mm/hp /obj/item/ammo_magazine/a5_7mm/five_seven/hunter name = "magazine (5.7x28mm hunter)" - rendering_static_overlay = "hunter" + rendering_static_overlay = "fiveseven-hunter" ammo_preload = /obj/item/ammo_casing/a5_7mm/hunter /obj/item/ammo_magazine/a5_7mm/five_seven/empty @@ -143,16 +143,16 @@ /obj/item/ammo_magazine/a5_7mm/five_seven/highcap/ap name = "high capacity magazine (5.7x28mm armor piercing)" - rendering_static_overlay = "ap" + rendering_static_overlay = "fiveseven-high-ap" ammo_preload = /obj/item/ammo_casing/a5_7mm/ap /obj/item/ammo_magazine/a5_7mm/five_seven/highcap/hp name = "high capacity magazine (5.7x28mm hollow-point)" - rendering_static_overlay = "hp" + rendering_static_overlay = "fiveseven-high-hp" ammo_preload = /obj/item/ammo_casing/a5_7mm/hp /obj/item/ammo_magazine/a5_7mm/five_seven/highcap/hunter name = "high capacity magazine (5.7x28mm hunter)" - rendering_static_overlay = "hunter" + rendering_static_overlay = "fiveseven-high-hunter" ammo_preload = /obj/item/ammo_casing/a5_7mm/hunter /obj/item/ammo_magazine/a5_7mm/five_seven/highcap/empty diff --git a/code/modules/projectiles/ammunition/calibers/normal/a5mm.dm b/code/modules/projectiles/ammunition/calibers/normal/a5mm.dm index cea1f86a8c8..b51c935c13b 100644 --- a/code/modules/projectiles/ammunition/calibers/normal/a5mm.dm +++ b/code/modules/projectiles/ammunition/calibers/normal/a5mm.dm @@ -8,7 +8,7 @@ name = "prototype rifle magazine (5mm caseless)" icon_state = "caseless-mag-0" base_icon_state = "caseless-mag" - ammo_type = /obj/item/ammo_casing/a5mmcaseless + ammo_preload = /obj/item/ammo_casing/a5mmcaseless ammo_caliber = /datum/ammo_caliber/a5mm ammo_max = 30 rendering_system = GUN_RENDERING_STATES @@ -17,7 +17,7 @@ /obj/item/ammo_magazine/m5mmcaseless/stun icon_state = "caseless-mag-alt-0" base_icon_state = "caseless-mag-alt" - ammo_type = /obj/item/ammo_casing/a5mmcaseless/stun + ammo_preload = /obj/item/ammo_casing/a5mmcaseless/stun //* Ammunition *// diff --git a/code/modules/projectiles/ammunition/calibers/normal/a7_92mm.dm b/code/modules/projectiles/ammunition/calibers/normal/a7_92mm.dm index 5852f37ff6e..eac3c579cbe 100644 --- a/code/modules/projectiles/ammunition/calibers/normal/a7_92mm.dm +++ b/code/modules/projectiles/ammunition/calibers/normal/a7_92mm.dm @@ -8,7 +8,7 @@ icon_state = "stg" ammo_caliber = /datum/ammo_caliber/a7_92mm - ammo_type = /obj/item/ammo_casing/a792 + ammo_preload = /obj/item/ammo_casing/a792 ammo_max = 30 /obj/item/ammo_magazine/a7_92mm/empty diff --git a/code/modules/projectiles/ammunition/calibers/special/pellet.dm b/code/modules/projectiles/ammunition/calibers/special/pellet.dm index 56c074bbcf9..b0e3df75fc8 100644 --- a/code/modules/projectiles/ammunition/calibers/special/pellet.dm +++ b/code/modules/projectiles/ammunition/calibers/special/pellet.dm @@ -28,7 +28,7 @@ rendering_count = 1 ammo_caliber = /datum/ammo_caliber/pellet - ammo_type = /obj/item/ammo_casing/p_pellet + ammo_preload = /obj/item/ammo_casing/p_pellet magazine_type = MAGAZINE_TYPE_BOX materials_base = list( /datum/material/steel::id = 100, diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 6d865d55804..ed75a96ada7 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -130,7 +130,11 @@ var/unstable = 0 var/destroyed = 0 - //* Rendering + //* Rendering *// + + /// Used instead of base_icon_state for the mob renderer, if this exists. + var/base_mob_state + /// renderer datum we use for world rendering of the gun item itself /// set this in prototype to a path /// if null, we will not perform default rendering/updating of item states. @@ -149,25 +153,26 @@ var/datum/gun_mob_renderer/mob_renderer /// for de-duping var/static/list/mob_renderer_store = list() - /// base onmob state override so we don't use [base_icon_state] if overridden - // todo: impl - var/render_mob_base - /// render as -wield if we're wielded? applied at the end of our worn state no matter what + + /// render as -wield if we're wielded? applied at the end of our base worn state no matter what + /// + /// todo: impl /// /// * ignores [mob_renderer] /// * ignores [render_additional_exclusive] / [render_additional_worn] - // todo: impl + /// * ordering: [base]-wield-[additional]-[...rest] var/render_mob_wielded = FALSE /// state to add as an append /// /// * segment and overlay renders add [base_icon_state]-[append] - /// * state renders set state to [base_icon_state]-[append]-[...rest] + /// * state renders set state to [base_icon_state]-[wield?]-[append]-[...rest] var/render_additional_state /// only render [render_additional_state] var/render_additional_exclusive = FALSE /// [render_additional_state] and [render_additional_exclusive] apply to worn sprites // todo: impl var/render_additional_worn = FALSE + /// use the old render system, if item_renderer and mob_renderer are not set // todo: remove var/render_use_legacy_by_default = TRUE @@ -879,6 +884,8 @@ // PENDING FIREMODE REWORK /obj/item/gun/proc/legacy_get_firemode() + if(!length(firemodes) || (sel_mode > length(firemodes))) + return return firemodes[sel_mode] //* Ammo *// @@ -896,7 +903,8 @@ //* Rendering *// /obj/item/gun/update_icon(updates) - if(!item_renderer && !mob_renderer) + // todo: shouldn't need this check, deal with legacy + if(!item_renderer && !mob_renderer && render_use_legacy_by_default) return ..() cut_overlays() var/ratio_left = get_ammo_ratio() diff --git a/code/modules/projectiles/gun_item_renderer.dm b/code/modules/projectiles/gun_item_renderer.dm index d7b57cc5415..a2cd3a4715f 100644 --- a/code/modules/projectiles/gun_item_renderer.dm +++ b/code/modules/projectiles/gun_item_renderer.dm @@ -60,7 +60,7 @@ return var/x = initial_x var/y = initial_y - var/append = "[use_firemode && firemode_key && "-[firemode_key]"]" + var/append = "[use_firemode && firemode_key ? "-[firemode_key]" : ""]" for(var/i in 1 to ceil(count * ammo_ratio)) var/image/creating = image(gun.icon, "[base_icon_state][append]-ammo", null, null, x, y) x += offset_x @@ -132,7 +132,7 @@ return if(!ammo_ratio) if(use_empty) - gun.icon_state = "[base_icon_state][firemode_key && use_firemode_empty && "-[firemode_key]"]-empty" + gun.icon_state = "[base_icon_state][firemode_key && use_firemode_empty ? "-[firemode_key]" : ""]-empty" else gun.icon_state = base_icon_state return @@ -146,3 +146,17 @@ */ /datum/gun_item_renderer/states/all_or_nothing count = 1 + +/** + * just swaps icon state to "-empty" + * + * * can optionally append a firemode key + */ +/datum/gun_item_renderer/empty_state + +/datum/gun_item_renderer/empty_state/render(obj/item/gun/gun, ammo_ratio, firemode_key) + var/base_icon_state = gun.base_icon_state || initial(gun.icon_state) + gun.icon_state = "[base_icon_state][firemode_key && use_firemode ? "-[firemode_key]" : ""][ammo_ratio ? "" : "-empty"]" + +/datum/gun_item_renderer/empty_state/dedupe_key() + return "empty_state-[use_firemode]" diff --git a/code/modules/projectiles/gun_mob_renderer.dm b/code/modules/projectiles/gun_mob_renderer.dm index 5bbce3dc96b..cbcba9de9b6 100644 --- a/code/modules/projectiles/gun_mob_renderer.dm +++ b/code/modules/projectiles/gun_mob_renderer.dm @@ -43,7 +43,7 @@ /datum/gun_mob_renderer/states/render(obj/item/gun/gun, ammo_ratio, firemode_key) // todo: do we really need to always return TRUE and force an update? - var/base_icon_state = gun.render_mob_base || gun.base_icon_state || initial(gun.icon_state) + var/base_icon_state = gun.base_mob_state || gun.base_icon_state || initial(gun.icon_state) if(!ammo_ratio) if(empty_state) gun.inhand_state = "[base_icon_state][firemode_key && use_firemode && "-[firemode_key]"]-empty" diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 9fc3cd85399..8ba4989426f 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -17,6 +17,32 @@ /// If set, accepts ammo and magazines of this caliber. var/caliber = /datum/ammo_caliber/a357 + //* Rendering *// + + /// Render an overlay when magazine is in. + /// + /// todo: mob renderer integration + /// + /// * This uses MAGAZINE_CLASS_* defines + /// * We'll look for a matching class that we support to render + /// * If we can't find one, we'll use any class that we have on ourselves + var/render_magazine_overlay = NONE + /// Render the chamber state. + /// + /// todo: mob renderer integration + /// todo: this is not supported yet + /// + /// * uses BALLISTIC_RENDER_BOLT_* enms + var/render_bolt_overlay = BALLISTIC_RENDER_BOLT_NEVER + /// Render the state of a gun that's 'break action' + /// + /// todo: mob renderer integration + /// todo: this is not supported yet + /// + /// * uses BALLISTIC_RENDER_BREAK_* enums + /// * This is also used for LMGs, and any other gun requiring this stuff. + var/render_break_overlay = BALLISTIC_RENDER_BREAK_NEVER + //! LEGACY BELOW var/handle_casings = EJECT_CASINGS //determines how spent casings should be handled @@ -111,7 +137,8 @@ qdel(chambered) return else - chambered.loc = get_turf(src) + chambered.forceMove(get_turf(src)) + chambered.randomize_offsets_after_eject() playsound(src.loc, "casing", 50, 1) if(CYCLE_CASINGS) //cycle the casing back to the end. if(ammo_magazine) @@ -366,3 +393,30 @@ var/datum/ammo_caliber/ours = resolve_caliber(caliber) var/datum/ammo_caliber/theirs = resolve_caliber(caliberlike) return ours.equivalent(theirs) + +//* Rendering *// + +/** + * Returns an overlay for a magazine. This can be a string, or anything else that goes into our 'overlays' list. + */ +/obj/item/gun/ballistic/proc/get_magazine_overlay_for(obj/item/ammo_magazine/magazine) + var/effective_magazine_class = magazine.magazine_class + if(!(effective_magazine_class & render_magazine_overlay)) + if(render_magazine_overlay & MAGAZINE_CLASS_GENERIC) + effective_magazine_class = MAGAZINE_CLASS_GENERIC + else + return + return global.magazine_class_bit_to_state[log(2, magazine.magazine_class) + 1] + +/obj/item/gun/ballistic/update_icon() + // todo: shouldn't need this check, deal with legacy + if(!item_renderer && !mob_renderer && render_use_legacy_by_default) + return ..() + . = ..() + // todo: render_break_overlay + // todo: render_bolt_overlay + if(render_magazine_overlay) + if(ammo_magazine) + var/overlay = get_magazine_overlay_for(ammo_magazine) + if(overlay) + add_overlay(overlay) diff --git a/code/modules/projectiles/guns/ballistic/microbattery/medigun.dm b/code/modules/projectiles/guns/ballistic/microbattery/medigun.dm index e0c51d4bf7d..83030d8233f 100644 --- a/code/modules/projectiles/guns/ballistic/microbattery/medigun.dm +++ b/code/modules/projectiles/guns/ballistic/microbattery/medigun.dm @@ -26,7 +26,7 @@ desc = "A nanite fabrication magazine for the \'AML'" catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med) description_info = "This magazine holds self-charging nanite fabricators to power the AML 'Medigun'. Up to three can be loaded at once, and each provides four shots of their respective healing type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger." - ammo_type = /obj/item/ammo_casing/microbattery/medical + ammo_restrict = /obj/item/ammo_casing/microbattery/medical icon_state = "ml3m_mag" origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3) diff --git a/code/modules/projectiles/guns/ballistic/microbattery/microbattery-magazine.dm b/code/modules/projectiles/guns/ballistic/microbattery/microbattery-magazine.dm index dbcb829cd3c..b7b7cf9b27c 100644 --- a/code/modules/projectiles/guns/ballistic/microbattery/microbattery-magazine.dm +++ b/code/modules/projectiles/guns/ballistic/microbattery/microbattery-magazine.dm @@ -7,7 +7,6 @@ icon_state = "cell_mag" origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_MAGNETS = 3) ammo_caliber = /datum/ammo_caliber/microbattery - ammo_type = /obj/item/ammo_casing/microbattery ammo_max = 3 ammo_current = 0 ammo_legacy_init_everything = TRUE diff --git a/code/modules/projectiles/guns/ballistic/microbattery/revolver.dm b/code/modules/projectiles/guns/ballistic/microbattery/revolver.dm index 7ecdbf4d0f7..de5e78196b5 100644 --- a/code/modules/projectiles/guns/ballistic/microbattery/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/microbattery/revolver.dm @@ -31,7 +31,7 @@ x_offset = 4 catalogue_data = null//list(/datum/category_item/catalogue/information/organization/nanotrasen) description_info = "This magazine holds Hydra microbatteries to power the Hydra handgun. Up to three can be loaded at once, and each provides four shots of their respective energy type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger." - ammo_type = /obj/item/ammo_casing/microbattery/combat + ammo_restrict = /obj/item/ammo_casing/microbattery/combat /obj/item/ammo_magazine/microbattery/combat/prototype name = "prototype microbattery magazine" diff --git a/icons/content/factions/corporations/hephaestus/items/guns/protomag/srp.dmi b/icons/content/factions/corporations/hephaestus/items/guns/protomag/srp.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3e7ef8869411dc0b995e35412cec5e0af8f67821 GIT binary patch literal 468 zcmV;_0W1EAP)QUlSKs5fx8QSg*Laii(PLcYbLV86YDq7aJgskC?;F&6Ap$au*wHY-~_f zWNmG2kdTmb7aW5cA5&9PK0!hj78Z?_p+QGX&;nvY00001bW%=J06^y0W&i*HXL?jv zbVOxyV{&P5bZKvH004NLQ&wnP9K#7YpC9|j)$TQ^POe;#vO@*+P6` z#jmW$0002HNklD6sQcRo74IJ@3~eanVa72(l7ia=cJqhz{&qH z#+1{6enF8C%DPhk4WevxAzAIGvJ|gs=W2yKdGCW0DwP?tqp4%ODj|iGQY$kWFkG@( zY;1-s3HBy*Aouq71!^!nf{r1Cc4(~wmlHgDg)(amqQQ1mrxDPMYtjfX5hF8d1LDao z@M>UuMVNRoY`dSw^)Ly)27tL#(2cpg%J&yYmhFG+JoJ%tBD?{+83&iASuC0001KP)t-sz`($a zOfEDyJuFWNIAn`-DJAivL{?U2A0H=#oKAwm*djV;&}C1_WPjAr-X5mN@_%XXlhxd%L7OnGo$JxV51@j!J0W^@6WNZ`#HN=_E@H7rbh?0aP zHNI37oN^S-FG?%YBpQ6CRB}m{$S?U4aV0zXMIFD}0v2ig27E=)!IRSXA5N}5SYkhr zi>fK7=l=op=H?&!8ECWs00WyzL_t(|ob8)kTca=(ghfbqp;QEuRMcwQ|NkR5p&ySQ zoSBrAx)+%XE_Ql&hqzCgbCkQgq$ELEc7KojJjZ@f6!88^;reW``12R>%M$uURaHyG zuWMMJEmo`S0r8tAe?%j@cWn2UP$p=TUA%T1XI@E(Bn5!2z$RL0C#EkXa zcb}NGp8HI(^+`!dx7V}Nukvwwegl4%Jk$5Y0el08{ND4y0e13qQ-#`8v4-WjE z@FV5}GxKwDf7ZW8^UD%HKk47&*S~Dw{DAcD*ZBFP`2p+S`(gV-d@?^6wm&pKVEudV zwm+F4Fh8(te!%+o-fe#}{~GfH)*rj=7x1q!KVbba=3irez=Zkp&kvH4l9K*2(f)mI zKIw07z{mZ2e*-@5-{(va*1wM?*t}nZPx{+)13AY3h)+QKcX@uWd4G>j5YWF%^8?4< zL?;O9-^b?%p1+Ar5ZJ$u9v?mYE;2!2|2{rH*j$!CP3KGf!$k>H{WC#q|9(*d|Cd}p zGDY$)OVFur0kr@1dK^DEfjVD4@vZ5)E|UK_!3OZ_ZscEG|L#^Ll7C9zw*>H^G5*j! zE2XB*556bBd`Uim^!s%-Klqkl5+C=sY<}=H!8AVZZ`u6dOM;1ftYH3Z`fYwvQc_Y< zQc_aVt(6lWy~X8~5r510B~Gw}?~(a8wQz#%jwJAJav{HJTbRJVDTe&reoqoKIbMQx ziI-rN;U(B_L4f>x8Q1cB8CQ0`jB9(o2>h~cx=x2)+^tZb`^xg6kAM@Sv6QA*u dl9G~ctbf9Ss$w1$ofiNA002ovPDHLkV1kp1nGpa0 literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/antimaterial.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/antimaterial.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b5ffd3b25dae3dacf22e46d3181faff7b38fa8e5 GIT binary patch literal 379 zcmV->0fhdEP)fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3KBSC^Ic5Rf&r;C9|j)$T#HTOe;#vO@**gRq5s?rsGnntl;YB0(JlZxkM%}$V%u1 z0001*Nkl2nG<%=hC~$8r%;M3P3`mfSUD31c0G+_J0WgHf*I99q<=YhdF>+a6mZ= zFnI!2d!9Wm^8+@y0LGk^@eTlni}5+p&IjpZ;sWh_SI~qDw1b`;KADZdqsrg{e4~@* Z9d>h_4v|qmk2e4S002ovPDHLkV1oarmCpbG literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy-ammo.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy-ammo.dmi new file mode 100644 index 0000000000000000000000000000000000000000..24d41475107550a5bde9d9570c83a852c4249cf6 GIT binary patch literal 2332 zcmXw52~-kT7Y5wGG|h4;GnZ0pCYQ{a#8J^S%T%D!taOxeZE(ajHw46#%oLa0asl%% zn`$&tTLuBcNn2DjGc*_UuMu}tL_`vX>i^HV_q+GLd*8Xsd+(f=i-aH7RNtiz001<- zPI#PF$ce8ER#Kpq@YaArP>?=;$J*Q5Z}?az9x#u0+09>brA{4q!n%}uZkMM-h z_{*`0moYH_KuUFK87)4`R@(!;s=JGB5&F3$#%?Vvr~(g2P}N0w>cqLg42IS3w{Yt! zpC&(j8t|wzq(P8yfLz|ZZW=1eC{&Y3XxoR~k2F>pr<*@6NF0I6A2r6?<6~yu%+7g+ z<^OyIr*B5Dyl*Ktx_7GN`D~ppG2%Yj&MSJCg|}}om3oqxM;JQAN30sN%S*aviPCqI204;|{Dh=B}Jz4SFQyx+dJ9nRK=7!&`0|2Nld3m_`rBpA} zTugpeY9k6Oyh3oz#bn8Rl?2|o#aye$C((9gR_hNcz492oi4DCW_m2{8z6tlhO zQ7D6)iw3ODScj`FUON42oZeolalYs6g#--_rwcrZvE>iuB?yNVY#^NS*O<1G!t0okgOik%`vT#PgV;mj+ zgx!!H(de-KPB)@%bPXXInhtAOb@F}0jxWa0WsJ|!!L_F4nCrqjTSgga&v5zCdKU_g zyXS#^VvX06RT#&6=9Z78O{F29!}?(pbXp4p_tfP=Ani7TQ>RyP=DA(e&`1Um5X5pWN# z$^U40qLi@?X_Yee?DJa`rxhVvd3h8hoj2!pwA1^Wi*}U-vz`o}hfc>!V4TRW7ehh& zgwVBsmJOu4G|#nVIkR5_R+X~3d~5uLC8tMo=I!Hy(;V}`u5`}?3!ZKbXHyxon=%dY zT$^kTTu0p&22#g5jpT*DOkj(Bj1sfoN+j5+bstLTJ6Vrak>L)45YsTAtTNGtZ_!cN zA;vgsIb52;_pD)z**gE(?y=Skt(ABE_ykYCxb;*RXB5zH^vLZm&sIi7ZBxHKm5=s= z&;JyK_Vf9MCmEj83temRF%=5D^enlW#`xBOq6ts67Af6VbD@0e25ZlszrC8&PpvIS zi8nUKram^06yX@bO`V}XTx?AyT-EPh6iJ`=MDU;8Rl0<~XQ~umE8xDfPv|3?#LL#! z@;>oK3Yad$+j_;g z{J)gfPrjD$Q2C1&L0@ebb1Ep7DMq(=A^k}O!F0+4u8A|gmkXJe2o=`IAtApleE?Y} zX;xTSf|S5@x0JwrE8kC2fvjsS_&jG^pnF=JTrd60+IXhUN$JxeT!6dU%@1d285znf z*$hx+Gcej1G>&IjZvW<;vpHm4w_#d+N;l4%a!U6Qzsh|*`(a@fhtW?i6jPNj|G263 zO0>0;KHJ2CJGl1BE?D3CX5Kid>2iCsw#5W?eb@DNQd1pRp{OUtaUJ_-c$cJBC5TbhF)`h$*HWM`jW+ZB{{Pa< z`o*C9odRQCU_V)qZ3N!(=-H>rF0tzJ7Q4DgY3uZ6QD3v@%shm7+I1-MrPW&#Jo_LB9A&9$q}Ik$Mf3~KIMk@v2FD1V3lAe zZj&=b{)bh|5<)1LrcCi(av^RkJBgsBz-9n+Hv zfUb(I+SCW!1~@>Gh^{=waN+16Hx2oUZc;Nw1xO)uk>?;^-@ml+>{oIh4~>~*;q_C# emY?#gOv!Fl^Uq8`;6ue90^oHF?$LM@Mf?}EZKhWM literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a5098c560946aaa29f5681e050b55c05ffece7ce GIT binary patch literal 1305 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 literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-light.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-light.dmi new file mode 100644 index 0000000000000000000000000000000000000000..78eb4491263817a9d9efb99d3b117db32dc74b1a GIT binary patch literal 1566 zcmV+(2I2XMP)004jp0{{R3ySY;0^aI6Vv! z5@2C!V=-0C=30)3FYMFc1ddxqXTT<{D8~7XvX2 z@($IW&Y2l)6lz~EwfZg%lDJ!qLlwTI4- z5NXK`#+O_myfF?H?XrU-W)V&i+}*Y)AFcI3;||nI+5!4MI4$16WZUrG$#6~o#ZysK z`SOQ8@O1I|!kV*I000D)NklGu~>hbz;0hr{{*79eVaLek(6@-2I^s`D-PNFEz9!^H~GE4 z%chgFzUPnX2gk+JeazAWhUzh( z!pl%e)izElBWUJFe(3n1aEkhR#@*=Z(FaM57pbTAnji48!v^nhm*KOLy80eE*`Q|x zAg>6OTu(Pi8&%dS-%-HfF7NNLfFv4Y-m^Ja-#x?d0yw>y4o?GyAKF(x*{`W@{}xZN z=M2psc}bmh|5hxJ_1t&&`-ra7M`vKMSS%Kc#bU9(STTOL2;aL!F@86b@7wG#9yHt4UH6ARFsU3{f8$9|BK7L33 z=jZ3flotr!OBJ-`lefh>#|H zPNTp9pR)s0f`;7LdltJat=~4r>5Hy@o`!r*gSL@x1~^n2&@~VX&$A8Koj9j2y88L* z@x5t6(GGC#0l2P1ojm>m0ZDf16mWdCRCqhm8LG=JlnZwG{HA^pZ7vt3eD_<83Khrv zMZ~0y#bU8o|E_X)dUS-aa#-mH^Hytr7tYrnkUMy*G7fm7GS8C5_3%N@b1;Pu{>FKj zkNe6w%b0(Y#(dBjVEenBMPVtI&tE)Xk~E;u0)uu&OW%6F5XB?%*=3KVrf-w)=JtJ@ z!Tl39WYE$%fMdWfrMz=OP&gQP9{%NB8Ckp+^S@rP#e1t>+{a?ESgiT_1Nx3v!d>|^ QCIA2c07*qoM6N<$f{2_83jhEB literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/shotgun-ammo.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/shotgun-ammo.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b92a4ffde967af1a88891a1e2384a441160dd95a GIT binary patch literal 967 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 literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-heavy.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-heavy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3a33ab4067d55b5f29c8e866b82dd72bdf94e49b GIT binary patch literal 2077 zcma)-dpOe#8^?bWjb+Fji%~g+oYmgxF+9jA7IR#l5{3*zYLh32oKni+aVTpdg%BcQ zX+#JQIdpKYRok-0G>w_Vqw9MAc;Ek?KkoZ`egC-c>%Ol0`rP+5wCf2dWFG_o0H~vb zt^1Ci{T1T7cQU>B5@JUv@fe>Aw!yK1F=2!YVNsC)KqMCoHA1@8<B4{JDeY_5Tz~O+qv;TA&ih3h-{75Sjc6vA~#Vh{|G-o~B`ClbBR1MfUpe zhXmUJ-9v=X6lW4vX+38isyX#aR0ZioIYm0oKgJ)xjCm+D;+?yQko;pqHR#W}w1t@$ zixTGSt*%YOnU_X;cKWKROkR!*4z=I_02t|LYmFh2IppndScppB{3YjMN^k8+zq{7h zDj&!b!-XmO`3L(0Kez_;b2HHBWyP>>Zz52Ui76UJ$SiD^4eRXHgF|&J>859AYTG$r z?Z5EI8)Fe#9YGOO&iQ7oYV=sfpk^Cm?06BMWKE23qb5+8q^C7SGCqEvWIVT7 zuVFGk1f4EnrK|-67XyF&pE1_&oW%07`b;0O{=?@xRW1gGi{0n6D%Ev{(-Oe04P6%W z@lz6|qlAaup+a*p?#(qhO}H39NI4QdpH>Dkh^2OYvKqf>?_U75+;c$x8*&08$Ckd& z87WD5e#kQTOwAss6nJWC8XW~|sDJyQFpWF19#?Q_X>QEZx9MIhY9JzUP8>}?wHC4& z8Xh&SzuB}^TlVfFL48eM6wn;>tH2~GMbH>>JrYOzon`so!-n*pW*R(r^N|2pjhg5? zvRH`r7Pt}U!FsoYu+4p2nn0Zui!$)Ld)wj!uDs{|Gve}bZ!Q3PGRHA&hs024AyM+D zX#S$W#N<8zXbe@#wNqZ=tDZ=Rlh5F{R;f98?NUtNjabTbd#xWHA>o(JFH!*kMnpmT z*hGxWEQJ~^A;ew+fcW^!6Of?YhOMKxpx>tJ!y&S^mF*EQd0U0xwcb8N-P0v|_Quc1 z#Mj`)^||qWj2hq-d0JP`=g6-?NYXO4+VGLnyK=nL0NEeuOP7GRVJM-=O_TP>mu7;1 zg~}AY%2nZ9wV*6C9&{9mhm=dgl1yBH0V9x3x9GipV?1I-$Q|bOGEJDsYVdspfm7f6 zBb|N;+<1|q!2y<0(vN*hs>_F4X_f zo13@}ajA@5j~N~3Ut{ga$4Msj@Mb!DA82lGY2Ks&kRjhr$hWRp8rN9e#Xr^6vRZ|j^VK-owNiczjkt-UBkO62~C3&su_E>AYNL5}qv`9l@qnx~@@0e0UGHlTKys+xQ&AuhSBIjv(#TwM_X>4wu zoouKEI)?gPr+AS?nS%rUv0|`o>JHOWji!Tnztx}07~=G=APQfFJ7^UxjPb%Sj2ssOMY82Uo#NkXc1xgd0vf#R ztVWFqI~ONc#C#iOSdi0&eO3FlRKwBN`=LVOh5*oO48~VaXBB)f>FtG#@Ys84mALE@9nXcTm74n!fz8OUEO2 zTlz!jzen-E#F}e&+7C(_ZSa1+?X5!1v)owT$QOr2&k8_VNngQeToVIa+$(P_`J_5k z()t3}9+4wD=G!-!k*r^W~XM!<% z3e~KX3)RpEZuoTTeHz*R!gIS?Q&V%&tHxZuutLC57`%DD*H9Z(Mn9C)f|@_qTCXK5 z@rO(*Mn|bRBbt6_2|y>`>exW)&=R} zoxFsF?yW0uqp0%quqBW^B5ngA7@xQ+jeoNj?Oe=Yv;Kzs?};1QhUZe{(LuSEJO3VV Mv~#t6Y;!i{A9-cnV*mgE literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-light-ammo.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-light-ammo.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c8e54349ef9b7d0212bb6caba99bf7e9e3b0774f GIT binary patch literal 1368 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 GU)o<0DCl

zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=E(pc$L!IgGahGs&TBLlba@MT z2Z`p0PMNa9BG{qwrs5n?L=ai_1_KsgWHFo@{Dq>`C+@|UNYs(U#{mj;$ zE{-7;bKcI(_YMw}Ile#rt=!(vufoiD1VtPY3)Lskpp6{Zz}YysR0+$0=y8>A8$fPy-b1;rm%8(RLnv*Fi- za(iacyU$tjv|G>DSFjea_Rl*PnR8~&)<=9rD>yEgoXsilFSq8gZJzh8jA!NEXBRJC z-GAhujd;ZeBlx5EDY2A*!ITozr?h=D_7iOR#p(;*l@O|uWy^1hOeH6Z)^0Q zwOy4A4OcEOtz5{;TlDZm{AW#>l~(pbK~Rgz(I|MX>76Uv?$GBfBuS7&gzUY>h>XTJD}w`ql%C9-qP z=RNQ(k`vc!Gx(m=#%Qqo(9!MhW#``ithV6|pK(h6MDvB095=kt5$JQ_jo+N}OnU0% zih}p=HgYHKp3>WJCr@lYhI@P1F)v+Z&AB`y;#PceOPbM5LJ zovPmv`}T)VX1>qzzx+tij3@@vLkwArS2&ngum&jeED&?(UE06M-BCkCskZK}dxJp( z78PK@()@fd&x-GvobIv4*lkXk{rq|SUzc8Z^Zs~1JXhxJO>+(hu}pb)UVZzz8G;u~ zS0n+IXO?bTc8n=HI{B&u%gX&6H(xPrwfZC;{QW&6x}y>9yt0>ZKchqI` zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=E(pc$L!IgGahGs&TBLlba@MT z2Z`p0PMNa9BG{qwrs5n?L=ai_1_KsgWHFo@{Dq>`C+@|UNYs(U#{Y;lU zT^vIy=DeNd?JXTB(KbKXRKj<~kt2C5v0_VHC-4MqIBQm~$g#C#C2M^{^mVSaOO={h zC-{mloiZsjyCCpXL|4FyM~l`f?R8y!bVY8Kb?lLklUnDVJgTqu{H9OZ4CCjv{`-ti z#)N21T{LawWIlynF$Gx%DP0Gv29v0U5{Aqz3@;fjWiVc1T(Yu~@#|5Oy4_pSZq8pH zlNWyUcwzg`w2Mq1%zkpeyI;!6b7x=j!HW;tm9%+W!#K|HM=am2!&~zIst^10`F*st3BLB(q3-|d*Y_E2+`Oy(W5%i( z)=pOogmk=WF$C-5owp5@kfH7!E3!$oP)-|IE3V85ZM z=@kpeI2>IpeeK4L=KprwHD6B`Y?&{zZau5dpFuZ=LYgGNJV6Rj`4C6QHsH<)Jq^4k|sDF&x)Go|rP*za{ PW-A6yS3j3^P6 zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=E(pc$L!IgGahGs&TBLlba@MT z2Z`p0PMNa9BG{qwrs5n?L$4Vn0tl(>LAjm8x2K$?aPi@S*To@Rb_&r@5 zLn`LHopsQQDNv&I{9dj{hs0bjE^_rYcjRGtThrsvw1`9g(DMvUk&gEl&h-lJ;AAb- ze6mWQOH8Qu`?d`e1GQeAE9HCgztMpC+?>bH?H@nr$ugTAk!rG=L0a&D-T^n34cr?9 z8Q(DFxG+G4(w?%W#G2dKS#G~r^mo^?KUX~M|N9FE=uOYH*%QuxVKqC4(R8yDF}Ld8 zUir7DJw@l)bG!ZfcJ%E3l+74evE6>lv)Z2a*~TJf-_zG0jFq1HiuKy<(-Sw$kgxqQ z=QEFg;k`d!U)JUQ-NyVz?%v~V%p&}grg}||_jg!)F@Rx1_?+5)F(b&&kT1s7Qf&YS|@$0=HJC< zpZo1j?|3qOTlBUqcZ>EJzpY8v*uBlHb6T(AuctqMuAFc-&+={0jQ2I=7Cg=wYtx07 zOu1EXSKRpiPk{?j{f}N>yLGYreJtC)Pjl5BvTf7vNKAgk^5c~Mmzq{XwSBX|Y!!tv z4km|H!Vk3X|CBM{bhhPm)-bI#I|x*2+Pc1GIp>RS?eYJf@i9u<9@^wn^X#;+5^`)H ed=M6QfZdyI&)<*B1G0f>lEKr}&t;ucLK6UD_&PrT literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_45.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_45.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c0279eca57778e531c0b4b615698db7d3f18ecdc GIT binary patch literal 2431 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 Y4YHyNg9DJ@&;S4c07*qoM6N<$f)-t$hX4Qo literal 0 HcmV?d00001 diff --git a/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_9mm.dmi b/icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/staging_9mm.dmi new file mode 100644 index 0000000000000000000000000000000000000000..02f3f38bb00fea2a86ed2b8bc8473290b754fb89 GIT binary patch literal 2551 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 diff --git a/icons/modules/projectiles/magazines/modular_magazine_unused.dmi b/icons/modules/projectiles/magazines/modular_magazine_unused.dmi index b732274adafa941b4981d93b74d446aebc91a5e4..a1c9eea32a068bb5d51e782efec359c4db27a9c4 100644 GIT binary patch literal 2639 zcmY*a2{@bC8jhuwqP4UYTTu)}#WIQ@L2a?clv-Of^Ak%5Dmg9JL2I+Zav;cD z6E2u}$H_HDTSyyl1|0HBFHOF%*9xLjTX;3f*EC8O@FxQBrd;Nnj>#^~?~*412t1=< zs#;WxO)B|0B*W9;nz12F3yILao}#rl4)3r2$I`q7)oqlI` zqKT2?Syg?XD={U-4+uopp& z8Jgm#;6h$>asikv(1JMM?I>3dq-9_XB04k*85$V@03_Tgx#bA&H51JqS#6||q{cw5 z$4$Jb@1TA&F5lo&d>7(zs z%v8^x+30RW&A6>8<|Q|(uQ2{Jg+z5;vyY#~me#n1x>cWvxiqdjiJ%AkMhW*+W0~M@ zC%IG;e1;rwSj|gQmctQ_UhVdvFSzykFn@Qo?QW5J$ny^@-@Uf%Wk;8uu7>s#PlpwF zX##$TG)F+3TF^PnF!z+^_f-Fy>z%A7{F7gz3IE`h5m3kwGqS08CYu7p`R$651VdD~ z?kblT@NO5Ro!7K5bY{-ljXC}E_6F_%EX?P>e-q!V2>LW zw4{j2nIi>W3M8kt(x`7DuumyF$?qhX(&->Ek0=GON0hoTP*BZUEHX`>B;_Z(afDVF z)-qb`8Sq?FH}L*MRYv;R=4Zv8Mktz5+Vf-lZ;Yfds@`=@A!hiBd&SW=70{WBN`1Hx z?2;czPI1{bPd6Y>EGD;9V%1JgxD?SR%g)&;aiT!cb8`Z)6mY6vnJfUnkA_*AyC&RO zz3c5VZ7Z53lBojJZu7J78({H;S)3n;C<|b-=Ux|R{%%*&F+EgWRn@CsBgWQqI zL|&A-!8sG0h#I*~=f2b2>hm~5243f`Ew0_jP)4@ChwlX{9$EuY<0DiQ8y$*pZ5zVQ>ni{^C(7F z+{iI99M84Fp-&!>R^(f;F&21HnD* zo%s_?s>tKzla?KO$*jwi0(1N4rG4EQGTR0x3w6XNa$%aXby|XDk?PY#+8_p3EjQ2N z(JaZ>0A;;Z_-fC6!1Y}lCkH6KBZQnHQ-wsYf6fX(bRpKutwEJ=kDR!;_?Y?(i$5e^ zDOr$*SQp3vI|*f*p!}9isX@f*tk!C|KWN^-UysbrUIbyo$#Il<-DuP1{9#%G1%go8 zp8g)P?JL|Q!VVA&q0lCb|%TgbpK_(Am=k=_En}eTS!Egk9Fzu}lmqGyB zd^^D6#gg@{}8YwuS+EbI2f`~h-xWg6aV*cd&1tA#!?+e~^G)y&$rcURRr>~7OMZ%^XZO?}Kujlv{F6;+20FXxgY4Ef*DPE%N+C7 z$6r^uS?`XXrwR%mAf*##l@BL6W)-jIJM)}quxHpOwd0>RUsh1+|Iz zg87@MF8lv^jRN`&i0G8p<6h_2(i?q=kC^+6O;)Ei2`POOZ6AJ5m>Eu9tYNi#vG=D9 z+}L0D)OT1b{qAq#_(@*y2-S1q)=+{kEO?eUW8Md#qN1S@1x*@|tA#JR(49{gmDDf! zejc?oh4-Rt6=E#QmTOyz+Ii{s#_*9TeZShg^#^Dv8X>{ygL2Pge=6+RFoTU0H|_Ga z8r!zpHNX0J;C7nKO2etk0i6?Ed_z zg(v(dkMz>8Kq$-5k+sm;eex9{r;h%fKs>3t!tnrvD~mE7^Wy)uTSlCov;+^$ zD8$D0a;LJ6%A?K0(}kJIxChPajl;=%-fQ>w`4_LaSIuzsadVm<8>d11FVg#ujgL)@ zxCie^1mpoHJI+&W#zpf;D1L35+)7YT)7TWfW^4`cPJOVpA&)MmpQePF;W7`7cjoF? zJqCeX+g(qWsCngA;A(4T|HLmpzFr!U(VMYkqP^%{yVS}3Fc$xNPSAJ9S VsIwPE`-ek`Fe@j^1`EGm{sNtc5#9g* literal 8445 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 b8wC#9pC4Q3d4A&l`uwDw)3NeDeG~p4STyHT diff --git a/icons/modules/projectiles/magazines/modular_speedloader_unused.dmi b/icons/modules/projectiles/magazines/modular_speedloader_unused.dmi deleted file mode 100644 index f565fbbd2a1d74c75bed1eae013d69954a11b314..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4200 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 diff --git a/icons/modules/projectiles/magazines/modular_stripper_unused.dmi b/icons/modules/projectiles/magazines/modular_stripper_unused.dmi deleted file mode 100644 index fc99de5d492373e45c6c753323f60a0e65a4173e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1137 zcmV-%1djWOP)a|0QlHoTP!4ce1P1b8*nlJACkg2WQ&5r*djV;RC6#aPYHya zP75#qg^83_R%W}w$uu}U$!0V=-0C=30)lEwSF%ZV_^X5|w?OCxedh?)es)24&x+!{-l}0z< zOPC4u>pNKRCiFQ3X5h~pewR$?*4{f$ZRgA(vE;8$x~Ap%g=xO?zK*&q=B61_ejDp? zkvi0*<7DO5mVAg5gI=LsZ(DkF@geLY*{99g-ML5`yX{=xyWlCTsJn4K>a*K^Vw!zs z(L*!Syz=moj`QDnshmqm{QNRVI=y~Bn<4QWi5Ez`MB+;%zB)Z-M1v6xMl=}FU_^rv zjq!kRXbpI14S;A3h-eLvXbqSMLL!KWARvNx2*M$VMnN&i8>|`k9>bVyx`FAR6))NUCc9g2(Cs}#ny&Ks zMMOkoN9rZZ%il}-%HK=+D$q-MD$`45c0LD>O7)UiUEVICqy0Lw|G#1H7s(iWsCkVwWDKDF087RQ+z*gsj7)ex zK#?)DW?cDxAp8X+A|fIpk^*%NH2_@$4P&1}!`SE0u=bLk?%|_^UeeF}K8KEIdP$IR zGvC4dB%K+|c=!mNxprpejKMpsAmhk8q|bQve1|16e!n};UnFDnsb)3SkTHPv11uRM za6dqjF*4)*07b^onsMd(f$$fQh=_=YNDBV{<}uJU&@lEnG>m-?4QnsyX<33t3B9DB z z4H*MyKfsbP0`~(X86yw8AE3w>S~ISEKd=P9fJ8(@L_|`cuAv5?YoKB5b7&a*92(YM zl0-r;Nr9%9G^(L9Lu%;Epb9dM;Llh@L_|bH