From 708b2931345609f9f5e5904c52a6ff96f9250021 Mon Sep 17 00:00:00 2001
From: Rhials <28870487+Rhials@users.noreply.github.com>
Date: Tue, 13 Feb 2024 17:21:00 -0500
Subject: [PATCH 01/56] Reduces chat/audio spam when multiple ghost polls are
being called (#81441)
## About The Pull Request
This slightly modifies the polling subsystem. The sound/chat popup for a
new role is now only given on the first "stack" of a role signup.
Let's say 3 loneops roll at once (ty admins), you'll still get the toast
popup for 3x loneop rolls, but you'll only get one text highlight in the
chat, and only one audio stinger.
Even if the first 2 loneops don't have anyone sign up for it, using the
text or toast signup options will still sign you up for the last roll as
it completes. This shouldn't make signing up any harder, just quieter.
## Why It's Good For The Game
Less spam in chat. Less headset-blasting audio bleeps. Cool!
Closes #80998.
## Changelog
:cl: Rhials
fix: Ghost role polls should spam you less when multiple of the same
roll occur in succession.
/:cl:
---
code/controllers/subsystem/polling.dm | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm
index 7787d36b2bf4b..8a041eb36b96c 100644
--- a/code/controllers/subsystem/polling.dm
+++ b/code/controllers/subsystem/polling.dm
@@ -49,7 +49,6 @@ SUBSYSTEM_DEF(polling)
if(role && !is_eligible(candidate_mob, role, check_jobban, ignore_category))
continue
- SEND_SOUND(candidate_mob, 'sound/misc/notice2.ogg')
if(flash_window)
window_flash(candidate_mob.client)
@@ -116,7 +115,10 @@ SUBSYSTEM_DEF(polling)
var/act_never = ""
if(ignore_category)
act_never = "\[Never For This Round]"
- to_chat(candidate_mob, span_boldnotice(examine_block("Now looking for candidates [role_name_text ? "to play as \an [role_name_text]." : "\"[question]\""] [act_jump] [act_signup] [act_never]")))
+
+ if(!duplicate_message_check(alert_poll)) //Only notify people once. They'll notice if there are multiple and we don't want to spam people.
+ SEND_SOUND(candidate_mob, 'sound/misc/notice2.ogg')
+ to_chat(candidate_mob, span_boldnotice(examine_block("Now looking for candidates [role_name_text ? "to play as \an [role_name_text]." : "\"[question]\""] [act_jump] [act_signup] [act_never]")))
// Start processing it so it updates visually the timer
START_PROCESSING(SSprocessing, poll_alert_button)
@@ -192,13 +194,8 @@ SUBSYSTEM_DEF(polling)
// Take care of updating the remaining screen alerts if a similar poll is found, or deleting them.
if(length(finishing_poll.alert_buttons))
- var/polls_of_same_type_left = FALSE
- for(var/datum/candidate_poll/running_poll as anything in currently_polling)
- if(running_poll.poll_key == finishing_poll.poll_key && running_poll.time_left() > 0)
- polls_of_same_type_left = TRUE
- break
for(var/atom/movable/screen/alert/poll_alert/alert as anything in finishing_poll.alert_buttons)
- if(polls_of_same_type_left)
+ if(duplicate_message_check(finishing_poll))
alert.update_stacks_overlay()
else
alert.owner.clear_alert("[finishing_poll.poll_key]_poll_alert")
@@ -213,6 +210,13 @@ SUBSYSTEM_DEF(polling)
msg += " | Next: [DisplayTimeText(soonest_to_complete.time_left())] ([length(soonest_to_complete.signed_up)] candidates)"
return ..()
+///Is there a multiple of the given event type running right now?
+/datum/controller/subsystem/polling/proc/duplicate_message_check(datum/candidate_poll/poll_to_check)
+ for(var/datum/candidate_poll/running_poll as anything in currently_polling)
+ if((running_poll.poll_key == poll_to_check.poll_key && running_poll != poll_to_check) && running_poll.time_left() > 0)
+ return TRUE
+ return FALSE
+
/datum/controller/subsystem/polling/proc/get_next_poll_to_finish()
var/lowest_time_left = INFINITY
var/next_poll_to_finish
From 027b82044fc6d2dd154c46b82af984ca1a2a9d09 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Wed, 14 Feb 2024 11:21:22 +1300
Subject: [PATCH 02/56] Automatic changelog for PR #81441 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81441.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81441.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81441.yml b/html/changelogs/AutoChangeLog-pr-81441.yml
new file mode 100644
index 0000000000000..97ffdf650b1ab
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81441.yml
@@ -0,0 +1,4 @@
+author: "Rhials"
+delete-after: True
+changes:
+ - bugfix: "Ghost role polls should spam you less when multiple of the same roll occur in succession."
\ No newline at end of file
From 081b84c6318983f059df9a20f67bb2fd585bfbc6 Mon Sep 17 00:00:00 2001
From: Lucy
Date: Tue, 13 Feb 2024 19:01:06 -0500
Subject: [PATCH 03/56] Painkillers now actually induce analgesic effects
(#81335)
## About The Pull Request
This adds a new trait, `TRAIT_ANALGESIA`, and makes various painkillers
(+ tenacity trauma) apply said trait.
This prevents various pain-related effects, such as screaming due to
pain, and also provides a speed bonus during surgery.
## Why It's Good For The Game
Gives more of an incentive to actually use reagents such as morphine or
miner's salve.
## Changelog
:cl:
add: Painkillers (i.e morphine, miner's salve) now actually induce
analgesic effects, preventing various pain-related effects, such as
screaming due to pain, and also provides a speed bonus during surgery.
add: The tenacity trauma (traumatic neuropathy) also applies analgesic
effects.
refactor: Simplified code related to reagents adding traits.
/:cl:
---
code/__DEFINES/traits/declarations.dm | 2 +
code/_globalvars/traits/_traits.dm | 1 +
code/datums/brain_damage/special.dm | 4 +-
.../mood_events/generic_negative_events.dm | 24 ++++
code/datums/wounds/bones.dm | 21 +---
code/modules/mob/living/carbon/human/emote.dm | 6 +-
code/modules/mob/living/emote.dm | 5 +
code/modules/reagents/chemistry/reagents.dm | 16 ++-
.../chemistry/reagents/atmos_gas_reagents.dm | 12 +-
.../reagents/cat2_medicine_reagents.dm | 6 +-
.../reagents/drinks/alcohol_reagents.dm | 31 ++---
.../reagents/drinks/drink_reagents.dm | 6 +-
.../chemistry/reagents/drug_reagents.dm | 24 +---
.../chemistry/reagents/food_reagents.dm | 9 +-
.../impure_medicine_reagents.dm | 9 +-
.../chemistry/reagents/medicine_reagents.dm | 109 +++---------------
.../chemistry/reagents/other_reagents.dm | 29 +----
.../chemistry/reagents/toxin_reagents.dm | 45 +-------
code/modules/surgery/surgery_step.dm | 15 ++-
19 files changed, 118 insertions(+), 256 deletions(-)
diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
index 9e901b0665faa..5946f76b7a109 100644
--- a/code/__DEFINES/traits/declarations.dm
+++ b/code/__DEFINES/traits/declarations.dm
@@ -425,6 +425,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_FOV_APPLIED "fov_applied"
/// Mob is using the scope component
#define TRAIT_USER_SCOPED "user_scoped"
+/// Mob is unable to feel pain
+#define TRAIT_ANALGESIA "analgesia"
/// Trait added when a revenant is visible.
#define TRAIT_REVENANT_REVEALED "revenant_revealed"
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index dd074b8d0649b..b1882ff3450f2 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -118,6 +118,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_ALLOW_HERETIC_CASTING" = TRAIT_ALLOW_HERETIC_CASTING,
"TRAIT_ALWAYS_NO_ACCESS" = TRAIT_ALWAYS_NO_ACCESS,
"TRAIT_ALWAYS_WANTED" = TRAIT_ALWAYS_WANTED,
+ "TRAIT_ANALGESIA" = TRAIT_ANALGESIA,
"TRAIT_ANGELIC" = TRAIT_ANGELIC,
"TRAIT_ANTENNAE" = TRAIT_ANTENNAE,
"TRAIT_ANTICONVULSANT" = TRAIT_ANTICONVULSANT,
diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm
index 651881292e9c7..e24ecd99c6177 100644
--- a/code/datums/brain_damage/special.dm
+++ b/code/datums/brain_damage/special.dm
@@ -267,11 +267,11 @@
lose_text = span_warning("You realize you can feel pain again.")
/datum/brain_trauma/special/tenacity/on_gain()
- owner.add_traits(list(TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT), TRAUMA_TRAIT)
+ owner.add_traits(list(TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_ANALGESIA), TRAUMA_TRAIT)
..()
/datum/brain_trauma/special/tenacity/on_lose()
- owner.remove_traits(list(TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT), TRAUMA_TRAIT)
+ owner.remove_traits(list(TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_ANALGESIA), TRAUMA_TRAIT)
..()
/datum/brain_trauma/special/death_whispers
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index afcb5d688ed60..32b9772dc0709 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -92,6 +92,12 @@
mood_change = -3
timeout = 2 MINUTES
+/datum/mood_event/reattachment/New(mob/M, ...)
+ if(HAS_TRAIT(M, TRAIT_ANALGESIA))
+ qdel(src)
+ return
+ return ..()
+
/datum/mood_event/reattachment/add_effects(obj/item/bodypart/limb)
if(limb)
description = "Ouch! My [limb.plaintext_zone] feels like I fell asleep on it."
@@ -122,6 +128,12 @@
mood_change = -3
timeout = 3 MINUTES
+/datum/mood_event/table_limbsmash/New(mob/M, ...)
+ if(HAS_TRAIT(M, TRAIT_ANALGESIA))
+ qdel(src)
+ return
+ return ..()
+
/datum/mood_event/table_limbsmash/add_effects(obj/item/bodypart/banged_limb)
if(banged_limb)
description = "My fucking [banged_limb.plaintext_zone], man that hurts..."
@@ -194,6 +206,12 @@
mood_change = -5
timeout = 60 SECONDS
+/datum/mood_event/painful_medicine/New(mob/M, ...)
+ if(HAS_TRAIT(M, TRAIT_ANALGESIA))
+ qdel(src)
+ return
+ return ..()
+
/datum/mood_event/spooked
description = "The rattling of those bones... It still haunts me."
mood_change = -4
@@ -231,6 +249,12 @@
description = "Bags never sit right on my back, this hurts like hell!"
mood_change = -15
+/datum/mood_event/back_pain/New(mob/M, ...)
+ if(HAS_TRAIT(M, TRAIT_ANALGESIA))
+ qdel(src)
+ return
+ return ..()
+
/datum/mood_event/sad_empath
description = "Someone seems upset..."
mood_change = -1
diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm
index 80c1c0a755713..9911a7cdd5de0 100644
--- a/code/datums/wounds/bones.dm
+++ b/code/datums/wounds/bones.dm
@@ -413,22 +413,11 @@
user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [limb.plaintext_zone], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [limb.plaintext_zone]!"), ignored_mobs=victim)
to_chat(victim, span_userdanger("[user] finishes applying [I] to your [limb.plaintext_zone], and you can feel the bones exploding with pain as they begin melting and reforming!"))
else
- var/painkiller_bonus = 0
- if(victim.get_drunk_amount() > 10)
- painkiller_bonus += 10
- if(victim.reagents.has_reagent(/datum/reagent/medicine/morphine))
- painkiller_bonus += 20
- if(victim.reagents.has_reagent(/datum/reagent/determination))
- painkiller_bonus += 10
- if(victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/painkiller))
- painkiller_bonus += 15
- if(victim.reagents.has_reagent(/datum/reagent/medicine/mine_salve))
- painkiller_bonus += 20
-
- if(prob(25 + (20 * (severity - 2)) - painkiller_bonus)) // 25%/45% chance to fail self-applying with severe and critical wounds, modded by painkillers
- victim.visible_message(span_danger("[victim] fails to finish applying [I] to [victim.p_their()] [limb.plaintext_zone], passing out from the pain!"), span_notice("You pass out from the pain of applying [I] to your [limb.plaintext_zone] before you can finish!"))
- victim.AdjustUnconscious(5 SECONDS)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ANALGESIA))
+ if(prob(25 + (20 * (severity - 2)) - min(victim.get_drunk_amount(), 10))) // 25%/45% chance to fail self-applying with severe and critical wounds, modded by drunkenness
+ victim.visible_message(span_danger("[victim] fails to finish applying [I] to [victim.p_their()] [limb.plaintext_zone], passing out from the pain!"), span_notice("You pass out from the pain of applying [I] to your [limb.plaintext_zone] before you can finish!"))
+ victim.AdjustUnconscious(5 SECONDS)
+ return TRUE
victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [limb.plaintext_zone], grimacing from the pain!"), span_notice("You finish applying [I] to your [limb.plaintext_zone], and your bones explode in pain!"))
limb.receive_damage(25, wound_bonus=CANT_WOUND)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index a7be681a22e2f..b205eb2e2e217 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -81,10 +81,14 @@
only_forced_audio = TRUE
vary = TRUE
+/datum/emote/carbon/human/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
+ if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
+ return
+ return ..()
+
/datum/emote/living/carbon/human/scream/get_sound(mob/living/carbon/human/user)
if(!istype(user))
return
-
return user.dna.species.get_scream_sound(user)
/datum/emote/living/carbon/human/scream/screech //If a human tries to screech it'll just scream.
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index db8302b49dfa9..5c13e489395b1 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -342,6 +342,11 @@
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
mob_type_blacklist_typecache = list(/mob/living/carbon/human) //Humans get specialized scream.
+/datum/emote/living/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
+ if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
+ return
+ return ..()
+
/datum/emote/living/scream/select_message_type(mob/user, message, intentional)
. = ..()
if(!intentional && isanimal_or_basicmob(user))
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 714b2ac21979f..f51532b28b19d 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -74,6 +74,10 @@
/// The affected respiration type, if the reagent damages/heals oxygen damage of an affected mob.
/// See "Mob bio-types flags" in /code/_DEFINES/mobs.dm
var/affected_respiration_type = ALL
+ /// A list of traits to apply while the reagent is being metabolized.
+ var/list/metabolized_traits
+ /// A list of traits to apply while the reagent is in a mob.
+ var/list/added_traits
///The default reagent container for the reagent, used for icon generation
var/obj/item/reagent_containers/default_container = /obj/item/reagent_containers/cup/bottle
@@ -191,20 +195,24 @@ Primarily used in reagents/reaction_agents
/// Called when this reagent is first added to a mob
/datum/reagent/proc/on_mob_add(mob/living/affected_mob, amount)
overdose_threshold /= max(normalise_creation_purity(), 1) //Maybe??? Seems like it would help pure chems be even better but, if I normalised this to 1, then everything would take a 25% reduction
- return
+ if(added_traits)
+ affected_mob.add_traits(added_traits, "base:[type]")
/// Called when this reagent is removed while inside a mob
/datum/reagent/proc/on_mob_delete(mob/living/affected_mob)
affected_mob.clear_mood_event("[type]_overdose")
- return
+ REMOVE_TRAITS_IN(affected_mob, "base:[type]")
/// Called when this reagent first starts being metabolized by a liver
/datum/reagent/proc/on_mob_metabolize(mob/living/affected_mob)
- return
+ SHOULD_CALL_PARENT(TRUE)
+ if(metabolized_traits)
+ affected_mob.add_traits(metabolized_traits, "metabolize:[type]")
/// Called when this reagent stops being metabolized by a liver
/datum/reagent/proc/on_mob_end_metabolize(mob/living/affected_mob)
- return
+ SHOULD_CALL_PARENT(TRUE)
+ REMOVE_TRAITS_IN(affected_mob, "metabolize:[type]")
/**
* Called when a reagent is inside of a mob when they are dead if the reagent has the REAGENT_DEAD_PROCESS flag
diff --git a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
index 7b13b2d28b1d2..1406e37369359 100644
--- a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
@@ -23,16 +23,15 @@
color = "90560B"
taste_description = "minty"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE
+ metabolized_traits = list(TRAIT_RESISTHEAT)
/datum/reagent/halon/on_mob_metabolize(mob/living/breather)
. = ..()
breather.add_movespeed_modifier(/datum/movespeed_modifier/reagent/halon)
- ADD_TRAIT(breather, TRAIT_RESISTHEAT, type)
/datum/reagent/halon/on_mob_end_metabolize(mob/living/breather)
. = ..()
breather.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/halon)
- REMOVE_TRAIT(breather, TRAIT_RESISTHEAT, type)
/datum/reagent/healium
name = "Healium"
@@ -81,14 +80,7 @@
ph = 1.8
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE
addiction_types = list(/datum/addiction/stimulants = 14)
-
-/datum/reagent/nitrium_high_metabolization/on_mob_metabolize(mob/living/breather)
- . = ..()
- ADD_TRAIT(breather, TRAIT_SLEEPIMMUNE, type)
-
-/datum/reagent/nitrium_high_metabolization/on_mob_end_metabolize(mob/living/breather)
- . = ..()
- REMOVE_TRAIT(breather, TRAIT_SLEEPIMMUNE, type)
+ metabolized_traits = list(TRAIT_SLEEPIMMUNE)
/datum/reagent/nitrium_high_metabolization/on_mob_life(mob/living/carbon/breather, seconds_per_tick, times_fired)
. = ..()
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index 8fb16f6333ac6..039bce7eaa8eb 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -584,8 +584,10 @@
if(affected_mob.health <= (affected_mob.crit_threshold + HEALTH_THRESHOLD_FULLCRIT*(2*normalise_creation_purity()))) //certain death below this threshold
REMOVE_TRAIT(affected_mob, TRAIT_STABLEHEART, type) //we have to remove the stable heart trait before we give them a heart attack
- to_chat(affected_mob,span_danger("You feel something rupturing inside your chest!"))
- affected_mob.emote("scream")
+ affected_mob.remove_traits(subject_traits, type)
+ to_chat(affected_mob, span_danger("You feel something rupturing inside your chest!"))
+ if(!HAS_TRAIT(affected_mob, TRAIT_ANALGESIA))
+ affected_mob.emote("scream")
affected_mob.set_heartattack(TRUE)
volume = 0
if(need_mob_update)
diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index 2cc88da41ade8..87033589812cb 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -158,6 +158,7 @@
drinker.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)
/datum/reagent/consumable/ethanol/beer/green/on_mob_end_metabolize(mob/living/drinker)
+ . = ..()
drinker.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, color)
/datum/reagent/consumable/ethanol/beer/green/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
@@ -684,6 +685,7 @@
taste_description = "alcoholic bravery"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_EASY
+ metabolized_traits = list(TRAIT_FEARLESS, TRAIT_ANALGESIA)
var/tough_text
/datum/reagent/consumable/ethanol/brave_bull/on_mob_metabolize(mob/living/drinker)
@@ -692,14 +694,12 @@
to_chat(drinker, span_notice("You feel [tough_text]!"))
drinker.maxHealth += 10 //Brave Bull makes you sturdier, and thus capable of withstanding a tiny bit more punishment.
drinker.health += 10
- ADD_TRAIT(drinker, TRAIT_FEARLESS, type)
/datum/reagent/consumable/ethanol/brave_bull/on_mob_end_metabolize(mob/living/drinker)
. = ..()
to_chat(drinker, span_notice("You no longer feel [tough_text]."))
drinker.maxHealth -= 10
drinker.health = min(drinker.health - 10, drinker.maxHealth) //This can indeed crit you if you're alive solely based on alchol ingestion
- REMOVE_TRAIT(drinker, TRAIT_FEARLESS, type)
/datum/reagent/consumable/ethanol/tequila_sunrise
name = "Tequila Sunrise"
@@ -1073,15 +1073,11 @@
quality = DRINK_VERYGOOD
taste_description = "concentrated matter"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ metabolized_traits = list(TRAIT_MADNESS_IMMUNE)
var/static/list/ray_filter = list(type = "rays", size = 40, density = 15, color = SUPERMATTER_SINGULARITY_RAYS_COLOUR, factor = 15)
-/datum/reagent/consumable/ethanol/singulo/on_mob_metabolize(mob/living/drinker)
- . = ..()
- ADD_TRAIT(drinker, TRAIT_MADNESS_IMMUNE, type)
-
/datum/reagent/consumable/ethanol/singulo/on_mob_end_metabolize(mob/living/drinker)
. = ..()
- REMOVE_TRAIT(drinker, TRAIT_MADNESS_IMMUNE, type)
drinker.remove_filter("singulo_rays")
/datum/reagent/consumable/ethanol/singulo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
@@ -2173,14 +2169,7 @@
quality = DRINK_GOOD
taste_description = "artifical fruityness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/consumable/ethanol/rubberneck/on_mob_metabolize(mob/living/drinker)
- . = ..()
- ADD_TRAIT(drinker, TRAIT_SHOCKIMMUNE, type)
-
-/datum/reagent/consumable/ethanol/rubberneck/on_mob_end_metabolize(mob/living/drinker)
- REMOVE_TRAIT(drinker, TRAIT_SHOCKIMMUNE, type)
- return ..()
+ metabolized_traits = list(TRAIT_SHOCKIMMUNE)
/datum/reagent/consumable/ethanol/duplex
name = "Duplex"
@@ -2260,6 +2249,7 @@
quality = DRINK_NICE
taste_description = "sugary tartness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ metabolized_traits = list(TRAIT_ANALGESIA)
/datum/reagent/consumable/ethanol/pina_colada
name = "Pina Colada"
@@ -2642,20 +2632,13 @@
/datum/reagent/consumable/ethanol/telepole
name = "Telepole"
- description = "A grounding rod in the form of a drink. Recharges ethereals, and gives temporary shock resistance."
+ description = "A grounding rod in the form of a drink. Recharges ethereals, and gives temporary shock resistance."
boozepwr = 50
color = "#b300ff"
quality = DRINK_NICE
taste_description = "the howling storm"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/consumable/ethanol/telepole/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_SHOCKIMMUNE, type)
-
-/datum/reagent/consumable/ethanol/telepole/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_SHOCKIMMUNE, type)
+ metabolized_traits = list(TRAIT_SHOCKIMMUNE)
/datum/reagent/consumable/ethanol/telepole/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) //can't be on life because of the way blood works.
. = ..()
diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index 5365cea34841f..3bef7fcd55a95 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -497,19 +497,15 @@
quality = DRINK_VERYGOOD
taste_description = "carbonated oil"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ metabolized_traits = list(TRAIT_SHOCKIMMUNE)
/datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/carbon/affected_atom)
. = ..()
- ADD_TRAIT(affected_atom, TRAIT_SHOCKIMMUNE, type)
var/obj/item/organ/internal/liver/liver = affected_atom.get_organ_slot(ORGAN_SLOT_LIVER)
if(HAS_TRAIT(liver, TRAIT_MAINTENANCE_METABOLISM))
affected_atom.add_mood_event("maintenance_fun", /datum/mood_event/maintenance_high)
metabolization_rate *= 0.8
-/datum/reagent/consumable/grey_bull/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_SHOCKIMMUNE, type)
-
/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.set_jitter_if_lower(40 SECONDS * REM * seconds_per_tick)
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 837a34daf7f15..6363a9766a35a 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -5,6 +5,7 @@
var/trippy = TRUE //Does this drug make you trip?
/datum/reagent/drug/on_mob_end_metabolize(mob/living/affected_mob)
+ . = ..()
if(trippy)
affected_mob.clear_mood_event("[type]_high")
@@ -214,13 +215,13 @@
overdose_threshold = 20
taste_description = "salt" // because they're bathsalts?
addiction_types = list(/datum/addiction/stimulants = 25) //8 per 2 seconds
- var/datum/brain_trauma/special/psychotic_brawling/bath_salts/rage
ph = 8.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ metabolized_traits = list(TRAIT_STUNIMMUNE, TRAIT_SLEEPIMMUNE, TRAIT_ANALGESIA)
+ var/datum/brain_trauma/special/psychotic_brawling/bath_salts/rage
/datum/reagent/drug/bath_salts/on_mob_metabolize(mob/living/affected_mob)
. = ..()
- affected_mob.add_traits(list(TRAIT_STUNIMMUNE, TRAIT_SLEEPIMMUNE), type)
if(iscarbon(affected_mob))
var/mob/living/carbon/carbon_mob = affected_mob
rage = new()
@@ -228,7 +229,6 @@
/datum/reagent/drug/bath_salts/on_mob_end_metabolize(mob/living/affected_mob)
. = ..()
- affected_mob.remove_traits(list(TRAIT_STUNIMMUNE, TRAIT_SLEEPIMMUNE), type)
if(rage)
QDEL_NULL(rage)
@@ -290,15 +290,14 @@
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
taste_description = "paint thinner"
addiction_types = list(/datum/addiction/hallucinogens = 18)
+ metabolized_traits = list(TRAIT_FEARLESS, TRAIT_ANALGESIA)
/datum/reagent/drug/happiness/on_mob_metabolize(mob/living/affected_mob)
. = ..()
- ADD_TRAIT(affected_mob, TRAIT_FEARLESS, type)
affected_mob.add_mood_event("happiness_drug", /datum/mood_event/happiness_drug)
/datum/reagent/drug/happiness/on_mob_delete(mob/living/affected_mob)
. = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_FEARLESS, type)
affected_mob.clear_mood_event("happiness_drug")
/datum/reagent/drug/happiness/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
@@ -335,19 +334,15 @@
overdose_threshold = 30
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/stimulants = 6) //2.6 per 2 seconds
+ metabolized_traits = list(TRAIT_BATON_RESISTANCE, TRAIT_ANALGESIA)
/datum/reagent/drug/pumpup/on_mob_metabolize(mob/living/carbon/affected_mob)
. = ..()
- ADD_TRAIT(affected_mob, TRAIT_BATON_RESISTANCE, type)
var/obj/item/organ/internal/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER)
if(liver && HAS_TRAIT(liver, TRAIT_MAINTENANCE_METABOLISM))
affected_mob.add_mood_event("maintenance_fun", /datum/mood_event/maintenance_high)
metabolization_rate *= 0.8
-/datum/reagent/drug/pumpup/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_BATON_RESISTANCE, type)
-
/datum/reagent/drug/pumpup/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick)
@@ -432,20 +427,13 @@
overdose_threshold = 25
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/maintenance_drugs = 8)
-
-/datum/reagent/drug/maint/sludge/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob,TRAIT_HARDLY_WOUNDED,type)
+ metabolized_traits = list(TRAIT_HARDLY_WOUNDED, TRAIT_ANALGESIA)
/datum/reagent/drug/maint/sludge/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(affected_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
-/datum/reagent/drug/maint/sludge/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_HARDLY_WOUNDED,type)
-
/datum/reagent/drug/maint/sludge/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(!iscarbon(affected_mob))
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index f7d070ee33dab..a9fad04ff7f1f 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -525,14 +525,7 @@
taste_description = "garlic"
metabolization_rate = 0.15 * REAGENTS_METABOLISM
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/consumable/garlic/on_mob_add(mob/living/affected_mob, amount)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_GARLIC_BREATH, type)
-
-/datum/reagent/consumable/garlic/on_mob_delete(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_GARLIC_BREATH, type)
+ added_traits = list(TRAIT_GARLIC_BREATH)
/datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
index a54f117265da1..3c677e43d1c07 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
@@ -847,14 +847,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
ph = 4.5
metabolization_rate = 0.08 * REM
tox_damage = 0
-
-/datum/reagent/inverse/salbutamol/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_EASYBLEED, type)
-
-/datum/reagent/inverse/salbutamol/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_EASYBLEED, type)
+ metabolized_traits = list(TRAIT_EASYBLEED)
/datum/reagent/inverse/pen_acid
name = "Pendetide"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 303a85c6b4b6a..aface2dce34b5 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -41,6 +41,7 @@
color = "#E0BB00" //golden for the gods
taste_description = "badmins"
chemical_flags = REAGENT_DEAD_PROCESS
+ metabolized_traits = list(TRAIT_ANALGESIA)
/// Flags to fullheal every metabolism tick
var/full_heal_flags = ~(HEAL_BRUTE|HEAL_BURN|HEAL_TOX|HEAL_RESTRAINTS|HEAL_REFRESH_ORGANS)
@@ -252,14 +253,7 @@
metabolization_rate = 0.1 * REAGENTS_METABOLISM
ph = 8.1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/medicine/spaceacillin/on_mob_add(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_VIRUS_RESISTANCE, type)
-
-/datum/reagent/medicine/spaceacillin/on_mob_delete(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_VIRUS_RESISTANCE, type)
+ added_traits = list(TRAIT_VIRUS_RESISTANCE)
//Goon Chems. Ported mainly from Goonstation. Easily mixable (or not so easily) and provide a variety of effects.
@@ -349,6 +343,7 @@
metabolization_rate = 0.4 * REAGENTS_METABOLISM
ph = 2.6
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_AFFECTS_WOUNDS
+ metabolized_traits = list(TRAIT_ANALGESIA)
/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -496,14 +491,7 @@
metabolization_rate = 2 * REAGENTS_METABOLISM
ph = 12 //It's a reducing agent
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/medicine/potass_iodide/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_HALT_RADIATION_EFFECTS, "[type]")
-
-/datum/reagent/medicine/potass_iodide/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_HALT_RADIATION_EFFECTS, "[type]")
+ metabolized_traits = list(TRAIT_HALT_RADIATION_EFFECTS)
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -521,14 +509,7 @@
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
inverse_chem_val = 0.4
inverse_chem = /datum/reagent/inverse/pen_acid
-
-/datum/reagent/medicine/pen_acid/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_HALT_RADIATION_EFFECTS, "[type]")
-
-/datum/reagent/medicine/pen_acid/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_HALT_RADIATION_EFFECTS, "[type]")
+ metabolized_traits = list(TRAIT_HALT_RADIATION_EFFECTS)
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -603,16 +584,15 @@
addiction_types = list(/datum/addiction/stimulants = 4) //1.6 per 2 seconds
inverse_chem = /datum/reagent/inverse/corazargh
inverse_chem_val = 0.4
+ metabolized_traits = list(TRAIT_BATON_RESISTANCE)
/datum/reagent/medicine/ephedrine/on_mob_metabolize(mob/living/affected_mob)
. = ..()
affected_mob.add_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
- ADD_TRAIT(affected_mob, TRAIT_BATON_RESISTANCE, type)
/datum/reagent/medicine/ephedrine/on_mob_end_metabolize(mob/living/affected_mob)
. = ..()
affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
- REMOVE_TRAIT(affected_mob, TRAIT_BATON_RESISTANCE, type)
/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -668,6 +648,7 @@
ph = 8.96
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/opioids = 10)
+ metabolized_traits = list(TRAIT_ANALGESIA)
/datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/affected_mob)
. = ..()
@@ -820,14 +801,7 @@
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
inverse_chem_val = 0.35
inverse_chem = /datum/reagent/inverse/atropine
-
-/datum/reagent/medicine/atropine/on_mob_add(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION, "[type]")
-
-/datum/reagent/medicine/atropine/on_mob_delete(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION, "[type]")
+ added_traits = list(TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION)
/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -863,14 +837,7 @@
overdose_threshold = 30
ph = 10.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/medicine/epinephrine/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_NOCRITDAMAGE, type)
-
-/datum/reagent/medicine/epinephrine/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_NOCRITDAMAGE, type)
+ metabolized_traits = list(TRAIT_NOCRITDAMAGE)
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -1039,21 +1006,13 @@
purity = REAGENT_STANDARD_PURITY
inverse_chem = /datum/reagent/inverse
inverse_chem_val = 0.45
+ metabolized_traits = list(TRAIT_TUMOR_SUPPRESSED) //Having mannitol in you will pause the brain damage from brain tumor (so it heals an even 2 brain damage instead of 1.8)
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
-//Having mannitol in you will pause the brain damage from brain tumor (so it heals an even 2 brain damage instead of 1.8)
-/datum/reagent/medicine/mannitol/on_mob_metabolize(mob/living/carbon/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_TUMOR_SUPPRESSED, TRAIT_GENERIC)
-
-/datum/reagent/medicine/mannitol/on_mob_end_metabolize(mob/living/carbon/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_TUMOR_SUPPRESSED, TRAIT_GENERIC)
-
/datum/reagent/medicine/mannitol/overdose_start(mob/living/affected_mob)
. = ..()
to_chat(affected_mob, span_notice("You suddenly feel E N L I G H T E N E D!"))
@@ -1080,12 +1039,12 @@
purity = REAGENT_STANDARD_PURITY
inverse_chem_val = 0.5
inverse_chem = /datum/reagent/inverse/neurine
+ added_traits = list(TRAIT_ANTICONVULSANT)
///brain damage level when we first started taking the chem
var/initial_bdamage = 200
/datum/reagent/medicine/neurine/on_mob_add(mob/living/affected_mob, amount)
. = ..()
- ADD_TRAIT(affected_mob, TRAIT_ANTICONVULSANT, name)
if(!iscarbon(affected_mob))
return
var/mob/living/carbon/affected_carbon = affected_mob
@@ -1094,7 +1053,6 @@
/datum/reagent/medicine/neurine/on_mob_delete(mob/living/affected_mob)
. = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_ANTICONVULSANT, name)
if(!iscarbon(affected_mob))
return
var/mob/living/carbon/affected_carbon = affected_mob
@@ -1172,16 +1130,15 @@
ph = 8.7
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE
addiction_types = list(/datum/addiction/stimulants = 4) //0.8 per 2 seconds
+ metabolized_traits = list(TRAIT_BATON_RESISTANCE, TRAIT_ANALGESIA)
/datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/affected_mob)
. = ..()
affected_mob.add_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
- ADD_TRAIT(affected_mob, TRAIT_BATON_RESISTANCE, type)
/datum/reagent/medicine/stimulants/on_mob_end_metabolize(mob/living/affected_mob)
. = ..()
affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
- REMOVE_TRAIT(affected_mob, TRAIT_BATON_RESISTANCE, type)
/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -1298,6 +1255,7 @@
ph = 11
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/hallucinogens = 14)
+ metabolized_traits = list(TRAIT_PACIFISM)
/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -1323,14 +1281,6 @@
if(need_mob_update)
return UPDATE_MOB_HEALTH
-/datum/reagent/medicine/earthsblood/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_PACIFISM, type)
-
-/datum/reagent/medicine/earthsblood/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_PACIFISM, type)
-
/datum/reagent/medicine/earthsblood/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * seconds_per_tick, 120 SECONDS)
@@ -1446,14 +1396,7 @@
color = "#FF3542"
self_consuming = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/medicine/higadrite/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_STABLELIVER, type)
-
-/datum/reagent/medicine/higadrite/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_STABLELIVER, type)
+ metabolized_traits = list(TRAIT_STABLELIVER)
/datum/reagent/medicine/cordiolis_hepatico
name = "Cordiolis Hepatico"
@@ -1474,6 +1417,7 @@
name = "Muscle Stimulant"
description = "A potent chemical that allows someone under its influence to be at full physical ability even when under massive amounts of pain."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE
+ metabolized_traits = list(TRAIT_ANALGESIA)
/datum/reagent/medicine/muscle_stimulant/on_mob_metabolize(mob/living/affected_mob)
. = ..()
@@ -1494,14 +1438,7 @@
var/overdose_progress = 0 // to track overdose progress
ph = 7.89
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/medicine/modafinil/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_SLEEPIMMUNE, type)
-
-/datum/reagent/medicine/modafinil/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_SLEEPIMMUNE, type)
+ metabolized_traits = list(TRAIT_SLEEPIMMUNE)
/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired)
. = ..()
@@ -1565,14 +1502,7 @@
overdose_threshold = 30
ph = 9.12
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/medicine/psicodine/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_FEARLESS, type)
-
-/datum/reagent/medicine/psicodine/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_FEARLESS, type)
+ metabolized_traits = list(TRAIT_FEARLESS)
/datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -1694,19 +1624,16 @@
/// For tracking when we tell the person we're no longer bleeding
var/was_working
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ metabolized_traits = list(TRAIT_COAGULATING)
/datum/reagent/medicine/coagulant/on_mob_metabolize(mob/living/affected_mob)
. = ..()
- ADD_TRAIT(affected_mob, TRAIT_COAGULATING, /datum/reagent/medicine/coagulant)
-
if(ishuman(affected_mob))
var/mob/living/carbon/human/blood_boy = affected_mob
blood_boy.physiology?.bleed_mod *= passive_bleed_modifier
/datum/reagent/medicine/coagulant/on_mob_end_metabolize(mob/living/affected_mob)
. = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_COAGULATING, /datum/reagent/medicine/coagulant)
-
if(was_working)
to_chat(affected_mob, span_warning("The medicine thickening your blood loses its effect!"))
if(ishuman(affected_mob))
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 48c30271158f9..25751c5903319 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -347,6 +347,7 @@
ph = 7.5 //God is alkaline
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS|REAGENT_UNAFFECTED_BY_METABOLISM // Operates at fixed metabolism for balancing memes.
default_container = /obj/item/reagent_containers/cup/glass/bottle/holywater
+ metabolized_traits = list(TRAIT_HOLY)
/datum/glass_style/drinking_glass/holywater
required_drink_type = /datum/reagent/water/holywater
@@ -369,14 +370,6 @@
mytray.adjust_plant_health(round(volume * 0.1))
mytray.myseed?.adjust_instability(round(volume * 0.15))
-/datum/reagent/water/holywater/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_HOLY, type)
-
-/datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_HOLY, type)
-
/datum/reagent/water/holywater/on_mob_add(mob/living/affected_mob, amount)
. = ..()
if(IS_CULTIST(affected_mob))
@@ -2507,14 +2500,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
ph = 15
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/pax/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_PACIFISM, type)
-
-/datum/reagent/pax/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_PACIFISM, type)
+ metabolized_traits = list(TRAIT_PACIFISM)
/datum/reagent/bz_metabolites
name = "BZ Metabolites"
@@ -2523,14 +2509,7 @@
taste_description = "acrid cinnamon"
metabolization_rate = 0.2 * REAGENTS_METABOLISM
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE
-
-/datum/reagent/bz_metabolites/on_mob_metabolize(mob/living/ling)
- . = ..()
- ADD_TRAIT(ling, TRAIT_CHANGELING_HIVEMIND_MUTE, type)
-
-/datum/reagent/bz_metabolites/on_mob_end_metabolize(mob/living/ling)
- . = ..()
- REMOVE_TRAIT(ling, TRAIT_CHANGELING_HIVEMIND_MUTE, type)
+ metabolized_traits = list(TRAIT_CHANGELING_HIVEMIND_MUTE)
/datum/reagent/bz_metabolites/on_mob_life(mob/living/carbon/target, seconds_per_tick, times_fired)
. = ..()
@@ -2767,6 +2746,7 @@
metabolization_rate = 0.75 * REAGENTS_METABOLISM // 5u (WOUND_DETERMINATION_CRITICAL) will last for ~34 seconds
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
self_consuming = TRUE
+ metabolized_traits = list(TRAIT_ANALGESIA)
/// Whether we've had at least WOUND_DETERMINATION_SEVERE (2.5u) of determination at any given time. No damage slowdown immunity or indication we're having a second wind if it's just a single moderate wound
var/significant = FALSE
@@ -3055,6 +3035,7 @@
addtimer(CALLBACK(exposed_obj, TYPE_PROC_REF(/atom/movable/, remove_haunted), HAUNTIUM_REAGENT_TRAIT), volume * 20 SECONDS)
/datum/reagent/hauntium/on_mob_metabolize(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
+ . = ..()
to_chat(affected_mob, span_userdanger("You feel an evil presence inside you!"))
if(affected_mob.mob_biotypes & MOB_UNDEAD || HAS_MIND_TRAIT(affected_mob, TRAIT_MORBID))
affected_mob.add_mood_event("morbid_hauntium", /datum/mood_event/morbid_hauntium, name) //8 minutes of slight mood buff if undead or morbid
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 7457acd0687b9..e9bea91fbed64 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -295,14 +295,7 @@
taste_description = "death"
ph = 14.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/toxin/ghoulpowder/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_FAKEDEATH, type)
-
-/datum/reagent/toxin/ghoulpowder/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_FAKEDEATH, type)
+ metabolized_traits = list(TRAIT_FAKEDEATH)
/datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -321,14 +314,7 @@
inverse_chem = /datum/reagent/impurity/rosenol
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/hallucinogens = 18) //7.2 per 2 seconds
-
-/datum/reagent/toxin/mindbreaker/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_RDS_SUPPRESSED, type)
-
-/datum/reagent/toxin/mindbreaker/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_RDS_SUPPRESSED, type)
+ metabolized_traits = list(TRAIT_RDS_SUPPRESSED)
/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -848,14 +834,7 @@
metabolization_rate = 0.75 * REAGENTS_METABOLISM
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE
-
-/datum/reagent/toxin/sodium_thiopental/on_mob_add(mob/living/affected_mob, amount)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_ANTICONVULSANT, name)
-
-/datum/reagent/toxin/sodium_thiopental/on_mob_delete(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_ANTICONVULSANT, name)
+ added_traits = list(TRAIT_ANTICONVULSANT)
/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -1000,20 +979,13 @@
toxpwr = 0
ph = 11.6
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ metabolized_traits = list(TRAIT_BLOODY_MESS)
/datum/reagent/toxin/heparin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
if(holder.has_reagent(/datum/reagent/medicine/coagulant)) //Directly purges coagulants from the system. Get rid of the heparin BEFORE attempting to use coagulants.
holder.remove_reagent(/datum/reagent/medicine/coagulant, 2 * REM * seconds_per_tick)
return ..()
-/datum/reagent/toxin/heparin/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_BLOODY_MESS, /datum/reagent/toxin/heparin)
-
-/datum/reagent/toxin/heparin/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_BLOODY_MESS, /datum/reagent/toxin/heparin)
-
/datum/reagent/toxin/rotatium //Rotatium. Fucks up your rotation and is hilarious
name = "Rotatium"
description = "A constantly swirling, oddly colourful fluid. Causes the consumer's sense of direction and hand-eye coordination to become wild."
@@ -1184,14 +1156,7 @@
ph = 1.7
taste_description = "stillness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
-/datum/reagent/toxin/mimesbane/on_mob_metabolize(mob/living/affected_mob)
- . = ..()
- ADD_TRAIT(affected_mob, TRAIT_EMOTEMUTE, type)
-
-/datum/reagent/toxin/mimesbane/on_mob_end_metabolize(mob/living/affected_mob)
- . = ..()
- REMOVE_TRAIT(affected_mob, TRAIT_EMOTEMUTE, type)
+ metabolized_traits = list(TRAIT_EMOTEMUTE)
/datum/reagent/toxin/bonehurtingjuice //oof ouch
name = "Bone Hurting Juice"
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 6d20a58b9e426..342f984042fec 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -70,6 +70,8 @@
#define SURGERY_SPEED_DISSECTION_MODIFIER 0.8
///Modifier given to users with TRAIT_MORBID on certain surgeries
#define SURGERY_SPEED_MORBID_CURIOSITY 0.7
+///Modifier given to patients with TRAIT_ANALGESIA
+#define SURGERY_SPEED_TRAIT_ANALGESIA 0.8
/datum/surgery_step/proc/initiate(mob/living/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE)
// Only followers of Asclepius have the ability to use Healing Touch and perform miracle feats of surgery.
@@ -95,6 +97,9 @@
if(check_morbid_curiosity(user, tool, surgery))
speed_mod *= SURGERY_SPEED_MORBID_CURIOSITY
+ if(HAS_TRAIT(target, TRAIT_ANALGESIA))
+ speed_mod *= SURGERY_SPEED_TRAIT_ANALGESIA
+
var/implement_speed_mod = 1
if(implement_type) //this means it isn't a require hand or any item step.
implement_speed_mod = implements[implement_type] / 100.0
@@ -260,10 +265,14 @@
*/
/datum/surgery_step/proc/display_pain(mob/living/target, pain_message, mechanical_surgery = FALSE)
if(target.stat < UNCONSCIOUS)
- to_chat(target, span_userdanger(pain_message))
- if(prob(30) && !mechanical_surgery)
- target.emote("scream")
+ if(HAS_TRAIT(target, TRAIT_ANALGESIA))
+ to_chat(target, span_notice("You feel a dull, numb sensation as your body is surgically operated on."))
+ else
+ to_chat(target, span_userdanger(pain_message))
+ if(prob(30) && !mechanical_surgery)
+ target.emote("scream")
+#undef SURGERY_SPEED_TRAIT_ANALGESIA
#undef SURGERY_SPEED_DISSECTION_MODIFIER
#undef SURGERY_SPEED_MORBID_CURIOSITY
#undef SURGERY_SLOWDOWN_CAP_MULTIPLIER
From d8fa5e7a762561b2cbe5be778b7726d50ad8615b Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Wed, 14 Feb 2024 13:01:24 +1300
Subject: [PATCH 04/56] Automatic changelog for PR #81335 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81335.yml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81335.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81335.yml b/html/changelogs/AutoChangeLog-pr-81335.yml
new file mode 100644
index 0000000000000..dbc6fe6345de8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81335.yml
@@ -0,0 +1,6 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - rscadd: "Painkillers (i.e morphine, miner's salve) now actually induce analgesic effects, preventing various pain-related effects, such as screaming due to pain, and also provides a speed bonus during surgery."
+ - rscadd: "The tenacity trauma (traumatic neuropathy) also applies analgesic effects."
+ - refactor: "Simplified code related to reagents adding traits."
\ No newline at end of file
From f0f5eb85eaaec3614495f898426168e1837bd047 Mon Sep 17 00:00:00 2001
From: ViktorKoL <44502667+ViktorKoL@users.noreply.github.com>
Date: Wed, 14 Feb 2024 01:02:35 +0100
Subject: [PATCH 05/56] Partial fix of heretic shapechanges (#81434)
## About The Pull Request
Fixes #79713 and partially #80525 - heretics should no longer regain
their spells improperly when coming back from a shapeshift.
Note: heretics losing their living heart when shapeshifting is an
unrelated issue that I wanted to solve in this same PR originally, but
it has proven to be more complicated than anticipated. So only spell fix
for now.
## Why It's Good For The Game
I see bug I kill it.
## Changelog
:cl:
fix: heretics no longer lose their spells when returning from a
shapeshift
/:cl:
---
code/modules/antagonists/heretic/heretic_knowledge.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index cb9f3b75ccccf..f2cf7b0004771 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -211,7 +211,8 @@
/datum/heretic_knowledge/spell/on_lose(mob/user, datum/antagonist/heretic/our_heretic)
var/datum/action/cooldown/spell/created_spell = created_spell_ref?.resolve()
- created_spell?.Remove(user)
+ if(created_spell?.owner == user)
+ created_spell.Remove(user)
/**
* A knowledge subtype for knowledge that can only
From 56918890e9b2c0c012b088ca4b62b4020e5d6067 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Wed, 14 Feb 2024 13:02:56 +1300
Subject: [PATCH 06/56] Automatic changelog for PR #81434 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81434.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81434.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81434.yml b/html/changelogs/AutoChangeLog-pr-81434.yml
new file mode 100644
index 0000000000000..4bbf08c3dc43c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81434.yml
@@ -0,0 +1,4 @@
+author: "ViktorKoL"
+delete-after: True
+changes:
+ - bugfix: "heretics no longer lose their spells when returning from a shapeshift"
\ No newline at end of file
From 115dfcc29124c4b1ba47abab423f4af90cc7b7bd Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Wed, 14 Feb 2024 00:19:31 +0000
Subject: [PATCH 07/56] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-81335.yml | 6 -----
html/changelogs/AutoChangeLog-pr-81354.yml | 6 -----
html/changelogs/AutoChangeLog-pr-81385.yml | 5 ----
html/changelogs/AutoChangeLog-pr-81420.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81432.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81434.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81437.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81441.yml | 4 ----
html/changelogs/archive/2024-02.yml | 27 ++++++++++++++++++++++
9 files changed, 27 insertions(+), 37 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-81335.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81354.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81385.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81420.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81432.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81434.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81437.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81441.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81335.yml b/html/changelogs/AutoChangeLog-pr-81335.yml
deleted file mode 100644
index dbc6fe6345de8..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81335.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Absolucy"
-delete-after: True
-changes:
- - rscadd: "Painkillers (i.e morphine, miner's salve) now actually induce analgesic effects, preventing various pain-related effects, such as screaming due to pain, and also provides a speed bonus during surgery."
- - rscadd: "The tenacity trauma (traumatic neuropathy) also applies analgesic effects."
- - refactor: "Simplified code related to reagents adding traits."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81354.yml b/html/changelogs/AutoChangeLog-pr-81354.yml
deleted file mode 100644
index db9fbbabb28e6..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81354.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Aylong"
-delete-after: True
-changes:
- - rscadd: "Added `Mute` button into `Chat Tabs` settings, it disables tab unread counter"
- - rscadd: "Added `Clear chat` button into `General` settings, you can clear your dirty chat like you did it before TGchat"
- - bugfix: "Case-sensitive highlighting now works properly"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81385.yml b/html/changelogs/AutoChangeLog-pr-81385.yml
deleted file mode 100644
index 23f3aab42b1af..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81385.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "ViktorKoL"
-delete-after: True
-changes:
- - bugfix: "knit flesh now heals organs as intended, and does not cause its victims to be red forever if interrupted"
- - spellcheck: "knit flesh chat messages are no longer gramatically incorrect"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81420.yml b/html/changelogs/AutoChangeLog-pr-81420.yml
deleted file mode 100644
index c83fff17957ef..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81420.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "JohnFulpWillard"
-delete-after: True
-changes:
- - bugfix: "Revenants (and other flying mobs) will not make noise when walking into pools of gibs,"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81432.yml b/html/changelogs/AutoChangeLog-pr-81432.yml
deleted file mode 100644
index 0b74f0ee4c90e..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81432.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Rhials"
-delete-after: True
-changes:
- - spellcheck: "Some space ruin area names have been made more distinct."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81434.yml b/html/changelogs/AutoChangeLog-pr-81434.yml
deleted file mode 100644
index 4bbf08c3dc43c..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81434.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ViktorKoL"
-delete-after: True
-changes:
- - bugfix: "heretics no longer lose their spells when returning from a shapeshift"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81437.yml b/html/changelogs/AutoChangeLog-pr-81437.yml
deleted file mode 100644
index c27dd8a0fa994..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81437.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "vinylspiders"
-delete-after: True
-changes:
- - bugfix: "*wag emote is now functional again"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81441.yml b/html/changelogs/AutoChangeLog-pr-81441.yml
deleted file mode 100644
index 97ffdf650b1ab..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81441.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Rhials"
-delete-after: True
-changes:
- - bugfix: "Ghost role polls should spam you less when multiple of the same roll occur in succession."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml
index 7c8d89aa9282a..0228eb0bc38b4 100644
--- a/html/changelogs/archive/2024-02.yml
+++ b/html/changelogs/archive/2024-02.yml
@@ -387,3 +387,30 @@
- bugfix: Holding bloodied gloves no longer makes your hands look bloody, bloodied
gloves now look bloody when worn, and damaged gloves now look damaged when worn
- bugfix: Gaining or losing an arm now correctly updates your hand overlays
+2024-02-14:
+ Absolucy:
+ - rscadd: Painkillers (i.e morphine, miner's salve) now actually induce analgesic
+ effects, preventing various pain-related effects, such as screaming due to pain,
+ and also provides a speed bonus during surgery.
+ - rscadd: The tenacity trauma (traumatic neuropathy) also applies analgesic effects.
+ - refactor: Simplified code related to reagents adding traits.
+ Aylong:
+ - rscadd: Added `Mute` button into `Chat Tabs` settings, it disables tab unread
+ counter
+ - rscadd: Added `Clear chat` button into `General` settings, you can clear your
+ dirty chat like you did it before TGchat
+ - bugfix: Case-sensitive highlighting now works properly
+ JohnFulpWillard:
+ - bugfix: Revenants (and other flying mobs) will not make noise when walking into
+ pools of gibs,
+ Rhials:
+ - spellcheck: Some space ruin area names have been made more distinct.
+ - bugfix: Ghost role polls should spam you less when multiple of the same roll occur
+ in succession.
+ ViktorKoL:
+ - bugfix: heretics no longer lose their spells when returning from a shapeshift
+ - bugfix: knit flesh now heals organs as intended, and does not cause its victims
+ to be red forever if interrupted
+ - spellcheck: knit flesh chat messages are no longer gramatically incorrect
+ vinylspiders:
+ - bugfix: '*wag emote is now functional again'
From 0dbf9c78f6787f010bccfd3e83a232de957473ab Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Tue, 13 Feb 2024 20:56:35 -0600
Subject: [PATCH 08/56] Nuka Cola causes irradiation (#81362)
## About The Pull Request
Nuka Cola now causes irradiation.
## Why It's Good For The Game
Most of our speed bonuses, such as Methamphetamine, comes with a
downside (the usual one being brain damage), because speed is king.
When you give people a speed boost that comes with absolutely NO
downsides outside of visual, it turns out people abuse it, a lot.
Even a small speed boost ends up being abused. It is not uncommon to see
security officers saddled with two, three bottles. Nor is it uncommon to
see tiders use it to escape said officers, or antags to escape said
tiders. Do you see the problem here? It has become a situation where not
having it puts you at a disadvantage, which is sad.
Irradiation fits thematically, too. And it also shows you when someone's
using it, since they start glowing green.
## Changelog
:cl: Melbert
balance: Scientists have discovered Nuka Cola is not good for short term
health.
/:cl:
---
.../reagents/chemistry/reagents/drinks/drink_reagents.dm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index 3bef7fcd55a95..43430d0946916 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -454,8 +454,10 @@
affected_mob.set_drugginess(1 MINUTES * REM * seconds_per_tick)
affected_mob.adjust_dizzy(3 SECONDS * REM * seconds_per_tick)
affected_mob.remove_status_effect(/datum/status_effect/drowsiness)
- affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
+ if (SSradiation.can_irradiate_basic(affected_mob))
+ affected_mob.AddComponent(/datum/component/irradiated)
/datum/reagent/consumable/rootbeer
name = "root beer"
From 02a60dbdad93186406c8840e9eb05d5a56740102 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:56:54 +1300
Subject: [PATCH 09/56] Automatic changelog for PR #81362 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81362.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81362.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81362.yml b/html/changelogs/AutoChangeLog-pr-81362.yml
new file mode 100644
index 0000000000000..9f2e87096680c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81362.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - balance: "Scientists have discovered Nuka Cola is not good for short term health."
\ No newline at end of file
From 5c927e406b44a1f864c530ef27322c830b4179bb Mon Sep 17 00:00:00 2001
From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Date: Wed, 14 Feb 2024 04:41:22 -0800
Subject: [PATCH 10/56] Makes AI tracking more snappy, improves API (AI
movement change) (#81401)
## About The Pull Request
Ok so tracking (from the datum) worked, but when used to follow someone
it had a noticable delay from the datum needing to wait for process to
fire to do its work
This would be an expensive proc to run constantly, but we don't really
have to (there are not that many ai eyes in the world). So rather then
only processing to keep step, let's track the target mob by its
movement, and then fall back on a process loop to handle rechecking in
case of camera memes.
This does technically mean you won't "break" the track if the cameras go
out until the tracked mob moves, but I think that's a reasonable price
to pay for more responsive movement. I think I could make our current
system work with it too, though it would be a bit more wasteful. John if
you have opinions just lay into me.
I've also renamed/pulled apart the helper procs for the trackable datum,
with the hope of making how they are used more understandable at a
glance
Oh and rather then holding a weakref since I needed MOVED anyway I just
use QDELETING to free the ref if the mob goes away
### Edit:
#### Glide size touchups
Implements glide size mirroring so we move at the same speed as our
target
Also moves the existing signal to send to the trackable datum itself, as
appears intended from the doc comment
#### AI behavior changes
Rewrites ai movement to be less dumb
OK so 2 things here. One is a behavior change, the other is a visual QOL
thing.
The way ai movement works is we move graduated "steps". Either moving 1,
2, or 3 steps per tick.
We do this by, so long as input is held down, incrementing a number
called "sprint"
Currently it'll go from 10 to 50 (formula effectively looks like steps =
(sprint / 20) + 1))
Anyway, this is... not fine but ok, but the way we handle deceleration
is ass IMO. It's literally just wait 0.5 seconds and sprint resets.
I think this feels crummy, so instead I've made it decay depending on
how long you go between inputs, at 7x greater rate then it increases.
That's the behavior change. Visual change is a lot easier.
Ais were not gliding properly. They assumed they had 4 ticks to move a
tile, rather then 1. This meant they'd jump around constantly, to catch
up to where we expect them to be.
I've fixed this by giving them 1 tick instead. Should feel a lot better
## Why It's Good For The Game
Snappier response times, cleaner code
## Changelog
:cl:
add: AI's acceleration now smoothly decays, instead of just falling back
down to 0 after 0.5 seconds
fix: AI's standard movement (non accelerated) is smooth now, instead of
constantly jumping around
fix: AIs will now follow their targets more closely, shouldn't have any
issues with them lagging behind anymore
/:cl:
---
code/__DEFINES/dcs/signals/signals_camera.dm | 4 +-
code/_onclick/ai.dm | 2 +-
code/game/machinery/camera/trackable.dm | 178 ++++++++++++------
code/game/machinery/computer/crew.dm | 2 +-
code/modules/mob/living/silicon/ai/ai.dm | 28 +--
.../mob/living/silicon/ai/freelook/eye.dm | 53 +++---
code/modules/mob/mob_movement.dm | 3 +-
.../file_system/programs/secureye.dm | 12 +-
8 files changed, 184 insertions(+), 98 deletions(-)
diff --git a/code/__DEFINES/dcs/signals/signals_camera.dm b/code/__DEFINES/dcs/signals/signals_camera.dm
index 6ec142f54fabe..92e9b94f35bba 100644
--- a/code/__DEFINES/dcs/signals/signals_camera.dm
+++ b/code/__DEFINES/dcs/signals/signals_camera.dm
@@ -1,2 +1,4 @@
-///Signal sent when a /datum/trackable found a target: (datum/trackable/source, mob/living/target)
+///Signal sent when a /datum/trackable found a target: (mob/living/target)
#define COMSIG_TRACKABLE_TRACKING_TARGET "comsig_trackable_tracking_target"
+///Signal sent when the mob a /datum/trackable is actively following changes glide size: mob/living/target, new_glide_size)
+#define COMSIG_TRACKABLE_GLIDE_CHANGED "comsig_trackable_glide_changed"
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index 614258388cc1b..8f95bdadda934 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -11,7 +11,7 @@
return
if(ismob(A))
- ai_tracking_tool.set_tracked_mob(src, A.name)
+ ai_tracking_tool.track_mob(src, A)
else
A.move_camera_by_click()
diff --git a/code/game/machinery/camera/trackable.dm b/code/game/machinery/camera/trackable.dm
index 884f38f750bc5..b1c4b46da4b19 100644
--- a/code/game/machinery/camera/trackable.dm
+++ b/code/game/machinery/camera/trackable.dm
@@ -2,13 +2,13 @@
#define CAMERA_TICK_LIMIT 10
/datum/trackable
- ///Boolean on whether or not we are currently trying to track something.
- var/tracking = FALSE
///Reference to the atom that owns us, used for tracking.
var/atom/tracking_holder
- ///If there is a mob currently being tracked, this will be the weakref to it.
- var/datum/weakref/tracked_mob
+ ///What mob are we currently tracking, if any
+ var/mob/living/tracked_mob
+ ///If we're currently rechecking our target's trackability in hopes of something changing
+ var/rechecking = FALSE
///How many times we've failed to locate our target.
var/cameraticks = 0
@@ -24,7 +24,7 @@
/datum/trackable/New(atom/source)
. = ..()
tracking_holder = source
- RegisterSignal(tracking_holder, COMSIG_MOB_RESET_PERSPECTIVE, PROC_REF(cancel_target_tracking))
+ RegisterSignal(tracking_holder, COMSIG_MOB_RESET_PERSPECTIVE, PROC_REF(perspective_reset))
/datum/trackable/Destroy(force)
tracking_holder = null
@@ -32,27 +32,6 @@
STOP_PROCESSING(SSprocessing, src)
return ..()
-/datum/trackable/process()
- var/mob/living/tracked_target = tracked_mob?.resolve()
- if(!tracked_target || !tracking)
- set_tracking(FALSE)
- return
-
- if(tracked_target.can_track(tracking_holder))
- cameraticks = initial(cameraticks)
- SEND_SIGNAL(tracking_holder, COMSIG_TRACKABLE_TRACKING_TARGET, tracked_target)
- return
-
- if(cameraticks < CAMERA_TICK_LIMIT)
- if(!cameraticks)
- to_chat(tracking_holder, span_warning("Target is not near any active cameras. Attempting to reacquire..."))
- cameraticks++
- return
-
- to_chat(tracking_holder, span_warning("Unable to reacquire, cancelling track..."))
- cameraticks = initial(cameraticks)
- set_tracking(FALSE)
-
///Generates a list of trackable people by name, returning a list of Humans + Non-Humans that can be tracked.
/datum/trackable/proc/find_trackable_mobs()
RETURN_TYPE(/list)
@@ -82,47 +61,140 @@
var/list/targets = sort_list(humans) + sort_list(others)
return targets
-///Toggles whether or not we're tracking something. Arg is whether it's on or off.
-/datum/trackable/proc/set_tracking(on = FALSE)
- if(on)
+/// Takes a mob to track, resets our state and begins trying to follow it
+/// Best we can at least
+/datum/trackable/proc/set_tracked_mob(mob/living/track)
+ set_rechecking(FALSE)
+ if(tracked_mob)
+ UnregisterSignal(tracked_mob, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE))
+ if(track && !isliving(track))
+ tracked_mob = null
+ return
+ tracked_mob = track
+ if(tracked_mob)
+ RegisterSignal(tracked_mob, COMSIG_QDELETING, PROC_REF(target_deleted))
+ RegisterSignal(tracked_mob, COMSIG_MOVABLE_MOVED, PROC_REF(target_moved))
+ RegisterSignal(tracked_mob, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(glide_size_changed))
+ attempt_track()
+
+/datum/trackable/proc/target_deleted(datum/source)
+ SIGNAL_HANDLER
+ reset_tracking()
+
+/datum/trackable/proc/perspective_reset(atom/source)
+ SIGNAL_HANDLER
+ reset_tracking()
+
+/datum/trackable/proc/target_moved(datum/source)
+ SIGNAL_HANDLER
+ if(attempt_track())
+ return
+ set_rechecking(TRUE)
+
+/// Controls if we're processing to recheck the conditions that prevent tracking or not
+/datum/trackable/proc/set_rechecking(should_check)
+ if(should_check)
START_PROCESSING(SSprocessing, src)
- tracking = TRUE
+ cameraticks = initial(cameraticks)
+ rechecking = TRUE
else
STOP_PROCESSING(SSprocessing, src)
- tracking = FALSE
- tracked_mob = null
+ rechecking = FALSE
+
+/datum/trackable/process()
+ if(!rechecking)
+ return PROCESS_KILL
+
+ if(attempt_track())
+ set_rechecking(FALSE)
+ return
+
+ if(cameraticks < CAMERA_TICK_LIMIT)
+ if(!cameraticks)
+ to_chat(tracking_holder, span_warning("Target is not near any active cameras. Attempting to reacquire..."))
+ cameraticks++
+ return
-///Called by Signals, used to cancel tracking of a target.
-/datum/trackable/proc/cancel_target_tracking(atom/source)
+ to_chat(tracking_holder, span_warning("Unable to reacquire, cancelling track..."))
+ reset_tracking()
+
+/// Tries to track onto our target mob. Returns true if it succeeds, false otherwise
+/datum/trackable/proc/attempt_track()
+ if(!tracked_mob)
+ reset_tracking()
+ return FALSE
+
+ if(!tracked_mob.can_track(tracking_holder))
+ return FALSE
+ // In case we've been checking
+ set_rechecking(FALSE)
+ SEND_SIGNAL(src, COMSIG_TRACKABLE_TRACKING_TARGET, tracked_mob)
+ return TRUE
+
+/datum/trackable/proc/glide_size_changed(datum/source, new_glide_size)
SIGNAL_HANDLER
- set_tracking(FALSE)
+ SEND_SIGNAL(src, COMSIG_TRACKABLE_GLIDE_CHANGED, tracked_mob, new_glide_size)
/**
- * set_tracked_mob
+ * reset_tracking
*
- * Sets a mob as being tracked, if a target is already provided then it will track that directly,
- * otherwise it will give a tgui input list to find targets to track.
+ * Resets our tracking
+ */
+/datum/trackable/proc/reset_tracking()
+ set_tracked_mob(null)
+
+/**
+ * track_input
+ *
+ * Sets a mob as being tracked, will give a tgui input list to find targets to track.
* Args:
* tracker - The person trying to track, used for feedback messages. This is not the same as tracking_holder
- * tracked_mob_name - (Optional) The person being tracked, to skip the input list.
*/
-/datum/trackable/proc/set_tracked_mob(mob/living/tracker, tracked_mob_name)
+/datum/trackable/proc/track_input(mob/living/tracker)
if(!tracker || tracker.stat == DEAD)
return
- if(tracked_mob_name)
- find_trackable_mobs() //this is in case the tracked mob is newly/no-longer in camera field of view.
- tracked_mob = isnull(humans[tracked_mob_name]) ? others[tracked_mob_name] : humans[tracked_mob_name]
- if(isnull(tracked_mob))
- to_chat(tracker, span_notice("Target is not on or near any active cameras. Tracking failed."))
- return
- to_chat(tracker, span_notice("Now tracking [tracked_mob_name] on camera."))
- else
- var/target_name = tgui_input_list(tracker, "Select a target", "Tracking", find_trackable_mobs())
- if(!target_name || isnull(target_name))
- return
- tracked_mob = isnull(humans[target_name]) ? others[target_name] : humans[target_name]
+ var/target_name = tgui_input_list(tracker, "Select a target", "Tracking", find_trackable_mobs())
+ if(!target_name || isnull(target_name))
+ return
+ var/datum/weakref/mob_ref = isnull(humans[target_name]) ? others[target_name] : humans[target_name]
+ if(isnull(mob_ref))
+ to_chat(tracker, span_notice("Target is not on or near any active cameras. Tracking failed."))
+ return
+ set_tracked_mob(mob_ref.resolve())
+
+/**
+ * track_name
+ *
+ * Sets a mob as being tracked, will track the passed in target name's target
+ * Args:
+ * tracker - The person trying to track, used for feedback messages. This is not the same as tracking_holder
+ * tracked_mob_name - The person being tracked.
+ */
+/datum/trackable/proc/track_name(mob/living/tracker, tracked_mob_name)
+ if(!tracker || tracker.stat == DEAD)
+ return
+
+ find_trackable_mobs() //this is in case the tracked mob is newly/no-longer in camera field of view.
+ var/datum/weakref/mob_ref = isnull(humans[tracked_mob_name]) ? others[tracked_mob_name] : humans[tracked_mob_name]
+ if(isnull(mob_ref))
+ to_chat(tracker, span_notice("Target is not on or near any active cameras. Tracking failed."))
+ return
+ to_chat(tracker, span_notice("Now tracking [tracked_mob_name] on camera."))
+ set_tracked_mob(mob_ref.resolve())
- set_tracking(TRUE)
+/**
+ * track_mob
+ *
+ * Sets a mob as being tracked, will track the passed in target
+ * Args:
+ * tracker - The person trying to track, used for feedback messages. This is not the same as tracking_holder
+ * tracked - The person being tracked.
+ */
+/datum/trackable/proc/track_mob(mob/living/tracker, mob/living/tracked)
+ if(!tracker || tracker.stat == DEAD)
+ return
+ // Need to make sure the tracked mob is in our list
+ track_name(tracked.name)
#undef CAMERA_TICK_LIMIT
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index a00ed045be7af..d286f8ee6043d 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -282,7 +282,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
var/mob/living/silicon/ai/AI = usr
if(!istype(AI))
return
- AI.ai_tracking_tool.set_tracked_mob(AI, params["name"])
+ AI.ai_tracking_tool.track_name(AI, params["name"])
#undef SENSORS_UPDATE_PERIOD
#undef UNKNOWN_JOB_ID
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 23de5d9417f5d..041d964f5dc50 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -77,7 +77,7 @@
var/mob/camera/ai_eye/eyeobj
var/sprint = 10
- var/cooldown = 0
+ var/last_moved = 0
var/acceleration = TRUE
var/obj/structure/ai_core/deactivated/linked_core //For exosuit control
@@ -191,7 +191,8 @@
builtInCamera.network = list("ss13")
ai_tracking_tool = new(src)
- RegisterSignal(src, COMSIG_TRACKABLE_TRACKING_TARGET, PROC_REF(on_track_target))
+ RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_TRACKING_TARGET, PROC_REF(on_track_target))
+ RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_GLIDE_CHANGED, PROC_REF(tracked_glidesize_changed))
add_traits(list(TRAIT_PULL_BLOCKED, TRAIT_HANDS_BLOCKED), ROUNDSTART_TRAIT)
@@ -211,8 +212,7 @@
switch(_key)
if("`", "0")
if(cam_prev)
- if(ai_tracking_tool.tracking)
- ai_tracking_tool.set_tracking(FALSE)
+ ai_tracking_tool.reset_tracking()
eyeobj.setLoc(cam_prev)
return
if("1", "2", "3", "4", "5", "6", "7", "8", "9")
@@ -223,8 +223,7 @@
return
if(cam_hotkeys[_key]) //if this is false, no hotkey for this slot exists.
cam_prev = eyeobj.loc
- if(ai_tracking_tool.tracking)
- ai_tracking_tool.set_tracking(FALSE)
+ ai_tracking_tool.reset_tracking()
eyeobj.setLoc(cam_hotkeys[_key])
return
return ..()
@@ -250,7 +249,6 @@
if(ai_voicechanger)
ai_voicechanger.owner = null
ai_voicechanger = null
- UnregisterSignal(src, COMSIG_TRACKABLE_TRACKING_TARGET)
return ..()
/// Removes all malfunction-related abilities from the AI
@@ -401,7 +399,7 @@
set name = "track"
set hidden = TRUE //Don't display it on the verb lists. This verb exists purely so you can type "track Oldman Robustin" and follow his ass
- ai_tracking_tool.set_tracked_mob(src)
+ ai_tracking_tool.track_input(src)
///Called when an AI finds their tracking target.
/mob/living/silicon/ai/proc/on_track_target(datum/trackable/source, mob/living/target)
@@ -411,6 +409,12 @@
else
view_core()
+/// Keeps our rate of gliding in step with the mob we're following
+/mob/living/silicon/ai/proc/tracked_glidesize_changed(datum/trackable/source, mob/living/target, new_glide_size)
+ SIGNAL_HANDLER
+ if(eyeobj)
+ eyeobj.glide_size = new_glide_size
+
/mob/living/silicon/ai/verb/toggle_anchor()
set category = "AI Commands"
set name = "Toggle Floor Bolts"
@@ -524,7 +528,7 @@
else
to_chat(src, span_notice("Unable to project to the holopad."))
if(href_list["track"])
- ai_tracking_tool.set_tracked_mob(src, href_list["track"])
+ ai_tracking_tool.track_name(src, href_list["track"])
return
if (href_list["ai_take_control"]) //Mech domination
var/obj/vehicle/sealed/mecha/M = locate(href_list["ai_take_control"]) in GLOB.mechas_list
@@ -567,8 +571,7 @@
view_core()
return
- if(ai_tracking_tool.tracking)
- ai_tracking_tool.set_tracking(FALSE)
+ ai_tracking_tool.reset_tracking()
// ok, we're alive, camera is good and in our network...
eyeobj.setLoc(get_turf(C))
@@ -642,8 +645,7 @@
set category = "AI Commands"
set name = "Jump To Network"
unset_machine()
- if(ai_tracking_tool.tracking)
- ai_tracking_tool.set_tracking(FALSE)
+ ai_tracking_tool.reset_tracking()
var/cameralist[0]
if(incapacitated())
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 416bbb19912e8..e8c1919b020f9 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -154,35 +154,44 @@
return
var/mob/living/silicon/ai/AI = usr
if(AI.eyeobj && (AI.multicam_on || (AI.client.eye == AI.eyeobj)) && (AI.eyeobj.z == z))
- if(AI.ai_tracking_tool.tracking)
- AI.ai_tracking_tool.set_tracking(FALSE)
+ AI.ai_tracking_tool.reset_tracking()
if (isturf(loc) || isturf(src))
AI.eyeobj.setLoc(src)
// This will move the AIEye. It will also cause lights near the eye to light up, if toggled.
// This is handled in the proc below this one.
-
-/client/proc/AIMove(n, direct, mob/living/silicon/ai/user)
-
- var/initial = initial(user.sprint)
- var/max_sprint = 50
-
- if(user.cooldown && user.cooldown < world.timeofday) // 3 seconds
- user.sprint = initial
-
- for(var/i = 0; i < max(user.sprint, initial); i += 20)
- var/turf/step = get_turf(get_step(user.eyeobj, direct))
+#define SPRINT_PER_TICK 0.5
+#define MAX_SPRINT 50
+#define SPRINT_PER_STEP 20
+/mob/living/silicon/ai/proc/AIMove(direction)
+ if(last_moved && last_moved + 1 < world.timeofday)
+ // Decay sprint based off how long it took us to input this next move
+ var/missed_sprint = max((world.timeofday + 1) - last_moved, 0) * SPRINT_PER_TICK
+ sprint = max(sprint - missed_sprint * 7, initial(sprint))
+
+ // We move a full step, at least. Can't glide more with our current movement mode, so this is how I have to live
+ var/step_count = 0
+ for(var/i = 0; i < max(sprint, initial(sprint)); i += SPRINT_PER_STEP)
+ step_count += 1
+ var/turf/step = get_turf(get_step(eyeobj, direction))
if(step)
- user.eyeobj.setLoc(step)
+ eyeobj.setLoc(step)
+
+ // I'd like to make this scale with the steps we take, but it like, just can't
+ // So we're doin this instead
+ eyeobj.glide_size = world.icon_size
- user.cooldown = world.timeofday + 5
- if(user.acceleration)
- user.sprint = min(user.sprint + 0.5, max_sprint)
+ last_moved = world.timeofday
+ if(acceleration)
+ sprint = min(sprint + SPRINT_PER_TICK, MAX_SPRINT)
else
- user.sprint = initial
+ sprint = initial(sprint)
+
+ ai_tracking_tool.reset_tracking()
- if(user.ai_tracking_tool.tracking)
- user.ai_tracking_tool.set_tracking(FALSE)
+#undef SPRINT_PER_STEP
+#undef MAX_SPRINT
+#undef SPRINT_PER_TICK
// Return to the Core.
/mob/living/silicon/ai/proc/view_core()
@@ -191,8 +200,8 @@
H.clear_holo(src)
else
current = null
- if(ai_tracking_tool && ai_tracking_tool.tracking)
- ai_tracking_tool.set_tracking(FALSE)
+ if(ai_tracking_tool)
+ ai_tracking_tool.reset_tracking()
unset_machine()
if(isturf(loc) && (QDELETED(eyeobj) || !eyeobj.loc))
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 9b62bd0774331..c54d0fd7c33d0 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -76,7 +76,8 @@
return mob.remote_control.relaymove(mob, direct)
if(isAI(mob))
- return AIMove(new_loc,direct,mob)
+ var/mob/living/silicon/ai/smoovin_ai = mob
+ return smoovin_ai.AIMove(direct)
if(Process_Grab()) //are we restrained by someone's grip?
return
diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm
index c9e4fc087f364..2b3b8f6ea8c95 100644
--- a/code/modules/modular_computers/file_system/programs/secureye.dm
+++ b/code/modules/modular_computers/file_system/programs/secureye.dm
@@ -61,7 +61,6 @@
cam_background = new
cam_background.assigned_map = map_name
cam_background.del_on_map_removal = FALSE
- RegisterSignal(src, COMSIG_TRACKABLE_TRACKING_TARGET, PROC_REF(on_track_target))
/datum/computer_file/program/secureye/Destroy()
QDEL_NULL(cam_screen)
@@ -138,8 +137,8 @@
playsound(computer, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE)
if(isnull(camera_ref))
return TRUE
- if(internal_tracker && internal_tracker.tracking)
- internal_tracker.set_tracking(FALSE)
+ if(internal_tracker)
+ internal_tracker.reset_tracking()
update_active_camera_screen()
return TRUE
@@ -147,7 +146,8 @@
if("start_tracking")
if(!internal_tracker)
internal_tracker = new(src)
- internal_tracker.set_tracked_mob(usr)
+ RegisterSignal(internal_tracker, COMSIG_TRACKABLE_TRACKING_TARGET, PROC_REF(on_track_target))
+ internal_tracker.track_input(usr)
return TRUE
/datum/computer_file/program/secureye/proc/on_track_target(datum/trackable/source, mob/living/target)
@@ -169,8 +169,8 @@
/datum/computer_file/program/secureye/ui_close(mob/user)
. = ..()
//don't track anyone while we're shutting off.
- if(internal_tracker && internal_tracker.tracking)
- internal_tracker.set_tracking(FALSE)
+ if(internal_tracker)
+ internal_tracker.reset_tracking()
var/user_ref = REF(user)
var/is_living = isliving(user)
// Living creature or not, we remove you anyway.
From 752ac9a7d906b661b65f0d06fd69867f1b81a566 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Thu, 15 Feb 2024 01:41:42 +1300
Subject: [PATCH 11/56] Automatic changelog for PR #81401 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81401.yml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81401.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81401.yml b/html/changelogs/AutoChangeLog-pr-81401.yml
new file mode 100644
index 0000000000000..4fc9c0e073539
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81401.yml
@@ -0,0 +1,6 @@
+author: "LemonInTheDark"
+delete-after: True
+changes:
+ - rscadd: "AI's acceleration now smoothly decays, instead of just falling back down to 0 after 0.5 seconds"
+ - bugfix: "AI's standard movement (non accelerated) is smooth now, instead of constantly jumping around"
+ - bugfix: "AIs will now follow their targets more closely, shouldn't have any issues with them lagging behind anymore"
\ No newline at end of file
From 2504311db1a8ceaff674652a3ed92fc92c325c01 Mon Sep 17 00:00:00 2001
From: IndieanaJones <47086570+IndieanaJones@users.noreply.github.com>
Date: Wed, 14 Feb 2024 07:58:56 -0500
Subject: [PATCH 12/56] Reduces Time For Nightmare To Gain a Critical Strike
(#81317)
## About The Pull Request
This PR reduces the amount of time it takes for Nightmare to gain a
critical strike whilst in jaunt (15 > 7 seconds)
## Why It's Good For The Game
Having watched players use the new mechanic added to Nightmare's Light
Eater in #80670, I've recognized that the 15 second requirement is
extremely clunky in practice, as it was a carryover from when Nightmare
got crits from being out of jaunt as opposed to staying in. Since
Nightmare's job requires it to usually be out of jaunt smashing lights
or APCs when it isn't engaged in combat, reducing the time it takes
while in jaunt to gain a critical strike allows Nightmare to get more
use out of the mechanic without throwing off their general game plan so
much.
## Changelog
:cl:
balance: Nightmare's Light Eater takes less time in jaunt to gain a
critical strike, being reduced to 7 seconds from 15 seconds.
/:cl:
---
code/modules/antagonists/nightmare/nightmare_equipment.dm | 2 +-
tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/antagonists/nightmare/nightmare_equipment.dm b/code/modules/antagonists/nightmare/nightmare_equipment.dm
index 965b95ca6e892..fd80b3ea3ef56 100644
--- a/code/modules/antagonists/nightmare/nightmare_equipment.dm
+++ b/code/modules/antagonists/nightmare/nightmare_equipment.dm
@@ -64,7 +64,7 @@
remove_crit()
/obj/item/light_eater/proc/prepare_crit_timer()
- crit_timer = addtimer(CALLBACK(src, PROC_REF(add_crit)), 15 SECONDS, TIMER_DELETE_ME | TIMER_STOPPABLE)
+ crit_timer = addtimer(CALLBACK(src, PROC_REF(add_crit)), 7 SECONDS, TIMER_DELETE_ME | TIMER_STOPPABLE)
/obj/item/light_eater/proc/stop_crit_timer()
deltimer(crit_timer)
diff --git a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx
index 2552bf4b86e41..f0b897e764545 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx
@@ -63,7 +63,7 @@ export const AntagInfoNightmare = (props) => {
Your twisted appendage. It will consume the light of what it
- touches, be it victim or object. After 15 seconds of being in
+ touches, be it victim or object. After 7 seconds of being in
jaunt, stabbing a foe will stun them or do extra damage.
From 20db27bf44857ef29a2398aa685fc742df4586f3 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Thu, 15 Feb 2024 01:59:14 +1300
Subject: [PATCH 13/56] Automatic changelog for PR #81317 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81317.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81317.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81317.yml b/html/changelogs/AutoChangeLog-pr-81317.yml
new file mode 100644
index 0000000000000..edfc7c3a3dc23
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81317.yml
@@ -0,0 +1,4 @@
+author: "IndieanaJones"
+delete-after: True
+changes:
+ - balance: "Nightmare's Light Eater takes less time in jaunt to gain a critical strike, being reduced to 7 seconds from 15 seconds."
\ No newline at end of file
From 499e311a95638ba5235d7757df898a34d2b355f4 Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Wed, 14 Feb 2024 07:19:58 -0600
Subject: [PATCH 14/56] Fixes valentine love again, for real this time, "why
did no one report this" edition (#81470)
## About The Pull Request
Basic one-person huds now default to having no AA flags set, rather than
`AA_TARGET_SEE_APPEARANCE` set
I thought it would be fine to let basic huds just use default hud flags
without realizing the default flags were very self-defeating for this.
Also also kinda dumb. Why does it default to letting the target see the
hud? Whatever I guess.
This fixes Valentines seeing love hearts on themselves in addition to
their companion
I'm surprised no one reported this.
## Changelog
:cl: Melbert
fix: Valentines no longer see themselves covered in hearts. They only
see their Valentine covered in hearts.
/:cl:
---
code/game/atom/alternate_appearance.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/atom/alternate_appearance.dm b/code/game/atom/alternate_appearance.dm
index e22e5c8951995..228462f7936a4 100644
--- a/code/game/atom/alternate_appearance.dm
+++ b/code/game/atom/alternate_appearance.dm
@@ -166,7 +166,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
return TRUE
return FALSE
-/datum/atom_hud/alternate_appearance/basic/one_person/New(key, image/I, options, mob/living/seer)
+/datum/atom_hud/alternate_appearance/basic/one_person/New(key, image/I, options = NONE, mob/living/seer)
src.seer = seer
return ..()
From 7f654b6e8e59021607a9e888dfeb79920401c372 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Thu, 15 Feb 2024 02:20:20 +1300
Subject: [PATCH 15/56] Automatic changelog for PR #81470 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81470.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81470.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81470.yml b/html/changelogs/AutoChangeLog-pr-81470.yml
new file mode 100644
index 0000000000000..79667e7b25649
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81470.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - bugfix: "Valentines no longer see themselves covered in hearts. They only see their Valentine covered in hearts."
\ No newline at end of file
From 39e861cb0409696ab971a1115d32a7bfc15c4fc4 Mon Sep 17 00:00:00 2001
From: Iamgoofball
Date: Wed, 14 Feb 2024 08:47:16 -0800
Subject: [PATCH 16/56] Fixes Krav Maga allowing pacifism bypasses. (#81447)
## About The Pull Request
Fixes Krav Maga allowing pacifism bypasses.
## Why It's Good For The Game
Bugfixes are good for my GBP count. Also, pacifism bypasses bad.
## Changelog
:cl: CandleJaxx and Iamgoofball
fix: Fixes Krav Maga allowing pacifism bypasses.
/:cl:
---
code/datums/martial/krav_maga.dm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
index cda53bbe6475e..1710009de3c6e 100644
--- a/code/datums/martial/krav_maga.dm
+++ b/code/datums/martial/krav_maga.dm
@@ -102,6 +102,8 @@
/datum/martial_art/krav_maga/proc/leg_sweep(mob/living/attacker, mob/living/defender)
if(defender.stat != CONSCIOUS || defender.IsParalyzed())
return MARTIAL_ATTACK_INVALID
+ if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
+ return MARTIAL_ATTACK_INVALID // Does 5 damage, so we can't let pacifists leg sweep.
defender.visible_message(
span_warning("[attacker] leg sweeps [defender]!"),
span_userdanger("Your legs are sweeped by [attacker]!"),
@@ -134,6 +136,8 @@
return MARTIAL_ATTACK_SUCCESS
/datum/martial_art/krav_maga/proc/neck_chop(mob/living/attacker, mob/living/defender)
+ if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
+ return MARTIAL_ATTACK_INVALID // Does 10 damage, so we can't let pacifists neck chop.
attacker.do_attack_animation(defender)
defender.visible_message(
span_warning("[attacker] karate chops [defender]'s neck!"),
From b228e45e4d3b874e4203019ddd8c9a648679cc84 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Thu, 15 Feb 2024 05:47:43 +1300
Subject: [PATCH 17/56] Automatic changelog for PR #81447 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81447.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81447.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81447.yml b/html/changelogs/AutoChangeLog-pr-81447.yml
new file mode 100644
index 0000000000000..b2c8e4c50913f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81447.yml
@@ -0,0 +1,4 @@
+author: "CandleJaxx and Iamgoofball"
+delete-after: True
+changes:
+ - bugfix: "Fixes Krav Maga allowing pacifism bypasses."
\ No newline at end of file
From fa3dc02e65226f9bc970e6d6794462dd4f2fc255 Mon Sep 17 00:00:00 2001
From: K4rlox <118483925+K4rlox@users.noreply.github.com>
Date: Wed, 14 Feb 2024 22:55:29 +0300
Subject: [PATCH 18/56] Maintenance drones can use RCDs, RPEDs, Spray Bottles,
and Holosign Projectors (#81219)
## About The Pull Request
makes maintenance drones able to pick up RCD and RPEDs in order to use
for upgrading and repairing the station as per their laws state
you used to be unable to pick these up due to "using this item may break
your laws"
which made no sense since they could be used to repair and upgrade
station gear
this fixes that
## Why It's Good For The Game
drones can now easily repair and maintain station equipment like they
are programmed to do so
additionally with the use of RCD they no longer need to carry around
metal sheets and glass sheets all the time, making their job way easier
## Changelog
:cl:
balance: Maintenance drones now can use RPED, RCD, Holosign, and Spray
bottles
/:cl:
---
code/modules/mob/living/basic/drone/_drone.dm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/code/modules/mob/living/basic/drone/_drone.dm b/code/modules/mob/living/basic/drone/_drone.dm
index 76f09318b7acb..9298083c67c21 100644
--- a/code/modules/mob/living/basic/drone/_drone.dm
+++ b/code/modules/mob/living/basic/drone/_drone.dm
@@ -161,6 +161,12 @@
/obj/item/clothing/mask,
/obj/item/storage/box/lights,
/obj/item/lightreplacer,
+ /obj/item/construction/rcd,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_upgrade,
+ /obj/item/storage/part_replacer,
+ /obj/item/soap,
+ /obj/item/holosign_creator,
)
/// machines whitelisted from being shy with
var/list/shy_machine_whitelist = list(
From 851740810aeb4c68f479bad3fbd143f657f1b103 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Thu, 15 Feb 2024 08:55:48 +1300
Subject: [PATCH 19/56] Automatic changelog for PR #81219 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81219.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81219.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81219.yml b/html/changelogs/AutoChangeLog-pr-81219.yml
new file mode 100644
index 0000000000000..963fe228c0881
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81219.yml
@@ -0,0 +1,4 @@
+author: "K4rlox"
+delete-after: True
+changes:
+ - balance: "Maintenance drones now can use RPED, RCD, Holosign, and Spray bottles"
\ No newline at end of file
From 4739d00a7fec01b974b89682f25fb818c5443715 Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Thu, 15 Feb 2024 00:19:58 +0000
Subject: [PATCH 20/56] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-81219.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81317.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81362.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81401.yml | 6 ------
html/changelogs/AutoChangeLog-pr-81447.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81470.yml | 4 ----
html/changelogs/archive/2024-02.yml | 19 +++++++++++++++++++
7 files changed, 19 insertions(+), 26 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-81219.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81317.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81362.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81401.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81447.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81470.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81219.yml b/html/changelogs/AutoChangeLog-pr-81219.yml
deleted file mode 100644
index 963fe228c0881..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81219.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "K4rlox"
-delete-after: True
-changes:
- - balance: "Maintenance drones now can use RPED, RCD, Holosign, and Spray bottles"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81317.yml b/html/changelogs/AutoChangeLog-pr-81317.yml
deleted file mode 100644
index edfc7c3a3dc23..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81317.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "IndieanaJones"
-delete-after: True
-changes:
- - balance: "Nightmare's Light Eater takes less time in jaunt to gain a critical strike, being reduced to 7 seconds from 15 seconds."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81362.yml b/html/changelogs/AutoChangeLog-pr-81362.yml
deleted file mode 100644
index 9f2e87096680c..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81362.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - balance: "Scientists have discovered Nuka Cola is not good for short term health."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81401.yml b/html/changelogs/AutoChangeLog-pr-81401.yml
deleted file mode 100644
index 4fc9c0e073539..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81401.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "LemonInTheDark"
-delete-after: True
-changes:
- - rscadd: "AI's acceleration now smoothly decays, instead of just falling back down to 0 after 0.5 seconds"
- - bugfix: "AI's standard movement (non accelerated) is smooth now, instead of constantly jumping around"
- - bugfix: "AIs will now follow their targets more closely, shouldn't have any issues with them lagging behind anymore"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81447.yml b/html/changelogs/AutoChangeLog-pr-81447.yml
deleted file mode 100644
index b2c8e4c50913f..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81447.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "CandleJaxx and Iamgoofball"
-delete-after: True
-changes:
- - bugfix: "Fixes Krav Maga allowing pacifism bypasses."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81470.yml b/html/changelogs/AutoChangeLog-pr-81470.yml
deleted file mode 100644
index 79667e7b25649..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81470.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - bugfix: "Valentines no longer see themselves covered in hearts. They only see their Valentine covered in hearts."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml
index 0228eb0bc38b4..3834cc554d067 100644
--- a/html/changelogs/archive/2024-02.yml
+++ b/html/changelogs/archive/2024-02.yml
@@ -414,3 +414,22 @@
- spellcheck: knit flesh chat messages are no longer gramatically incorrect
vinylspiders:
- bugfix: '*wag emote is now functional again'
+2024-02-15:
+ CandleJaxx and Iamgoofball:
+ - bugfix: Fixes Krav Maga allowing pacifism bypasses.
+ IndieanaJones:
+ - balance: Nightmare's Light Eater takes less time in jaunt to gain a critical strike,
+ being reduced to 7 seconds from 15 seconds.
+ K4rlox:
+ - balance: Maintenance drones now can use RPED, RCD, Holosign, and Spray bottles
+ LemonInTheDark:
+ - rscadd: AI's acceleration now smoothly decays, instead of just falling back down
+ to 0 after 0.5 seconds
+ - bugfix: AI's standard movement (non accelerated) is smooth now, instead of constantly
+ jumping around
+ - bugfix: AIs will now follow their targets more closely, shouldn't have any issues
+ with them lagging behind anymore
+ Melbert:
+ - bugfix: Valentines no longer see themselves covered in hearts. They only see their
+ Valentine covered in hearts.
+ - balance: Scientists have discovered Nuka Cola is not good for short term health.
From 89073444dbbc97c9e83e6755e8640e8a2c225fed Mon Sep 17 00:00:00 2001
From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Date: Wed, 14 Feb 2024 18:28:34 -0800
Subject: [PATCH 21/56] Micro-Optimize keyLoop's self time (#81464)
## About The Pull Request
This is a REALLY hot proc, takes up to like 2% of total cpu at highpop
Let's micro it then
First, clients do not go null at random. It's not predictable per say
but it is consistent.
We can use this understanding to remove a bunch of null checks here
For loops are expensive. So rather then doing one each keyLoop, let's
cache the client's intended move direction on the client. Simplifies
some other code too
There is no sense running a turn call if it would have no effect, let's
be more intelligent about this
## Changelog
:cl:
refactor: Fucks with how movement keys are handled. Please report any
bugs
/:cl:
---
code/datums/components/jetpack.dm | 2 +-
code/datums/components/scope.dm | 2 +-
code/modules/client/client_defines.dm | 3 ++
code/modules/client/client_procs.dm | 1 +
code/modules/keybindings/bindings_atom.dm | 33 ++++++++++++++-------
code/modules/keybindings/bindings_client.dm | 14 +++++----
6 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/code/datums/components/jetpack.dm b/code/datums/components/jetpack.dm
index 3e0fd28ed8013..437660abc82e0 100644
--- a/code/datums/components/jetpack.dm
+++ b/code/datums/components/jetpack.dm
@@ -116,7 +116,7 @@
return
if(user.throwing)//You don't must use jet if you thrown
return
- if(length(user.client.keys_held & user.client.movement_keys))//You use jet when press keys. yes.
+ if(user.client.intended_direction)//You use jet when press keys. yes.
thrust()
/datum/component/jetpack/proc/pre_move_react(mob/user)
diff --git a/code/datums/components/scope.dm b/code/datums/components/scope.dm
index b413b6f8e51ac..531ff9e9962df 100644
--- a/code/datums/components/scope.dm
+++ b/code/datums/components/scope.dm
@@ -60,7 +60,7 @@
stop_zooming(user_mob)
return
tracker.calculate_params()
- if(!length(user_client.keys_held & user_client.movement_keys))
+ if(!user_client.intended_direction)
user_mob.face_atom(tracker.given_turf)
animate(user_client, world.tick_lag, pixel_x = tracker.given_x, pixel_y = tracker.given_y)
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 15a8e4454fc1e..45ccda8b92bd1 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -240,6 +240,9 @@
var/list/keys_held = list()
/// A buffer for combinations such of modifiers + keys (ex: CtrlD, AltE, ShiftT). Format: `"key"` -> `"combo"` (ex: `"D"` -> `"CtrlD"`)
var/list/key_combos_held = list()
+ /// The direction we WANT to move, based off our keybinds
+ /// Will be udpated to be the actual direction later on
+ var/intended_direction = NONE
/*
** These next two vars are to apply movement for keypresses and releases made while move delayed.
** Because discarding that input makes the game less responsive.
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 3c0b5aa1db3b0..5de1341358230 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -1012,6 +1012,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
winset(src, "default-[REF(key)]", "parent=default;name=[key];command=[asay]")
else
winset(src, "default-[REF(key)]", "parent=default;name=[key];command=")
+ calculate_move_dir()
/client/proc/change_view(new_size)
if (isnull(new_size))
diff --git a/code/modules/keybindings/bindings_atom.dm b/code/modules/keybindings/bindings_atom.dm
index 6dadcd5768ee3..e9e38489a4df3 100644
--- a/code/modules/keybindings/bindings_atom.dm
+++ b/code/modules/keybindings/bindings_atom.dm
@@ -2,12 +2,18 @@
// Only way to do that is to tie the behavior into the focus's keyLoop().
/atom/movable/keyLoop(client/user)
- var/movement_dir = NONE
- for(var/_key in user?.keys_held)
- movement_dir = movement_dir | user.movement_keys[_key]
- if(user?.next_move_dir_add)
- movement_dir |= user.next_move_dir_add
- if(user?.next_move_dir_sub)
+ // Clients don't go null randomly. They do go null unexpectedly though, when they're poked in particular ways
+ // keyLoop is called by a for loop over mobs. We're guarenteed that all the mobs have clients at the START
+ // But the move of one mob might poke the client of another, so we do this
+ if(!user)
+ return FALSE
+ var/movement_dir = user.intended_direction | user.next_move_dir_add
+ // If we're not movin anywhere, we aren't movin anywhere
+ // Safe because nothing adds to movement_dir after this moment
+ if(!movement_dir)
+ return FALSE
+
+ if(user.next_move_dir_sub)
movement_dir &= ~user.next_move_dir_sub
// Sanity checks in case you hold left and right and up to make sure you only go up
if((movement_dir & NORTH) && (movement_dir & SOUTH))
@@ -15,14 +21,21 @@
if((movement_dir & EAST) && (movement_dir & WEST))
movement_dir &= ~(EAST|WEST)
- if(user && movement_dir) //If we're not moving, don't compensate, as byond will auto-fill dir otherwise
+ if(user.dir != NORTH && movement_dir) //If we're not moving, don't compensate, as byond will auto-fill dir otherwise
movement_dir = turn(movement_dir, -dir2angle(user.dir)) //By doing this we ensure that our input direction is offset by the client (camera) direction
//turn without moving while using the movement lock key, unless something wants to ignore it and move anyway
- if(user?.movement_locked && !(SEND_SIGNAL(src, COMSIG_MOVABLE_KEYBIND_FACE_DIR, movement_dir) & COMSIG_IGNORE_MOVEMENT_LOCK))
+ if(user.movement_locked && !(SEND_SIGNAL(src, COMSIG_MOVABLE_KEYBIND_FACE_DIR, movement_dir) & COMSIG_IGNORE_MOVEMENT_LOCK))
keybind_face_direction(movement_dir)
- else
- user?.Move(get_step(src, movement_dir), movement_dir)
+ // Null check cause of the signal above
+ else if(user)
+ user.Move(get_step(src, movement_dir), movement_dir)
return !!movement_dir //true if there was actually any player input
return FALSE
+
+/client/proc/calculate_move_dir()
+ var/movement_dir = NONE
+ for(var/_key in keys_held)
+ movement_dir |= movement_keys[_key]
+ intended_direction = movement_dir
diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm
index 0aa0fd6952ed2..0a8cc20b38fe5 100644
--- a/code/modules/keybindings/bindings_client.dm
+++ b/code/modules/keybindings/bindings_client.dm
@@ -47,9 +47,10 @@
//the time a key was pressed isn't actually used anywhere (as of 2019-9-10) but this allows easier access usage/checking
keys_held[_key] = world.time
- if(!movement_locked)
- var/movement = movement_keys[_key]
- if(!(next_move_dir_sub & movement))
+ var/movement = movement_keys[_key]
+ if(movement)
+ calculate_move_dir()
+ if(!movement_locked && !(next_move_dir_sub & movement))
next_move_dir_add |= movement
// Client-level keybindings are ones anyone should be able to do at any time
@@ -93,9 +94,10 @@
keys_held -= _key
- if(!movement_locked)
- var/movement = movement_keys[_key]
- if(!(next_move_dir_add & movement))
+ var/movement = movement_keys[_key]
+ if(movement)
+ calculate_move_dir()
+ if(!movement_locked && !(next_move_dir_add & movement))
next_move_dir_sub |= movement
// We don't do full key for release, because for mod keys you
From 23c97f74892b58c099a4bccf684b7a86aa386562 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Thu, 15 Feb 2024 15:28:52 +1300
Subject: [PATCH 22/56] Automatic changelog for PR #81464 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81464.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81464.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81464.yml b/html/changelogs/AutoChangeLog-pr-81464.yml
new file mode 100644
index 0000000000000..97f057943a4c3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81464.yml
@@ -0,0 +1,4 @@
+author: "LemonInTheDark"
+delete-after: True
+changes:
+ - refactor: "Fucks with how movement keys are handled. Please report any bugs"
\ No newline at end of file
From 9fb2a54c30aff39a9c57febb43c6f9ff15d99d97 Mon Sep 17 00:00:00 2001
From: Kylerace
Date: Thu, 15 Feb 2024 03:15:55 -0800
Subject: [PATCH 23/56] Adds Subsystem Profile Focusing (#81461)
## About The Pull Request
adds a var to /subsystem that when toggled to true by an admin makes
/subsystem/ignite() start the profiler before calling fire() and then
stop the profiler after, this allows us to audit any individual
subsystems synchronous call chain.
## Why It's Good For The Game
when SSInput is focused
when SSair is focused
some subsystems are hard to profile performance issues for because
theres a billion procs downstream of them in the profiler and some of
them arent even unique to them (if a subsystem is spending half of its
time in some procs downstream of /_SendSignal() how could you tell). now
we can just do it. starting (and stopping?) the profiler itself is
expensive and this messes with the full round profiler but this is worth
it.
also this doesnt help with sleeping procs / timers created downstream of
that subsystem.
## Changelog
:cl:
admin: admins/maintainers can now make the profiler focus on specific
subsystems by setting the subsystem var profile_focused to TRUE
/:cl:
---
code/controllers/master.dm | 6 ++++++
code/controllers/subsystem.dm | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 6e4c21fba208b..ac12add1ae2d5 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -684,10 +684,16 @@ GLOBAL_REAL(Master, /datum/controller/master)
queue_node.state = SS_RUNNING
+ if(queue_node.profiler_focused)
+ world.Profile(PROFILE_START)
+
tick_usage = TICK_USAGE
var/state = queue_node.ignite(queue_node_paused)
tick_usage = TICK_USAGE - tick_usage
+ if(queue_node.profiler_focused)
+ world.Profile(PROFILE_STOP)
+
if (state == SS_RUNNING)
state = SS_IDLE
current_tick_budget -= queue_node_priority
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index ddeb9368f500b..b01f4b17b9de4 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -38,6 +38,12 @@
///Bitmap of what game states can this subsystem fire at. See [RUNLEVELS_DEFAULT] for more details.
var/runlevels = RUNLEVELS_DEFAULT //points of the game at which the SS can fire
+ /**
+ * boolean set by admins. if TRUE then this subsystem will stop the world profiler after ignite() returns and start it again when called.
+ * used so that you can audit a specific subsystem or group of subsystems' synchronous call chain.
+ */
+ var/profiler_focused = FALSE
+
/*
* The following variables are managed by the MC and should not be modified directly.
*/
@@ -65,7 +71,7 @@
/// Tracks the current execution state of the subsystem. Used to handle subsystems that sleep in fire so the mc doesn't run them again while they are sleeping
var/state = SS_IDLE
-
+
/// Tracks how many times a subsystem has ever slept in fire().
var/slept_count = 0
From cadb787f26b54bb24e863ac4417356650b6159f3 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Fri, 16 Feb 2024 00:16:15 +1300
Subject: [PATCH 24/56] Automatic changelog for PR #81461 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81461.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81461.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81461.yml b/html/changelogs/AutoChangeLog-pr-81461.yml
new file mode 100644
index 0000000000000..783e7e3825655
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81461.yml
@@ -0,0 +1,4 @@
+author: "Kylerace"
+delete-after: True
+changes:
+ - admin: "admins/maintainers can now make the profiler focus on specific subsystems by setting the subsystem var profile_focused to TRUE"
\ No newline at end of file
From b98edb898ea99129da0e00c753234884a014f6fe Mon Sep 17 00:00:00 2001
From: WinterDarkraven <70779744+WinterDarkraven@users.noreply.github.com>
Date: Thu, 15 Feb 2024 18:53:13 +0000
Subject: [PATCH 25/56] Stun Baton Eyecandy | Glows and Sparks (#81449)
## About The Pull Request
Adds a soft glow and sparks to the stun baton and stun prod. Video
below:
https://github.com/tgstation/tgstation/assets/70779744/468351ef-0574-46b9-8d32-58cf40651f3a
## Why It's Good For The Game
Looks cool.
## Changelog
:cl:
add: In an attempt to stop the greytide, NanoTrasen has increased
security's baton energy output. This has, through testing, done nothing
but make the device spark more than it used to.
/:cl:
---
code/game/objects/items/melee/baton.dm | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index da0bf1dbc64fb..b692b58bfcf2d 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -427,6 +427,12 @@
on_stun_volume = 50
active = FALSE
context_living_rmb_active = "Harmful Stun"
+ light_range = 1.5
+ light_system = OVERLAY_LIGHT
+ light_on = FALSE
+ light_color = LIGHT_COLOR_ORANGE
+ light_power = 0.5
+
var/throw_stun_chance = 35
var/obj/item/stock_parts/cell/cell
@@ -541,6 +547,8 @@
active = !active
balloon_alert(user, "turned [active ? "on" : "off"]")
playsound(src, SFX_SPARKS, 75, TRUE, -1)
+ toggle_light(user)
+ do_sparks(1, TRUE, src)
else
active = FALSE
if(!cell)
@@ -550,6 +558,11 @@
update_appearance()
add_fingerprint(user)
+/// Toggles the stun baton's light
+/obj/item/melee/baton/security/proc/toggle_light(mob/user)
+ set_light_on(!light_on)
+ return
+
/obj/item/melee/baton/security/proc/deductcharge(deducted_charge)
if(!cell)
return
@@ -559,6 +572,7 @@
if(active && cell.charge < cell_hit_cost)
//we're below minimum, turn off
active = FALSE
+ set_light_on(FALSE)
update_appearance()
playsound(src, SFX_SPARKS, 75, TRUE, -1)
@@ -649,6 +663,8 @@
if (!cell || cell.charge < cell_hit_cost)
return
active = !active
+ toggle_light()
+ do_sparks(1, TRUE, src)
playsound(src, SFX_SPARKS, 75, TRUE, -1)
update_appearance()
From a55e1671ee7b6ab3d432fefcc928d420711c6e11 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Fri, 16 Feb 2024 07:53:36 +1300
Subject: [PATCH 26/56] Automatic changelog for PR #81449 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81449.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81449.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81449.yml b/html/changelogs/AutoChangeLog-pr-81449.yml
new file mode 100644
index 0000000000000..639375b79db26
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81449.yml
@@ -0,0 +1,4 @@
+author: "WinterDarkraven"
+delete-after: True
+changes:
+ - rscadd: "In an attempt to stop the greytide, NanoTrasen has increased security's baton energy output. This has, through testing, done nothing but make the device spark more than it used to."
\ No newline at end of file
From f64e5de1f6252f08fbee0b7fb5791da4477678c5 Mon Sep 17 00:00:00 2001
From: _0Steven <42909981+00-Steven@users.noreply.github.com>
Date: Thu, 15 Feb 2024 19:59:13 +0100
Subject: [PATCH 27/56] Fix lizardperson spine preference dropdown not showing
up (#81475)
## About The Pull Request
I was recently told about the fact that apparently spines are missing
from lizardperson customization.
Looking into it, it seems like this was caused by #80952 performing an
unrelated line removal, presumably by accident while copying something
over.
Re-adding this line seems to make it work fine.
## Why It's Good For The Game
Fixes the lizardperson spine preference dropdown not showing up in the
character menu.
## Changelog
:cl:
fix: Fixed the lizardperson spine preference dropdown not showing up in
the character menu.
/:cl:
---
code/modules/surgery/organs/external/spines.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/modules/surgery/organs/external/spines.dm b/code/modules/surgery/organs/external/spines.dm
index 524810a2a67c3..743b7fa8d47f2 100644
--- a/code/modules/surgery/organs/external/spines.dm
+++ b/code/modules/surgery/organs/external/spines.dm
@@ -7,6 +7,8 @@
zone = BODY_ZONE_CHEST
slot = ORGAN_SLOT_EXTERNAL_SPINES
+ preference = "feature_lizard_spines"
+
dna_block = DNA_SPINES_BLOCK
restyle_flags = EXTERNAL_RESTYLE_FLESH
From 48d6e6cc04d042f9094f72a726511ec579ff8ac6 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Fri, 16 Feb 2024 07:59:31 +1300
Subject: [PATCH 28/56] Automatic changelog for PR #81475 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81475.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81475.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81475.yml b/html/changelogs/AutoChangeLog-pr-81475.yml
new file mode 100644
index 0000000000000..a17eac7da1550
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81475.yml
@@ -0,0 +1,4 @@
+author: "00-Steven"
+delete-after: True
+changes:
+ - bugfix: "Fixed the lizardperson spine preference dropdown not showing up in the character menu."
\ No newline at end of file
From a4fc21d275a3833903a9f6d219a9dd3548bd0b03 Mon Sep 17 00:00:00 2001
From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Date: Thu, 15 Feb 2024 17:06:07 -0500
Subject: [PATCH 29/56] Adds support for different achievement dmis (#81471)
## About The Pull Request
I am back to pushing my code improvements upstream, sorry in advance.
As the title says, this adds support for achievement icons to be in
different dmi files than the default, pretty much the exact same way
that Language icons (for chat assets) do.
## Why It's Good For The Game
It is one of the few things in game (the only other thing i can think of
that does this rn is barsigns) that cannot have their icon changed when
trying to make a subtype, this is very limiting and very annoying,
especially since dmi conflicts are one of the worst types to deal with,
this would make my life a lot easier.
## Changelog
No player-facing changes.
---
code/datums/achievements/_achievement_data.dm | 2 +-
code/datums/achievements/_awards.dm | 10 +--
code/datums/achievements/boss_achievements.dm | 40 +++++------
code/datums/achievements/job_achievements.dm | 18 ++---
.../datums/achievements/mafia_achievements.dm | 36 +++++-----
code/datums/achievements/misc_achievements.dm | 72 +++++++++----------
.../datums/achievements/skill_achievements.dm | 4 +-
.../asset_cache/assets/achievements.dm | 10 ++-
code/modules/unit_tests/achievements.dm | 6 +-
9 files changed, 103 insertions(+), 95 deletions(-)
diff --git a/code/datums/achievements/_achievement_data.dm b/code/datums/achievements/_achievement_data.dm
index 295770b89b5b7..8b78cf7c8f387 100644
--- a/code/datums/achievements/_achievement_data.dm
+++ b/code/datums/achievements/_achievement_data.dm
@@ -113,7 +113,7 @@
"name" = award.name,
"desc" = award.desc,
"category" = award.category,
- "icon_class" = assets.icon_class_name(award.icon),
+ "icon_class" = assets.icon_class_name("achievement-[award.icon_state]"),
"value" = data[achievement_type],
)
award_data += award.get_ui_data(user.ckey)
diff --git a/code/datums/achievements/_awards.dm b/code/datums/achievements/_awards.dm
index 23ab5e81001c9..d99659ea780f9 100644
--- a/code/datums/achievements/_awards.dm
+++ b/code/datums/achievements/_awards.dm
@@ -2,8 +2,10 @@
///Name of the achievement, If null it won't show up in the achievement browser. (Handy for inheritance trees)
var/name
var/desc = "You did it."
- ///The icon state for this award. The icon file is found in ui_icons/achievements.
- var/icon = "default"
+ ///The dmi icon file that holds the award's icon state.
+ var/icon = ACHIEVEMENTS_SET
+ ///The icon state for this award.
+ var/icon_state = "default"
var/category = "Normal"
@@ -80,7 +82,7 @@
///Achievements are one-off awards for usually doing cool things.
/datum/award/achievement
desc = "Achievement for epic people"
- icon = "" // This should warn contributors that do not declare an icon when contributing new achievements.
+ icon_state = "" // This should warn contributors that do not declare an icon when contributing new achievements.
///How many players have earned this achievement
var/times_achieved = 0
@@ -171,7 +173,7 @@
/datum/award/score/achievements_score
name = "Achievements Unlocked"
desc = "Don't worry, metagaming is all that matters."
- icon = "elephant" //Obey the reference
+ icon_state = "elephant" //Obey the reference
database_id = ACHIEVEMENTS_SCORE
/datum/award/score/achievements_score/get_ui_data(key)
diff --git a/code/datums/achievements/boss_achievements.dm b/code/datums/achievements/boss_achievements.dm
index a378b703e46ed..c02286b8f7a58 100644
--- a/code/datums/achievements/boss_achievements.dm
+++ b/code/datums/achievements/boss_achievements.dm
@@ -5,119 +5,119 @@
name = "Tendril Exterminator"
desc = "Watch your step"
database_id = BOSS_MEDAL_TENDRIL
- icon = "tendril"
+ icon_state = "tendril"
/datum/award/achievement/boss/boss_killer
name = "Boss Killer"
desc = "You've come a long ways from asking how to switch hands."
database_id = "Boss Killer"
- icon = "firstboss"
+ icon_state = "firstboss"
/datum/award/achievement/boss/blood_miner_kill
name = "Blood-Drunk Miner Killer"
desc = "I guess he couldn't handle his drink that well."
database_id = BOSS_MEDAL_MINER
- icon = "miner"
+ icon_state = "miner"
/datum/award/achievement/boss/demonic_miner_kill
name = "Demonic-Frost Miner Killer"
desc = "Definitely harder than the Blood-Drunk Miner."
database_id = BOSS_MEDAL_FROSTMINER
- icon = "frostminer"
+ icon_state = "frostminer"
/datum/award/achievement/boss/bubblegum_kill
name = "Bubblegum Killer"
desc = "I guess he wasn't made of candy after all"
database_id = BOSS_MEDAL_BUBBLEGUM
- icon = "bbgum"
+ icon_state = "bbgum"
/datum/award/achievement/boss/colossus_kill
name = "Colossus Killer"
desc = "The bigger they are... the better the loot"
database_id = BOSS_MEDAL_COLOSSUS
- icon = "colossus"
+ icon_state = "colossus"
/datum/award/achievement/boss/drake_kill
name = "Drake Killer"
desc = "Now I can wear Rune Platebodies!"
database_id = BOSS_MEDAL_DRAKE
- icon = "drake"
+ icon_state = "drake"
/datum/award/achievement/boss/hierophant_kill
name = "Hierophant Killer"
desc = "Hierophant, but not triumphant."
database_id = BOSS_MEDAL_HIEROPHANT
- icon = "hierophant"
+ icon_state = "hierophant"
/datum/award/achievement/boss/legion_kill
name = "Legion Killer"
desc = "We were many..now we are none."
database_id = BOSS_MEDAL_LEGION
- icon = "legion"
+ icon_state = "legion"
/datum/award/achievement/boss/wendigo_kill
name = "Wendigo Killer"
desc = "You've now ruined years of mythical storytelling."
database_id = BOSS_MEDAL_WENDIGO
- icon = "wendigo"
+ icon_state = "wendigo"
/datum/award/achievement/boss/blood_miner_crusher
name = "Blood-Drunk Miner Crusher"
desc = "I guess he couldn't handle his drink that well."
database_id = BOSS_MEDAL_MINER_CRUSHER
- icon = "miner"
+ icon_state = "miner"
/datum/award/achievement/boss/demonic_miner_crusher
name = "Demonic-Frost Miner Crusher"
desc = "Definitely harder than the Blood-Drunk Miner."
database_id = BOSS_MEDAL_FROSTMINER_CRUSHER
- icon = "frostminer"
+ icon_state = "frostminer"
/datum/award/achievement/boss/bubblegum_crusher
name = "Bubblegum Crusher"
desc = "I guess he wasn't made of candy after all"
database_id = BOSS_MEDAL_BUBBLEGUM_CRUSHER
- icon = "bbgum"
+ icon_state = "bbgum"
/datum/award/achievement/boss/colossus_crusher
name = "Colossus Crusher"
desc = "The bigger they are... the better the loot"
database_id = BOSS_MEDAL_COLOSSUS_CRUSHER
- icon = "colossus"
+ icon_state = "colossus"
/datum/award/achievement/boss/drake_crusher
name = "Drake Crusher"
desc = "Now I can wear Rune Platebodies!"
database_id = BOSS_MEDAL_DRAKE_CRUSHER
- icon = "drake"
+ icon_state = "drake"
/datum/award/achievement/boss/hierophant_crusher
name = "Hierophant Crusher"
desc = "Hierophant, but not triumphant."
database_id = BOSS_MEDAL_HIEROPHANT_CRUSHER
- icon = "hierophant"
+ icon_state = "hierophant"
/datum/award/achievement/boss/legion_crusher
name = "Legion Crusher"
desc = "We were many... now we are none."
database_id = BOSS_MEDAL_LEGION_CRUSHER
- icon = "legion"
+ icon_state = "legion"
/datum/award/achievement/boss/wendigo_crusher
name = "Wendigo Crusher"
desc = "You've now ruined years of mythical storytelling."
database_id = BOSS_MEDAL_WENDIGO_CRUSHER
- icon = "wendigo"
+ icon_state = "wendigo"
//should be removed soon
/datum/award/achievement/boss/king_goat_kill
name = "King Goat Killer"
desc = "The king is dead, long live the king!"
database_id = BOSS_MEDAL_KINGGOAT
- icon = "goatboss"
+ icon_state = "goatboss"
/datum/award/achievement/boss/king_goat_crusher
name = "King Goat Crusher"
desc = "The king is dead, long live the king!"
database_id = BOSS_MEDAL_KINGGOAT_CRUSHER
- icon = "goatboss"
+ icon_state = "goatboss"
diff --git a/code/datums/achievements/job_achievements.dm b/code/datums/achievements/job_achievements.dm
index 6aafbee8e68d1..bd37de7c0e112 100644
--- a/code/datums/achievements/job_achievements.dm
+++ b/code/datums/achievements/job_achievements.dm
@@ -8,7 +8,7 @@
name = "All Within Theoretical Limits"
desc = "I never thought I'd see a resonance cascade, let alone prevent one..."
database_id = MEDAL_THEORETICAL_LIMITS
- icon = "theoreticallimits"
+ icon_state = "theoreticallimits"
//medical
@@ -16,13 +16,13 @@
name = "Mister Sandman"
desc = "Mechanically speaking, there's no real benefit to being unconscious during surgery. Weird how insistent this doctor is about using the N2O anyway though, huh?"
database_id = MEDAL_SANDMAN
- icon = "basemisc"
+ icon_state = "basemisc"
/datum/award/achievement/jobs/helbitaljanken
name = "Helbitaljanken"
desc = "You janked hard"
database_id = MEDAL_HELBITALJANKEN
- icon = "helbital"
+ icon_state = "helbital"
//mining
@@ -30,7 +30,7 @@
name = "Frenching"
desc = "Just a taste, for science!"
database_id = MEDAL_FRENCHING
- icon = "frenchingthebubble"
+ icon_state = "frenchingthebubble"
//science
@@ -38,13 +38,13 @@
name = "Feat of Strength"
desc = "If the rod is immovable, is it passing you or are you passing it?"
database_id = MEDAL_RODSUPLEX
- icon = "featofstrength"
+ icon_state = "featofstrength"
/datum/award/achievement/jobs/snail
name = "KKKiiilll mmmeee"
desc = "You were a little too ambitious, but hey, I guess you're still alive?"
database_id = MEDAL_SNAIL
- icon = "snail"
+ icon_state = "snail"
//all of service! hip hip!
@@ -52,18 +52,18 @@
name = "Centcom Grade: Shitty Service"
desc = "Well, you at least tried. How about trying harder?"
database_id = MEDAL_BAD_SERVICE
- icon = "service_bad"
+ icon_state = "service_bad"
/datum/award/achievement/jobs/service_okay
name = "Centcom Grade: Acceptable Service"
desc = "Well, it'll do! You and your department did just fine."
database_id = MEDAL_OKAY_SERVICE
- icon = "service_okay"
+ icon_state = "service_okay"
/datum/award/achievement/jobs/service_good
name = "Centcom Grade: Exemplary Service"
desc = "Centcom is very impressed with your department!"
database_id = MEDAL_GOOD_SERVICE
- icon = "service_good"
+ icon_state = "service_good"
//civilian achievies! while not recognized by the code, it is recognized by our hearts
diff --git a/code/datums/achievements/mafia_achievements.dm b/code/datums/achievements/mafia_achievements.dm
index da70fb11e871f..31462f7a0ce2f 100644
--- a/code/datums/achievements/mafia_achievements.dm
+++ b/code/datums/achievements/mafia_achievements.dm
@@ -7,103 +7,103 @@
name = "Assistant Victory"
desc = "If you got killed instead of someone more important, you just flexed the true strength of your \"\"\"\"role\"\"\"\"."
database_id = MAFIA_MEDAL_ASSISTANT
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/detective
name = "Detective Victory"
desc = "If you did this with a Medical Doctor in the game, i'm not really that impressed."
database_id = MAFIA_MEDAL_DETECTIVE
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/psychologist
name = "Psychologist Victory"
desc = "You learned how to not reveal someone random night one! Or... maybe you're just a lucky bastard."
database_id = MAFIA_MEDAL_PSYCHOLOGIST
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/chaplain
name = "Chaplain Victory"
desc = "Useless... until the one night the thoughtfeeder confidently claims themselves as detective. Mafia's true bullshit detector."
database_id = MAFIA_MEDAL_CHAPLAIN
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/md
name = "Medical Doctor Victory"
desc = "Congratulations on learning how to not talk!"
database_id = MAFIA_MEDAL_MD
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/officer
name = "Security Officer Victory"
desc = "Don't worry, you can win this if you're dead! You... did use your ability to become dead, right?"
database_id = MAFIA_MEDAL_OFFICER
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/lawyer
name = "Lawyer Victory"
desc = "Oh don't mind me, i'm just the worst rol- Oops, I just instantly ended the game."
database_id = MAFIA_MEDAL_LAWYER
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/hop
name = "Head of Personnel Victory"
desc = "King of Assistants, waster of a single mafia's night, thrower of games."
database_id = MAFIA_MEDAL_HOP
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/warden
name = "Warden Victory"
desc = "Make changelings think you're detective, go on lockdown, actual detective investigates you and dies. Cha cha real smooth!"
database_id = MAFIA_MEDAL_WARDEN
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/hos
name = "Head of Security Victory"
desc = "Certified not shitcurity."
database_id = MAFIA_MEDAL_HOS
- icon = "town"
+ icon_state = "town"
/datum/award/achievement/mafia/changeling
name = "Changeling Victory"
desc = "I think the changelings are metacomming."
database_id = MAFIA_MEDAL_CHANGELING
- icon = "mafia"
+ icon_state = "mafia"
/datum/award/achievement/mafia/thoughtfeeder
name = "Thoughtfeeder Victory"
desc = "Clown's best friend. And Obsessed. And fugitive? Whose side are you on?!"
database_id = MAFIA_MEDAL_THOUGHTFEEDER
- icon = "mafia"
+ icon_state = "mafia"
/datum/award/achievement/mafia/traitor
name = "Traitor Victory"
desc = "Guys, we still have two more changelings to ki-!! TRAITOR VICTORY !!"
database_id = MAFIA_MEDAL_TRAITOR
- icon = "neutral"
+ icon_state = "neutral"
/datum/award/achievement/mafia/nightmare
name = "Nightmare Victory"
desc = "DID YOUR LIGHT FLICKER?!"
database_id = MAFIA_MEDAL_NIGHTMARE
- icon = "neutral"
+ icon_state = "neutral"
/datum/award/achievement/mafia/fugitive
name = "Fugitive Victory"
desc = "I'm just the description on an achievement, but if you end up having to choose between town and changelings, go changelings."
database_id = MAFIA_MEDAL_FUGITIVE
- icon = "neutral"
+ icon_state = "neutral"
/datum/award/achievement/mafia/obsessed
name = "Obsessed Victory"
desc = "You got your target lynched, so instead of being spiteful and annoying, you're just smug and annoying."
database_id = MAFIA_MEDAL_OBSESSED
- icon = "neutral"
+ icon_state = "neutral"
/datum/award/achievement/mafia/clown
name = "Clown Victory"
desc = "Did you know this works on traitors, despite their immunity? If you hit the jackpot and manage to kill one, they'll salt into the next dimension. Clown tips!"
database_id = MAFIA_MEDAL_CLOWN
- icon = "neutral"
+ icon_state = "neutral"
///ALL THE ACHIEVEMENTS FOR MISC MAFIA ODDITIES///
@@ -111,4 +111,4 @@
name = "Universally Hated"
desc = "Managed to get more than 12 votes when put up on trial, jesus christ."
database_id = MAFIA_MEDAL_HATED
- icon = "hated"
+ icon_state = "hated"
diff --git a/code/datums/achievements/misc_achievements.dm b/code/datums/achievements/misc_achievements.dm
index e452b860f0072..e92fc3bc56b91 100644
--- a/code/datums/achievements/misc_achievements.dm
+++ b/code/datums/achievements/misc_achievements.dm
@@ -1,54 +1,54 @@
/datum/award/achievement/misc
category = "Misc"
- icon = "basemisc" //for those achievements that still need an actual icon, later.
+ icon_state = "basemisc" //for those achievements that still need an actual icon, later.
/datum/award/achievement/misc/meteor_examine
name = "Your Life Before Your Eyes"
desc = "Take a close look at hurtling space debris"
database_id = MEDAL_METEOR
- icon = "meteors"
+ icon_state = "meteors"
/datum/award/achievement/misc/pulse
name = "Jackpot"
desc = "Win a pulse rifle from an arcade machine"
database_id = MEDAL_PULSE
- icon = "jackpot"
+ icon_state = "jackpot"
/datum/award/achievement/misc/time_waste
name = "Time waster"
desc = "Speak no evil, hear no evil, see just errors"
database_id = MEDAL_TIMEWASTE
- icon = "timewaste"
+ icon_state = "timewaste"
/datum/award/achievement/misc/round_and_full
name = "Round and Full"
desc = "Well at least you aren't down the river, I hear they eat people there."
database_id = MEDAL_CLOWNCARKING
- icon = "clownking"
+ icon_state = "clownking"
/datum/award/achievement/misc/the_best_driver
name = "The Best Driver"
desc = "100 honks later"
database_id = MEDAL_THANKSALOT
- icon = "clownthanks"
+ icon_state = "clownthanks"
/datum/award/achievement/misc/getting_an_upgrade
name = "Getting an upgrade"
desc = "Make your first unique material item!"
database_id = MEDAL_MATERIALCRAFT
- icon = "upgrade"
+ icon_state = "upgrade"
/datum/award/achievement/misc/rocket_holdup
name = "Disk, Please!"
desc = "Is the man currently pointing a loaded rocket launcher at your head point blank really dumb enough to pull the trigger? Do you really want to find out?"
database_id = MEDAL_DISKPLEASE
- icon = "rocket_holdup"
+ icon_state = "rocket_holdup"
/datum/award/achievement/misc/gamer
name = "My Watchlist Status is Not Important"
desc = "You may be under the impression that violent video games are a harmless pastime, but the security and medical personnel swarming your location with batons and knockout gas look like they disagree."
database_id = MEDAL_GAMER
- icon = "live_sec_reaction"
+ icon_state = "live_sec_reaction"
/datum/award/achievement/misc/vendor_squish
name = "I Was a Teenage Anarchist"
@@ -69,161 +69,161 @@
name = "One Lean, Mean, Cleaning Machine"
desc = "How does it feel to know that your workplace values a mop bucket on wheels more than you?" // i can do better than this give me time
database_id = MEDAL_CLEANBOSS
- icon = "cleanboss"
+ icon_state = "cleanboss"
/datum/award/achievement/misc/rule8
name = "Rule 8"
desc = "Call an admin this is ILLEGAL!!"
database_id = MEDAL_RULE8
- icon = "rule8"
+ icon_state = "rule8"
/datum/award/achievement/misc/speed_round
name = "Long shift"
desc = "Well, that didn't take long."
database_id = MEDAL_LONGSHIFT
- icon = "longshift"
+ icon_state = "longshift"
/datum/award/achievement/misc/lookoutsir
name = "Look Out, Sir!"
desc = "Either awarded for making the ultimate sacrifice for your comrades, or a really dumb attempt at grenade jumping."
database_id = MEDAL_LOOKOUTSIR
- icon = "martyr" // purple heart on an explosive danger warning sign (well, sort of)
+ icon_state = "martyr" // purple heart on an explosive danger warning sign (well, sort of)
/datum/award/achievement/misc/gottem
name = "HA, GOTTEM"
desc = "Made you look!"
database_id = MEDAL_GOTTEM
- icon = "gottem"
+ icon_state = "gottem"
/datum/award/achievement/misc/ascension
name = "Ascension"
desc = "Caedite eos. Novit enim Dominus qui sunt eius."
database_id = MEDAL_ASCENSION
- icon = "ascension"
+ icon_state = "ascension"
/datum/award/achievement/misc/ash_ascension
name = "Nightwatcher's Eyes"
desc = "You've risen above the flames, became one with the ashes. You've been reborn as one with the Nightwatcher."
database_id = MEDAL_ASH_ASCENSION
- icon = "ashascend"
+ icon_state = "ashascend"
/datum/award/achievement/misc/flesh_ascension
name = "Vortex of Arms"
desc = "You've became something more, something greater. A piece of the emperor resides within you, and you within him."
database_id = MEDAL_FLESH_ASCENSION
- icon = "fleshascend"
+ icon_state = "fleshascend"
/datum/award/achievement/misc/rust_ascension
name = "Hills of Rust"
desc = "You've summoned a piece of the Hill of rust, and so the Hills welcome you."
database_id = MEDAL_RUST_ASCENSION
- icon = "rustascend"
+ icon_state = "rustascend"
/datum/award/achievement/misc/void_ascension
name = "All that perish"
desc = "Place of a different being, different time. Everything ends there... but maybe it is just the beginning?"
database_id = MEDAL_VOID_ASCENSION
- icon = "voidascend"
+ icon_state = "voidascend"
/datum/award/achievement/misc/blade_ascension
name = "Silver and Steel"
desc = "You've become the master of all duellists - the paragon of blades."
database_id = MEDAL_BLADE_ASCENSION
- icon = "bladeascend"
+ icon_state = "bladeascend"
/datum/award/achievement/misc/cosmic_ascension
name = "It arrived"
desc = "You managed to teleport an entity on the station that really shouldn't be there."
database_id = MEDAL_COSMOS_ASCENSION
- icon = "cosmicascend"
+ icon_state = "cosmicascend"
/datum/award/achievement/misc/lock_ascension
name = "Secrets of the Locked Labyrinth"
desc = "You managed to open a gate into the mansus."
database_id = MEDAL_LOCK_ASCENSION
- icon = "lockascend"
+ icon_state = "lockascend"
/datum/award/achievement/misc/moon_ascension
name = "The Last Act"
desc = "You managed to become the ringleader and slay the lie."
database_id = MEDAL_MOON_ASCENSION
- icon = "moonascend"
+ icon_state = "moonascend"
/datum/award/achievement/misc/grand_ritual_finale
name = "Archmage"
desc = "Made a big impression on the station with your phenomenal cosmic power."
database_id = MEDAL_ARCHMAGE
- icon = "archmage"
+ icon_state = "archmage"
/datum/award/achievement/misc/toolbox_soul
name = "SOUL'd Out"
desc = "My eternal soul was destroyed to make a toolbox look funny and all I got was this achievement..."
database_id = MEDAL_TOOLBOX_SOUL
- icon = "toolbox_soul"
+ icon_state = "toolbox_soul"
/datum/award/achievement/misc/hot_damn
name = "Hot Damn!"
desc = "Sometimes you need to make some noise to make a point."
database_id = MEDAL_HOT_DAMN
- icon = "hotdamn"
+ icon_state = "hotdamn"
/datum/award/achievement/misc/cayenne_disk
name = "Very Important Piscis"
desc = "You can rest well now."
database_id = MEDAL_CAYENNE_DISK
- icon = "cayenne_disk"
+ icon_state = "cayenne_disk"
/datum/award/achievement/misc/tram_surfer
name = "Tram Surfer"
desc = "Lights out, guerilla radio!"
database_id = MEDAL_TRAM_SURFER
- icon = "tram_surfer"
+ icon_state = "tram_surfer"
/datum/award/achievement/misc/cult_shuttle_omfg
name = "WHAT JUST HAPPENED"
desc = "As a blood cultist, be part of a team that summons 3 shuttle curses within 10 seconds. Imagine cleaning up after them, g r o s s!"
database_id = MEDAL_CULT_SHUTTLE_OMFG
- icon = "cult_shuttle_omfg"
+ icon_state = "cult_shuttle_omfg"
/datum/award/achievement/misc/clickbait
name = "Clickbait"
desc = "Where's my free smartphone?!?"
database_id = MEDAL_CLICKBAIT
- icon = "bait"
+ icon_state = "bait"
/datum/award/achievement/misc/narsupreme
name = "If Nar'Sie is so good, why isn't there a..."
desc = "Even interdimensional space deitys need a friend."
database_id = MEDAL_NARSUPREME
- icon = "narsupreme"
+ icon_state = "narsupreme"
/datum/award/achievement/misc/springlock
name = "The Man Inside the MODsuit"
desc = "Ignore the warning label on a springlock MODsuit."
database_id = MEDAL_SPRINGLOCK
- icon = "springlock"
+ icon_state = "springlock"
/datum/award/achievement/misc/healthy
name = "The Picture of Health"
desc = "Don't be such a baby, it's just a heart attack. You've bounced back from worse!"
database_id = MEDAL_HEALTHY
- icon = "picofhealth"
+ icon_state = "picofhealth"
/datum/award/achievement/misc/gods_wrath
name = "God's Wrath"
desc = "Did you think you could get away with defiling the word of God?"
database_id = MEDAL_GODS_WRATH
- icon = "godswrath"
+ icon_state = "godswrath"
/datum/award/achievement/misc/earthquake_victim
name = "A Nasty Fall"
desc = "...And the earth opened its mouth and swallowed them and their station- all the HOP's men and all their possessions."
database_id = MEDAL_EARTHQUAKE_VICTIM
- icon = "earthquake"
+ icon_state = "earthquake"
/datum/award/achievement/misc/debt_extinguished
name = "Outdebted"
desc = "I've paid my dues, shift after shift... I've done my sentence but commited no griff..."
database_id = MEDAL_DEBT_EXTINGUISHED
- icon = "outdebted"
+ icon_state = "outdebted"
diff --git a/code/datums/achievements/skill_achievements.dm b/code/datums/achievements/skill_achievements.dm
index 6384b1b3db4ad..7e2f3f1a24742 100644
--- a/code/datums/achievements/skill_achievements.dm
+++ b/code/datums/achievements/skill_achievements.dm
@@ -5,10 +5,10 @@
name = "Legendary miner"
desc = "No mere rock can stop me!"
database_id = MEDAL_LEGENDARY_MINER
- icon = "mining"
+ icon_state = "mining"
/datum/award/achievement/skill/legendary_fisher
name = "Legendary fisher"
desc = "Give a spaceman a fish and you feed him for a while; teach a spaceman to fish and you feed him until the shuttle arrives."
database_id = MEDAL_LEGENDARY_FISHER
- icon = "fishing_hat"
+ icon_state = "fishing_hat"
diff --git a/code/modules/asset_cache/assets/achievements.dm b/code/modules/asset_cache/assets/achievements.dm
index 1ba7b91af92b9..91f2d75b6d581 100644
--- a/code/modules/asset_cache/assets/achievements.dm
+++ b/code/modules/asset_cache/assets/achievements.dm
@@ -1,5 +1,11 @@
/datum/asset/spritesheet/simple/achievements
- name ="achievements"
+ name = "achievements"
/datum/asset/spritesheet/simple/achievements/create_spritesheets()
- InsertAll("", ACHIEVEMENTS_SET)
+ InsertAll("achievement", ACHIEVEMENTS_SET)
+ // catch achievements which are pulling icons from another file
+ for(var/datum/award/other_award as anything in subtypesof(/datum/award))
+ var/icon = initial(other_award.icon)
+ if (icon != ACHIEVEMENTS_SET)
+ var/icon_state = initial(other_award.icon_state)
+ Insert("achievement-[icon_state]", icon, icon_state=icon_state)
diff --git a/code/modules/unit_tests/achievements.dm b/code/modules/unit_tests/achievements.dm
index 44e1384c2e01a..decda52a2f5d7 100644
--- a/code/modules/unit_tests/achievements.dm
+++ b/code/modules/unit_tests/achievements.dm
@@ -2,13 +2,13 @@
/datum/unit_test/achievements
/datum/unit_test/achievements/Run()
- var/award_icons = icon_states(ACHIEVEMENTS_SET)
for(var/datum/award/award as anything in subtypesof(/datum/award))
if(!initial(award.name)) //Skip abstract achievements types
continue
var/init_icon = initial(award.icon)
- if(!init_icon || !(init_icon in award_icons))
- TEST_FAIL("Award [initial(award.name)] has an unexistent icon: \"[init_icon || "null"]\"")
+ var/init_icon_state = initial(award.icon_state)
+ if(!init_icon_state || !icon_exists(init_icon, init_icon_state))
+ TEST_FAIL("Award [initial(award.name)] has a non-existent icon in [init_icon]: \"[init_icon_state || "null"]\"")
if(length(initial(award.database_id)) > 32) //sql schema limit
TEST_FAIL("Award [initial(award.name)] database id is too long")
var/init_category = initial(award.category)
From a9abb3e7c932a791d43e91a0200f2cace4629285 Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Fri, 16 Feb 2024 00:19:27 +0000
Subject: [PATCH 30/56] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-81449.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81461.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81464.yml | 4 ----
html/changelogs/AutoChangeLog-pr-81475.yml | 4 ----
html/changelogs/archive/2024-02.yml | 13 +++++++++++++
5 files changed, 13 insertions(+), 16 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-81449.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81461.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81464.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-81475.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81449.yml b/html/changelogs/AutoChangeLog-pr-81449.yml
deleted file mode 100644
index 639375b79db26..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81449.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "WinterDarkraven"
-delete-after: True
-changes:
- - rscadd: "In an attempt to stop the greytide, NanoTrasen has increased security's baton energy output. This has, through testing, done nothing but make the device spark more than it used to."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81461.yml b/html/changelogs/AutoChangeLog-pr-81461.yml
deleted file mode 100644
index 783e7e3825655..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81461.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kylerace"
-delete-after: True
-changes:
- - admin: "admins/maintainers can now make the profiler focus on specific subsystems by setting the subsystem var profile_focused to TRUE"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81464.yml b/html/changelogs/AutoChangeLog-pr-81464.yml
deleted file mode 100644
index 97f057943a4c3..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81464.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LemonInTheDark"
-delete-after: True
-changes:
- - refactor: "Fucks with how movement keys are handled. Please report any bugs"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-81475.yml b/html/changelogs/AutoChangeLog-pr-81475.yml
deleted file mode 100644
index a17eac7da1550..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-81475.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "00-Steven"
-delete-after: True
-changes:
- - bugfix: "Fixed the lizardperson spine preference dropdown not showing up in the character menu."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml
index 3834cc554d067..6afd8b08c3696 100644
--- a/html/changelogs/archive/2024-02.yml
+++ b/html/changelogs/archive/2024-02.yml
@@ -433,3 +433,16 @@
- bugfix: Valentines no longer see themselves covered in hearts. They only see their
Valentine covered in hearts.
- balance: Scientists have discovered Nuka Cola is not good for short term health.
+2024-02-16:
+ 00-Steven:
+ - bugfix: Fixed the lizardperson spine preference dropdown not showing up in the
+ character menu.
+ Kylerace:
+ - admin: admins/maintainers can now make the profiler focus on specific subsystems
+ by setting the subsystem var profile_focused to TRUE
+ LemonInTheDark:
+ - refactor: Fucks with how movement keys are handled. Please report any bugs
+ WinterDarkraven:
+ - rscadd: In an attempt to stop the greytide, NanoTrasen has increased security's
+ baton energy output. This has, through testing, done nothing but make the device
+ spark more than it used to.
From db5199e535084e1a14daf70d04fe0090df269622 Mon Sep 17 00:00:00 2001
From: _0Steven <42909981+00-Steven@users.noreply.github.com>
Date: Fri, 16 Feb 2024 09:45:28 +0100
Subject: [PATCH 31/56] Fixes space cats not being able to survive in space.
(#81482)
---
code/modules/mob/living/basic/pets/cat/cat.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/mob/living/basic/pets/cat/cat.dm b/code/modules/mob/living/basic/pets/cat/cat.dm
index 207599a1d164a..dd8a588e91502 100644
--- a/code/modules/mob/living/basic/pets/cat/cat.dm
+++ b/code/modules/mob/living/basic/pets/cat/cat.dm
@@ -134,6 +134,7 @@
icon_state = "spacecat"
icon_living = "spacecat"
icon_dead = "spacecat_dead"
+ unsuitable_atmos_damage = 0
minimum_survivable_temperature = TCMB
maximum_survivable_temperature = T0C + 40
held_state = "spacecat"
From 091b5330dec199ea557e4cdc7e047372ebf3da86 Mon Sep 17 00:00:00 2001
From: orange man <61334995+comfyorange@users.noreply.github.com>
Date: Fri, 16 Feb 2024 21:45:50 +1300
Subject: [PATCH 32/56] Automatic changelog for PR #81482 [ci skip]
---
html/changelogs/AutoChangeLog-pr-81482.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-81482.yml
diff --git a/html/changelogs/AutoChangeLog-pr-81482.yml b/html/changelogs/AutoChangeLog-pr-81482.yml
new file mode 100644
index 0000000000000..7306b7c28b4de
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-81482.yml
@@ -0,0 +1,4 @@
+author: "00-Steven"
+delete-after: True
+changes:
+ - bugfix: "Space cats CAN into space. (They're back to surviving being in unsuitable atmos.)"
\ No newline at end of file
From 16009a3ccfecb686f63e2a42021e3eafe6d60d82 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Fri, 16 Feb 2024 09:46:29 +0100
Subject: [PATCH 33/56] [MDB Ignore] Converts random bedsheets to spawners + 3
bedsheets I made long time ago. (#81435)
---
..._underground_abandoned_plasma_facility.dmm | 2 +-
.../icemoon_underground_abandoned_village.dmm | 4 +-
.../icemoon_underground_frozen_comms.dmm | 2 +-
.../LavaRuins/lavaland_biodome_beach.dmm | 2 +-
.../SpaceRuins/DJstation/quarters_1.dmm | 4 +-
.../SpaceRuins/DJstation/quarters_4.dmm | 2 +-
_maps/RandomRuins/SpaceRuins/deepstorage.dmm | 4 +-
_maps/RandomRuins/SpaceRuins/hellfactory.dmm | 4 +-
.../SpaceRuins/hilbertresearchfacility.dmm | 2 +-
_maps/RandomRuins/SpaceRuins/waystation.dmm | 4 +-
_maps/RandomZLevels/SnowCabin.dmm | 2 +-
_maps/map_files/Basketball/beach_bums.dmm | 6 +-
_maps/map_files/Birdshot/birdshot.dmm | 8 +-
.../map_files/Deltastation/DeltaStation2.dmm | 12 +-
.../map_files/IceBoxStation/IceBoxStation.dmm | 18 +-
_maps/map_files/MetaStation/MetaStation.dmm | 12 +-
_maps/map_files/NorthStar/north_star.dmm | 10 +-
_maps/map_files/tramstation/tramstation.dmm | 28 +--
_maps/shuttles/emergency_clown.dmm | 12 +-
_maps/shuttles/emergency_hugcage.dmm | 12 +-
_maps/shuttles/pirate_grey.dmm | 2 +-
_maps/shuttles/pirate_silverscale.dmm | 6 +-
_maps/shuttles/ruin_pirate_cutter.dmm | 8 +-
_maps/shuttles/whiteship_cere.dmm | 2 +-
_maps/shuttles/whiteship_kilo.dmm | 2 +-
_maps/shuttles/whiteship_personalshuttle.dmm | 2 +-
_maps/templates/hilbertshotel.dmm | 2 +-
_maps/templates/hilbertshotellore.dmm | 2 +-
_maps/virtual_domains/beach_bar.dmm | 2 +-
code/__DEFINES/random_spawner.dm | 3 +
.../quirks/negative_quirks/all_nighter.dm | 2 +-
.../effects/spawners/random/bedsheet.dm | 64 +++++++
.../objects/items/stacks/sheets/leather.dm | 11 +-
code/game/objects/structures/bedsheet_bin.dm | 167 +++++++-----------
icons/effects/random_spawners.dmi | Bin 91383 -> 95084 bytes
icons/mob/clothing/neck.dmi | Bin 106540 -> 115431 bytes
icons/mob/inhands/items/bedsheet_lefthand.dmi | Bin 4102 -> 4571 bytes
.../mob/inhands/items/bedsheet_righthand.dmi | Bin 3964 -> 4422 bytes
icons/obj/bedsheets.dmi | Bin 62656 -> 67477 bytes
tgstation.dme | 2 +
.../Scripts/81435_bedsheet_spawners.txt | 3 +
41 files changed, 231 insertions(+), 199 deletions(-)
create mode 100644 code/__DEFINES/random_spawner.dm
create mode 100644 code/game/objects/effects/spawners/random/bedsheet.dm
create mode 100644 tools/UpdatePaths/Scripts/81435_bedsheet_spawners.txt
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
index 865695e5b3327..356bed29f9fe1 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -1016,7 +1016,7 @@
/area/ruin/plasma_facility/commons)
"pE" = (
/obj/structure/bed/maint,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/item/flashlight/flare/candle{
pixel_x = 12;
pixel_y = 9
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index c2b11194dfb4c..97b4e3d53c99f 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -40,7 +40,7 @@
"fD" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/blood/bubblegum,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/wood,
/area/ruin/powered)
"gG" = (
@@ -416,7 +416,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/turf/open/floor/wood,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
index 25f29890f45db..eb537cd26f6c6 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
@@ -63,7 +63,7 @@
"oj" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/turf/open/floor/iron/grimy{
initial_gas_mix = "ICEMOON_ATMOS"
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index c97bd25796016..7de6e7d990082 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -286,7 +286,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/bed{
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm
index c389af77150b2..dc6cea464f7ef 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm
@@ -16,7 +16,7 @@
/area/ruin/space/djstation)
"k" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/iron/grimy,
/area/ruin/space/djstation)
"p" = (
@@ -41,7 +41,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/turf/open/floor/iron/grimy,
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_4.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_4.dmm
index 8e632403b3669..52ec466ae8623 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_4.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_4.dmm
@@ -39,7 +39,7 @@
/turf/open/floor/iron/freezer/airless,
/area/ruin/space/djstation)
"x" = (
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/plating/airless,
/area/ruin/space/djstation)
"A" = (
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index 5645ac3ef152c..2c23219b7d382 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -1958,7 +1958,7 @@
/area/ruin/space/has_grav/deepstorage/hydroponics)
"zl" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
@@ -2128,7 +2128,7 @@
"Ev" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"EA" = (
diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
index 9660b317c66f1..524e81ebb69cc 100644
--- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -570,7 +570,7 @@
/area/ruin/space/has_grav/hellfactory)
"cc" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/turf/open/floor/holofloor/wood,
/area/ruin/space/has_grav/hellfactory)
"cd" = (
@@ -899,7 +899,7 @@
/area/ruin/space/has_grav/hellfactoryoffice)
"xK" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/holofloor/wood,
/area/ruin/space/has_grav/hellfactory)
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
index f829696000951..b964addf1f6e6 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -349,7 +349,7 @@
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"jt" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"jC" = (
diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm
index 9399ee029474d..def97102238e5 100644
--- a/_maps/RandomRuins/SpaceRuins/waystation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm
@@ -1143,7 +1143,7 @@
/area/ruin/space/has_grav/waystation/dorms)
"rQ" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"rV" = (
@@ -1889,7 +1889,7 @@
/area/ruin/space/has_grav/waystation/cargobay)
"IS" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index c6366d62e541d..7ad0b42218f51 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -2142,7 +2142,7 @@
/area/awaymission/cabin/caves)
"km" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/turf/open/floor/wood,
/area/awaymission/cabin/caves)
"ko" = (
diff --git a/_maps/map_files/Basketball/beach_bums.dmm b/_maps/map_files/Basketball/beach_bums.dmm
index aa5948a34e6d2..517e70f2b630a 100644
--- a/_maps/map_files/Basketball/beach_bums.dmm
+++ b/_maps/map_files/Basketball/beach_bums.dmm
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"af" = (
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
pixel_x = 6;
pixel_y = 11
},
@@ -344,7 +344,7 @@
/turf/open/misc/beach/sand,
/area/centcom/basketball)
"Jb" = (
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
pixel_x = 6;
pixel_y = 11
},
@@ -360,7 +360,7 @@
/turf/open/misc/beach/sand,
/area/centcom/basketball)
"Lu" = (
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
pixel_x = 6;
pixel_y = 11
},
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index 72516d9c396fa..09cd9472764a6 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -9299,7 +9299,7 @@
/area/station/maintenance/department/medical/central)
"dBA" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/light/small/directional/east,
/turf/open/floor/carpet/royalblack,
/area/station/commons/dorms)
@@ -11067,7 +11067,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/machinery/light/small/directional/west,
@@ -39807,7 +39807,7 @@
/area/station/security/checkpoint/customs)
"ohO" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/light/small/directional/east,
/turf/open/floor/carpet/red,
/area/station/commons/dorms)
@@ -70063,7 +70063,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/machinery/light/small/directional/west,
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index bd942b1bd8787..28143ce53ea8b 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1408,7 +1408,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 1
},
/obj/item/pillow/random,
@@ -55689,7 +55689,7 @@
/area/station/maintenance/department/science)
"nTU" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/start/hangover,
/obj/item/pillow/random,
@@ -58792,7 +58792,7 @@
/area/station/maintenance/department/science)
"oLO" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/status_display/evac/directional/east,
/obj/item/pillow/random,
/turf/open/floor/wood,
@@ -63735,7 +63735,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 1
},
/obj/machinery/status_display/evac/directional/north,
@@ -82687,7 +82687,7 @@
/area/station/tcommsat/server)
"uEo" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/status_display/evac/directional/east,
/obj/effect/landmark/start/hangover,
/obj/item/pillow/random,
@@ -93649,7 +93649,7 @@
/area/station/science/genetics)
"xso" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/random/double,
+/obj/effect/spawner/random/bedsheet/any/double,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
"xsp" = (
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index efeb6bc25c74e..3b78dacec0643 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -6937,7 +6937,7 @@
/area/station/engineering/atmos/project)
"ccp" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/hangover,
/obj/machinery/button/door/directional/south{
id = "Dorm5";
@@ -10057,7 +10057,7 @@
/area/station/cargo/office)
"cXp" = (
/obj/structure/bed/pod,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/port/fore)
@@ -10420,7 +10420,7 @@
"dcq" = (
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/button/door/directional/east{
id = "Dorm3";
name = "Dorm Bolt Control";
@@ -34264,7 +34264,7 @@
/area/station/hallway/secondary/service)
"kzv" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
"kzw" = (
@@ -41367,7 +41367,7 @@
"mJO" = (
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/button/door/directional/east{
id = "Dorm2";
name = "Dorm Bolt Control";
@@ -45232,7 +45232,7 @@
"nOl" = (
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/hangover,
/obj/machinery/button/door/directional/east{
id = "Dorm4";
@@ -49799,7 +49799,7 @@
/area/station/hallway/primary/central)
"piC" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/button/door/directional/south{
id = "Dorm6";
name = "Cabin Bolt Control";
@@ -63483,7 +63483,7 @@
/obj/structure/bed{
dir = 1
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 1
},
/obj/effect/spawner/random/contraband/permabrig_gear,
@@ -66635,7 +66635,7 @@
/obj/structure/bed{
dir = 1
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 1
},
/obj/effect/turf_decal/trimline/red/filled/line{
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index b2a9971f12f91..03dfa234b14be 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1124,7 +1124,7 @@
/area/station/maintenance/fore/lesser)
"avU" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/button/door/directional/east{
id = "Cabin2";
@@ -31986,7 +31986,7 @@
/area/station/medical/virology)
"lxf" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/button/door/directional/west{
id = "Cabin5";
@@ -41784,7 +41784,7 @@
"oYv" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/button/door/directional/west{
id = "Cabin4";
@@ -50133,7 +50133,7 @@
/area/station/commons/locker)
"rUo" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
@@ -51804,7 +51804,7 @@
"sBa" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/button/door/directional/east{
id = "Cabin3";
@@ -64199,7 +64199,7 @@
"wNp" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/cobweb,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/landmark/start/hangover,
/obj/machinery/button/door/directional/west{
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index e01fb546e4c3a..9a1372065a6d9 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -26977,7 +26977,7 @@
/area/station/medical/pharmacy)
"heS" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
@@ -27019,7 +27019,7 @@
/area/station/maintenance/floor1/starboard/aft)
"hfy" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
@@ -33741,7 +33741,7 @@
/area/station/maintenance/floor1/starboard/fore)
"iTn" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/turf/open/floor/carpet/black,
/area/station/hallway/secondary/service)
"iTu" = (
@@ -63497,7 +63497,7 @@
/area/station/science/genetics)
"qBh" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
@@ -63553,7 +63553,7 @@
/area/station/commons/fitness)
"qCn" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/wood,
/area/station/medical/psychology)
"qCo" = (
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index bd915e60abb13..57379c2353eed 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -7420,7 +7420,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/sign/clock/directional/west,
@@ -10176,7 +10176,7 @@
/area/station/command/heads_quarters/captain)
"cvg" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/obj/effect/landmark/start/assistant,
/obj/structure/sign/clock/directional/north,
/obj/item/pillow/random,
@@ -11408,7 +11408,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/effect/landmark/start/assistant,
@@ -14385,7 +14385,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/sign/clock/directional/south,
@@ -22999,7 +22999,7 @@
/obj/structure/bed{
dir = 8
},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/structure/sign/clock/directional/east,
/obj/item/pillow/random,
/turf/open/floor/wood,
@@ -24884,7 +24884,7 @@
/area/station/security/brig)
"hRK" = (
/obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/hangover,
/obj/structure/sign/clock/directional/south,
/obj/item/pillow/random,
@@ -26311,7 +26311,7 @@
/area/station/hallway/secondary/entry)
"iuJ" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/obj/structure/sign/clock/directional/north,
/obj/item/pillow/random,
/turf/open/floor/carpet,
@@ -28841,7 +28841,7 @@
/obj/structure/bed{
dir = 8
},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/assistant,
/obj/structure/sign/clock/directional/east,
/obj/item/pillow/random,
@@ -36227,7 +36227,7 @@
/obj/structure/bed{
dir = 8
},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/assistant,
/obj/structure/sign/clock/directional/east,
/obj/item/pillow/random,
@@ -45402,7 +45402,7 @@
/turf/open/floor/iron/showroomfloor,
/area/station/security/warden)
"pfm" = (
-/obj/item/bedsheet/dorms_double{
+/obj/effect/spawner/random/bedsheet/double{
dir = 4
},
/obj/structure/bed/double{
@@ -59280,7 +59280,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/sign/clock/directional/west,
@@ -59892,7 +59892,7 @@
/obj/structure/bed{
dir = 8
},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
/obj/structure/sign/clock/directional/east,
/obj/item/pillow/random,
/turf/open/floor/carpet,
@@ -60494,7 +60494,7 @@
/area/station/hallway/secondary/command)
"upb" = (
/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
/obj/effect/landmark/start/hangover,
/obj/structure/sign/clock/directional/north,
/obj/item/pillow/random,
@@ -67525,7 +67525,7 @@
/obj/structure/bed/double{
dir = 4
},
-/obj/item/bedsheet/dorms_double{
+/obj/effect/spawner/random/bedsheet/double{
dir = 4
},
/obj/structure/sign/clock/directional/north,
diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm
index f5c0ca4ea61eb..fc943e5287bb8 100644
--- a/_maps/shuttles/emergency_clown.dmm
+++ b/_maps/shuttles/emergency_clown.dmm
@@ -158,7 +158,7 @@
/area/shuttle/escape)
"aM" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"aQ" = (
@@ -246,7 +246,7 @@
/area/shuttle/escape)
"iU" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/obj/machinery/light/small/directional/east,
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
@@ -254,7 +254,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/turf/open/floor/mineral/bananium,
@@ -289,7 +289,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/obj/machinery/light/small/directional/west,
@@ -300,7 +300,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/turf/open/floor/mineral/bananium,
@@ -315,7 +315,7 @@
"XT" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"YC" = (
diff --git a/_maps/shuttles/emergency_hugcage.dmm b/_maps/shuttles/emergency_hugcage.dmm
index 6e68506c4332e..4b500f7bdbd45 100644
--- a/_maps/shuttles/emergency_hugcage.dmm
+++ b/_maps/shuttles/emergency_hugcage.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape/brig)
"aR" = (
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 8
},
/obj/structure/bed,
@@ -83,7 +83,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"gg" = (
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/obj/structure/bed{
@@ -116,7 +116,7 @@
/area/shuttle/escape)
"iI" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/obj/item/pillow/random,
/obj/effect/spawner/random/entertainment/plushie_delux,
/turf/open/floor/mineral/titanium/yellow,
@@ -148,7 +148,7 @@
/obj/structure/bed{
dir = 1
},
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/obj/item/pillow/random,
@@ -211,7 +211,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ys" = (
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/obj/structure/bed{
@@ -327,7 +327,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"KW" = (
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
dir = 8
},
/obj/structure/bed,
diff --git a/_maps/shuttles/pirate_grey.dmm b/_maps/shuttles/pirate_grey.dmm
index 0726d8d1ea196..7ba8fdd5a5ced 100644
--- a/_maps/shuttles/pirate_grey.dmm
+++ b/_maps/shuttles/pirate_grey.dmm
@@ -955,7 +955,7 @@
/area/shuttle/pirate)
"DP" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/plating,
/area/shuttle/pirate)
"DX" = (
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm
index e4838e040e472..d4bd9d0c16b3e 100644
--- a/_maps/shuttles/pirate_silverscale.dmm
+++ b/_maps/shuttles/pirate_silverscale.dmm
@@ -91,7 +91,7 @@
/obj/structure/bed/pod{
dir = 4
},
-/obj/item/bedsheet/black{
+/obj/item/bedsheet/pirate{
dir = 4
},
/turf/open/floor/carpet/royalblack,
@@ -288,7 +288,7 @@
/area/shuttle/pirate)
"uP" = (
/obj/structure/bed/pod,
-/obj/item/bedsheet/black,
+/obj/item/bedsheet/pirate,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"vw" = (
@@ -381,7 +381,7 @@
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/bed/pod,
-/obj/item/bedsheet/black,
+/obj/item/bedsheet/pirate,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"zB" = (
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index 9fa1943c5f8f1..e99c5097664a6 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -344,7 +344,7 @@
"wV" = (
/obj/machinery/light/small/directional/north,
/obj/structure/bed,
-/obj/item/bedsheet/brown,
+/obj/item/bedsheet/pirate,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/pirate)
"xb" = (
@@ -501,7 +501,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/brown{
+/obj/item/bedsheet/pirate{
dir = 4
},
/obj/machinery/airalarm/directional/west,
@@ -514,7 +514,7 @@
"Ha" = (
/obj/machinery/light/small/directional/south,
/obj/structure/bed,
-/obj/item/bedsheet/brown,
+/obj/item/bedsheet/pirate,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/pirate)
"Hb" = (
@@ -838,7 +838,7 @@
/obj/structure/bed{
dir = 4
},
-/obj/item/bedsheet/brown{
+/obj/item/bedsheet/pirate{
dir = 4
},
/obj/machinery/firealarm/directional/west,
diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm
index e6a677d57c3a5..1f0308690e77d 100644
--- a/_maps/shuttles/whiteship_cere.dmm
+++ b/_maps/shuttles/whiteship_cere.dmm
@@ -388,7 +388,7 @@
/area/shuttle/abandoned/cargo)
"oB" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm
index 2dc2e1c54d5bc..cbc214f21d828 100644
--- a/_maps/shuttles/whiteship_kilo.dmm
+++ b/_maps/shuttles/whiteship_kilo.dmm
@@ -1176,7 +1176,7 @@
/obj/structure/bed/pod{
dir = 1
},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/shuttles/whiteship_personalshuttle.dmm b/_maps/shuttles/whiteship_personalshuttle.dmm
index e3f432f350b57..8e041082bc6d9 100644
--- a/_maps/shuttles/whiteship_personalshuttle.dmm
+++ b/_maps/shuttles/whiteship_personalshuttle.dmm
@@ -273,7 +273,7 @@
/area/shuttle/abandoned/bridge)
"pS" = (
/obj/machinery/light/small/directional/south,
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/bed/pod{
diff --git a/_maps/templates/hilbertshotel.dmm b/_maps/templates/hilbertshotel.dmm
index 2895d10406907..8c425aa9c13db 100644
--- a/_maps/templates/hilbertshotel.dmm
+++ b/_maps/templates/hilbertshotel.dmm
@@ -76,7 +76,7 @@
/area/misc/hilbertshotel)
"q" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/turf/open/indestructible/hotelwood,
/area/misc/hilbertshotel)
"r" = (
diff --git a/_maps/templates/hilbertshotellore.dmm b/_maps/templates/hilbertshotellore.dmm
index 4774f6788e373..fe77ef9cc3d54 100644
--- a/_maps/templates/hilbertshotellore.dmm
+++ b/_maps/templates/hilbertshotellore.dmm
@@ -177,7 +177,7 @@
/area/misc/hilbertshotel)
"aU" = (
/obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/hotelwood,
/area/misc/hilbertshotel)
diff --git a/_maps/virtual_domains/beach_bar.dmm b/_maps/virtual_domains/beach_bar.dmm
index 7da71e943d172..6368168416193 100644
--- a/_maps/virtual_domains/beach_bar.dmm
+++ b/_maps/virtual_domains/beach_bar.dmm
@@ -859,7 +859,7 @@
/turf/open/misc/beach/sand,
/area/virtual_domain/fullbright)
"Nw" = (
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/bed{
diff --git a/code/__DEFINES/random_spawner.dm b/code/__DEFINES/random_spawner.dm
new file mode 100644
index 0000000000000..2a012e7904860
--- /dev/null
+++ b/code/__DEFINES/random_spawner.dm
@@ -0,0 +1,3 @@
+///Used by bedsheets spawners to tell if it's a single or double bedsheet.
+#define BEDSHEET_SINGLE "single"
+#define BEDSHEET_DOUBLE "double"
diff --git a/code/datums/quirks/negative_quirks/all_nighter.dm b/code/datums/quirks/negative_quirks/all_nighter.dm
index 798add0539f24..253ce12b41f32 100644
--- a/code/datums/quirks/negative_quirks/all_nighter.dm
+++ b/code/datums/quirks/negative_quirks/all_nighter.dm
@@ -14,7 +14,7 @@
mail_goodies = list(
/obj/item/clothing/glasses/blindfold,
- /obj/item/bedsheet/random,
+ /obj/effect/spawner/random/bedsheet/any,
/obj/item/clothing/under/misc/pj/red,
/obj/item/clothing/head/costume/nightcap/red,
/obj/item/clothing/under/misc/pj/blue,
diff --git a/code/game/objects/effects/spawners/random/bedsheet.dm b/code/game/objects/effects/spawners/random/bedsheet.dm
new file mode 100644
index 0000000000000..3fb39c5de4a71
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/bedsheet.dm
@@ -0,0 +1,64 @@
+/obj/effect/spawner/random/bedsheet
+ name = "random dorm bedsheet"
+ icon_state = "random_bedsheet"
+ loot = list(/obj/item/bedsheet = 8,
+ /obj/item/bedsheet/blue = 8,
+ /obj/item/bedsheet/green = 8,
+ /obj/item/bedsheet/grey = 8,
+ /obj/item/bedsheet/orange = 8,
+ /obj/item/bedsheet/purple = 8,
+ /obj/item/bedsheet/red = 8,
+ /obj/item/bedsheet/yellow = 8,
+ /obj/item/bedsheet/brown = 8,
+ /obj/item/bedsheet/black = 8,
+ /obj/item/bedsheet/patriot = 2,
+ /obj/item/bedsheet/rainbow = 2,
+ /obj/item/bedsheet/ian = 2,
+ /obj/item/bedsheet/runtime = 2,
+ /obj/item/bedsheet/cosmos = 2,
+ /obj/item/bedsheet/nanotrasen = 2,
+ /obj/item/bedsheet/pirate = 2,
+ /obj/item/bedsheet/gondola = 1,
+ )
+
+/obj/effect/spawner/random/bedsheet/double
+ name = "random dorm double bedsheet"
+ icon_state = "random_doublesheet"
+ loot = list(
+ /obj/item/bedsheet/double = 4,
+ /obj/item/bedsheet/blue/double = 4,
+ /obj/item/bedsheet/green/double = 4,
+ /obj/item/bedsheet/grey/double = 4,
+ /obj/item/bedsheet/orange/double = 4,
+ /obj/item/bedsheet/purple/double = 4,
+ /obj/item/bedsheet/red/double = 4,
+ /obj/item/bedsheet/yellow/double = 4,
+ /obj/item/bedsheet/brown/double = 4,
+ /obj/item/bedsheet/black/double = 4,
+ /obj/item/bedsheet/patriot/double = 1,
+ /obj/item/bedsheet/rainbow/double = 1,
+ /obj/item/bedsheet/ian/double = 1,
+ /obj/item/bedsheet/runtime/double = 1,
+ /obj/item/bedsheet/cosmos/double = 1,
+ /obj/item/bedsheet/nanotrasen/double = 1,
+ )
+
+/obj/effect/spawner/random/bedsheet/any
+ name = "random single bedsheet"
+ loot = null
+ var/static/list/bedsheet_list = list()
+ var/spawn_type = BEDSHEET_SINGLE
+
+/obj/effect/spawner/random/bedsheet/any/Initialize(mapload)
+ if(isnull(bedsheet_list[spawn_type]))
+ var/list/spawn_list = list()
+ for(var/obj/item/bedsheet/sheet as anything in typesof(/obj/item/bedsheet))
+ if(initial(sheet.bedsheet_type) == spawn_type)
+ spawn_list += sheet
+ bedsheet_list[spawn_type] = spawn_list
+ loot = bedsheet_list[spawn_type]
+ return ..()
+
+/obj/effect/spawner/random/bedsheet/any/double
+ icon_state = "random_doublesheet"
+ spawn_type = BEDSHEET_DOUBLE
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 500b2500c8ad5..e9426a913ec70 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -40,11 +40,6 @@ GLOBAL_LIST_INIT(human_recipes, list( \
inhand_icon_state = null
merge_type = /obj/item/stack/sheet/animalhide/corgi
-GLOBAL_LIST_INIT(gondola_recipes, list ( \
- new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1, check_density = FALSE, category = CAT_CLOTHING), \
- new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2, check_density = FALSE, category = CAT_CLOTHING), \
- ))
-
/obj/item/stack/sheet/animalhide/corgi/five
amount = 5
@@ -59,6 +54,12 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
/obj/item/stack/sheet/animalhide/mothroach/five
amount = 5
+GLOBAL_LIST_INIT(gondola_recipes, list ( \
+ new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1, check_density = FALSE, category = CAT_CLOTHING), \
+ new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2, check_density = FALSE, category = CAT_CLOTHING), \
+ new/datum/stack_recipe("gondola bedsheet", /obj/item/bedsheet/gondola, 1, check_density = FALSE, category = CAT_FURNITURE), \
+ ))
+
/obj/item/stack/sheet/animalhide/gondola
name = "gondola hide"
desc = "The extremely valuable product of gondola hunting."
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 66de98bd50ab4..f80042f5679a7 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -4,10 +4,6 @@ BEDSHEETS
LINEN BINS
*/
-#define BEDSHEET_ABSTRACT "abstract"
-#define BEDSHEET_SINGLE "single"
-#define BEDSHEET_DOUBLE "double"
-
/obj/item/bedsheet
name = "bedsheet"
desc = "A surprisingly soft linen bedsheet."
@@ -28,7 +24,9 @@ LINEN BINS
dog_fashion = /datum/dog_fashion/head/ghost
/// Custom nouns to act as the subject of dreams
var/list/dream_messages = list("white")
- /// The number of cloth sheets to be dropped by this bedsheet when cut
+ /// Cutting it up will yield this.
+ var/stack_type = /obj/item/stack/sheet/cloth
+ /// The number of sheets dropped by this bedsheet when cut
var/stack_amount = 3
/// Denotes if the bedsheet is a single, double, or other kind of bedsheet
var/bedsheet_type = BEDSHEET_SINGLE
@@ -126,7 +124,7 @@ LINEN BINS
/obj/item/bedsheet/attackby(obj/item/I, mob/user, params)
if(I.tool_behaviour == TOOL_WIRECUTTER || I.get_sharpness())
if (!(flags_1 & HOLOGRAM_1))
- var/obj/item/stack/sheet/cloth/shreds = new (get_turf(src), stack_amount)
+ var/obj/item/stack/shreds = new stack_type(get_turf(src), stack_amount)
if(!QDELETED(shreds)) //stacks merged
transfer_fingerprints_to(shreds)
shreds.add_fingerprint(user)
@@ -338,6 +336,60 @@ LINEN BINS
inhand_icon_state = "sheetian"
dream_messages = list("a dog", "a corgi", "woof", "bark", "arf")
+/obj/item/bedsheet/runtime
+ icon_state = "sheetruntime"
+ inhand_icon_state = "sheetruntime"
+ dream_messages = list("a kitty", "a cat", "meow", "purr", "nya~")
+
+/obj/item/bedsheet/pirate
+ name = "pirate's bedsheet"
+ desc = "It has a Jolly Roger emblem on it and has a faint scent of grog."
+ icon_state = "sheetpirate"
+ inhand_icon_state = "sheetpirate"
+ dream_messages = list(
+ "a buried treasure",
+ "an island",
+ "a monkey",
+ "a parrot",
+ "a swashbuckler",
+ "a talking skull",
+ "avast",
+ "being a pirate",
+ "'cause a pirate is free",
+ "doing whatever you want",
+ "gold",
+ "landlubbers",
+ "stealing",
+ "sailing the Seven Seas",
+ "yarr",
+ )
+
+/obj/item/bedsheet/gondola
+ name = "gondola bedsheet"
+ desc = "A precious bedsheet made from the hide of a endangered and peculiar critter."
+ icon_state = "sheetgondola"
+ inhand_icon_state = "sheetgondola"
+ dream_messages = list("peace", "comfiness", "a rare critter", "a harmless creature")
+ stack_type = /obj/item/stack/sheet/animalhide/gondola
+ stack_amount = 1
+ ///one of four icon states that represent its mouth
+ var/gondola_mouth
+ ///one of four icon states that represent its eyes
+ var/gondola_eyes
+
+/obj/item/bedsheet/gondola/Initialize(mapload)
+ . = ..()
+ gondola_mouth = "sheetgondola_mouth[rand(1, 4)]"
+ gondola_eyes = "sheetgondola_eyes[rand(1, 4)]"
+ add_overlay(gondola_mouth)
+ add_overlay(gondola_eyes)
+
+/obj/item/bedsheet/gondola/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+ . = ..()
+ if(!isinhands)
+ . += mutable_appearance(icon_file, gondola_mouth)
+ . += mutable_appearance(icon_file, gondola_eyes)
+
/obj/item/bedsheet/cosmos
name = "cosmic space bedsheet"
desc = "Made from the dreams of those who wonder at the stars."
@@ -347,66 +399,6 @@ LINEN BINS
light_power = 2
light_range = 1.4
-/obj/item/bedsheet/random
- icon_state = "random_bedsheet"
- name = "random bedsheet"
- desc = "If you're reading this description ingame, something has gone wrong! Honk!"
- bedsheet_type = BEDSHEET_ABSTRACT
- item_flags = ABSTRACT
- var/static/list/bedsheet_list
- var/spawn_type = BEDSHEET_SINGLE
-
-/obj/item/bedsheet/random/Initialize(mapload)
- ..()
- if(!LAZYACCESS(bedsheet_list, spawn_type))
- var/list/spawn_list = list()
- var/list/possible_types = typesof(/obj/item/bedsheet)
- for(var/obj/item/bedsheet/sheet as anything in possible_types)
- if(initial(sheet.bedsheet_type) == spawn_type)
- spawn_list += sheet
- LAZYSET(bedsheet_list, spawn_type, spawn_list)
- var/chosen_type = pick(bedsheet_list[spawn_type])
- var/obj/item/bedsheet = new chosen_type(loc)
- bedsheet.dir = dir
- return INITIALIZE_HINT_QDEL
-
-/obj/item/bedsheet/random/double
- icon_state = "random_bedsheet"
- spawn_type = BEDSHEET_DOUBLE
-
-/obj/item/bedsheet/dorms
- icon_state = "random_bedsheet"
- name = "random dorms bedsheet"
- desc = "If you're reading this description ingame, something has gone wrong! Honk!"
- bedsheet_type = BEDSHEET_DOUBLE
- item_flags = ABSTRACT
- slot_flags = null
-
-/obj/item/bedsheet/dorms/Initialize(mapload)
- ..()
- var/type = pick_weight(list("Colors" = 80, "Special" = 20))
- switch(type)
- if("Colors")
- type = pick(list(/obj/item/bedsheet,
- /obj/item/bedsheet/blue,
- /obj/item/bedsheet/green,
- /obj/item/bedsheet/grey,
- /obj/item/bedsheet/orange,
- /obj/item/bedsheet/purple,
- /obj/item/bedsheet/red,
- /obj/item/bedsheet/yellow,
- /obj/item/bedsheet/brown,
- /obj/item/bedsheet/black))
- if("Special")
- type = pick(list(/obj/item/bedsheet/patriot,
- /obj/item/bedsheet/rainbow,
- /obj/item/bedsheet/ian,
- /obj/item/bedsheet/cosmos,
- /obj/item/bedsheet/nanotrasen))
- var/obj/item/bedsheet = new type(loc)
- bedsheet.dir = dir
- return INITIALIZE_HINT_QDEL
-
/obj/item/bedsheet/double
icon_state = "double_sheetwhite"
worn_icon_state = "sheetwhite"
@@ -559,45 +551,16 @@ LINEN BINS
worn_icon_state = "sheetian"
bedsheet_type = BEDSHEET_DOUBLE
+/obj/item/bedsheet/runtime/double
+ icon_state = "double_sheetruntime"
+ worn_icon_state = "sheetruntime"
+ bedsheet_type = BEDSHEET_DOUBLE
+
/obj/item/bedsheet/cosmos/double
icon_state = "double_sheetcosmos"
worn_icon_state = "sheetcosmos"
bedsheet_type = BEDSHEET_DOUBLE
-/obj/item/bedsheet/dorms_double
- icon_state = "random_bedsheet"
- item_flags = ABSTRACT
- bedsheet_type = BEDSHEET_ABSTRACT
-
-/obj/item/bedsheet/dorms_double/Initialize(mapload)
- ..()
- var/type = pick_weight(list("Colors" = 80, "Special" = 20))
- switch(type)
- if("Colors")
- type = pick(list(
- /obj/item/bedsheet/double,
- /obj/item/bedsheet/blue/double,
- /obj/item/bedsheet/green/double,
- /obj/item/bedsheet/grey/double,
- /obj/item/bedsheet/orange/double,
- /obj/item/bedsheet/purple/double,
- /obj/item/bedsheet/red/double,
- /obj/item/bedsheet/yellow/double,
- /obj/item/bedsheet/brown/double,
- /obj/item/bedsheet/black/double,
- ))
- if("Special")
- type = pick(list(
- /obj/item/bedsheet/patriot/double,
- /obj/item/bedsheet/rainbow/double,
- /obj/item/bedsheet/ian/double,
- /obj/item/bedsheet/cosmos/double,
- /obj/item/bedsheet/nanotrasen/double,
- ))
- var/obj/item/bedsheet = new type(loc)
- bedsheet.dir = dir
- return INITIALIZE_HINT_QDEL
-
/obj/structure/bedsheetbin
name = "linen bin"
desc = "It looks rather cosy."
@@ -736,7 +699,3 @@ LINEN BINS
add_fingerprint(user)
return COMPONENT_CANCEL_ATTACK_CHAIN
-
-#undef BEDSHEET_ABSTRACT
-#undef BEDSHEET_SINGLE
-#undef BEDSHEET_DOUBLE
diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi
index c03b196a13798d1eff1e81dc509c0c35c26545af..08df14c0ffc990e4e39d630dec649b51c03006cb 100644
GIT binary patch
delta 23927
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
NK}J=&>Vrw}{{vuN3ta#J
delta 20197
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