From b134a3f1789c3971cad0eb4128f468e9e40f6a2a Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Sat, 14 Dec 2024 20:55:40 +0100
Subject: [PATCH 01/69] [NO GBP] Fixing the displayed stats when examining
fishing rods twice (#88412)
---
code/modules/fishing/fishing_rod.dm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index a4b1e5924f8f3..9fc26ee10ae15 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -140,7 +140,7 @@
var/list/block = list()
var/get_percent = HAS_MIND_TRAIT(user, TRAIT_EXAMINE_DEEPER_FISH)
block += span_info("You think you can cast it up to [get_cast_range()] tiles away.")
- block += get_stat_info(get_percent, difficulty_modifier, "Fishing will be", "easier", "harder", "with this fishing rod")
+ block += get_stat_info(get_percent, difficulty_modifier * 0.01, "Fishing will be", "easier", "harder", "with this fishing rod", offset = 0)
block += get_stat_info(get_percent, experience_multiplier, "You will gain experience", "faster", "slower")
block += get_stat_info(get_percent, completion_speed_mult, "You should complete the minigame", "faster", "slower")
block += get_stat_info(get_percent, bait_speed_mult, "Reeling is", "faster", "slower")
@@ -148,6 +148,7 @@
block += get_stat_info(get_percent, bounciness_mult, "This fishing rod is ", "bouncier", "less bouncy", "than a normal one", less_is_better = TRUE)
block += get_stat_info(get_percent, gravity_mult, "The lure will sink", "faster", "slower", span_info = TRUE)
+ list_clear_nulls(block)
. += examine_block(block.Join("\n"))
if(get_percent && (material_flags & MATERIAL_EFFECTS) && length(custom_materials))
@@ -172,15 +173,16 @@
. += examine_block(block.Join("\n"))
///Used in examine_more to reduce all the copypasta when getting more information about the various stats of the fishing rod.
-/obj/item/fishing_rod/proc/get_stat_info(get_percent, value, prefix, easier, harder, suffix = "with this fishing rod", span_info = FALSE, less_is_better = FALSE)
+/obj/item/fishing_rod/proc/get_stat_info(get_percent, value, prefix, easier, harder, suffix = "with this fishing rod", span_info = FALSE, less_is_better = FALSE, offset = 1)
if(value == 1)
return
- var/percent = get_percent ? "[abs(value)]% " : ""
- var/harder_easier = value > 1 ? easier : harder
+ value -= offset
+ var/percent = get_percent ? "[abs(value * 100)]% " : ""
+ var/harder_easier = value > 0 ? easier : harder
. = "[prefix] [percent][harder_easier] [suffix]."
if(span_info)
return span_info(.)
- if(less_is_better ? value < 1 : value > 1)
+ if(less_is_better ? value < 0 : value > 0)
return span_nicegreen(.)
return span_danger(.)
From 7a8182d3019467b454ce5988bf5e472f78e5b21d Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sat, 14 Dec 2024 19:56:03 +0000
Subject: [PATCH 02/69] Automatic changelog for PR #88412 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88412.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88412.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88412.yml b/html/changelogs/AutoChangeLog-pr-88412.yml
new file mode 100644
index 0000000000000..a767cf2d7f2ea
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88412.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed the displayed stats when examining fishing rods twice."
\ No newline at end of file
From 584de91709a1455960a54fc9862412cf58039a8a Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Sat, 14 Dec 2024 14:20:59 -0600
Subject: [PATCH 03/69] Adds a chemical to the chem kit (#88393)
## About The Pull Request
Adds Syndol to the chemical kit
- It deals minor liver damage
- It is a very addictive hallucinogen
- When a security officer is exposed, they will hallucinate other mobs
as Nuke Ops
- When an assistant or clown is exposed, they will hallucinate other
mobs as Security Officers
- When exposed to less than ten units, these unique hallucinations will
only apply to all mobs *outside* of the view of the victim.
- When exposed to more than ten units (an overdose), it applies to *all*
mobs, not just those in view.
- All other members of the crew will just get normal hallucinations.
- Exposure is completely silent (until the liver damage kicks in, which
takes a while)
## Why It's Good For The Game
Someone dropped the idea in Discord and I thought it was pretty funny.
It also gives syndies a way to temporarily disorient a security officer
a la the old chaos holoparasite (oh god who was I chasing everyone is a
syndie?).
## Changelog
:cl: Melbert
add: Adds Syndol to the chemical kit, an addictive hallucinogen that
applies bonus effects when security officers, assistants, or clowns are
exposed.
/:cl:
---
.../game/objects/items/storage/uplink_kits.dm | 3 +-
code/modules/hallucination/delusions.dm | 16 ++++++
.../chemistry/reagents/drug_reagents.dm | 51 +++++++++++++++++++
.../reagent_containers/cups/bottle.dm | 5 ++
4 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 3f813e50b45db..d945a3fd711db 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -461,7 +461,7 @@
/obj/item/storage/box/syndie_kit/chemical/Initialize(mapload)
. = ..()
- atom_storage.max_slots = 14
+ atom_storage.max_slots = 15
/obj/item/storage/box/syndie_kit/chemical/PopulateContents()
new /obj/item/reagent_containers/cup/bottle/polonium(src)
@@ -469,6 +469,7 @@
new /obj/item/reagent_containers/cup/bottle/fentanyl(src)
new /obj/item/reagent_containers/cup/bottle/formaldehyde(src)
new /obj/item/reagent_containers/cup/bottle/spewium(src)
+ new /obj/item/reagent_containers/cup/bottle/syndol(src)
new /obj/item/reagent_containers/cup/bottle/cyanide(src)
new /obj/item/reagent_containers/cup/bottle/histamine(src)
new /obj/item/reagent_containers/cup/bottle/initropidril(src)
diff --git a/code/modules/hallucination/delusions.dm b/code/modules/hallucination/delusions.dm
index 0760d05ff46c6..da12f117803d1 100644
--- a/code/modules/hallucination/delusions.dm
+++ b/code/modules/hallucination/delusions.dm
@@ -230,6 +230,22 @@
return ..()
+/datum/hallucination/delusion/preset/seccies
+ dynamic_delusion = TRUE
+ random_hallucination_weight = 0
+ delusion_name = "Security"
+ affects_others = TRUE
+ affects_us = FALSE
+
+/datum/hallucination/delusion/preset/seccies/make_delusion_image(mob/over_who)
+ delusion_appearance = get_dynamic_human_appearance(
+ outfit_path = /datum/outfit/job/security,
+ bloody_slots = prob(5) ? ALL : NONE,
+ r_hand = prob(15) ? /obj/item/melee/baton/security/loaded : null,
+ l_hand = prob(15) ? /obj/item/melee/baton/security/loaded : null,
+ )
+ return ..()
+
/// Hallucination used by the nightmare vision goggles to turn everyone except you into mares
/datum/hallucination/delusion/preset/mare
delusion_icon_file = 'icons/obj/clothing/masks.dmi'
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 28c299c87f0af..4a4bf137b3c4d 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -865,3 +865,54 @@
)
new /obj/structure/bouncy_castle(gored.loc, gored)
gored.gib()
+
+/datum/reagent/drug/syndol
+ name = "Syndol"
+ description = "A potent and addictive hallucinogen used by syndicate agents disorient certain targets. \
+ It is said that the hallucinations it causes are tailored to the user's fears, but tests have been inconclusive, \
+ with subjects in security and assistants reporting wildly different experiences."
+ color = "#c90000"
+ taste_description = "metallic"
+ ph = 7
+ overdose_threshold = 10
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ addiction_types = list(/datum/addiction/hallucinogens = 20)
+ /// Track the active hallucination we're giving out so we don't replace it by accident
+ VAR_PRIVATE/datum/weakref/active_hallucination_weakref
+
+/datum/reagent/drug/syndol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
+ . = ..()
+ var/obj/item/organ/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER)
+ if(isnull(liver) || !(liver.organ_flags & affected_organ_flags))
+ return
+ // non-trivial but not immediately dangerous liver damage
+ liver.apply_organ_damage(0.5 * REM * seconds_per_tick)
+ // anti-hallucinogens can counteract the effects
+ if(HAS_TRAIT(affected_mob, TRAIT_HALLUCINATION_IMMUNE) || affected_mob.reagents.has_reagent(/datum/reagent/medicine/haloperidol, amount = 3, needs_metabolizing = TRUE))
+ QDEL_NULL(active_hallucination_weakref)
+ return
+
+ // and the main event, funny hallucinations
+ if(active_hallucination_weakref?.resolve())
+ return
+ var/greatest_fear
+ if(HAS_TRAIT(liver, TRAIT_LAW_ENFORCEMENT_METABOLISM))
+ greatest_fear = /datum/hallucination/delusion/preset/syndies
+ else if(HAS_TRAIT(liver, TRAIT_MAINTENANCE_METABOLISM) || HAS_TRAIT(liver, TRAIT_COMEDY_METABOLISM))
+ greatest_fear = /datum/hallucination/delusion/preset/seccies
+
+ if(greatest_fear)
+ // 5 minutes = 15 units, roughly. we cancel the hallucination early when we exit the mob, anyway
+ active_hallucination_weakref = WEAKREF(affected_mob.cause_hallucination(greatest_fear, name, duration = 5 MINUTES, skip_nearby = !overdosed))
+ else
+ // if they're just some random schmuck, give them random hallucinations
+ affected_mob.adjust_hallucinations_up_to(4 SECONDS * REM * seconds_per_tick, 20 SECONDS)
+
+/datum/reagent/drug/syndol/on_mob_end_metabolize(mob/living/affected_mob)
+ . = ..()
+ affected_mob.adjust_hallucinations(-16 SECONDS)
+ QDEL_NULL(active_hallucination_weakref)
+
+/datum/reagent/drug/syndol/overdose_start(mob/living/affected_mob)
+ // no message, just refresh the hallucination
+ QDEL_NULL(active_hallucination_weakref)
diff --git a/code/modules/reagents/reagent_containers/cups/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm
index 4c757e0e14691..2a81c39886be6 100644
--- a/code/modules/reagents/reagent_containers/cups/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/bottle.dm
@@ -37,6 +37,11 @@
desc = "A small bottle of spewium."
list_reagents = list(/datum/reagent/toxin/spewium = 30)
+/obj/item/reagent_containers/cup/bottle/syndol
+ name = "syndol bottle"
+ desc = "A small bottle of syndol."
+ list_reagents = list(/datum/reagent/drug/syndol = 30)
+
/obj/item/reagent_containers/cup/bottle/morphine
name = "morphine bottle"
desc = "A small bottle of morphine."
From 2c4fd5e768d4089a0a0c6ebf7f69341902bdc690 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sat, 14 Dec 2024 20:24:57 +0000
Subject: [PATCH 04/69] Automatic changelog for PR #88393 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88393.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88393.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88393.yml b/html/changelogs/AutoChangeLog-pr-88393.yml
new file mode 100644
index 0000000000000..3cc8696f3059a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88393.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - rscadd: "Adds Syndol to the chemical kit, an addictive hallucinogen that applies bonus effects when security officers, assistants, or clowns are exposed."
\ No newline at end of file
From 6db57342da2e6a98ebaa839c4b1a2b84e9064c45 Mon Sep 17 00:00:00 2001
From: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Date: Sun, 15 Dec 2024 09:29:53 +1100
Subject: [PATCH 05/69] Various mob attack procs treat their attacks as unarmed
attacks instead of melee attacks when checking blocking. (#88481)
---
code/modules/mob/living/carbon/human/human_defense.dm | 7 ++-----
code/modules/mob/living/living_defense.dm | 8 ++++----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 254144d063d65..73f63b8bfe110 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -191,7 +191,7 @@
var/damage = HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER) ? monkey_mouth.unarmed_damage_high : rand(monkey_mouth.unarmed_damage_low, monkey_mouth.unarmed_damage_high)
if(!damage)
return FALSE
- if(check_block(user, damage, "the [user.name]"))
+ if(check_block(user, damage, "the [user.name]", attack_type = UNARMED_ATTACK))
return FALSE
apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, MELEE))
return TRUE
@@ -248,9 +248,6 @@
return TRUE
apply_damage(damage, BRUTE, affecting, armor_block)
-
-
-
/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L, list/modifiers)
. = ..()
if(!.)
@@ -258,7 +255,7 @@
var/damage = rand(L.melee_damage_lower, L.melee_damage_upper)
if(!damage)
return
- if(check_block(L, damage, "the [L.name]"))
+ if(check_block(L, damage, "the [L.name]", attack_type = UNARMED_ATTACK))
return FALSE
if(stat != DEAD)
L.amount_grown = min(L.amount_grown + damage, L.max_grown)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index eef97d35655d7..426a0face9f9f 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -290,7 +290,7 @@
return FALSE
if(SEND_SIGNAL(src, COMSIG_LIVING_GRAB, target) & (COMPONENT_CANCEL_ATTACK_CHAIN|COMPONENT_SKIP_ATTACK))
return FALSE
- if(target.check_block(src, 0, "[src]'s grab"))
+ if(target.check_block(src, 0, "[src]'s grab", UNARMED_ATTACK))
return FALSE
target.grabbedby(src)
return TRUE
@@ -397,7 +397,7 @@
return FALSE
var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
- if(check_block(user, damage, "[user]'s [user.attack_verb_simple]", MELEE_ATTACK/*or UNARMED_ATTACK?*/, user.armour_penetration, user.melee_damage_type))
+ if(check_block(user, damage, "[user]'s [user.attack_verb_simple]", UNARMED_ATTACK, user.armour_penetration, user.melee_damage_type))
return FALSE
if(user.attack_sound)
@@ -512,7 +512,7 @@
/mob/living/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers)
SEND_SIGNAL(src, COMSIG_MOB_ATTACK_ALIEN, user, modifiers)
if(LAZYACCESS(modifiers, RIGHT_CLICK))
- if(check_block(user, 0, "[user]'s tackle", MELEE_ATTACK, 0, BRUTE))
+ if(check_block(user, 0, "[user]'s tackle", UNARMED_ATTACK, 0, BRUTE))
return FALSE
user.do_attack_animation(src, ATTACK_EFFECT_DISARM)
return TRUE
@@ -521,7 +521,7 @@
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to hurt anyone!"))
return FALSE
- if(check_block(user, user.melee_damage_upper, "[user]'s slash", MELEE_ATTACK, 0, BRUTE))
+ if(check_block(user, user.melee_damage_upper, "[user]'s slash", UNARMED_ATTACK, 0, BRUTE))
return FALSE
user.do_attack_animation(src)
return TRUE
From 4e986e798616dce289715bde64875f44f1f18c8b Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sat, 14 Dec 2024 22:30:12 +0000
Subject: [PATCH 06/69] Automatic changelog for PR #88481 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88481.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88481.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88481.yml b/html/changelogs/AutoChangeLog-pr-88481.yml
new file mode 100644
index 0000000000000..2cef228351ff4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88481.yml
@@ -0,0 +1,4 @@
+author: "necromanceranne"
+delete-after: True
+changes:
+ - code_imp: "Various mob attack procs are treated as unarmed attacks as a baseline assumption, rather than melee attacks."
\ No newline at end of file
From 82721387d1ec3bb2d52310575035c5b1cd62c557 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 15 Dec 2024 00:23:12 +0100
Subject: [PATCH 07/69] Add run_all_tests and run_alternate_tests to the
completion gate needs (#88469)
---
.github/workflows/ci_suite.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index 622cd98514ac9..414f5d59ea050 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -287,7 +287,7 @@ jobs:
completion_gate: # Serves as a non-moving target for branch rulesets
if: always() && !cancelled()
name: Completion Gate
- needs: [ test_windows, compare_screenshots, compile_all_maps, run_linters ]
+ needs: [ test_windows, compare_screenshots, compile_all_maps, run_all_tests, run_alternate_tests, run_linters ]
runs-on: ubuntu-latest
steps:
- name: Decide whether the needed jobs succeeded or failed
From 337d285793a2ba1fa02502e4e88af80a2bcb9d1f Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Sat, 14 Dec 2024 17:23:31 -0600
Subject: [PATCH 08/69] Carbons and Robots indicate they can be dragged onto
(with a slight mouse cursor change) (#88471)
---
code/modules/mob/living/carbon/carbon_defines.dm | 1 +
code/modules/mob/living/silicon/robot/robot_defines.dm | 1 +
2 files changed, 2 insertions(+)
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index c13ac14b100c1..56c687df7bb1b 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -11,6 +11,7 @@
usable_hands = 0 //Populated on init through list/bodyparts
mobility_flags = MOBILITY_FLAGS_CARBON_DEFAULT
blocks_emissive = EMISSIVE_BLOCK_NONE
+ mouse_drop_zone = TRUE
// STOP_OVERLAY_UPDATE_BODY_PARTS is removed after we call update_body_parts() during init.
living_flags = ALWAYS_DEATHGASP|STOP_OVERLAY_UPDATE_BODY_PARTS
///List of [/obj/item/organ]s in the mob. They don't go in the contents for some reason I don't want to know.
diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm
index 7e2d8de24694a..07b8322bd7c48 100644
--- a/code/modules/mob/living/silicon/robot/robot_defines.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defines.dm
@@ -16,6 +16,7 @@
has_limbs = TRUE
hud_type = /datum/hud/robot
unique_name = TRUE
+ mouse_drop_zone = TRUE
///Represents the cyborg's model (engineering, medical, etc.)
var/obj/item/robot_model/model = null
From e725e84bf2fc2138e1a6b1ebf0ed0930c6c99263 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sat, 14 Dec 2024 23:23:51 +0000
Subject: [PATCH 09/69] Automatic changelog for PR #88471 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88471.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88471.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88471.yml b/html/changelogs/AutoChangeLog-pr-88471.yml
new file mode 100644
index 0000000000000..f5c264c376528
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88471.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - qol: "When dragging an item (like, with your mouse cursor. not physically), your cursor updates when hovering humans or cyborgs to indicate you're hovering over a human or cyborg."
\ No newline at end of file
From 8fd8278b19ae5b82c43c5c1ad91e775224448824 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sun, 15 Dec 2024 00:38:06 +0000
Subject: [PATCH 10/69] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-88393.yml | 4 ----
html/changelogs/AutoChangeLog-pr-88412.yml | 4 ----
html/changelogs/AutoChangeLog-pr-88432.yml | 4 ----
html/changelogs/AutoChangeLog-pr-88462.yml | 4 ----
html/changelogs/AutoChangeLog-pr-88468.yml | 6 ------
html/changelogs/AutoChangeLog-pr-88471.yml | 4 ----
html/changelogs/AutoChangeLog-pr-88481.yml | 4 ----
html/changelogs/AutoChangeLog-pr-88499.yml | 4 ----
html/changelogs/archive/2024-12.yml | 24 ++++++++++++++++++++++
9 files changed, 24 insertions(+), 34 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-88393.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-88412.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-88432.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-88462.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-88468.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-88471.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-88481.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-88499.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88393.yml b/html/changelogs/AutoChangeLog-pr-88393.yml
deleted file mode 100644
index 3cc8696f3059a..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88393.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - rscadd: "Adds Syndol to the chemical kit, an addictive hallucinogen that applies bonus effects when security officers, assistants, or clowns are exposed."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88412.yml b/html/changelogs/AutoChangeLog-pr-88412.yml
deleted file mode 100644
index a767cf2d7f2ea..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88412.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed the displayed stats when examining fishing rods twice."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88432.yml b/html/changelogs/AutoChangeLog-pr-88432.yml
deleted file mode 100644
index 99921a27644e9..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88432.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Paxilmaniac"
-delete-after: True
-changes:
- - bugfix: "Fixes resin sprayers not working if the target is more than one tile away from you"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88462.yml b/html/changelogs/AutoChangeLog-pr-88462.yml
deleted file mode 100644
index 3fc603235f47c..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88462.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothymtorres"
-delete-after: True
-changes:
- - code_imp: "Improve looping sounds to allow nested and non-associative lists"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88468.yml b/html/changelogs/AutoChangeLog-pr-88468.yml
deleted file mode 100644
index 71cd2c966c099..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88468.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - bugfix: "Metalgen works as a lockpick; igniting a crate metalgen'd into plasma will properly drop its contents."
- - code_imp: "Hiding stuff in food should generally work more consistently now."
- - bugfix: "Fixes players not doing the \"searching for item\" do-after for items hidden in food."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88471.yml b/html/changelogs/AutoChangeLog-pr-88471.yml
deleted file mode 100644
index f5c264c376528..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88471.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - qol: "When dragging an item (like, with your mouse cursor. not physically), your cursor updates when hovering humans or cyborgs to indicate you're hovering over a human or cyborg."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88481.yml b/html/changelogs/AutoChangeLog-pr-88481.yml
deleted file mode 100644
index 2cef228351ff4..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88481.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - code_imp: "Various mob attack procs are treated as unarmed attacks as a baseline assumption, rather than melee attacks."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88499.yml b/html/changelogs/AutoChangeLog-pr-88499.yml
deleted file mode 100644
index 947eace7a1b19..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88499.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LT3"
-delete-after: True
-changes:
- - bugfix: "Fixed unconstructed solar panels on Nebulastation port aft solars"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml
index 89bcd50eb8389..210a0f1e6f04a 100644
--- a/html/changelogs/archive/2024-12.yml
+++ b/html/changelogs/archive/2024-12.yml
@@ -370,3 +370,27 @@
waves.
timothymtorres:
- sound: Add water sound to sinks
+2024-12-15:
+ Ghommie:
+ - bugfix: Fixed the displayed stats when examining fishing rods twice.
+ LT3:
+ - bugfix: Fixed unconstructed solar panels on Nebulastation port aft solars
+ Melbert:
+ - rscadd: Adds Syndol to the chemical kit, an addictive hallucinogen that applies
+ bonus effects when security officers, assistants, or clowns are exposed.
+ - bugfix: Metalgen works as a lockpick; igniting a crate metalgen'd into plasma
+ will properly drop its contents.
+ - code_imp: Hiding stuff in food should generally work more consistently now.
+ - bugfix: Fixes players not doing the "searching for item" do-after for items hidden
+ in food.
+ - qol: When dragging an item (like, with your mouse cursor. not physically), your
+ cursor updates when hovering humans or cyborgs to indicate you're hovering over
+ a human or cyborg.
+ Paxilmaniac:
+ - bugfix: Fixes resin sprayers not working if the target is more than one tile away
+ from you
+ necromanceranne:
+ - code_imp: Various mob attack procs are treated as unarmed attacks as a baseline
+ assumption, rather than melee attacks.
+ timothymtorres:
+ - code_imp: Improve looping sounds to allow nested and non-associative lists
From da85b47259538d63ecfb9899c201542a8b017c30 Mon Sep 17 00:00:00 2001
From: tonty <39193182+tontyGH@users.noreply.github.com>
Date: Sat, 14 Dec 2024 20:35:02 -0500
Subject: [PATCH 11/69] Emphasis handling no longer gets clipped by spans
(#88435)
## About The Pull Request
When messages got composed, the emphasis part was done after all the
speech spans were created, which caused problems if those spans had
characters that conflicted with our emphasis keys (notably underline).
This fixes that bug
## The Horse
## Changelog
:cl:
fix: Underlining your messages in loud mode shouldn't break anymore
/:cl:
---
code/game/say.dm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/code/game/say.dm b/code/game/say.dm
index d8cb91c4ea429..1e5b4bce45070 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
if(istype(dialect) && dialect.display_icon(src))
languageicon = "[dialect.get_icon()] "
- messagepart = " [say_emphasis(messagepart)]"
+ messagepart = " [messagepart]"
return "[spanpart1][spanpart2][freqpart][languageicon][compose_track_href(speaker, namepart)][namepart][compose_job(speaker, message_language, raw_message, radio_freq)][endspanpart][messagepart]"
@@ -223,8 +223,14 @@ GLOBAL_LIST_INIT(freqtospan, list(
if(copytext_char(input, -2) == "!!")
spans |= SPAN_YELL
- var/spanned = attach_spans(input, spans)
- return "[say_mod], \"[spanned]\""
+ /* all inputs should be fully figured out past this point */
+
+ var/processed_input = say_emphasis(input) //This MUST be done first so that we don't get clipped by spans
+ processed_input = attach_spans(processed_input, spans)
+
+ var/processed_say_mod = say_emphasis(say_mod)
+
+ return "[processed_say_mod], \"[processed_input]\""
/// Transforms the speech emphasis mods from [/atom/movable/proc/say_emphasis] into the appropriate HTML tags. Includes escaping.
#define ENCODE_HTML_EMPHASIS(input, char, html, varname) \
@@ -235,8 +241,8 @@ GLOBAL_LIST_INIT(freqtospan, list(
/atom/movable/proc/say_emphasis(input)
ENCODE_HTML_EMPHASIS(input, "\\|", "i", italics)
ENCODE_HTML_EMPHASIS(input, "\\+", "b", bold)
- ENCODE_HTML_EMPHASIS(input, "_", "u", underline)
- var/static/regex/remove_escape_backlashes = regex("\\\\(_|\\+|\\|)", "g") // Removes backslashes used to escape text modification.
+ ENCODE_HTML_EMPHASIS(input, "\\_", "u", underline)
+ var/static/regex/remove_escape_backlashes = regex("\\\\(\\_|\\+|\\|)", "g") // Removes backslashes used to escape text modification.
input = remove_escape_backlashes.Replace_char(input, "$1")
return input
From 67e03c402006c52972ce26a9b71964b68e69ce3f Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sun, 15 Dec 2024 01:35:22 +0000
Subject: [PATCH 12/69] Automatic changelog for PR #88435 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88435.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88435.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88435.yml b/html/changelogs/AutoChangeLog-pr-88435.yml
new file mode 100644
index 0000000000000..0f91aa47c2209
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88435.yml
@@ -0,0 +1,4 @@
+author: "tontyGH"
+delete-after: True
+changes:
+ - bugfix: "Underlining your messages in loud mode shouldn't break anymore"
\ No newline at end of file
From d1b842356ec4fd773a1e7092197e7f094cc4d36d Mon Sep 17 00:00:00 2001
From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Date: Sun, 15 Dec 2024 08:57:37 +0530
Subject: [PATCH 13/69] More maintenance for turbine (#88254)
## About The Pull Request
**1. Fixes**
- Fixes #88231. This is a 2 part fix as in
- For the UI side we first convert energy to power in the back end via
`energy_to_power()` proc & then use `formatPower()` proc in the client
side UI to display the correct SI units instead of always using KW
- The turbine now uses `SSMachines` subsytem for processing instead of
`SSAir`. This is because energy which is
[power x delta time] requires `seconds_per_tick` which isn't supplied by
`process_atmos()` so for correct conversion we have to switch over to
the machine subsystem
**2. Refactor**
- Merged procs like `power_on()` & `power_off()` both into
`toggle_power()` proc
- Converted `attackby()` attack chain into `item_interaction()`
- `ui_data()` now won't update the UI if it encounters invalid data &
sends very little data if it's not connected to the turbine to reduce
bandwidth
- Removes redundant vars, autodoc procs & much more
## Changelog
:cl:
fix: Turbine converts energy to power correctly & shows correct reading
with multitool
refactor: turbine code has been overall improved. report bugs on github
/:cl:
---
code/game/machinery/_machinery.dm | 1 -
code/modules/power/turbine/turbine.dm | 276 +++++++++---------
.../modules/power/turbine/turbine_computer.dm | 86 ++++--
code/modules/power/turbine/turbine_parts.dm | 131 ++++-----
code/modules/unit_tests/unit_test.dm | 2 +
icons/obj/machines/engine/turbine.dmi | Bin 5513 -> 5492 bytes
.../tgui/interfaces/TurbineComputer.tsx | 168 ++++++-----
7 files changed, 330 insertions(+), 334 deletions(-)
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 656ece7f8ee14..b962a902f17f4 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -493,7 +493,6 @@
///internal proc that removes all static power usage from the current area
/obj/machinery/proc/unset_static_power()
- PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
var/old_usage = static_power_usage
diff --git a/code/modules/power/turbine/turbine.dm b/code/modules/power/turbine/turbine.dm
index e839800158f63..2112002e50745 100644
--- a/code/modules/power/turbine/turbine.dm
+++ b/code/modules/power/turbine/turbine.dm
@@ -1,11 +1,18 @@
+///Minimum pressure of gases pumped through the turbine
#define MINIMUM_TURBINE_PRESSURE 0.01
+///Returns the minimum pressure if it falls below the value
#define PRESSURE_MAX(value)(max((value), MINIMUM_TURBINE_PRESSURE))
+///Use emissive for overlays
+#define EMISSIVE_OVERLAY (1 << 0)
+///No turned off overlay
+#define NO_INACTIVE_OVERLAY (1 << 1)
/obj/machinery/power/turbine
+ icon = 'icons/obj/machines/engine/turbine.dmi'
density = TRUE
resistance_flags = FIRE_PROOF
can_atmos_pass = ATMOS_PASS_DENSITY
- processing_flags = NONE
+ processing_flags = START_PROCESSING_MANUALLY
///Checks if the machine is processing or not
var/active = FALSE
@@ -17,15 +24,8 @@
var/obj/item/turbine_parts/part_path
///The gas mixture this turbine part is storing
var/datum/gas_mixture/machine_gasmix
-
- ///Our overlay when active
- var/active_overlay = ""
- ///Our overlay when off
- var/off_overlay = ""
- ///Our overlay when open
- var/open_overlay = ""
- ///Should we use emissive appearance?
- var/emissive = FALSE
+ ///Flags for our overlays
+ var/overlay_flags = NONE
/obj/machinery/power/turbine/Initialize(mapload, gas_theoretical_volume)
. = ..()
@@ -59,41 +59,6 @@
deactivate_parts()
return ..()
-/**
- * Handles all the calculations needed for the gases, work done, temperature increase/decrease
- *
- * Arguments
- * * datum/gas_mixture/input_mix - the gas from the environment or from another part of the turbine
- * * datum/gas_mixture/output_mix - the gas that got pumped into this part from the input mix.
- * ideally should be same as input mix but varying texmperatur & pressures can cause varying results
- * * work_amount_to_remove - the amount of work to subtract from the actual work done to pump in the input mixture.
- * For e.g. if gas was transfered from the inlet compressor to the rotor we want to subtract the work done
- * by the inlet from the rotor to get the true work done
- * * intake_size - the percentage of gas to be fed into an turbine part, controlled by turbine computer for inlet compressor only
- */
-/obj/machinery/power/turbine/proc/transfer_gases(datum/gas_mixture/input_mix, datum/gas_mixture/output_mix, work_amount_to_remove, intake_size = 1)
- //pump gases. if no gases were transferred then no work was done
- var/output_pressure = PRESSURE_MAX(output_mix.return_pressure())
- var/datum/gas_mixture/transferred_gases = input_mix.pump_gas_to(output_mix, input_mix.return_pressure() * intake_size)
- if(!transferred_gases)
- return 0
-
- //compute work done
- var/work_done = QUANTIZE(transferred_gases.total_moles()) * R_IDEAL_GAS_EQUATION * transferred_gases.temperature * log((transferred_gases.volume * PRESSURE_MAX(transferred_gases.return_pressure())) / (output_mix.volume * output_pressure)) * TURBINE_WORK_CONVERSION_MULTIPLIER
- if(work_amount_to_remove)
- work_done = work_done - work_amount_to_remove
-
- //compute temperature & work from temperature if that is a lower value
- var/output_mix_heat_capacity = output_mix.heat_capacity()
- if(!output_mix_heat_capacity)
- return 0
- work_done = min(work_done, (output_mix_heat_capacity * output_mix.temperature - output_mix_heat_capacity * TCMB) / TURBINE_HEAT_CONVERSION_MULTIPLIER)
- output_mix.temperature = max((output_mix.temperature * output_mix_heat_capacity + work_done * TURBINE_HEAT_CONVERSION_MULTIPLIER) / output_mix_heat_capacity, TCMB)
- return work_done
-
-/obj/machinery/power/turbine/block_superconductivity()
- return TRUE
-
/obj/machinery/power/turbine/add_context(atom/source, list/context, obj/item/held_item, mob/user)
if(isnull(held_item))
return NONE
@@ -128,7 +93,7 @@
. = ..()
if(installed_part)
. += span_notice("Currently at tier [installed_part.current_tier].")
- if(installed_part.current_tier + 1 < installed_part.max_tier)
+ if(installed_part.current_tier + 1 < TURBINE_PART_TIER_FOUR)
. += span_notice("Can be upgraded by using a tier [installed_part.current_tier + 1] part.")
. += span_notice("The [installed_part.name] can be [EXAMINE_HINT("pried")] out.")
else
@@ -140,15 +105,54 @@
/obj/machinery/power/turbine/update_overlays()
. = ..()
+
if(panel_open)
- . += open_overlay
+ . += "[base_icon_state]_open"
if(active)
- . += active_overlay
- if(emissive)
- . += emissive_appearance(icon, active_overlay, src)
- else
- . += off_overlay
+ . += "[base_icon_state]_on"
+ if(overlay_flags & EMISSIVE_OVERLAY)
+ . += emissive_appearance(icon, "[base_icon_state]_on", src)
+ else if(!(overlay_flags & NO_INACTIVE_OVERLAY))
+ . += "[base_icon_state]_off"
+
+
+/**
+ * Handles all the calculations needed for the gases, work done, temperature increase/decrease
+ *
+ * Arguments
+ * * datum/gas_mixture/input_mix - the gas from the environment or from another part of the turbine
+ * * datum/gas_mixture/output_mix - the gas that got pumped into this part from the input mix.
+ * ideally should be same as input mix but varying texmperatur & pressures can cause varying results
+ * * work_amount_to_remove - the amount of work to subtract from the actual work done to pump in the input mixture.
+ * For e.g. if gas was transfered from the inlet compressor to the rotor we want to subtract the work done
+ * by the inlet from the rotor to get the true work done
+ * * intake_size - the percentage of gas to be fed into an turbine part, controlled by turbine computer for inlet compressor only
+ */
+/obj/machinery/power/turbine/proc/transfer_gases(datum/gas_mixture/input_mix, datum/gas_mixture/output_mix, work_amount_to_remove, intake_size = 1)
+ PROTECTED_PROC(TRUE)
+
+ //pump gases. if no gases were transferred then no work was done
+ var/output_pressure = PRESSURE_MAX(output_mix.return_pressure())
+ var/datum/gas_mixture/transferred_gases = input_mix.pump_gas_to(output_mix, input_mix.return_pressure() * intake_size)
+ if(!transferred_gases)
+ return 0
+
+ //compute work done
+ var/work_done = QUANTIZE(transferred_gases.total_moles()) * R_IDEAL_GAS_EQUATION * transferred_gases.temperature * log((transferred_gases.volume * PRESSURE_MAX(transferred_gases.return_pressure())) / (output_mix.volume * output_pressure)) * TURBINE_WORK_CONVERSION_MULTIPLIER
+ if(work_amount_to_remove)
+ work_done = work_done - work_amount_to_remove
+
+ //compute temperature & work from temperature if that is a lower value
+ var/output_mix_heat_capacity = output_mix.heat_capacity()
+ if(!output_mix_heat_capacity)
+ return 0
+ work_done = min(work_done, (output_mix_heat_capacity * output_mix.temperature - output_mix_heat_capacity * TCMB) / TURBINE_HEAT_CONVERSION_MULTIPLIER)
+ output_mix.temperature = max((output_mix.temperature * output_mix_heat_capacity + work_done * TURBINE_HEAT_CONVERSION_MULTIPLIER) / output_mix_heat_capacity, TCMB)
+ return work_done
+
+/obj/machinery/power/turbine/block_superconductivity()
+ return TRUE
/obj/machinery/power/turbine/screwdriver_act(mob/living/user, obj/item/tool)
. = ITEM_INTERACT_BLOCKING
@@ -165,7 +169,7 @@
deactivate_parts(user)
else
activate_parts(user)
- update_appearance()
+ update_appearance(UPDATE_OVERLAYS)
return ITEM_INTERACT_SUCCESS
@@ -229,22 +233,22 @@
if(gone == installed_part)
installed_part = null
-/obj/machinery/power/turbine/attackby(obj/item/turbine_parts/object, mob/user, params)
- //not the correct part
+/obj/machinery/power/turbine/item_interaction(mob/living/user, obj/item/turbine_parts/object, list/modifiers)
+ . = NONE
if(!istype(object, part_path))
return ..()
//not in a state to accep the part. return TRUE so we don't bash the machine and damage it
if(active)
balloon_alert(user, "turn off the machine first!")
- return TRUE
+ return ITEM_INTERACT_BLOCKING
if(!panel_open)
balloon_alert(user, "open the maintenance hatch first!")
- return TRUE
+ return ITEM_INTERACT_BLOCKING
//install the part
if(!do_after(user, 2 SECONDS, src))
- return TRUE
+ return ITEM_INTERACT_BLOCKING
if(installed_part)
user.put_in_hands(installed_part)
balloon_alert(user, "replaced part with the one in hand")
@@ -252,22 +256,21 @@
balloon_alert(user, "installed new part")
user.transferItemToLoc(object, src)
installed_part = object
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/// Gets the efficiency of the installed part, returns 0 if no part is installed
/obj/machinery/power/turbine/proc/get_efficiency()
+ SHOULD_BE_PURE(TRUE)
+
return installed_part?.part_efficiency || 0
/obj/machinery/power/turbine/inlet_compressor
name = "inlet compressor"
desc = "The input side of a turbine generator, contains the compressor."
- icon = 'icons/obj/machines/engine/turbine.dmi'
icon_state = "inlet_compressor"
+ base_icon_state = "inlet"
circuit = /obj/item/circuitboard/machine/turbine_compressor
part_path = /obj/item/turbine_parts/compressor
- active_overlay = "inlet_animation"
- off_overlay = "inlet_off"
- open_overlay = "inlet_open"
/// The rotor this inlet is linked to
var/obj/machinery/power/turbine/core_rotor/rotor
@@ -296,6 +299,8 @@
* Returns temperature of the gas mix absorbed only if some work was done
*/
/obj/machinery/power/turbine/inlet_compressor/proc/compress_gases()
+ SHOULD_NOT_OVERRIDE(TRUE)
+
compressor_work = 0
compressor_pressure = MINIMUM_TURBINE_PRESSURE
if(QDELETED(input_turf))
@@ -314,16 +319,14 @@
return input_turf_mixture.temperature
+//===========================OUTLET==============================================
/obj/machinery/power/turbine/turbine_outlet
name = "turbine outlet"
desc = "The output side of a turbine generator, contains the turbine and the stator."
- icon = 'icons/obj/machines/engine/turbine.dmi'
icon_state = "turbine_outlet"
+ base_icon_state = "outlet"
circuit = /obj/item/circuitboard/machine/turbine_stator
part_path = /obj/item/turbine_parts/stator
- active_overlay = "outlet_animation"
- off_overlay = "outlet_off"
- open_overlay = "outlet_open"
/// The rotor this outlet is linked to
var/obj/machinery/power/turbine/core_rotor/rotor
@@ -343,6 +346,8 @@
/// push gases from its gas mix to output turf
/obj/machinery/power/turbine/turbine_outlet/proc/expel_gases()
+ SHOULD_NOT_OVERRIDE(TRUE)
+
if(QDELETED(output_turf))
output_turf = get_step(loc, dir)
//turf is blocked don't eject gases
@@ -358,18 +363,16 @@
//return ejected gases
return ejected_gases
+//===========================================CORE ROTOR=========================================
/obj/machinery/power/turbine/core_rotor
name = "core rotor"
desc = "The middle part of a turbine generator, contains the rotor and the main computer."
- icon = 'icons/obj/machines/engine/turbine.dmi'
icon_state = "core_rotor"
- active_overlay = "core_light"
- open_overlay = "core_open"
- active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION
- emissive = TRUE
+ base_icon_state = "core"
can_change_cable_layer = TRUE
circuit = /obj/item/circuitboard/machine/turbine_rotor
part_path = /obj/item/turbine_parts/rotor
+ overlay_flags = EMISSIVE_OVERLAY | NO_INACTIVE_OVERLAY
///ID to easily connect the main part of the turbine to the computer
var/mapping_id
@@ -378,9 +381,9 @@
///Reference to the turbine
var/obj/machinery/power/turbine/turbine_outlet/turbine
///Rotation per minute the machine is doing
- var/rpm
+ var/rpm = 0
///Amount of power the machine is producing
- var/produced_energy
+ var/produced_energy = 0
///Check to see if all parts are connected to the core
var/all_parts_connected = FALSE
///Max rmp that the installed parts can handle, limits the rpms
@@ -462,16 +465,21 @@
//works same as regular left click
return multitool_act(user, tool)
-/// convinience proc for balloon alert which returns if viewer is null
+/**
+ * convinience proc for balloon alert which returns if viewer is null
+ * Arguments
+ *
+ * * mob/viewer - the player receiving the message
+ * * text - the message
+ */
/obj/machinery/power/turbine/core_rotor/proc/feedback(mob/viewer, text)
+ PRIVATE_PROC(TRUE)
+
if(isnull(viewer))
return
balloon_alert(viewer, text)
-/**
- * Called to activate the complete machine, checks for part presence, correct orientation and installed parts
- * Registers the input/output turfs
- */
+///Called to activate the complete machine, checks for part presence, correct orientation and installed parts
/obj/machinery/power/turbine/core_rotor/activate_parts(mob/user, check_only = FALSE)
//if this is not a checkup and all parts are connected then we have nothing to do
if(!check_only && all_parts_connected)
@@ -479,13 +487,18 @@
//locate compressor & turbine, when checking we simply check to see if they are still there
if(!check_only)
- compressor = locate(/obj/machinery/power/turbine/inlet_compressor) in get_step(src, REVERSE_DIR(dir))
- turbine = locate(/obj/machinery/power/turbine/turbine_outlet) in get_step(src, dir)
+ compressor = locate() in get_step(src, REVERSE_DIR(dir))
+ turbine = locate() in get_step(src, dir)
- //maybe look for them the other way around. we want the rotor to allign with them either way for player convinience
- if(!compressor && !turbine)
- compressor = locate(/obj/machinery/power/turbine/inlet_compressor) in get_step(src, dir)
- turbine = locate(/obj/machinery/power/turbine/turbine_outlet) in get_step(src, REVERSE_DIR(dir))
+ //maybe look for them the other way around. this means the rotor is facing the wrong way
+ if(QDELETED(compressor) && QDELETED(turbine))
+ compressor = locate() in get_step(src, dir)
+ turbine = locate() in get_step(src, REVERSE_DIR(dir))
+
+ //show corrective actions
+ if(!QDELETED(compressor) || !QDELETED(turbine))
+ feedback(user, "rotor is facing the wrong way!")
+ return (all_parts_connected = FALSE)
//sanity checks for compressor
if(QDELETED(compressor))
@@ -505,17 +518,17 @@
if(QDELETED(turbine))
feedback(user, "missing turbine!")
return (all_parts_connected = FALSE)
- if(turbine.dir != dir && turbine.dir != REVERSE_DIR(dir))
+ if(turbine.dir != dir && turbine.dir != REVERSE_DIR(dir)) //make sure it's not perpendicular to the rotor
feedback(user, "turbine not aligned with rotor!")
return (all_parts_connected = FALSE)
if(!turbine.can_connect)
- feedback(user, "turbine panel is either open or is misplaced!") //we say misplaced because can_connect becomes FALSE when this turbine is moved
+ feedback(user, "close turbine panel!") //we say misplaced because can_connect becomes FALSE when this turbine is moved
return (all_parts_connected = FALSE)
if(!turbine.installed_part)
feedback(user, "turbine is missing stator part!")
return (all_parts_connected = FALSE)
- //final sanity check to make sure turbine & compressor are facing the same direction. From an visual perspective they will appear facing away from each other actually. I know blame spriter's
+ //sanity check to make sure turbine & compressor are facing the same direction. From an visual perspective they will appear facing away from each other actually. I know blame spriter's
if(compressor.dir != turbine.dir)
feedback(user, "turbine & compressor are not facing away from each other!")
return (all_parts_connected = FALSE)
@@ -537,85 +550,60 @@
* Allows to null the various machines and references from the main core
*/
/obj/machinery/power/turbine/core_rotor/deactivate_parts()
- if(all_parts_connected)
- power_off()
+ toggle_power(force_off = TRUE)
compressor?.rotor = null
compressor = null
turbine?.rotor = null
turbine = null
all_parts_connected = FALSE
disconnect_from_network()
- SSair.stop_processing_machine(src)
/obj/machinery/power/turbine/core_rotor/on_deconstruction(disassembled)
deactivate_parts()
return ..()
/// Toggle power on and off, not safe
-/obj/machinery/power/turbine/core_rotor/proc/toggle_power()
- if(active)
- power_off()
- return
- power_on()
-
-/**
- * Activate all three parts, not safe, it assumes the machine already connected and properly working
- * It does a minimun check to ensure the parts still exist
- */
-/obj/machinery/power/turbine/core_rotor/proc/power_on()
- if(active || QDELETED(compressor) || QDELETED(turbine))
- return
- active = TRUE
- compressor.active = TRUE
- turbine.active = TRUE
- call_parts_update_appearance()
- SSair.start_processing_machine(src)
-
-/// Calls all parts update appearance proc.
-/obj/machinery/power/turbine/core_rotor/proc/call_parts_update_appearance()
- update_appearance()
- if(!QDELETED(compressor))
- compressor.update_appearance()
- if(!QDELETED(turbine))
- turbine.update_appearance()
+/obj/machinery/power/turbine/core_rotor/proc/toggle_power(force_off)
+ SHOULD_NOT_OVERRIDE(TRUE)
+
+ //toggle status
+ if(force_off)
+ if(!active) //was already off
+ return
+ active = FALSE
+ else
+ active = !active
-/**
- * Deactivate all three parts, not safe, it assumes the machine already connected and properly working
- * will try to turn off whatever components are left of this machine
- */
-/obj/machinery/power/turbine/core_rotor/proc/power_off()
- if(!active)
- return
- active = FALSE
+ //update operation status of parts
+ update_appearance(UPDATE_OVERLAYS)
if(!QDELETED(compressor))
- compressor.active = FALSE
+ compressor.active = active
+ compressor.update_appearance(UPDATE_OVERLAYS)
if(!QDELETED(turbine))
- turbine.active = FALSE
- call_parts_update_appearance()
- SSair.stop_processing_machine(src)
+ turbine.active = active
+ turbine.update_appearance(UPDATE_OVERLAYS)
-/// Returns true if all parts have their panel closed
-/obj/machinery/power/turbine/core_rotor/proc/all_parts_ready()
- if(QDELETED(compressor))
- return FALSE
- if(QDELETED(turbine))
- return FALSE
- return !panel_open && !compressor.panel_open && !turbine.panel_open
+ //start or stop processing
+ if(active)
+ update_mode_power_usage(ACTIVE_POWER_USE, active_power_usage)
+ begin_processing()
+ else
+ unset_static_power()
+ end_processing()
/// Getter for turbine integrity, return the amount in %
/obj/machinery/power/turbine/core_rotor/proc/get_turbine_integrity()
+ SHOULD_NOT_OVERRIDE(TRUE)
+
var/integrity = damage / 500
integrity = max(round(100 - integrity * 100, 0.01), 0)
return integrity
-/obj/machinery/power/turbine/core_rotor/process_atmos()
+/obj/machinery/power/turbine/core_rotor/process(seconds_per_tick)
if(!active || !activate_parts(check_only = TRUE) || (machine_stat & BROKEN) || !powered(ignore_use_power = TRUE))
- power_off()
+ deactivate_parts()
return PROCESS_KILL
- //use power to operate internal electronics & stuff
- update_mode_power_usage(ACTIVE_POWER_USE, active_power_usage)
-
//===============COMPRESSOR WORKING========//
//Transfer gases from turf to compressor
var/temperature = compressor.compress_gases()
@@ -668,9 +656,9 @@
work_done = max(work_done - compressor.compressor_work * TURBINE_COMPRESSOR_STATOR_INTERACTION_MULTIPLIER - turbine_work, 0)
//calculate final acheived rpm
rpm = ((work_done * compressor.get_efficiency()) ** turbine.get_efficiency()) * get_efficiency() / TURBINE_RPM_CONVERSION
- rpm = FLOOR(min(rpm, max_allowed_rpm), 1)
+ rpm = min(ROUND_UP(rpm), max_allowed_rpm)
//add energy into the grid, also use part of it for turbine operation
- produced_energy = rpm * TURBINE_ENERGY_RECTIFICATION_MULTIPLIER * TURBINE_RPM_CONVERSION
+ produced_energy = rpm * TURBINE_ENERGY_RECTIFICATION_MULTIPLIER * TURBINE_RPM_CONVERSION * seconds_per_tick
add_avail(produced_energy)
/obj/item/paper/guides/jobs/atmos/turbine
@@ -686,3 +674,5 @@
#undef PRESSURE_MAX
#undef MINIMUM_TURBINE_PRESSURE
+#undef EMISSIVE_OVERLAY
+#undef NO_INACTIVE_OVERLAY
diff --git a/code/modules/power/turbine/turbine_computer.dm b/code/modules/power/turbine/turbine_computer.dm
index 36a556daefb42..7771bda03f8df 100644
--- a/code/modules/power/turbine/turbine_computer.dm
+++ b/code/modules/power/turbine/turbine_computer.dm
@@ -20,8 +20,8 @@
register_machine(main)
break
-/obj/machinery/computer/turbine_computer/multitool_act(mob/living/user, obj/item/tool)
- var/obj/item/multitool/multitool = tool
+/obj/machinery/computer/turbine_computer/multitool_act(mob/living/user, obj/item/multitool/multitool)
+ . = ITEM_INTERACT_FAILURE
if(!istype(multitool.buffer, /obj/machinery/power/turbine/core_rotor))
to_chat(user, span_notice("Wrong machine type in [multitool] buffer..."))
return
@@ -29,12 +29,21 @@
to_chat(user, span_notice("Changing [src] bluespace network..."))
if(!do_after(user, 0.2 SECONDS, src))
return
+
playsound(get_turf(user), 'sound/machines/click.ogg', 10, TRUE)
register_machine(multitool.buffer)
to_chat(user, span_notice("You link [src] to the console in [multitool]'s buffer."))
- return TRUE
+ return ITEM_INTERACT_SUCCESS
+
+/**
+ * Links the rotor with this computer
+ * Arguments
+ *
+ * * obj/machinery/power/turbine/core_rotor/machine - the machine to link
+ */
+/obj/machinery/computer/turbine_computer/proc/register_machine(obj/machinery/power/turbine/core_rotor/machine)
+ PRIVATE_PROC(TRUE)
-/obj/machinery/computer/turbine_computer/proc/register_machine(machine)
turbine_core = WEAKREF(machine)
/obj/machinery/computer/turbine_computer/ui_interact(mob/user, datum/tgui/ui)
@@ -45,26 +54,27 @@
ui.open()
/obj/machinery/computer/turbine_computer/ui_data(mob/user)
- var/list/data = list()
+ . = list()
+ //do we have the main rotor with all parts connected
var/obj/machinery/power/turbine/core_rotor/main_control = turbine_core?.resolve()
- data["connected"] = !!QDELETED(main_control)
- if(!main_control)
+ if(QDELETED(main_control) || !main_control.all_parts_connected)
+ .["connected"] = FALSE
return
+ else
+ .["connected"] = TRUE
- data["active"] = main_control.active
- data["rpm"] = main_control.rpm ? main_control.rpm : 0
- data["power"] = main_control.produced_energy ? main_control.produced_energy : 0
- data["integrity"] = main_control.get_turbine_integrity()
- data["parts_linked"] = main_control.all_parts_connected
- data["parts_ready"] = main_control.all_parts_ready()
-
- data["max_rpm"] = main_control.max_allowed_rpm
- data["max_temperature"] = main_control.max_allowed_temperature
- data["temp"] = main_control.compressor?.input_turf?.air.temperature || 0
- data["regulator"] = QDELETED(main_control.compressor) ? 0 : main_control.compressor.intake_regulator
+ //operation status
+ .["active"] = main_control.active
+ .["rpm"] = main_control.rpm
+ .["power"] = energy_to_power(main_control.produced_energy)
+ .["integrity"] = main_control.get_turbine_integrity()
- return data
+ //running parameters
+ .["max_rpm"] = main_control.max_allowed_rpm
+ .["max_temperature"] = main_control.max_allowed_temperature
+ .["temp"] = main_control.compressor.input_turf?.air.temperature || 0
+ .["regulator"] = main_control.compressor.intake_regulator
/obj/machinery/computer/turbine_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
@@ -74,19 +84,35 @@
switch(action)
if("toggle_power")
var/obj/machinery/power/turbine/core_rotor/main_control = turbine_core?.resolve()
- if(!main_control || !main_control.all_parts_connected || main_control.rpm > 1000)
- return TRUE
- if(!main_control.activate_parts(usr, check_only = TRUE))
- return TRUE
+ if(!main_control)
+ return FALSE
+
+ if(!main_control.active) //turning on the machine requires all part to be linked
+ if(!main_control.activate_parts(ui.user, check_only = TRUE))
+ return FALSE
+ else if(main_control.rpm > 1000) //turning off requires rpm to be less than 1000
+ return FALSE
+
main_control.toggle_power()
main_control.rpm = 0
main_control.produced_energy = 0
- . = TRUE
+ return TRUE
+
if("regulate")
- var/intake_size = text2num(params["regulate"])
+ var/intake_size = params["regulate"]
+ if(isnull(intake_size))
+ return FALSE
+
+ intake_size = text2num(intake_size)
+ if(isnull(intake_size))
+ return FALSE
+
var/obj/machinery/power/turbine/core_rotor/main_control = turbine_core?.resolve()
- if(intake_size == null || !main_control)
- return
- if(!QDELETED(main_control.compressor))
- main_control.compressor.intake_regulator = clamp(intake_size, 0.01, 1)
- . = TRUE
+ if(!main_control)
+ return FALSE
+
+ if(QDELETED(main_control.compressor))
+ return FALSE
+
+ main_control.compressor.intake_regulator = clamp(intake_size, 0.01, 1)
+ return TRUE
diff --git a/code/modules/power/turbine/turbine_parts.dm b/code/modules/power/turbine/turbine_parts.dm
index 4215fccf39fe0..e568f9e096469 100644
--- a/code/modules/power/turbine/turbine_parts.dm
+++ b/code/modules/power/turbine/turbine_parts.dm
@@ -1,3 +1,8 @@
+///String to access turbine part typepath to upgrade
+#define TURBINE_UPGRADE_PART "part"
+///String to access turbine part required amount to upgrade
+#define TURBINE_UPGRADE_AMOUNT "amount"
+
/obj/item/turbine_parts
name = "turbine parts"
desc = "you really should call an admin"
@@ -8,90 +13,62 @@
var/part_efficiency = 0
///Efficiency increase amount for each tier
var/part_efficiency_increase_amount = 0
-
///Current part tier
var/current_tier = TURBINE_PART_TIER_ONE
- ///Max part tier
- var/max_tier = TURBINE_PART_TIER_FOUR
-
- ///Stores the path of the material for the second tier upgrade
- var/obj/item/stack/sheet/second_tier_material = /obj/item/stack/sheet/plasteel
- ///Amount of second tier material for the upgrade
- var/second_tier_material_amount = 10
-
- ///Stores the path of the material for the third tier upgrade
- var/obj/item/stack/sheet/third_tier_material = /obj/item/stack/sheet/mineral/titanium
- ///Amount of third tier material for the upgrade
- var/third_tier_material_amount = 10
-
- ///Stores the path of the material for the fourth tier upgrade
- var/obj/item/stack/sheet/fourth_tier_material = /obj/item/stack/sheet/mineral/metal_hydrogen
- ///Amount of fourth tier material for the upgrade
- var/fourth_tier_material_amount = 5
-
///Max rpm reachable by the part
var/max_rpm = 35000
- ///Multiplier to increase the max rpm per tier, max should be around 500000 rpm
- var/max_rpm_tier_multiplier = 2.5
-
///Max temperature achievable by the part before the turbine starts to take damage
var/max_temperature = 50000
- ///Max temperature exponential value per tier
- var/max_temperature_tier_exponential = 1.2
/obj/item/turbine_parts/examine(mob/user)
. = ..()
- . += "This is a tier [current_tier] turbine part, rated for [max_rpm] rpm and [max_temperature] K."
- var/upgrade_material_name_amount
- switch(current_tier)
- if(TURBINE_PART_TIER_ONE)
- upgrade_material_name_amount = "[second_tier_material_amount] [initial(second_tier_material.name)] sheets"
- if(TURBINE_PART_TIER_TWO)
- upgrade_material_name_amount = "[third_tier_material_amount] [initial(third_tier_material.name)] sheets"
- if(TURBINE_PART_TIER_THREE)
- upgrade_material_name_amount = "[fourth_tier_material_amount] [initial(fourth_tier_material.name)] sheets"
+ . += span_notice("This is a tier [current_tier] turbine part, rated for [max_rpm] rpm and [max_temperature] K.")
- if(upgrade_material_name_amount)
- . += "Can be upgraded with [upgrade_material_name_amount]."
+ var/list/required_parts = get_tier_upgrades()
+ if(length(required_parts))
+ var/obj/item/stack/material = required_parts[TURBINE_UPGRADE_PART]
+ . += span_notice("Can be upgraded with [required_parts[TURBINE_UPGRADE_AMOUNT]] [initial(material.name)] sheets.")
else
- . += "Is already at max tier."
+ . += span_notice("Is already at max tier.")
+
+///Returns a list containing the typepath & amount of it required to upgrade to the next tier
+/obj/item/turbine_parts/proc/get_tier_upgrades()
+ PROTECTED_PROC(TRUE)
+ SHOULD_BE_PURE(TRUE)
+ RETURN_TYPE(/list)
-/obj/item/turbine_parts/attackby(obj/item/attacking_item, mob/user, params)
- if(current_tier >= max_tier)
- return FALSE
switch(current_tier)
if(TURBINE_PART_TIER_ONE)
- if(!istype(attacking_item, second_tier_material))
- return
- var/obj/item/stack/sheet/second_tier = attacking_item
- if(do_after(user, 1 SECONDS, src) && second_tier.use(second_tier_material_amount))
- current_tier = 2
- part_efficiency += part_efficiency_increase_amount
- max_rpm *= max_rpm_tier_multiplier
- max_temperature = max_temperature ** max_temperature_tier_exponential
- return TRUE
+ return list(TURBINE_UPGRADE_PART = /obj/item/stack/sheet/plasteel, TURBINE_UPGRADE_AMOUNT = 10)
if(TURBINE_PART_TIER_TWO)
- if(!istype(attacking_item, third_tier_material))
- return
- var/obj/item/stack/sheet/third_tier = attacking_item
- if(do_after(user, 2 SECONDS, src) && third_tier.use(third_tier_material_amount))
- current_tier = 3
- part_efficiency += part_efficiency_increase_amount
- max_rpm *= max_rpm_tier_multiplier
- max_temperature = max_temperature ** max_temperature_tier_exponential
- return TRUE
+ return list(TURBINE_UPGRADE_PART = /obj/item/stack/sheet/mineral/titanium, TURBINE_UPGRADE_AMOUNT = 10)
if(TURBINE_PART_TIER_THREE)
- if(!istype(attacking_item, fourth_tier_material))
- return
- var/obj/item/stack/sheet/fourth_tier = attacking_item
- if(do_after(user, 3 SECONDS, src) && fourth_tier.use(fourth_tier_material_amount))
- current_tier = 4
- part_efficiency += part_efficiency_increase_amount
- max_rpm *= max_rpm_tier_multiplier
- max_temperature = max_temperature ** max_temperature_tier_exponential
- return TRUE
-
- return ..()
+ return list(TURBINE_UPGRADE_PART = /obj/item/stack/sheet/mineral/metal_hydrogen, TURBINE_UPGRADE_AMOUNT = 5)
+
+/obj/item/turbine_parts/item_interaction(mob/living/user, obj/item/attacking_item, list/modifiers)
+ . = NONE
+
+ var/list/required_parts = get_tier_upgrades()
+ if(!length(required_parts))
+ balloon_alert(user, "already at max tier!")
+ return ITEM_INTERACT_FAILURE
+
+ var/obj/item/stack/sheet/material = attacking_item
+ if(!istype(material, required_parts[TURBINE_UPGRADE_PART]))
+ balloon_alert(user, "incorrect part!")
+ return ITEM_INTERACT_FAILURE
+
+ var/amount = required_parts[TURBINE_UPGRADE_AMOUNT]
+ if(material.amount < amount)
+ balloon_alert(user, "requires [amount] sheets!")
+ return ITEM_INTERACT_FAILURE
+
+ if(do_after(user, current_tier SECONDS, src) && material.use(amount))
+ current_tier += 1
+ part_efficiency += part_efficiency_increase_amount
+ max_rpm *= 2.5
+ max_temperature = max_temperature ** 1.2
+ return ITEM_INTERACT_SUCCESS
/obj/item/turbine_parts/compressor
name = "compressor part"
@@ -113,9 +90,15 @@
icon_state = "stator_part"
part_efficiency = 0.85
part_efficiency_increase_amount = 0.015
- second_tier_material = /obj/item/stack/sheet/mineral/titanium
- third_tier_material = /obj/item/stack/sheet/mineral/metal_hydrogen
- fourth_tier_material = /obj/item/stack/sheet/mineral/zaukerite
- second_tier_material_amount = 15
- third_tier_material_amount = 15
- fourth_tier_material_amount = 10
+
+/obj/item/turbine_parts/stator/get_tier_upgrades()
+ switch(current_tier)
+ if(TURBINE_PART_TIER_ONE)
+ return list(TURBINE_UPGRADE_PART = /obj/item/stack/sheet/mineral/titanium, TURBINE_UPGRADE_AMOUNT = 15)
+ if(TURBINE_PART_TIER_TWO)
+ return list(TURBINE_UPGRADE_PART = /obj/item/stack/sheet/mineral/metal_hydrogen, TURBINE_UPGRADE_AMOUNT = 15)
+ if(TURBINE_PART_TIER_THREE)
+ return list(TURBINE_UPGRADE_PART = /obj/item/stack/sheet/mineral/zaukerite, TURBINE_UPGRADE_AMOUNT = 10)
+
+#undef TURBINE_UPGRADE_PART
+#undef TURBINE_UPGRADE_AMOUNT
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index 6a2bda4ee25af..241d7b54c39af 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -254,6 +254,8 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
//Yet more templates
/obj/machinery/restaurant_portal,
//Template type
+ /obj/machinery/power/turbine,
+ //Template type
/obj/effect/mob_spawn,
//Template type
/obj/structure/holosign/robot_seat,
diff --git a/icons/obj/machines/engine/turbine.dmi b/icons/obj/machines/engine/turbine.dmi
index 1ae45eb2a1b1f7a28a0bea8f3ed600e29cb29bff..afd9839af1341893312eb208bde380df4ff5e64b 100644
GIT binary patch
delta 5370
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
KcBQ7>v;P5V-}M*(
delta 5392
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 {
+const TurbineDisplay = (props) => {
const { act, data } = useBackend();
- const parts_not_connected = !data.parts_linked && (
-
-
- {
- 'Parts not connected, use a multitool on the core rotor before trying again'
- }
-
-
+
+ return (
+ = 1000)}
+ onClick={() => act('toggle_power')}
+ >
+ {data.active ? 'Online' : 'Offline'}
+
+ }
+ >
+
+
+
+ act('regulate', {
+ regulate: value * 0.01,
+ })
+ }
+ />
+
+
+
+
+
+ {data.rpm} RPM
+
+
+ {data.max_rpm} RPM
+
+
+ {data.temp} K
+
+
+ {data.max_temperature} K
+
+
+ {formatPower(data.power)}
+
+
+
);
- const parts_not_ready = data.parts_linked && !data.parts_ready && (
+};
+
+const OutOfService = (props) => {
+ return (
-
- {
- 'Some parts have open maintenance hatchet, please close them before starting'
- }
-
+
+
+
+ {
+ 'Parts not connected, close all mantainence panels/use a multitool on the rotor before trying again'
+ }
+
+
+
);
+};
+
+export const TurbineComputer = (props) => {
+ const { data } = useBackend();
+
return (
- = 1000) || !data.parts_linked}
- onClick={() => act('toggle_power')}
- />
- }
- >
- {parts_not_connected}
- {parts_not_ready}
-
-
-
- act('regulate', {
- regulate: value * 0.01,
- })
- }
- />
-
-
-
-
-
- {data.rpm} RPM
-
-
- {data.max_rpm} RPM
-
-
- {data.temp} K
-
-
- {data.max_temperature} K
-
-
- {data.power * 4 * 0.001} kW
-
-
-
+ {data.connected ? : }
);
From 27fb2a6a51b244750d47d989680dcaa4a4ad128b Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sun, 15 Dec 2024 03:27:56 +0000
Subject: [PATCH 14/69] Automatic changelog for PR #88254 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88254.yml | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88254.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88254.yml b/html/changelogs/AutoChangeLog-pr-88254.yml
new file mode 100644
index 0000000000000..e2ee830005d84
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88254.yml
@@ -0,0 +1,5 @@
+author: "SyncIt21"
+delete-after: True
+changes:
+ - bugfix: "Turbine converts energy to power correctly & shows correct reading with multitool"
+ - refactor: "turbine code has been overall improved. report bugs on github"
\ No newline at end of file
From 1cdcdf6b1fe6235585bced3804962a39b395b47c Mon Sep 17 00:00:00 2001
From: Josh
Date: Sun, 15 Dec 2024 03:45:08 +0000
Subject: [PATCH 15/69] that damn CC light (#88509)
## About The Pull Request
There is a FUCKING light in the CC landing area that is not aligned with
the rest of them
## Why It's Good For The Game
That light can get fucked
## Changelog
:cl:
fix: CC have got an electrician to sort out the lights in the CC arrival
area
/:cl:
Co-authored-by: Josh Powell
---
_maps/map_files/generic/CentCom.dmm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 4aab72d4be630..8f24d290d1750 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -62229,7 +62229,7 @@ xt
xt
xt
xt
-xt
+PG
xt
Vd
zm
@@ -62486,7 +62486,7 @@ xt
xt
xt
xt
-rq
+xt
xt
xt
zl
From 005ce43fb190c924e036e61aef3df938c00bcaf8 Mon Sep 17 00:00:00 2001
From: Josh
Date: Sun, 15 Dec 2024 03:45:30 +0000
Subject: [PATCH 16/69] Gives nukies beakers (#88508)
## About The Pull Request
This gives the chemical section in the nukie base some large beakers
## Why It's Good For The Game
It's a bit mad that a nukie can pay TC to get access to this area and
then they get, like, 3 small beakers? I've had to intervene as an admin
to give them more.
## Changelog
:cl:
map: In the new year's budget the syndicate have decided that chemists
need beakers to do their job properly.
/:cl:
Co-authored-by: Josh Powell
---
_maps/templates/lazy_templates/nukie_base.dmm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm
index bb1d8bd412650..5178b0f935630 100644
--- a/_maps/templates/lazy_templates/nukie_base.dmm
+++ b/_maps/templates/lazy_templates/nukie_base.dmm
@@ -68,6 +68,17 @@
/obj/effect/turf_decal/siding/thinplating_new/light{
dir = 8
},
+/obj/structure/closet/syndicate/personal,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
"bo" = (
From 469f7dc14f9d327bfa6bb8f4303f4f1dee33faf4 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sun, 15 Dec 2024 03:45:49 +0000
Subject: [PATCH 17/69] Automatic changelog for PR #88508 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88508.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88508.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88508.yml b/html/changelogs/AutoChangeLog-pr-88508.yml
new file mode 100644
index 0000000000000..30b95cd438a3c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88508.yml
@@ -0,0 +1,4 @@
+author: "JoshAdamPowell"
+delete-after: True
+changes:
+ - map: "In the new year's budget the syndicate have decided that chemists need beakers to do their job properly."
\ No newline at end of file
From 92d224d48ff393035477a9b44ee285e70d2ca450 Mon Sep 17 00:00:00 2001
From: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Date: Sun, 15 Dec 2024 06:49:30 +0300
Subject: [PATCH 18/69] Fourth! Time's the Charm: Actually fixes jetpack race
conditions this time around (#88492)
## About The Pull Request
A) Queue time can be null and it'll be valid for hotstarting loops
B) Pushoffs working even when you're moving feels much better
C) Jetpacks were having race issues with drift handlers because those
were also using comsigs which is a remnant of old code back when they
were components. Handlers should fire last, post-comsigs.
D) We should not be hard-blocking jetpack movement when doing final
slowdown step. Like really.
## Why It's Good For The Game
Jetpacks ACTUALLY don't suck this time around.
## Changelog
:cl:
qol: Jetpacks should ACTUALLY feel better now
/:cl:
---
.../subsystem/movement/newtonian_movement.dm | 2 +-
code/datums/components/jetpack.dm | 21 +++++++++---
code/datums/drift_handler.dm | 33 +++++++++----------
code/modules/mob/mob_movement.dm | 16 ++++++---
4 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/code/controllers/subsystem/movement/newtonian_movement.dm b/code/controllers/subsystem/movement/newtonian_movement.dm
index 41db87d722b58..e4143669678b2 100644
--- a/code/controllers/subsystem/movement/newtonian_movement.dm
+++ b/code/controllers/subsystem/movement/newtonian_movement.dm
@@ -39,7 +39,7 @@ MOVEMENT_SUBSYSTEM_DEF(newtonian_movement)
/datum/controller/subsystem/movement/newtonian_movement/proc/fire_moveloop(datum/move_loop/loop)
// Loop isn't even running right now
- if(!(loop.status & MOVELOOP_STATUS_QUEUED) || isnull(loop.queued_time))
+ if(!(loop.status & MOVELOOP_STATUS_QUEUED))
return
// Drop the loop, process it, and if its still valid - queue it again
dequeue_loop(loop)
diff --git a/code/datums/components/jetpack.dm b/code/datums/components/jetpack.dm
index 1a44da7eb6d8b..c7ff096029b97 100644
--- a/code/datums/components/jetpack.dm
+++ b/code/datums/components/jetpack.dm
@@ -110,6 +110,7 @@
RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_react))
RegisterSignal(user, COMSIG_MOB_CLIENT_MOVE_NOGRAV, PROC_REF(on_client_move))
RegisterSignal(user, COMSIG_MOB_ATTEMPT_HALT_SPACEMOVE, PROC_REF(on_pushoff))
+ RegisterSignal(user, COMSIG_MOVABLE_DRIFT_BLOCK_INPUT, PROC_REF(on_input_block))
last_stabilization_tick = world.time
START_PROCESSING(SSnewtonian_movement, src)
if (effect_type)
@@ -164,6 +165,17 @@
var/max_drift_force = MOVE_DELAY_TO_DRIFT(user.cached_multiplicative_slowdown)
user.drift_handler.stabilize_drift(user.client.intended_direction ? dir2angle(user.client.intended_direction) : null, user.client.intended_direction ? max_drift_force : 0, stabilization_force * (seconds_per_tick * 1 SECONDS))
+/datum/component/jetpack/proc/on_input_block(mob/source)
+ SIGNAL_HANDLER
+
+ if (!should_trigger(source))
+ return
+
+ if (!check_on_move.Invoke(TRUE))
+ return
+
+ return DRIFT_ALLOW_INPUT
+
/datum/component/jetpack/proc/on_client_move(mob/source, list/move_args)
SIGNAL_HANDLER
@@ -179,11 +191,10 @@
var/max_drift_force = MOVE_DELAY_TO_DRIFT(source.cached_multiplicative_slowdown)
var/applied_force = drift_force
var/move_dir = source.client.intended_direction
- // We're not moving anywhere, try to see if we can simulate pushing off a wall
- if (isnull(source.drift_handler))
- var/atom/movable/backup = source.get_spacemove_backup(move_dir, FALSE)
- if (backup && !(backup.dir & move_dir))
- applied_force = max_drift_force
+ // Try to see if we can simulate pushing off a wall
+ var/atom/movable/backup = source.get_spacemove_backup(move_dir, FALSE, include_floors = TRUE)
+ if (backup && !(backup.dir & move_dir))
+ applied_force = max_drift_force
// We don't want to force the loop to fire before stabilizing if we're going to, otherwise its effects will be delayed until the next tick which is jank
var/force_stabilize = FALSE
diff --git a/code/datums/drift_handler.dm b/code/datums/drift_handler.dm
index dc47f28819b59..dcf0771d8a5e8 100644
--- a/code/datums/drift_handler.dm
+++ b/code/datums/drift_handler.dm
@@ -36,7 +36,6 @@
RegisterSignal(drifting_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(before_move))
RegisterSignal(drifting_loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(after_move))
RegisterSignal(drifting_loop, COMSIG_QDELETING, PROC_REF(loop_death))
- RegisterSignal(parent, COMSIG_MOB_ATTEMPT_HALT_SPACEMOVE, PROC_REF(attempt_halt))
if(drifting_loop.status & MOVELOOP_STATUS_RUNNING)
drifting_start(drifting_loop) // There's a good chance it'll autostart, gotta catch that
@@ -208,28 +207,28 @@
if(world.time < block_inputs_until)
return COMSIG_MOB_CLIENT_BLOCK_PRE_MOVE
-/datum/drift_handler/proc/attempt_halt(mob/source, movement_dir, continuous_move, atom/backup)
- SIGNAL_HANDLER
-
- if ((backup.density || !backup.CanPass(source, get_dir(backup, source))) && (get_dir(source, backup) == movement_dir || source.loc == backup.loc))
+/datum/drift_handler/proc/attempt_halt(movement_dir, continuous_move, atom/backup)
+ if ((backup.density || !backup.CanPass(parent, get_dir(backup, parent))) && (get_dir(parent, backup) == movement_dir || parent.loc == backup.loc))
if (drift_force >= INERTIA_FORCE_THROW_FLOOR)
- source.throw_at(backup, 1, floor(1 + (drift_force - INERTIA_FORCE_THROW_FLOOR) / INERTIA_FORCE_PER_THROW_FORCE), spin = FALSE)
- return
+ parent.throw_at(backup, 1, floor(1 + (drift_force - INERTIA_FORCE_THROW_FLOOR) / INERTIA_FORCE_PER_THROW_FORCE), spin = FALSE)
+ return FALSE
if (drift_force < INERTIA_FORCE_SPACEMOVE_GRAB || isnull(drifting_loop))
- return
+ return FALSE
- if (!isnull(source.client) && source.client.intended_direction)
- if ((source.client.intended_direction & movement_dir) && !(get_dir(source, backup) & movement_dir))
- return
+ if (ismob(parent))
+ var/mob/source_user = parent
+ if (!isnull(source_user.client) && source_user.client.intended_direction)
+ if ((source_user.client.intended_direction & movement_dir) && !(get_dir(source_user, backup) & movement_dir))
+ return FALSE
- if (drift_force <= INERTIA_FORCE_SPACEMOVE_REDUCTION / source.inertia_force_weight)
- glide_to_halt(get_loop_delay(source))
- return COMPONENT_PREVENT_SPACEMOVE_HALT
+ if (drift_force <= INERTIA_FORCE_SPACEMOVE_REDUCTION / parent.inertia_force_weight)
+ glide_to_halt(get_loop_delay(parent))
+ return TRUE
- drift_force -= INERTIA_FORCE_SPACEMOVE_REDUCTION / source.inertia_force_weight
- drifting_loop.set_delay(get_loop_delay(source))
- return COMPONENT_PREVENT_SPACEMOVE_HALT
+ drift_force -= INERTIA_FORCE_SPACEMOVE_REDUCTION / parent.inertia_force_weight
+ drifting_loop.set_delay(get_loop_delay(parent))
+ return TRUE
/datum/drift_handler/proc/get_loop_delay(atom/movable/movable)
return (DEFAULT_INERTIA_SPEED / ((1 - INERTIA_SPEED_COEF) + drift_force * INERTIA_SPEED_COEF)) * movable.inertia_move_multiplier
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index f19a3991ca34f..743bdad8c4511 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -281,6 +281,9 @@
if (SEND_SIGNAL(src, COMSIG_MOB_ATTEMPT_HALT_SPACEMOVE, movement_dir, continuous_move, backup) & COMPONENT_PREVENT_SPACEMOVE_HALT)
return FALSE
+ if (drift_handler?.attempt_halt(movement_dir, continuous_move, backup))
+ return FALSE
+
if(continuous_move || !istype(backup) || !movement_dir || backup.anchored)
return TRUE
@@ -300,8 +303,9 @@
/**
* Finds a target near a mob that is viable for pushing off when moving.
* Takes the intended movement direction as input, alongside if the context is checking if we're allowed to continue drifting
+ * If include_floors is TRUE, includes floors *with gravity*
*/
-/mob/get_spacemove_backup(moving_direction, continuous_move)
+/mob/get_spacemove_backup(moving_direction, continuous_move, include_floors = FALSE)
var/atom/secondary_backup
var/list/priority_dirs = (moving_direction in GLOB.cardinals) ? GLOB.cardinals : GLOB.diagonals
for(var/atom/pushover as anything in range(1, get_turf(src)))
@@ -309,13 +313,15 @@
continue
if(isarea(pushover))
continue
+ var/is_priority = pushover.loc == loc || (get_dir(src, pushover) in priority_dirs)
if(isturf(pushover))
var/turf/turf = pushover
if(isspaceturf(turf))
continue
if(!turf.density && !mob_negates_gravity())
- continue
- if (get_dir(src, pushover) in priority_dirs)
+ if (!include_floors || !turf.has_gravity())
+ continue
+ if (is_priority)
return pushover
secondary_backup = pushover
continue
@@ -343,13 +349,13 @@
if(moving_direction == get_dir(src, pushover)) // Can't push "off" of something that you're walking into
continue
if(rebound.anchored)
- if (get_dir(src, rebound) in priority_dirs)
+ if (is_priority)
return rebound
secondary_backup = rebound
continue
if(pulling == rebound)
continue
- if (get_dir(src, rebound) in priority_dirs)
+ if (is_priority)
return rebound
secondary_backup = rebound
return secondary_backup
From fd97195e2c3867351855a7ffcecbe21b5f5ca551 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sun, 15 Dec 2024 03:49:52 +0000
Subject: [PATCH 19/69] Automatic changelog for PR #88492 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88492.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88492.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88492.yml b/html/changelogs/AutoChangeLog-pr-88492.yml
new file mode 100644
index 0000000000000..3b1598c748c0f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88492.yml
@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+ - qol: "Jetpacks should ACTUALLY feel better now"
\ No newline at end of file
From 47b601956494c3e806bfc15781c48129129d3338 Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Sun, 15 Dec 2024 06:32:48 -0600
Subject: [PATCH 20/69] Fixes gauzes arguments being backwards (also improves
wording while here) (#88507)
---
code/game/objects/items/stacks/medical.dm | 28 +++++++++++++++--------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 6eda30d328dea..fc6af425f0af7 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -32,6 +32,8 @@
var/sanitization
/// How much we add to flesh_healing for burn wounds on application
var/flesh_regeneration
+ /// Verb used when applying this object to someone
+ var/apply_verb = "treating"
/obj/item/stack/medical/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!isliving(interacting_with))
@@ -90,8 +92,8 @@
var/heal_zone = check_zone(user.zone_selected)
if(!try_heal_checks(patient, user, heal_zone))
return FALSE
- SSblackbox.record_feedback("nested tally", "medical_item_used", 1, list(type, auto_change_zone ? "auto" : "manual"))
- patient.balloon_alert(user, "treating [parse_zone(heal_zone)]...")
+ SSblackbox.record_feedback("nested tally", "medical_item_used", 1, list(type, "[auto_change_zone ? "auto" : "manual"]"))
+ patient.balloon_alert(user, "[apply_verb] [parse_zone(heal_zone)]...")
INVOKE_ASYNC(src, PROC_REF(try_heal), patient, user, heal_zone, FALSE, iscarbon(patient) && auto_change_zone) // auto change is useless for non-carbons
return TRUE
@@ -114,7 +116,7 @@
/obj/item/stack/medical/proc/try_heal(mob/living/patient, mob/living/user, healed_zone, silent = FALSE, auto_change_zone = TRUE)
if(patient == user)
if(!silent)
- user.balloon_alert(user, "treating [parse_zone(healed_zone)]...")
+ user.balloon_alert(user, "[apply_verb] [parse_zone(healed_zone)]...")
user.visible_message(
span_notice("[user] starts to apply [src] on [user.p_them()]self..."),
span_notice("You begin applying [src] on yourself..."),
@@ -134,7 +136,7 @@
else if(other_delay)
if(!silent)
- patient.balloon_alert(user, "treating [parse_zone(healed_zone)]...")
+ patient.balloon_alert(user, "[apply_verb] [parse_zone(healed_zone)]...")
user.visible_message(
span_notice("[user] starts to apply [src] on [patient]."),
span_notice("You begin applying [src] on [patient]..."),
@@ -181,7 +183,7 @@
var/preferred_target = check_zone(user.zone_selected)
if(try_heal_checks(patient, user, preferred_target, silent = TRUE))
if(preferred_target != healed_zone)
- patient.balloon_alert(user, "treating [parse_zone(preferred_target)]...")
+ patient.balloon_alert(user, "[apply_verb] [parse_zone(preferred_target)]...")
try_heal(patient, user, preferred_target, TRUE, auto_change_zone)
return
@@ -211,7 +213,7 @@
var/next_picked = (preferred_target in other_affected_limbs) ? preferred_target : other_affected_limbs[1]
if(next_picked != last_zone)
- user.balloon_alert(user, "treating [parse_zone(next_picked)]...")
+ user.balloon_alert(user, "[apply_verb] [parse_zone(next_picked)]...")
try_heal(patient, user, next_picked, silent = TRUE, auto_change_zone = TRUE)
/obj/item/stack/medical/proc/try_heal_manual_target(mob/living/carbon/patient, mob/living/user)
@@ -223,7 +225,7 @@
var/new_zone = check_zone(user.zone_selected)
if(!try_heal_checks(patient, user, new_zone))
return
- patient.balloon_alert(user, "treating [parse_zone(new_zone)]...")
+ patient.balloon_alert(user, "[apply_verb] [parse_zone(new_zone)]...")
try_heal(patient, user, new_zone, silent = TRUE, auto_change_zone = FALSE)
/// Checks if the passed patient can be healed by the passed user
@@ -343,6 +345,7 @@
other_delay = 2 SECONDS
grind_results = list(/datum/reagent/medicine/c2/libital = 10)
merge_type = /obj/item/stack/medical/bruise_pack
+ apply_verb = "applying to"
/obj/item/stack/medical/bruise_pack/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
@@ -365,6 +368,7 @@
splint_factor = 0.7
burn_cleanliness_bonus = 0.35
merge_type = /obj/item/stack/medical/gauze
+ apply_verb = "wrapping"
var/obj/item/bodypart/gauzed_bodypart
/obj/item/stack/medical/gauze/Destroy(force)
@@ -403,7 +407,7 @@
return FALSE
// gauze is only relevant for wounds, which are handled in the wounds themselves
-/obj/item/stack/medical/gauze/try_heal(mob/living/patient, mob/living/user, silent, healed_zone, auto_change_zone)
+/obj/item/stack/medical/gauze/try_heal(mob/living/patient, mob/living/user, healed_zone, silent, auto_change_zone)
var/obj/item/bodypart/limb = patient.get_bodypart(healed_zone)
var/treatment_delay = (user == patient ? self_delay : other_delay)
var/any_scanned = FALSE
@@ -436,8 +440,6 @@
visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE,
)
- patient.balloon_alert(user, "wrapping [parse_zone(healed_zone)]...")
-
if(!do_after(user, treatment_delay, target = patient))
return
@@ -510,6 +512,7 @@
stop_bleeding = 0.6
grind_results = list(/datum/reagent/medicine/spaceacillin = 2)
merge_type = /obj/item/stack/medical/suture
+ apply_verb = "suturing"
/obj/item/stack/medical/suture/emergency
name = "emergency suture"
@@ -546,6 +549,7 @@
sanitization = 0.25
grind_results = list(/datum/reagent/medicine/c2/lenturi = 10)
merge_type = /obj/item/stack/medical/ointment
+ apply_verb = "applying to"
/obj/item/stack/medical/ointment/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is squeezing [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?"))
@@ -643,6 +647,7 @@
heal_burn = 3
grind_results = list(/datum/reagent/consumable/aloejuice = 1)
merge_type = /obj/item/stack/medical/aloe
+ apply_verb = "applying to"
/obj/item/stack/medical/aloe/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt)
. = ..()
@@ -667,6 +672,7 @@
grind_results = list(/datum/reagent/bone_dust = 10, /datum/reagent/carbon = 10)
novariants = TRUE
merge_type = /obj/item/stack/medical/bone_gel
+ apply_verb = "applying to"
/obj/item/stack/medical/bone_gel/get_surgery_tool_overlay(tray_extended)
return "gel" + (tray_extended ? "" : "_out")
@@ -719,6 +725,7 @@
mob_throw_hit_sound = 'sound/misc/moist_impact.ogg'
hitsound = 'sound/misc/moist_impact.ogg'
merge_type = /obj/item/stack/medical/poultice
+ apply_verb = "applying to"
/obj/item/stack/medical/poultice/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/living/user)
. = ..()
@@ -740,6 +747,7 @@
self_delay = 3 SECONDS
other_delay = 1 SECONDS
grind_results = list(/datum/reagent/medicine/c2/libital = 2)
+ apply_verb = "applying to"
/obj/item/stack/medical/bandage/makeshift
name = "makeshift bandage"
From 1fff1f42d1a4f00e02a1a8177037e148b1e8a853 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sun, 15 Dec 2024 12:33:10 +0000
Subject: [PATCH 21/69] Automatic changelog for PR #88507 [ci skip]
---
html/changelogs/AutoChangeLog-pr-88507.yml | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-88507.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88507.yml b/html/changelogs/AutoChangeLog-pr-88507.yml
new file mode 100644
index 0000000000000..f0cb40e7e9ffd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88507.yml
@@ -0,0 +1,5 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - qol: "Treatment message now better reflects what you're doing (\"suturing\", \"applying\", etc)"
+ - bugfix: "Gauze is now stickier (and will actually apply to bodyparts)"
\ No newline at end of file
From d4d106c97d9547feeb6718ba937cc8f5ddc8ba4e Mon Sep 17 00:00:00 2001
From: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Date: Sun, 15 Dec 2024 16:15:37 +0300
Subject: [PATCH 22/69] Rave and plasma stabilizer MODules now utilize
theme-specific visors (#88369)
## About The Pull Request
Rave and plasma stabilizer MODules now use per-theme visors so they no
longer look like an ugly blob (because their sprite only works with the
"standard" MODsuit theme)
Armor booster modules use a signal to change the visor when they're
activated
## Why It's Good For The Game
Currently they use the base helmet visor sprite which doesn't look very
good on non-standard MODsuits
## Changelog
:cl:
add: Rave and plasma stabilizer MODules now utilize theme-specific
visors
/:cl:
---
code/__DEFINES/dcs/signals/signals_mod.dm | 2 ++
code/modules/mod/mod_control.dm | 7 +++++++
code/modules/mod/modules/modules_antag.dm | 11 +++++++++++
code/modules/mod/modules/modules_general.dm | 10 ++++++----
code/modules/mod/modules/modules_maint.dm | 11 +++++++----
icons/mob/clothing/modsuit/mod_clothing.dmi | Bin 136036 -> 115201 bytes
icons/mob/clothing/modsuit/mod_modules.dmi | Bin 15622 -> 13412 bytes
7 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/code/__DEFINES/dcs/signals/signals_mod.dm b/code/__DEFINES/dcs/signals/signals_mod.dm
index 58fd8ca689ed1..c08377d50db42 100644
--- a/code/__DEFINES/dcs/signals/signals_mod.dm
+++ b/code/__DEFINES/dcs/signals/signals_mod.dm
@@ -45,3 +45,5 @@
#define COMSIG_MOD_TETHER_SNAP "mod_tether_snap"
/// Called when a MOD module generats its worn overlay
#define COMSIG_MODULE_GENERATE_WORN_OVERLAY "mod_module_generate_worn_overlay"
+/// Called when the MOD control unit fetches its visor icon
+#define COMSIG_MOD_GET_VISOR_OVERLAY "mod_get_visor_overlay"
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 8d5c5c209540d..3b1f2a648bc76 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -771,3 +771,10 @@
mod_link.end_call()
mod_link.frequency = null
+
+/obj/item/mod/control/proc/get_visor_overlay(mutable_appearance/standing)
+ var/list/overrides = list()
+ SEND_SIGNAL(src, COMSIG_MOD_GET_VISOR_OVERLAY, standing, overrides)
+ if (length(overrides))
+ return overrides[1]
+ return mutable_appearance(worn_icon, "[skin]-helmet-visor", layer = standing.layer + 0.1)
diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm
index 3eef7d47f158b..ba5e1711fcb29 100644
--- a/code/modules/mod/modules/modules_antag.dm
+++ b/code/modules/mod/modules/modules_antag.dm
@@ -102,6 +102,17 @@
else
REMOVE_TRAIT(mod.wearer, TRAIT_HEAD_INJURY_BLOCKED, REF(src))
+/obj/item/mod/module/armor_booster/on_install()
+ RegisterSignal(mod, COMSIG_MOD_GET_VISOR_OVERLAY, PROC_REF(on_visor_overlay))
+
+/obj/item/mod/module/armor_booster/on_uninstall(deleting)
+ UnregisterSignal(mod, COMSIG_MOD_GET_VISOR_OVERLAY)
+
+/obj/item/mod/module/armor_booster/proc/on_visor_overlay(datum/source, mutable_appearance/standing, list/overrides)
+ SIGNAL_HANDLER
+ if (active)
+ overrides += mutable_appearance(overlay_icon_file, "module_armorbooster_visor-[mod.skin]", layer = standing.layer + 0.1)
+
///Energy Shield - Gives you a rechargeable energy shield that nullifies attacks.
/obj/item/mod/module/energy_shield
name = "MOD energy shield module"
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 3f4dfe405f738..a766e3f6e4da2 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -664,13 +664,15 @@
complexity = 1
idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
incompatible_modules = list(/obj/item/mod/module/plasma_stabilizer)
- overlay_state_inactive = "module_plasma"
required_slots = list(ITEM_SLOT_HEAD)
-/obj/item/mod/module/plasma_stabilizer/generate_worn_overlay()
- if(locate(/obj/item/mod/module/infiltrator) in mod.modules)
+/obj/item/mod/module/plasma_stabilizer/generate_worn_overlay(mutable_appearance/standing)
+ if (!active)
return list()
- return ..()
+ var/mutable_appearance/visor_overlay = mod.get_visor_overlay(standing)
+ visor_overlay.appearance_flags |= RESET_COLOR
+ visor_overlay.color = COLOR_VOID_PURPLE
+ return list(visor_overlay)
/obj/item/mod/module/plasma_stabilizer/on_equip()
ADD_TRAIT(mod.wearer, TRAIT_HEAD_ATMOS_SEALED, REF(src))
diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm
index 48089b0125c9a..7344993802cbc 100644
--- a/code/modules/mod/modules/modules_maint.dm
+++ b/code/modules/mod/modules/modules_maint.dm
@@ -87,7 +87,6 @@
desc = "A Super Cool Awesome Visor (SCAV), intended for modular suits."
icon_state = "rave_visor"
complexity = 1
- overlay_state_inactive = "module_rave"
required_slots = list(ITEM_SLOT_HEAD|ITEM_SLOT_MASK)
/// The client colors applied to the wearer.
var/datum/client_colour/rave_screen
@@ -132,9 +131,13 @@
SEND_SOUND(mod.wearer, sound('sound/machines/terminal/terminal_off.ogg', volume = 50, channel = CHANNEL_JUKEBOX))
/obj/item/mod/module/visor/rave/generate_worn_overlay(mutable_appearance/standing)
- . = ..()
- for(var/mutable_appearance/appearance as anything in .)
- appearance.color = isnull(music_player.active_song_sound) ? null : rainbow_order[rave_number]
+ if (!active)
+ return list()
+ var/mutable_appearance/visor_overlay = mod.get_visor_overlay(standing)
+ visor_overlay.appearance_flags |= RESET_COLOR
+ if (!isnull(music_player.active_song_sound))
+ visor_overlay.color = rainbow_order[rave_number]
+ return list(visor_overlay)
/obj/item/mod/module/visor/rave/on_active_process(seconds_per_tick)
rave_number++
diff --git a/icons/mob/clothing/modsuit/mod_clothing.dmi b/icons/mob/clothing/modsuit/mod_clothing.dmi
index 815983f7094e6dd9bb2aa229860000f2a78fc377..8a39f37bf0b1fcd8cca4e0d7ede1bd7b82147668 100644
GIT binary patch
literal 115201
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