cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rainbow slime extracts don't get deleted after a use if they have more than one use. (#46871)

Browse Source 
* Rainbow slime extracts don't get deleted after a use if they have more than one use.

* Moves to get_turf call to line 668.
This commit is contained in:
Firecage
2019-10-08 19:15:34 -04:00
committed by moo
parent 67efcb7f49
commit ae4eddf040
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+9 -3
View File
@@ -652,7 +652,6 @@
S.icon_state = "[S.base_state]_active"
S.active = TRUE
addtimer(CALLBACK(S, /obj/item/grenade.proc/prime), rand(15,60))
qdel(holder.my_atom) //deleto
else
var/mob/living/simple_animal/slime/random/S = new (get_turf(holder.my_atom))
S.visible_message("<span class='danger'>Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!</span>")
@@ -666,12 +665,19 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slime/slimebomb/on_reaction(datum/reagents/holder, created_volume)
var/obj/item/grenade/clusterbuster/slime/volatile/S = new (holder.my_atom.loc)
var/turf/T = get_turf(holder.my_atom)
var/obj/item/grenade/clusterbuster/slime/volatile/S = new (T)
S.visible_message("<span class='danger'>Infused with slime jelly, the core begins to expand uncontrollably!</span>")
S.icon_state = "[S.base_state]_active"
S.active = TRUE
addtimer(CALLBACK(S, /obj/item/grenade.proc/prime), rand(15,60))
qdel(holder.my_atom) //deleto
var/lastkey = holder.my_atom.fingerprintslast
var/touch_msg = "N/A"
if(lastkey)
var/mob/toucher = get_mob_by_key(lastkey)
touch_msg = "[ADMIN_LOOKUPFLW(toucher)]."
message_admins("Brorble Brorble primed at [ADMIN_VERBOSEJMP(T)]. Last Fingerprint: [touch_msg]")
log_game("Brorble Brorble primed at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"].")
..()
/datum/chemical_reaction/slime/slime_transfer