cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source
This commit is contained in:
PsiOmega
2015-03-10 07:58:25 +01:00
parent 56516d1ec5 dc4b02ceb2
commit 85641b46e5
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/machinery/cryo.dm
View File

@@ -24,6 +24,11 @@
..() ..()
initialize_directions = dir initialize_directions = dir
/obj/machinery/atmospherics/unary/cryo_cell/Del()
if(occupant)
occupant.loc = loc
..()
/obj/machinery/atmospherics/unary/cryo_cell/initialize() /obj/machinery/atmospherics/unary/cryo_cell/initialize()
if(node) return if(node) return
var/node_connect = dir var/node_connect = dir

6
code/game/machinery/cryopod.dm
View File

@@ -234,6 +234,12 @@
..() ..()
/obj/machinery/cryopod/Del()
if(occupant)
occupant.loc = loc
occupant.resting = 1
..()
/obj/machinery/cryopod/initialize() /obj/machinery/cryopod/initialize()
..() ..()

4
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -239,7 +239,7 @@
if (!(status_flags & CANPUSH)) if (!(status_flags & CANPUSH))
return return
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, M, src ) var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src)
M.put_in_active_hand(G) M.put_in_active_hand(G)
@@ -375,4 +375,4 @@
/mob/living/simple_animal/put_in_hands(var/obj/item/W) // No hands. /mob/living/simple_animal/put_in_hands(var/obj/item/W) // No hands.
W.loc = get_turf(src) W.loc = get_turf(src)
return 1 return 1