mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on severity lower than 1, all that stuff
This commit is contained in:
@@ -192,7 +192,7 @@
|
||||
updateUsrDialog()
|
||||
return
|
||||
|
||||
/obj/machinery/mineral/ore_redemption/ex_act(severity, specialty)
|
||||
/obj/machinery/mineral/ore_redemption/ex_act(severity, target)
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
s.set_up(5, 1, src)
|
||||
s.start()
|
||||
@@ -357,7 +357,7 @@
|
||||
new /obj/item/device/t_scanner/adv_mining_scanner(src.loc)
|
||||
qdel(voucher)
|
||||
|
||||
/obj/machinery/mineral/equipment_vendor/ex_act(severity, specialty)
|
||||
/obj/machinery/mineral/equipment_vendor/ex_act(severity, target)
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
s.set_up(5, 1, src)
|
||||
s.start()
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner
|
||||
var/hidden = 1
|
||||
|
||||
/turf/simulated/mineral/ex_act(severity, specialty)
|
||||
/turf/simulated/mineral/ex_act(severity, target)
|
||||
..()
|
||||
switch(severity)
|
||||
if(3.0)
|
||||
@@ -494,8 +494,8 @@
|
||||
/turf/simulated/floor/plating/asteroid/burn_tile()
|
||||
return
|
||||
|
||||
/turf/simulated/floor/plating/asteroid/ex_act(severity, specialty)
|
||||
contents_explosion(src, severity, specialty)
|
||||
/turf/simulated/floor/plating/asteroid/ex_act(severity, target)
|
||||
contents_explosion(severity, target)
|
||||
switch(severity)
|
||||
if(3.0)
|
||||
return
|
||||
|
||||
@@ -83,6 +83,6 @@
|
||||
src.updateUsrDialog()
|
||||
return
|
||||
|
||||
obj/structure/ore_box/ex_act(severity, specialty)
|
||||
obj/structure/ore_box/ex_act(severity, target)
|
||||
if(prob(100 / severity) && severity < 3)
|
||||
qdel(src) //nothing but ores can get inside unless its a bug and ores just return nothing on ex_act, not point in calling it on them
|
||||
Reference in New Issue
Block a user