shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8213 from Citadel-Station-13/kevinz000-patch-33

Browse Source 
shuttle purchase announcements are no longer delayed by mapload's blocking proccall
This commit is contained in:
BlackMajor
2019-06-16 20:09:15 +12:00
committed by GitHub
parent 9af1ce97f8 040238d7ed
commit 0294cba855
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/communications.dm
+5 -4
View File
@@ -173,14 +173,15 @@
var/obj/machinery/shuttle_manipulator/M = locate() in GLOB.machines var/obj/machinery/shuttle_manipulator/M = locate() in GLOB.machines
if(M) if(M)
SSshuttle.shuttle_purchased = TRUE SSshuttle.shuttle_purchased = TRUE
M.unload_preview()
M.load_template(S)
M.existing_shuttle = SSshuttle.emergency
M.action_load(S)
SSshuttle.points -= S.credit_cost SSshuttle.points -= S.credit_cost
minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase") minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].") message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]") SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
M.unload_preview()
M.load_template(S)
M.existing_shuttle = SSshuttle.emergency
M.action_load(S)
message_admins("[S.name] loaded, purchased by [usr]")
else else
to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.") to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.")
else else