mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-21 15:42:35 +00:00
Tidies up Mine Drones and Gifts (#3930)
This commit is contained in:
LordFowl
Lohikar
@@ -332,14 +332,14 @@ var/const/NO_EMAG_ACT = -50
|
||||
access = get_all_station_access() + access_synth
|
||||
..()
|
||||
|
||||
/obj/item/weapon/card/id/synthetic/minedrone
|
||||
/obj/item/weapon/card/id/minedrone
|
||||
name = "\improper Minedrone ID"
|
||||
desc = "Access module for NanoTrasen Minedrones"
|
||||
icon_state = "id-robot"
|
||||
item_state = "tdgreen"
|
||||
assignment = "Minedrone"
|
||||
|
||||
/obj/item/weapon/card/id/synthetic/minedrone/New()
|
||||
/obj/item/weapon/card/id/minedrone/New()
|
||||
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station)
|
||||
..()
|
||||
|
||||
|
||||
@@ -202,12 +202,16 @@
|
||||
|
||||
/obj/item/weapon/xmasgift/New()
|
||||
..()
|
||||
var/gift_benefactor = pick("John Rolf","Isaac Bureaurgard","David Montrello","Sarah Karpac","Camille Rodgers","Luke Lawrence","Goliath Grills","Torbjorn","Odin","Jesus DeSanto","Santa Claus","Ms. Claus","Mr. Claus","Bjorn","Frodo","Gandalf","Elrond",
|
||||
"Robert Heinlen","Martin Fresco","Lawrence Chamberlain","Buster Kilrain","Nerevar","Neville Trouserkepling","Adam Sortings","Eve's Grocers","Father Christmas","Adolph Romkippler","Adolf Strange","Camille","Maximilian von Biesel","Max","Bob Wallace",
|
||||
"The Grinch","Cicilia Simon","John F. Kennedy","Joseph Dorn","Mendell City","Ta<54>Akaix<69>Scay<61>extiih<69>aur Zo<5A>ra","Ta'Akaix'Vaur'skiyet'sca Zo'ra","Miranda Trasen","Jiub","The Biesellian National Guard","The ERT","Baal D. Griffon","Hephaestus Industries","The Sol Alliance (Sorry about the blockade!")
|
||||
var/gift_benefactor = pick("the NanoTrasen Department of Christmas Affairs", "Miranda Trasen", "Joseph Dorne", "Isaac Asimov", "Baal D. Griffon", "the Sol Alliance (Sorry about the blockade!)",
|
||||
"Hephaestus Industries", "Idris Incorporated", "Glorsh Omega II", "the Jargon Federation", "the People's Republic of Adhomai", "the Adhomai Liberation Army", "the Izweski Hegemony",
|
||||
"the Zo'ra Hive","the Frontier Alliance", "Digital Dingo", "Optimum Jeffrey", "Lemmy and the Clockworks", "President Hadii", "King Azunja","Supreme Commander Nated'Hakhan",
|
||||
"Lord-Regent Not'zar","Jesus Christ","Santa Claus","Mrs. Claus","Sandy Claws","Buddha","Gary","Jesus Christ!","the True Queen of Biesel, God-Lady Seon-rin von Illdenberg, First of Her Name",
|
||||
"Admiral Frost","Pirate King Frost", "The Secret NanoTrasen Cabal of Duty Officers", "The Society for the Preservation of Mice", "Officer Beepsky","Lieutenant Columbo","B.O.B","Runtime",
|
||||
"Bones","Chauncey","Ian","Pun Pun","Nup Nup","Waldo","Odlaw","Crew of the NSS Exodus", "Custodial Staff of the NTCC Odin","ERT Phoenix","grey slime (357)","Bob the Blob","People for the Ethical Treatment of Bluespace Bears",
|
||||
"Mr. Clown and Mrs. Mime from New Puerto Rico","the Grinch","the Krampus","Satan","Mega-Satan","<span class='danger'>\[BENEFACTOR REDACTED]\</span>","Bluespace Cat","Union of Bluespace Technicians Tau Ceti","Robo Mickey Mouse")
|
||||
var/pick_emotion = pick("love","platonic admiration","approval","love (not in a sexual way or anything, though)","apathy", "schadenfreude","love","God's blessing","Santa's blessing","Non-demoninational deity's blessing","love","compassion","appreciation",
|
||||
"respect","begrudging respect","love")
|
||||
desc = "To: The [station_name()]<BR>From: <i>[gift_benefactor], with [pick_emotion]</i>"
|
||||
desc = "To: <i>The [station_name()]</i><BR>From: <i>[gift_benefactor], with [pick_emotion]</i>"
|
||||
|
||||
return
|
||||
|
||||
@@ -217,12 +221,17 @@
|
||||
|
||||
/obj/item/weapon/xmasgift/small/attack_self(mob/M as mob)
|
||||
var/gift_type = pick(
|
||||
/obj/random/action_figure,
|
||||
/obj/random/coin,
|
||||
/obj/random/spacecash,
|
||||
/obj/random/glowstick,
|
||||
/obj/item/weapon/storage/wallet,
|
||||
/obj/item/weapon/storage/photo_album,
|
||||
/obj/item/weapon/storage/box/snappops,
|
||||
/obj/item/weapon/storage/fancy/crayons,
|
||||
/obj/item/weapon/soap/deluxe,
|
||||
/obj/item/weapon/pen/invisible,
|
||||
/obj/item/clothing/gloves/watch,
|
||||
/obj/item/weapon/lipstick/random,
|
||||
/obj/item/weapon/corncob,
|
||||
/obj/item/weapon/bikehorn,
|
||||
@@ -242,9 +251,7 @@
|
||||
/obj/item/toy/prize/seraph,
|
||||
/obj/item/device/paicard,
|
||||
/obj/item/clothing/accessory/horrible,
|
||||
/obj/item/weapon/coin/silver,
|
||||
/obj/item/device/camera,
|
||||
/obj/item/weapon/coin/gold,
|
||||
/obj/item/bluespace_crystal,
|
||||
/obj/item/weapon/flame/lighter/zippo,
|
||||
/obj/item/device/taperecorder,
|
||||
@@ -265,7 +272,22 @@
|
||||
/obj/item/trash/koisbar,
|
||||
/obj/item/weapon/xmasgift/medium,
|
||||
/obj/item/toy/syndicateballoon,
|
||||
/obj/item/toy/xmastree)
|
||||
/obj/item/toy/xmastree,
|
||||
/obj/item/clothing/accessory/medal/gold/heroism,
|
||||
/obj/item/clothing/accessory/medal/nobel_science,
|
||||
/obj/item/clothing/accessory/medal/bronze_heart,
|
||||
/obj/item/clothing/accessory/medal/silver/valor,
|
||||
/obj/item/bluespace_crystal,
|
||||
/obj/random/junk,
|
||||
/obj/item/weapon/gun/energy/mousegun,
|
||||
/obj/item/weapon/gun/energy/wand/toy,
|
||||
/obj/item/weapon/mirror,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/stamp/clown,
|
||||
/obj/item/organ/heart/skrell,
|
||||
/obj/item/latexballon)
|
||||
|
||||
var/atom/movable/I = new gift_type(M)
|
||||
M.remove_from_mob(src)
|
||||
@@ -282,6 +304,7 @@
|
||||
/obj/item/weapon/xmasgift/medium/attack_self(mob/M as mob)
|
||||
var/gift_type = pick(
|
||||
/obj/item/weapon/sord,
|
||||
/obj/random/booze,
|
||||
/obj/item/weapon/storage/belt/champion,
|
||||
/obj/item/weapon/pickaxe/silver,
|
||||
/obj/item/weapon/grenade/smokebomb,
|
||||
@@ -312,7 +335,27 @@
|
||||
/obj/item/weapon/xmasgift/small,
|
||||
/obj/item/weapon/tank/jetpack/void,
|
||||
/obj/item/weapon/xmasgift/large,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/pudding)
|
||||
/obj/item/weapon/reagent_containers/food/snacks/pudding,
|
||||
/obj/item/weapon/contraband/poster,
|
||||
/obj/item/clothing/head/hardhat/red/atmos,
|
||||
/mob/living/bot/cleanbot,
|
||||
/obj/item/vaurca/box,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/device/camera,
|
||||
/obj/item/device/gps,
|
||||
/obj/item/device/uv_light,
|
||||
/obj/random/loot,
|
||||
/obj/random/contraband,
|
||||
/obj/item/weapon/autochisel,
|
||||
/obj/item/weapon/melee/vaurca/rock,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/phone,
|
||||
/obj/item/device/dociler,
|
||||
/obj/item/device/flashlight/maglight,
|
||||
/obj/item/device/megaphone,
|
||||
/obj/item/device/violin)
|
||||
|
||||
var/atom/movable/I = new gift_type(M)
|
||||
M.remove_from_mob(src)
|
||||
@@ -335,6 +378,8 @@
|
||||
/obj/item/clothing/under/syndicate/tracksuit,
|
||||
/obj/item/clothing/under/rank/clown,
|
||||
/obj/item/clothing/under/mime,
|
||||
/obj/item/clothing/under/rank/fatigues/marine,
|
||||
/obj/item/clothing/under/rank/dress/marine,
|
||||
/mob/living/simple_animal/cat/kitten,
|
||||
/mob/living/simple_animal/chick,
|
||||
/mob/living/simple_animal/corgi/puppy,
|
||||
@@ -343,7 +388,18 @@
|
||||
/obj/item/weapon/xmasgift/medium,
|
||||
/obj/item/weapon/tank/jetpack,
|
||||
/obj/structure/plushie/drone,
|
||||
/obj/structure/plushie/ivancarp,)
|
||||
/obj/structure/plushie/ivancarp,
|
||||
/obj/item/weapon/grenade/spawnergrenade/vaurca,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/ore/coal,
|
||||
/obj/item/weapon/mass_driver_diy,
|
||||
/mob/living/simple_animal/crab,
|
||||
/mob/living/simple_animal/parrot,
|
||||
/mob/living/simple_animal/hostile/commanded/dog/pug,
|
||||
/obj/item/clothing/suit/space/void/vaurca,
|
||||
/obj/item/clothing/head/helmet/space/void/vaurca,
|
||||
/obj/item/target/alien)
|
||||
|
||||
var/atom/movable/I = new gift_type(M)
|
||||
M.remove_from_mob(src)
|
||||
|
||||
@@ -14,7 +14,7 @@ var/global/list/minevendor_list = list( //keep in order of price
|
||||
new /datum/data/mining_equipment("5 Purple Flags", /obj/item/stack/flag/purple, 10, 50),
|
||||
new /datum/data/mining_equipment("Ore-bag", /obj/item/weapon/storage/bag/ore, 25, 50),
|
||||
new /datum/data/mining_equipment("Meat Pizza", /obj/item/pizzabox/meat, 25, 50),
|
||||
new /datum/data/mining_equipment("Lantern", /obj/item/device/flashlight/lantern,10, 75),
|
||||
new /datum/data/mining_equipment("Lantern", /obj/item/device/flashlight/lantern, 10, 75),
|
||||
new /datum/data/mining_equipment("Shovel", /obj/item/weapon/shovel, 15, 100),
|
||||
new /datum/data/mining_equipment("Pickaxe", /obj/item/weapon/pickaxe, 10, 100),
|
||||
new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 40, 100),
|
||||
@@ -52,6 +52,7 @@ var/global/list/minevendor_list = list( //keep in order of price
|
||||
new /datum/data/mining_equipment("Mass Driver", /obj/item/weapon/mass_driver_diy, 5, 800),
|
||||
new /datum/data/mining_equipment("Mining Drone", /mob/living/silicon/robot/drone/mining, 15, 800),
|
||||
new /datum/data/mining_equipment("Minecart Engine", /obj/vehicle/train/cargo/engine/mining, -1, 800, 1),
|
||||
new /datum/data/mining_equipment("Drone Kinetic Accelerator Upgrade", /obj/item/device/mine_bot_ugprade/ka, 10, 800),
|
||||
new /datum/data/mining_equipment("Ore Summoner", /obj/item/weapon/oreportal, 35, 800),
|
||||
new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 15, 1000),
|
||||
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 25, 1000),
|
||||
@@ -59,7 +60,6 @@ var/global/list/minevendor_list = list( //keep in order of price
|
||||
new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 10, 1250),
|
||||
new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/turfs, 15, 1500),
|
||||
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 10, 1500),
|
||||
new /datum/data/mining_equipment("Drone Thermal Drill Upgrade", /obj/item/device/mine_bot_ugprade/thermal, 20, 2000),
|
||||
new /datum/data/mining_equipment("Thermal Drill", /obj/item/weapon/gun/energy/vaurca/thermaldrill, 5, 3750)
|
||||
)
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
health = 45
|
||||
pass_flags = PASSTABLE
|
||||
req_access = list(access_mining, access_robotics)
|
||||
idcard_type = /obj/item/weapon/card/id/synthetic/minedrone
|
||||
idcard_type = /obj/item/weapon/card/id/minedrone
|
||||
speed = -1
|
||||
range_limit = 0
|
||||
var/health_upgrade
|
||||
@@ -176,7 +176,7 @@
|
||||
qdel(M.module)
|
||||
M.module = null
|
||||
if(M.ranged_upgrade)
|
||||
new /obj/item/weapon/robot_module/mining_drone/drillandplasmacutter(M)
|
||||
new /obj/item/weapon/robot_module/mining_drone/drillandka(M)
|
||||
else
|
||||
new /obj/item/weapon/robot_module/mining_drone/drill(M)
|
||||
M.module.rebuild()
|
||||
@@ -200,41 +200,24 @@
|
||||
M.health_upgrade = 1
|
||||
qdel(src)
|
||||
|
||||
/obj/item/device/mine_bot_ugprade/plasma
|
||||
name = "minebot plasma cutter upgrade"
|
||||
/obj/item/device/mine_bot_ugprade/ka
|
||||
name = "minebot kinetic accelerator upgrade"
|
||||
|
||||
/obj/item/device/mine_bot_ugprade/plasma/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
|
||||
/obj/item/device/mine_bot_ugprade/ka/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
|
||||
if(M.ranged_upgrade)
|
||||
user << "[src] already has a plasma cutter upgrade installed!"
|
||||
user << "[src] already has a KA upgrade installed!"
|
||||
return
|
||||
M.modtype = initial(M.modtype)
|
||||
M.uneq_all()
|
||||
qdel(M.module)
|
||||
M.module = null
|
||||
if(M.melee_upgrade)
|
||||
new /obj/item/weapon/robot_module/mining_drone/drillandplasmacutter(M)
|
||||
new /obj/item/weapon/robot_module/mining_drone/drillandka(M)
|
||||
else
|
||||
new /obj/item/weapon/robot_module/mining_drone/plasmacutter(M)
|
||||
new /obj/item/weapon/robot_module/mining_drone/ka(M)
|
||||
M.ranged_upgrade = 1
|
||||
M.module.rebuild()
|
||||
M.recalculate_synth_capacities()
|
||||
if(!M.jetpack)
|
||||
M.jetpack = new /obj/item/weapon/tank/jetpack/carbondioxide/synthetic(src)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/device/mine_bot_ugprade/thermal
|
||||
name = "minebot thermal drill upgrade"
|
||||
|
||||
/obj/item/device/mine_bot_ugprade/thermal/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user)
|
||||
if(M.drill_upgrade)
|
||||
user << "[src] already has a thermal drill!"
|
||||
return
|
||||
if(M.emagged == 1)
|
||||
return 0
|
||||
|
||||
M.emagged = 1
|
||||
M.fakeemagged = 1
|
||||
M.drill_upgrade = 1
|
||||
if(!M.jetpack)
|
||||
M.jetpack = new /obj/item/weapon/tank/jetpack/carbondioxide/synthetic(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -924,8 +924,8 @@ var/global/list/robot_modules = list(
|
||||
src.modules += new /obj/item/weapon/gripper/miner(src)
|
||||
src.modules += new /obj/item/weapon/mining_scanner(src)
|
||||
|
||||
src.emag = new /obj/item/weapon/gun/energy/vaurca/mountedthermaldrill(src)
|
||||
src.emag.name = "Mounted Thermal Drill"
|
||||
src.emag = new /obj/item/weapon/gun/energy/plasmacutter/mounted(src)
|
||||
src.emag.name = "Mounted Plasma Cutter"
|
||||
..()
|
||||
|
||||
/obj/item/weapon/robot_module/mining_drone/drill/New(var/mob/living/silicon/robot/robot)
|
||||
@@ -937,33 +937,33 @@ var/global/list/robot_modules = list(
|
||||
src.modules += new /obj/item/weapon/gripper/miner(src)
|
||||
src.modules += new /obj/item/weapon/mining_scanner(src)
|
||||
|
||||
src.emag = new /obj/item/weapon/gun/energy/vaurca/mountedthermaldrill(src)
|
||||
src.emag.name = "Mounted Thermal Drill"
|
||||
src.emag = new /obj/item/weapon/gun/energy/plasmacutter/mounted(src)
|
||||
src.emag.name = "Mounted Plasma Cutter"
|
||||
..()
|
||||
|
||||
/obj/item/weapon/robot_module/mining_drone/plasmacutter/New(var/mob/living/silicon/robot/robot)
|
||||
/obj/item/weapon/robot_module/mining_drone/ka/New(var/mob/living/silicon/robot/robot)
|
||||
src.modules += new /obj/item/device/flash(src)
|
||||
src.modules += new /obj/item/borg/sight/material(src)
|
||||
src.modules += new /obj/item/weapon/storage/bag/ore/drone(src)
|
||||
src.modules += new /obj/item/weapon/gun/energy/plasmacutter/mounted(src)
|
||||
src.modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg(src)
|
||||
src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
|
||||
src.modules += new /obj/item/weapon/gripper/miner(src)
|
||||
src.modules += new /obj/item/weapon/mining_scanner(src)
|
||||
|
||||
src.emag = new /obj/item/weapon/gun/energy/vaurca/mountedthermaldrill(src)
|
||||
src.emag.name = "Mounted Thermal Drill"
|
||||
src.emag = new /obj/item/weapon/gun/energy/plasmacutter/mounted(src)
|
||||
src.emag.name = "Mounted Plasma Cutter"
|
||||
..()
|
||||
|
||||
/obj/item/weapon/robot_module/mining_drone/drillandplasmacutter/New(var/mob/living/silicon/robot/robot)
|
||||
/obj/item/weapon/robot_module/mining_drone/drillandka/New(var/mob/living/silicon/robot/robot)
|
||||
src.modules += new /obj/item/device/flash(src)
|
||||
src.modules += new /obj/item/borg/sight/material(src)
|
||||
src.modules += new /obj/item/weapon/storage/bag/ore/drone(src)
|
||||
src.modules += new /obj/item/weapon/gun/energy/plasmacutter/mounted(src)
|
||||
src.modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg(src)
|
||||
src.modules += new /obj/item/weapon/pickaxe/jackhammer(src)
|
||||
src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
|
||||
src.modules += new /obj/item/weapon/gripper/miner(src)
|
||||
src.modules += new /obj/item/weapon/mining_scanner(src)
|
||||
|
||||
src.emag = new /obj/item/weapon/gun/energy/vaurca/mountedthermaldrill(src)
|
||||
src.emag.name = "Mounted Thermal Drill"
|
||||
src.emag = new /obj/item/weapon/gun/energy/plasmacutter/mounted(src)
|
||||
src.emag.name = "Mounted Plasma Cutter"
|
||||
..()
|
||||
|
||||
39
html/changelogs/minebot.yml
Normal file
39
html/changelogs/minebot.yml
Normal file
@@ -0,0 +1,39 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: LordFowl
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- bugfix: "Mining drones no longer have all access IDs."
|
||||
- rscadd: "Mining drones can be upgraded with kinetic accelerators, further cementing the obsolescence of the human shaft miner."
|
||||
- tweak: "Mining drones can no longer be upgraded with plasma cutters, and their emag module is no longer a thermal drill."
|
||||
Reference in New Issue
Block a user