cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-29 08:09:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes devices

Browse Source
This commit is contained in:
atermonera
2022-04-17 19:14:43 -08:00
parent 7a9806d9b4
commit 9d71839ac6
600 changed files with 5636 additions and 5530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/abandonedcrates.dm
+5 -5
View File
@@ -28,7 +28,7 @@
new/obj/item/flame/lighter/zippo(src)
if(6 to 10)
new/obj/item/pickaxe/drill(src)
new/obj/item/device/taperecorder(src)
new/obj/item/taperecorder(src)
new/obj/item/clothing/suit/space(src)
new/obj/item/clothing/head/helmet/space(src)
if(11 to 15)
@@ -106,7 +106,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/material/sword/katana(src)
if(93)
@@ -115,7 +115,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/stamp/clown(src) I'd add it, but only clowns can use it
@@ -124,7 +124,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/white(src)
new/obj/item/clothing/mask/gas/mime(src)
new/obj/item/clothing/head/beret(src)
@@ -192,7 +192,7 @@
/obj/structure/closet/crate/secure/loot/attackby(obj/item/W as obj, mob/user as mob)
if(locked)
if (istype(W, /obj/item/device/multitool)) // Greetings Urist McProfessor, how about a nice game of cows and bulls?
if (istype(W, /obj/item/multitool)) // Greetings Urist McProfessor, how about a nice game of cows and bulls?
to_chat(user, "<span class='notice'>DECA-CODE LOCK ANALYSIS:</span>")
if (attempts == 1)
to_chat(user, "<span class='warning'>* Anti-Tamper system will activate on the next failed access attempt.</span>")
code/modules/mining/drilling/drill.dm
+2 -2
View File
@@ -15,7 +15,7 @@
var/supported = 0
var/active = 0
var/list/resource_field = list()
var/obj/item/device/radio/intercom/faultreporter = new /obj/item/device/radio/intercom{channels=list("Supply")}(null)
var/obj/item/radio/intercom/faultreporter = new /obj/item/radio/intercom{channels=list("Supply")}(null)
var/list/ore_types = list(
"hematite" = /obj/item/ore/iron,
@@ -161,7 +161,7 @@
/obj/machinery/mining/drill/attackby(obj/item/O as obj, mob/user as mob)
if(!active)
if(istype(O, /obj/item/device/multitool))
if(istype(O, /obj/item/multitool))
var/newtag = text2num(sanitizeSafe(input(user, "Enter new ID number or leave empty to cancel.", "Assign ID number") as text, 4))
if(newtag)
name = "[initial(name)] #[newtag]"
code/modules/mining/drilling/scanner.dm
+2
View File
@@ -2,6 +2,8 @@
name = "deep scan device"
desc = "A complex device used to locate ore deep underground."
icon = 'icons/obj/device.dmi'
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
icon_state = "deep_scan_device"
item_state = "electronic"
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
code/modules/mining/mine_items.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************Lantern*******************************/
/obj/item/device/flashlight/lantern
/obj/item/flashlight/lantern
name = "lantern"
icon_state = "lantern"
desc = "A mining lantern."
code/modules/mining/mine_turfs.dm
+8 -8
View File
@@ -477,26 +477,26 @@ var/list/mining_overlay_cache = list()
else
if (istype(W, /obj/item/device/core_sampler))
if (istype(W, /obj/item/core_sampler))
geologic_data.UpdateNearbyArtifactInfo(src)
var/obj/item/device/core_sampler/C = W
var/obj/item/core_sampler/C = W
C.sample_item(src, user)
return
if (istype(W, /obj/item/device/depth_scanner))
var/obj/item/device/depth_scanner/C = W
if (istype(W, /obj/item/depth_scanner))
var/obj/item/depth_scanner/C = W
C.scan_atom(user, src)
return
if (istype(W, /obj/item/device/measuring_tape))
var/obj/item/device/measuring_tape/P = W
if (istype(W, /obj/item/measuring_tape))
var/obj/item/measuring_tape/P = W
user.visible_message("<span class='notice'>\The [user] extends \a [P] towards \the [src].</span>","<span class='notice'>You extend \the [P] towards \the [src].</span>")
if(do_after(user, 15))
to_chat(user, "<span class='notice'>\The [src] has been excavated to a depth of [excavation_level]cm.</span>")
return
if(istype(W, /obj/item/device/xenoarch_multi_tool))
var/obj/item/device/xenoarch_multi_tool/C = W
if(istype(W, /obj/item/xenoarch_multi_tool))
var/obj/item/xenoarch_multi_tool/C = W
if(C.mode) //Mode means scanning
C.depth_scanner.scan_atom(user, src)
else
code/modules/mining/ore.dm
+2 -2
View File
@@ -153,8 +153,8 @@
randpixel_xy()
/obj/item/ore/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/device/core_sampler))
var/obj/item/device/core_sampler/C = W
if(istype(W,/obj/item/core_sampler))
var/obj/item/core_sampler/C = W
C.sample_item(src, user)
else
return ..()
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+4 -4
View File
@@ -19,8 +19,8 @@
new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/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, 900),
new /datum/data/mining_equipment("Geiger Counter", /obj/item/device/geiger, 750),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 900),
new /datum/data/mining_equipment("Geiger Counter", /obj/item/geiger, 750),
new /datum/data/mining_equipment("Plush Toy", /obj/random/plushie, 300),
new /datum/data/mining_equipment("Umbrella", /obj/item/melee/umbrella/random, 200),
// new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 500),
@@ -43,7 +43,7 @@
new /datum/data/mining_equipment("Industrial Equipment - Sheet-Snatcher",/obj/item/storage/bag/sheetsnatcher, 500), new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500),
new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
new /datum/data/mining_equipment("Fine Excavation Kit - Chisels",/obj/item/storage/excavation, 500),
new /datum/data/mining_equipment("Fine Excavation Kit - Measuring Tape",/obj/item/device/measuring_tape, 125),
new /datum/data/mining_equipment("Fine Excavation Kit - Measuring Tape",/obj/item/measuring_tape, 125),
new /datum/data/mining_equipment("Fine Excavation Kit - Hand Pick",/obj/item/pickaxe/hand, 375),
new /datum/data/mining_equipment("Explosive Excavation Kit - Plastic Charge",/obj/item/plastique/seismic, 1500),
new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500),
@@ -201,7 +201,7 @@
// if("Mining Drone")
// new /obj/item/storage/box/drone_kit(drop_location)
// if("Advanced Scanner")
// new /obj/item/device/t_scanner/adv_mining_scanner(drop_location)
// new /obj/item/t_scanner/adv_mining_scanner(drop_location)
// if("Crusher")
// new /obj/item/twohanded/required/mining_hammer(drop_location)
qdel(voucher)
code/modules/mining/ore_redemption_machine/survey_vendor.dm
+2 -2
View File
@@ -15,8 +15,8 @@
new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 20),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 90),
new /datum/data/mining_equipment("Geiger Counter", /obj/item/device/geiger, 75),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 90),
new /datum/data/mining_equipment("Geiger Counter", /obj/item/geiger, 75),
new /datum/data/mining_equipment("Plush Toy", /obj/random/plushie, 30),
new /datum/data/mining_equipment("Umbrella", /obj/item/melee/umbrella/random, 10),
new /datum/data/mining_equipment("Extraction Equipment - Fulton Beacon", /obj/item/fulton_core, 100),