Unorphans the blackbox

This commit is contained in:
CitadelStationBot
2017-04-26 17:05:23 -05:00
parent e7df2bc14a
commit bde5d6253a
116 changed files with 1980 additions and 322 deletions
+1 -1
View File
@@ -131,7 +131,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
/obj/machinery/computer/auxillary_base/onShuttleMove(turf/T1, rotation)
..()
if(z == ZLEVEL_MINING) //Avoids double logging and landing on other Z-levels due to badminnery
feedback_add_details("colonies_dropped", "[x]|[y]|[z]") //Number of times a base has been dropped!
SSblackbox.add_details("colonies_dropped", "[x]|[y]|[z]") //Number of times a base has been dropped!
/obj/machinery/computer/auxillary_base/proc/set_mining_mode()
if(z == ZLEVEL_MINING) //The console switches to controlling the mining shuttle once landed.
+1 -1
View File
@@ -320,7 +320,7 @@
H.attack_same = 0
loaded = 0
user.visible_message("<span class='notice'>[user] injects [M] with [src], reviving it.</span>")
feedback_add_details("lazarus_injector", "[M.type]")
SSblackbox.add_details("lazarus_injector", "[M.type]")
playsound(src,'sound/effects/refill.ogg',50,1)
icon_state = "lazarus_empty"
return
+26
View File
@@ -0,0 +1,26 @@
diff a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm (rejected hunks)
@@ -68,7 +68,7 @@
/obj/item/device/wormhole_jaunter/attack_self(mob/user)
user.visible_message("<span class='notice'>[user.name] activates the [src.name]!</span>")
- feedback_add_details("jaunter", "U") // user activated
+ SSblackbox.add_details("jaunter", "U") // user activated
activate(user)
/obj/item/device/wormhole_jaunter/proc/turf_check(mob/user)
@@ -124,13 +124,13 @@
if(triggered)
usr.visible_message("<span class='warning'>The [src] overloads and activates!</span>")
- feedback_add_details("jaunter","E") // EMP accidental activation
+ SSblackbox.add_details("jaunter","E") // EMP accidental activation
activate(usr)
/obj/item/device/wormhole_jaunter/proc/chasm_react(mob/user)
if(user.get_item_by_slot(slot_belt) == src)
to_chat(user, "Your [src] activates, saving you from the chasm!</span>")
- feedback_add_details("jaunter","C") // chasm automatic activation
+ SSblackbox.add_details("jaunter","C") // chasm automatic activation
activate(user)
else
to_chat(user, "The [src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>")
@@ -140,7 +140,7 @@
return
new /obj/effect/particle_effect/smoke(user.loc)
user.forceMove(get_turf(linked))
feedback_add_details("warp_cube","[src.type]")
SSblackbox.add_details("warp_cube","[src.type]")
new /obj/effect/particle_effect/smoke(user.loc)
/obj/item/device/warp_cube/red
@@ -0,0 +1,28 @@
diff a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm (rejected hunks)
@@ -87,7 +87,7 @@
user.sight |= SEE_MOBS
icon_state = "lantern"
wisp.orbit(user, 20)
- feedback_add_details("wisp_lantern","F") // freed
+ SSblackbox.add_details("wisp_lantern","F") // freed
else
to_chat(user, "<span class='notice'>You return the wisp to the lantern.</span>")
@@ -102,7 +102,7 @@
wisp.stop_orbit()
wisp.loc = src
icon_state = "lantern-blue"
- feedback_add_details("wisp_lantern","R") // returned
+ SSblackbox.add_details("wisp_lantern","R") // returned
/obj/item/device/wisp_lantern/Initialize()
..()
@@ -229,7 +229,7 @@
/obj/item/device/immortality_talisman/attack_self(mob/user)
if(cooldown < world.time)
- feedback_add_details("immortality_talisman","U") // usage
+ SSblackbox.add_details("immortality_talisman","U") // usage
cooldown = world.time + 600
user.visible_message("<span class='danger'>[user] vanishes from reality, leaving a a hole in [user.p_their()] place!</span>")
var/obj/effect/immortality_talisman/Z = new(get_turf(src.loc))
+2 -2
View File
@@ -136,7 +136,7 @@
else
inserted_id.mining_points -= prize.cost
new prize.equipment_path(src.loc)
feedback_add_details("mining_equipment_bought",
SSblackbox.add_details("mining_equipment_bought",
"[src.type]|[prize.equipment_path]")
// Add src.type to keep track of free golem purchases
// seperately.
@@ -189,7 +189,7 @@
if("Mining Conscription Kit")
new /obj/item/weapon/storage/backpack/dufflebag/mining_conscript(loc)
feedback_add_details("mining_voucher_redeemed", selection)
SSblackbox.add_details("mining_voucher_redeemed", selection)
qdel(voucher)
/obj/machinery/mineral/equipment_vendor/ex_act(severity, target)