From 3dbe32ddb983deedbcfe25bd4d741e8efd517511 Mon Sep 17 00:00:00 2001 From: Ssalty <65713506+KazooBard@users.noreply.github.com> Date: Fri, 12 Sep 2025 19:14:17 +0200 Subject: [PATCH] Murphy lore (#4443) ## About The Pull Request Patches up some holes in the Murphy's descriptions, in the style of classic guns such as the overheating WT, cancer-giving advanced egun and other mad-science corpo-money-grabbing pieces of lore. ## Why It's Good For The Game Someone pointed out it's not a satisfying enough description, so I redid it. Doesn't affect gameplay. Compiles. Etc etc.
Screenshots/Videos
## Changelog :cl: add: Murphy's lore and descriptions adjusted /:cl: --- code/__DEFINES/~skyrat_defines/projectiles.dm | 2 +- modular_skyrat/modules/sec_haul/code/guns/bullets.dm | 6 +++--- .../modules/projectiles/boxes_magazines/external/pistol.dm | 4 ++-- .../modules/research/designs/autolathe/security_designs.dm | 2 +- .../code/modules/research/designs/weapon_designs.dm | 3 ++- .../code/modules/security/security_glock/gun.dm | 7 +++++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/code/__DEFINES/~skyrat_defines/projectiles.dm b/code/__DEFINES/~skyrat_defines/projectiles.dm index 20a97b3864a..d7aa2bed2f2 100644 --- a/code/__DEFINES/~skyrat_defines/projectiles.dm +++ b/code/__DEFINES/~skyrat_defines/projectiles.dm @@ -22,4 +22,4 @@ #define CALIBER_PEPPERBALL "pepperball" // Murphy caliber, there was no other way to make it non-compatible with syndie ammo and prevent gaming it -#define CALIBER_9MM_SEC "9mm Security" +#define CALIBER_9MM_SEC "9x19 Security" diff --git a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm index 2c29c51c2ee..d0cc1ded54b 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm @@ -24,13 +24,13 @@ advanced_print_req = TRUE /obj/item/ammo_casing/security - name = "9x25mm Mk.12 security casing" - desc = "A modern 9x25mm Mk.12 bullet casing. This one fires a law-enfocement grade round, making it less deadly than most, but still lethal enough to do it's job." + name = "9x19 security casing" + desc = "A standard security-issue cartridge. Optimized to avoid long-lasting damage so criminals can be brigged (and billed) after medical care is administered." caliber = CALIBER_9MM_SEC projectile_type = /obj/projectile/bullet/security /obj/projectile/bullet/security - name = "9x25mm Murphy bullet" + name = "9x19mm Murphy bullet" damage = 20 wound_bonus = -20 diff --git a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm index deda59f4e63..aed6c81d860 100644 --- a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -1,6 +1,6 @@ /obj/item/ammo_box/magazine/security name = "pistol magazine (9mm Murphy)" - desc = "A 9mm handgun magazine, suitable for the Service Pistol." + desc = "A 9mm handgun magazine, suitable for the Nanotrasen Service Pistol. It comes with a more robust spring than the average magazine and weight to boot." icon = 'modular_skyrat/modules/aesthetics/guns/icons/magazine.dmi' icon_state = "9x19p" base_icon_state = "9x19p" @@ -15,7 +15,7 @@ /obj/item/ammo_box/magazine/security/rocket name = "pistol magazine (9mm Murphy Rocket Eject)" - desc = "A 9mm handgun magazine, suitable for the Service Pistol." + desc = parent_type::desc + "With a small charge inside that sparks on ejection, this one has less room for ammo and a lethal velocity to it's ejections." ammo_type = /obj/item/ammo_casing/security max_ammo = 8 base_icon_state = "9x19pI" diff --git a/modular_zubbers/code/modules/research/designs/autolathe/security_designs.dm b/modular_zubbers/code/modules/research/designs/autolathe/security_designs.dm index 2cb97bf09c0..41eb94c24a6 100644 --- a/modular_zubbers/code/modules/research/designs/autolathe/security_designs.dm +++ b/modular_zubbers/code/modules/research/designs/autolathe/security_designs.dm @@ -1,5 +1,5 @@ /datum/design/c9mm_sec - name = "Ammo Box (9x25mm Murphy) (Lethal)" //SKYRAT EDIT: Calibre rename - Original: name = "Ammo Box (9mm)" + name = "Ammo Box (9x19m Murphy) (Lethal)" //SKYRAT EDIT: Calibre rename - Original: name = "Ammo Box (9mm)" id = "c9mm_sec" build_type = AUTOLATHE materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 150) diff --git a/modular_zubbers/code/modules/research/designs/weapon_designs.dm b/modular_zubbers/code/modules/research/designs/weapon_designs.dm index b34590cb592..f22a98e46d3 100644 --- a/modular_zubbers/code/modules/research/designs/weapon_designs.dm +++ b/modular_zubbers/code/modules/research/designs/weapon_designs.dm @@ -185,7 +185,8 @@ /datum/design/m9mm_sec name = "Magazine (9x25mm Murphy) (Lethal)" - desc = "Designed to slide in and out of a 9mm 'Murphy' service pistol. It's heavier bullets make this magazine quite heavy, watch where you throw it!" + desc = "Designed to slide in and out of a 9mm 'Murphy' service pistol. Stronger springs mean faster reloads - and a promotion for the officer behind \ + the window-shattering magazine toss which inspired the RND team into further improving the launch speed." id = "m9mm_sec" build_type = PROTOLATHE | AWAY_LATHE materials = list( diff --git a/modular_zubbers/code/modules/security/security_glock/gun.dm b/modular_zubbers/code/modules/security/security_glock/gun.dm index 851a1586ca1..5b9a48f8e5e 100644 --- a/modular_zubbers/code/modules/security/security_glock/gun.dm +++ b/modular_zubbers/code/modules/security/security_glock/gun.dm @@ -1,6 +1,6 @@ -/obj/item/gun/ballistic/automatic/pistol/sec_glock //This is what you give to the Head of Security. +/obj/item/gun/ballistic/automatic/pistol/sec_glock name = "\improper 'Murphy' Service Pistol" - desc = "This 9 mm monster was developed during the very first body-modding craze by Nanotrasen, built with every what-if in mind, this timeless brick is near-incapable of failure. It comes with a revolutionary quick-reload system." + desc = "This 9mm monster was developed during the very first body-modding craze by Nanotrasen, built with every what-if in mind, this timeless brick is near-incapable of failure. It comes with a revolutionary quick-reload system." icon = 'modular_zubbers/icons/obj/guns/sec_pistol.dmi' icon_state = "black" w_class = WEIGHT_CLASS_NORMAL @@ -14,6 +14,9 @@ actions_types = list(/datum/action/item_action/toggle_mageject) var/magejecting = FALSE //Whether we are launching the mags or not +/obj/item/gun/ballistic/automatic/pistol/sec_glock/give_manufacturer_examine() + AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN) + /datum/action/item_action/toggle_mageject button_icon = 'icons/obj/weapons/guns/ammo.dmi' button_icon_state = "9x19p"