cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fake hotspots

Browse Source
This commit is contained in:
Fox McCloud
2019-03-20 17:11:30 -04:00
parent 6caec96c2a
commit aba98f6cb2
3 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+5 -5
View File
@@ -198,7 +198,7 @@
S.overlays.Cut()
S.overlays = image('icons/effects/effects.dmi', icon_state = "thermite")
if(S.active_hotspot)
S.reagents.temperature_reagents(S.active_hotspot.temperature, S.active_hotspot.volume, 10, 300)
S.reagents.temperature_reagents(S.active_hotspot.temperature, 10, 300)
/datum/reagent/glycerol
name = "Glycerol"
@@ -344,8 +344,8 @@
/datum/reagent/cryostylane/on_tick()
if(holder.has_reagent("oxygen"))
holder.remove_reagent("oxygen", 1)
holder.remove_reagent("cryostylane", 1)
holder.remove_reagent("oxygen", 2)
holder.remove_reagent("cryostylane", 2)
holder.temperature_reagents(holder.chem_temp - 200)
holder.temperature_reagents(holder.chem_temp - 200)
..()
@@ -374,8 +374,8 @@
/datum/reagent/pyrosium/on_tick()
if(holder.has_reagent("oxygen"))
holder.remove_reagent("oxygen", 1)
holder.remove_reagent("pyrosium", 1)
holder.remove_reagent("oxygen", 2)
holder.remove_reagent("pyrosium", 2)
holder.temperature_reagents(holder.chem_temp + 200)
holder.temperature_reagents(holder.chem_temp + 200)
..()
code/modules/reagents/reagent_dispenser.dm
+4 -3
View File
@@ -26,7 +26,8 @@
..()
if(reagents)
for(var/i in 1 to 8)
reagents.temperature_reagents(exposed_temperature, exposed_volume)
if(reagents)
reagents.temperature_reagents(exposed_temperature)
/obj/structure/reagent_dispensers/proc/boom()
visible_message("<span class='danger'>[src] ruptures!</span>")
@@ -91,8 +92,8 @@
investigate_log("[key_name(P.firer)] triggered a fueltank explosion with [P.name] at [COORD(loc)]", INVESTIGATE_BOMB)
boom()
/obj/structure/reagent_dispensers/fueltank/boom(var/rigtrigger = FALSE) // Prevent case where someone who rigged the tank is blamed for the explosion when the rig isn't what triggered the explosion
if(rigtrigger == TRUE) // If the explosion is triggered by an assembly holder
/obj/structure/reagent_dispensers/fueltank/boom(rigtrigger = FALSE) // Prevent case where someone who rigged the tank is blamed for the explosion when the rig isn't what triggered the explosion
if(rigtrigger) // If the explosion is triggered by an assembly holder
message_admins("A fueltank, last rigged by [lastrigger], was triggered at [COORD(loc)]") // Then admin is informed of the last person who rigged the fuel tank
log_game("A fueltank, last rigged by [lastrigger], triggered at [COORD(loc)]")
investigate_log("A fueltank, last rigged by [lastrigger], triggered at [COORD(loc)]", INVESTIGATE_BOMB)