From 9044084b9549c916b180d96f9ea6510399a7af22 Mon Sep 17 00:00:00 2001 From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Sun, 24 Aug 2025 11:12:55 -0400 Subject: [PATCH] Gives all Heads of Staff energy pistols, equips with cybernetics (#29848) * Gives all heads of staff epistols, starts with basic implants * Whoops * Replaces roundstart head of staff implants with them being in single-use autosurgeons --------- Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> --- code/datums/station_traits/positive_traits.dm | 4 +-- code/game/jobs/job/medical_jobs.dm | 1 - .../closets/secure/cargo_lockers.dm | 3 ++- .../closets/secure/engineering_lockers.dm | 5 ++-- .../closets/secure/medical_lockers.dm | 4 +-- .../closets/secure/scientist.dm | 4 +-- .../closets/secure/security_lockers.dm | 4 ++- code/modules/surgery/organs/autosurgeon.dm | 27 +++++++++++++++++++ 8 files changed, 41 insertions(+), 11 deletions(-) diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index 0ed44d43124..1887cac2071 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -173,7 +173,7 @@ /datum/job/smith = /obj/item/organ/internal/cyberimp/arm/toolset, /datum/job/chaplain = /obj/item/organ/internal/cyberimp/brain/anti_drop, /datum/job/chemist = /obj/item/organ/internal/liver/cybernetic, - /datum/job/chief_engineer = /obj/item/organ/internal/cyberimp/brain/wire_interface, + /datum/job/chief_engineer = /obj/item/organ/internal/eyes/cybernetic/shield, /datum/job/cmo = /obj/item/organ/internal/cyberimp/chest/reviver, /datum/job/clown = /obj/item/organ/internal/cyberimp/brain/anti_stam, //HONK! /datum/job/chef = /obj/item/organ/internal/cyberimp/chest/nutriment/plus, @@ -190,7 +190,7 @@ /datum/job/paramedic = /obj/item/organ/internal/cyberimp/mouth/breathing_tube, /datum/job/psychiatrist = /obj/item/organ/internal/heart/cybernetic/upgraded, //heart of gold. Or at least part gold /datum/job/qm = /obj/item/organ/internal/cyberimp/arm/telebaton, - /datum/job/rd = /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic, + /datum/job/rd = /obj/item/organ/internal/cyberimp/arm/flash, /datum/job/roboticist = /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic, /datum/job/scientist = /obj/item/organ/internal/ears/cybernetic, /datum/job/xenobiologist = /obj/item/organ/internal/cyberimp/arm/surgery, diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm index 98faecadf42..20262fffffc 100644 --- a/code/game/jobs/job/medical_jobs.dm +++ b/code/game/jobs/job/medical_jobs.dm @@ -57,7 +57,6 @@ satchel = /obj/item/storage/backpack/satchel_med dufflebag = /obj/item/storage/backpack/duffel/medical - /datum/outfit/job/cmo/on_mind_initialize(mob/living/carbon/human/H) . = ..() ADD_TRAIT(H.mind, TRAIT_MED_EXAMINE, JOB_TRAIT) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm index 3333f793ce9..0a68bde3eff 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm @@ -100,7 +100,7 @@ /obj/structure/closet/secure_closet/quartermaster/populate_contents() new /obj/item/radio/headset/heads/qm(src) new /obj/item/door_remote/quartermaster(src) - new /obj/item/organ/internal/eyes/cybernetic/meson(src) + new /obj/item/autosurgeon/organ/one_use/meson_eyes(src) new /obj/item/storage/bag/garment/quartermaster(src) new /obj/item/clothing/accessory/medal/supply(src) new /obj/item/clothing/accessory/medal/supply(src) @@ -112,6 +112,7 @@ new /obj/item/cartridge/qm(src) new /obj/item/storage/bag/mail(src) new /obj/item/melee/knuckleduster/nanotrasen(src) + new /obj/item/gun/energy/gun/mini(src) /// used in mining outpost /obj/structure/closet/secure_closet/quartermaster/lavaland diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm index 65b49cb4f35..c7a159add47 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm @@ -26,12 +26,13 @@ new /obj/item/door_remote/chief_engineer(src) new /obj/item/rpd(src) new /obj/item/reagent_containers/drinks/mug/ce(src) - new /obj/item/organ/internal/eyes/cybernetic/meson(src) + new /obj/item/autosurgeon/organ/one_use/meson_eyes(src) + new /obj/item/autosurgeon/organ/one_use/wire_interface(src) new /obj/item/clothing/accessory/medal/engineering(src) new /obj/item/holosign_creator/atmos(src) new /obj/item/rcd/preloaded(src) - new /obj/item/organ/internal/cyberimp/brain/wire_interface(src) new /obj/item/storage/bag/construction(src) + new /obj/item/gun/energy/gun/mini(src) /obj/structure/closet/secure_closet/engineering_electrical diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm index 5eaad13500b..d447e66e732 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm @@ -154,13 +154,13 @@ new /obj/item/flash(src) new /obj/item/gun/syringe(src) new /obj/item/reagent_containers/hypospray/cmo(src) - new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src) new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/reagent_containers/drinks/mug/cmo(src) new /obj/item/clothing/accessory/medal/medical(src) new /obj/item/storage/briefcase(src) new /obj/item/clothing/mask/gas(src) - + new /obj/item/gun/energy/gun/mini(src) + new /obj/item/autosurgeon/organ/one_use/med_hud(src) /obj/structure/closet/secure_closet/animal name = "animal control locker" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 19eba236cc3..d1b934b210f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -57,9 +57,9 @@ new /obj/item/laser_pointer(src) new /obj/item/door_remote/research_director(src) new /obj/item/reagent_containers/drinks/mug/rd(src) - new /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic(src) new /obj/item/clothing/accessory/medal/science(src) - + new /obj/item/gun/energy/gun/mini(src) + new /obj/item/autosurgeon/organ/one_use/diagnostic_hud(src) /obj/structure/closet/secure_closet/research_reagents name = "research chemical storage closet" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm index b06a9d2ddde..435c9d1dd41 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm @@ -19,6 +19,7 @@ new /obj/item/door_remote/captain(src) new /obj/item/reagent_containers/drinks/mug/cap(src) new /obj/item/tank/internals/emergency_oxygen/double(src) + new /obj/item/autosurgeon/organ/one_use/skill_hud(src) /obj/structure/closet/secure_closet/hop name = "head of personnel's locker" @@ -36,6 +37,7 @@ new /obj/item/reagent_containers/drinks/mug/hop(src) new /obj/item/clothing/accessory/medal/service(src) new /obj/item/storage/bag/garment/head_of_personnel(src) + new /obj/item/autosurgeon/organ/one_use/skill_hud(src) new /obj/item/storage/box/fingerprints(src) // used for fingerprinting new arrivals /obj/structure/closet/secure_closet/hos @@ -61,10 +63,10 @@ new /obj/item/gun/energy/gun/hos(src) new /obj/item/door_remote/head_of_security(src) new /obj/item/reagent_containers/drinks/mug/hos(src) - new /obj/item/organ/internal/cyberimp/eyes/hud/security(src) new /obj/item/clothing/accessory/medal/security(src) new /obj/item/reagent_containers/drinks/flask/barflask(src) new /obj/item/clothing/mask/gas/sechailer(src) + new /obj/item/autosurgeon/organ/one_use/sec_hud(src) /obj/structure/closet/secure_closet/warden name = "warden's locker" diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index c0357458ba4..32b0b49f914 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -80,6 +80,33 @@ desc = "[initial(desc)] Looks like it's been used up." return TRUE +/obj/item/autosurgeon/organ/one_use + uses = 1 + +/obj/item/autosurgeon/organ/one_use/skill_hud + desc = "A single use autosurgeon that contains a skill heads up display. A screwdriver can be used to remove it, but implants can't be placed back in." + starting_organ = /obj/item/organ/internal/cyberimp/eyes/hud/skill + +/obj/item/autosurgeon/organ/one_use/sec_hud + desc = "A single use autosurgeon that contains a security heads up display. A screwdriver can be used to remove it, but implants can't be placed back in." + starting_organ = /obj/item/organ/internal/cyberimp/eyes/hud/security + +/obj/item/autosurgeon/organ/one_use/med_hud + desc = "A single use autosurgeon that contains a medical heads up display. A screwdriver can be used to remove it, but implants can't be placed back in." + starting_organ = /obj/item/organ/internal/cyberimp/eyes/hud/medical + +/obj/item/autosurgeon/organ/one_use/diagnostic_hud + desc = "A single use autosurgeon that contains a diagnostic heads up display. A screwdriver can be used to remove it, but implants can't be placed back in." + starting_organ = /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic + +/obj/item/autosurgeon/organ/one_use/wire_interface + desc = "A single use autosurgeon that contains a wire interface. A screwdriver can be used to remove it, but implants can't be placed back in." + starting_organ = /obj/item/organ/internal/cyberimp/brain/wire_interface + +/obj/item/autosurgeon/organ/one_use/meson_eyes + desc = "A single use autosurgeon that contains a set of meson eyes. A screwdriver can be used to remove it, but implants can't be placed back in." + starting_organ = /obj/item/organ/internal/eyes/cybernetic/meson + /obj/item/autosurgeon/organ/syndicate name = "suspicious implant autosurgeon" icon_state = "syndicate_autoimplanter"