Unwinded most of shit

Meh
This commit is contained in:
Razharas
2014-11-19 21:36:45 +03:00
parent b7d08c591e
commit ff456ebaf4
88 changed files with 206 additions and 212 deletions
+2 -2
View File
@@ -192,7 +192,7 @@
updateUsrDialog()
return
/obj/machinery/mineral/ore_redemption/ex_act(severity)
/obj/machinery/mineral/ore_redemption/ex_act(severity, specialty)
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)
/obj/machinery/mineral/equipment_vendor/ex_act(severity, specialty)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
+3 -3
View File
@@ -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)
/turf/simulated/mineral/ex_act(severity, specialty)
..()
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)
..()
/turf/simulated/floor/plating/asteroid/ex_act(severity, specialty)
contents_explosion(src, severity, specialty)
switch(severity)
if(3.0)
return
+1 -1
View File
@@ -83,6 +83,6 @@
src.updateUsrDialog()
return
obj/structure/ore_box/ex_act(severity)
obj/structure/ore_box/ex_act(severity, specialty)
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