cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sentience Potions now violently explode if overused (#19356)

Browse Source 
* Sentience Potions now violently explode if overused

* Early returns

* Removed redundant return, split cooldown behavior into two procs

* Removed redundant proc
This commit is contained in:
FloFluoro
2022-10-21 20:40:10 +02:00
committed by GitHub
parent 1660182d19
commit a8a3694114
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/xenobiology.dm
+37
View File
@@ -188,6 +188,21 @@
origin_tech = "biotech=6"
var/list/not_interested = list()
var/sentience_type = SENTIENCE_ORGANIC
var/heat_stage = 0 //When used at stage 2 or above, the Sentience Potion explodes. Stop bugging ghosts
/obj/item/slimepotion/sentience/examine(mob/user)
. = ..()
if(!user.Adjacent(src))
return
switch(heat_stage)
if(1)
. += "<span class='warning'>The vial is hot to the touch.</span>"
if(2)
. += "<span class='warning'>The vial is scalding hot! Is it really a good idea to use this..?</span>"
/obj/item/slimepotion/sentience/attack()
return
/obj/item/slimepotion/sentience/afterattack(mob/living/M, mob/user, proximity_flag)
if(!proximity_flag)
@@ -205,6 +220,14 @@
to_chat(user, "<span class='warning'>The potion won't work on [SM].</span>")
return ..()
if(heat_stage >= 2)
to_chat(user, "<span class='danger'>[src] violently explodes!</span>")
var/turf/T = get_turf(loc)
if(T)
T.hotspot_expose(700, 125)
explosion(T, -1, -1, 2, 3)
qdel(src)
return
to_chat(user, "<span class='notice'>You offer [src] sentience potion to [SM]...</span>")
being_used = TRUE
@@ -231,9 +254,23 @@
qdel(src)
else
to_chat(user, "<span class='notice'>[M] looks interested for a moment, but then looks back down. Maybe you should try again later.</span>")
heat_stage += 1
addtimer(CALLBACK(src, .proc/cooldown_potion), 60 SECONDS)
if(user.Adjacent(src))
switch(heat_stage)
if(1)
to_chat(user, "<span class='warning'>An intense heat emanates from [src]. It might need to cool off for awhile.</span>")
if(2)
to_chat(user, "<span class='warning'>[src] is boiling hot! You shudder to think what would happen if you used it again...</span>")
being_used = FALSE
..()
/obj/item/slimepotion/sentience/proc/cooldown_potion()
if(!heat_stage)
return
heat_stage -= 1
/obj/item/slimepotion/sentience/proc/after_success(mob/living/user, mob/living/simple_animal/SM)
return