From 1e5d31ff0454bfb6cfc9fc028632ae91c458aef9 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sat, 17 May 2025 10:20:36 -0700 Subject: [PATCH] [MIRROR] Vendor and Phasegun adjustments (#10900) Co-authored-by: Cameron Lennox --- code/datums/supplypacks/misc.dm | 2 +- .../gamemodes/cult/construct_spells_ch.dm | 3 +- .../objects/items/weapons/storage/belt.dm | 3 +- .../objects/items/weapons/storage/belt_vr.dm | 6 +- .../crates_lockers/closets/secure/cargo.dm | 3 +- .../closets/secure/scientist.dm | 3 +- .../clothing/spacesuits/rig/modules/vision.dm | 8 +- .../clothing/spacesuits/rig/suits/alien.dm | 6 +- .../clothing/spacesuits/rig/suits/alien_vr.dm | 5 - .../clothing/spacesuits/rig/suits/combat.dm | 9 +- .../spacesuits/rig/suits/combat_vr.dm | 5 - .../clothing/spacesuits/rig/suits/ert.dm | 19 +- .../clothing/spacesuits/rig/suits/ert_vr.dm | 13 - .../clothing/spacesuits/rig/suits/light.dm | 1 + .../clothing/spacesuits/rig/suits/merc.dm | 2 +- .../clothing/spacesuits/rig/suits/pmc.dm | 2 +- .../clothing/spacesuits/rig/suits/robotics.dm | 2 +- .../clothing/spacesuits/rig/suits/station.dm | 394 +++++++++++++++- .../spacesuits/rig/suits/station_vr.dm | 423 ------------------ code/modules/mining/kinetic_crusher.dm | 2 +- .../mining/machinery/machine_processing.dm | 4 +- .../mining/machinery/machine_stacking.dm | 4 +- .../mining/machinery/machine_unloading.dm | 3 +- .../equipment_vendor.dm | 134 +++--- .../ore_redemption_machine/survey_vendor.dm | 203 ++++----- code/modules/mob/living/simple_mob/defense.dm | 6 +- code/modules/projectiles/projectile.dm | 5 +- .../projectiles/projectile/beams_ch.dm | 9 +- .../modules/projectiles/projectile/bullets.dm | 6 +- code/modules/projectiles/projectile/energy.dm | 10 +- .../projectiles/projectile/energy_ch.dm | 13 +- .../projectiles/projectile/magnetic.dm | 3 +- code/modules/projectiles/projectile_ch.dm | 3 +- code/modules/samples/container.dm | 30 -- icons/obj/machines/mining_machines.dmi | Bin 7216 -> 30436 bytes icons/obj/machines/mining_machines_vr.dmi | Bin 7364 -> 0 bytes .../ammo_refactor/_ammo_defines.dm | 2 +- .../projectiles/ammo_refactor/ammo_types.dm | 2 +- .../code/modules/projectiles/guns/beam.dm | 8 +- .../code/modules/projectiles/guns/bullet.dm | 6 +- .../code/modules/projectiles/guns/energy.dm | 12 +- .../code/modules/projectiles/guns/magnetic.dm | 2 +- .../code/modules/projectiles/guns/pump.dm | 2 +- vorestation.dme | 4 - 44 files changed, 620 insertions(+), 762 deletions(-) delete mode 100644 code/modules/clothing/spacesuits/rig/suits/alien_vr.dm delete mode 100644 code/modules/clothing/spacesuits/rig/suits/combat_vr.dm delete mode 100644 code/modules/clothing/spacesuits/rig/suits/ert_vr.dm delete mode 100644 code/modules/clothing/spacesuits/rig/suits/station_vr.dm delete mode 100644 icons/obj/machines/mining_machines_vr.dmi diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 8aca57a666..5e1b5c7ed8 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -269,7 +269,7 @@ /datum/supply_pack/randomised/misc/explorer_shield name = JOB_EXPLORER + " shield" - desc = "Two Physical and Two PSG shields for use by away teams. Requires EVA or Pilot's access." + desc = "Contains two random shields. These can be Physical or PSG shields for use by away teams. Requires EVA or Pilot's access." num_contained = 2 contains = list( /obj/item/shield/riot/explorer, diff --git a/code/game/gamemodes/cult/construct_spells_ch.dm b/code/game/gamemodes/cult/construct_spells_ch.dm index 19b8bc3281..dc8a3d8047 100644 --- a/code/game/gamemodes/cult/construct_spells_ch.dm +++ b/code/game/gamemodes/cult/construct_spells_ch.dm @@ -89,8 +89,7 @@ fire_sound = 'sound/weapons/spiderlunge.ogg' damage = 15 damage_type = BURN - SA_bonus_damage = 45 - SA_vulnerability = list(MOB_CLASS_DEMONIC,MOB_CLASS_ILLUSION) + mob_bonus_damage = 45 check_armour = "laser" armor_penetration = 60 light_range = 2 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 3b02289d17..e7ea421e88 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -531,7 +531,8 @@ /obj/item/ano_scanner, /obj/item/pickaxe/hand, /obj/item/xenoarch_multi_tool, - /obj/item/pickaxe/excavationdrill + /obj/item/pickaxe/excavationdrill, + /obj/item/storage/sample_container ) /obj/item/storage/belt/fannypack diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index 4190ba76c6..758fba4f9e 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -51,7 +51,8 @@ /obj/item/mapping_unit, /obj/item/binoculars, //CHOMPADD /obj/item/kinetic_crusher, - /obj/item/analyzer + /obj/item/analyzer, + /obj/item/storage/sample_container ) /obj/item/storage/belt/explorer/pathfinder @@ -120,7 +121,8 @@ /obj/item/melee, /obj/item/kinetic_crusher, /obj/item/mining_scanner, - /obj/item/storage/bag/ore + /obj/item/storage/bag/ore, + /obj/item/storage/sample_container ) //Pretty much, if it's in the mining vendor, they should be able to put it on the belt. diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 014c683212..a65ad936ea 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -89,7 +89,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/miner, /obj/item/clothing/shoes/boots/winter/mining, /obj/item/emergency_beacon, - /obj/item/stack/marker_beacon/thirty) + /obj/item/stack/marker_beacon/thirty, + /obj/item/storage/sample_container) /obj/structure/closet/secure_closet/miner/Initialize(mapload) if(prob(50)) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 90d63d008d..f01c4da79e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -71,7 +71,8 @@ /obj/item/radio/headset/headset_sci, /obj/item/storage/belt/archaeology, /obj/item/storage/excavation, - /obj/item/pickaxe/excavationdrill) + /obj/item/pickaxe/excavationdrill, + /obj/item/storage/sample_container) /obj/structure/closet/excavation name = "Excavation tools" diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm index 48883a715f..2b68612b06 100644 --- a/code/modules/clothing/spacesuits/rig/modules/vision.dm +++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm @@ -48,12 +48,6 @@ /datum/rig_vision/medhud/New() glasses = new /obj/item/clothing/glasses/hud/health -/datum/rig_vision/material - mode = "material scanner" - -/datum/rig_vision/material/New() - glasses = new /obj/item/clothing/glasses/material - /obj/item/rig_module/vision name = "hardsuit visor" @@ -115,7 +109,7 @@ name = "hardsuit material scanner" desc = "A layered, translucent visor system for a hardsuit." - icon_state = "material" //VOREStation Edit + icon_state = "material" usable = 0 diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index a1601693a8..023d16a80f 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -9,7 +9,7 @@ desc = "A cheap NT knock-off of an Unathi battle-rig. Uses softer, but lighter, armour plating, producing a still-useful suit" suit_type = "\improper NT breacher" icon_state = "breacher_rig_cheap" - armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 70, bio = 100, rad = 50) + armor = list(melee = 60, bullet = 45, laser = 45, energy = 10, bomb = 50, bio = 100, rad = 20) emp_protection = -20 slowdown = 3 //This is too much, reducing from 6 to 3. May edit again in the future. offline_slowdown = 5 @@ -32,7 +32,7 @@ desc = "An authentic Unathi breacher chassis. Huge, bulky and absurdly heavy. It must be like wearing a tank." suit_type = "breacher chassis" icon_state = "breacher_rig" - armor = list(melee = 90, bullet = 90, laser = 90, energy = 90, bomb = 90, bio = 100, rad = 80) //Takes TEN TIMES as much damage to stop someone in a breacher. In exchange, it's slow. + armor = list(melee = 85, bullet = 80, laser = 80, energy = 40, bomb = 80, bio = 100, rad = 60) //Still a tank just not indestructable vision_restriction = 0 siemens_coefficient = 0.2 slowdown = 6 @@ -64,7 +64,7 @@ item_flags = THICKMATERIAL siemens_coefficient = 0.2 offline_slowdown = 2.5 - allowed = list(POCKET_GENERIC, POCKET_EXPLO, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_STORAGE) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT) air_type = /obj/item/tank/vox diff --git a/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm b/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm deleted file mode 100644 index a1795c797b..0000000000 --- a/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/rig/breacher - armor = list(melee = 60, bullet = 45, laser = 45, energy = 10, bomb = 50, bio = 100, rad = 20) - -/obj/item/rig/breacher/fancy - armor = list(melee = 85, bullet = 80, laser = 80, energy = 40, bomb = 80, bio = 100, rad = 60) //Still a tank just not indestructable diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index c190e07c22..fd5369a720 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -6,14 +6,13 @@ desc = "A sleek and dangerous hardsuit for active combat." icon_state = "security_rig" suit_type = "combat hardsuit" - armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60) + armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) slowdown = 0.5 offline_slowdown = 1.5 offline_vision_restriction = 1 helm_type = /obj/item/clothing/head/helmet/space/rig/combat - allowed = list(POCKET_GENERIC, POCKET_SECURITY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_STORAGE) - + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT) /obj/item/rig/combat/equipped @@ -38,11 +37,11 @@ desc = "An austere hardsuit used by paramilitary groups and real soldiers alike." icon_state = "military_rig" suit_type = "military hardsuit" - armor = list(melee = 80, bullet = 70, laser = 55, energy = 15, bomb = 80, bio = 100, rad = 30) + armor = list(melee = 80, bullet = 75, laser = 65, energy = 15, bomb = 80, bio = 100, rad = 40) slowdown = 0.5 offline_slowdown = 1.5 offline_vision_restriction = 1 - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_ENGINEERING, POCKET_HEAVYTOOLS, POCKET_STORAGE, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_CE, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT) chest_type = /obj/item/clothing/suit/space/rig/military helm_type = /obj/item/clothing/head/helmet/space/rig/military diff --git a/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm b/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm deleted file mode 100644 index 2af3eb66dc..0000000000 --- a/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/rig/combat - armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) - -/obj/item/rig/military - armor = list(melee = 80, bullet = 75, laser = 65, energy = 15, bomb = 80, bio = 100, rad = 40) diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index 88ceba1e88..be3a3752b9 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -14,7 +14,7 @@ siemens_coefficient= 0.5 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100) - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_ENGINEERING, POCKET_HEAVYTOOLS, POCKET_STORAGE, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_CE, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT) initial_modules = list( /obj/item/rig_module/ai_container, @@ -68,7 +68,7 @@ desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armoured and space ready." suit_type = "heavy asset protection" icon_state = "asset_protection_rig" - armor = list(melee = 60, bullet = 50, laser = 50,energy = 40, bomb = 40, bio = 100, rad = 100) + armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) siemens_coefficient= 0.3 glove_type = /obj/item/clothing/gloves/gauntlets/rig/eva //CHOMPEdit Begin @@ -89,8 +89,13 @@ /obj/item/rig_module/datajack ) -/obj/item/rig/ert/assetprotection/antiareli - name = "Heavy Asset Protection Special Agent control module" - desc = "A heavy suit worn by the highest level of the highest level of Asset Protection, don't mess with the person wearing this. Armoured and space ready and protected against almost fucking everything" - armor = list(melee = 80, bullet = 80, laser = 80,energy = 80, bomb = 100, bio = 100, rad = 100) - siemens_coefficient= 0 +/obj/item/rig/ert/janitor + name = "ERT-J suit control module" + desc = "A suit worn by the janitorial division of an Emergency Response Team. Has purple highlights. Armoured and space ready." + suit_type = "ERT janitor" + icon_state = "ert_janitor_rig" + + initial_modules = list( + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/cleaner_launcher, + ) diff --git a/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm b/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm deleted file mode 100644 index 34dd4fb646..0000000000 --- a/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm +++ /dev/null @@ -1,13 +0,0 @@ -/obj/item/rig/ert/janitor - name = "ERT-J suit control module" - desc = "A suit worn by the janitorial division of an Emergency Response Team. Has purple highlights. Armoured and space ready." - suit_type = "ERT janitor" - icon_state = "ert_janitor_rig" - - initial_modules = list( - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/cleaner_launcher, - ) - -/obj/item/rig/ert/assetprotection - armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index a6ddd326e1..8749d2f323 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -81,6 +81,7 @@ desc = "A unique suit of nano-enhanced armor designed for covert operations." icon_state = "ninja_rig" armor = list(melee = 50, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 30) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY, POCKET_BAYSUIT) emp_protection = 40 //change this to 30 if too high. slowdown = 0 diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 16ac34bc29..d86af04a82 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -14,7 +14,7 @@ siemens_coefficient = 0.3 glove_type = /obj/item/clothing/gloves/gauntlets/rig/eva helm_type = /obj/item/clothing/head/helmet/space/rig/merc - allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_EXPLO, POCKET_SUIT_REGULATORS, POCKET_STORAGE) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY, POCKET_BAYSUIT) initial_modules = list( /obj/item/rig_module/mounted, diff --git a/code/modules/clothing/spacesuits/rig/suits/pmc.dm b/code/modules/clothing/spacesuits/rig/suits/pmc.dm index f58a1b5cc7..e9a8670ff1 100644 --- a/code/modules/clothing/spacesuits/rig/suits/pmc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/pmc.dm @@ -13,7 +13,7 @@ armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 95) - allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_ENGINEERING, POCKET_HEAVYTOOLS, POCKET_SECURITY, POCKET_SUIT_REGULATORS, POCKET_STORAGE) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT, /obj/item/storage/firstaid) /obj/item/rig/pmc/commander name = "PMC-C hardsuit control module" diff --git a/code/modules/clothing/spacesuits/rig/suits/robotics.dm b/code/modules/clothing/spacesuits/rig/suits/robotics.dm index d2086513d7..af4144af64 100644 --- a/code/modules/clothing/spacesuits/rig/suits/robotics.dm +++ b/code/modules/clothing/spacesuits/rig/suits/robotics.dm @@ -20,7 +20,7 @@ glove_type = null cell_type = null - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_STORAGE) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, /obj/item/storage/box, /obj/item/storage/belt, /obj/item/defib_kit/compact) req_access = list() req_one_access = list() diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index a016207b88..010e199abd 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -73,7 +73,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/industrial - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING, POCKET_CE, /obj/item/storage) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_BAYSUIT) req_access = list() req_one_access = list() @@ -98,7 +98,7 @@ slowdown = 0 offline_slowdown = 0.5 offline_vision_restriction = 1 - siemens_coefficient= 0.75 + siemens_coefficient = 0.75 helm_type = /obj/item/clothing/head/helmet/space/rig/eva glove_type = /obj/item/clothing/gloves/gauntlets/rig/eva @@ -143,7 +143,7 @@ glove_type = /obj/item/clothing/gloves/gauntlets/rig/ce boot_type = /obj/item/clothing/shoes/magboots/rig/ce //VOREStation Add - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_ENGINEERING, POCKET_CE) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_ENGINEERING, POCKET_CE, POCKET_BAYSUIT) req_access = list() req_one_access = list() @@ -183,7 +183,7 @@ boot_type = /obj/item/clothing/shoes/magboots/rig/hazmat //ywadd end - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING, POCKET_XENOARC) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_XENOARC, POCKET_BAYSUIT) req_access = list() req_one_access = list() @@ -223,21 +223,21 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/medical - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MEDICAL, /obj/item/storage, /obj/item/roller) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MEDICAL, POCKET_BAYSUIT, /obj/item/roller, /obj/item/storage/firstaid) req_access = list() req_one_access = list() +//Access restriction and seal delay, plus pat_module and rescue_pharm for medical suit /obj/item/rig/medical/equipped - req_access = list(access_medical) + seal_delay = 5 initial_modules = list( - /obj/item/rig_module/sprinter, - /obj/item/rig_module/chem_dispenser/injector, /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/device/healthscanner, - /obj/item/rig_module/vision/medhud + /obj/item/rig_module/sprinter, + /obj/item/rig_module/pat_module, + /obj/item/rig_module/rescue_pharm ) //Security suit @@ -254,7 +254,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/hazard - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_EXPLO, /obj/item/storage) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT) req_access = list() req_one_access = list() @@ -268,3 +268,375 @@ /obj/item/rig_module/grenade_launcher, /obj/item/rig_module/mounted/taser ) + +// 'Technomancer' hardsuit +/obj/item/rig/focalpoint + name = "\improper F.P.E. hardsuit control module" + desc = "A high-end hardsuit produced by Focal Point Energistics, focused around repair and construction." + + icon = 'icons/obj/rig_modules_vr.dmi' // the item + default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob + icon_state = "techno_rig" + suit_type = "\improper F.P.E. hardsuit" + cell_type = /obj/item/cell/hyper + + // Copied from CE rig + slowdown = 0 + offline_slowdown = 0 + offline_vision_restriction = 0 + rigsuit_max_pressure = 20 * ONE_ATMOSPHERE // Max pressure the rig protects against when sealed + rigsuit_min_pressure = 0 // Min pressure the rig protects against when sealed + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE // so it's like a rig firesuit + armor = list("melee" = 40, "bullet" = 10, "laser" = 30, "energy" = 55, "bomb" = 70, "bio" = 100, "rad" = 100) + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, /obj/item/storage/backpack) + chest_type = /obj/item/clothing/suit/space/rig/focalpoint + helm_type = /obj/item/clothing/head/helmet/space/rig/focalpoint + boot_type = /obj/item/clothing/shoes/magboots/rig/ce/focalpoint + glove_type = /obj/item/clothing/gloves/gauntlets/rig/focalpoint + +/obj/item/rig/focalpoint/equipped + initial_modules = list( + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/teleporter, // Try not to set yourself on fire + /obj/item/rig_module/device/rcd, + /obj/item/rig_module/grenade_launcher/metalfoam + ) + +/obj/item/clothing/head/helmet/space/rig/focalpoint + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "techno_rig" + // No animal people sprites for these yet, sad times + species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) + sprite_sheets = null + +/obj/item/clothing/suit/space/rig/focalpoint + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "techno_rig" + // No animal people sprites for these yet, sad times + species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) + sprite_sheets = null + +/obj/item/clothing/shoes/magboots/rig/ce/focalpoint + icon = 'icons/inventory/feet/item_vr.dmi' + default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' + icon_state = "techno_rig" + // No animal people sprites for these yet, sad times + species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) + sprite_sheets = null + +/obj/item/clothing/gloves/gauntlets/rig/focalpoint + icon = 'icons/inventory/hands/item_vr.dmi' + default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' + icon_state = "techno_rig" + siemens_coefficient = 0 + // No animal people sprites for these yet, sad times + species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) + sprite_sheets = null + +// 'Ironhammer' hardsuit +/obj/item/rig/hephaestus + name = "\improper Hephaestus hardsuit control module" + desc = "A high-end hardsuit produced by Hephaestus Industries, focused on destroying the competition. Literally." + + icon = 'icons/obj/rig_modules_vr.dmi' // the item + default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob + icon_state = "ihs_rig" + suit_type = "\improper Hephaestus hardsuit" + cell_type = /obj/item/cell/super + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_SECURITY, POCKET_ENGINEERING, POCKET_BAYSUIT, /obj/item/storage/firstaid, /obj/item/roller) + + armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 60, "bio" = 100, "rad" = 20) + + chest_type = /obj/item/clothing/suit/space/rig/hephaestus + helm_type = /obj/item/clothing/head/helmet/space/rig/hephaestus + boot_type = /obj/item/clothing/shoes/magboots/rig/hephaestus + glove_type = /obj/item/clothing/gloves/gauntlets/rig/hephaestus + +/obj/item/rig/hephaestus/equipped + initial_modules = list( + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/grenade_launcher, + /obj/item/rig_module/mounted/egun, + /obj/item/rig_module/mounted/energy_blade + ) + +/obj/item/clothing/head/helmet/space/rig/hephaestus + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "ihs_rig" + // No animal people sprites for these yet, sad times + species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) + sprite_sheets = null + +/obj/item/clothing/suit/space/rig/hephaestus + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "ihs_rig" + // No animal people sprites for these yet, sad times + species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) + sprite_sheets = null + +/obj/item/clothing/shoes/magboots/rig/hephaestus + icon = 'icons/inventory/feet/item_vr.dmi' + default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' + icon_state = "ihs_rig" + // No animal people sprites for these yet, sad times + species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) + sprite_sheets = null + +/obj/item/clothing/gloves/gauntlets/rig/hephaestus + icon = 'icons/inventory/hands/item_vr.dmi' + default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' + icon_state = "ihs_rig" + // No animal people sprites for these yet, sad times + species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) + sprite_sheets = null + +// 'Zero' rig +/obj/item/rig/zero + name = "null hardsuit control module" + desc = "A very lightweight suit designed to allow use inside mechs and starfighters. It feels like you're wearing nothing at all." + + icon = 'icons/obj/rig_modules_vr.dmi' // the item + default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob + icon_state = "null_rig" + suit_type = "null hardsuit" + cell_type = /obj/item/cell/high + + chest_type = /obj/item/clothing/suit/space/rig/zero + helm_type = /obj/item/clothing/head/helmet/space/rig/zero + boot_type = null + glove_type = null + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_BAYSUIT) + + slowdown = 0 + offline_slowdown = 1 + offline_vision_restriction = 2 + armor = list("melee" = 20, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 35, "bio" = 100, "rad" = 20) + +/obj/item/rig/zero/equipped + initial_modules = list( + /obj/item/rig_module/maneuvering_jets + ) + +/obj/item/clothing/head/helmet/space/rig/zero + desc = "A bubble helmet that maximizes the field of view. A state of the art holographic display provides a stream of information." + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "null_rig" + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM + slowdown = 0 + +/obj/item/clothing/suit/space/rig/zero + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "null_rig" + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS // like a voidsuit + slowdown = 0 + +// Medical rig from bay +/obj/item/rig/baymed + name = "\improper Commonwealth medical hardsuit control module" + desc = "A lightweight first responder hardsuit from the Commonwealth. Not suitable for combat use, but advanced myomer fibers can push the user to incredible speeds." + interface_intro = "Commonwealth" + + icon = 'icons/obj/rig_modules_vr.dmi' // the item + default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob + icon_state = "medical_rig_bay" + item_state = null + suit_type = "medical hardsuit" + cell_type = /obj/item/cell/high + + chest_type = /obj/item/clothing/suit/space/rig/baymed + helm_type = /obj/item/clothing/head/helmet/space/rig/baymed + boot_type = /obj/item/clothing/shoes/magboots/rig/ce/baymed + glove_type = /obj/item/clothing/gloves/gauntlets/rig/baymed + + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MEDICAL, POCKET_BAYSUIT, /obj/item/roller) + + // speedy paper + slowdown = -0.5 + armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 25, "bio" = 100, "rad" = 20) + +/obj/item/rig/baymed/equipped + + initial_modules = list( + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/sprinter, + /obj/item/rig_module/pat_module, + /obj/item/rig_module/rescue_pharm + ) + +/obj/item/clothing/head/helmet/space/rig/baymed + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "medical_rig_bay" + item_state = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM + camera_networks = list(NETWORK_MEDICAL) + +/obj/item/clothing/suit/space/rig/baymed + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "medical_rig_bay" + item_state = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + +/obj/item/clothing/shoes/magboots/rig/ce/baymed + icon = 'icons/inventory/feet/item_vr.dmi' + default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' + icon_state = "medical_rig_bay" + item_state = null + sprite_sheets = null + sprite_sheets_obj = null + +/obj/item/clothing/gloves/gauntlets/rig/baymed + icon = 'icons/inventory/hands/item_vr.dmi' + default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' + icon_state = "medical_rig_bay" + item_state = null + sprite_sheets = null + sprite_sheets_obj = null + +// Engineering/'Industrial' rig from bay +/obj/item/rig/bayeng + name = "\improper Commonwealth engineering hardsuit control module" + desc = "An advanced construction hardsuit from the Commonwealth. Built like a tank. Don't expect to be taking any tight corners while running." + interface_intro = "Commonwealth" + + icon = 'icons/obj/rig_modules_vr.dmi' // the item + default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob + icon_state = "engineering_rig_bay" + item_state = null + suit_type = "engineering hardsuit" + cell_type = /obj/item/cell/super + + chest_type = /obj/item/clothing/suit/space/rig/bayeng + helm_type = /obj/item/clothing/head/helmet/space/rig/bayeng + boot_type = /obj/item/clothing/shoes/magboots/rig/ce/bayeng + glove_type = /obj/item/clothing/gloves/gauntlets/rig/bayeng + + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING, POCKET_CE, POCKET_BAYSUIT) + + slowdown = 0 + offline_slowdown = 5 // very bulky + armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50) + +/obj/item/rig/bayeng/equipped + initial_modules = list( + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/device/rcd, + /obj/item/rig_module/grenade_launcher/metalfoam, + /obj/item/rig_module/vision/meson, + /obj/item/rig_module/ai_container + ) + +/obj/item/clothing/head/helmet/space/rig/bayeng + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "engineering_rig_bay" + item_state = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM + camera_networks = list(NETWORK_ENGINEERING) + +/obj/item/clothing/suit/space/rig/bayeng + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "engineering_rig_bay" + item_state = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + +/obj/item/clothing/shoes/magboots/rig/ce/bayeng + icon = 'icons/inventory/feet/item_vr.dmi' + default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' + icon_state = "engineering_rig_bay" + item_state = null + sprite_sheets = null + sprite_sheets_obj = null + +/obj/item/clothing/gloves/gauntlets/rig/bayeng + icon = 'icons/inventory/hands/item_vr.dmi' + default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' + icon_state = "engineering_rig_bay" + item_state = null + sprite_sheets = null + sprite_sheets_obj = null + siemens_coefficient = 0 // insulated + +// Pathfinder rig from bay - event/reward stuff here +/obj/item/rig/pathfinder + name = "\improper Commonwealth pathfinder hardsuit control module" + desc = "A Commonwealth pathfinder hardsuit is hard to come by... how'd this end up on the frontier?" + interface_intro = "Commonwealth" + + icon = 'icons/obj/rig_modules_vr.dmi' // the item + default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob + icon_state = "pathfinder_rig_bay" + item_state = null + suit_type = "pathfinder hardsuit" + cell_type = /obj/item/cell/super + + chest_type = /obj/item/clothing/suit/space/rig/pathfinder + helm_type = /obj/item/clothing/head/helmet/space/rig/pathfinder + boot_type = /obj/item/clothing/shoes/magboots/rig/pathfinder + glove_type = /obj/item/clothing/gloves/gauntlets/rig/pathfinder + + slowdown = 0.5 + offline_slowdown = 4 // bulky + offline_vision_restriction = 2 // doesn't even have a way to see out without power + armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50) + +/obj/item/rig/pathfinder//equipped + initial_modules = list( + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/teleporter, + /obj/item/rig_module/stealth_field, + /obj/item/rig_module/mounted/energy_blade + ) + +/obj/item/clothing/head/helmet/space/rig/pathfinder + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "pathfinder_rig_bay" + item_state = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM + +/obj/item/clothing/suit/space/rig/pathfinder + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "pathfinder_rig_bay" + item_state = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + +/obj/item/clothing/shoes/magboots/rig/pathfinder + icon = 'icons/inventory/feet/item_vr.dmi' + default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' + icon_state = "pathfinder_rig_bay" + item_state = null + sprite_sheets = null + sprite_sheets_obj = null + +/obj/item/clothing/gloves/gauntlets/rig/pathfinder + icon = 'icons/inventory/hands/item_vr.dmi' + default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' + icon_state = "pathfinder_rig_bay" + item_state = null + sprite_sheets = null + sprite_sheets_obj = null + +/obj/item/rig/industrial/vendor + name = "discount industrial suit control module" + desc = "A heavy, powerful hardsuit used by construction crews and mining corporations. This is a mass production model with reduced armor." + armor = list(melee = 50, bullet = 10, laser = 20, energy = 15, bomb = 30, bio = 100, rad = 50) diff --git a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm deleted file mode 100644 index c8cd8c061f..0000000000 --- a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm +++ /dev/null @@ -1,423 +0,0 @@ -//Access restriction and seal delay, plus pat_module and rescue_pharm for medical suit -/obj/item/rig/medical/equipped - req_access = list(access_medical) - seal_delay = 5 - - initial_modules = list( - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/sprinter, - /obj/item/rig_module/pat_module, - /obj/item/rig_module/rescue_pharm - ) - -//Armor reduction for industrial suit -/obj/item/rig/industrial/vendor - desc = "A heavy, powerful hardsuit used by construction crews and mining corporations. This is a mass production model with reduced armor." - armor = list(melee = 50, bullet = 10, laser = 20, energy = 15, bomb = 30, bio = 100, rad = 50) - -//Area allowing backpacks to be placed on rigsuits. -/obj/item/rig/vox - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT) - -/obj/item/rig/combat - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT) - -/obj/item/rig/ert - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_CE, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT) - -/obj/item/rig/light/ninja - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY, POCKET_BAYSUIT) - -/obj/item/rig/merc - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY, POCKET_BAYSUIT) - -/obj/item/rig/ce - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_ENGINEERING, POCKET_CE, POCKET_BAYSUIT) - -/obj/item/rig/medical - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MEDICAL, POCKET_BAYSUIT, /obj/item/roller, /obj/item/storage/firstaid) - -/obj/item/rig/hazmat - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_XENOARC, POCKET_BAYSUIT) - -/obj/item/rig/hazard - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT) - -/obj/item/rig/industrial - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_BAYSUIT) - -/obj/item/rig/military - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_CE, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT) -/obj/item/rig/pmc - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT, /obj/item/storage/firstaid) - -/obj/item/rig/robotics - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, /obj/item/storage/box, /obj/item/storage/belt, /obj/item/defib_kit/compact) - -// 'Technomancer' hardsuit -/obj/item/rig/focalpoint - name = "\improper F.P.E. hardsuit control module" - desc = "A high-end hardsuit produced by Focal Point Energistics, focused around repair and construction." - - icon = 'icons/obj/rig_modules_vr.dmi' // the item - default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob - icon_state = "techno_rig" - suit_type = "\improper F.P.E. hardsuit" - cell_type = /obj/item/cell/hyper - - // Copied from CE rig - slowdown = 0 - offline_slowdown = 0 - offline_vision_restriction = 0 - rigsuit_max_pressure = 20 * ONE_ATMOSPHERE // Max pressure the rig protects against when sealed - rigsuit_min_pressure = 0 // Min pressure the rig protects against when sealed - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE // so it's like a rig firesuit - armor = list("melee" = 40, "bullet" = 10, "laser" = 30, "energy" = 55, "bomb" = 70, "bio" = 100, "rad" = 100) - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, /obj/item/storage/backpack) - chest_type = /obj/item/clothing/suit/space/rig/focalpoint - helm_type = /obj/item/clothing/head/helmet/space/rig/focalpoint - boot_type = /obj/item/clothing/shoes/magboots/rig/focalpoint - glove_type = /obj/item/clothing/gloves/gauntlets/rig/focalpoint - -/obj/item/rig/focalpoint/equipped - initial_modules = list( - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/teleporter, // Try not to set yourself on fire - /obj/item/rig_module/device/rcd, - /obj/item/rig_module/grenade_launcher/metalfoam - ) - -/obj/item/clothing/head/helmet/space/rig/focalpoint - icon = 'icons/inventory/head/item_vr.dmi' - default_worn_icon = 'icons/inventory/head/mob_vr.dmi' - icon_state = "techno_rig" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null - -/obj/item/clothing/suit/space/rig/focalpoint - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' - icon_state = "techno_rig" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null - -/obj/item/clothing/shoes/magboots/rig/focalpoint - icon = 'icons/inventory/feet/item_vr.dmi' - default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' - icon_state = "techno_rig" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null - -/obj/item/clothing/gloves/gauntlets/rig/focalpoint - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' - icon_state = "techno_rig" - siemens_coefficient = 0 - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null - -// 'Ironhammer' hardsuit -/obj/item/rig/hephaestus - name = "\improper Hephaestus hardsuit control module" - desc = "A high-end hardsuit produced by Hephaestus Industries, focused on destroying the competition. Literally." - - icon = 'icons/obj/rig_modules_vr.dmi' // the item - default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob - icon_state = "ihs_rig" - suit_type = "\improper Hephaestus hardsuit" - cell_type = /obj/item/cell/super - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_SECURITY, POCKET_ENGINEERING, POCKET_BAYSUIT, /obj/item/storage/firstaid, /obj/item/roller) - - armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 60, "bio" = 100, "rad" = 20) - - chest_type = /obj/item/clothing/suit/space/rig/hephaestus - helm_type = /obj/item/clothing/head/helmet/space/rig/hephaestus - boot_type = /obj/item/clothing/shoes/magboots/rig/hephaestus - glove_type = /obj/item/clothing/gloves/gauntlets/rig/hephaestus - -/obj/item/rig/hephaestus/equipped - initial_modules = list( - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/grenade_launcher, - /obj/item/rig_module/mounted/egun, - /obj/item/rig_module/mounted/energy_blade - ) - -/obj/item/clothing/head/helmet/space/rig/hephaestus - icon = 'icons/inventory/head/item_vr.dmi' - default_worn_icon = 'icons/inventory/head/mob_vr.dmi' - icon_state = "ihs_rig" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null - -/obj/item/clothing/suit/space/rig/hephaestus - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' - icon_state = "ihs_rig" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null - -/obj/item/clothing/shoes/magboots/rig/hephaestus - icon = 'icons/inventory/feet/item_vr.dmi' - default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' - icon_state = "ihs_rig" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null - -/obj/item/clothing/gloves/gauntlets/rig/hephaestus - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' - icon_state = "ihs_rig" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null - -// 'Zero' rig -/obj/item/rig/zero - name = "null hardsuit control module" - desc = "A very lightweight suit designed to allow use inside mechs and starfighters. It feels like you're wearing nothing at all." - - icon = 'icons/obj/rig_modules_vr.dmi' // the item - default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob - icon_state = "null_rig" - suit_type = "null hardsuit" - cell_type = /obj/item/cell/high - - chest_type = /obj/item/clothing/suit/space/rig/zero - helm_type = /obj/item/clothing/head/helmet/space/rig/zero - boot_type = null - glove_type = null - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_BAYSUIT) - - slowdown = 0 - offline_slowdown = 1 - offline_vision_restriction = 2 - armor = list("melee" = 20, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 35, "bio" = 100, "rad" = 20) - -/obj/item/rig/zero/equipped - initial_modules = list( - /obj/item/rig_module/maneuvering_jets - ) - -/obj/item/clothing/head/helmet/space/rig/zero - desc = "A bubble helmet that maximizes the field of view. A state of the art holographic display provides a stream of information." - icon = 'icons/inventory/head/item_vr.dmi' - default_worn_icon = 'icons/inventory/head/mob_vr.dmi' - icon_state = "null_rig" - sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM - slowdown = 0 - -/obj/item/clothing/suit/space/rig/zero - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' - icon_state = "null_rig" - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM - body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS // like a voidsuit - slowdown = 0 - -// Medical rig from bay -// CHOMPEdit: Commonwealth -> Solgov. -/obj/item/rig/baymed - name = "\improper Solgov medical hardsuit control module" - desc = "A lightweight first responder hardsuit from Solgov. Not suitable for combat use, but advanced myomer fibers can push the user to incredible speeds." - interface_intro = "Commonwealth" - - icon = 'icons/obj/rig_modules_vr.dmi' // the item - default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob - icon_state = "medical_rig_bay" - item_state = null - suit_type = "medical hardsuit" - cell_type = /obj/item/cell/high - - chest_type = /obj/item/clothing/suit/space/rig/baymed - helm_type = /obj/item/clothing/head/helmet/space/rig/baymed - boot_type = /obj/item/clothing/shoes/magboots/rig/baymed - glove_type = /obj/item/clothing/gloves/gauntlets/rig/baymed - - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MEDICAL, POCKET_BAYSUIT, /obj/item/roller) - - // speedy paper - slowdown = -0.5 - armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 25, "bio" = 100, "rad" = 20) - -/obj/item/rig/baymed/equipped - - initial_modules = list( - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/sprinter, - /obj/item/rig_module/pat_module, - /obj/item/rig_module/rescue_pharm - ) - -/obj/item/clothing/head/helmet/space/rig/baymed - icon = 'icons/inventory/head/item_vr.dmi' - default_worn_icon = 'icons/inventory/head/mob_vr.dmi' - icon_state = "medical_rig_bay" - item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM - -/obj/item/clothing/suit/space/rig/baymed - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' - icon_state = "medical_rig_bay" - item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM - -/obj/item/clothing/shoes/magboots/rig/baymed - icon = 'icons/inventory/feet/item_vr.dmi' - default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' - icon_state = "medical_rig_bay" - item_state = null - sprite_sheets = null - sprite_sheets_obj = null - -/obj/item/clothing/gloves/gauntlets/rig/baymed - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' - icon_state = "medical_rig_bay" - item_state = null - sprite_sheets = null - sprite_sheets_obj = null - -// Engineering/'Industrial' rig from bay -// CHOMPEdit: Commonwealth -> Solgov. -/obj/item/rig/bayeng - name = "\improper Solgov engineering hardsuit control module" - desc = "An advanced construction hardsuit from Solgov. Built like a tank. Don't expect to be taking any tight corners while running." - interface_intro = "Commonwealth" - - icon = 'icons/obj/rig_modules_vr.dmi' // the item - default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob - icon_state = "engineering_rig_bay" - item_state = null - suit_type = "engineering hardsuit" - cell_type = /obj/item/cell/super - - chest_type = /obj/item/clothing/suit/space/rig/bayeng - helm_type = /obj/item/clothing/head/helmet/space/rig/bayeng - boot_type = /obj/item/clothing/shoes/magboots/rig/bayeng - glove_type = /obj/item/clothing/gloves/gauntlets/rig/bayeng - - allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING, POCKET_CE, POCKET_BAYSUIT) - - slowdown = 0 - offline_slowdown = 5 // very bulky - armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50) - -/obj/item/rig/bayeng//equipped - initial_modules = list( - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/device/rcd, - /obj/item/rig_module/grenade_launcher/metalfoam, - /obj/item/rig_module/vision/meson, - /obj/item/rig_module/ai_container - ) - -/obj/item/clothing/head/helmet/space/rig/bayeng - icon = 'icons/inventory/head/item_vr.dmi' - default_worn_icon = 'icons/inventory/head/mob_vr.dmi' - icon_state = "engineering_rig_bay" - item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM - -/obj/item/clothing/suit/space/rig/bayeng - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' - icon_state = "engineering_rig_bay" - item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM - -/obj/item/clothing/shoes/magboots/rig/bayeng - icon = 'icons/inventory/feet/item_vr.dmi' - default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' - icon_state = "engineering_rig_bay" - item_state = null - sprite_sheets = null - sprite_sheets_obj = null - -/obj/item/clothing/gloves/gauntlets/rig/bayeng - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' - icon_state = "engineering_rig_bay" - item_state = null - sprite_sheets = null - sprite_sheets_obj = null - siemens_coefficient = 0 // insulated - -// Pathfinder rig from bay - event/reward stuff here -// CHOMPEdit: Commonwealth -> Solgov. -/obj/item/rig/pathfinder - name = "\improper Solgov pathfinder hardsuit control module" - desc = "A Solgov pathfinder hardsuit is hard to come by... how'd this end up on the frontier?" - interface_intro = "Commonwealth" - - icon = 'icons/obj/rig_modules_vr.dmi' // the item - default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob - icon_state = "pathfinder_rig_bay" - item_state = null - suit_type = "pathfinder hardsuit" - cell_type = /obj/item/cell/super - - chest_type = /obj/item/clothing/suit/space/rig/pathfinder - helm_type = /obj/item/clothing/head/helmet/space/rig/pathfinder - boot_type = /obj/item/clothing/shoes/magboots/rig/pathfinder - glove_type = /obj/item/clothing/gloves/gauntlets/rig/pathfinder - - slowdown = 0.5 - offline_slowdown = 4 // bulky - offline_vision_restriction = 2 // doesn't even have a way to see out without power - armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50) - -/obj/item/rig/pathfinder//equipped - initial_modules = list( - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/teleporter, - /obj/item/rig_module/stealth_field, - /obj/item/rig_module/mounted/energy_blade - ) - -/obj/item/clothing/head/helmet/space/rig/pathfinder - icon = 'icons/inventory/head/item_vr.dmi' - default_worn_icon = 'icons/inventory/head/mob_vr.dmi' - icon_state = "pathfinder_rig_bay" - item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM - -/obj/item/clothing/suit/space/rig/pathfinder - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' - icon_state = "pathfinder_rig_bay" - item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM - -/obj/item/clothing/shoes/magboots/rig/pathfinder - icon = 'icons/inventory/feet/item_vr.dmi' - default_worn_icon = 'icons/inventory/feet/mob_vr.dmi' - icon_state = "pathfinder_rig_bay" - item_state = null - sprite_sheets = null - sprite_sheets_obj = null - -/obj/item/clothing/gloves/gauntlets/rig/pathfinder - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' - icon_state = "pathfinder_rig_bay" - item_state = null - sprite_sheets = null - sprite_sheets_obj = null diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm index 15098aa748..d1233be039 100644 --- a/code/modules/mining/kinetic_crusher.dm +++ b/code/modules/mining/kinetic_crusher.dm @@ -270,7 +270,7 @@ item_state = "c-gauntlets" attack_verb = list("bashed", "kicked", "punched", "struck", "axe kicked", "uppercut", "cross-punched", "jabbed", "hammerfisted", "roundhouse kicked") integ_light_icon = FALSE - w_class = ITEMSIZE_HUGE + w_class = ITEMSIZE_NORMAL can_cleave = FALSE requires_wield = TRUE force = 28 diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm index e63f09772c..c924cc820d 100644 --- a/code/modules/mining/machinery/machine_processing.dm +++ b/code/modules/mining/machinery/machine_processing.dm @@ -6,7 +6,7 @@ /obj/machinery/mineral/processing_unit_console name = "production machine console" - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "console" layer = ABOVE_WINDOW_LAYER density = TRUE @@ -150,7 +150,7 @@ /obj/machinery/mineral/processing_unit name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron... - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "furnace" density = TRUE anchored = TRUE diff --git a/code/modules/mining/machinery/machine_stacking.dm b/code/modules/mining/machinery/machine_stacking.dm index d388ecb28d..048298d7a2 100644 --- a/code/modules/mining/machinery/machine_stacking.dm +++ b/code/modules/mining/machinery/machine_stacking.dm @@ -2,7 +2,7 @@ /obj/machinery/mineral/stacking_unit_console name = "stacking machine console" - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "console" layer = ABOVE_WINDOW_LAYER density = TRUE @@ -70,7 +70,7 @@ /obj/machinery/mineral/stacking_machine name = "stacking machine" - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "stacker" density = TRUE anchored = TRUE diff --git a/code/modules/mining/machinery/machine_unloading.dm b/code/modules/mining/machinery/machine_unloading.dm index cfb66a0b5f..d20536131c 100644 --- a/code/modules/mining/machinery/machine_unloading.dm +++ b/code/modules/mining/machinery/machine_unloading.dm @@ -3,14 +3,13 @@ /obj/machinery/mineral/unloading_machine name = "unloading machine" - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "unloader" density = TRUE anchored = TRUE var/obj/machinery/mineral/input = null var/obj/machinery/mineral/output = null - /obj/machinery/mineral/unloading_machine/Initialize(mapload) . = ..() for(var/dir in GLOB.cardinal) diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 26b174ef7a..b596030371 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -15,7 +15,7 @@ var/icon_vend = "minevend-vend" circuit = /obj/item/circuitboard/mining_equipment_vendor var/obj/item/card/id/inserted_id - var/list/prize_list // Initialized just below! (if you're wondering why - check CONTRIBUTING.md, look for: "hidden" init proc) + var/list/prize_list //Generated during Initialize var/dirty_items = FALSE // Used to refresh the static/redundant data in case the machine gets VV'd /datum/data/mining_equipment @@ -30,109 +30,111 @@ /obj/machinery/mineral/equipment_vendor/Initialize(mapload) . = ..() - //VOREStation Edit Start - Heavily modified list prize_list = list() prize_list["Gear"] = list( - // TODO EQUIPMENT("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), - // TODO EQUIPMENT("Explorer's Webbing", /obj/item/storage/belt/mining, 500), + EQUIPMENT("Brown Webbing", /obj/item/clothing/accessory/storage/brown_vest, 500), EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/material/knife/machete, 500), EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/grenade/spawnergrenade/manhacks/station/locked, 1000), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/grenade/spawnergrenade/ward, 1500), EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/grenade/smokebomb, 100), + EQUIPMENT("Defense Equipment - Phase Pistol", /obj/item/gun/energy/locked/phasegun/pistol, 1500), //CHOMPEDIT EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/kinetic_crusher/machete/dagger, 500), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/kinetic_crusher/machete, 1000), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Gauntlets", /obj/item/kinetic_crusher/machete/gauntlets, 1000), //eh this is two-handed so whatever, same price for slight dmg increase! EQUIPMENT("Machete Holster", /obj/item/clothing/accessory/holster/machete, 350), - EQUIPMENT("Durasteel Fishing Rod", /obj/item/material/fishing_rod/modern/strong, 7500), + EQUIPMENT("Defense Equipment - PSG-B (Melee)", /obj/item/personal_shield_generator/belt/melee/loaded, 5000), + EQUIPMENT("Defense Equipment - PSG-M (General)", /obj/item/personal_shield_generator/belt/mining/loaded, 1000), + EQUIPMENT("PSG-M Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 50), + EQUIPMENT("Durasteel Fishing Rod", /obj/item/material/fishing_rod/modern/strong, 5000), EQUIPMENT("Titanium Fishing Rod", /obj/item/material/fishing_rod/modern, 1000), EQUIPMENT("Fishing Net", /obj/item/material/fishing_net, 500), EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 500), EQUIPMENT("Geiger Counter", /obj/item/geiger, 750), EQUIPMENT("GPS Device", /obj/item/gps/mining, 100), - // EQUIPMENT("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000), EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), EQUIPMENT("Mini-Translocator", /obj/item/perfect_tele/one_beacon, 1200), EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 750), EQUIPMENT("Mining Satchel of Holding", /obj/item/storage/bag/ore/holding, 1500), + EQUIPMENT("Industrial Equipment - Sheet-Snatcher", /obj/item/storage/bag/sheetsnatcher, 500), EQUIPMENT("Sheet Snatcher of Holding", /obj/item/storage/bag/sheetsnatcher/holding, 1000), EQUIPMENT("Advanced Ore Scanner", /obj/item/mining_scanner/advanced, 500), + EQUIPMENT("Exotic Sample Container", /obj/item/storage/sample_container, 100), ) prize_list["Consumables"] = list( EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30), EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 1200), - EQUIPMENT("Injector (L) - Glucose", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500), - EQUIPMENT("Injector (L) - Panacea", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 500), - EQUIPMENT("Injector (L) - Trauma", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 500), + EQUIPMENT("Injector (L) - Glucose", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500), + EQUIPMENT("Injector (L) - Panacea", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 500), + EQUIPMENT("Injector (L) - Trauma", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 500), EQUIPMENT("Nanopaste Tube", /obj/item/stack/nanopaste, 1000), - EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500), - EQUIPMENT("Shelter Capsule", /obj/item/survivalcapsule, 500), - EQUIPMENT("Burn Medipen", /obj/item/reagent_containers/hypospray/autoinjector/burn, 250), - EQUIPMENT("Detox Medipen", /obj/item/reagent_containers/hypospray/autoinjector/detox, 250), - EQUIPMENT("Oxy Medipen", /obj/item/reagent_containers/hypospray/autoinjector/oxy, 250), - EQUIPMENT("Trauma Medipen", /obj/item/reagent_containers/hypospray/autoinjector/trauma, 250), + EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500), + EQUIPMENT("Shelter Capsule", /obj/item/survivalcapsule, 500), + EQUIPMENT("Burn Medipen", /obj/item/reagent_containers/hypospray/autoinjector/burn, 250), + EQUIPMENT("Detox Medipen", /obj/item/reagent_containers/hypospray/autoinjector/detox, 250), + EQUIPMENT("Oxy Medipen", /obj/item/reagent_containers/hypospray/autoinjector/oxy, 250), + EQUIPMENT("Trauma Medipen", /obj/item/reagent_containers/hypospray/autoinjector/trauma, 250), ) prize_list["Kinetic Accelerator"] = list( - EQUIPMENT("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 900), - EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), - EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), - EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200), - EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), - EQUIPMENT("KA Temperature Modulator", /obj/item/borg/upgrade/modkit/heater, 1000), - EQUIPMENT("KA Off-Station Modulator", /obj/item/borg/upgrade/modkit/offsite, 1750), - EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350), - EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), - EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), - EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable, 175), - EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 125), - EQUIPMENT("Premium Kinetic Accelerator",/obj/item/gun/energy/kinetic_accelerator/premiumka, 12000), + EQUIPMENT("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 900), + EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), + EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), + EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200), + EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), + EQUIPMENT("KA Temperature Modulator", /obj/item/borg/upgrade/modkit/heater, 1000), + EQUIPMENT("KA Off-Station Modulator", /obj/item/borg/upgrade/modkit/offsite, 1750), + EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350), + EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), + EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), + EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable, 175), + EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 125), + EQUIPMENT("Premium Kinetic Accelerator",/obj/item/gun/energy/kinetic_accelerator/premiumka, 12000), ) prize_list["Digging Tools"] = list( - EQUIPMENT("Resonator", /obj/item/resonator, 900), - EQUIPMENT("Silver Pickaxe", /obj/item/pickaxe/silver, 1200), - EQUIPMENT("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), - EQUIPMENT("Super Resonator", /obj/item/resonator/upgraded, 2500), - EQUIPMENT("Archeology Equipment - Chisels", /obj/item/storage/excavation, 500), - EQUIPMENT("Archeology Equipment - Scanner", /obj/item/depth_scanner, 1000), // They can get a basic scanner for archeology, but not the anomaly scanner. Keeps job stealing at a minimum while also allowing miners to excavate any cool rocks they come across. - EQUIPMENT("Fine Excavation Kit - Measuring Tape", /obj/item/measuring_tape, 125), - EQUIPMENT("Explosive Excavation Kit - Plastic Charge",/obj/item/plastique/seismic/locked, 1500), - EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 3000), - EQUIPMENT("Industrial Equipment - Inducer", /obj/item/inducer, 3500), - EQUIPMENT("Industrial Equipment - Sheet-Snatcher", /obj/item/storage/bag/sheetsnatcher, 500), + EQUIPMENT("Resonator", /obj/item/resonator, 900), + EQUIPMENT("Silver Pickaxe", /obj/item/pickaxe/silver, 1200), + EQUIPMENT("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), + EQUIPMENT("Super Resonator", /obj/item/resonator/upgraded, 2500), + EQUIPMENT("Archeology Equipment - Chisels", /obj/item/storage/excavation, 500), + EQUIPMENT("Archeology Equipment - Scanner", /obj/item/depth_scanner, 1000), // They can get a basic scanner for archeology, but not the anomaly scanner. Keeps job stealing at a minimum while also allowing miners to excavate any cool rocks they come across. + EQUIPMENT("Fine Excavation Kit - Measuring Tape", /obj/item/measuring_tape, 125), + EQUIPMENT("Explosive Excavation Kit - Plastic Charge", /obj/item/plastique/seismic/locked, 1500), + EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 3000), + EQUIPMENT("Industrial Equipment - Inducer", /obj/item/inducer, 3500), ) prize_list["Hardsuit"] = list( - EQUIPMENT("Hardsuit - Control Module", /obj/item/rig/industrial/vendor, 2000), - EQUIPMENT("Hardsuit - Drill", /obj/item/rig_module/device/drill, 5000), - EQUIPMENT("Hardsuit - Intelligence Storage", /obj/item/rig_module/ai_container, 2500), - EQUIPMENT("Hardsuit - Maneuvering Jets", /obj/item/rig_module/maneuvering_jets, 1250), - EQUIPMENT("Hardsuit - Material Scanner", /obj/item/rig_module/vision/material, 500), - EQUIPMENT("Hardsuit - Ore Scanner", /obj/item/rig_module/device/orescanner, 1000), - EQUIPMENT("Hardsuit - Plasma Cutter", /obj/item/rig_module/device/plasmacutter, 800), - EQUIPMENT("Hardsuit - Smoke Bomb Deployer", /obj/item/rig_module/grenade_launcher/smoke, 2000), - EQUIPMENT("Hardsuit - Proto-Kinetic Gauntlets", /obj/item/rig_module/gauntlets, 2000), + EQUIPMENT("Hardsuit - Cheap Control Module", /obj/item/rig/industrial/vendor, 2000), + EQUIPMENT("Hardsuit - Premium Control Module", /obj/item/rig/industrial, 5000), + EQUIPMENT("Hardsuit - Drill", /obj/item/rig_module/device/drill, 2500), + EQUIPMENT("Hardsuit - Intelligence Storage", /obj/item/rig_module/ai_container, 2500), + EQUIPMENT("Hardsuit - Maneuvering Jets", /obj/item/rig_module/maneuvering_jets, 1250), + EQUIPMENT("Hardsuit - Material Scanner", /obj/item/rig_module/vision/material, 1000), + EQUIPMENT("Hardsuit - Advanced Optics", /obj/item/rig_module/vision/mining, 2000), + EQUIPMENT("Hardsuit - Ore Scanner", /obj/item/rig_module/device/orescanner, 1000), + EQUIPMENT("Hardsuit - Plasma Cutter", /obj/item/rig_module/device/plasmacutter, 800), + EQUIPMENT("Hardsuit - Anomaly Scanner", /obj/item/rig_module/device/anomaly_scanner, 2500), + EQUIPMENT("Hardsuit - Anomaly Drill", /obj/item/rig_module/device/arch_drill, 2500), + EQUIPMENT("Hardsuit - Radiation Shield", /obj/item/rig_module/rad_shield, 2000), + EQUIPMENT("Hardsuit - Smoke Bomb Deployer", /obj/item/rig_module/grenade_launcher/smoke, 2000), + EQUIPMENT("Hardsuit - Proto-Kinetic Gauntlets", /obj/item/rig_module/gauntlets, 2000), ) prize_list["Miscellaneous"] = list( - EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125), - EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150), - EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500), - EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000), - EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 900), - EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3100), - EQUIPMENT("Bar Shelter Capsule", /obj/item/survivalcapsule/luxurybar, 10000), - EQUIPMENT("Plush Toy", /obj/random/plushie, 300), - EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 200), - EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 1000), - EQUIPMENT("Thalers - 1000", /obj/item/spacecash/c1000, 10000), - EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 200), - EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125), - EQUIPMENT("Mining PSG Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 2500), - //CHOMPedit Start - EQUIPMENT("Mining PSG", /obj/item/personal_shield_generator/belt/mining/loaded, 2000), - //CHOMPedit End + EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125), + EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150), + EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500), + EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000), + EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 900), + EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3100), + EQUIPMENT("Bar Shelter Capsule", /obj/item/survivalcapsule/luxurybar, 10000), + EQUIPMENT("Plush Toy", /obj/random/plushie, 300), + EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 200), + EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 1000), + EQUIPMENT("Thalers - 1000", /obj/item/spacecash/c1000, 10000), + EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 200), + EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125), ) prize_list["Extra"] = list() // Used in child vendors - //VOREStation Edit End /obj/machinery/mineral/equipment_vendor/power_change() var/old_stat = stat diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 09e8e0da9b..6ef131b795 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -1,135 +1,110 @@ /obj/machinery/mineral/equipment_vendor/survey name = "exploration equipment vendor" desc = "An equipment vendor for explorers, points collected with a survey scanner can be spent here." - icon = 'icons/obj/machines/mining_machines_vr.dmi' //VOREStation Edit - icon_state = "exploration" //VOREStation Edit + icon = 'icons/obj/machines/mining_machines.dmi' + icon_state = "exploration" density = TRUE anchored = TRUE circuit = /obj/item/circuitboard/exploration_equipment_vendor - icon_deny = "exploration-deny" //VOREStation Edit - icon_vend = "exploration-vend" //VOREStation Add - prize_list = list( - new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), - new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), - new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30), - new /datum/data/mining_equipment(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120), - new /datum/data/mining_equipment(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120), - new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15), - new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 20), - new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 90), - new /datum/data/mining_equipment("Geiger Counter", /obj/item/geiger, 75), - new /datum/data/mining_equipment("Plush Toy", /obj/random/plushie, 30), - new /datum/data/mining_equipment("Umbrella", /obj/item/melee/umbrella/random, 10), - new /datum/data/mining_equipment("Extraction Equipment - Fulton Beacon", /obj/item/fulton_core, 100), - new /datum/data/mining_equipment("Extraction Equipment - Fulton Pack", /obj/item/extraction_pack, 50), - new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card/survey, 50), - new /datum/data/mining_equipment("Fishing Net", /obj/item/material/fishing_net, 50), - new /datum/data/mining_equipment("Titanium Fishing Rod", /obj/item/material/fishing_rod/modern, 50), - new /datum/data/mining_equipment("Direct Payment - 1000", /obj/item/spacecash/c1000, 500), - new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 500), - new /datum/data/mining_equipment("Survey Tools - Mapping Unit", /obj/item/mapping_unit, 150), - new /datum/data/mining_equipment("Survey Tools - Mapping Beacon",/obj/item/holomap_beacon, 25), - new /datum/data/mining_equipment("Survey Tools - Shovel", /obj/item/shovel, 20), - new /datum/data/mining_equipment("Survey Tools - Mechanical Trap", /obj/item/beartrap, 30), - new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 100), - new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 300), - new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 30), - new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 30), - new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), - new /datum/data/mining_equipment("Nanopaste Tube", /obj/item/stack/nanopaste, 50), - new /datum/data/mining_equipment("Defense Equipment - Phase Pistol",/obj/item/gun/energy/locked/phasegun/pistol, 15), //CHOMPedit - new /datum/data/mining_equipment("Defense Equipment - Smoke Bomb",/obj/item/grenade/smokebomb, 50), - new /datum/data/mining_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/grenade/spawnergrenade/manhacks/station, 50), - new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/grenade/spawnergrenade/ward, 100), - new /datum/data/mining_equipment("Defense Equipment - Steel Machete", /obj/item/material/knife/machete, 50), - new /datum/data/mining_equipment("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75) - ) + icon_deny = "exploration-deny" + icon_vend = "exploration-vend" /obj/machinery/mineral/equipment_vendor/survey/Initialize(mapload) . = ..() - //VOREStation Edit Start - Heavily modified list prize_list = list() prize_list["Gear"] = list( - EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/grenade/smokebomb, 10), - EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/material/knife/machete, 50), - EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/grenade/spawnergrenade/manhacks/station/locked, 100), - EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/grenade/spawnergrenade/ward, 150), - EQUIPMENT("Defense Equipment - Marksman Frontier Phaser", /obj/item/gun/energy/locked/frontier/rifle, 800), //CHOMPADD - EQUIPMENT("Defense Equipment - Frontier Shotgun", /obj/item/gun/energy/locked/frontier/shotgun, 800), //CHOMPADD - EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/gun/energy/locked/frontier/carbine, 800), //CHOMPEDIT - EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/gun/energy/locked/frontier, 600), //CHOMPADD - EQUIPMENT("Defense Equipment - Holdout Frontier Phaser", /obj/item/gun/energy/locked/frontier/holdout, 300), //CHOMPADD - EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/kinetic_crusher/machete/dagger, 75), - EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/kinetic_crusher/machete, 250), - EQUIPMENT("Fishing Net", /obj/item/material/fishing_net, 50), - EQUIPMENT("Titanium Fishing Rod", /obj/item/material/fishing_rod/modern, 100), - EQUIPMENT("Durasteel Fishing Rod", /obj/item/material/fishing_rod/modern/strong, 750), - EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 300), - EQUIPMENT("Geiger Counter", /obj/item/geiger, 75), - EQUIPMENT("GPS Device", /obj/item/gps/mining, 10), - EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 250), - EQUIPMENT("Mini-Translocator", /obj/item/perfect_tele/one_beacon, 120), - EQUIPMENT("Survey Tools - Mapping Unit", /obj/item/mapping_unit, 150), - EQUIPMENT("Survey Tools - Mapping Beacon", /obj/item/holomap_beacon, 25), - EQUIPMENT("Survey Tools - Advanced Cataloguer", /obj/item/cataloguer/advanced, 300), //CHOMPADD - EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75), - EQUIPMENT("Survival Equipment - Glowstick", /obj/item/flashlight/glowstick, 5), - EQUIPMENT("Survival Equipment - Flare", /obj/item/flashlight/flare, 5), - EQUIPMENT("Survival Equipment - Radioisotope Glowstick", /obj/item/flashlight/glowstick/radioisotope, 40), - EQUIPMENT("Survival Equipment - Modular Explorer Suit", /obj/item/clothing/suit/armor/pcarrier/explorer, 200), - EQUIPMENT("Survival Equipment - Armored Jumpsuit", /obj/item/clothing/under/explorer/armored, 200), - EQUIPMENT("Survival Equipment - Exploration Plate", /obj/item/clothing/accessory/armor/armorplate/explorer, 50), //CHOMPADD - EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer, 50), //CHOMPADD - EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer, 50), //CHOMPADD - EQUIPMENT("Survival Equipment - Exploration Riot shield", /obj/item/shield/riot/explorer, 75), //CHOMPADD - EQUIPMENT("Survival Equipment - Storage Pouch", /obj/item/clothing/accessory/storage/pouches/green, 10), //CHOMPADD - EQUIPMENT("Survival Equipment - Large Storage Pouch", /obj/item/clothing/accessory/storage/pouches/large/green, 25), //CHOMPADD - EQUIPMENT("Survival Equipment - Pathfinder Belt", /obj/item/storage/belt/explorer/pathfinder, 200), //CHOMPADD + EQUIPMENT("Brown Webbing", /obj/item/clothing/accessory/storage/brown_vest, 500), + EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/grenade/smokebomb, 10), + EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/grenade/spawnergrenade/manhacks/station/locked, 100), + EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/grenade/spawnergrenade/ward, 150), + EQUIPMENT("Defense Equipment - Phase Pistol", /obj/item/gun/energy/locked/phasegun/pistol, 100), //CHOMPEDIT + EQUIPMENT("Defense Equipment - Marksman Frontier Phaser", /obj/item/gun/energy/locked/frontier/rifle, 800), //CHOMPADD + EQUIPMENT("Defense Equipment - Frontier Shotgun", /obj/item/gun/energy/locked/frontier/shotgun, 800), //CHOMPADD + EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/gun/energy/locked/frontier/carbine, 800), //CHOMPEDIT + EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/gun/energy/locked/frontier, 600), //CHOMPADD + EQUIPMENT("Defense Equipment - Holdout Frontier Phaser", /obj/item/gun/energy/locked/frontier/holdout, 300), //CHOMPADD + EQUIPMENT("Defense Equipment - Phase Carbine", /obj/item/gun/energy/locked/phasegun, 200), //CHOMPEDIT + EQUIPMENT("Defense Equipment - Phase Rifle", /obj/item/gun/energy/locked/phasegun/rifle, 350), //CHOMPEDIT + EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/material/knife/machete, 50), + EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/kinetic_crusher/machete, 100), + EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/kinetic_crusher/machete/dagger, 75), + EQUIPMENT("Hybrid Equipment - Proto-Kinetic Gauntlets", /obj/item/kinetic_crusher/machete/gauntlets, 150), + EQUIPMENT("Machete Holster", /obj/item/clothing/accessory/holster/machete, 10), + EQUIPMENT("Defense Equipment - PSG-B (Melee)", /obj/item/personal_shield_generator/belt/melee/loaded, 500), + EQUIPMENT("Defense Equipment - PSG-M (General)", /obj/item/personal_shield_generator/belt/mining/loaded, 100), + EQUIPMENT("PSG-M Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 50), + EQUIPMENT("Fishing Net", /obj/item/material/fishing_net, 50), + EQUIPMENT("Titanium Fishing Rod", /obj/item/material/fishing_rod/modern, 100), + EQUIPMENT("Durasteel Fishing Rod", /obj/item/material/fishing_rod/modern/strong, 750), + EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 300), + EQUIPMENT("Geiger Counter", /obj/item/geiger, 75), + EQUIPMENT("GPS Device", /obj/item/gps/mining, 10), + EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 250), + EQUIPMENT("Mini-Translocator", /obj/item/perfect_tele/one_beacon, 120), + EQUIPMENT("Survey Tools - Mapping Unit", /obj/item/mapping_unit, 150), + EQUIPMENT("Survey Tools - Mapping Beacon", /obj/item/holomap_beacon, 25), + EQUIPMENT("Survey Tools - Advanced Cataloguer", /obj/item/cataloguer/advanced, 300), //CHOMPADD + EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75), + EQUIPMENT("Survival Equipment - Glowstick", /obj/item/flashlight/glowstick, 5), + EQUIPMENT("Survival Equipment - Flare", /obj/item/flashlight/flare, 5), + EQUIPMENT("Survival Equipment - Radioisotope Glowstick", /obj/item/flashlight/glowstick/radioisotope, 40), + EQUIPMENT("Survival Equipment - Modular Explorer Suit", /obj/item/clothing/suit/armor/pcarrier/explorer, 200), + EQUIPMENT("Survival Equipment - Armored Jumpsuit", /obj/item/clothing/under/explorer/armored, 200), + EQUIPMENT("Survival Equipment - Exploration Plate", /obj/item/clothing/accessory/armor/armorplate/explorer, 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer, 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer, 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Riot shield", /obj/item/shield/riot/explorer, 75), //CHOMPADD + EQUIPMENT("Survival Equipment - Storage Pouch", /obj/item/clothing/accessory/storage/pouches/green, 10), //CHOMPADD + EQUIPMENT("Survival Equipment - Large Storage Pouch", /obj/item/clothing/accessory/storage/pouches/large/green, 25), //CHOMPADD + EQUIPMENT("Survival Equipment - Pathfinder Belt", /obj/item/storage/belt/explorer/pathfinder, 200), //CHOMPADD + EQUIPMENT("Exotic Sample Container", /obj/item/storage/sample_container, 100), ) prize_list["Consumables"] = list( - EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), - EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), - EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30), - EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 125), - EQUIPMENT("Injector (L) - Glucose", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50), - EQUIPMENT("Injector (L) - Panacea", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 50), - EQUIPMENT("Injector (L) - Trauma", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), - EQUIPMENT("Nanopaste Tube", /obj/item/stack/nanopaste, 100), - EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card/survey, 50), - EQUIPMENT("Shelter Capsule", /obj/item/survivalcapsule, 50), - EQUIPMENT("Burn Medipen", /obj/item/reagent_containers/hypospray/autoinjector/burn, 25), - EQUIPMENT("Detox Medipen", /obj/item/reagent_containers/hypospray/autoinjector/detox, 25), - EQUIPMENT("Oxy Medipen", /obj/item/reagent_containers/hypospray/autoinjector/oxy, 25), - EQUIPMENT("Trauma Medipen", /obj/item/reagent_containers/hypospray/autoinjector/trauma, 25), + EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), + EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), + EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30), + EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 125), + EQUIPMENT("Injector (L) - Glucose", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50), + EQUIPMENT("Injector (L) - Panacea", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 50), + EQUIPMENT("Injector (L) - Trauma", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), + EQUIPMENT("Nanopaste Tube", /obj/item/stack/nanopaste, 100), + EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card/survey, 50), + EQUIPMENT("Shelter Capsule", /obj/item/survivalcapsule, 50), + EQUIPMENT("Burn Medipen", /obj/item/reagent_containers/hypospray/autoinjector/burn, 25), + EQUIPMENT("Detox Medipen", /obj/item/reagent_containers/hypospray/autoinjector/detox, 25), + EQUIPMENT("Oxy Medipen", /obj/item/reagent_containers/hypospray/autoinjector/oxy, 25), + EQUIPMENT("Trauma Medipen", /obj/item/reagent_containers/hypospray/autoinjector/trauma, 25), ) prize_list["Digging Tools"] = list( - EQUIPMENT("Survey Tools - Shovel", /obj/item/shovel, 40), - EQUIPMENT("Survey Tools - Mechanical Trap", /obj/item/beartrap, 50), - EQUIPMENT("Survey Tools - Binoculars", /obj/item/binoculars,40), + EQUIPMENT("Survey Tools - Shovel", /obj/item/shovel, 40), + EQUIPMENT("Survey Tools - Mechanical Trap", /obj/item/beartrap, 50), + EQUIPMENT("Survey Tools - Binoculars", /obj/item/binoculars, 40), + EQUIPMENT("Archeology Equipment - Chisels", /obj/item/storage/excavation, 50), + EQUIPMENT("Archeology Equipment - Scanner", /obj/item/depth_scanner, 50), + EQUIPMENT("Fine Excavation Kit - Measuring Tape", /obj/item/measuring_tape, 10), + ) prize_list["Miscellaneous"] = list( - EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10), - EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10), - EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15), - EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50), - EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100), - EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 300), - EQUIPMENT("Industrial Equipment - Inducer", /obj/item/inducer, 750), - EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 90), - EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 310), - EQUIPMENT("Bar Shelter Capsule", /obj/item/survivalcapsule/luxurybar, 1000), - EQUIPMENT("Plush Toy", /obj/random/plushie, 30), - EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 20), - EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 100), - EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 20), - EQUIPMENT("UAV - Recon Skimmer", /obj/item/uav, 40), - //CHOMPedit Start - EQUIPMENT("Mining-Grade PSG", /obj/item/personal_shield_generator/belt/mining/loaded, 100), - EQUIPMENT("Security-Grade PSG", /obj/item/personal_shield_generator/belt/security/loaded, 200), - EQUIPMENT("PSG Variant-P", /obj/item/personal_shield_generator/belt/parry, 250), - //CHOMPedit End + EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10), + EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10), + EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15), + EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50), + EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100), + EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 300), + EQUIPMENT("Industrial Equipment - Inducer", /obj/item/inducer, 750), + EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 90), + EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 310), + EQUIPMENT("Bar Shelter Capsule", /obj/item/survivalcapsule/luxurybar, 1000), + EQUIPMENT("Plush Toy", /obj/random/plushie, 30), + EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 20), + EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 100), + EQUIPMENT("Thalers - 1000", /obj/item/spacecash/c1000, 1000), + EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 20), + EQUIPMENT("UAV - Recon Skimmer", /obj/item/uav, 40), + EQUIPMENT("Mining-Grade PSG", /obj/item/personal_shield_generator/belt/mining/loaded, 100), //CHOMPADD + EQUIPMENT("Security-Grade PSG", /obj/item/personal_shield_generator/belt/security/loaded, 200), //CHOMPADD + EQUIPMENT("PSG Variant-P", /obj/item/personal_shield_generator/belt/parry, 250), //CHOMPADD ) - //VOREStation Edit End /obj/machinery/mineral/equipment_vendor/survey/get_points(obj/item/card/id/target) if(!istype(target)) diff --git a/code/modules/mob/living/simple_mob/defense.dm b/code/modules/mob/living/simple_mob/defense.dm index 56df7e567a..4e42d6c7ad 100644 --- a/code/modules/mob/living/simple_mob/defense.dm +++ b/code/modules/mob/living/simple_mob/defense.dm @@ -1,10 +1,8 @@ // Hit by a projectile. /mob/living/simple_mob/bullet_act(var/obj/item/projectile/P) //Projectiles with bonus SA damage - if(!P.nodamage) - // if(!P.SA_vulnerability || P.SA_vulnerability == intelligence_level) - if(P.SA_vulnerability & mob_class) - P.damage += P.SA_bonus_damage + if(!P.nodamage && P.mob_bonus_damage && !mind) //If the projectile is NOT a nodamage projectile, we HAVE A BONUS damage, AND the mob is not player controlled (it has no mind), we do bonus damage + P.damage += P.mob_bonus_damage . = ..() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 5b437d1ac1..bd3a59019c 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -103,8 +103,7 @@ var/damage = 10 var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE, HALLOSS, ELECTROCUTE, BIOACID, SEARING are the only things that should be in here - var/SA_bonus_damage = 0 // Some bullets inflict extra damage on simple animals. - var/SA_vulnerability = null // What kind of simple animal the above bonus damage should be applied to. Set to null to apply to all SAs. + var/mob_bonus_damage = 0 // Some bullets inflict extra damage on simple animals. var/nodamage = 0 //Determines if the projectile will skip any damage inflictions var/taser_effect = 0 //If set then the projectile will apply it's agony damage using stun_effect_act() to mobs it hits, and other damage will be ignored var/check_armour = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid @@ -667,7 +666,7 @@ /obj/item/projectile/proc/get_structure_damage() if(damage_type == BRUTE || damage_type == BURN) - return damage + SA_bonus_damage //CHOMP Edit: Added SA_bonus_damage to the returned value so that phaser can do damage against shields. + return damage + mob_bonus_damage //CHOMP Edit: Added mob_bonus_damage to the returned value so that phaser can do damage against shields. return 0 //return 1 if the projectile should be allowed to pass through after all, 0 if not. diff --git a/code/modules/projectiles/projectile/beams_ch.dm b/code/modules/projectiles/projectile/beams_ch.dm index 13f1ac6061..70032802c3 100644 --- a/code/modules/projectiles/projectile/beams_ch.dm +++ b/code/modules/projectiles/projectile/beams_ch.dm @@ -1,7 +1,6 @@ /obj/item/projectile/beam/phaser //The "medium" phaser beam. damage = 20 - SA_bonus_damage = 20 - SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION) + mob_bonus_damage = 20 icon = 'icons/obj/projectiles_ch.dmi' icon_state = "phaser" light_color = "#F18F12" @@ -13,7 +12,7 @@ /obj/item/projectile/beam/phaser/light damage = 10 - SA_bonus_damage = 10 + mob_bonus_damage = 10 icon_state = "phaser_light" light_range = 1.5 light_power = 0.3 @@ -24,7 +23,7 @@ /obj/item/projectile/beam/phaser/heavy damage = 30 - SA_bonus_damage = 30 + mob_bonus_damage = 30 icon_state = "phaser_heavy" light_range = 3 light_power = 1 @@ -35,7 +34,7 @@ /obj/item/projectile/beam/phaser/heavy/cannon damage = 40 - SA_bonus_damage = 40 + mob_bonus_damage = 40 /obj/effect/projectile/tracer/phaser diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 2dcb425fc6..cbfbd1bac1 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -216,8 +216,7 @@ /obj/item/projectile/bullet/rifle/a762/hunter // Optimized for killing simple animals and not people, because Balance(tm) damage = 20 - SA_bonus_damage = 50 // 70 total on animals. - SA_vulnerability = SA_ANIMAL + mob_bonus_damage = 50 hud_state = "rifle_heavy" /obj/item/projectile/bullet/rifle/a545 @@ -238,8 +237,7 @@ /obj/item/projectile/bullet/rifle/a545/hunter damage = 15 - SA_bonus_damage = 35 // 50 total on animals. - SA_vulnerability = SA_ANIMAL + mob_bonus_damage = 35 hud_state = "rifle_heavy" /obj/item/projectile/bullet/rifle/a145 // 14.5×114mm is bigger than a .50 BMG round. diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index c33072b965..d68009bbf3 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -294,24 +294,20 @@ icon_state = "phase" range = 13 //Chompedit This range was still awful damage = 5 - SA_bonus_damage = 45 // 50 total on animals - SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION, MOB_CLASS_HUMANOID) //CHOMP Edit expand this list + mob_bonus_damage = 45 hud_state = "laser_heat" /obj/item/projectile/energy/phase/light - range = 11 //Chompedit This range was absolutely pathetic - SA_bonus_damage = 35 // 40 total on animals + range = 4 hud_state = "laser_heat" /obj/item/projectile/energy/phase/heavy - range = 16 //Chompedit This range was not great - SA_bonus_damage = 55 // 60 total on animals + range = 8 hud_state = "laser_heat" /obj/item/projectile/energy/phase/heavy/cannon range = 20 //Chompedit This range was mediocre, but not worth a cannon. damage = 15 - SA_bonus_damage = 60 // 75 total on animals hud_state = "laser_heat" */ diff --git a/code/modules/projectiles/projectile/energy_ch.dm b/code/modules/projectiles/projectile/energy_ch.dm index 25f58fcd6c..a46d0f135c 100644 --- a/code/modules/projectiles/projectile/energy_ch.dm +++ b/code/modules/projectiles/projectile/energy_ch.dm @@ -1,12 +1,12 @@ /obj/item/projectile/energy/phase/bolt range = 4 - SA_bonus_damage = 15 // 30 total on animals + mob_bonus_damage = 15 // 30 total on animals icon_state = "cbbolt" hud_state = "taser" /obj/item/projectile/energy/phase/bolt/heavy range = 4 - SA_bonus_damage = 25 // 20 total on animals + mob_bonus_damage = 25 // 20 total on animals hud_state = "taser" /obj/item/projectile/energy/plasma/vepr @@ -30,15 +30,14 @@ fire_sound = 'sound/weapons/phase_new/phasecarbine.ogg' //CHOMPedit - New sounds. range = 13 damage = 5 - SA_bonus_damage = 45 + mob_bonus_damage = 45 armor_penetration = -35 - SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION, MOB_CLASS_HUMANOID) //CHOMP Edit expand this list hud_state = "laser_heat" /obj/item/projectile/energy/phase/light fire_sound = 'sound/weapons/phase_new/phasepistol.ogg' //CHOMPedit - New sounds. range = 11 - SA_bonus_damage = 35 + mob_bonus_damage = 35 armor_penetration = -50 hud_state = "laser_heat" @@ -46,7 +45,7 @@ fire_sound = 'sound/weapons/phase_new/phaserifle.ogg' //CHOMPedit - New sounds. range = 16 //Chompedit This range was not great damage = 10 - SA_bonus_damage = 50 + mob_bonus_damage = 50 armor_penetration = -25 hud_state = "laser_heat" @@ -54,6 +53,6 @@ fire_sound = 'sound/weapons/phase_new/phasecannon.ogg' //CHOMPedit - New sounds. range = 20 //Chompedit This range was mediocre, but not worth a cannon. damage = 15 - SA_bonus_damage = 60 + mob_bonus_damage = 60 armor_penetration = -20 hud_state = "laser_heat" diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm index fbc756ee79..d64c7ccec4 100644 --- a/code/modules/projectiles/projectile/magnetic.dm +++ b/code/modules/projectiles/projectile/magnetic.dm @@ -37,8 +37,7 @@ /obj/item/projectile/bullet/magnetic/flechette/hunting name = "shredder slug" armor_penetration = 30 - SA_bonus_damage = 40 - SA_vulnerability = SA_ANIMAL + mob_bonus_damage = 40 hud_state = "alloy_spike" /obj/item/projectile/bullet/magnetic/heated diff --git a/code/modules/projectiles/projectile_ch.dm b/code/modules/projectiles/projectile_ch.dm index 4eb8971392..9926313cec 100644 --- a/code/modules/projectiles/projectile_ch.dm +++ b/code/modules/projectiles/projectile_ch.dm @@ -6,8 +6,7 @@ name = "shrapnel" fire_sound = 'sound/weapons/weaponsounds_shotgunshot.ogg' damage = 10 - SA_bonus_damage = 16 // Potential 156 Damage against demons at point blank. - SA_vulnerability = MOB_CLASS_DEMONIC | MOB_CLASS_ABERRATION + mob_bonus_damage = 16 // Potential 156 Damage against demons at point blank. embed_chance = -1 pellets = 6 range_step = 1 diff --git a/code/modules/samples/container.dm b/code/modules/samples/container.dm index f7eebc9482..8dc85a62fc 100644 --- a/code/modules/samples/container.dm +++ b/code/modules/samples/container.dm @@ -34,33 +34,3 @@ S.loc = src update_icon() to_chat(user, span_notice("You scoop \the [S] into \the [src].")) - -//Splice research sample containers into the list of valid items for these belts *without* overriding the lists entirely -/obj/item/storage/belt/explorer/Initialize(mapload) - . = ..() - can_hold.Add(/obj/item/storage/sample_container) - -/obj/item/storage/belt/miner/Initialize(mapload) - . = ..() - can_hold.Add(/obj/item/storage/sample_container) - -/obj/item/storage/belt/archaeology/Initialize(mapload) - . = ..() - can_hold.Add(/obj/item/storage/sample_container) - -//ditto, lockers and redemption machines -/obj/structure/closet/secure_closet/miner/Initialize(mapload) - . = ..() - starts_with += /obj/item/storage/sample_container - -/obj/structure/closet/secure_closet/xenoarchaeologist/Initialize(mapload) - . = ..() - starts_with += /obj/item/storage/sample_container - -/obj/machinery/mineral/equipment_vendor/Initialize(mapload) - . = ..() - prize_list["Gear"] += list(EQUIPMENT("Exotic Sample Container", /obj/item/storage/sample_container, 100)) - -/obj/machinery/mineral/equipment_vendor/survey/Initialize(mapload) - . = ..() - prize_list["Gear"] += list(EQUIPMENT("Survey Tools - Exotic Sample Container", /obj/item/storage/sample_container, 100)) diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index 3f57f650149e4f6792b4b28bf1e2c51222d1a876..2b01510cb1c1b79e4bc43753dc5b46963207cd74 100644 GIT binary patch literal 30436 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 C+>_$~ literal 7216 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 ImT2Pt0Ly;~OaK4? diff --git a/icons/obj/machines/mining_machines_vr.dmi b/icons/obj/machines/mining_machines_vr.dmi deleted file mode 100644 index 799aad08089b578aaf53f8b66986e57e53675b73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7364 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 E5B!(fkpKVy diff --git a/modular_chomp/code/modules/projectiles/ammo_refactor/_ammo_defines.dm b/modular_chomp/code/modules/projectiles/ammo_refactor/_ammo_defines.dm index a58a542306..9d29cde0a2 100644 --- a/modular_chomp/code/modules/projectiles/ammo_refactor/_ammo_defines.dm +++ b/modular_chomp/code/modules/projectiles/ammo_refactor/_ammo_defines.dm @@ -21,5 +21,5 @@ #define AMMO_RUBBER_AGONY_MULT 2 //Multiply a projectile's damage by this to get the agony for it's rubber counterpart #define AMMO_RUBBER_DAMAGE_MULT 0.25 //Rubber bullets still do some regular damage. This is the multiplier for their damage amount. -#define AMMO_HUNTER_SA_DAMAGE_MULT 1.2 //Multiply by original projectile damage to get SA_bonus_damage +#define AMMO_HUNTER_SA_DAMAGE_MULT 1.2 //Multiply by original projectile damage to get mob_bonus_damage #define AMMO_HUNTER_DAMAGE_MULT 0.2 //Damage multiplier for hunter rounds, SA bonus makes up for it diff --git a/modular_chomp/code/modules/projectiles/ammo_refactor/ammo_types.dm b/modular_chomp/code/modules/projectiles/ammo_refactor/ammo_types.dm index 647312ce7c..8a08d47de6 100644 --- a/modular_chomp/code/modules/projectiles/ammo_refactor/ammo_types.dm +++ b/modular_chomp/code/modules/projectiles/ammo_refactor/ammo_types.dm @@ -43,7 +43,7 @@ return P.launch_from_gun(target, target_zone, user, params, angle_override, forced_spread, launcher) if(ammo_flags & AMMO_FLAG_HUNTER) var/obj/item/projectile/P = new projectile_type_real(src.loc) - P.SA_bonus_damage = round(P.damage * AMMO_HUNTER_SA_DAMAGE_MULT) //In exchange for SA damage + P.mob_bonus_damage = round(P.damage * AMMO_HUNTER_SA_DAMAGE_MULT) //In exchange for SA damage P.damage = round(P.damage * AMMO_HUNTER_DAMAGE_MULT) //Severely reduced damage qdel(src) return P.launch_from_gun(target, target_zone, user, params, angle_override, forced_spread, launcher) diff --git a/modular_chomp/code/modules/projectiles/guns/beam.dm b/modular_chomp/code/modules/projectiles/guns/beam.dm index 10f65f8fad..f8366d3531 100644 --- a/modular_chomp/code/modules/projectiles/guns/beam.dm +++ b/modular_chomp/code/modules/projectiles/guns/beam.dm @@ -48,20 +48,20 @@ //Damage values back to old values for combat refactor walkback, keeping simplemob bonus damage. /obj/item/projectile/beam/phaser //The "medium" phaser beam. //damage = 10 - SA_bonus_damage = 10 + mob_bonus_damage = 10 /obj/item/projectile/beam/phaser/light //damage = 5 - SA_bonus_damage = 5 + mob_bonus_damage = 5 /obj/item/projectile/beam/phaser/heavy //damage = 12 - SA_bonus_damage = 12 + mob_bonus_damage = 12 /obj/item/projectile/beam/phaser/heavy/cannon //damage = 15 - SA_bonus_damage = 15 + mob_bonus_damage = 15 /obj/item/projectile/scatter/laser diff --git a/modular_chomp/code/modules/projectiles/guns/bullet.dm b/modular_chomp/code/modules/projectiles/guns/bullet.dm index 727244319d..820686ab72 100644 --- a/modular_chomp/code/modules/projectiles/guns/bullet.dm +++ b/modular_chomp/code/modules/projectiles/guns/bullet.dm @@ -37,7 +37,7 @@ /obj/item/projectile/bullet/rifle/a545/hunter damage = 15 - SA_bonus_damage = 35 // 50 total on animals. + mob_bonus_damage = 35 // 50 total on animals. SA_vulnerability = SA_ANIMAL hud_state = "rifle_heavy" @@ -124,7 +124,7 @@ /obj/item/projectile/bullet/rifle/a762/hunter damage = 10 - SA_bonus_damage = 30 + mob_bonus_damage = 30 /obj/item/projectile/bullet/rifle/a545 damage = 20 @@ -140,7 +140,7 @@ /obj/item/projectile/bullet/rifle/a545/hunter damage = 5 - SA_bonus_damage = 25 + mob_bonus_damage = 25 /obj/item/projectile/bullet/rifle/a145 damage = 60 diff --git a/modular_chomp/code/modules/projectiles/guns/energy.dm b/modular_chomp/code/modules/projectiles/guns/energy.dm index c3d5e7b30a..2f0b30109d 100644 --- a/modular_chomp/code/modules/projectiles/guns/energy.dm +++ b/modular_chomp/code/modules/projectiles/guns/energy.dm @@ -15,13 +15,13 @@ // /obj/item/projectile/energy/phase/bolt range = 4 - SA_bonus_damage = 15 // 30 total on animals + mob_bonus_damage = 15 // 30 total on animals icon_state = "cbbolt" hud_state = "taser" /obj/item/projectile/energy/phase/bolt/heavy range = 4 - SA_bonus_damage = 25 // 20 total on animals + mob_bonus_damage = 25 // 20 total on animals hud_state = "taser" /obj/item/projectile/energy/plasma/vepr @@ -30,20 +30,20 @@ /obj/item/projectile/energy/phase //damage = 5 - SA_bonus_damage = 15 + mob_bonus_damage = 15 armor_penetration = 0 SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION) /obj/item/projectile/energy/phase/light - SA_bonus_damage = 5 + mob_bonus_damage = 5 armor_penetration = 0 /obj/item/projectile/energy/phase/heavy //damage = 5 - SA_bonus_damage = 20 + mob_bonus_damage = 20 armor_penetration = 0 /obj/item/projectile/energy/phase/heavy/cannon //damage = 5 - SA_bonus_damage = 35 + mob_bonus_damage = 35 armor_penetration = 0 diff --git a/modular_chomp/code/modules/projectiles/guns/magnetic.dm b/modular_chomp/code/modules/projectiles/guns/magnetic.dm index 66ec4a31af..e82bc62d30 100644 --- a/modular_chomp/code/modules/projectiles/guns/magnetic.dm +++ b/modular_chomp/code/modules/projectiles/guns/magnetic.dm @@ -19,7 +19,7 @@ */ /obj/item/projectile/bullet/magnetic/flechette/hunting armor_penetration = 15 - SA_bonus_damage = 20 + mob_bonus_damage = 20 /* /obj/item/projectile/bullet/magnetic/heated/weak damage = 7 diff --git a/modular_chomp/code/modules/projectiles/guns/pump.dm b/modular_chomp/code/modules/projectiles/guns/pump.dm index 1fd91c5494..b9e04cdd5d 100644 --- a/modular_chomp/code/modules/projectiles/guns/pump.dm +++ b/modular_chomp/code/modules/projectiles/guns/pump.dm @@ -33,7 +33,7 @@ /obj/item/projectile/beam/phaser/shotgun damage = 7 - SA_bonus_damage = 7 + mob_bonus_damage = 7 range = 4 icon_state = "phaser_heavy" light_range = 3 diff --git a/vorestation.dme b/vorestation.dme index bfe4c72f8f..eb5e7c3c3d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2471,18 +2471,14 @@ #include "code\modules\clothing\spacesuits\rig\modules\specific\vision.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\voice.dm" #include "code\modules\clothing\spacesuits\rig\suits\alien.dm" -#include "code\modules\clothing\spacesuits\rig\suits\alien_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\combat.dm" -#include "code\modules\clothing\spacesuits\rig\suits\combat_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert.dm" -#include "code\modules\clothing\spacesuits\rig\suits\ert_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\light.dm" #include "code\modules\clothing\spacesuits\rig\suits\merc.dm" #include "code\modules\clothing\spacesuits\rig\suits\pmc.dm" #include "code\modules\clothing\spacesuits\rig\suits\robotics.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm" #include "code\modules\clothing\spacesuits\rig\suits\station_ch.dm" -#include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm" #include "code\modules\clothing\spacesuits\void\ert_vr.dm" #include "code\modules\clothing\spacesuits\void\event.dm" #include "code\modules\clothing\spacesuits\void\event_vr.dm"