From 2c796c4010eb8e984d443c6d4350639666c42cbd Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 18 Aug 2024 06:40:36 -0400 Subject: [PATCH] Adminbus and Shelter Capsule Updates (#16191) * Adminbus and Shelter Capsule Updates - Adds weapon cell boxes, which contain 7 weapon cells. For now adminbus only. - ERT Ship gets a couple denecrotizers, reinforced insulated gloves, weapon cell boxes, and a minor bugfix - Updated an adminbus deployable dropship - Updated uplinks with reinforced insulated gloves and weapon cell boxes - Fixes a load error with Ascian's shelter capsule, adds a missing health analyzer - Adds Survival Watch and Emergency Beacon to Luxury Shelter Capsule and Ascian's Shelter capsule - Replaces Escape Pod shelter capsule in the Curious Coin trader with a Frontier Translocator * Fixes accidental double commas * Casino spawner nade adjustments * Buffs the Dropship's SMES * Updates Shelter capsule medical supplies --- code/datums/uplink/ammunition_vr.dm | 6 + code/datums/uplink/tools_vr.dm | 5 + .../objects/items/weapons/storage/boxes_vr.dm | 8 +- code/modules/casino/spawnergrenade_casino.dm | 81 ++++++---- code/modules/economy/trader.dm | 4 +- maps/offmap_vr/om_ships/shelter_5.dmm | 10 +- maps/offmap_vr/om_ships/shelter_6.dmm | 147 +++++++++++------- maps/submaps/admin_use_vr/ert.dmm | 50 ++++-- maps/submaps/shelters/shelter_1.dmm | 1 + maps/submaps/shelters/shelter_2.dmm | 6 +- maps/submaps/shelters/shelter_3.dmm | 1 + maps/submaps/shelters/shelter_a.dmm | 11 +- 12 files changed, 222 insertions(+), 108 deletions(-) diff --git a/code/datums/uplink/ammunition_vr.dm b/code/datums/uplink/ammunition_vr.dm index 18235e53432..2783710f7eb 100644 --- a/code/datums/uplink/ammunition_vr.dm +++ b/code/datums/uplink/ammunition_vr.dm @@ -3,6 +3,12 @@ *************/ /datum/uplink_item/item/ammo/cell name = "Weapon cell" + item_cost = 10 + +/datum/uplink_item/item/ammo/cell/box + name = "Weapon cell box" + path = /obj/item/weapon/storage/box/weapon_cells + item_cost = 70 /datum/uplink_item/item/ammo/highcell name = "High capacity cell" diff --git a/code/datums/uplink/tools_vr.dm b/code/datums/uplink/tools_vr.dm index 702a8ae37b8..710e47f55c4 100644 --- a/code/datums/uplink/tools_vr.dm +++ b/code/datums/uplink/tools_vr.dm @@ -144,3 +144,8 @@ name = "Capture Crystal (Ultra)" item_cost = 50 path = /obj/item/capture_crystal/ultra + +/datum/uplink_item/item/tools/armoredgloves + name = "Reinforced Insulated Gloves" + item_cost = 5 + path = /obj/item/clothing/gloves/heavy_engineer diff --git a/code/game/objects/items/weapons/storage/boxes_vr.dm b/code/game/objects/items/weapons/storage/boxes_vr.dm index dbb9ab87603..89ffc6f9bcc 100644 --- a/code/game/objects/items/weapons/storage/boxes_vr.dm +++ b/code/game/objects/items/weapons/storage/boxes_vr.dm @@ -47,4 +47,10 @@ starts_with = list(/obj/item/ammo_magazine/sam48 = 3) max_storage_space = ITEMSIZE_COST_NORMAL * 3 drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' \ No newline at end of file + pickup_sound = 'sound/items/pickup/ammobox.ogg' + +/obj/item/weapon/storage/box/weapon_cells + name = "box of weapon cells" + desc = "A box full of weapon power cells. For all your portable energy storage needs." + icon_state = "secbox" + starts_with = list(/obj/item/weapon/cell/device/weapon = 7) diff --git a/code/modules/casino/spawnergrenade_casino.dm b/code/modules/casino/spawnergrenade_casino.dm index 70bf00bf160..34056fe89a7 100644 --- a/code/modules/casino/spawnergrenade_casino.dm +++ b/code/modules/casino/spawnergrenade_casino.dm @@ -1,6 +1,6 @@ /obj/item/weapon/grenade/spawnergrenade/casino - name = "Casino Creature Container (Cat)" - desc = "It is set to detonate in 5 seconds. It will release a cat won from the casino prize vendor!" + name = "Creature Container (Cat)" + desc = "It is set to detonate in 5 seconds. It will release a cat won from the prize vendor!" icon = 'icons/obj/casino.dmi' icon_state = "casino_delivery" item_state = "flashbang" @@ -26,58 +26,58 @@ // Creatures // /obj/item/weapon/grenade/spawnergrenade/casino/penguin - desc = "It is set to detonate in 5 seconds. It will release a penguin won from the casino prize vendor!" - name = "Casino Creature Container (Penguin)" + desc = "It is set to detonate in 5 seconds. It will release a penguin won from the prize vendor!" + name = "Creature Container (Penguin)" spawner_type = /mob/living/simple_mob/animal/passive/penguin /obj/item/weapon/grenade/spawnergrenade/casino/chicken - desc = "It is set to detonate in 5 seconds. It will release a chicken won from the casino prize vendor!" - name = "Casino Creature Container (Chicken)" + desc = "It is set to detonate in 5 seconds. It will release a chicken won from the prize vendor!" + name = "Creature Container (Chicken)" spawner_type = /mob/living/simple_mob/animal/passive/chicken /obj/item/weapon/grenade/spawnergrenade/casino/cow - desc = "It is set to detonate in 5 seconds. It will release a cow won from the casino prize vendor!" - name = "Casino Creature Container (Cow)" + desc = "It is set to detonate in 5 seconds. It will release a cow won from the prize vendor!" + name = "Creature Container (Cow)" spawner_type = /mob/living/simple_mob/animal/passive/cow /obj/item/weapon/grenade/spawnergrenade/casino/corgi - desc = "It is set to detonate in 5 seconds. It will release a corgi won from the casino prize vendor!" - name = "Casino Creature Container (Corgi)" + desc = "It is set to detonate in 5 seconds. It will release a corgi won from the prize vendor!" + name = "Creature Container (Corgi)" spawner_type = /mob/living/simple_mob/animal/passive/dog/corgi /obj/item/weapon/grenade/spawnergrenade/casino/fox - desc = "It is set to detonate in 5 seconds. It will release a fox won from the casino prize vendor!" - name = "Casino Creature Container (Fox)" + desc = "It is set to detonate in 5 seconds. It will release a fox won from the prize vendor!" + name = "Creature Container (Fox)" spawner_type = /mob/living/simple_mob/animal/passive/fox /obj/item/weapon/grenade/spawnergrenade/casino/fennec - desc = "It is set to detonate in 5 seconds. It will release a fennec won from the casino prize vendor!" - name = "Casino Creature Container (Fennec)" + desc = "It is set to detonate in 5 seconds. It will release a fennec won from the prize vendor!" + name = "Creature Container (Fennec)" spawner_type = /mob/living/simple_mob/vore/fennec /obj/item/weapon/grenade/spawnergrenade/casino/snake - desc = "It is set to detonate in 5 seconds. It will release a snake won from the casino prize vendor!" - name = "Casino Creature Container (Snake)" + desc = "It is set to detonate in 5 seconds. It will release a snake won from the prize vendor!" + name = "Creature Container (Snake)" spawner_type = /mob/living/simple_mob/animal/passive/snake /obj/item/weapon/grenade/spawnergrenade/casino/redpanda - desc = "It is set to detonate in 5 seconds. It will release a red panda won from the casino prize vendor!" - name = "Casino Creature Container (Red panda)" + desc = "It is set to detonate in 5 seconds. It will release a red panda won from the prize vendor!" + name = "Creature Container (Red panda)" spawner_type = /mob/living/simple_mob/vore/redpanda /obj/item/weapon/grenade/spawnergrenade/casino/snake - desc = "It is set to detonate in 5 seconds. It will release a snake won from the casino prize vendor!" - name = "Casino Creature Container (Snake)" + desc = "It is set to detonate in 5 seconds. It will release a snake won from the prize vendor!" + name = "Creature Container (Snake)" spawner_type = /mob/living/simple_mob/animal/passive/snake /obj/item/weapon/grenade/spawnergrenade/casino/otie - desc = "It is set to detonate in 5 seconds. It will release a otie won from the casino prize vendor!" - name = "Casino Creature Container (Otie)" + desc = "It is set to detonate in 5 seconds. It will release a otie won from the prize vendor!" + name = "Creature Container (Otie)" spawner_type = /mob/living/simple_mob/vore/otie/friendly /obj/item/weapon/grenade/spawnergrenade/casino/goldcrest - desc = "It is set to detonate in 5 seconds. It will release a bird won from the casino prize vendor!" - name = "Casino Creature Container (Bird)" + desc = "It is set to detonate in 5 seconds. It will release a bird won from the prize vendor!" + name = "Creature Container (Bird)" spawner_type = /mob/living/simple_mob/animal/passive/bird/goldcrest // @@ -89,17 +89,42 @@ spawner_type = /obj/mecha/combat/gygax/dark /obj/item/weapon/grenade/spawnergrenade/casino/gygax/mining - name = "Casino Mech Container (Mining Ripley)" + name = "Mech Container (Mining Ripley)" spawner_type = /obj/mecha/working/ripley/mining /obj/item/weapon/grenade/spawnergrenade/casino/gygax/firefighter - name = "Casino Mech Container (Firefighter Ripley)" + name = "Mech Container (Firefighter Ripley)" spawner_type = /obj/mecha/working/ripley/firefighter /obj/item/weapon/grenade/spawnergrenade/casino/gygax/Odysseus - name = "Casino Mech Container (Odysseus)" + name = "Mech Container (Odysseus)" spawner_type = /obj/mecha/medical/odysseus/loaded /obj/item/weapon/grenade/spawnergrenade/casino/gygax/shuttlepod - name = "Casino Mech Container (Shuttlepod)" + name = "Mech Container (Shuttlepod)" spawner_type = /obj/mecha/working/hoverpod/shuttlepod +// +// Fighters +// +/obj/item/weapon/grenade/spawnergrenade/casino/fighter + desc = "You feel great power inside this small round sphere, with great powers comes great responsibilities!" + +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/gunpod + name = "Fighter Container (Gunpod)" + spawner_type = /obj/mecha/combat/fighter/gunpod/loaded + +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/baron + name = "Fighter Container (Baron)" + spawner_type = /obj/mecha/combat/fighter/baron/loaded + +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/scoralis + name = "Fighter Container (Scoralis)" + spawner_type = /obj/mecha/combat/fighter/scoralis/loaded + +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/allure + name = "Fighter Container (Allure)" + spawner_type = /obj/mecha/combat/fighter/allure/loaded + +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/pinnace + name = "Fighter Container (Pinnace)" + spawner_type = /obj/mecha/combat/fighter/pinnace/loaded diff --git a/code/modules/economy/trader.dm b/code/modules/economy/trader.dm index d0acd04baef..e80d71501ac 100644 --- a/code/modules/economy/trader.dm +++ b/code/modules/economy/trader.dm @@ -344,7 +344,7 @@ /obj/item/device/survivalcapsule/luxury = 20, /obj/item/device/survivalcapsule/luxurybar = 15, /obj/item/device/survivalcapsule/popcabin = 20, - /obj/item/device/survivalcapsule/escapepod = 5 + /obj/item/device/perfect_tele/frontier/unknown/one = 1 ) prices = list( /obj/item/capture_crystal/basic = 6, @@ -371,7 +371,7 @@ /obj/item/device/survivalcapsule/luxury = 20, /obj/item/device/survivalcapsule/luxurybar = 25, /obj/item/device/survivalcapsule/popcabin = 10, - /obj/item/device/survivalcapsule/escapepod = 30 + /obj/item/device/perfect_tele/frontier/unknown/one = 30 ) multiple = list( /obj/item/capture_crystal/basic = 10, diff --git a/maps/offmap_vr/om_ships/shelter_5.dmm b/maps/offmap_vr/om_ships/shelter_5.dmm index 6299b5bb8e6..7055a4dee35 100644 --- a/maps/offmap_vr/om_ships/shelter_5.dmm +++ b/maps/offmap_vr/om_ships/shelter_5.dmm @@ -41,9 +41,10 @@ /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/weapon/storage/pill_bottle/dice, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/adv, /obj/item/weapon/storage/box/survival/space, /obj/item/weapon/storage/box/survival/space, /obj/item/weapon/storage/box/survival/space, @@ -54,6 +55,9 @@ /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/storage/toolbox/emergency, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "f" = ( diff --git a/maps/offmap_vr/om_ships/shelter_6.dmm b/maps/offmap_vr/om_ships/shelter_6.dmm index 78a82302f60..a1d0fe56338 100644 --- a/maps/offmap_vr/om_ships/shelter_6.dmm +++ b/maps/offmap_vr/om_ships/shelter_6.dmm @@ -79,6 +79,12 @@ /obj/item/weapon/material/knife/machete, /obj/item/weapon/material/knife/machete, /obj/item/weapon/material/knife/machete, +/obj/item/clothing/accessory/storage/bluespace, +/obj/item/clothing/accessory/storage/bluespace, +/obj/item/clothing/accessory/storage/bluespace, +/obj/item/clothing/accessory/storage/bluespace, +/obj/item/clothing/accessory/storage/bluespace, +/obj/item/clothing/accessory/storage/bluespace, /obj/item/weapon/melee/energy/sword, /obj/item/weapon/melee/energy/sword, /obj/item/weapon/melee/energy/sword, @@ -190,6 +196,10 @@ /obj/item/clothing/suit/space/void/responseteam/security, /obj/item/clothing/suit/space/void/responseteam/security, /obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/baron, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/baron, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/baron, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/baron, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "af" = ( @@ -306,46 +316,17 @@ /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "ah" = ( @@ -886,6 +867,8 @@ /obj/item/device/healthanalyzer/phasic, /obj/item/device/healthanalyzer/phasic, /obj/item/device/healthanalyzer/phasic, +/obj/item/device/denecrotizer/medical, +/obj/item/device/denecrotizer/medical, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, @@ -1080,9 +1063,10 @@ /area/shuttle/tabiranth) "bl" = ( /obj/machinery/power/smes/buildable/hybrid{ - input_level = 200000; - output_level = 200000; - recharge_rate = 20000 + cur_coils = 4; + input_level = 500000; + output_level = 500000; + recharge_rate = 40000 }, /obj/structure/cable/cyan{ icon_state = "0-4" @@ -1366,6 +1350,10 @@ /obj/item/weapon/storage/belt/utility/chief/full, /obj/item/weapon/storage/belt/utility/chief/full, /obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/clothing/gloves/heavy_engineer, +/obj/item/clothing/gloves/heavy_engineer, +/obj/item/clothing/gloves/heavy_engineer, +/obj/item/clothing/gloves/heavy_engineer, /obj/item/weapon/storage/belt/security/tactical, /obj/item/weapon/storage/belt/security/tactical, /obj/item/weapon/storage/belt/security/tactical, @@ -1374,6 +1362,10 @@ /obj/item/weapon/storage/belt/medical/emt, /obj/item/weapon/storage/belt/medical/emt, /obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/explorer/pathfinder, +/obj/item/weapon/storage/belt/explorer/pathfinder, +/obj/item/weapon/storage/belt/explorer/pathfinder, +/obj/item/weapon/storage/belt/explorer/pathfinder, /obj/item/weapon/storage/backpack/ert/commander, /obj/item/weapon/storage/backpack/ert/engineer, /obj/item/weapon/storage/backpack/ert/engineer, @@ -1433,6 +1425,15 @@ /obj/item/device/binoculars, /obj/item/device/binoculars, /obj/item/device/binoculars, +/obj/item/clothing/gloves/watch/survival, +/obj/item/clothing/gloves/watch/survival, +/obj/item/clothing/gloves/watch/survival, +/obj/item/clothing/gloves/watch/survival, +/obj/item/device/mapping_unit/ert, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/holomap_beacon/ert, +/obj/item/device/holomap_beacon/ert, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, @@ -1493,7 +1494,6 @@ /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/clothing/suit/space/void/refurb/officer, /turf/simulated/floor/tiled/white, /area/shuttle/tabiranth) "bK" = ( @@ -1549,14 +1549,7 @@ /obj/machinery/mech_recharger{ icon = 'icons/turf/shuttle_alien_blue.dmi' }, -/obj/mecha/combat/fighter/baron/loaded{ - ground_capable = 1; - health = 600; - maxhealth = 600; - name = "Duke"; - desc = "A heavily modified Baron-class fighter from the commonwealth. It has been retrofitted with heavier armor and additional maneuvering thrusters. Can be used in atmospheric operations."; - starting_components = list(/obj/item/mecha_parts/component/hull/lightweight,/obj/item/mecha_parts/component/actuator/hispeed,/obj/item/mecha_parts/component/armor/military,/obj/item/mecha_parts/component/gas/reinforced,/obj/item/mecha_parts/component/electrical) - }, +/obj/mecha/combat/fighter/baron/loaded, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "bP" = ( @@ -1575,12 +1568,18 @@ /obj/item/clothing/head/helmet/space/void/security/fluff/hos, /obj/item/clothing/head/helmet/space/void/captain, /obj/item/clothing/suit/space/void/captain, +/obj/item/clothing/head/helmet/space/void/refurb/officer, +/obj/item/clothing/suit/space/void/refurb/officer, +/obj/item/device/survivalcapsule/popcabin, +/obj/item/device/survivalcapsule/popcabin, /obj/item/weapon/tank/oxygen/yellow, /obj/item/weapon/tank/oxygen/yellow, /obj/item/weapon/tank/oxygen/yellow, /obj/item/weapon/tank/oxygen/yellow, /obj/item/weapon/tank/vox, /obj/item/weapon/tank/vox, +/obj/item/weapon/tank/vox, +/obj/item/weapon/tank/vox, /obj/item/rig_module/chem_dispenser/injector/advanced, /obj/item/rig_module/vision/multi, /obj/item/weapon/rig/military/equipped, @@ -1602,6 +1601,7 @@ /obj/item/weapon/storage/firstaid/combat, /obj/item/weapon/storage/firstaid/combat, /obj/item/weapon/storage/toolbox/syndicate/powertools, +/obj/item/weapon/storage/toolbox/syndicate/powertools, /obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy{ name = "Super Heavy Demolitions kit" }, @@ -1826,14 +1826,13 @@ /obj/item/ammo_magazine/m762/ap, /obj/item/ammo_magazine/ammo_box/b145, /obj/item/ammo_magazine/ammo_box/b145, +/obj/item/weapon/cell/infinite, +/obj/item/device/nif/authentic, /obj/item/modular_computer/laptop/preset/custom_loadout/hybrid, /obj/item/modular_computer/laptop/preset/custom_loadout/hybrid, /obj/item/modular_computer/tablet/preset/custom_loadout/hybrid, /obj/item/device/perfect_tele/alien, /obj/item/device/perfect_tele/frontier/staff, -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, /obj/item/weapon/inducer/hybrid, /obj/item/weapon/cell/device/weapon/recharge/alien/hybrid, /obj/item/weapon/cell/device/weapon/recharge/alien/hybrid, @@ -1843,7 +1842,45 @@ /obj/item/weapon/circuitboard/machine/abductor/core/hybrid, /obj/item/weapon/gun/magnetic/railgun/automatic, /obj/item/weapon/gun/magnetic/railgun/automatic, +/obj/item/weapon/grenade/spawnergrenade/casino, +/obj/item/weapon/grenade/spawnergrenade/casino/penguin, +/obj/item/weapon/grenade/spawnergrenade/casino/chicken, +/obj/item/weapon/grenade/spawnergrenade/casino/cow, +/obj/item/weapon/grenade/spawnergrenade/casino/corgi, +/obj/item/weapon/grenade/spawnergrenade/casino/fox, +/obj/item/weapon/grenade/spawnergrenade/casino/fennec, +/obj/item/weapon/grenade/spawnergrenade/casino/snake, +/obj/item/weapon/grenade/spawnergrenade/casino/redpanda, +/obj/item/weapon/grenade/spawnergrenade/casino/snake, +/obj/item/weapon/grenade/spawnergrenade/casino/otie, +/obj/item/weapon/grenade/spawnergrenade/casino/goldcrest, +/obj/item/weapon/grenade/spawnergrenade/casino/gygax, +/obj/item/weapon/grenade/spawnergrenade/casino/gygax/mining, +/obj/item/weapon/grenade/spawnergrenade/casino/gygax/firefighter, +/obj/item/weapon/grenade/spawnergrenade/casino/gygax/Odysseus, +/obj/item/weapon/grenade/spawnergrenade/casino/gygax/shuttlepod, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/gunpod, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/baron, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/scoralis, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/allure, +/obj/item/weapon/grenade/spawnergrenade/casino/fighter/pinnace, +/obj/item/weapon/bluespace_harpoon, +/obj/item/weapon/stock_parts/scanning_module/hyper, +/obj/item/device/cataloguer/compact/pathfinder, +/obj/item/capture_crystal/basic, +/obj/item/capture_crystal/basic, +/obj/item/capture_crystal/basic, +/obj/item/capture_crystal/basic, +/obj/item/capture_crystal/great, +/obj/item/capture_crystal/great, +/obj/item/capture_crystal/ultra, +/obj/item/capture_crystal/ultra, +/obj/item/device/denecrotizer, +/obj/item/device/denecrotizer, /obj/effect/floor_decal/industrial/loading, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/tabiranth) diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 3139989968e..b217dd44418 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -1005,6 +1005,8 @@ /obj/item/weapon/surgical/scalpel/manager, /obj/item/weapon/surgical/circular_saw/manager, /obj/item/weapon/surgical/circular_saw/manager, +/obj/item/device/denecrotizer/medical, +/obj/item/device/denecrotizer/medical, /obj/item/stack/nanopaste, /obj/item/stack/nanopaste, /turf/simulated/floor/tiled/techfloor, @@ -2604,14 +2606,6 @@ }, /turf/simulated/floor/plating, /area/ship/ert/engine) -"nY" = ( -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "braun_blast_shields"; - name = "Blast Shield" - }, -/turf/space, -/area/space) "ob" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -2881,11 +2875,11 @@ "pv" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/gloves/yellow{ +/obj/item/clothing/gloves/heavy_engineer{ pixel_y = -3 }, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow{ +/obj/item/clothing/gloves/heavy_engineer, +/obj/item/clothing/gloves/heavy_engineer{ pixel_y = 3 }, /obj/item/weapon/storage/backpack/ert/engineer{ @@ -2895,13 +2889,13 @@ /obj/item/weapon/storage/backpack/ert/engineer{ pixel_y = 3 }, -/obj/item/clothing/gloves/yellow{ +/obj/item/clothing/gloves/heavy_engineer{ pixel_y = 6 }, -/obj/item/clothing/gloves/yellow{ +/obj/item/clothing/gloves/heavy_engineer{ pixel_y = 9 }, -/obj/item/clothing/gloves/yellow{ +/obj/item/clothing/gloves/heavy_engineer{ pixel_y = 12 }, /obj/item/weapon/storage/backpack/ert/engineer{ @@ -4959,6 +4953,22 @@ /obj/item/clothing/accessory/storage/brown_vest{ pixel_y = 6 }, +/obj/item/clothing/accessory/storage/bluespace{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/bluespace{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/bluespace, +/obj/item/clothing/accessory/storage/bluespace{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/bluespace{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/bluespace{ + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "Ao" = ( @@ -6004,6 +6014,16 @@ /obj/structure/closet/crate{ dir = 2 }, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, +/obj/item/weapon/storage/box/weapon_cells, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) @@ -20062,7 +20082,7 @@ yz yz yz yz -nY +yz yY ap WH diff --git a/maps/submaps/shelters/shelter_1.dmm b/maps/submaps/shelters/shelter_1.dmm index b9ca384cd33..63ea7433627 100644 --- a/maps/submaps/shelters/shelter_1.dmm +++ b/maps/submaps/shelters/shelter_1.dmm @@ -24,6 +24,7 @@ /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/weapon/storage/pill_bottle/dice, +/obj/item/weapon/storage/firstaid/regular, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "e" = ( diff --git a/maps/submaps/shelters/shelter_2.dmm b/maps/submaps/shelters/shelter_2.dmm index 9391e0d2928..1dbc0b26415 100644 --- a/maps/submaps/shelters/shelter_2.dmm +++ b/maps/submaps/shelters/shelter_2.dmm @@ -49,8 +49,12 @@ /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, -/obj/item/weapon/storage/pill_bottle/antitox, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/box/survival/space, +/obj/item/clothing/gloves/watch/survival, +/obj/item/device/emergency_beacon, /obj/item/device/healthanalyzer, /obj/item/weapon/storage/pill_bottle/dice_nerd, /turf/simulated/shuttle/floor/voidcraft, diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm index 4b69bced80c..27603130111 100644 --- a/maps/submaps/shelters/shelter_3.dmm +++ b/maps/submaps/shelters/shelter_3.dmm @@ -110,6 +110,7 @@ pixel_y = 4 }, /obj/item/weapon/flame/lighter/random, +/obj/item/weapon/storage/firstaid/regular, /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod) "t" = ( diff --git a/maps/submaps/shelters/shelter_a.dmm b/maps/submaps/shelters/shelter_a.dmm index 27ae194a5eb..0d118b9e77c 100644 --- a/maps/submaps/shelters/shelter_a.dmm +++ b/maps/submaps/shelters/shelter_a.dmm @@ -63,14 +63,19 @@ /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/antitox, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/adv, /obj/item/weapon/storage/firstaid/regular, +/obj/item/device/healthanalyzer, /obj/item/modular_computer/laptop/preset/custom_loadout/rugged, /obj/item/weapon/storage/box/survival/comp{ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) }, /obj/item/weapon/storage/box/survival/space, +/obj/item/clothing/gloves/watch/survival, +/obj/item/device/emergency_beacon, /obj/item/weapon/extinguisher/mini, /obj/item/device/radio{ icon_state = "walkietalkiebay"; @@ -100,8 +105,8 @@ /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/no_raisin, /obj/item/weapon/reagent_containers/food/snacks/no_raisin, -/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie, -/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie, +/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie, +/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, /obj/item/weapon/reagent_containers/food/snacks/tastybread,