mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
TG: HUD damage indicator now updates with halloss
Inspecting yourself for organ damage now randomly shows damaged organs if you have halloss Mining shuttle now shunts people where it wants to be Shuttles now crush people if they fail to move out of where they want to be with the initial shunt. Revision: r3337 Author: VivianFoxfoot
This commit is contained in:
@@ -140,9 +140,13 @@ datum/shuttle_controller
|
||||
AM.throw_at(E, 1, 1)
|
||||
return
|
||||
*/
|
||||
|
||||
if(istype(T, /turf/simulated))
|
||||
del(T)
|
||||
|
||||
for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
|
||||
bug.gib()
|
||||
|
||||
start_location.move_contents_to(end_location)
|
||||
settimeleft(SHUTTLELEAVETIME)
|
||||
world << "<B>The Emergency Shuttle has docked with the station! You have [timeleft()/60] minutes to board the Emergency Shuttle.</B>"
|
||||
@@ -151,6 +155,7 @@ datum/shuttle_controller
|
||||
return 1
|
||||
|
||||
if(1)
|
||||
|
||||
if(timeleft>0)
|
||||
return 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user