From a9c0c79f85bd140821724e007da49ad764d1aa14 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:14:03 +0000
Subject: [PATCH 01/33] Update ticker.dm (#14962)
---
code/controllers/subsystem/ticker.dm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index d4bbf0fd9e3..975e03b786c 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -127,9 +127,10 @@ SUBSYSTEM_DEF(ticker)
if((GLOB.master_mode=="random") || (GLOB.master_mode=="secret"))
runnable_modes = config.get_runnable_modes()
if(runnable_modes.len==0)
+ to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.")
+ force_start = FALSE
current_state = GAME_STATE_PREGAME
Master.SetRunLevel(RUNLEVEL_LOBBY)
- to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.")
return 0
if(GLOB.secret_force_mode != "secret")
var/datum/game_mode/M = config.pick_mode(GLOB.secret_force_mode)
@@ -147,6 +148,7 @@ SUBSYSTEM_DEF(ticker)
to_chat(world, "Unable to start [mode.name]. Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby.")
mode = null
current_state = GAME_STATE_PREGAME
+ force_start = FALSE
SSjobs.ResetOccupations()
Master.SetRunLevel(RUNLEVEL_LOBBY)
return 0
@@ -158,8 +160,9 @@ SUBSYSTEM_DEF(ticker)
SSjobs.DivideOccupations() //Distribute jobs
if(!can_continue)
qdel(mode)
- current_state = GAME_STATE_PREGAME
to_chat(world, "Error setting up [GLOB.master_mode]. Reverting to pre-game lobby.")
+ current_state = GAME_STATE_PREGAME
+ force_start = FALSE
SSjobs.ResetOccupations()
Master.SetRunLevel(RUNLEVEL_LOBBY)
return 0
From bc81098b94b70789891706aaac7f51c27b6ac241 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:17:54 +0000
Subject: [PATCH 02/33] Update cryopod.dm (#14963)
---
code/game/machinery/cryopod.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 40e462d2212..7e58cb992a7 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -572,7 +572,7 @@
willing = 1
if(willing)
- if(!Adjacent(L))
+ if(!Adjacent(L) && !Adjacent(user))
to_chat(user, "You're not close enough to [src].")
return
if(L == user)
From 827e4950c6489872d58a7cc68caf357b728edea4 Mon Sep 17 00:00:00 2001
From: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date: Sun, 22 Nov 2020 07:16:35 -0600
Subject: [PATCH 03/33] Update bomb.dm (#14943)
---
code/game/gamemodes/miniantags/guardian/types/bomb.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/game/gamemodes/miniantags/guardian/types/bomb.dm b/code/game/gamemodes/miniantags/guardian/types/bomb.dm
index b69487644f0..bc2e19e6878 100644
--- a/code/game/gamemodes/miniantags/guardian/types/bomb.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/bomb.dm
@@ -49,6 +49,7 @@
density = A.density
appearance = A.appearance
dir = A.dir
+ move_resist = A.move_resist
addtimer(CALLBACK(src, .proc/disable), 600)
/obj/item/guardian_bomb/proc/disable()
From 30de304fdc7c59c270ed5d9f091413a7d3185653 Mon Sep 17 00:00:00 2001
From: Darkmight9 <45213755+Darkmight9@users.noreply.github.com>
Date: Sun, 22 Nov 2020 16:36:37 -0500
Subject: [PATCH 04/33] Makes grass, flowers, and bushes easily destroyable
(#14926)
---
code/game/objects/structures/flora.dm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 62ccc187ecb..0e75bb760f9 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -50,6 +50,7 @@
name = "grass"
icon = 'icons/obj/flora/snowflora.dmi'
anchored = 1
+ max_integrity = 15
/obj/structure/flora/grass/brown
icon_state = "snowgrass1bb"
@@ -80,6 +81,7 @@
icon = 'icons/obj/flora/snowflora.dmi'
icon_state = "snowbush1"
anchored = 1
+ max_integrity = 15
/obj/structure/flora/bush/New()
..()
@@ -92,6 +94,7 @@
icon = 'icons/obj/flora/ausflora.dmi'
icon_state = "firstbush_1"
anchored = 1
+ max_integrity = 15
/obj/structure/flora/ausbushes/New()
..()
From cf3f0f3b451469d0d15ae398d9a74590944b9057 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Sun, 22 Nov 2020 21:41:03 +0000
Subject: [PATCH 05/33] Adds a new examination message for damage severity
(#14922)
* Moderate damage
* Little bit of cleaning
---
.../mob/living/carbon/human/examine.dm | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 4e3bbfcabfd..78489251ca1 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -254,26 +254,26 @@
if(wound_flavor_text["r_foot"]&& (is_destroyed["right foot"] || (!shoes && !skipshoes)))
msg += wound_flavor_text["r_foot"]
- var/temp = getBruteLoss() //no need to calculate each of these twice
+ var/damage = getBruteLoss() //no need to calculate each of these twice
- if(temp)
+ if(damage)
var/brute_message = !ismachineperson(src) ? "bruising" : "denting"
- if(temp < 30)
- msg += "[p_they(TRUE)] [p_have()] minor [brute_message ].\n"
+ if(damage < 60)
+ msg += "[p_they(TRUE)] [p_have()] [damage < 30 ? "minor" : "moderate"] [brute_message].\n"
else
- msg += "[p_they(TRUE)] [p_have()] severe [brute_message ]!\n"
+ msg += "[p_they(TRUE)] [p_have()] severe [brute_message]!\n"
- temp = getFireLoss()
- if(temp)
- if(temp < 30)
- msg += "[p_they(TRUE)] [p_have()] minor burns.\n"
+ damage = getFireLoss()
+ if(damage)
+ if(damage < 60)
+ msg += "[p_they(TRUE)] [p_have()] [damage < 30 ? "minor" : "moderate"] burns.\n"
else
msg += "[p_they(TRUE)] [p_have()] severe burns!\n"
- temp = getCloneLoss()
- if(temp)
- if(temp < 30)
- msg += "[p_they(TRUE)] [p_have()] minor cellular damage.\n"
+ damage = getCloneLoss()
+ if(damage)
+ if(damage < 60)
+ msg += "[p_they(TRUE)] [p_have()] [damage < 30 ? "minor" : "moderate"] cellular damage.\n"
else
msg += "[p_they(TRUE)] [p_have()] severe cellular damage.\n"
From a9d798664901254b11472790e3c99477e5c45883 Mon Sep 17 00:00:00 2001
From: moxian
Date: Sun, 22 Nov 2020 13:44:03 -0800
Subject: [PATCH 06/33] Dialisys QoL. (#14905)
- Can eject beaker from the UI even if no occupant is present.
- The ejected beaker goes into the hand, rather than onto the floor.
---
code/game/machinery/Sleeper.dm | 12 +++++++-----
tgui/packages/tgui/interfaces/Sleeper.js | 5 +++--
tgui/packages/tgui/public/tgui.bundle.js | 2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index d95b38e3fa2..b8a3160d3b9 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -17,8 +17,10 @@
var/possible_chems = list("ephedrine", "salglu_solution", "salbutamol", "charcoal")
var/emergency_chems = list("ephedrine") // Desnowflaking
var/amounts = list(5, 10)
+ /// Beaker loaded into the sleeper. Used for dialysis.
var/obj/item/reagent_containers/glass/beaker = null
- var/filtering = 0
+ /// Whether the machine is currently performing dialysis.
+ var/filtering = FALSE
var/max_chem
var/initial_bin_rating = 1
var/min_health = -25
@@ -404,9 +406,9 @@
/obj/machinery/sleeper/proc/toggle_filter()
if(filtering || !beaker)
- filtering = 0
+ filtering = FALSE
else
- filtering = 1
+ filtering = TRUE
/obj/machinery/sleeper/proc/go_out()
if(filtering)
@@ -464,8 +466,8 @@
return
if(beaker)
- filtering = 0
- beaker.forceMove(usr.loc)
+ filtering = FALSE
+ usr.put_in_hands(beaker)
beaker = null
SStgui.update_uis(src)
add_fingerprint(usr)
diff --git a/tgui/packages/tgui/interfaces/Sleeper.js b/tgui/packages/tgui/interfaces/Sleeper.js
index 7a464923cf8..a38886742a7 100644
--- a/tgui/packages/tgui/interfaces/Sleeper.js
+++ b/tgui/packages/tgui/interfaces/Sleeper.js
@@ -42,6 +42,7 @@ export const Sleeper = (props, context) => {
{body}
+
);
@@ -57,7 +58,6 @@ const SleeperMain = (props, context) => {
-
);
};
@@ -174,6 +174,7 @@ const SleeperDamage = (props, context) => {
const SleeperDialysis = (props, context) => {
const { act, data } = useBackend(context);
const {
+ hasOccupant,
isBeakerLoaded,
beakerMaxSpace,
beakerFreeSpace,
@@ -186,7 +187,7 @@ const SleeperDialysis = (props, context) => {
buttons={