mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Rounded off the shuttle time message.
"The Emergency Shuttle has left the station. Estimate 2.98662 minutes until the shuttle docks at Central Command." should no longer happen. Removed some while(1) loops from object process()s. Removed some unused object process()s. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4116 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -173,7 +173,7 @@ datum/shuttle_controller
|
|||||||
start_location.move_contents_to(end_location)
|
start_location.move_contents_to(end_location)
|
||||||
settimeleft(SHUTTLELEAVETIME)
|
settimeleft(SHUTTLELEAVETIME)
|
||||||
send2irc("Server", "The Emergency Shuttle has docked with the station.")
|
send2irc("Server", "The Emergency Shuttle has docked with the station.")
|
||||||
captain_announce("The Emergency Shuttle has docked with the station. You have [timeleft()/60] minutes to board the Emergency Shuttle.")
|
captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.")
|
||||||
world << sound('shuttledock.ogg')
|
world << sound('shuttledock.ogg')
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
@@ -243,7 +243,7 @@ datum/shuttle_controller
|
|||||||
D.close()
|
D.close()
|
||||||
|
|
||||||
|
|
||||||
captain_announce("The Emergency Shuttle has left the station. Estimate [timeleft()/60] minutes until the shuttle docks at Central Command.")
|
captain_announce("The Emergency Shuttle has left the station. Estimate [round(timeleft()/60,1)] minutes until the shuttle docks at Central Command.")
|
||||||
|
|
||||||
// Some aesthetic turbulance shaking
|
// Some aesthetic turbulance shaking
|
||||||
for(var/mob/M in end_location)
|
for(var/mob/M in end_location)
|
||||||
|
|||||||
@@ -118,7 +118,7 @@
|
|||||||
..()
|
..()
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/effect/alien/resin/process() //Buggy and irrelevant now that you're able to just make nice little infection chambers - Urist
|
///obj/effect/alien/resin/process() //Buggy and irrelevant now that you're able to just make nice little infection chambers - Urist
|
||||||
/*if(affecting)
|
/*if(affecting)
|
||||||
var/mob/living/carbon/M = affecting
|
var/mob/living/carbon/M = affecting
|
||||||
var/check = 0
|
var/check = 0
|
||||||
@@ -157,7 +157,7 @@
|
|||||||
else
|
else
|
||||||
for(var/mob/O in viewers(src, 3))
|
for(var/mob/O in viewers(src, 3))
|
||||||
O.show_message(text("\red An alien larva bursts from the resin wall!"), 1, text("\red You hear a high, alien screech nearby!"), 2)*/
|
O.show_message(text("\red An alien larva bursts from the resin wall!"), 1, text("\red You hear a high, alien screech nearby!"), 2)*/
|
||||||
return
|
// return
|
||||||
|
|
||||||
/obj/effect/alien/resin/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
|
/obj/effect/alien/resin/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
|
||||||
if(air_group) return 0
|
if(air_group) return 0
|
||||||
|
|||||||
@@ -827,7 +827,7 @@ steam.start() -- spawns the effect
|
|||||||
spawn(3 + metal*3)
|
spawn(3 + metal*3)
|
||||||
process()
|
process()
|
||||||
spawn(120)
|
spawn(120)
|
||||||
expand = 0 // stop expanding
|
processing_objects.Remove(src)
|
||||||
sleep(30)
|
sleep(30)
|
||||||
|
|
||||||
if(metal)
|
if(metal)
|
||||||
@@ -854,30 +854,27 @@ steam.start() -- spawns the effect
|
|||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
while(expand) // keep trying to expand while true
|
for(var/direction in cardinal)
|
||||||
|
|
||||||
for(var/direction in cardinal)
|
|
||||||
|
|
||||||
|
|
||||||
var/turf/T = get_step(src,direction)
|
var/turf/T = get_step(src,direction)
|
||||||
if(!T)
|
if(!T)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if(!T.Enter(src))
|
if(!T.Enter(src))
|
||||||
continue
|
continue
|
||||||
|
|
||||||
var/obj/effect/effect/foam/F = locate() in T
|
var/obj/effect/effect/foam/F = locate() in T
|
||||||
if(F)
|
if(F)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
F = new(T, metal)
|
F = new(T, metal)
|
||||||
F.amount = amount
|
F.amount = amount
|
||||||
if(!metal)
|
if(!metal)
|
||||||
F.create_reagents(10)
|
F.create_reagents(10)
|
||||||
if (reagents)
|
if (reagents)
|
||||||
for(var/datum/reagent/R in reagents.reagent_list)
|
for(var/datum/reagent/R in reagents.reagent_list)
|
||||||
F.reagents.add_reagent(R.id,1)
|
F.reagents.add_reagent(R.id,1)
|
||||||
sleep(15)
|
|
||||||
|
|
||||||
// foam disolves when heated
|
// foam disolves when heated
|
||||||
// except metal foams
|
// except metal foams
|
||||||
|
|||||||
@@ -26,14 +26,12 @@ ZIPPO
|
|||||||
|
|
||||||
|
|
||||||
process()
|
process()
|
||||||
while(src.lit == 1)
|
src.smoketime--
|
||||||
src.smoketime--
|
if(src.smoketime < 1)
|
||||||
sleep(10)
|
src.icon_state = "match_burnt"
|
||||||
if(src.smoketime < 1)
|
src.lit = -1
|
||||||
src.icon_state = "match_burnt"
|
processing_objects.Remove(src)
|
||||||
src.lit = -1
|
return
|
||||||
processing_objects.Remove(src)
|
|
||||||
return
|
|
||||||
|
|
||||||
|
|
||||||
dropped(mob/user as mob)
|
dropped(mob/user as mob)
|
||||||
|
|||||||
@@ -114,9 +114,6 @@
|
|||||||
spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
|
spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
|
||||||
toggle = 1
|
toggle = 1
|
||||||
|
|
||||||
/obj/item/device/transfer_valve/process()
|
|
||||||
return
|
|
||||||
|
|
||||||
/obj/item/device/transfer_valve/update_icon()
|
/obj/item/device/transfer_valve/update_icon()
|
||||||
overlays = null
|
overlays = null
|
||||||
underlays = null
|
underlays = null
|
||||||
|
|||||||
Reference in New Issue
Block a user