From c3e3c54f01530e577af1b6d2df0c5120c33b9d87 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Fri, 29 Dec 2023 05:22:49 +1300 Subject: [PATCH] yeah (#18061) --- .../crates_lockers/crates/gear_loadout.dm | 12 +++--- code/modules/background/citizenship/skrell.dm | 6 +-- .../projectiles/guns/energy/nuclear.dm | 11 +++-- .../RustingWithYou - warblenomore.yml | 41 +++++++++++++++++++ 4 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 html/changelogs/RustingWithYou - warblenomore.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 01dbd1c65f4..4a8795037f0 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -859,10 +859,10 @@ new /obj/item/clothing/shoes/jackboots/kala(src) new /obj/item/clothing/shoes/jackboots/kala(src) new /obj/item/rig/skrell/equipped/merc(src) - new /obj/item/gun/energy/psipistol(src) - new /obj/item/gun/energy/psipistol(src) - new /obj/item/gun/energy/psipistol(src) - new /obj/item/gun/energy/psipistol(src) + new /obj/item/gun/energy/fedpistol(src) + new /obj/item/gun/energy/fedpistol(src) + new /obj/item/gun/energy/fedpistol(src) + new /obj/item/gun/energy/fedpistol(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/accessory/holster/hip(src) @@ -881,7 +881,7 @@ new /obj/item/clothing/gloves/kala(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/gun/energy/rifle/laser/qukala(src) - new /obj/item/gun/energy/psipistol(src) + new /obj/item/gun/energy/fedpistol(src) new /obj/item/clothing/suit/storage/vest/kala(src) new /obj/item/clothing/suit/space/void/kala(src) new /obj/item/clothing/head/helmet/space/void/kala(src) @@ -1104,4 +1104,4 @@ new /obj/item/clothing/under/skrell/tupkala(src) new /obj/item/gun/energy/rifle/laser/qukala(src) new /obj/item/clothing/shoes/jackboots/kala(src) - new /obj/item/gun/energy/psipistol(src) + new /obj/item/gun/energy/fedpistol(src) diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index 8e399e42574..a34105b015e 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -78,7 +78,7 @@ /datum/outfit/job/representative/consular/nralakk/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H) if(isskrell(H)) - H.equip_to_slot_or_del(new /obj/item/gun/energy/psipistol(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol(H), slot_belt) if(isvaurca(H)) // there should be a system for this but for now this will have to do i guess H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/nralakk(H), slot_head) @@ -86,9 +86,9 @@ H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask) H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/nralakk(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/gun/energy/pistol(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt) else - H.equip_to_slot_or_del(new /obj/item/gun/energy/pistol(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt) if(!visualsOnly) addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES) return TRUE diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 4aafec316d1..f073cb59a11 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -304,10 +304,10 @@ recharge_time = 10 can_turret = 0 -/obj/item/gun/energy/psipistol - name = "psionic pistol" - desc = "A pistol that utilises psionics. It's made from a lightweight alloy." - desc_extended = "A sidearm usually seen in the hands of Nralakk Federation officials and law enforcement, the Psi Pistol has a psionically-linked firing pin that checks for a developed Zona Bovinae in its user before it can be fired. A wire can be attached to the user's wrist to allow for mode switching using psionics rather than changing it physically, enabling the weapon to be used entirely one-handed." +/obj/item/gun/energy/fedpistol + name = "nralakk energy pistol" + desc = "A Skrell-made pistol that utilises a psionic control mechanism. It's made from a lightweight alloy." + desc_extended = "A sidearm usually seen in the hands of Nralakk Federation officials and law enforcement, the Xuqm-3 energy pistol has a psionically-linked firing pin that checks for a developed Zona Bovinae in its user before it can be fired. A wire can be attached to the user's wrist to allow for mode switching using psionics rather than changing it physically. For non-psionic users, a small dial for mode switching has been attached." icon = 'icons/obj/guns/psi_pistol.dmi' icon_state = "psipistolstun100" item_state = "psipistolstun100" @@ -328,3 +328,6 @@ list(mode_name="lethal", projectile_type=/obj/item/projectile/energy/blaster/skrell, modifystate="psipistollethal", fire_sound='sound/weapons/laser3.ogg'), list(mode_name="ion", projectile_type=/obj/item/projectile/ion/small, modifystate="psipistolion", fire_sound='sound/weapons/laser1.ogg') ) + +/obj/item/gun/energy/fedpistol/nopsi + pin = /obj/item/device/firing_pin diff --git a/html/changelogs/RustingWithYou - warblenomore.yml b/html/changelogs/RustingWithYou - warblenomore.yml new file mode 100644 index 00000000000..5cd0bb7a027 --- /dev/null +++ b/html/changelogs/RustingWithYou - warblenomore.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: "Tweaks the Skrell consular pistol's name and description, and adds a non-psionic version for non-Skrell consulars."