cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes All Weapons

Browse Source
This commit is contained in:
Fox McCloud
2018-04-15 16:25:56 -04:00
parent 8b576c4d42
commit 5c4aa9b3fd
1100 changed files with 17642 additions and 17666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/abandonedcrates.dm
+40 -40
View File
@@ -21,31 +21,31 @@
var/loot = rand(1,100) //100 different crates with varying chances of spawning
switch(loot)
if(1 to 5) //5% chance
new /obj/item/weapon/reagent_containers/food/drinks/bottle/rum(src)
new /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src)
new /obj/item/weapon/lighter(src)
new /obj/item/reagent_containers/food/drinks/bottle/rum(src)
new /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus(src)
new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
new /obj/item/lighter(src)
if(6 to 10)
new /obj/item/weapon/bedsheet(src)
new /obj/item/weapon/kitchen/knife(src)
new /obj/item/weapon/wirecutters(src)
new /obj/item/weapon/screwdriver(src)
new /obj/item/weapon/weldingtool(src)
new /obj/item/weapon/hatchet(src)
new /obj/item/weapon/crowbar(src)
new /obj/item/bedsheet(src)
new /obj/item/kitchen/knife(src)
new /obj/item/wirecutters(src)
new /obj/item/screwdriver(src)
new /obj/item/weldingtool(src)
new /obj/item/hatchet(src)
new /obj/item/crowbar(src)
if(11 to 15)
new /obj/item/weapon/reagent_containers/glass/beaker/bluespace(src)
new /obj/item/reagent_containers/glass/beaker/bluespace(src)
if(16 to 20)
for(var/i in 1 to 10)
new /obj/item/weapon/ore/diamond(src)
new /obj/item/ore/diamond(src)
if(21 to 25)
for(var/i in 1 to 5)
new /obj/item/weapon/poster/random_contraband(src)
new /obj/item/poster/random_contraband(src)
if(26 to 35)
for(var/i in 1 to 3)
new /obj/item/weapon/reagent_containers/glass/beaker/noreact(src)
new /obj/item/reagent_containers/glass/beaker/noreact(src)
if(36 to 40)
new /obj/item/weapon/melee/baton(src)
new /obj/item/melee/baton(src)
if(41 to 45)
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
@@ -54,7 +54,7 @@
for(var/i in 1 to 7)
new /obj/item/clothing/accessory/horrible(src)
if(51 to 52) // 2% chance
new /obj/item/weapon/melee/classic_baton(src)
new /obj/item/melee/classic_baton(src)
if(53 to 54)
new /obj/item/toy/balloon(src)
if(55 to 56)
@@ -72,7 +72,7 @@
new /obj/item/clothing/accessory/petcollar(src)
if(63 to 64)
for(var/i in 1 to rand(4, 7))
var/newcoin = pick(/obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/diamond, /obj/item/weapon/coin/plasma, /obj/item/weapon/coin/uranium)
var/newcoin = pick(/obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/gold, /obj/item/coin/diamond, /obj/item/coin/plasma, /obj/item/coin/uranium)
new newcoin(src)
if(65 to 66)
new /obj/item/clothing/suit/ianshirt(src)
@@ -80,28 +80,28 @@
new /obj/item/clothing/head/corgi(src)
if(67 to 68)
for(var/i in 1 to rand(4, 7))
var /newitem = pick(subtypesof(/obj/item/weapon/stock_parts) - /obj/item/weapon/stock_parts/subspace)
var /newitem = pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace)
new newitem(src)
if(69 to 70)
for(var/i in 1 to 5)
new /obj/item/weapon/ore/bluespace_crystal(src)
new /obj/item/ore/bluespace_crystal(src)
if(71 to 72)
new /obj/item/weapon/pickaxe/drill(src)
new /obj/item/pickaxe/drill(src)
if(73 to 74)
new /obj/item/weapon/pickaxe/drill/jackhammer(src)
new /obj/item/pickaxe/drill/jackhammer(src)
if(75 to 76)
new /obj/item/weapon/pickaxe/diamond(src)
new /obj/item/pickaxe/diamond(src)
if(77 to 78)
new /obj/item/weapon/pickaxe/drill/diamonddrill(src)
new /obj/item/pickaxe/drill/diamonddrill(src)
if(79 to 80)
new /obj/item/weapon/cane(src)
new /obj/item/cane(src)
new /obj/item/clothing/head/collectable/tophat(src)
if(81 to 82)
new /obj/item/weapon/gun/energy/plasmacutter(src)
new /obj/item/gun/energy/plasmacutter(src)
if(83 to 84)
new /obj/item/toy/katana(src)
if(85 to 86)
new /obj/item/weapon/defibrillator/compact(src)
new /obj/item/defibrillator/compact(src)
if(87) //1% chance
new /obj/item/weed_extract(src)
if(88)
@@ -113,19 +113,19 @@
if(91)
new /obj/item/device/soulstone(src)
if(92)
new /obj/item/weapon/katana(src)
new /obj/item/katana(src)
if(93)
new /obj/item/weapon/dnainjector/xraymut(src)
new /obj/item/dnainjector/xraymut(src)
if(94)
new /obj/item/weapon/storage/backpack/clown(src)
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/clothing/mask/gas/clown_hat(src)
new /obj/item/weapon/bikehorn(src)
new /obj/item/bikehorn(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/weapon/reagent_containers/spray/waterflower(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana(src)
new /obj/item/reagent_containers/spray/waterflower(src)
new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
if(95)
new /obj/item/clothing/under/mime(src)
new /obj/item/clothing/shoes/black(src)
@@ -135,17 +135,17 @@
new /obj/item/clothing/head/beret(src)
new /obj/item/clothing/suit/suspenders(src)
new /obj/item/toy/crayon/mime(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(src)
new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
if(96)
new /obj/item/weapon/hand_tele(src)
new /obj/item/hand_tele(src)
if(97)
new /obj/item/clothing/mask/balaclava
new /obj/item/weapon/gun/projectile/automatic/pistol(src)
new /obj/item/gun/projectile/automatic/pistol(src)
new /obj/item/ammo_box/magazine/m10mm(src)
if(98)
new /obj/item/weapon/katana/cursed(src)
new /obj/item/katana/cursed(src)
if(99)
new /obj/item/weapon/storage/belt/champion(src)
new /obj/item/storage/belt/champion(src)
new /obj/item/clothing/mask/luchador(src)
if(100)
new /obj/item/clothing/head/bearpelt(src)
@@ -174,9 +174,9 @@
/obj/structure/closet/crate/secure/loot/attack_animal(mob/user)
boom(user)
/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W, mob/user)
/obj/structure/closet/crate/secure/loot/attackby(obj/item/W, mob/user)
if(locked)
if(istype(W, /obj/item/weapon/card/emag))
if(istype(W, /obj/item/card/emag))
boom(user)
return 1
if(istype(W, /obj/item/device/multitool))
code/modules/mining/coins.dm
+20 -20
View File
@@ -1,6 +1,6 @@
/*****************************Coin********************************/
/obj/item/weapon/coin
/obj/item/coin
icon = 'icons/obj/items.dmi'
name = "coin"
icon_state = "coin__heads"
@@ -14,7 +14,7 @@
var/cooldown = 0
var/credits = 10
/obj/item/weapon/coin/New()
/obj/item/coin/New()
pixel_x = rand(0,16)-8
pixel_y = rand(0,8)-8
@@ -22,72 +22,72 @@
if(cmineral)
name = "[cmineral] coin"
/obj/item/weapon/coin/gold
/obj/item/coin/gold
cmineral = "gold"
icon_state = "coin_gold_heads"
materials = list(MAT_GOLD = 400)
credits = 160
/obj/item/weapon/coin/silver
/obj/item/coin/silver
cmineral = "silver"
icon_state = "coin_silver_heads"
materials = list(MAT_SILVER = 400)
credits = 40
/obj/item/weapon/coin/diamond
/obj/item/coin/diamond
cmineral = "diamond"
icon_state = "coin_diamond_heads"
materials = list(MAT_DIAMOND = 400)
credits = 120
/obj/item/weapon/coin/iron
/obj/item/coin/iron
cmineral = "iron"
icon_state = "coin_iron_heads"
materials = list(MAT_METAL = 400)
credits = 20
/obj/item/weapon/coin/plasma
/obj/item/coin/plasma
cmineral = "plasma"
icon_state = "coin_plasma_heads"
materials = list(MAT_PLASMA = 400)
credits = 80
/obj/item/weapon/coin/uranium
/obj/item/coin/uranium
cmineral = "uranium"
icon_state = "coin_uranium_heads"
materials = list(MAT_URANIUM = 400)
credits = 160
/obj/item/weapon/coin/clown
/obj/item/coin/clown
cmineral = "bananium"
icon_state = "coin_bananium_heads"
materials = list(MAT_BANANIUM = 400)
credits = 600 //makes the clown cri
/obj/item/weapon/coin/mime
/obj/item/coin/mime
cmineral = "tranquillite"
icon_state = "coin_tranquillite_heads"
materials = list(MAT_TRANQUILLITE = 400)
credits = 600 //makes the mime cri
/obj/item/weapon/coin/adamantine
/obj/item/coin/adamantine
cmineral = "adamantine"
icon_state = "coin_adamantine_heads"
credits = 400
/obj/item/weapon/coin/mythril
/obj/item/coin/mythril
cmineral = "mythril"
icon_state = "coin_mythril_heads"
credits = 400
/obj/item/weapon/coin/twoheaded
/obj/item/coin/twoheaded
cmineral = "iron"
icon_state = "coin_iron_heads"
desc = "Hey, this coin's the same on both sides!"
sideslist = list("heads")
credits = 20
/obj/item/weapon/coin/antagtoken
/obj/item/coin/antagtoken
name = "antag token"
icon_state = "coin_valid_valid"
cmineral = "valid"
@@ -95,10 +95,10 @@
sideslist = list("valid", "salad")
credits = 20
/obj/item/weapon/coin/antagtoken/New()
/obj/item/coin/antagtoken/New()
return
/obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/coin/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/CC = W
if(string_attached)
@@ -113,7 +113,7 @@
to_chat(user, "<span class='warning'>You need one length of cable to attach a string to the coin.</span>")
return
else if(istype(W,/obj/item/weapon/wirecutters))
else if(istype(W,/obj/item/wirecutters))
if(!string_attached)
..()
return
@@ -124,8 +124,8 @@
overlays = list()
string_attached = null
to_chat(user, "<span class='notice'>You detach the string from the coin.</span>")
else if(istype(W,/obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
else if(istype(W,/obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.welding && WT.remove_fuel(0, user))
var/typelist = list("iron" = /obj/item/clothing/gloves/ring,
"silver" = /obj/item/clothing/gloves/ring/silver,
@@ -139,7 +139,7 @@
qdel(src)
else ..()
/obj/item/weapon/coin/attack_self(mob/user as mob)
/obj/item/coin/attack_self(mob/user as mob)
if(cooldown < world.time - 15)
var/coinflip = pick(sideslist)
cooldown = world.time
code/modules/mining/equipment_locker.dm
+87 -87
View File
@@ -14,7 +14,7 @@
var/stk_types = list()
var/stk_amt = list()
var/stack_list[0] //Key: Type. Value: Instance of type.
var/obj/item/weapon/card/id/inserted_id
var/obj/item/card/id/inserted_id
var/points = 0
var/ore_pickup_rate = 15
var/sheet_per_ore = 1
@@ -26,40 +26,40 @@
/obj/machinery/mineral/ore_redemption/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/ore_redemption(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
component_parts += new /obj/item/circuitboard/ore_redemption(null)
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/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
RefreshParts()
/obj/machinery/mineral/ore_redemption/upgraded/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/ore_redemption(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/circuitboard/ore_redemption(null)
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/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
RefreshParts()
/obj/machinery/mineral/ore_redemption/RefreshParts()
var/ore_pickup_rate_temp = 15
var/point_upgrade_temp = 1
var/sheet_per_ore_temp = 1
for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
for(var/obj/item/stock_parts/matter_bin/B in component_parts)
sheet_per_ore_temp = 0.65 + (0.35 * B.rating)
for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
for(var/obj/item/stock_parts/manipulator/M in component_parts)
ore_pickup_rate_temp = 15 * M.rating
for(var/obj/item/weapon/stock_parts/micro_laser/L in component_parts)
for(var/obj/item/stock_parts/micro_laser/L in component_parts)
point_upgrade_temp = 0.65 + (0.35 * L.rating)
ore_pickup_rate = ore_pickup_rate_temp
point_upgrade = point_upgrade_temp
sheet_per_ore = sheet_per_ore_temp
/obj/machinery/mineral/ore_redemption/proc/process_sheet(obj/item/weapon/ore/O)
/obj/machinery/mineral/ore_redemption/proc/process_sheet(obj/item/ore/O)
var/obj/item/stack/sheet/processed_sheet = SmeltMineral(O)
if(processed_sheet)
if(!(processed_sheet in stack_list)) //It's the first of this sheet added
@@ -84,7 +84,7 @@
var/turf/T = get_step(src, input_dir)
var/i = 0
if(T)
for(var/obj/item/weapon/ore/O in T)
for(var/obj/item/ore/O in T)
if(i >= ore_pickup_rate)
break
else if(!O || !O.refined_type)
@@ -95,7 +95,7 @@
else
var/obj/structure/ore_box/B = locate() in T
if(B)
for(var/obj/item/weapon/ore/O in B.contents)
for(var/obj/item/ore/O in B.contents)
if(i >= ore_pickup_rate)
break
else if(!O || !O.refined_type)
@@ -104,14 +104,14 @@
process_sheet(O)
i++
/obj/machinery/mineral/ore_redemption/attackby(var/obj/item/weapon/W, var/mob/user, params)
/obj/machinery/mineral/ore_redemption/attackby(var/obj/item/W, var/mob/user, params)
if(default_deconstruction_screwdriver(user, "ore_redemption-open", "ore_redemption", W))
updateUsrDialog()
return
if(exchange_parts(user, W))
return
if(panel_open)
if(istype(W, /obj/item/weapon/crowbar))
if(istype(W, /obj/item/crowbar))
if(inserted_id)
inserted_id.forceMove(loc) //Prevents deconstructing the ORM from deleting whatever ID was inside it.
empty_content()
@@ -123,11 +123,11 @@
return
if(default_unfasten_wrench(user, W))
return
if(istype(W,/obj/item/weapon/card/id))
if(istype(W,/obj/item/card/id))
if(!powered())
return
else
var/obj/item/weapon/card/id/I = usr.get_active_hand()
var/obj/item/card/id/I = usr.get_active_hand()
if(istype(I) && !istype(inserted_id))
if(!user.drop_item())
return
@@ -137,7 +137,7 @@
return
..()
/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(var/obj/item/weapon/ore/O)
/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(var/obj/item/ore/O)
if(O.refined_type)
var/obj/item/stack/sheet/M = O.refined_type
points += O.points * point_upgrade
@@ -229,7 +229,7 @@
else
to_chat(usr, "<span class='warning'>Required access not found.</span>")
else if(href_list["choice"] == "insert")
var/obj/item/weapon/card/id/I = usr.get_active_hand()
var/obj/item/card/id/I = usr.get_active_hand()
if(istype(I))
if(!usr.drop_item())
return 1
@@ -324,37 +324,37 @@
icon_state = "mining"
density = 1
anchored = 1.0
var/obj/item/weapon/card/id/inserted_id
var/obj/item/card/id/inserted_id
var/list/prize_list = list(
new /datum/data/mining_equipment("Stimpack", /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack, 50),
new /datum/data/mining_equipment("Teporone MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone, 50),
new /datum/data/mining_equipment("MediPen Bundle", /obj/item/weapon/storage/box/autoinjector/utility, 200),
new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100),
new /datum/data/mining_equipment("Stimpack", /obj/item/reagent_containers/hypospray/autoinjector/stimpack, 50),
new /datum/data/mining_equipment("Teporone MediPen", /obj/item/reagent_containers/hypospray/autoinjector/teporone, 50),
new /datum/data/mining_equipment("MediPen Bundle", /obj/item/storage/box/autoinjector/utility, 200),
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/weapon/soap/nanotrasen, 200),
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("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("Hivelord Stabilizer", /obj/item/weapon/hivelordstabilizer, 400),
new /datum/data/mining_equipment("Mining Drone", /obj/item/weapon/mining_drone_cube, 500),
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("Kinetic Crusher", /obj/item/weapon/twohanded/required/mining_hammer, 750),
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/weapon/storage/firstaid/brute, 600),
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("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 750),
new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 800),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1000),
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 belt",/obj/item/weapon/storage/belt/lazarus, 200),
new /datum/data/mining_equipment("Jetpack", /obj/item/weapon/tank/jetpack/carbondioxide/mining, 2000),
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),
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000),
new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 2500),
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000),
new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500),
new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100),
new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250),
@@ -363,7 +363,7 @@
new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
new /datum/data/mining_equipment("KA Cooldown Decrease",/obj/item/borg/upgrade/modkit/cooldown, 1000),
new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500),
new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500),
)
@@ -380,11 +380,11 @@
/obj/machinery/mineral/equipment_vendor/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/mining_equipment_vendor(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/circuitboard/mining_equipment_vendor(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
RefreshParts()
/obj/machinery/mineral/equipment_vendor/power_change()
@@ -437,7 +437,7 @@
inserted_id.verb_pickup()
inserted_id = null
else if(href_list["choice"] == "insert")
var/obj/item/weapon/card/id/I = usr.get_active_hand()
var/obj/item/card/id/I = usr.get_active_hand()
if(istype(I))
if(!usr.drop_item())
return
@@ -461,22 +461,22 @@
updateUsrDialog()
return
if(panel_open)
if(istype(I, /obj/item/weapon/crowbar))
if(istype(I, /obj/item/crowbar))
if(inserted_id)
inserted_id.forceMove(loc) //Prevents deconstructing the ORM from deleting whatever ID was inside it.
default_deconstruction_crowbar(I)
return 1
if(istype(I, /obj/item/weapon/mining_voucher))
if(istype(I, /obj/item/mining_voucher))
if(!powered())
return
else
RedeemVoucher(I, user)
return
if(istype(I,/obj/item/weapon/card/id))
if(istype(I,/obj/item/card/id))
if(!powered())
return
else
var/obj/item/weapon/card/id/C = usr.get_active_hand()
var/obj/item/card/id/C = usr.get_active_hand()
if(istype(C) && !istype(inserted_id))
if(!usr.drop_item())
return
@@ -486,21 +486,21 @@
return
..()
/obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/weapon/mining_voucher/voucher, mob/redeemer)
/obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/mining_voucher/voucher, mob/redeemer)
var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Kinetic Accelerator", "Resonator", "Mining Drone", "Advanced Scanner", "Crusher")
if(!selection || !Adjacent(redeemer) || voucher.loc != redeemer)
return
switch(selection)
if("Kinetic Accelerator")
new /obj/item/weapon/gun/energy/kinetic_accelerator(src.loc)
new /obj/item/gun/energy/kinetic_accelerator(src.loc)
if("Resonator")
new /obj/item/weapon/resonator(src.loc)
new /obj/item/resonator(src.loc)
if("Mining Drone")
new /obj/item/weapon/storage/box/drone_kit(src.loc)
new /obj/item/storage/box/drone_kit(src.loc)
if("Advanced Scanner")
new /obj/item/device/t_scanner/adv_mining_scanner(src.loc)
if("Crusher")
new /obj/item/weapon/twohanded/required/mining_hammer(loc)
new /obj/item/twohanded/required/mining_hammer(loc)
qdel(voucher)
/obj/machinery/mineral/equipment_vendor/ex_act(severity, target)
@@ -514,7 +514,7 @@
/**********************Mining Equipment Voucher**********************/
/obj/item/weapon/mining_voucher
/obj/item/mining_voucher
name = "mining voucher"
desc = "A token to redeem a piece of equipment. Use it on a mining equipment vendor."
icon = 'icons/obj/items.dmi'
@@ -523,16 +523,16 @@
/**********************Mining Point Card**********************/
/obj/item/weapon/card/mining_point_card
/obj/item/card/mining_point_card
name = "mining point card"
desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard."
icon_state = "data"
var/points = 500
/obj/item/weapon/card/mining_point_card/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/card/id))
/obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/card/id))
if(points)
var/obj/item/weapon/card/id/C = I
var/obj/item/card/id/C = I
C.mining_points += points
to_chat(user, "<span class='info'>You transfer [points] points to [C].</span>")
points = 0
@@ -540,7 +540,7 @@
to_chat(user, "<span class='info'>There's no points left on [src].</span>")
..()
/obj/item/weapon/card/mining_point_card/examine(mob/user)
/obj/item/card/mining_point_card/examine(mob/user)
..(user)
to_chat(user, "There's [points] points on the card.")
@@ -607,7 +607,7 @@
/**********************Resonator**********************/
/obj/item/weapon/resonator
/obj/item/resonator
name = "resonator"
icon = 'icons/obj/items.dmi'
icon_state = "resonator"
@@ -622,14 +622,14 @@
var/burst_time = 50
var/fieldlimit = 3
/obj/item/weapon/resonator/upgraded
/obj/item/resonator/upgraded
name = "upgraded resonator"
desc = "An upgraded version of the resonator that can produce more fields at once."
icon_state = "resonator_u"
origin_tech = "materials=4;powerstorage=3;engineering=3;magnets=3"
fieldlimit = 5
/obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator)
/obj/item/resonator/proc/CreateResonance(var/target, var/creator)
var/turf/T = get_turf(target)
if(locate(/obj/effect/resonance) in T)
return
@@ -640,7 +640,7 @@
spawn(burst_time)
fieldsactive--
/obj/item/weapon/resonator/attack_self(mob/user)
/obj/item/resonator/attack_self(mob/user)
if(burst_time == 50)
burst_time = 30
to_chat(user, "<span class='info'>You set the resonator's fields to detonate after 3 seconds.</span>")
@@ -648,7 +648,7 @@
burst_time = 50
to_chat(user, "<span class='info'>You set the resonator's fields to detonate after 5 seconds.</span>")
/obj/item/weapon/resonator/afterattack(atom/target, mob/user, proximity_flag)
/obj/item/resonator/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag)
if(!check_allowed_items(target, 1)) return
CreateResonance(target, user)
@@ -707,7 +707,7 @@
/**********************Mining drone cube**********************/
/obj/item/weapon/mining_drone_cube
/obj/item/mining_drone_cube
name = "mining drone cube"
desc = "Compressed mining drone, ready for deployment. Just press the button to activate!"
w_class = WEIGHT_CLASS_SMALL
@@ -715,7 +715,7 @@
icon_state = "minedronecube"
item_state = "electronic"
/obj/item/weapon/mining_drone_cube/attack_self(mob/user)
/obj/item/mining_drone_cube/attack_self(mob/user)
user.visible_message("<span class='warning'>\The [src] suddenly expands into a fully functional mining drone!</span>", \
"<span class='warning'>You press center button on \the [src]. The device suddenly expands into a fully functional mining drone!</span>")
new /mob/living/simple_animal/hostile/mining_drone(get_turf(src))
@@ -723,22 +723,22 @@
/**********************Mining drone kit**********************/
/obj/item/weapon/storage/box/drone_kit
/obj/item/storage/box/drone_kit
name = "Drone Kit"
desc = "A boxed kit that includes one mining drone cube and a welding tool with an increased capacity."
icon_state = "implant"
max_w_class = WEIGHT_CLASS_NORMAL
storage_slots = 2
can_hold = list(/obj/item/weapon/mining_drone_cube, /obj/item/weapon/weldingtool/hugetank)
can_hold = list(/obj/item/mining_drone_cube, /obj/item/weldingtool/hugetank)
/obj/item/weapon/storage/box/drone_kit/New()
/obj/item/storage/box/drone_kit/New()
..()
new /obj/item/weapon/mining_drone_cube(src)
new /obj/item/weapon/weldingtool/hugetank(src)
new /obj/item/mining_drone_cube(src)
new /obj/item/weldingtool/hugetank(src)
/**********************Lazarus Injector**********************/
/obj/item/weapon/lazarus_injector
/obj/item/lazarus_injector
name = "lazarus injector"
desc = "An injector with a cocktail of nanomachines and chemicals, this device can seemingly raise animals from the dead, making them become friendly to the user. Unfortunately, the process is useless on higher forms of life and incredibly costly, so these were hidden in storage until an executive thought they'd be great motivation for some of their employees."
icon = 'icons/obj/hypo.dmi'
@@ -752,7 +752,7 @@
var/loaded = 1
var/malfunctioning = 0
/obj/item/weapon/lazarus_injector/afterattack(atom/target, mob/user, proximity_flag)
/obj/item/lazarus_injector/afterattack(atom/target, mob/user, proximity_flag)
if(!loaded)
return
if(istype(target, /mob/living) && proximity_flag)
@@ -784,15 +784,15 @@
to_chat(user, "<span class='info'>[src] is only effective on lesser beings.</span>")
return
/obj/item/weapon/lazarus_injector/emag_act()
/obj/item/lazarus_injector/emag_act()
if(!malfunctioning)
malfunctioning = 1
/obj/item/weapon/lazarus_injector/emp_act()
/obj/item/lazarus_injector/emp_act()
if(!malfunctioning)
malfunctioning = 1
/obj/item/weapon/lazarus_injector/examine(mob/user)
/obj/item/lazarus_injector/examine(mob/user)
..(user)
if(!loaded)
to_chat(user, "<span class='info'>[src] is empty.</span>")
@@ -924,7 +924,7 @@
icon_state = "xeno_warning"
/**********************Mining Jetpack**********************/
/obj/item/weapon/tank/jetpack/carbondioxide/mining
/obj/item/tank/jetpack/carbondioxide/mining
name = "mining jetpack"
icon_state = "jetpack-mining"
item_state = "jetpack-mining"
@@ -936,7 +936,7 @@
/*********************Hivelord stabilizer****************/
/obj/item/weapon/hivelordstabilizer
/obj/item/hivelordstabilizer
name = "hivelord stabilizer"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle19"
@@ -944,7 +944,7 @@
w_class = WEIGHT_CLASS_TINY
origin_tech = "biotech=3"
/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/internal/M, mob/user)
/obj/item/hivelordstabilizer/afterattack(obj/item/organ/internal/M, mob/user)
var/obj/item/organ/internal/hivelord_core/C = M
if(!istype(C, /obj/item/organ/internal/hivelord_core))
to_chat(user, "<span class='warning'>The stabilizer only works on hivelord cores.</span>")
@@ -954,7 +954,7 @@
qdel(src)
/*********************Mining Hammer****************/
/obj/item/weapon/twohanded/required/mining_hammer
/obj/item/twohanded/required/mining_hammer
icon = 'icons/obj/mining.dmi'
icon_state = "mining_hammer1"
item_state = "mining_hammer1"
@@ -988,7 +988,7 @@
damage_type = BRUTE
flag = "bomb"
range = 6
var/obj/item/weapon/twohanded/required/mining_hammer/hammer_synced = null
var/obj/item/twohanded/required/mining_hammer/hammer_synced = null
/obj/item/projectile/destabilizer/on_hit(atom/target, blocked = 0, hit_zone)
if(hammer_synced)
@@ -1011,7 +1011,7 @@
M.gets_drilled(firer)
..()
/obj/item/weapon/twohanded/required/mining_hammer/afterattack(atom/target, mob/user, proximity_flag)
/obj/item/twohanded/required/mining_hammer/afterattack(atom/target, mob/user, proximity_flag)
if(!proximity_flag && charged)//Mark a target, or mine a tile.
var/turf/proj_turf = get_turf(src)
if(!istype(proj_turf, /turf))
@@ -1046,7 +1046,7 @@
else
L.apply_damage(50, BRUTE, blocked = def_check)
/obj/item/weapon/twohanded/required/mining_hammer/proc/Recharge()
/obj/item/twohanded/required/mining_hammer/proc/Recharge()
if(!charged)
charged = 1
icon_state = "mining_hammer1"
code/modules/mining/laborcamp/laborshuttle.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle/labor
name = "labor shuttle console"
desc = "Used to call and send the labor camp shuttle."
circuit = /obj/item/weapon/circuitboard/labor_shuttle
circuit = /obj/item/circuitboard/labor_shuttle
shuttleId = "laborcamp"
possible_destinations = "laborcamp_home;laborcamp_away"
req_access = list(access_brig)
@@ -11,7 +11,7 @@
name = "prisoner shuttle console"
desc = "A one-way shuttle console, used to summon the shuttle to the labor camp."
possible_destinations = "laborcamp_away"
circuit = /obj/item/weapon/circuitboard/labor_shuttle/one_way
circuit = /obj/item/circuitboard/labor_shuttle/one_way
req_access = list( )
/obj/machinery/computer/shuttle/labor/one_way/Topic(href, href_list)
code/modules/mining/laborcamp/laborstacker.dm
+6 -6
View File
@@ -9,7 +9,7 @@
anchored = 1
var/obj/machinery/mineral/stacking_machine/laborstacker/machine = null
var/machinedir = SOUTH
var/obj/item/weapon/card/id/prisoner/inserted_id
var/obj/item/card/id/prisoner/inserted_id
var/obj/machinery/door/airlock/release_door
var/door_tag = "prisonshuttle"
var/use_release_door = 0
@@ -62,7 +62,7 @@
/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weapon/card/id))
if(istype(I, /obj/item/card/id))
return attack_hand(user)
..()
@@ -90,7 +90,7 @@
machine.points = 0
to_chat(src, "Points transferred.")
else if(href_list["choice"] == "insert")
var/obj/item/weapon/card/id/prisoner/I = usr.get_active_hand()
var/obj/item/card/id/prisoner/I = usr.get_active_hand()
if(istype(I))
usr.drop_item()
I.loc = src
@@ -166,9 +166,9 @@
user.examine(src)
/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weapon/card/id))
if(istype(I, /obj/item/weapon/card/id/prisoner))
var/obj/item/weapon/card/id/prisoner/prisoner_id = I
if(istype(I, /obj/item/card/id))
if(istype(I, /obj/item/card/id/prisoner))
var/obj/item/card/id/prisoner/prisoner_id = I
to_chat(user, "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>")
to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.points]</span>")
to_chat(user, "<span class='notice'>Point Quota: [prisoner_id.goal]</span>")
code/modules/mining/lavaland/ash_flora.dm
+15 -15
View File
@@ -7,7 +7,7 @@
var/harvested_name = "shortened mushrooms"
var/harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large."
var/needs_sharp_harvest = TRUE
var/harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings
var/harvest = /obj/item/reagent_containers/food/snacks/ash_flora/shavings
var/harvest_amount_low = 1
var/harvest_amount_high = 3
var/harvest_time = 60
@@ -54,7 +54,7 @@
desc = initial(desc)
harvested = FALSE
/obj/structure/flora/ash/attackby(obj/item/weapon/W, mob/user, params)
/obj/structure/flora/ash/attackby(obj/item/W, mob/user, params)
if(!harvested && needs_sharp_harvest && W.sharp)
user.visible_message("<span class='notice'>[user] starts to harvest from [src] with [W].</span>","<span class='notice'>You begin to harvest from [src] with [W].</span>")
if(do_after(user, harvest_time, target = src))
@@ -79,7 +79,7 @@
desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
harvested_name = "leafless mushrooms"
harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?"
harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf
harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_leaf
needs_sharp_harvest = FALSE
harvest_amount_high = 4
harvest_time = 20
@@ -95,7 +95,7 @@
desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
harvested_name = "small mushrooms"
harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms."
harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap
harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_cap
harvest_amount_high = 4
harvest_time = 50
harvest_message_low = "You slice the cap off of a mushroom."
@@ -111,7 +111,7 @@
luminosity = 1
harvested_name = "tiny mushrooms"
harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back."
harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem
harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_stem
harvest_amount_high = 4
harvest_time = 40
harvest_message_low = "You pick and slice the cap off of a mushroom, leaving the stem."
@@ -126,7 +126,7 @@
desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
harvested_name = "cacti"
harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash."
harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit
harvest = /obj/item/reagent_containers/food/snacks/ash_flora/cactus_fruit
needs_sharp_harvest = FALSE
harvest_amount_high = 2
harvest_time = 10
@@ -149,7 +149,7 @@
H.visible_message("<span class='danger'>[H] steps on a cactus!</span>", \
"<span class='userdanger'>You step on a cactus!</span>")
/obj/item/weapon/reagent_containers/food/snacks/ash_flora
/obj/item/reagent_containers/food/snacks/ash_flora
name = "mushroom shavings"
desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
icon = 'icons/obj/lavaland/ash_flora.dmi'
@@ -157,33 +157,33 @@
list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/New()
/obj/item/reagent_containers/food/snacks/ash_flora/New()
..()
pixel_x = rand(-4, 4)
pixel_y = rand(-4, 4)
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings //for actual crafting
/obj/item/reagent_containers/food/snacks/ash_flora/shavings //for actual crafting
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf
/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_leaf
name = "mushroom leaf"
desc = "A leaf, from a mushroom."
list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2)
icon_state = "mushroom_leaf"
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap
/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_cap
name = "mushroom cap"
desc = "The cap of a large mushroom."
list_reagents = list("lsd" = 2, "entpoly" = 4, "psilocybin" = 2)
icon_state = "mushroom_cap"
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem
/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_stem
name = "mushroom stem"
desc = "A long mushroom stem. It's slightly glowing."
list_reagents = list("tinlux" = 2, "vitamin" = 1, "space_drugs" = 1)
icon_state = "mushroom_stem"
luminosity = 1
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit
/obj/item/reagent_containers/food/snacks/ash_flora/cactus_fruit
name = "cactus fruit"
list_reagents = list("vitamin" = 2, "nutriment" = 2, "vitfro" = 4)
desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
@@ -199,7 +199,7 @@
//what you can craft with these things
/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
result = /obj/item/weapon/reagent_containers/food/drinks/mushroom_bowl
reqs = list(/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings = 5)
result = /obj/item/reagent_containers/food/drinks/mushroom_bowl
reqs = list(/obj/item/reagent_containers/food/snacks/ash_flora/shavings = 5)
time = 30
category = CAT_PRIMAL
code/modules/mining/lavaland/loot/ashdragon_loot.dm
+19 -19
View File
@@ -6,18 +6,18 @@
var/loot = rand(1,4)
switch(loot)
if(1)
new /obj/item/weapon/melee/ghost_sword(src)
new /obj/item/melee/ghost_sword(src)
if(2)
new /obj/item/weapon/lava_staff(src)
new /obj/item/lava_staff(src)
if(3)
new /obj/item/weapon/spellbook/oneuse/sacredflame(src)
new /obj/item/weapon/gun/magic/wand/fireball(src)
new /obj/item/spellbook/oneuse/sacredflame(src)
new /obj/item/gun/magic/wand/fireball(src)
if(4)
new /obj/item/weapon/dragons_blood(src)
new /obj/item/dragons_blood(src)
// Spectral Blade
/obj/item/weapon/melee/ghost_sword
/obj/item/melee/ghost_sword
name = "spectral blade"
desc = "A rusted and dulled blade. It doesn't look like it'd do much damage. It glows weakly."
icon_state = "spectral"
@@ -32,13 +32,13 @@
var/summon_cooldown = 0
var/list/mob/dead/observer/spirits
/obj/item/weapon/melee/ghost_sword/New()
/obj/item/melee/ghost_sword/New()
..()
spirits = list()
processing_objects.Add(src)
poi_list |= src
/obj/item/weapon/melee/ghost_sword/Destroy()
/obj/item/melee/ghost_sword/Destroy()
for(var/mob/dead/observer/G in spirits)
G.invisibility = initial(G.invisibility)
spirits.Cut()
@@ -46,7 +46,7 @@
poi_list -= src
. = ..()
/obj/item/weapon/melee/ghost_sword/attack_self(mob/user)
/obj/item/melee/ghost_sword/attack_self(mob/user)
if(summon_cooldown > world.time)
to_chat(user, "You just recently called out for aid. You don't want to annoy the spirits.")
return
@@ -56,16 +56,16 @@
summon_cooldown = world.time + 600
/obj/item/weapon/melee/ghost_sword/Topic(href, href_list)
/obj/item/melee/ghost_sword/Topic(href, href_list)
if(href_list["follow"])
var/mob/dead/observer/ghost = usr
if(istype(ghost))
ghost.ManualFollow(src)
/obj/item/weapon/melee/ghost_sword/process()
/obj/item/melee/ghost_sword/process()
ghost_check()
/obj/item/weapon/melee/ghost_sword/proc/ghost_check()
/obj/item/melee/ghost_sword/proc/ghost_check()
var/ghost_counter = 0
var/turf/T = get_turf(src)
var/list/contents = T.GetAllContents()
@@ -84,7 +84,7 @@
return ghost_counter
/obj/item/weapon/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user)
/obj/item/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user)
force = 0
var/ghost_counter = ghost_check()
@@ -92,7 +92,7 @@
user.visible_message("<span class='danger'>[user] strikes with the force of [ghost_counter] vengeful spirits!</span>")
..()
/obj/item/weapon/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
/obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
var/ghost_counter = ghost_check()
final_block_chance += Clamp((ghost_counter * 5), 0, 75)
owner.visible_message("<span class='danger'>[owner] is protected by a ring of [ghost_counter] ghosts!</span>")
@@ -100,13 +100,13 @@
// Blood
/obj/item/weapon/dragons_blood
/obj/item/dragons_blood
name = "bottle of dragons blood"
desc = "You're not actually going to drink this, are you?"
icon = 'icons/obj/wizard.dmi'
icon_state = "vial"
/obj/item/weapon/dragons_blood/attack_self(mob/living/carbon/human/user)
/obj/item/dragons_blood/attack_self(mob/living/carbon/human/user)
if(!istype(user))
return
@@ -147,7 +147,7 @@
//Lava Staff
/obj/item/weapon/lava_staff
/obj/item/lava_staff
name = "staff of lava"
desc = "The ability to fill the emergency shuttle with lava. What more could you want out of life?"
icon_state = "staffofstorms"
@@ -171,11 +171,11 @@
var/timer = 0
var/banned_turfs
/obj/item/weapon/lava_staff/New()
/obj/item/lava_staff/New()
. = ..()
banned_turfs = typecacheof(list(/turf/space/transit, /turf/unsimulated))
/obj/item/weapon/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
/obj/item/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
..()
if(timer > world.time)
return
code/modules/mining/lavaland/loot/bubblegum_loot.dm
+2 -2
View File
@@ -10,7 +10,7 @@
if(2)
new /obj/item/blood_contract(src)
if(3)
new /obj/item/weapon/gun/magic/staff/spellblade(src)
new /obj/item/gun/magic/staff/spellblade(src)
// Mayhem
@@ -76,6 +76,6 @@
if(H == L)
continue
to_chat(H, "<span class='userdanger'>You have an overwhelming desire to kill [L]. They have been marked red! Go kill them!</span>")
H.put_in_hands(new /obj/item/weapon/kitchen/knife/butcher(H))
H.put_in_hands(new /obj/item/kitchen/knife/butcher(H))
qdel(src)
code/modules/mining/lavaland/loot/colossus_loot.dm
+3 -3
View File
@@ -15,7 +15,7 @@
use_power = 0
var/memory_saved = FALSE
var/list/stored_items = list()
var/static/list/blacklist = typecacheof(list(/obj/item/weapon/spellbook))
var/static/list/blacklist = typecacheof(list(/obj/item/spellbook))
/obj/machinery/smartfridge/black_box/update_icon()
return
@@ -206,7 +206,7 @@
NewTerrainTables = /obj/structure/table/wood
NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush,
/obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/human/monkey,
/obj/item/weapon/gun/projectile/bow, /obj/item/weapon/storage/backpack/quiver/full)
/obj/item/gun/projectile/bow, /obj/item/storage/backpack/quiver/full)
florachance = 20
if("alien") //Beneficial, turns stuff into alien alloy which is useful to cargo and research. Also repairs atmos.
NewTerrainFloors = /turf/simulated/floor/mineral/abductor
@@ -378,7 +378,7 @@
activation_method = "touch"
cooldown_add = 50
activation_sound = 'sound/magic/TIMEPARADOX2.ogg'
var/list/banned_items_typecache = list(/obj/item/weapon/storage, /obj/item/weapon/implant, /obj/item/weapon/implanter, /obj/item/weapon/disk/nuclear, /obj/item/projectile, /obj/item/weapon/spellbook)
var/list/banned_items_typecache = list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear, /obj/item/projectile, /obj/item/spellbook)
/obj/machinery/anomalous_crystal/refresher/New()
..()
code/modules/mining/lavaland/loot/hierophant_loot.dm
+7 -7
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/hierophant_staff
/obj/item/hierophant_staff
name = "Hierophant's staff"
desc = "A large club with intense magic power infused into it."
icon_state = "hierophant_staff"
@@ -19,7 +19,7 @@
var/teleporting = FALSE //if we ARE teleporting
var/friendly_fire_check = FALSE //if the blasts we make will consider our faction against the faction of hit targets
/obj/item/weapon/hierophant_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
/obj/item/hierophant_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
..()
var/turf/T = get_turf(target)
if(!T || timer > world.time)
@@ -47,7 +47,7 @@
else
to_chat(user, "<span class='warning'>That target is out of range!</span>") //too far away
/obj/item/weapon/hierophant_staff/ui_action_click(mob/user, actiontype)
/obj/item/hierophant_staff/ui_action_click(mob/user, actiontype)
if(actiontype == /datum/action/item_action/toggle_unfriendly_fire) //toggle friendly fire...
friendly_fire_check = !friendly_fire_check
to_chat(user, "<span class='warning'>You toggle friendly fire [friendly_fire_check ? "off":"on"]!</span>")
@@ -128,7 +128,7 @@
if(user)
user.update_action_buttons_icon()
/obj/item/weapon/hierophant_staff/proc/teleport_mob(turf/source, mob/M, turf/target, mob/user)
/obj/item/hierophant_staff/proc/teleport_mob(turf/source, mob/M, turf/target, mob/user)
var/turf/turf_to_teleport_to = get_step(target, get_dir(source, M)) //get position relative to caster
if(!turf_to_teleport_to || is_blocked_turf(turf_to_teleport_to))
return
@@ -152,7 +152,7 @@
if(user != M)
add_logs(user, M, "teleported", null, "from ([source.x],[source.y],[source.z])")
/obj/item/weapon/hierophant_staff/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
/obj/item/hierophant_staff/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
if(!T)
return
new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, user)
@@ -164,7 +164,7 @@
spawn(0)
blast_wall(T, d, user)
/obj/item/weapon/hierophant_staff/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long
/obj/item/hierophant_staff/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long
if(!T)
return
var/range = blast_range
@@ -177,7 +177,7 @@
previousturf = J
J = get_step(previousturf, dir)
/obj/item/weapon/hierophant_staff/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target
/obj/item/hierophant_staff/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target
if(!T)
return
new /obj/effect/temp_visual/hierophant/telegraph(T, user)
code/modules/mining/lavaland/loot/legion_loot.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/staff/storm
/obj/item/staff/storm
name = "staff of storms"
desc = "An ancient staff retrieved from the remains of Legion. The wind stirs as you move it."
icon_state = "staffofstorms"
@@ -13,7 +13,7 @@
var/storm_type = /datum/weather/ash_storm
var/storm_cooldown = 0
/obj/item/weapon/staff/storm/attack_self(mob/user)
/obj/item/staff/storm/attack_self(mob/user)
if(storm_cooldown > world.time)
to_chat(user, "<span class='warning'>The staff is still recharging!</span>")
return
code/modules/mining/lavaland/loot/tendril_loot.dm
+10 -10
View File
@@ -1,7 +1,7 @@
//Shared Bag
//Internal
/obj/item/weapon/storage/backpack/shared
/obj/item/storage/backpack/shared
name = "paradox bag"
desc = "Somehow, it's in two places at once."
max_combined_w_class = 60
@@ -14,7 +14,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "cultpack"
slot_flags = SLOT_BACK
var/obj/item/weapon/storage/backpack/shared/bag
var/obj/item/storage/backpack/shared/bag
/obj/item/device/shared_storage/red
name = "paradox bag"
@@ -23,7 +23,7 @@
/obj/item/device/shared_storage/red/New()
..()
if(!bag)
var/obj/item/weapon/storage/backpack/shared/S = new(src)
var/obj/item/storage/backpack/shared/S = new(src)
var/obj/item/device/shared_storage/blue = new(loc)
bag = S
@@ -79,16 +79,16 @@
//Potion of Flight: as we do not have the "Angel" species this currently does not work.
/obj/item/weapon/reagent_containers/glass/bottle/potion
/obj/item/reagent_containers/glass/bottle/potion
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "potionflask"
/obj/item/weapon/reagent_containers/glass/bottle/potion/flight
/obj/item/reagent_containers/glass/bottle/potion/flight
name = "strange elixir"
desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'."
list_reagents = list("flightpotion" = 5)
/obj/item/weapon/reagent_containers/glass/bottle/potion/update_icon()
/obj/item/reagent_containers/glass/bottle/potion/update_icon()
if(reagents.total_volume)
icon_state = "potionflask"
else
@@ -124,7 +124,7 @@
desc = "A boat used for traversing lava."
icon_state = "goliath_boat"
icon = 'icons/obj/lavaland/dragonboat.dmi'
keytype = /obj/item/weapon/oar
keytype = /obj/item/oar
burn_state = LAVA_PROOF | FIRE_PROOF
/obj/vehicle/lavaboat/relaymove(mob/user, direction)
@@ -137,7 +137,7 @@
to_chat(user, "<span class='warning'>Boats don't go on land!</span>")
return 0
/obj/item/weapon/oar
/obj/item/oar
name = "oar"
icon = 'icons/obj/vehicles.dmi'
icon_state = "oar"
@@ -149,7 +149,7 @@
/datum/crafting_recipe/oar
name = "goliath bone oar"
result = /obj/item/weapon/oar
result = /obj/item/oar
reqs = list(/obj/item/stack/sheet/bone = 2)
time = 15
category = CAT_PRIMAL
@@ -284,7 +284,7 @@
//Meat Hook
/obj/item/weapon/gun/magic/hook
/obj/item/gun/magic/hook
name = "meat hook"
desc = "Mid or feed."
ammo_type = /obj/item/ammo_casing/magic/hook
code/modules/mining/lavaland/necropolis_chests.dm
+11 -11
View File
@@ -24,15 +24,15 @@
if(3)
new /obj/item/device/soulstone/anybody(src)
if(4)
new /obj/item/weapon/katana/cursed(src)
new /obj/item/katana/cursed(src)
if(5)
new /obj/item/clothing/glasses/godeye(src)
if(6)
new /obj/item/weapon/pickaxe/diamond(src)
new /obj/item/pickaxe/diamond(src)
if(7)
new /obj/item/clothing/head/culthood(src)
new /obj/item/clothing/suit/hooded/cultrobes(src)
new /obj/item/weapon/bedsheet/cult(src)
new /obj/item/bedsheet/cult(src)
if(8)
new /obj/item/organ/internal/brain/xeno(src)
if(9)
@@ -43,13 +43,13 @@
new /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker(src)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/berserker(src)
if(12)
new /obj/item/weapon/sord(src)
new /obj/item/sord(src)
if(13)
new /obj/item/weapon/nullrod/scythe/talking(src)
new /obj/item/nullrod/scythe/talking(src)
if(14)
new /obj/item/weapon/nullrod/armblade(src)
new /obj/item/nullrod/armblade(src)
if(15)
new /obj/item/weapon/guardiancreator(src)
new /obj/item/guardiancreator(src)
if(16)
new /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs(src)
if(17)
@@ -59,14 +59,14 @@
if(19)
new /obj/item/device/immortality_talisman(src)
if(20)
new /obj/item/weapon/gun/magic/hook(src)
new /obj/item/gun/magic/hook(src)
if(21)
new /obj/item/voodoo(src)
if(22)
new /obj/item/weapon/grenade/clusterbuster/inferno(src)
new /obj/item/grenade/clusterbuster/inferno(src)
if(23)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/hell(src)
new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
new /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor(src)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor(src)
if(24)
new /obj/item/weapon/spellbook/oneuse/summonitem(src)
new /obj/item/spellbook/oneuse/summonitem(src)
code/modules/mining/machine_processing.dm
+11 -11
View File
@@ -385,7 +385,7 @@
ore_mime--
if(selected_titanium == 1)
ore_titanium--
generate_mineral(/obj/item/weapon/ore/slag)
generate_mineral(/obj/item/ore/slag)
on = 0
else
on = 0
@@ -400,43 +400,43 @@
n++
if(n>10)
break
if(istype(O,/obj/item/weapon/ore/iron))
if(istype(O,/obj/item/ore/iron))
ore_iron++;
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/glass))
if(istype(O,/obj/item/ore/glass))
ore_glass++;
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/diamond))
if(istype(O,/obj/item/ore/diamond))
ore_diamond++;
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/plasma))
if(istype(O,/obj/item/ore/plasma))
ore_plasma++
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/gold))
if(istype(O,/obj/item/ore/gold))
ore_gold++
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/silver))
if(istype(O,/obj/item/ore/silver))
ore_silver++
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/uranium))
if(istype(O,/obj/item/ore/uranium))
ore_uranium++
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/bananium))
if(istype(O,/obj/item/ore/bananium))
ore_clown++
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/tranquillite))
if(istype(O,/obj/item/ore/tranquillite))
ore_mime++
O.loc = null
continue
if(istype(O,/obj/item/weapon/ore/titanium))
if(istype(O,/obj/item/ore/titanium))
ore_titanium++
O.loc = null
continue
code/modules/mining/machine_unloading.dm
+1 -1
View File
@@ -16,7 +16,7 @@
if(T)
var/limit
for(var/obj/structure/ore_box/B in T)
for(var/obj/item/weapon/ore/O in B)
for(var/obj/item/ore/O in B)
B.contents -= O
unload_mineral(O)
limit++
code/modules/mining/mine_items.dm
+54 -54
View File
@@ -19,9 +19,9 @@
/obj/structure/closet/wardrobe/miner/New()
..()
contents = list()
new /obj/item/weapon/storage/backpack/duffel(src)
new /obj/item/weapon/storage/backpack/industrial(src)
new /obj/item/weapon/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/duffel(src)
new /obj/item/storage/backpack/industrial(src)
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/clothing/under/rank/miner(src)
new /obj/item/clothing/under/rank/miner(src)
new /obj/item/clothing/under/rank/miner(src)
@@ -44,11 +44,11 @@
/obj/structure/closet/secure_closet/miner/New()
..()
new /obj/item/weapon/shovel(src)
new /obj/item/weapon/pickaxe(src)
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/weapon/storage/bag/ore(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/clothing/glasses/meson(src)
/**********************Shuttle Computer**************************/
@@ -56,7 +56,7 @@
/obj/machinery/computer/shuttle/mining
name = "Mining Shuttle Console"
desc = "Used to call and send the mining shuttle."
circuit = /obj/item/weapon/circuitboard/mining_shuttle
circuit = /obj/item/circuitboard/mining_shuttle
shuttleId = "mining"
possible_destinations = "mining_home;mining_away"
@@ -70,7 +70,7 @@
/*****************************Pickaxe********************************/
/obj/item/weapon/pickaxe
/obj/item/pickaxe
name = "pickaxe"
icon = 'icons/obj/items.dmi'
icon_state = "pickaxe"
@@ -91,10 +91,10 @@
usesound = 'sound/effects/picaxe1.ogg'
toolspeed = 1
/obj/item/weapon/pickaxe/proc/playDigSound()
/obj/item/pickaxe/proc/playDigSound()
playsound(src, pick(digsound),20,1)
/obj/item/weapon/pickaxe/silver
/obj/item/pickaxe/silver
name = "silver-plated pickaxe"
icon_state = "spickaxe"
item_state = "spickaxe"
@@ -103,7 +103,7 @@
desc = "A silver-plated pickaxe that mines slightly faster than standard-issue."
toolspeed = 0.75
/obj/item/weapon/pickaxe/gold
/obj/item/pickaxe/gold
name = "golden pickaxe"
icon_state = "gpickaxe"
item_state = "gpickaxe"
@@ -112,7 +112,7 @@
desc = "A gold-plated pickaxe that mines faster than standard-issue."
toolspeed = 0.6
/obj/item/weapon/pickaxe/diamond
/obj/item/pickaxe/diamond
name = "diamond-tipped pickaxe"
icon_state = "dpickaxe"
item_state = "dpickaxe"
@@ -121,7 +121,7 @@
desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
toolspeed = 0.5
/obj/item/weapon/pickaxe/drill
/obj/item/pickaxe/drill
name = "mining drill"
icon_state = "handdrill"
item_state = "jackhammer"
@@ -133,12 +133,12 @@
desc = "An electric mining drill for the especially scrawny."
toolspeed = 0.5
/obj/item/weapon/pickaxe/drill/cyborg
/obj/item/pickaxe/drill/cyborg
name = "cyborg mining drill"
desc = "An integrated electric mining drill."
flags = NODROP
/obj/item/weapon/pickaxe/drill/diamonddrill
/obj/item/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
icon_state = "diamonddrill"
digspeed = 10
@@ -146,20 +146,20 @@
desc = "Yours is the drill that will pierce the heavens!"
toolspeed = 0.25
/obj/item/weapon/pickaxe/diamonddrill/traitor //Pocket-sized traitor diamond drill.
/obj/item/pickaxe/diamonddrill/traitor //Pocket-sized traitor diamond drill.
name = "supermatter drill"
icon_state = "smdrill"
origin_tech = "materials=6;powerstorage=4;engineering=4;syndicate=3"
desc = "Microscopic supermatter crystals cover the head of this tiny drill."
w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/drill/cyborg/diamond //This is the BORG version!
/obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version!
name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics.
icon_state = "diamonddrill"
digspeed = 10
toolspeed = 0.25
/obj/item/weapon/pickaxe/drill/jackhammer
/obj/item/pickaxe/drill/jackhammer
name = "sonic jackhammer"
icon_state = "jackhammer"
item_state = "jackhammer"
@@ -173,7 +173,7 @@
/*****************************Shovel********************************/
/obj/item/weapon/shovel
/obj/item/shovel
name = "shovel"
desc = "A large tool for digging and moving dirt."
icon = 'icons/obj/items.dmi'
@@ -190,7 +190,7 @@
usesound = 'sound/effects/shovel_dig.ogg'
toolspeed = 1
/obj/item/weapon/shovel/spade
/obj/item/shovel/spade
name = "spade"
desc = "A small tool for digging and moving dirt."
icon_state = "spade"
@@ -276,7 +276,7 @@
requires_power = 0
has_gravity = 1
/obj/item/weapon/survivalcapsule
/obj/item/survivalcapsule
name = "bluespace shelter capsule"
desc = "An emergency shelter stored within a pocket of bluespace."
icon_state = "capsule"
@@ -287,7 +287,7 @@
var/datum/map_template/shelter/template
var/used = FALSE
/obj/item/weapon/survivalcapsule/proc/get_template()
/obj/item/survivalcapsule/proc/get_template()
if(template)
return
template = shelter_templates[template_id]
@@ -295,13 +295,13 @@
log_runtime("Shelter template ([template_id]) not found!", src)
qdel(src)
/obj/item/weapon/survivalcapsule/examine(mob/user)
/obj/item/survivalcapsule/examine(mob/user)
. = ..()
get_template()
to_chat(user, "This capsule has the [template.name] stored.")
to_chat(user, template.description)
/obj/item/weapon/survivalcapsule/attack_self()
/obj/item/survivalcapsule/attack_self()
// Can't grab when capsule is New() because templates aren't loaded then
get_template()
if(used == FALSE)
@@ -332,7 +332,7 @@
new /obj/effect/particle_effect/smoke(get_turf(src))
qdel(src)
/obj/item/weapon/survivalcapsule/luxury
/obj/item/survivalcapsule/luxury
name = "luxury bluespace shelter capsule"
desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace."
origin_tech = "engineering=3;bluespace=4"
@@ -401,13 +401,13 @@
/obj/machinery/sleeper/survival_pod/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/sleeper/survival(null)
var/obj/item/weapon/stock_parts/matter_bin/B = new(null)
component_parts += new /obj/item/circuitboard/sleeper/survival(null)
var/obj/item/stock_parts/matter_bin/B = new(null)
B.rating = initial_bin_rating
component_parts += B
component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -420,8 +420,8 @@
density = 1
pixel_y = -32
/obj/item/device/gps/computer/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
/obj/item/device/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.")
@@ -450,11 +450,11 @@
max_n_of_items = 10
pixel_y = -4
/obj/item/weapon/circuitboard/smartfridge/survival
/obj/item/circuitboard/smartfridge/survival
name = "circuit board (Smartfridge Survival)"
build_path = /obj/machinery/smartfridge/survival_pod
/obj/item/weapon/circuitboard/smartfridge/attackby(obj/item/I, mob/user, params)
/obj/item/circuitboard/smartfridge/attackby(obj/item/I, mob/user, params)
return
/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
@@ -465,17 +465,17 @@
/obj/machinery/smartfridge/survival_pod/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/smartfridge/survival(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
component_parts += new /obj/item/circuitboard/smartfridge/survival(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
RefreshParts()
/obj/machinery/smartfridge/survival_pod/loaded/New()
..()
for(var/i in 1 to 5)
var/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket_weak/W = new(src)
var/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak/W = new(src)
load(W)
if(prob(50))
var/obj/item/weapon/storage/pill_bottle/dice/D = new(src)
var/obj/item/storage/pill_bottle/dice/D = new(src)
load(D)
else
var/obj/item/device/instrument/guitar/G = new(src)
@@ -498,8 +498,8 @@
new buildstacktype(loc, buildstackamount)
qdel(src)
/obj/structure/fans/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
/obj/structure/fans/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 fan.</span>", \
"<span class='notice'>You start to disassemble the fan...</span>", "You hear clanking and banging noises.")
@@ -549,8 +549,8 @@
layer = MOB_LAYER - 0.2
density = 0
/obj/structure/tubes/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
/obj/structure/tubes/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 [src].</span>", \
"<span class='notice'>You start to disassemble [src]...</span>", "You hear clanking and banging noises.")
@@ -564,19 +564,19 @@
icon = 'icons/mob/screen_gen.dmi'
icon_state = "x2"
var/possible = list(/obj/item/ship_in_a_bottle,
/obj/item/weapon/gun/energy/pulse,
/obj/item/weapon/sleeping_carp_scroll,
/obj/item/weapon/shield/changeling,
/obj/item/weapon/lava_staff,
/obj/item/weapon/katana/energy,
/obj/item/weapon/storage/toolbox/green/memetic,
/obj/item/weapon/gun/projectile/automatic/l6_saw,
/obj/item/weapon/gun/magic/staff/chaos,
/obj/item/weapon/gun/magic/staff/spellblade,
/obj/item/weapon/gun/magic/wand/death,
/obj/item/weapon/gun/magic/wand/fireball,
/obj/item/gun/energy/pulse,
/obj/item/sleeping_carp_scroll,
/obj/item/shield/changeling,
/obj/item/lava_staff,
/obj/item/katana/energy,
/obj/item/storage/toolbox/green/memetic,
/obj/item/gun/projectile/automatic/l6_saw,
/obj/item/gun/magic/staff/chaos,
/obj/item/gun/magic/staff/spellblade,
/obj/item/gun/magic/wand/death,
/obj/item/gun/magic/wand/fireball,
/obj/item/stack/telecrystal,
/obj/item/weapon/banhammer)
/obj/item/banhammer)
/obj/item/fakeartefact/New()
. = ..()
code/modules/mining/mine_turfs.dm
+29 -29
View File
@@ -37,7 +37,7 @@ var/global/list/rockTurfEdgeCache = list(
var/next_rock = 0
var/archaeo_overlay = ""
var/excav_overlay = ""
var/obj/item/weapon/last_find
var/obj/item/last_find
var/datum/artifact_find/artifact_find
//end xenaorch vars
@@ -187,7 +187,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/iron
name = "iron deposit"
icon_state = "rock_Iron"
mineralType = /obj/item/weapon/ore/iron
mineralType = /obj/item/ore/iron
mineralName = "Iron"
spreadChance = 20
spread = 1
@@ -195,7 +195,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/uranium
name = "uranium deposit"
mineralType = /obj/item/weapon/ore/uranium
mineralType = /obj/item/ore/uranium
mineralName = "Uranium"
spreadChance = 5
spread = 1
@@ -204,7 +204,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/diamond
name = "diamond deposit"
mineralType = /obj/item/weapon/ore/diamond
mineralType = /obj/item/ore/diamond
mineralName = "Diamond"
spreadChance = 0
spread = 1
@@ -213,7 +213,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/gold
name = "gold deposit"
mineralType = /obj/item/weapon/ore/gold
mineralType = /obj/item/ore/gold
mineralName = "Gold"
spreadChance = 5
spread = 1
@@ -222,7 +222,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/silver
name = "silver deposit"
mineralType = /obj/item/weapon/ore/silver
mineralType = /obj/item/ore/silver
mineralName = "Silver"
spreadChance = 5
spread = 1
@@ -231,7 +231,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/titanium
name = "titanium deposit"
mineralType = /obj/item/weapon/ore/titanium
mineralType = /obj/item/ore/titanium
spreadChance = 5
spread = 1
hidden = 1
@@ -240,7 +240,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/plasma
name = "plasma deposit"
icon_state = "rock_Plasma"
mineralType = /obj/item/weapon/ore/plasma
mineralType = /obj/item/ore/plasma
mineralName = "Plasma"
spreadChance = 8
spread = 1
@@ -250,7 +250,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/clown
name = "bananium deposit"
icon_state = "rock_Clown"
mineralType = /obj/item/weapon/ore/bananium
mineralType = /obj/item/ore/bananium
mineralName = "Bananium"
mineralAmt = 3
spreadChance = 0
@@ -260,7 +260,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/mime
name = "tranquillite deposit"
icon_state = "rock_Mime"
mineralType = /obj/item/weapon/ore/tranquillite
mineralType = /obj/item/ore/tranquillite
mineralAmt = 3
spreadChance = 0
spread = 0
@@ -269,7 +269,7 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/mineral/bscrystal
name = "bluespace crystal deposit"
icon_state = "rock_BScrystal"
mineralType = /obj/item/weapon/ore/bluespace_crystal
mineralType = /obj/item/ore/bluespace_crystal
mineralName = "Bluespace crystal"
mineralAmt = 1
spreadChance = 0
@@ -358,7 +358,7 @@ var/global/list/rockTurfEdgeCache = list(
mineralAmt = 0
explosion(bombturf,1,2,5, adminlog = 0)
if(stage == 2) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
var/obj/item/weapon/twohanded/required/gibtonite/G = new /obj/item/weapon/twohanded/required/gibtonite/(src)
var/obj/item/twohanded/required/gibtonite/G = new /obj/item/twohanded/required/gibtonite/(src)
if(det_time <= 0)
G.quality = 3
G.icon_state = "Gibtonite ore 3"
@@ -374,13 +374,13 @@ var/global/list/rockTurfEdgeCache = list(
////////////////////////////////End Gibtonite
/turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob, params)
/turf/simulated/mineral/attackby(var/obj/item/pickaxe/P as obj, mob/user as mob, params)
if(!user.IsAdvancedToolUser())
to_chat(usr, "<span class='warning'>You don't have the dexterity to do this!</span>")
return
if(istype(P, /obj/item/weapon/pickaxe))
if(istype(P, /obj/item/pickaxe))
var/turf/T = user.loc
if(!( istype(T, /turf) ))
return
@@ -433,14 +433,14 @@ var/global/list/rockTurfEdgeCache = list(
. = ..()
if(istype(AM,/mob/living/carbon/human))
var/mob/living/carbon/human/H = AM
if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
if((istype(H.l_hand,/obj/item/pickaxe)) && (!H.hand))
attackby(H.l_hand,H)
else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
else if((istype(H.r_hand,/obj/item/pickaxe)) && H.hand)
attackby(H.r_hand,H)
else if(istype(AM,/mob/living/silicon/robot))
var/mob/living/silicon/robot/R = AM
if(istype(R.module_active,/obj/item/weapon/pickaxe))
if(istype(R.module_active,/obj/item/pickaxe))
attackby(R.module_active,R)
else if(istype(AM,/obj/mecha))
@@ -479,12 +479,12 @@ var/global/list/rockTurfEdgeCache = list(
src.gets_dug()
return
/turf/simulated/floor/plating/airless/asteroid/attackby(obj/item/weapon/W, mob/user, params)
/turf/simulated/floor/plating/airless/asteroid/attackby(obj/item/W, mob/user, params)
//note that this proc does not call ..()
if(!W || !user)
return 0
if((istype(W, /obj/item/weapon/shovel)))
if((istype(W, /obj/item/shovel)))
var/turf/T = get_turf(user)
if(!istype(T))
return
@@ -499,8 +499,8 @@ var/global/list/rockTurfEdgeCache = list(
gets_dug()
return
if((istype(W, /obj/item/weapon/pickaxe)))
var/obj/item/weapon/pickaxe/P = W
if((istype(W, /obj/item/pickaxe)))
var/obj/item/pickaxe/P = W
var/turf/T = get_turf(user)
if(!istype(T))
return
@@ -516,10 +516,10 @@ var/global/list/rockTurfEdgeCache = list(
gets_dug()
return
if(istype(W,/obj/item/weapon/storage/bag/ore))
var/obj/item/weapon/storage/bag/ore/S = W
if(istype(W,/obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W
if(S.collection_mode == 1)
for(var/obj/item/weapon/ore/O in src.contents)
for(var/obj/item/ore/O in src.contents)
O.attackby(W,user)
return
@@ -532,11 +532,11 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/floor/plating/airless/asteroid/proc/gets_dug()
if(dug)
return
new/obj/item/weapon/ore/glass(src)
new/obj/item/weapon/ore/glass(src)
new/obj/item/weapon/ore/glass(src)
new/obj/item/weapon/ore/glass(src)
new/obj/item/weapon/ore/glass(src)
new/obj/item/ore/glass(src)
new/obj/item/ore/glass(src)
new/obj/item/ore/glass(src)
new/obj/item/ore/glass(src)
new/obj/item/ore/glass(src)
dug = 1
playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
icon_plating = "asteroid_dug"
code/modules/mining/minebot.dm
+9 -9
View File
@@ -36,10 +36,10 @@
projectiletype = /obj/item/projectile/kinetic
projectilesound = 'sound/weapons/Gunshot4.ogg'
speak_emote = list("states")
wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
/obj/item/weapon/ore/plasma, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/iron,
/obj/item/weapon/ore/bananium, /obj/item/weapon/ore/tranquillite, /obj/item/weapon/ore/glass,
/obj/item/weapon/ore/titanium)
wanted_objects = list(/obj/item/ore/diamond, /obj/item/ore/gold, /obj/item/ore/silver,
/obj/item/ore/plasma, /obj/item/ore/uranium, /obj/item/ore/iron,
/obj/item/ore/bananium, /obj/item/ore/tranquillite, /obj/item/ore/glass,
/obj/item/ore/titanium)
healable = 0
var/mode = MINEDRONE_COLLECT
var/light_on = 0
@@ -73,8 +73,8 @@
check_friendly_fire = 0
/mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(istype(I, /obj/item/weldingtool))
var/obj/item/weldingtool/W = I
if(W.welding && !stat)
if(AIStatus != AI_OFF && AIStatus != AI_IDLE)
to_chat(user, "<span class='info'>[src] is moving around too much to repair!</span>")
@@ -133,13 +133,13 @@
to_chat(src, "<span class='info'>You are set to attack mode. You can now attack from range.</span>")
/mob/living/simple_animal/hostile/mining_drone/AttackingTarget()
if(istype(target, /obj/item/weapon/ore) && mode == MINEDRONE_COLLECT)
if(istype(target, /obj/item/ore) && mode == MINEDRONE_COLLECT)
CollectOre()
return
..()
/mob/living/simple_animal/hostile/mining_drone/proc/CollectOre()
var/obj/item/weapon/ore/O
var/obj/item/ore/O
for(O in src.loc)
O.forceMove(src)
for(var/dir in alldirs)
@@ -155,7 +155,7 @@
return
if(message)
to_chat(src, "<span class='notice'>You dump your stored ore.</span>")
for(var/obj/item/weapon/ore/O in contents)
for(var/obj/item/ore/O in contents)
contents -= O
O.forceMove(loc)
return
code/modules/mining/mint.dm
+10 -10
View File
@@ -130,7 +130,7 @@
switch(chosen)
if("metal")
while(amt_iron > 0 && coinsToProduce > 0)
create_coins(/obj/item/weapon/coin/iron)
create_coins(/obj/item/coin/iron)
amt_iron -= 20
coinsToProduce--
newCoins++
@@ -138,7 +138,7 @@
sleep(5)
if("gold")
while(amt_gold > 0 && coinsToProduce > 0)
create_coins(/obj/item/weapon/coin/gold)
create_coins(/obj/item/coin/gold)
amt_gold -= 20
coinsToProduce--
newCoins++
@@ -146,7 +146,7 @@
sleep(5)
if("silver")
while(amt_silver > 0 && coinsToProduce > 0)
create_coins(/obj/item/weapon/coin/silver)
create_coins(/obj/item/coin/silver)
amt_silver -= 20
coinsToProduce--
newCoins++
@@ -154,7 +154,7 @@
sleep(5)
if("diamond")
while(amt_diamond > 0 && coinsToProduce > 0)
create_coins(/obj/item/weapon/coin/diamond)
create_coins(/obj/item/coin/diamond)
amt_diamond -= 20
coinsToProduce--
newCoins++
@@ -162,7 +162,7 @@
sleep(5)
if("plasma")
while(amt_plasma > 0 && coinsToProduce > 0)
create_coins(/obj/item/weapon/coin/plasma)
create_coins(/obj/item/coin/plasma)
amt_plasma -= 20
coinsToProduce--
newCoins++
@@ -170,7 +170,7 @@
sleep(5)
if("uranium")
while(amt_uranium > 0 && coinsToProduce > 0)
create_coins(/obj/item/weapon/coin/uranium)
create_coins(/obj/item/coin/uranium)
amt_uranium -= 20
coinsToProduce--
newCoins++
@@ -178,7 +178,7 @@
sleep(5)
if("clown")
while(amt_clown > 0 && coinsToProduce > 0)
create_coins(/obj/item/weapon/coin/clown)
create_coins(/obj/item/coin/clown)
amt_clown -= 20
coinsToProduce--
newCoins++
@@ -186,7 +186,7 @@
sleep(5)
if("mime")
while(amt_mime > 0 && coinsToProduce > 0)
create_coins(/obj/item/weapon/coin/mime)
create_coins(/obj/item/coin/mime)
amt_mime -= 20
coinsToProduce--
newCoins++
@@ -202,8 +202,8 @@
var/turf/T = get_step(src,output_dir)
if(T)
var/obj/item/O = new P(src)
var/obj/item/weapon/moneybag/M = locate(/obj/item/weapon/moneybag/, T)
var/obj/item/moneybag/M = locate(/obj/item/moneybag/, T)
if(!M)
M = new /obj/item/weapon/moneybag(src)
M = new /obj/item/moneybag(src)
unload_mineral(M)
O.loc = M
code/modules/mining/money_bag.dm
+37 -37
View File
@@ -1,6 +1,6 @@
/*****************************Money bag********************************/
/obj/item/weapon/moneybag
/obj/item/moneybag
icon = 'icons/obj/storage.dmi'
name = "Money bag"
icon_state = "moneybag"
@@ -11,7 +11,7 @@
burntime = 20
w_class = WEIGHT_CLASS_BULKY
/obj/item/weapon/moneybag/attack_hand(user as mob)
/obj/item/moneybag/attack_hand(user as mob)
var/amt_gold = 0
var/amt_silver = 0
var/amt_diamond = 0
@@ -22,24 +22,24 @@
var/amt_mime = 0
var/amt_adamantine = 0
for(var/obj/item/weapon/coin/C in contents)
if(istype(C,/obj/item/weapon/coin/diamond))
for(var/obj/item/coin/C in contents)
if(istype(C,/obj/item/coin/diamond))
amt_diamond++
if(istype(C,/obj/item/weapon/coin/plasma))
if(istype(C,/obj/item/coin/plasma))
amt_plasma++
if(istype(C,/obj/item/weapon/coin/iron))
if(istype(C,/obj/item/coin/iron))
amt_iron++
if(istype(C,/obj/item/weapon/coin/silver))
if(istype(C,/obj/item/coin/silver))
amt_silver++
if(istype(C,/obj/item/weapon/coin/gold))
if(istype(C,/obj/item/coin/gold))
amt_gold++
if(istype(C,/obj/item/weapon/coin/uranium))
if(istype(C,/obj/item/coin/uranium))
amt_uranium++
if(istype(C,/obj/item/weapon/coin/clown))
if(istype(C,/obj/item/coin/clown))
amt_clown++
if(istype(C,/obj/item/weapon/coin/mime))
if(istype(C,/obj/item/coin/mime))
amt_mime++
if(istype(C,/obj/item/weapon/coin/adamantine))
if(istype(C,/obj/item/coin/adamantine))
amt_adamantine++
var/dat = text("<b>The contents of the moneybag reveal...</b><br>")
@@ -63,60 +63,60 @@
dat += text("Adamantine coins: [amt_adamantine] <A href='?src=[UID()];remove=adamantine'>Remove one</A><br>")
user << browse("[dat]", "window=moneybag")
/obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/moneybag/attackby(obj/item/W as obj, mob/user as mob, params)
..()
if(istype(W, /obj/item/weapon/coin))
var/obj/item/weapon/coin/C = W
if(istype(W, /obj/item/coin))
var/obj/item/coin/C = W
if(!user.drop_item())
return
to_chat(user, "<span class='notice'>You add the [C.name] into the bag.</span>")
contents += C
if(istype(W, /obj/item/weapon/moneybag))
var/obj/item/weapon/moneybag/C = W
if(istype(W, /obj/item/moneybag))
var/obj/item/moneybag/C = W
for(var/obj/O in C.contents)
contents += O;
to_chat(user, "<span class='notice'>You empty the [C.name] into the bag.</span>")
return
/obj/item/weapon/moneybag/Topic(href, href_list)
/obj/item/moneybag/Topic(href, href_list)
if(..())
return
usr.set_machine(src)
src.add_fingerprint(usr)
if(href_list["remove"])
var/obj/item/weapon/coin/COIN
var/obj/item/coin/COIN
switch(href_list["remove"])
if("gold")
COIN = locate(/obj/item/weapon/coin/gold,src.contents)
COIN = locate(/obj/item/coin/gold,src.contents)
if("silver")
COIN = locate(/obj/item/weapon/coin/silver,src.contents)
COIN = locate(/obj/item/coin/silver,src.contents)
if("iron")
COIN = locate(/obj/item/weapon/coin/iron,src.contents)
COIN = locate(/obj/item/coin/iron,src.contents)
if("diamond")
COIN = locate(/obj/item/weapon/coin/diamond,src.contents)
COIN = locate(/obj/item/coin/diamond,src.contents)
if("plasma")
COIN = locate(/obj/item/weapon/coin/plasma,src.contents)
COIN = locate(/obj/item/coin/plasma,src.contents)
if("uranium")
COIN = locate(/obj/item/weapon/coin/uranium,src.contents)
COIN = locate(/obj/item/coin/uranium,src.contents)
if("clown")
COIN = locate(/obj/item/weapon/coin/clown,src.contents)
COIN = locate(/obj/item/coin/clown,src.contents)
if("mime")
COIN = locate(/obj/item/weapon/coin/mime,src.contents)
COIN = locate(/obj/item/coin/mime,src.contents)
if("adamantine")
COIN = locate(/obj/item/weapon/coin/adamantine,src.contents)
COIN = locate(/obj/item/coin/adamantine,src.contents)
if(!COIN)
return
COIN.loc = src.loc
return
/obj/item/weapon/moneybag/vault
/obj/item/moneybag/vault
/obj/item/weapon/moneybag/vault/New()
/obj/item/moneybag/vault/New()
..()
new /obj/item/weapon/coin/silver(src)
new /obj/item/weapon/coin/silver(src)
new /obj/item/weapon/coin/silver(src)
new /obj/item/weapon/coin/silver(src)
new /obj/item/weapon/coin/gold(src)
new /obj/item/weapon/coin/gold(src)
new /obj/item/weapon/coin/adamantine(src)
new /obj/item/coin/silver(src)
new /obj/item/coin/silver(src)
new /obj/item/coin/silver(src)
new /obj/item/coin/silver(src)
new /obj/item/coin/gold(src)
new /obj/item/coin/gold(src)
new /obj/item/coin/adamantine(src)
code/modules/mining/ore.dm
+37 -37
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/ore
/obj/item/ore
name = "rock"
icon = 'icons/obj/mining.dmi'
icon_state = "ore"
@@ -6,9 +6,9 @@
var/refined_type = null //What this ore defaults to being refined into
var/datum/geosample/geologic_data
/obj/item/weapon/ore/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
/obj/item/ore/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weldingtool))
var/obj/item/weldingtool/W = I
if(W.remove_fuel(15) && refined_type)
new refined_type(get_turf(src.loc))
qdel(src)
@@ -16,21 +16,21 @@
to_chat(user, "<span class='info'>Not enough fuel to smelt [src].</span>")
..()
/obj/item/weapon/ore/Crossed(AM as mob|obj)
var/obj/item/weapon/storage/bag/ore/OB
/obj/item/ore/Crossed(AM as mob|obj)
var/obj/item/storage/bag/ore/OB
var/turf/simulated/floor/F = get_turf(src)
if(loc != F)
return ..()
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
for(var/thing in H.get_body_slots())
if(istype(thing, /obj/item/weapon/storage/bag/ore))
if(istype(thing, /obj/item/storage/bag/ore))
OB = thing
break
else if(isrobot(AM))
var/mob/living/silicon/robot/R = AM
for(var/thing in R.get_all_slots())
if(istype(thing, /obj/item/weapon/storage/bag/ore))
if(istype(thing, /obj/item/storage/bag/ore))
OB = thing
break
if(OB && istype(F, /turf/simulated/floor/plating/airless/asteroid))
@@ -39,7 +39,7 @@
/obj/item/weapon/ore/uranium
/obj/item/ore/uranium
name = "uranium ore"
icon_state = "Uranium ore"
origin_tech = "materials=5"
@@ -47,7 +47,7 @@
refined_type = /obj/item/stack/sheet/mineral/uranium
materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/iron
/obj/item/ore/iron
name = "iron ore"
icon_state = "Iron ore"
origin_tech = "materials=1"
@@ -55,7 +55,7 @@
refined_type = /obj/item/stack/sheet/metal
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/glass
/obj/item/ore/glass
name = "sand pile"
icon_state = "Glass ore"
origin_tech = "materials=1"
@@ -63,14 +63,14 @@
refined_type = /obj/item/stack/sheet/glass
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/glass/basalt
/obj/item/ore/glass/basalt
name = "volcanic ash"
icon_state = "volcanic_sand"
/obj/item/weapon/ore/glass/attack_self(mob/living/user as mob)
/obj/item/ore/glass/attack_self(mob/living/user as mob)
to_chat(user, "<span class='notice'>You use the sand to make sandstone.</span>")
var/sandAmt = 1
for(var/obj/item/weapon/ore/glass/G in user.loc) // The sand on the floor
for(var/obj/item/ore/glass/G in user.loc) // The sand on the floor
sandAmt += 1
qdel(G)
while(sandAmt > 0)
@@ -86,7 +86,7 @@
qdel(src)
return
/obj/item/weapon/ore/plasma
/obj/item/ore/plasma
name = "plasma ore"
icon_state = "Plasma ore"
origin_tech = "plasmatech=2;materials=2"
@@ -94,15 +94,15 @@
refined_type = /obj/item/stack/sheet/mineral/plasma
materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/plasma/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
/obj/item/ore/plasma/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weldingtool))
var/obj/item/weldingtool/W = I
if(W.welding)
to_chat(user, "<span class='warning'>You can't hit a high enough temperature to smelt [src] properly!</span>")
else
..()
/obj/item/weapon/ore/silver
/obj/item/ore/silver
name = "silver ore"
icon_state = "Silver ore"
origin_tech = "materials=3"
@@ -110,7 +110,7 @@
refined_type = /obj/item/stack/sheet/mineral/silver
materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/gold
/obj/item/ore/gold
name = "gold ore"
icon_state = "Gold ore"
origin_tech = "materials=4"
@@ -118,7 +118,7 @@
refined_type = /obj/item/stack/sheet/mineral/gold
materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/diamond
/obj/item/ore/diamond
name = "diamond ore"
icon_state = "Diamond ore"
origin_tech = "materials=6"
@@ -126,7 +126,7 @@
refined_type = /obj/item/stack/sheet/mineral/diamond
materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/bananium
/obj/item/ore/bananium
name = "bananium ore"
icon_state = "Clown ore"
origin_tech = "materials=4"
@@ -134,7 +134,7 @@
refined_type = /obj/item/stack/sheet/mineral/bananium
materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/tranquillite
/obj/item/ore/tranquillite
name = "tranquillite ore"
icon_state = "Mime ore"
origin_tech = "materials=4"
@@ -142,19 +142,19 @@
refined_type = /obj/item/stack/sheet/mineral/tranquillite
materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/titanium
/obj/item/ore/titanium
name = "titanium ore"
icon_state = "Titanium ore"
points = 50
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/titanium
/obj/item/weapon/ore/slag
/obj/item/ore/slag
name = "slag"
desc = "Completely useless"
icon_state = "slag"
/obj/item/weapon/twohanded/required/gibtonite
/obj/item/twohanded/required/gibtonite
name = "gibtonite ore"
desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under space law."
icon = 'icons/obj/mining.dmi'
@@ -169,11 +169,11 @@
var/attacher = "UNKNOWN"
var/datum/wires/explosive/gibtonite/wires
/obj/item/weapon/twohanded/required/gibtonite/Destroy()
/obj/item/twohanded/required/gibtonite/Destroy()
QDEL_NULL(wires)
return ..()
/obj/item/weapon/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params)
/obj/item/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params)
if(!wires && istype(I, /obj/item/device/assembly/igniter))
user.visible_message("[user] attaches [I] to [src].", "<span class='notice'>You attach [I] to [src].</span>")
wires = new(src)
@@ -183,11 +183,11 @@
return
if(wires && !primed)
if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler))
if(istype(I, /obj/item/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler))
wires.Interact(user)
return
if(istype(I, /obj/item/weapon/pickaxe) || istype(I, /obj/item/weapon/resonator) || I.force >= 10)
if(istype(I, /obj/item/pickaxe) || istype(I, /obj/item/resonator) || I.force >= 10)
GibtoniteReaction(user)
return
if(primed)
@@ -199,24 +199,24 @@
return
..()
/obj/item/weapon/twohanded/required/gibtonite/attack_ghost(mob/user)
/obj/item/twohanded/required/gibtonite/attack_ghost(mob/user)
if(wires)
wires.Interact(user)
/obj/item/weapon/twohanded/required/gibtonite/attack_self(mob/user)
/obj/item/twohanded/required/gibtonite/attack_self(mob/user)
if(wires)
wires.Interact(user)
else
..()
/obj/item/weapon/twohanded/required/gibtonite/bullet_act(var/obj/item/projectile/P)
/obj/item/twohanded/required/gibtonite/bullet_act(var/obj/item/projectile/P)
GibtoniteReaction(P.firer)
..()
/obj/item/weapon/twohanded/required/gibtonite/ex_act()
/obj/item/twohanded/required/gibtonite/ex_act()
GibtoniteReaction(null, 1)
/obj/item/weapon/twohanded/required/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0)
/obj/item/twohanded/required/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0)
if(!primed)
playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
primed = 1
@@ -251,11 +251,11 @@
explosion(src.loc,-1,1,3,adminlog = notify_admins)
qdel(src)
/obj/item/weapon/ore/New()
/obj/item/ore/New()
pixel_x = rand(0,16)-8
pixel_y = rand(0,8)-8
if(is_mining_level(src.z))
score_oremined++ //When ore spawns, increment score. Only include ore spawned on mining asteroid (No Clown Planet)
/obj/item/weapon/ore/ex_act()
/obj/item/ore/ex_act()
return
code/modules/mining/satchel_ore_boxdm.dm
+19 -19
View File
@@ -9,18 +9,18 @@
density = 1
pressure_resistance = 5*ONE_ATMOSPHERE
/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/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))
attack_hand(user)
return
if(istype(W, /obj/item/weapon/ore))
if(istype(W, /obj/item/ore))
if(!user.drop_item())
return
W.loc = src
if(istype(W, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = W
if(istype(W, /obj/item/storage))
var/obj/item/storage/S = W
S.hide_from(usr)
for(var/obj/item/weapon/ore/O in S.contents)
for(var/obj/item/ore/O in S.contents)
S.remove_from_storage(O, src) //This will move the item to this item's contents
to_chat(user, "<span class='notice'>You empty the satchel into the box.</span>")
return
@@ -38,28 +38,28 @@
var/amt_mime = 0
var/amt_bluespace = 0
for(var/obj/item/weapon/ore/C in contents)
if(istype(C,/obj/item/weapon/ore/diamond))
for(var/obj/item/ore/C in contents)
if(istype(C,/obj/item/ore/diamond))
amt_diamond++
if(istype(C,/obj/item/weapon/ore/glass))
if(istype(C,/obj/item/ore/glass))
amt_glass++
if(istype(C,/obj/item/weapon/ore/plasma))
if(istype(C,/obj/item/ore/plasma))
amt_plasma++
if(istype(C,/obj/item/weapon/ore/iron))
if(istype(C,/obj/item/ore/iron))
amt_iron++
if(istype(C,/obj/item/weapon/ore/silver))
if(istype(C,/obj/item/ore/silver))
amt_silver++
if(istype(C,/obj/item/weapon/ore/gold))
if(istype(C,/obj/item/ore/gold))
amt_gold++
if(istype(C,/obj/item/weapon/ore/uranium))
if(istype(C,/obj/item/ore/uranium))
amt_uranium++
if(istype(C,/obj/item/weapon/ore/bananium))
if(istype(C,/obj/item/ore/bananium))
amt_clown++
if(istype(C,/obj/item/weapon/ore/tranquillite))
if(istype(C,/obj/item/ore/tranquillite))
amt_mime++
if(istype(C, /obj/item/weapon/ore/titanium))
if(istype(C, /obj/item/ore/titanium))
amt_titanium++
if(istype(C,/obj/item/weapon/ore/bluespace_crystal))
if(istype(C,/obj/item/ore/bluespace_crystal))
amt_bluespace++
var/dat = text("<b>The contents of the ore box reveal...</b><br>")
@@ -98,7 +98,7 @@
usr.set_machine(src)
src.add_fingerprint(usr)
if(href_list["removeall"])
for(var/obj/item/weapon/ore/O in contents)
for(var/obj/item/ore/O in contents)
contents -= O
O.loc = src.loc
to_chat(usr, "<span class='notice'>You empty the box.</span>")
@@ -132,7 +132,7 @@ obj/structure/ore_box/ex_act(severity, target)
to_chat(usr, "<span class='warning'>The ore box is empty.</span>")
return
for(var/obj/item/weapon/ore/O in contents)
for(var/obj/item/ore/O in contents)
contents -= O
O.loc = src.loc
to_chat(usr, "<span class='notice'>You empty the ore box.</span>")