shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10073 from Ghommie/Ghommie-cit435

Browse Source 
Ports timestop and sepia extracts improvements/tweaks.
This commit is contained in:
kevinz000
2020-01-24 00:25:53 -07:00
committed by GitHub
parent fb007069d1 a0f35f5cfc
commit 831ac91917
16 changed files with 334 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+9 -2
View File
@@ -565,9 +565,16 @@
required_other = TRUE
/datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder)
sleep(50)
var/obj/item/slime_extract/sepia/extract = holder.my_atom
var/turf/T = get_turf(holder.my_atom)
var/list/M = list(get_mob_by_key(holder.my_atom.fingerprintslast))
new /obj/effect/timestop(T, null, null, M)
new /obj/effect/timestop(T, null, null, null)
if(istype(extract))
if(extract.Uses > 0)
var/mob/lastheld = get_mob_by_key(holder.my_atom.fingerprintslast)
if(lastheld && !lastheld.equip_to_slot_if_possible(extract, SLOT_HANDS, disable_warning = TRUE))
extract.forceMove(get_turf(lastheld))
..()
/datum/chemical_reaction/slime/slimecamera