cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes commendations breaking the shuttle (#52769)

Browse Source 
* my heart skips a beat, my heart skips a beat

* Update code/__HELPERS/hearted.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* case insensitive

Co-authored-by: Rohesie <rohesie@gmail.com>
This commit is contained in:
Ryll Ryll
2020-08-10 16:27:56 -03:00
committed by GitHub
co-authored by Rohesie
parent e967e90525
commit 938606d9bb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/hearted.dm
+3 -2
View File
@@ -6,10 +6,10 @@
for(var/i in GLOB.joined_player_list)
var/mob/check_mob = get_mob_by_ckey(i)
if(!check_mob || !check_mob.mind || !check_mob.client)
if(!check_mob?.mind || !check_mob.client)
continue
// maybe some other filters like bans or whatever
check_mob.query_heart(1)
INVOKE_ASYNC(check_mob, /mob.proc/query_heart, 1)
number_to_ask--
if(number_to_ask == 0)
break
@@ -49,6 +49,7 @@
if(isnull(heart_nominee) || heart_nominee == "")
return
heart_nominee = lowertext(heart_nominee)
var/list/name_checks = get_mob_by_name(heart_nominee)
if(!name_checks || name_checks.len == 0)
query_heart(attempt + 1)
code/modules/shuttle/emergency.dm
+1 -1
View File
@@ -384,7 +384,7 @@
launch_status = ENDGAME_LAUNCHED
setTimer(SSshuttle.emergencyEscapeTime * engine_coeff)
priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, null, "Priority")
SSticker.poll_hearts()
INVOKE_ASYNC(SSticker, /datum/controller/subsystem/ticker.proc/poll_hearts)
SSmapping.mapvote() //If no map vote has been run yet, start one.
if(SHUTTLE_STRANDED)