From 8fde8b2923a219420174d303bc3ff3046ee202bb Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 18 Aug 2024 06:40:14 -0400 Subject: [PATCH] Adjusts stationside first aid spawns (#16194) * Adjusts stationside first aid spawns Stationside first aid kit spawns should not have combat first aid kits - Swaps stationside first aid kit spawns on Talon, Stellar Delight, and the V2 Outpost to Tetheraid spawns * Does some more swapping * Adds stasis bags to wallmeds --- code/game/objects/random/misc.dm | 2 +- code/game/objects/random/mob_vr.dm | 11 ++++++----- code/modules/economy/vending_machines_vr.dm | 12 ++++++++++++ .../aerostat/aerostat_science_outpost.dmm | 8 ++++---- maps/offmap_vr/talon/talon_v2.dm | 12 ++++++------ maps/redgate/cybercity.dmm | 8 ++++---- maps/redgate/facility.dmm | 10 +++++----- maps/redgate/jungle_underground.dmm | 2 +- maps/redgate/train_upper.dmm | 6 +++--- maps/stellar_delight/stellar_delight3.dmm | 6 +++--- 10 files changed, 45 insertions(+), 32 deletions(-) diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 0d5f252374..cf4c54a087 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -244,7 +244,7 @@ return pick(prob(10);/obj/item/weapon/storage/firstaid/regular, prob(8);/obj/item/weapon/storage/firstaid/toxin, prob(8);/obj/item/weapon/storage/firstaid/o2, - prob(6);/obj/item/weapon/storage/firstaid/adv, + prob(4);/obj/item/weapon/storage/firstaid/adv, //VOREStation Edit: 6 to 4 prob(8);/obj/item/weapon/storage/firstaid/fire, prob(1);/obj/item/device/denecrotizer/medical, //VOREStation Add, prob(1);/obj/item/weapon/storage/firstaid/combat) diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm index 66c058a68a..0b7a4d6ad2 100644 --- a/code/game/objects/random/mob_vr.dm +++ b/code/game/objects/random/mob_vr.dm @@ -210,11 +210,12 @@ icon_state = "firstaid" /obj/random/tetheraid/item_to_spawn() - return pick(prob(4);/obj/item/weapon/storage/firstaid/regular, - prob(3);/obj/item/weapon/storage/firstaid/toxin, - prob(3);/obj/item/weapon/storage/firstaid/o2, - prob(2);/obj/item/weapon/storage/firstaid/adv, - prob(3);/obj/item/weapon/storage/firstaid/fire) + return pick(prob(10);/obj/item/weapon/storage/firstaid/regular, + prob(8);/obj/item/weapon/storage/firstaid/toxin, + prob(8);/obj/item/weapon/storage/firstaid/o2, + prob(5);/obj/item/weapon/storage/firstaid/adv, + prob(8);/obj/item/weapon/storage/firstaid/fire, + prob(1);/obj/item/device/denecrotizer/medical) //Override from maintenance.dm to prevent combat kits from spawning in Tether maintenance /obj/random/maintenance/item_to_spawn() diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 47b31441aa..7048cc9452 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -24,6 +24,18 @@ /obj/item/clothing/glasses/omnihud/med = 4, /obj/item/device/glasses_kit = 1, /obj/item/weapon/storage/quickdraw/syringe_case = 4) ..() +/obj/machinery/vending/wallmed1/New() + products += list(/obj/item/bodybag/cryobag = 2) + ..() + +/obj/machinery/vending/wallmed2/New() + products += list(/obj/item/bodybag/cryobag = 3) + ..() + +/obj/machinery/vending/wallmed1/public/New() + products += list(/obj/item/bodybag/cryobag = 4) + ..() + // Food Machines (for event/away maps) //I want this not just as part of the zoo. ;v diff --git a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm index b816e799c7..499219e3dd 100644 --- a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm +++ b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm @@ -3719,7 +3719,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/rust, /obj/random/maintenance/research, -/obj/random/firstaid, +/obj/random/tetheraid, /obj/random/maintenance/engineering, /obj/random/soap, /obj/effect/decal/cleanable/dirt, @@ -7836,7 +7836,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/random/firstaid, +/obj/random/tetheraid, /obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) @@ -9855,7 +9855,7 @@ /area/offmap/aerostat/inside/xenoarch) "Lg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/random/firstaid, +/obj/random/tetheraid, /obj/random/maintenance/research, /obj/structure/sign/painting/public{ pixel_x = -30 @@ -10388,7 +10388,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/random/firstaid, +/obj/random/tetheraid, /obj/item/weapon/storage/firstaid, /obj/structure/cable{ icon_state = "1-2" diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 8f174fc6fa..5e31a8ce74 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -898,7 +898,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/structure/closet/crate/xion //XION SUIT ), prob(10);list( - /obj/random/firstaid, + /obj/random/tetheraid, /obj/random/medical, /obj/random/medical, /obj/random/medical, @@ -907,10 +907,10 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/structure/closet/crate/freezer/veymed //VM GRABBAG ), prob(10);list( - /obj/random/firstaid, - /obj/random/firstaid, - /obj/random/firstaid, - /obj/random/firstaid, + /obj/random/tetheraid, + /obj/random/tetheraid, + /obj/random/tetheraid, + /obj/random/tetheraid, /obj/random/unidentified_medicine/fresh_medicine, /obj/random/unidentified_medicine/fresh_medicine, /obj/structure/closet/crate/freezer/veymed //VM FAKS @@ -931,7 +931,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/structure/closet/crate/xion //XION SUPPLY ), prob(10);list( - /obj/random/firstaid, + /obj/random/tetheraid, /obj/random/medical, /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, diff --git a/maps/redgate/cybercity.dmm b/maps/redgate/cybercity.dmm index 9399c0f93c..038324dc9b 100644 --- a/maps/redgate/cybercity.dmm +++ b/maps/redgate/cybercity.dmm @@ -4172,7 +4172,7 @@ /area/redgate/city/waterworks) "fEr" = ( /obj/structure/table/glass, -/obj/random/tetheraid, +/obj/random/firstaid, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "fEG" = ( @@ -17937,7 +17937,7 @@ /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, -/obj/random/tetheraid, +/obj/random/firstaid, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "xwF" = ( @@ -18193,8 +18193,8 @@ /area/redgate/city/gym) "xUz" = ( /obj/structure/table/rack, -/obj/random/tetheraid, -/obj/random/tetheraid, +/obj/random/firstaid, +/obj/random/firstaid, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/redgate/city/hospital) "xVb" = ( diff --git a/maps/redgate/facility.dmm b/maps/redgate/facility.dmm index 02fa83ec07..a834684bfa 100644 --- a/maps/redgate/facility.dmm +++ b/maps/redgate/facility.dmm @@ -698,7 +698,7 @@ "bgg" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloor, -/obj/random/tetheraid, +/obj/random/firstaid, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "bil" = ( @@ -9751,7 +9751,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/random/tetheraid, +/obj/random/firstaid, /turf/simulated/floor/wood/alt, /area/redgate/facility/office7) "nJx" = ( @@ -12444,7 +12444,7 @@ }, /obj/item/clothing/shoes/slippers, /obj/item/clothing/under/pants/black, -/obj/random/tetheraid, +/obj/random/firstaid, /turf/simulated/floor/tiled/white, /area/redgate/facility/office6) "rDk" = ( @@ -13359,7 +13359,7 @@ /obj/item/clothing/suit/storage/toggle/labcoat, /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, -/obj/random/tetheraid, +/obj/random/firstaid, /turf/simulated/floor/tiled/white, /area/redgate/facility/office7) "sSG" = ( @@ -15443,7 +15443,7 @@ dir = 1 }, /obj/structure/table/glass, -/obj/random/tetheraid, +/obj/random/firstaid, /turf/simulated/floor/tiled/white, /area/redgate/facility/medbay) "vMh" = ( diff --git a/maps/redgate/jungle_underground.dmm b/maps/redgate/jungle_underground.dmm index 730ec1ffde..bcf6b0a68b 100644 --- a/maps/redgate/jungle_underground.dmm +++ b/maps/redgate/jungle_underground.dmm @@ -3169,7 +3169,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/jungle/facilitynw) "MA" = ( -/obj/random/tetheraid, +/obj/random/firstaid, /turf/simulated/floor, /area/redgate/jungle/facilityne) "MD" = ( diff --git a/maps/redgate/train_upper.dmm b/maps/redgate/train_upper.dmm index 375fbe99ec..0124e721c3 100644 --- a/maps/redgate/train_upper.dmm +++ b/maps/redgate/train_upper.dmm @@ -710,9 +710,9 @@ /area/redgate/train/dining) "lp" = ( /obj/structure/closet/walllocker_double/medical/east, -/obj/random/tetheraid, -/obj/random/tetheraid, -/obj/random/tetheraid, +/obj/random/firstaid, +/obj/random/firstaid, +/obj/random/firstaid, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/weapon/storage/belt/medical, diff --git a/maps/stellar_delight/stellar_delight3.dmm b/maps/stellar_delight/stellar_delight3.dmm index 256c4bdc0d..8d155584e6 100644 --- a/maps/stellar_delight/stellar_delight3.dmm +++ b/maps/stellar_delight/stellar_delight3.dmm @@ -1194,7 +1194,7 @@ /area/maintenance/stellardelight/deck3/starboardcent) "ed" = ( /obj/structure/closet, -/obj/random/firstaid, +/obj/random/tetheraid, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) "eg" = ( @@ -4709,7 +4709,7 @@ /area/stellardelight/deck3/exterior) "qM" = ( /obj/structure/table/steel, -/obj/random/firstaid, +/obj/random/tetheraid, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportrooma) "qN" = ( @@ -6516,7 +6516,7 @@ /area/stellardelight/deck3/starboarddock) "xE" = ( /obj/structure/closet, -/obj/random/firstaid, +/obj/random/tetheraid, /obj/random/maintenance, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo,