Merge pull request #13725 from Kyep/to_chat_fix

Genetics DNA Modifier Fixes
This commit is contained in:
Fox McCloud
2020-07-07 13:53:01 -04:00
committed by GitHub
+11 -13
View File
@@ -118,17 +118,15 @@
if(usr.incapacitated())
return
eject_occupant()
eject_occupant(usr)
add_fingerprint(usr)
/obj/machinery/dna_scannernew/Destroy()
eject_occupant()
eject_occupant(null, TRUE)
return ..()
/obj/machinery/dna_scannernew/proc/eject_occupant()
go_out()
/obj/machinery/dna_scannernew/proc/eject_occupant(user, force)
go_out(user, force)
for(var/obj/O in src)
if(!istype(O,/obj/item/circuitboard/clonescanner) && \
!istype(O,/obj/item/stock_parts) && \
@@ -271,15 +269,15 @@
occupant.notify_ghost_cloning(source = src)
/obj/machinery/dna_scannernew/proc/go_out()
/obj/machinery/dna_scannernew/proc/go_out(mob/user, force)
if(!occupant)
to_chat(usr, "<span class='warning'>The scanner is empty!</span>")
if(user)
to_chat(user, "<span class='warning'>The scanner is empty!</span>")
return
if(locked)
to_chat(usr, "<span class='warning'>The scanner is locked!</span>")
if(locked && !force)
if(user)
to_chat(user, "<span class='warning'>The scanner is locked!</span>")
return
occupant.forceMove(loc)
occupant = null
icon_state = "scanner_open"
@@ -751,7 +749,7 @@
return TRUE
if(href_list["ejectOccupant"])
connected.eject_occupant()
connected.eject_occupant(usr)
return TRUE
// Transfer Buffer Management