Skip to content

Commit

Permalink
Ditch abiotic checks in scanner/cryo cell, make cryo eject dropped it…
Browse files Browse the repository at this point in the history
…ems (#5398)
  • Loading branch information
ShadowLarkens authored Jun 3, 2024
1 parent 0d1750d commit b62d54e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
11 changes: 1 addition & 10 deletions code/game/machinery/adv_med.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
if(src.occupant)
to_chat(usr, SPAN_WARNING("The scanner is already occupied!"))
return
if(usr.abiotic())
to_chat(usr, SPAN_WARNING("The subject cannot have abiotic items on."))
return
set_occupant(usr)
src.add_fingerprint(usr)
return
Expand Down Expand Up @@ -80,9 +77,6 @@
if(target.buckled)
to_chat(user, SPAN_NOTICE("Unbuckle the subject before attempting to move them."))
return
if(target.abiotic())
to_chat(user, SPAN_NOTICE("Subject cannot have abiotic items on."))
return
set_occupant(target)
src.add_fingerprint(user)
return TRUE
Expand All @@ -93,9 +87,6 @@
if (src.occupant)
to_chat(user, SPAN_WARNING("The scanner is already occupied!"))
return
if (target.abiotic())
to_chat(user, SPAN_WARNING("Subject cannot have abiotic items on."))
return
if (target.buckled)
to_chat(user, SPAN_NOTICE("Unbuckle the subject before attempting to move them."))
return
Expand Down Expand Up @@ -461,4 +452,4 @@
set_light(l_range = 1.5, l_power = 2, l_color = COLOR_BLUE)
else
icon_state = "scanner_terminal_off"
set_light(0)
set_light(0)
15 changes: 8 additions & 7 deletions code/game/machinery/cryo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,16 @@
/obj/machinery/atmospherics/unary/cryo_cell/proc/go_out()
if(!( occupant ))
return
//for(var/obj/O in src)
// O.loc = loc
for(var/obj/O in src)
if(O == beaker)
continue
if(O in component_parts)
continue
O.forceMove(loc)
if (occupant.client)
occupant.client.eye = occupant.client.mob
occupant.client.perspective = MOB_PERSPECTIVE
occupant.loc = get_step(loc, SOUTH) //this doesn't account for walls or anything, but i don't forsee that being a problem.
occupant.forceMove(get_step(loc, SOUTH)) //this doesn't account for walls or anything, but i don't forsee that being a problem.
if (occupant.bodytemperature < 261 && occupant.bodytemperature >= 70) //Patch by Aranclanos to stop people from taking burn damage after being ejected
occupant.bodytemperature = 261 // Changed to 70 from 140 by Zuhayr due to reoccurance of bug.
// occupant.metabslow = 0
Expand All @@ -305,9 +309,6 @@
if (occupant)
to_chat(usr, SPAN_DANGER("The cryo cell is already occupied!"))
return
if (M.abiotic())
to_chat(usr, SPAN_WARNING("Subject may not have abiotic items on."))
return
if(!node1)
to_chat(usr, SPAN_WARNING("The cell is not correctly connected to its pipe network!"))
return
Expand Down Expand Up @@ -468,4 +469,4 @@
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker)
beaker = null
. = TRUE
. = TRUE

0 comments on commit b62d54e

Please sign in to comment.