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 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wounds-part-2

Browse Source
This commit is contained in:
Timothy Teakettle
2020-07-29 15:47:44 +01:00
committed by GitHub
parent 28bf5d2344 f8f29826f5
commit 9721025582
482 changed files with 3887 additions and 2657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/subsystem/mapping.dm
View File

@@ -469,11 +469,10 @@ GLOBAL_LIST_EMPTY(the_station_areas)
else
return
possible_options = "Custom"
var/away_name
var/datum/space_level/away_level
var/answer = input("What kind ? ","Away/VR") as null|anything in possible_options
var/answer = input("What kind ? ","Away/VR") as null|anything in list(possible_options + "Custom")
switch(answer)
if(null)
return

6
code/controllers/subsystem/processing/huds.dm Normal file
View File

@@ -0,0 +1,6 @@
// Smooth HUD updates, but low priority
PROCESSING_SUBSYSTEM_DEF(huds)
name = "HUD updates"
wait = 0.5
priority = FIRE_PRIORITY_HUDS
stat_tag = "HUDS"