cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vox fixes

Browse Source
This commit is contained in:
ZomgPonies
2013-10-12 15:07:21 -04:00
parent 5daf979b72
commit 64d2f86bdf
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baystation12.dme
+2
View File
@@ -49,6 +49,7 @@
#include "code\_onclick\hud\robot.dm"
#include "code\_onclick\hud\screen_objects.dm"
#include "code\ATMOSPHERICS\atmospherics.dm"
#include "code\ATMOSPHERICS\chiller.dm"
#include "code\ATMOSPHERICS\datum_pipe_network.dm"
#include "code\ATMOSPHERICS\datum_pipeline.dm"
#include "code\ATMOSPHERICS\he_pipes.dm"
@@ -71,6 +72,7 @@
#include "code\ATMOSPHERICS\components\unary\heat_source.dm"
#include "code\ATMOSPHERICS\components\unary\outlet_injector.dm"
#include "code\ATMOSPHERICS\components\unary\oxygen_generator.dm"
#include "code\ATMOSPHERICS\components\unary\thermal_plate.dm"
#include "code\ATMOSPHERICS\components\unary\unary_base.dm"
#include "code\ATMOSPHERICS\components\unary\vent_pump.dm"
#include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm"
code/game/gamemodes/vox/heist/heist.dm
+9 -1
View File
@@ -235,4 +235,12 @@ VOX HEIST ROUNDTYPE
/datum/game_mode/vox/heist/check_finished()
if (!(is_vox_crew_alive()) || (vox_shuttle_location && (vox_shuttle_location == "start")))
return 1
return ..()
return ..()
/datum/game_mode/vox/heist/proc/is_vox_crew_alive()
for(var/datum/mind/raider in raiders)
if(raider.current)
if(istype(raider.current,/mob/living/carbon/human) && raider.current.stat != 2)
return 1
return 0
code/game/gamemodes/vox/trade/trade.dm
+9 -1
View File
@@ -211,4 +211,12 @@ VOX TRADE ROUNDTYPE
/datum/game_mode/vox/trade/check_finished()
if (!(is_vox_crew_alive()) || (vox_shuttle_location && (vox_shuttle_location == "start")))
return 1
return ..()
return ..()
/datum/game_mode/vox/trade/proc/is_vox_crew_alive()
for(var/datum/mind/trader in traders)
if(trader.current)
if(istype(trader.current,/mob/living/carbon/human) && trader.current.stat != 2)
return 1
return 0
code/game/gamemodes/vox/vox.dm
-10
View File
@@ -18,16 +18,6 @@ var/global/vox_kills = 0 //Used to check the Inviolate.
return 0
return 1
/datum/game_mode/vox/proc/is_vox_crew_alive()
for(var/datum/mind/raider in raiders)
if(raider.current)
if(istype(raider.current,/mob/living/carbon/human) && raider.current.stat != 2)
return 1
return 0
//Vox global objectives.
datum/objective/vox