cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

oil slime logging (#15579)

Browse Source
This commit is contained in:
SteelSlayer
2021-02-21 11:19:58 -06:00
committed by GitHub
parent b2bb81bc24
commit 324af7454c
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+14 -7
View File
@@ -480,7 +480,7 @@
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
//Oil
/datum/chemical_reaction/slimeexplosion
/datum/chemical_reaction/slime_explosion
name = "Slime Explosion"
id = "m_explosion"
result = null
@@ -489,13 +489,20 @@
required_container = /obj/item/slime_extract/oil
required_other = 1
/datum/chemical_reaction/slimeexplosion/on_reaction(datum/reagents/holder)
/datum/chemical_reaction/slime_explosion/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime extract begins to vibrate violently !</span>")
spawn(50)
if(holder && holder.my_atom)
explosion(get_turf(holder.my_atom), 1 ,3, 6)
var/obj/item/slime_extract/oil/extract = holder.my_atom
extract.visible_message("<span class='danger'>The slime extract begins to vibrate violently!</span>")
addtimer(CALLBACK(src, .proc/explode, extract), 5 SECONDS)
/datum/chemical_reaction/slime_explosion/proc/explode(obj/item/slime_extract/oil/extract)
if(QDELETED(extract))
return
var/who = extract.injector_mob ? "[key_name_admin(extract.injector_mob)]" : "Unknown"
var/turf/extract_turf = get_turf(extract)
message_admins("[who] triggered an oil slime explosion at [COORD(extract_turf)].")
log_game("[who] triggered an oil slime explosion at [COORD(extract_turf)].")
explosion(extract_turf, 1, 3, 6)
//Light Pink
/datum/chemical_reaction/slimepotion2
code/modules/research/xenobiology/xenobiology.dm
+6 -1
View File
@@ -13,7 +13,10 @@
throw_speed = 3
throw_range = 6
origin_tech = "biotech=3"
var/Uses = 1 // uses before it goes inert
/// Uses before it goes inert
var/Uses = 1
/// The mob who last injected the extract with plasma, water or blood. Used for logging.
var/mob/living/injector_mob
/obj/item/slime_extract/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/slimepotion/enhancer))
@@ -23,6 +26,8 @@
to_chat(user, "<span class='notice'>You apply the enhancer to the slime extract. It may now be reused one more time.</span>")
Uses++
qdel(O)
if(istype(O, /obj/item/reagent_containers/syringe))
injector_mob = user
..()
/obj/item/slime_extract/New()