From 2fa70f8f8e7452e327a0b0cb6fc3862410d02ac3 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Sat, 2 Sep 2023 06:10:34 +1200 Subject: [PATCH] repaths hegemony rifle (#17051) --- .../crates_lockers/crates/gear_loadout.dm | 10 ++--- .../projectiles/guns/energy/nuclear.dm | 19 --------- code/modules/projectiles/guns/energy/rifle.dm | 19 +++++++++ .../RustingWithYou - hegemonyriflefix.yml | 41 +++++++++++++++++++ .../hegemony_corvette/hegemony_corvette.dmm | 4 +- .../merchants_guild/merchant_freighter.dmm | 4 +- 6 files changed, 69 insertions(+), 28 deletions(-) create mode 100644 html/changelogs/RustingWithYou - hegemonyriflefix.yml diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 995f3cc9601..90c7528affb 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -558,9 +558,9 @@ new /obj/item/clothing/suit/space/void/hegemony/captain(src) new /obj/item/clothing/suit/armor/unathi/klax(src) new /obj/item/clothing/head/helmet/unathi/klax(src) - new /obj/item/gun/energy/hegemonyrifle(src) - new /obj/item/gun/energy/hegemonyrifle(src) - new /obj/item/gun/energy/hegemonyrifle(src) + new /obj/item/gun/energy/rifle/hegemony(src) + new /obj/item/gun/energy/rifle/hegemony(src) + new /obj/item/gun/energy/rifle/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) @@ -592,7 +592,7 @@ new/obj/item/clothing/under/unathi(src) new /obj/item/clothing/head/helmet/space/void/hegemony(src) new /obj/item/clothing/suit/space/void/hegemony(src) - new /obj/item/gun/energy/hegemonyrifle(src) + new /obj/item/gun/energy/rifle/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) new /obj/item/melee/energy/sword/hegemony(src) new /obj/item/shield/energy/hegemony(src) @@ -668,7 +668,7 @@ new /obj/item/melee/energy/sword/pirate(src) new /obj/item/gun/projectile/shotgun/pump/combat(src) new /obj/item/gun/projectile/automatic/rifle/sts35(src) - new /obj/item/gun/energy/hegemonyrifle(src) + new /obj/item/gun/energy/rifle/hegemony(src) new /obj/item/gun/projectile/automatic/rifle/dpra/gold(src) new /obj/item/ammo_magazine/c762/dpra(src) new /obj/item/ammo_magazine/c762/dpra(src) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 5fca8e26c90..f6c2c6a030e 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -177,25 +177,6 @@ list(mode_name="smite", projectile_type=/obj/item/projectile/beam/pistol/hegemony, modifystate="hegemony_pistol", fire_sound='sound/weapons/laser1.ogg') ) -/obj/item/gun/energy/hegemonyrifle - name = "hegemony energy rifle" - desc = "An upgraded variant of the standard laser rifle. It does not have a stun setting." - desc_extended = "The Zkrehk-Guild Heavy Beamgun, an energy-based rifle designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy." - icon = 'icons/obj/guns/hegemony_rifle.dmi' - icon_state = "hegemonyrifle" - item_state = "hegemonyrifle" - has_item_ratio = FALSE - fire_sound = 'sound/weapons/laser1.ogg' - slot_flags = SLOT_BELT|SLOT_BACK - max_shots = 15 - can_switch_modes = FALSE - can_turret = TRUE - turret_is_lethal = TRUE - projectile_type = /obj/item/projectile/beam/midlaser/hegemony - origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4) - is_wieldable = TRUE - modifystate = "hegemonyrifle" - /obj/item/gun/energy/repeater name = "energy repeater" desc = "A Stellar Corporate Conglomerate created energy repeater, extremely lightweight. It has three settings: Single, Three-Burst, and Full-Auto." diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm index f387df5d785..9bd3c9327fd 100644 --- a/code/modules/projectiles/guns/energy/rifle.dm +++ b/code/modules/projectiles/guns/energy/rifle.dm @@ -239,3 +239,22 @@ item_state = "qukala_heavy" max_shots = 10 projectile_type = /obj/item/projectile/beam/midlaser/skrell/heavy + +/obj/item/gun/energy/rifle/hegemony + name = "hegemony energy rifle" + desc = "An upgraded variant of the standard laser rifle. It does not have a stun setting." + desc_extended = "The Zkrehk-Guild Heavy Beamgun, an energy-based rifle designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy." + icon = 'icons/obj/guns/hegemony_rifle.dmi' + icon_state = "hegemonyrifle" + item_state = "hegemonyrifle" + has_item_ratio = FALSE + fire_sound = 'sound/weapons/laser1.ogg' + slot_flags = SLOT_BELT|SLOT_BACK + max_shots = 15 + can_switch_modes = FALSE + can_turret = TRUE + turret_is_lethal = TRUE + projectile_type = /obj/item/projectile/beam/midlaser/hegemony + origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4) + is_wieldable = TRUE + modifystate = "hegemonyrifle" diff --git a/html/changelogs/RustingWithYou - hegemonyriflefix.yml b/html/changelogs/RustingWithYou - hegemonyriflefix.yml new file mode 100644 index 00000000000..4c1695a7934 --- /dev/null +++ b/html/changelogs/RustingWithYou - hegemonyriflefix.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "The Hegemony laser rifle is now an actual rifle that has the correct size." diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index 1c68aa2241a..1b9d267df5d 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -1935,8 +1935,8 @@ /obj/machinery/light/colored/red{ dir = 4 }, -/obj/item/gun/energy/hegemonyrifle, -/obj/item/gun/energy/hegemonyrifle, +/obj/item/gun/energy/rifle/hegemony, +/obj/item/gun/energy/rifle/hegemony, /obj/structure/closet/secure_closet/guncabinet{ req_access = list(113) }, diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm index 2e5f6ed8896..961ea666df9 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm @@ -852,8 +852,8 @@ /obj/structure/closet/secure_closet/guncabinet{ req_access = list(215) }, -/obj/item/gun/energy/hegemonyrifle, -/obj/item/gun/energy/hegemonyrifle, +/obj/item/gun/energy/rifle/hegemony, +/obj/item/gun/energy/rifle/hegemony, /turf/simulated/floor/tiled, /area/merchants_guild/armory) "kH" = (