From 8c0911e9689edb439f5bfef2889452fc53e5b7f0 Mon Sep 17 00:00:00 2001
From: qweq12yt <45515587+qweq12yt@users.noreply.github.com>
Date: Mon, 10 May 2021 15:56:50 -0300
Subject: [PATCH 1/2] fix hulks breaking cuffs/zipties
---
code/modules/mob/living/carbon/carbon.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 6f5109c90b..c1110af267 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -370,7 +370,7 @@
breakouttime = 50
visible_message("[src] is trying to break [I]!")
to_chat(src, "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)")
- if(do_after(src, breakouttime, 0, target = src))
+ if(do_after(src, breakouttime, 0, target = src, required_mobility_flags = MOBILITY_RESIST))
clear_cuffs(I, cuff_break)
else
to_chat(src, "You fail to break [I]!")
From 3b234405c89318a070169fd3259dba06345c1299 Mon Sep 17 00:00:00 2001
From: qweq12yt <45515587+qweq12yt@users.noreply.github.com>
Date: Mon, 10 May 2021 16:06:57 -0300
Subject: [PATCH 2/2] fixed disky comfort spam
---
code/modules/antagonists/nukeop/equipment/nuclearbomb.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index 7d669e5c41..eb98635e65 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -633,7 +633,7 @@ This is here to make the tiles around the station mininuke change when it's arme
AddComponent(/datum/component/stationloving, !fake)
/obj/item/disk/nuclear/process()
- ++process_tick
+ process_tick++
if(fake)
STOP_PROCESSING(SSobj, src)
CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck")
@@ -650,7 +650,7 @@ This is here to make the tiles around the station mininuke change when it's arme
disk_comfort_level++
if(disk_comfort_level >= 2) //Sleep tight, disky.
- if(process_tick % 30)
+ if(!(process_tick % 30))
visible_message("[src] sleeps soundly. Sleep tight, disky.")
if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001))
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control