Skip to content

Commit

Permalink
Три маленьких фикса. (#13845)
Browse files Browse the repository at this point in the history
  • Loading branch information
DarthSidiousPalpatine authored Mar 1, 2025
1 parent 2106baa commit 70dbd58
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 10 deletions.
14 changes: 7 additions & 7 deletions code/game/machinery/Sleeper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
return

/obj/machinery/sleeper/deconstruct(disassembled)
for(var/atom/movable/A as anything in src)
A.forceMove(loc)
for(var/atom/movable/A as anything in contents)
A.forceMove(get_turf(src))
..()

/obj/machinery/sleeper/attack_animal(mob/living/simple_animal/M)//Stop putting hostile mobs in things guise
Expand Down Expand Up @@ -154,9 +154,9 @@
if(EXPLODE_LIGHT)
if(prob(75))
return
for(var/atom/movable/A as anything in src)
A.loc = src.loc
ex_act(severity)
for(var/atom/movable/A as anything in contents)
A.forceMove(get_turf(src))
A.ex_act(severity)
qdel(src)

/obj/machinery/sleeper/emp_act(severity)
Expand Down Expand Up @@ -198,8 +198,8 @@
open_machine()

/obj/machinery/sleeper/Destroy()
var/turf/T = loc
T.contents += contents
for(var/atom/movable/A as anything in contents)
A.forceMove(get_turf(src))
return ..()

/obj/machinery/sleeper/verb/remove_beaker()
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/adv_med.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@
if(prob(75))
return
for(var/atom/movable/A in src)
A.forceMove(loc)
ex_act(severity)
A.forceMove(get_turf(src))
A.ex_act(severity)
qdel(src)

/obj/machinery/bodyscanner/deconstruct(disassembled)
for(var/atom/movable/A in src)
A.forceMove(loc)
A.forceMove(get_turf(src))
..()

/obj/machinery/body_scanconsole/power_change()
Expand Down
13 changes: 13 additions & 0 deletions code/game/machinery/cryopod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,19 @@ var/global/list/frozen_items = list()
. = ..()
QDEL_NULL(announce)

/obj/machinery/cryopod/ex_act(severity)
switch(severity)
if(EXPLODE_HEAVY)
if(prob(50))
return
if(EXPLODE_LIGHT)
if(prob(75))
return
for(var/atom/movable/A as anything in contents)
A.forceMove(get_turf(src))
A.ex_act(severity)
qdel(src)

/obj/machinery/cryopod/proc/delete_objective(datum/objective/target/O)
if(!O)
return
Expand Down

0 comments on commit 70dbd58

Please sign in to comment.