cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1896

Browse Source
This commit is contained in:
Datraen
2016-06-09 09:03:07 -04:00
parent d00078f0b9
commit 7670ab1ad0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/xenobio2/machinery/injector.dm
View File

@@ -67,19 +67,20 @@
src.occupant = victim src.occupant = victim
/obj/machinery/xenobio2/manualinjector/proc/eject_contents() /obj/machinery/xenobio2/manualinjector/proc/eject_contents()
for(var/obj/thing in (contents - component_parts - circuit - beaker)) eject_xeno()
thing.forceMove(loc) eject_beaker()
return
/obj/machinery/xenobio2/manualinjector/proc/eject_xeno()
if(occupant) if(occupant)
occupant.forceMove(loc) occupant.forceMove(loc)
occupant = null occupant = null
return
/obj/machinery/xenobio2/manualinjector/proc/eject_beaker() /obj/machinery/xenobio2/manualinjector/proc/eject_beaker()
if(beaker) if(beaker)
var/obj/item/weapon/reagent_containers/glass/beaker/B = beaker var/obj/item/weapon/reagent_containers/glass/beaker/B = beaker
B.loc = loc B.loc = loc
beaker = null beaker = null
return
/obj/machinery/xenobio2/manualinjector/proc/inject_reagents() /obj/machinery/xenobio2/manualinjector/proc/inject_reagents()
if(!occupant) if(!occupant)

2
code/modules/xenobio2/machinery/injector_computer.dm
View File

@@ -99,7 +99,7 @@
injector.inject_reagents() injector.inject_reagents()
active = 0 active = 0
if(href_list["eject_occupant"]) if(href_list["eject_occupant"])
injector.eject_contents() injector.eject_xeno()
if(href_list["eject_beaker"]) if(href_list["eject_beaker"])
injector.eject_beaker() injector.eject_beaker()