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

[MIRROR] Fixes Thermite overlay not deleting properly + thermite component documentation [MDB IGNORE] (#11085)

Browse Source 
* Fixes Thermite overlay not deleting properly + thermite component (#64419)

documentation
Fixes the thermite burning overlay not deleting if parent was qdel'd.
Also, adds documentation to the thermite component

* Fixes Thermite overlay not deleting properly + thermite component documentation

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
This commit is contained in:
SkyratBot
2022-01-29 03:10:20 +00:00
committed by GitHub
co-authored by Seth Scherer
parent 79bc4813f7
commit 16932bd577
1 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/thermite.dm
+58 -11
View File
@@ -1,23 +1,30 @@
/datum/component/thermite
dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
///Amoumt of thermite on parent
var/amount
///Amount of thermite required to burn through parent
var/burn_require
///The thermite overlay
var/overlay
///The timer for burning parent
var/burn_timer
///The thermite fire overlay
var/obj/effect/overlay/thermite/fakefire
///Blacklist of turfs that cannot have thermite on it
var/static/list/blacklist = typecacheof(list(
/turf/open/lava,
/turf/open/space,
/turf/open/water,
/turf/open/chasm)
)
///List of turfs that are immune to thermite
var/static/list/immunelist = typecacheof(list(
/turf/closed/wall/mineral/diamond,
/turf/closed/indestructible,
/turf/open/indestructible)
)
///List of turfs that take extra thermite to burn through
var/static/list/resistlist = typecacheof(
/turf/closed/wall/r_wall
)
@@ -47,6 +54,7 @@
UnregisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT)
UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY)
UnregisterSignal(parent, COMSIG_ATOM_FIRE_ACT)
UnregisterSignal(parent, COMSIG_PARENT_QDELETING)
/datum/component/thermite/Destroy()
var/turf/master = parent
@@ -62,23 +70,32 @@
amount += _amount
if (burn_timer) // prevent people from skipping a longer timer
deltimer(burn_timer)
var/fakefire
for (var/obj/effect/overlay/thermite/fire in parent)
fakefire = fire
burn_timer = addtimer(CALLBACK(src, .proc/burn_parent, fakefire, usr), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE)
burn_timer = addtimer(CALLBACK(src, .proc/burn_parent, usr), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE)
/**
* Used to begin the thermite burning process
*
* Arguments:
* * mob/user - The user igniting the thermite
*/
/datum/component/thermite/proc/thermite_melt(mob/user)
var/turf/master = parent
master.cut_overlay(overlay)
playsound(master, 'sound/items/welder.ogg', 100, TRUE)
var/obj/effect/overlay/thermite/fakefire = new(master)
burn_timer = addtimer(CALLBACK(src, .proc/burn_parent, fakefire, user), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE)
fakefire = new(master)
burn_timer = addtimer(CALLBACK(src, .proc/burn_parent, user), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE)
UnregisterFromParent()
RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/delete_fire) //in case parent gets deleted, get ready to delete the fire
/datum/component/thermite/proc/burn_parent(datum/fakefire, mob/user)
/**
* Used to actually melt parent
*
* Arguments:
* * mob/user - The user that ignited the thermite
*/
/datum/component/thermite/proc/burn_parent(mob/user)
var/turf/master = parent
if(!QDELETED(fakefire))
qdel(fakefire)
delete_fire()
if(user)
master.add_hiddenprint(user)
if(amount >= burn_require)
@@ -86,6 +103,18 @@
master.burn_tile()
qdel(src)
/**
* Used to delete the fake fire overlay
*/
/datum/component/thermite/proc/delete_fire()
SIGNAL_HANDLER
if(!QDELETED(fakefire))
qdel(fakefire)
/**
* wash reaction, used to clean off thermite from parent
*/
/datum/component/thermite/proc/clean_react(datum/source, strength)
SIGNAL_HANDLER
@@ -93,12 +122,30 @@
qdel(src)
return COMPONENT_CLEANED
/**
* fire_act reaction, has to be the correct temperature
*
* Arguments:
* * datum/source - The source of the flame
* * exposed_temperature - The temperature of the flame hitting the thermite
* * exposed_volume - The volume of the flame
*/
/datum/component/thermite/proc/flame_react(datum/source, exposed_temperature, exposed_volume)
SIGNAL_HANDLER
if(exposed_temperature > 1922) // This is roughly the real life requirement to ignite thermite
thermite_melt()
/**
* attackby reaction, ignites the thermite if its a flame creating object
*
* Arguments:
* * datum/source - The source of the attack
* * obj/item/thing - Item being attacked by
* * mob/user - The user behind the attack
* * params - params
*/
/datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params)
SIGNAL_HANDLER