cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mechrevert' of https://github.com/Nerezza/Baystation12 into Nerezza-mechrevert

Browse Source 
Conflicts:
	code/game/mecha/mecha.dm
This commit is contained in:
Albert Iordache
2012-08-04 22:48:25 +03:00
parent 521e94aa62 d8dfc36ec0
commit 27920a6c59
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/mecha/mecha.dm
View File

@@ -965,7 +965,7 @@
set category = "Object" set category = "Object"
set name = "Enter Exosuit" set name = "Enter Exosuit"
set src in oview(1) set src in oview(1)
if(usr.stat != 0 || ( !istajaran(usr) && !ishuman(usr) )) if (!ishuman(usr) || usr.stat) //Check if playable species and awake.
return return
src.log_message("[usr] tries to move in.") src.log_message("[usr] tries to move in.")
if (src.occupant) if (src.occupant)
@@ -1124,7 +1124,7 @@
/obj/mecha/proc/go_out() /obj/mecha/proc/go_out()
if(!src.occupant) return if(!src.occupant) return
var/atom/movable/mob_container var/atom/movable/mob_container
if(ishuman(occupant) || istajaran(occupant)) if(ishuman(occupant))
mob_container = src.occupant mob_container = src.occupant
else if(istype(occupant, /mob/living/carbon/brain)) else if(istype(occupant, /mob/living/carbon/brain))
var/mob/living/carbon/brain/brain = occupant var/mob/living/carbon/brain/brain = occupant
@@ -1133,7 +1133,7 @@
return return
if(mob_container.forceMove(src.loc))//ejecting mob container if(mob_container.forceMove(src.loc))//ejecting mob container
/* /*
if((ishuman(occupant) || istajaran(occupant)) && (return_pressure() > HAZARD_HIGH_PRESSURE)) if(ishuman(occupant) && (return_pressure() > HAZARD_HIGH_PRESSURE))
use_internal_tank = 0 use_internal_tank = 0
var/datum/gas_mixture/environment = get_turf_air() var/datum/gas_mixture/environment = get_turf_air()
if(environment) if(environment)