mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
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. <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 add: Murphy's lore and descriptions adjusted /🆑
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
+2
-2
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user