cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-29 23:57:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix

Browse Source 
Fix harddel issues with 515 upgrade PR
This commit is contained in:
BongaTheProto
2024-04-07 03:16:55 -05:00
committed by GitHub
parent 2709ec887c 66bd025454
commit 78d4eaeaaa
31 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_sand/code/modules/mob/living/simple_animal/bot/hugbot.dm
+2 -2
View File
@@ -294,10 +294,10 @@
return
if(patient && path.len == 0 && (get_dist(src,patient) > 1))
path = get_path_to(src, get_turf(patient), /turf/proc/Distance_cardinal, 0, 30,id=access_card)
path = get_path_to(src, get_turf(patient), 0, 30,id=access_card)
mode = BOT_MOVING
if(!path.len) //try to get closer if you can't reach the patient directly
path = get_path_to(src, get_turf(patient), /turf/proc/Distance_cardinal, 0, 30,1,id=access_card)
path = get_path_to(src, get_turf(patient), 0, 30,1,id=access_card)
if(!path.len) //Do not chase a patient we cannot reach.
soft_reset()
modular_sand/code/modules/tgs/chat_commands.dm
+4 -1
View File
@@ -22,4 +22,7 @@
. = new /datum/tgs_message_content("Restarting.")
to_chat(world, span_boldwarning("Server restart - Initialized by [sender.friendly_name] on Discord."))
send2adminchat("Server", "[sender.friendly_name] forced a restart.")
addtimer(CALLBACK(src, world.TgsEndProcess()), 1 SECONDS)
addtimer(CALLBACK(src, PROC_REF(DoEndProcess)), 1 SECONDS)
/datum/tgs_chat_command/proc/DoEndProcess()
world.TgsEndProcess()