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

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/emergency.dm
+21 -14
View File
@@ -60,12 +60,11 @@
var/obj/item/weapon/card/id/ID = user.get_idcard()
if(!ID)
user << "<span class='warning'>You don't have an ID.</span>"
to_chat(user, "<span class='warning'>You don't have an ID.</span>")
return
if(!(access_heads in ID.access))
user << "<span class='warning'>The access level of \
your card is not high enough.</span>"
to_chat(user, "<span class='warning'>The access level of your card is not high enough.</span>")
return
var/old_len = authorized.len
@@ -119,7 +118,7 @@
// Launch check is in process in case auth_need changes for some reason
// probably external.
. = FALSE
if(ENGINES_STARTED || (!IS_DOCKED))
if(!SSshuttle.emergency || ENGINES_STARTED || (!IS_DOCKED))
return .
// Check to see if we've reached criteria for early launch
@@ -137,7 +136,7 @@
return
if(emagged || ENGINES_STARTED) //SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LAUNCH IN 10 SECONDS
user << "<span class='warning'>The shuttle is already about to launch!</span>"
to_chat(user, "<span class='warning'>The shuttle is already about to launch!</span>")
return
var/time = TIME_LEFT
@@ -323,8 +322,10 @@
if(time_left <= 50 && !sound_played) //4 seconds left:REV UP THOSE ENGINES BOYS. - should sync up with the launch
sound_played = 1 //Only rev them up once.
for(var/area/shuttle/escape/E in world)
E << 'sound/effects/hyperspace_begin.ogg'
var/list/areas = list()
for(var/area/shuttle/escape/E in sortedAreas)
areas += E
hyperspace_sound(HYPERSPACE_WARMUP, areas)
if(time_left <= 0 && !SSshuttle.emergencyNoEscape)
//move each escape pod (or applicable spaceship) to its corresponding transit dock
@@ -335,8 +336,10 @@
M.enterTransit()
//now move the actual emergency shuttle to its transit dock
for(var/area/shuttle/escape/E in world)
E << 'sound/effects/hyperspace_progress.ogg'
var/list/areas = list()
for(var/area/shuttle/escape/E in sortedAreas)
areas += E
hyperspace_sound(HYPERSPACE_LAUNCH, areas)
enterTransit()
mode = SHUTTLE_ESCAPE
launch_status = ENDGAME_LAUNCHED
@@ -347,10 +350,13 @@
SSshuttle.checkHostileEnvironment()
if(SHUTTLE_ESCAPE)
if(sound_played && time_left <= HYPERSPACE_END_TIME)
var/list/areas = list()
for(var/area/shuttle/escape/E in sortedAreas)
areas += E
hyperspace_sound(HYPERSPACE_END, areas)
if(areaInstance.parallax_movedir && time_left <= PARALLAX_LOOP_TIME)
parallax_slowdown()
for(var/area/shuttle/escape/E in world)
E << 'sound/effects/hyperspace_end.ogg'
for(var/A in SSshuttle.mobile)
var/obj/docking_port/mobile/M = A
if(M.launch_status == ENDGAME_LAUNCHED)
@@ -396,7 +402,7 @@
launch_status = EARLY_LAUNCHED
return ..()
else
usr << "<span class='warning'>Escape pods will only launch during \"Code Red\" security alert.</span>"
to_chat(usr, "<span class='warning'>Escape pods will only launch during \"Code Red\" security alert.</span>")
return 1
/obj/docking_port/mobile/pod/New()
@@ -414,6 +420,7 @@
possible_destinations = "pod_asteroid"
icon = 'icons/obj/terminals.dmi'
icon_state = "dorm_available"
light_color = LIGHT_COLOR_BLUE
density = 0
clockwork = TRUE //it'd look weird
@@ -423,7 +430,7 @@
/obj/machinery/computer/shuttle/pod/emag_act(mob/user)
if(!emagged)
emagged = TRUE
user << "<span class='warning'>You fry the pod's alert level checking system.</span>"
to_chat(user, "<span class='warning'>You fry the pod's alert level checking system.</span>")
/obj/docking_port/stationary/random
name = "escape pod"
@@ -499,7 +506,7 @@
if(security_level == SEC_LEVEL_RED || security_level == SEC_LEVEL_DELTA || unlocked)
. = ..()
else
usr << "The storage unit will only unlock during a Red or Delta security alert."
to_chat(usr, "The storage unit will only unlock during a Red or Delta security alert.")
/obj/item/weapon/storage/pod/attack_hand(mob/user)
return MouseDrop(user)