cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Great Conflictening 2.0: Removes /obj/item/device

Browse Source
This commit is contained in:
Fox McCloud
2018-04-25 23:07:35 -04:00
parent 900bf31b38
commit 8c7b543415
505 changed files with 3699 additions and 3677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/abandonedcrates.dm
+4 -4
View File
@@ -111,7 +111,7 @@
if(90)
new /obj/item/organ/internal/heart(src)
if(91)
new /obj/item/device/soulstone(src)
new /obj/item/soulstone(src)
if(92)
new /obj/item/katana(src)
if(93)
@@ -120,7 +120,7 @@
new /obj/item/storage/backpack/clown(src)
new /obj/item/clothing/under/rank/clown(src)
new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/device/pda/clown(src)
new /obj/item/pda/clown(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/bikehorn(src)
new /obj/item/toy/crayon/rainbow(src)
@@ -129,7 +129,7 @@
if(95)
new /obj/item/clothing/under/mime(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/device/pda/mime(src)
new /obj/item/pda/mime(src)
new /obj/item/clothing/gloves/color/white(src)
new /obj/item/clothing/mask/gas/mime(src)
new /obj/item/clothing/head/beret(src)
@@ -179,7 +179,7 @@
if(istype(W, /obj/item/card/emag))
boom(user)
return 1
if(istype(W, /obj/item/device/multitool))
if(istype(W, /obj/item/multitool))
to_chat(user, "<span class='notice'>DECA-CODE LOCK REPORT:</span>")
if(attempts == 1)
to_chat(user, "<span class='warning'>* Anti-Tamper Bomb will activate on next failed access attempt.</span>")
code/modules/mining/equipment_locker.dm
+24 -23
View File
@@ -30,7 +30,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/device/assembly/igniter(null)
component_parts += new /obj/item/assembly/igniter(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
RefreshParts()
@@ -41,7 +41,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/device/assembly/igniter(null)
component_parts += new /obj/item/assembly/igniter(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
RefreshParts()
@@ -332,24 +332,24 @@
new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 300),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300),
new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 400),
new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 400),
new /datum/data/mining_equipment("Hivelord Stabilizer", /obj/item/hivelordstabilizer, 400),
new /datum/data/mining_equipment("Mining Drone", /obj/item/mining_drone_cube, 500),
new /datum/data/mining_equipment("Drone Melee Upgrade", /obj/item/device/mine_bot_upgrade, 400),
new /datum/data/mining_equipment("Drone Health Upgrade",/obj/item/device/mine_bot_upgrade/health, 400),
new /datum/data/mining_equipment("Drone Ranged Upgrade",/obj/item/device/mine_bot_upgrade/cooldown, 600),
new /datum/data/mining_equipment("Drone Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
new /datum/data/mining_equipment("Drone Health Upgrade",/obj/item/mine_bot_upgrade/health, 400),
new /datum/data/mining_equipment("Drone Ranged Upgrade",/obj/item/mine_bot_upgrade/cooldown, 600),
new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/twohanded/required/mining_hammer, 750),
new /datum/data/mining_equipment("Drone AI Upgrade", /obj/item/slimepotion/sentience/mining, 1000),
new /datum/data/mining_equipment("GAR mesons", /obj/item/clothing/glasses/meson/gar, 500),
new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 600),
new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 600),
new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 600),
new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000),
new /datum/data/mining_equipment("Lazarus Capsule", /obj/item/device/mobcapsule, 800),
new /datum/data/mining_equipment("Lazarus Capsule", /obj/item/mobcapsule, 800),
new /datum/data/mining_equipment("Lazarus Capsule belt",/obj/item/storage/belt/lazarus, 200),
new /datum/data/mining_equipment("Jetpack", /obj/item/tank/jetpack/carbondioxide/mining, 2000),
new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000),
@@ -498,7 +498,7 @@
if("Mining Drone")
new /obj/item/storage/box/drone_kit(src.loc)
if("Advanced Scanner")
new /obj/item/device/t_scanner/adv_mining_scanner(src.loc)
new /obj/item/t_scanner/adv_mining_scanner(src.loc)
if("Crusher")
new /obj/item/twohanded/required/mining_hammer(loc)
qdel(voucher)
@@ -546,7 +546,7 @@
/**********************Jaunter**********************/
/obj/item/device/wormhole_jaunter
/obj/item/wormhole_jaunter
name = "wormhole jaunter"
desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to blue space for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least."
icon = 'icons/obj/items.dmi'
@@ -558,7 +558,7 @@
throw_range = 5
origin_tech = "bluespace=2"
/obj/item/device/wormhole_jaunter/attack_self(mob/user)
/obj/item/wormhole_jaunter/attack_self(mob/user)
var/turf/device_turf = get_turf(user)
if(!device_turf || !is_teleport_allowed(device_turf.z))
to_chat(user, "<span class='notice'>You're having difficulties getting the [src.name] to work.</span>")
@@ -566,7 +566,7 @@
else
user.visible_message("<span class='notice'>[user.name] activates the [src.name]!</span>")
var/list/L = list()
for(var/obj/item/device/radio/beacon/B in world)
for(var/obj/item/radio/beacon/B in world)
var/turf/T = get_turf(B)
if(is_station_level(T.z))
L += B
@@ -801,9 +801,10 @@
/**********************Mining Scanner**********************/
/obj/item/device/mining_scanner
/obj/item/mining_scanner
desc = "A scanner that checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear material scanners for optimal results."
name = "manual mining scanner"
icon = 'icons/obj/device.dmi'
icon_state = "mining1"
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
@@ -812,7 +813,7 @@
var/cooldown = 0
origin_tech = "engineering=1;magnets=1"
/obj/item/device/mining_scanner/attack_self(mob/user)
/obj/item/mining_scanner/attack_self(mob/user)
if(!user.client)
return
if(!cooldown)
@@ -825,15 +826,15 @@
//Debug item to identify all ore spread quickly
/obj/item/device/mining_scanner/admin
/obj/item/mining_scanner/admin
/obj/item/device/mining_scanner/admin/attack_self(mob/user)
/obj/item/mining_scanner/admin/attack_self(mob/user)
for(var/turf/simulated/mineral/M in world)
if(M.scan_state)
M.icon_state = M.scan_state
qdel(src)
/obj/item/device/t_scanner/adv_mining_scanner
/obj/item/t_scanner/adv_mining_scanner
desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear meson scanners for optimal results. This one has an extended range."
name = "advanced automatic mining scanner"
icon_state = "mining0"
@@ -847,24 +848,24 @@
var/meson = TRUE
origin_tech = "engineering=3;magnets=3"
/obj/item/device/t_scanner/adv_mining_scanner/cyborg
/obj/item/t_scanner/adv_mining_scanner/cyborg
flags = CONDUCT | NODROP
/obj/item/device/t_scanner/adv_mining_scanner/material
/obj/item/t_scanner/adv_mining_scanner/material
meson = FALSE
desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear material scanners for optimal results. This one has an extended range."
/obj/item/device/t_scanner/adv_mining_scanner/lesser
/obj/item/t_scanner/adv_mining_scanner/lesser
name = "automatic mining scanner"
desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear meson scanners for optimal results."
range = 4
cooldown = 50
/obj/item/device/t_scanner/adv_mining_scanner/lesser/material
/obj/item/t_scanner/adv_mining_scanner/lesser/material
desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear material scanners for optimal results."
meson = FALSE
/obj/item/device/t_scanner/adv_mining_scanner/scan()
/obj/item/t_scanner/adv_mining_scanner/scan()
if(!on_cooldown)
on_cooldown = 1
spawn(cooldown)
code/modules/mining/laborcamp/laborstacker.dm
+2 -2
View File
@@ -13,12 +13,12 @@
var/obj/machinery/door/airlock/release_door
var/door_tag = "prisonshuttle"
var/use_release_door = 0
var/obj/item/device/radio/intercom/announcer
var/obj/item/radio/intercom/announcer
/obj/machinery/mineral/labor_claim_console/New()
..()
announcer = new /obj/item/device/radio/intercom(null)
announcer = new /obj/item/radio/intercom(null)
announcer.config(list("Security" = 0))
spawn(7)
code/modules/mining/lavaland/loot/tendril_loot.dm
+22 -22
View File
@@ -8,7 +8,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
//External
/obj/item/device/shared_storage
/obj/item/shared_storage
name = "paradox bag"
desc = "Somehow, it's in two places at once."
icon = 'icons/obj/storage.dmi'
@@ -16,25 +16,25 @@
slot_flags = SLOT_BACK
var/obj/item/storage/backpack/shared/bag
/obj/item/device/shared_storage/red
/obj/item/shared_storage/red
name = "paradox bag"
desc = "Somehow, it's in two places at once."
/obj/item/device/shared_storage/red/New()
/obj/item/shared_storage/red/New()
..()
if(!bag)
var/obj/item/storage/backpack/shared/S = new(src)
var/obj/item/device/shared_storage/blue = new(loc)
var/obj/item/shared_storage/blue = new(loc)
bag = S
blue.bag = S
/obj/item/device/shared_storage/attackby(obj/item/W, mob/user, params)
/obj/item/shared_storage/attackby(obj/item/W, mob/user, params)
if(bag)
bag.loc = user
bag.attackby(W, user, params)
/obj/item/device/shared_storage/attack_self(mob/living/carbon/user)
/obj/item/shared_storage/attack_self(mob/living/carbon/user)
if(!iscarbon(user))
return
if(src == user.l_hand || src == user.r_hand)
@@ -44,7 +44,7 @@
else
..()
/obj/item/device/shared_storage/attack_hand(mob/living/carbon/user)
/obj/item/shared_storage/attack_hand(mob/living/carbon/user)
if(!iscarbon(user))
return
if(loc == user && user.back && user.back == src)
@@ -54,7 +54,7 @@
else
..()
/obj/item/device/shared_storage/MouseDrop(atom/over_object)
/obj/item/shared_storage/MouseDrop(atom/over_object)
if(iscarbon(usr))
var/mob/M = usr
@@ -185,14 +185,14 @@
vehicle_move_delay = 1
// Wisp Lantern
/obj/item/device/wisp_lantern
/obj/item/wisp_lantern
name = "spooky lantern"
desc = "This lantern gives off no light, but is home to a friendly wisp."
icon = 'icons/obj/lighting.dmi'
icon_state = "lantern-blue"
var/obj/effect/wisp/wisp
/obj/item/device/wisp_lantern/attack_self(mob/user)
/obj/item/wisp_lantern/attack_self(mob/user)
if(!wisp)
to_chat(user, "<span class='warning'>The wisp has gone missing!</span>")
return
@@ -218,11 +218,11 @@
icon_state = "lantern-blue"
feedback_add_details("wisp_lantern","R") // returned
/obj/item/device/wisp_lantern/New()
/obj/item/wisp_lantern/New()
..()
wisp = new(src)
/obj/item/device/wisp_lantern/Destroy()
/obj/item/wisp_lantern/Destroy()
if(wisp)
if(wisp.loc == src)
qdel(wisp)
@@ -241,20 +241,20 @@
//Red/Blue Cubes
/obj/item/device/warp_cube
/obj/item/warp_cube
name = "blue cube"
desc = "A mysterious blue cube."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "blue_cube"
var/obj/item/device/warp_cube/linked
var/obj/item/warp_cube/linked
/obj/item/device/warp_cube/Destroy()
/obj/item/warp_cube/Destroy()
if(linked)
linked.linked = null
linked = null
return ..()
/obj/item/device/warp_cube/attack_self(mob/user)
/obj/item/warp_cube/attack_self(mob/user)
if(!linked)
to_chat(user, "[src] fizzles uselessly.")
return
@@ -270,15 +270,15 @@
smoke2.set_up(1, 0, user.loc)
smoke2.start()
/obj/item/device/warp_cube/red
/obj/item/warp_cube/red
name = "red cube"
desc = "A mysterious red cube."
icon_state = "red_cube"
/obj/item/device/warp_cube/red/New()
/obj/item/warp_cube/red/New()
..()
if(!linked)
var/obj/item/device/warp_cube/blue = new(src.loc)
var/obj/item/warp_cube/blue = new(src.loc)
linked = blue
blue.linked = src
@@ -334,7 +334,7 @@
//Immortality Talisman
/obj/item/device/immortality_talisman
/obj/item/immortality_talisman
name = "Immortality Talisman"
desc = "A dread talisman that can render you completely invulnerable."
icon = 'icons/obj/lavaland/artefacts.dmi'
@@ -345,13 +345,13 @@
/datum/action/item_action/immortality
name = "Immortality"
/obj/item/device/immortality_talisman/Destroy(force)
/obj/item/immortality_talisman/Destroy(force)
if(force)
. = ..()
else
return QDEL_HINT_LETMELIVE
/obj/item/device/immortality_talisman/attack_self(mob/user)
/obj/item/immortality_talisman/attack_self(mob/user)
if(cooldown < world.time)
feedback_add_details("immortality_talisman","U") // usage
cooldown = world.time + 600
code/modules/mining/lavaland/necropolis_chests.dm
+5 -5
View File
@@ -17,12 +17,12 @@
var/loot = rand(1,24)
switch(loot)
if(1)
new /obj/item/device/shared_storage/red(src)
new /obj/item/shared_storage/red(src)
if(2)
new /obj/item/clothing/head/helmet/space/cult(src)
new /obj/item/clothing/suit/space/cult(src)
if(3)
new /obj/item/device/soulstone/anybody(src)
new /obj/item/soulstone/anybody(src)
if(4)
new /obj/item/katana/cursed(src)
if(5)
@@ -53,11 +53,11 @@
if(16)
new /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs(src)
if(17)
new /obj/item/device/warp_cube/red(src)
new /obj/item/warp_cube/red(src)
if(18)
new /obj/item/device/wisp_lantern(src)
new /obj/item/wisp_lantern(src)
if(19)
new /obj/item/device/immortality_talisman(src)
new /obj/item/immortality_talisman(src)
if(20)
new /obj/item/gun/magic/hook(src)
if(21)
code/modules/mining/mine_items.dm
+15 -15
View File
@@ -46,8 +46,8 @@
..()
new /obj/item/shovel(src)
new /obj/item/pickaxe(src)
new /obj/item/device/radio/headset/headset_cargo/mining(src)
new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src)
new /obj/item/radio/headset/headset_cargo/mining(src)
new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/clothing/glasses/meson(src)
@@ -62,7 +62,7 @@
/******************************Lantern*******************************/
/obj/item/device/flashlight/lantern
/obj/item/flashlight/lantern
name = "lantern"
icon_state = "lantern"
desc = "A mining lantern."
@@ -213,7 +213,7 @@
/*********************Mob Capsule*************************/
/obj/item/device/mobcapsule
/obj/item/mobcapsule
name = "lazarus capsule"
desc = "It allows you to store and deploy lazarus-injected creatures easier."
icon = 'icons/obj/mobcap.dmi'
@@ -223,19 +223,19 @@
var/mob/living/simple_animal/captured = null
var/colorindex = 0
/obj/item/device/mobcapsule/Destroy()
/obj/item/mobcapsule/Destroy()
if(captured)
captured.ghostize()
QDEL_NULL(captured)
return ..()
/obj/item/device/mobcapsule/attack(var/atom/A, mob/user, prox_flag)
/obj/item/mobcapsule/attack(var/atom/A, mob/user, prox_flag)
if(!istype(A, /mob/living/simple_animal) || isbot(A))
return ..()
capture(A, user)
return 1
/obj/item/device/mobcapsule/proc/capture(var/mob/target, var/mob/U as mob)
/obj/item/mobcapsule/proc/capture(var/mob/target, var/mob/U as mob)
var/mob/living/simple_animal/T = target
if(captured)
to_chat(U, "<span class='notice'>Capture failed!</span>: The capsule already has a mob registered to it!")
@@ -250,17 +250,17 @@
else
to_chat(U, "You can't capture that mob!")
/obj/item/device/mobcapsule/throw_impact(atom/A, mob/user)
/obj/item/mobcapsule/throw_impact(atom/A, mob/user)
..()
if(captured)
dump_contents(user)
/obj/item/device/mobcapsule/proc/dump_contents(mob/user)
/obj/item/mobcapsule/proc/dump_contents(mob/user)
if(captured)
captured.forceMove(get_turf(src))
captured = null
/obj/item/device/mobcapsule/attack_self(mob/user)
/obj/item/mobcapsule/attack_self(mob/user)
colorindex += 1
if(colorindex >= 6)
colorindex = 0
@@ -412,7 +412,7 @@
RefreshParts()
//Computer
/obj/item/device/gps/computer
/obj/item/gps/computer
name = "pod computer"
icon_state = "pod_computer"
icon = 'icons/obj/lavaland/pod_computer.dmi'
@@ -420,17 +420,17 @@
density = 1
pixel_y = -32
/obj/item/device/gps/computer/attackby(obj/item/W, mob/user, params)
/obj/item/gps/computer/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/wrench))
playsound(loc, W.usesound, 50, 1)
user.visible_message("<span class='warning'>[user] disassembles the gps.</span>", \
"<span class='notice'>You start to disassemble the gps...</span>", "You hear clanking and banging noises.")
if(do_after(user, 20 * W.toolspeed, target = src))
new /obj/item/device/gps(loc)
new /obj/item/gps(loc)
qdel(src)
return ..()
/obj/item/device/gps/computer/attack_hand(mob/user)
/obj/item/gps/computer/attack_hand(mob/user)
attack_self(user)
//Bed
@@ -478,7 +478,7 @@
var/obj/item/storage/pill_bottle/dice/D = new(src)
load(D)
else
var/obj/item/device/instrument/guitar/G = new(src)
var/obj/item/instrument/guitar/G = new(src)
load(G)
//Fans
code/modules/mining/mine_turfs.dm
+1 -1
View File
@@ -297,7 +297,7 @@ var/global/list/rockTurfEdgeCache = list(
..()
/turf/simulated/mineral/gibtonite/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1)
if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) && stage == 1)
user.visible_message("<span class='notice'>You use [I] to locate where to cut off the chain reaction and attempt to stop it...</span>")
defuse()
..()
code/modules/mining/minebot.dm
+8 -8
View File
@@ -85,7 +85,7 @@
adjustBruteLoss(-10)
to_chat(user, "<span class='info'>You repair some of the armor on [src].</span>")
return
if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner))
if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner))
to_chat(user, "<span class='info'>You instruct [src] to drop any collected ore.</span>")
DropOre()
return
@@ -249,18 +249,18 @@
//Melee
/obj/item/device/mine_bot_upgrade
/obj/item/mine_bot_upgrade
name = "minebot melee upgrade"
desc = "A minebot upgrade."
icon_state = "door_electronics"
icon = 'icons/obj/doors/door_assembly.dmi'
/obj/item/device/mine_bot_upgrade/afterattack(mob/living/simple_animal/hostile/mining_drone/M, mob/user, proximity)
/obj/item/mine_bot_upgrade/afterattack(mob/living/simple_animal/hostile/mining_drone/M, mob/user, proximity)
if(!istype(M) || !proximity)
return
upgrade_bot(M, user)
/obj/item/device/mine_bot_upgrade/proc/upgrade_bot(mob/living/simple_animal/hostile/mining_drone/M, mob/user)
/obj/item/mine_bot_upgrade/proc/upgrade_bot(mob/living/simple_animal/hostile/mining_drone/M, mob/user)
if(M.melee_damage_upper != initial(M.melee_damage_upper))
to_chat(user, "[M] already has a combat upgrade installed!")
return
@@ -271,10 +271,10 @@
//Health
/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(mob/living/simple_animal/hostile/mining_drone/M, mob/user)
/obj/item/mine_bot_upgrade/health/upgrade_bot(mob/living/simple_animal/hostile/mining_drone/M, mob/user)
if(M.maxHealth != initial(M.maxHealth))
to_chat(user, "[M] already has a reinforced chassis!")
return
@@ -285,10 +285,10 @@
//Cooldown
/obj/item/device/mine_bot_upgrade/cooldown
/obj/item/mine_bot_upgrade/cooldown
name = "minebot cooldown upgrade"
/obj/item/device/mine_bot_upgrade/cooldown/upgrade_bot(mob/living/simple_animal/hostile/mining_drone/M, mob/user)
/obj/item/mine_bot_upgrade/cooldown/upgrade_bot(mob/living/simple_animal/hostile/mining_drone/M, mob/user)
if(M.ranged_cooldown_time != initial(M.ranged_cooldown_time))
to_chat(user, "[M] already has a decreased weapon cooldown!")
return
code/modules/mining/ore.dm
+3 -3
View File
@@ -174,7 +174,7 @@
return ..()
/obj/item/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params)
if(!wires && istype(I, /obj/item/device/assembly/igniter))
if(!wires && istype(I, /obj/item/assembly/igniter))
user.visible_message("[user] attaches [I] to [src].", "<span class='notice'>You attach [I] to [src].</span>")
wires = new(src)
attacher = key_name(user)
@@ -183,7 +183,7 @@
return
if(wires && !primed)
if(istype(I, /obj/item/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler))
if(istype(I, /obj/item/wirecutters) || istype(I, /obj/item/multitool) || istype(I, /obj/item/assembly/signaler))
wires.Interact(user)
return
@@ -191,7 +191,7 @@
GibtoniteReaction(user)
return
if(primed)
if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) || istype(I, /obj/item/device/multitool))
if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) || istype(I, /obj/item/multitool))
primed = 0
user.visible_message("The chain reaction was stopped! ...The ore's quality looks diminished.", "<span class='notice'>You stopped the chain reaction. ...The ore's quality looks diminished.</span>")
icon_state = "Gibtonite ore"
code/modules/mining/satchel_ore_boxdm.dm
+1 -1
View File
@@ -10,7 +10,7 @@
pressure_resistance = 5*ONE_ATMOSPHERE
/obj/structure/ore_box/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/device/t_scanner/adv_mining_scanner))
if(istype(W, /obj/item/t_scanner/adv_mining_scanner))
attack_hand(user)
return
if(istype(W, /obj/item/ore))