mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 11:36:24 +01:00
Laser Gun Update: Second Pass to Fix Lore and Tweak Grammar (#94438)
## About The Pull Request Touches up laser guns' lore a bit and makes them actually add an examine_lore component for every non-base laser gun, because the component wasn't being added due to a return for every non-basic laser type. Adjusts the laser guns so they're all Type [number]/[variant], so the previous `Type 5C laser pistol` is now the `Type 5/C laser pistol`, the `Type 5R laser carbine` is now the `Type 5/R laser carbine`, the `Type 5A laser assault rifle` is now the `Type 5/A laser assault rifle`, as to denote a more obvious separation between the base iteration/version and the variant appending. ## Why It's Good For The Game The lore wasn't being added because of the component add being beyond the slapcrafting component check. The clear slash between base version and variant looks a little nicer to me. Lore grammar tweaks feel like they read a little better to me? The latter two are subjective. ## Changelog 🆑 fix: Non-base laser guns now attach their lore properly. spellcheck: Adjusted the names on the laser guns to have a slash between the numeric type/version and the variant... abbreviation? Letter? One of the two. spellcheck: Fixed some typos and adjusted the now-visible lore on the laser guns to read a little nicer, theoretically. Whether the grammar tweaks improved anything or not is subjective. /🆑 --------- Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
This commit is contained in:
@@ -106,14 +106,14 @@
|
||||
contains = list(/obj/item/gun/energy/laser)
|
||||
|
||||
/datum/supply_pack/goody/carbine_single
|
||||
name = "Type 5R Laser Carbine Single_Pack"
|
||||
name = "Type 5/R Laser Carbine Single-Pack"
|
||||
desc = "Contains one laser carbine. Fires a rapid burst of slightly weaker laser projectiles."
|
||||
cost = PAYCHECK_COMMAND * 8
|
||||
access_view = ACCESS_WEAPONS
|
||||
contains = list(/obj/item/gun/energy/laser/carbine)
|
||||
|
||||
/datum/supply_pack/goody/laser_pistol_single
|
||||
name = "Type 5C Laser Pistol Single-Pack"
|
||||
name = "Type 5/C Laser Pistol Single-Pack"
|
||||
desc = "Contains one Type 5C laser pistol in an energy shoulder holster. Groovy."
|
||||
cost = PAYCHECK_COMMAND * 2
|
||||
access_view = ACCESS_WEAPONS
|
||||
@@ -128,14 +128,16 @@
|
||||
|
||||
/datum/supply_pack/goody/smg_single
|
||||
name = "Disabler SMG Single_Pack"
|
||||
desc = "Contains one disabler SMGs, capable of rapidly firing weak disabler beams."
|
||||
desc = "Contains one disabler SMG, capable of rapidly firing weak disabler beams."
|
||||
cost = PAYCHECK_COMMAND * 6
|
||||
access_view = ACCESS_WEAPONS
|
||||
contains = list(/obj/item/gun/energy/disabler/smg)
|
||||
|
||||
/datum/supply_pack/goody/hell_single
|
||||
name = "Hellgun Kit Single-Pack"
|
||||
desc = "Contains one hellgun degradation kit, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids."
|
||||
desc = "Contains one hellgun degradation kit, to convert regular laser guns into an older pattern of laser gun, \
|
||||
infamous for its ability to horribly disfigure targets with burns. \
|
||||
Technically violates the Space Geneva Convention when used on humanoids."
|
||||
cost = PAYCHECK_CREW * 2
|
||||
access_view = ACCESS_WEAPONS
|
||||
contains = list(/obj/item/weaponcrafting/gunkit/hellgun)
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
crate_type = /obj/structure/closet/crate/secure/plasma
|
||||
|
||||
/datum/supply_pack/security/armory/laser_carbine
|
||||
name = "Type 5R Laser Carbine Crate"
|
||||
name = "Type 5/R Laser Carbine Crate"
|
||||
desc = "Contains three Type 5R laser carbines, developed by Nanotrasen. Fires a rapid burst of slightly weaker laser projectiles."
|
||||
cost = CARGO_CRATE_VALUE * 9
|
||||
contains = list(/obj/item/gun/energy/laser/carbine = 3)
|
||||
|
||||
Reference in New Issue
Block a user