cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 17:07:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB Ignore] [IDB Ignore] Kills off /obj/item/device (#21774)

Browse Source 
This has zero reason to exist in our code base. We have no procs or
variables tied to this. I removed it to make future modifications
cleaner.

---------

Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
This commit is contained in:
Cody Brittain
2026-02-01 00:14:26 -05:00
committed by GitHub
parent 75424095ac
commit 3f62424312
857 changed files with 8690 additions and 8599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_vending.dm
+9 -9
View File
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(minevendor_list, list(
new /datum/data/mining_equipment(/obj/item/stack/flag/purple, 10, 50),
new /datum/data/mining_equipment(/obj/item/storage/bag/ore, 25, 50),
new /datum/data/mining_equipment(pick(subtypesof(/obj/item/pizzabox)), 2, 50),
new /datum/data/mining_equipment(/obj/item/device/flashlight/lantern, 10, 75),
new /datum/data/mining_equipment(/obj/item/flashlight/lantern, 10, 75),
new /datum/data/mining_equipment(/obj/item/shovel, 15, 100),
new /datum/data/mining_equipment(/obj/item/pickaxe, 10, 100),
new /datum/data/mining_equipment(/obj/item/rfd_ammo, 50, 100),
@@ -35,32 +35,32 @@ GLOBAL_LIST_INIT(minevendor_list, list(
new /datum/data/mining_equipment(/obj/item/gun/custom_ka/frame02/prebuilt, 12, 400),
new /datum/data/mining_equipment(/obj/item/autochisel, 10, 400),
new /datum/data/mining_equipment(/obj/item/tank/jetpack, 10, 400),
new /datum/data/mining_equipment(/obj/item/device/mine_bot_upgrade, 10, 400),
new /datum/data/mining_equipment(/obj/item/mine_bot_upgrade, 10, 400),
new /datum/data/mining_equipment(/obj/machinery/mining/brace, -1, 500, 1),
new /datum/data/mining_equipment(/obj/item/card/mining_point_card, -1, 500),
new /datum/data/mining_equipment(/obj/item/storage/belt/mining, 10, 500),
new /datum/data/mining_equipment(/obj/item/warp_core, 25, 500),
new /datum/data/mining_equipment(/obj/item/extraction_pack, 25, 600),
new /datum/data/mining_equipment(/obj/item/device/mine_bot_upgrade/health, 20, 600),
new /datum/data/mining_equipment(/obj/item/mine_bot_upgrade/health, 20, 600),
new /datum/data/mining_equipment(/obj/item/storage/firstaid/trauma, 30, 600),
new /datum/data/mining_equipment(/obj/item/oremagnet, 10, 600),
new /datum/data/mining_equipment(/obj/item/resonator, 10, 700),
new /datum/data/mining_equipment(/obj/item/device/wormhole_jaunter, 20, 750),
new /datum/data/mining_equipment(/obj/item/wormhole_jaunter, 20, 750),
new /datum/data/mining_equipment(/obj/item/rig/industrial, 5, 1000),
new /datum/data/mining_equipment(/obj/item/mass_driver_diy, 5, 800),
new /datum/data/mining_equipment(/mob/living/silicon/robot/drone/mining, 15, 800),
new /datum/data/mining_equipment(/obj/item/device/mine_bot_upgrade/ka, 10, 800),
new /datum/data/mining_equipment(/obj/item/mine_bot_upgrade/ka, 10, 800),
new /datum/data/mining_equipment(/obj/item/oreportal, 35, 800),
new /datum/data/mining_equipment(/obj/item/device/spaceflare, 5, 800),
new /datum/data/mining_equipment(/obj/item/spaceflare, 5, 800),
new /datum/data/mining_equipment(/obj/item/lazarus_injector, 25, 1000),
new /datum/data/mining_equipment(/obj/item/storage/backpack/cell, 5, 1000),
new /datum/data/mining_equipment(/obj/machinery/mining/drill, -1, 1000, 1),
new /datum/data/mining_equipment(/obj/item/resonator/upgraded, 10, 1250),
new /datum/data/mining_equipment(/obj/item/pickaxe/diamond, 10, 1500),
new /datum/data/mining_equipment(/obj/item/gun/energy/vaurca/thermaldrill, 5, 1750),
new /datum/data/mining_equipment(/obj/item/device/orbital_dropper/minecart, 5, 2000),
new /datum/data/mining_equipment(/obj/item/device/orbital_dropper/drill, 10, 3250),
new /datum/data/mining_equipment(/obj/item/device/orbital_dropper/mecha/miner, 2, 3500)
new /datum/data/mining_equipment(/obj/item/orbital_dropper/minecart, 5, 2000),
new /datum/data/mining_equipment(/obj/item/orbital_dropper/drill, 10, 3250),
new /datum/data/mining_equipment(/obj/item/orbital_dropper/mecha/miner, 2, 3500)
))
/obj/machinery/mineral/equipment_vendor
code/modules/mining/mine_items.dm
+7 -7
View File
@@ -675,7 +675,7 @@
/**********************Jaunter**********************/
/obj/item/device/wormhole_jaunter
/obj/item/wormhole_jaunter
name = "wormhole jaunter"
desc = "A single use device harnessing outdated warp technology. The wormholes it creates are unpleasant to travel through, to say the least."
contained_sprite = TRUE
@@ -689,29 +689,29 @@
slot_flags = SLOT_BELT
origin_tech = list(TECH_BLUESPACE = 2, TECH_PHORON = 4, TECH_ENGINEERING = 4)
/obj/item/device/wormhole_jaunter/attack_self(mob/user)
/obj/item/wormhole_jaunter/attack_self(mob/user)
user.visible_message(SPAN_NOTICE("\The [user] activates \the [src]!"))
feedback_add_details("jaunter", "U") // user activated
activate(user)
/obj/item/device/wormhole_jaunter/proc/turf_check(mob/user)
/obj/item/wormhole_jaunter/proc/turf_check(mob/user)
var/turf/device_turf = get_turf(user)
if(!device_turf || device_turf.z == 0)
to_chat(user, SPAN_NOTICE("You're having difficulties getting \the [src] to work."))
return FALSE
return TRUE
/obj/item/device/wormhole_jaunter/proc/get_destinations(mob/user)
/obj/item/wormhole_jaunter/proc/get_destinations(mob/user)
var/list/destinations = list()
for(var/obj/item/device/radio/beacon/B in GLOB.teleportbeacons)
for(var/obj/item/radio/beacon/B in GLOB.teleportbeacons)
var/turf/T = get_turf(B)
if(is_station_level(T.z))
destinations += B
return destinations
/obj/item/device/wormhole_jaunter/proc/activate(mob/user)
/obj/item/wormhole_jaunter/proc/activate(mob/user)
if(!turf_check(user))
return
@@ -725,7 +725,7 @@
playsound(src,'sound/effects/sparks4.ogg', 50, 1)
qdel(src)
/obj/item/device/wormhole_jaunter/emp_act(severity)
/obj/item/wormhole_jaunter/emp_act(severity)
. = ..()
var/triggered = FALSE
code/modules/mining/mine_turfs.dm
+6 -6
View File
@@ -263,18 +263,18 @@ GLOBAL_LIST_INIT(mineral_can_smooth_with, list(
to_chat(user, SPAN_WARNING("You don't have the dexterity to do this!"))
return
if(istype(attacking_item, /obj/item/device/core_sampler))
var/obj/item/device/core_sampler/C = attacking_item
if(istype(attacking_item, /obj/item/core_sampler))
var/obj/item/core_sampler/C = attacking_item
C.sample_item(src, user)
return
if(istype(attacking_item, /obj/item/device/depth_scanner))
var/obj/item/device/depth_scanner/C = attacking_item
if(istype(attacking_item, /obj/item/depth_scanner))
var/obj/item/depth_scanner/C = attacking_item
C.scan_atom(user, src)
return
if(istype(attacking_item, /obj/item/device/measuring_tape))
var/obj/item/device/measuring_tape/P = attacking_item
if(istype(attacking_item, /obj/item/measuring_tape))
var/obj/item/measuring_tape/P = attacking_item
user.visible_message(SPAN_NOTICE("\The [user] extends \the [P] towards \the [src].") , SPAN_NOTICE("You extend \the [P] towards \the [src]."))
if(do_after(user,25))
if(!istype(src, /turf/simulated/mineral))
code/modules/mining/minebot.dm
+8 -8
View File
@@ -88,8 +88,8 @@
to_chat(user, SPAN_WARNING("\The [src] is not compatible with \the [attacking_item]."))
return
if(istype(attacking_item, /obj/item/device/mine_bot_upgrade))
var/obj/item/device/mine_bot_upgrade/MBU = attacking_item
if(istype(attacking_item, /obj/item/mine_bot_upgrade))
var/obj/item/mine_bot_upgrade/MBU = attacking_item
MBU.upgrade_bot(src, user)
return
@@ -138,13 +138,13 @@
/**********************Minebot Upgrades**********************/
/obj/item/device/mine_bot_upgrade
/obj/item/mine_bot_upgrade
name = "minebot drill upgrade"
desc = "A minebot upgrade."
icon_state = "mainboard"
icon = 'icons/obj/module.dmi'
/obj/item/device/mine_bot_upgrade/proc/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
/obj/item/mine_bot_upgrade/proc/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
if(M.drill_upgrade)
to_chat(user, SPAN_WARNING("[src] already has a drill upgrade installed!"))
return
@@ -161,10 +161,10 @@
to_chat(user, SPAN_NOTICE("You successfully install \the [src] into \the [M]."))
qdel(src)
/obj/item/device/mine_bot_upgrade/health
/obj/item/mine_bot_upgrade/health
name = "minebot chassis upgrade"
/obj/item/device/mine_bot_upgrade/health/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
/obj/item/mine_bot_upgrade/health/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
if(M.health_upgrade)
to_chat(user, SPAN_WARNING("[src] already has a reinforced chassis!"))
return
@@ -178,10 +178,10 @@
to_chat(user, SPAN_NOTICE("You successfully install \the [src] into \the [M]."))
qdel(src)
/obj/item/device/mine_bot_upgrade/ka
/obj/item/mine_bot_upgrade/ka
name = "minebot kinetic accelerator upgrade"
/obj/item/device/mine_bot_upgrade/ka/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
/obj/item/mine_bot_upgrade/ka/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
if(M.ranged_upgrade)
to_chat(user, "[src] already has a KA upgrade installed!")
return
code/modules/mining/ore.dm
+2 -2
View File
@@ -96,8 +96,8 @@
material = null
/obj/item/ore/attackby(obj/item/attacking_item, mob/user)
if(istype(attacking_item,/obj/item/device/core_sampler))
var/obj/item/device/core_sampler/C = attacking_item
if(istype(attacking_item,/obj/item/core_sampler))
var/obj/item/core_sampler/C = attacking_item
C.sample_item(src, user)
else
return ..()