From d96266717ff7e56cdf5bb4d297621d8bb4799c44 Mon Sep 17 00:00:00 2001 From: BeeLover66 <78232749+BeeLover66@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:48:07 -0400 Subject: [PATCH 01/69] fixes radio channels defaulting to common (#11686) --- code/game/machinery/doors/brigdoors.dm | 4 ++-- code/game/objects/items/devices/radio/radio.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index a0223969a3e88..5ee9958d26fb2 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -32,6 +32,7 @@ sec_radio = new/obj/item/radio(src) sec_radio.set_listening(FALSE) + sec_radio.set_frequency(FREQ_SECURITY) if(id != null) for(var/obj/machinery/door/window/brigdoor/M in urange(20, src)) @@ -123,8 +124,7 @@ return 0 if(!forced) - sec_radio.set_frequency(FREQ_SECURITY) - sec_radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_SECURITY) + sec_radio.talk_into(src, "Timer has expired. Releasing prisoner.") timing = FALSE activation_time = null diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 75ca46dabf00f..b2deba79e7b60 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -284,8 +284,8 @@ // From the channel, determine the frequency and get a reference to it. var/freq - if(channel && channels && channels.len > 0) - if(channel == MODE_DEPARTMENT) + if(channel && channels) + if(channel == MODE_DEPARTMENT && channels.len > 0) channel = channels[1] freq = secure_radio_connections[channel] if(istype(talking_movable, /mob) && !freq && channel != RADIO_CHANNEL_UPLINK) From 8fbd735e70341931c5bd34fd1f29c8bb29bf1e5d Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed, 16 Oct 2024 15:57:53 -0500 Subject: [PATCH 02/69] Automatic changelog generation for PR #11686 [ci skip] --- html/changelogs/AutoChangeLog-pr-11686.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11686.yml diff --git a/html/changelogs/AutoChangeLog-pr-11686.yml b/html/changelogs/AutoChangeLog-pr-11686.yml new file mode 100644 index 0000000000000..866d6ec8c1c22 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11686.yml @@ -0,0 +1,5 @@ +author: BeeLover66 +delete-after: true +changes: + - bugfix: Radio channels no longer always default to common when no encryption key + is installed From b59c40724e6ecbe64a3450005352f2f98531e0ff Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed, 16 Oct 2024 21:03:59 +0000 Subject: [PATCH 03/69] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-11686.yml | 5 ----- 3 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11686.yml diff --git a/html/changelog.html b/html/changelog.html index dbac2115a2481..954988f0176ab 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

16 October 2024

+

BeeLover66 updated:

+ +

14 October 2024

PowerfulBacon updated:

- -

15 August 2024

-

Tsar-Salat updated:

- -

XeonMations updated:

- -

rkz updated:

-
GoonStation 13 Development Team From 11fcb63d7ac40eacf0d0adb19c9b84255c09cbdc Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Fri, 18 Oct 2024 00:13:18 +0000 Subject: [PATCH 05/69] Automatic changelog compile [ci skip] --- html/changelog.html | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 5a7f1494c3188..a0b2af2cea53e 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -956,31 +956,6 @@

ro5490 updated:

  • Added a new Floor Cluwne Smite, and interaction
  • fixed the stalker smite from killing people
    • - -

    16 August 2024

    -

    Dejaku51 updated:

    - -

    Sarchutar updated:

    - -

    Spockye updated:

    - -

    rkz, Kylerace, LemonInTheDark, Tastyfish, Mat05usz updated:

    - GoonStation 13 Development Team From 6cd8a5cc60b06f544b78e3b370df7a4d3c4cea65 Mon Sep 17 00:00:00 2001 From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:43:09 -0400 Subject: [PATCH 06/69] Newfood: Drink Refactor (#11701) * initial * file reorg * updatepaths * fix code * cocoa fix * lints * missing sprite * mapfixes * missed somethin --- _maps/Prefab/Departments.dmm | 2 +- _maps/RandomRooms/10x10/rdm_dorms.dmm | 2 +- .../10x10/rdm_organ_harvesting.dmm | 22 +- .../10x10/sk_rdm060_snakefighter.dmm | 2 +- .../RandomRooms/10x10/sk_rdm070_pubbybar.dmm | 14 +- .../10x10/sk_rdm083_bigtheatre.dmm | 8 +- .../10x10/sk_rdm098_graffitiroom.dmm | 2 +- .../10x10/sk_rdm106_sanitarium.dmm | 14 +- _maps/RandomRooms/10x10/sk_rdm129_beach.dmm | 20 +- .../10x10/sk_rdm141_6sectorsdown.dmm | 6 +- .../RandomRooms/10x10/sk_rdm142_olddiner.dmm | 2 +- .../RandomRooms/10x10/sk_rdm143_gamercave.dmm | 16 +- .../10x10/sk_rdm144_smallmagician.dmm | 6 +- .../RandomRooms/10x10/sk_rdm147_advbotany.dmm | 4 +- .../10x10/sk_rdm148_botany_apiary.dmm | 4 +- _maps/RandomRooms/10x10/sk_rdm157_chess.dmm | 6 +- .../10x10/sk_rdm167_library_ritual.dmm | 2 +- .../RandomRooms/10x5/rdm_pirate_derelict.dmm | 4 +- .../RandomRooms/10x5/sk_rdm011_barbershop.dmm | 36 +- .../10x5/sk_rdm031_deltarobotics.dmm | 2 +- .../10x5/sk_rdm040_deltabotnis.dmm | 8 +- .../10x5/sk_rdm045_deltacafeteria.dmm | 4 +- .../10x5/sk_rdm082_maintmedical.dmm | 52 +- _maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm | 4 +- .../10x5/sk_rdm100_meetingroom.dmm | 2 +- .../RandomRooms/10x5/sk_rdm151_ratburger.dmm | 8 +- .../10x5/sk_rdm153_hobowithpeter.dmm | 4 +- _maps/RandomRooms/3x3/rdm_workout.dmm | 2 +- .../RandomRooms/3x3/sk_rdm020_boxclutter6.dmm | 2 +- .../3x3/sk_rdm037_deltajanniecloset.dmm | 2 +- .../RandomRooms/3x3/sk_rdm050_medicloset.dmm | 4 +- .../3x3/sk_rdm077_kilolustymaid.dmm | 4 +- _maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm | 14 +- _maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm | 2 +- .../RandomRooms/3x5/sk_rdm013_boxkitchen.dmm | 8 +- .../RandomRooms/3x5/sk_rdm137_tinyshrink.dmm | 4 +- .../3x5/sk_rdm160_kilomaintbar.dmm | 4 +- .../5x3/sk_rdm054_metaclutter3.dmm | 2 +- .../5x3/sk_rdm066_pubbybedroom.dmm | 2 +- .../5x3/sk_rdm071_pubbykitchen.dmm | 8 +- _maps/RandomRooms/5x3/sk_rdm080_cloner.dmm | 4 +- .../5x3/sk_rdm101_minibreakroom.dmm | 2 +- .../RandomRooms/5x4/sk_rdm026_boxsurgery.dmm | 2 +- _maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm | 8 +- .../RandomRooms/5x4/sk_rdm049_metakitchen.dmm | 10 +- .../RandomRooms/5x4/sk_rdm055_metamedical.dmm | 10 +- .../5x4/sk_rdm067_pubbysurgery.dmm | 2 +- .../5x4/sk_rdm090_tinybarbershop.dmm | 4 +- .../RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm | 2 +- .../fland/sk_rdm_fln_05_apiary.dmm | 2 +- .../fland/sk_rdm_fln_06_publicgarden.dmm | 10 +- .../fland/sk_rdm_fln_08_zenroom.dmm | 8 +- .../fland/sk_rdm_fln_09_barbershop.dmm | 4 +- .../fland/sk_rdm_fln_11_hobobox.dmm | 2 +- .../LavaRuins/lavaland_biodome_beach.dmm | 10 +- .../lavaland_biodome_clown_planet.dmm | 2 +- .../lavaland_surface_animal_hospital.dmm | 4 +- .../lavaland_surface_ash_walker1.dmm | 4 +- .../lavaland_surface_biodome_winter.dmm | 4 +- .../LavaRuins/lavaland_surface_hermit.dmm | 2 +- .../LavaRuins/lavaland_surface_seed_vault.dmm | 18 +- .../lavaland_surface_syndicate_base1.dmm | 54 +- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 12 +- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 4 +- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 2 +- _maps/RandomRuins/SpaceRuins/bus.dmm | 8 +- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 24 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 28 +- .../RandomRuins/SpaceRuins/gasthelizards.dmm | 14 +- .../SpaceRuins/hilbertshoteltestingsite.dmm | 2 +- .../SpaceRuins/listeningstation.dmm | 4 +- .../SpaceRuins/mrow_thats_right.dmm | 8 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 66 +- _maps/RandomRuins/SpaceRuins/onehalf.dmm | 4 +- _maps/RandomRuins/SpaceRuins/refference.dmm | 2 +- _maps/RandomRuins/SpaceRuins/sos6.dmm | 2 +- _maps/RandomRuins/SpaceRuins/spacearcade.dmm | 32 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 54 +- .../SpaceRuins/turretedoutpost.dmm | 4 +- _maps/RandomZLevels/SnowCabin.dmm | 50 +- _maps/RandomZLevels/TheBeach.dmm | 88 +-- _maps/RandomZLevels/caves.dmm | 4 +- _maps/RandomZLevels/moonoutpost19.dmm | 28 +- _maps/RandomZLevels/research.dmm | 8 +- _maps/RandomZLevels/snowdin.dmm | 30 +- _maps/RandomZLevels/spacebattle.dmm | 6 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 44 +- _maps/RuinGeneration/13x13_cafe.dmm | 4 +- _maps/RuinGeneration/13x13_corgrobotics.dmm | 4 +- _maps/RuinGeneration/13x13_hilberttest.dmm | 2 +- _maps/RuinGeneration/13x13_listening_base.dmm | 4 +- _maps/RuinGeneration/13x13_shotelroom.dmm | 8 +- _maps/RuinGeneration/13x17_permabrig.dmm | 2 +- _maps/RuinGeneration/13x9_medical.dmm | 6 +- _maps/RuinGeneration/17x17_charliecrew.dmm | 4 +- .../5x5_4_room-janitor_closet.dmm | 2 +- _maps/RuinGeneration/9x13_kitchen.dmm | 8 +- _maps/RuinGeneration/9x13_vault.dmm | 2 +- _maps/RuinGeneration/9x9_chemlab.dmm | 8 +- _maps/arenas/bar.dmm | 8 +- _maps/arenas/beach.dmm | 10 +- _maps/arenas/survival pod.dmm | 6 +- _maps/holodeck/beach.dmm | 2 +- _maps/holodeck/lounge.dmm | 4 +- _maps/holodeck/medicalsim.dmm | 8 +- _maps/holodeck/petpark.dmm | 2 +- _maps/holodeck/small/beach.dmm | 2 +- _maps/holodeck/small/kitchen.dmm | 6 +- _maps/holodeck/small/lounge.dmm | 4 +- _maps/holodeck/small/medicalsim.dmm | 8 +- _maps/holodeck/small/petpark.dmm | 2 +- _maps/holodeck/small/teahouse.dmm | 10 +- _maps/holodeck/workshop/donut.dmm | 42 +- _maps/holodeck/workshop/plush.dmm | 8 +- _maps/map_files/BoxStation/BoxStation.dmm | 186 +++--- _maps/map_files/CorgStation/CorgStation.dmm | 258 +++---- .../map_files/Deltastation/DeltaStation2.dmm | 220 +++--- _maps/map_files/EchoStation/EchoStation.dmm | 110 +-- _maps/map_files/FlandStation/FlandStation.dmm | 272 ++++---- _maps/map_files/KiloStation/KiloStation.dmm | 226 +++---- _maps/map_files/MetaStation/MetaStation.dmm | 194 +++--- _maps/map_files/Mining/Lavaland.dmm | 42 +- _maps/map_files/RadStation/RadStation.dmm | 222 +++---- _maps/map_files/generic/CentCom.dmm | 92 +-- _maps/shuttles/emergency/emergency_bar.dmm | 6 +- _maps/shuttles/emergency/emergency_cere.dmm | 2 +- _maps/shuttles/emergency/emergency_corg.dmm | 12 +- _maps/shuttles/emergency/emergency_delta.dmm | 8 +- .../emergency/emergency_discoinferno.dmm | 16 +- _maps/shuttles/emergency/emergency_donut.dmm | 8 +- _maps/shuttles/emergency/emergency_fland.dmm | 18 +- .../emergency_imfedupwiththisworld.dmm | 10 +- _maps/shuttles/emergency/emergency_kilo.dmm | 2 +- _maps/shuttles/emergency/emergency_meta.dmm | 8 +- _maps/shuttles/emergency/emergency_pubby.dmm | 2 +- _maps/shuttles/emergency/emergency_raven.dmm | 8 +- .../emergency/emergency_russiafightpit.dmm | 18 +- .../shuttles/emergency/emergency_theatre.dmm | 18 +- _maps/shuttles/emergency/emergency_tiny.dmm | 2 +- .../emergency/emergency_wabbajack.dmm | 4 +- .../exploration/exploration_fland.dmm | 14 +- _maps/shuttles/hunter/hunter_bounty.dmm | 2 +- _maps/shuttles/hunter/hunter_russian.dmm | 14 +- _maps/shuttles/hunter/hunter_space_cop.dmm | 6 +- .../infiltrator/infiltrator_advanced.dmm | 8 +- .../infiltrator/infiltrator_basic.dmm | 12 +- _maps/shuttles/pirate/pirate_default.dmm | 30 +- _maps/shuttles/ruin/ruin_caravan_victim.dmm | 12 +- _maps/shuttles/ruin/ruin_pirate_cutter.dmm | 8 +- _maps/shuttles/whiteship/whiteship_box.dmm | 34 +- _maps/shuttles/whiteship/whiteship_delta.dmm | 24 +- _maps/shuttles/whiteship/whiteship_fland.dmm | 16 +- _maps/shuttles/whiteship/whiteship_meta.dmm | 54 +- _maps/templates/hilbertshotel.dmm | 4 +- _maps/templates/holodeck_asylum.dmm | 2 +- _maps/templates/holodeck_kitchen.dmm | 2 +- _maps/templates/holodeck_teahouse.dmm | 10 +- _maps/templates/shelter_2.dmm | 6 +- _maps/templates/shelter_3.dmm | 8 +- _maps/templates/shelter_4.dmm | 6 +- _maps/templates/warped_room.dmm | 4 +- beestation.dme | 14 +- .../dcs/signals/signals_atom/signals_atom.dm | 2 + .../signals_obj/signals_item/signals_food.dm | 5 + code/__DEFINES/economy.dm | 8 +- code/__DEFINES/is_helpers.dm | 2 + code/__HELPERS/randoms.dm | 7 +- code/__HELPERS/type_processing.dm | 2 +- code/_globalvars/lists/flavor_misc.dm | 14 +- code/_globalvars/lists/maintenance_loot.dm | 6 +- code/_onclick/item_attack.dm | 24 +- code/controllers/subsystem/traumas.dm | 4 +- code/datums/ai/monkey/monkey_controller.dm | 6 +- .../crafting/crafting_lists/drinks.dm | 46 +- .../crafting_lists/foodstuffs/recipes_egg.dm | 2 +- .../foodstuffs/recipes_frozen.dm | 36 +- .../crafting_lists/foodstuffs/recipes_meat.dm | 2 +- .../crafting_lists/foodstuffs/recipes_misc.dm | 6 +- .../foodstuffs/recipes_salad.dm | 14 +- .../crafting_lists/foodstuffs/recipes_soup.dm | 52 +- .../foodstuffs/recipes_spaghetti.dm | 2 +- .../crafting/crafting_lists/misc.dm | 2 +- .../crafting/crafting_lists/primal.dm | 2 +- .../crafting/crafting_lists/robots.dm | 2 +- .../crafting_lists/weaponry/weapons.dm | 12 +- code/datums/components/food/edible.dm | 6 +- code/datums/components/infective.dm | 13 + .../components/storage/concrete/pockets.dm | 6 +- code/datums/components/udder.dm | 6 +- code/datums/diseases/transformation.dm | 2 +- .../mood_events/generic_negative_events.dm | 17 + code/datums/station_traits/positive_traits.dm | 2 +- code/datums/traits/negative_quirk.dm | 36 +- code/game/atoms.dm | 15 + code/game/machinery/cloning.dm | 4 +- code/game/machinery/computer/arena.dm | 2 +- code/game/machinery/dish_drive.dm | 4 +- code/game/machinery/iv_drip.dm | 6 +- code/game/machinery/limbgrower.dm | 10 +- code/game/machinery/newscaster/newspaper.dm | 2 +- code/game/machinery/sleeper.dm | 2 +- code/game/machinery/syndicatebomb.dm | 8 +- code/game/machinery/washing_machine.dm | 2 +- code/game/objects/effects/decals/cleanable.dm | 2 +- code/game/objects/effects/landmarks.dm | 2 +- code/game/objects/items/RSF.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 2 +- .../circuitboards/machine_circuitboards.dm | 14 +- code/game/objects/items/clown_items.dm | 2 +- code/game/objects/items/devices/scanners.dm | 2 +- code/game/objects/items/food/donuts.dm | 6 +- code/game/objects/items/food/frozen.dm | 2 +- code/game/objects/items/food/salad.dm | 6 +- code/game/objects/items/food/soup.dm | 4 +- code/game/objects/items/food/spaghetti.dm | 2 +- .../objects/items/grenades/chem_grenade.dm | 152 +++-- .../game/objects/items/grenades/ghettobomb.dm | 2 +- code/game/objects/items/holy_weapons.dm | 2 +- code/game/objects/items/mail.dm | 8 +- code/game/objects/items/mop.dm | 2 +- code/game/objects/items/robot/robot_items.dm | 24 +- .../miscellaneous_mats_recipes.dm | 4 +- .../stacks/sheets/organic/cloths_recipes.dm | 2 +- .../stacks/sheets/organic/wood_recipes.dm | 2 +- code/game/objects/items/storage/backpack.dm | 4 +- code/game/objects/items/storage/bags.dm | 8 +- code/game/objects/items/storage/belt.dm | 43 +- code/game/objects/items/storage/book.dm | 2 +- code/game/objects/items/storage/boxes.dm | 26 +- code/game/objects/items/storage/firstaid.dm | 8 +- .../game/objects/items/storage/uplink_kits.dm | 34 +- code/game/objects/items/toys.dm | 2 +- code/game/objects/structures/artstuff.dm | 2 +- .../crates_lockers/closets/job_closets.dm | 4 +- .../crates_lockers/closets/l3closet.dm | 4 +- .../crates_lockers/closets/secure/bar.dm | 2 +- .../crates_lockers/closets/secure/freezer.dm | 14 +- .../crates_lockers/closets/secure/medical.dm | 24 +- .../crates_lockers/crates/wooden.dm | 2 +- code/game/objects/structures/watercloset.dm | 2 +- .../antagonists/cult/cult_structures.dm | 2 +- .../heretic/items/eldritch_flask.dm | 2 +- .../heretic/knowledge/side_rust_ash.dm | 2 +- code/modules/asset_cache/asset_list_items.dm | 2 +- .../components/unary_devices/cryo.dm | 4 +- .../awaymissions/mission_code/snowdin.dm | 2 +- .../modules/awaymissions/super_secret_room.dm | 4 +- code/modules/cargo/bounties/mining.dm | 2 +- code/modules/cargo/bounties/science.dm | 2 +- code/modules/cargo/exports/lavaland.dm | 2 +- code/modules/cargo/packs.dm | 140 ++-- .../entries/character/quirks/alcoholic.dm | 2 +- code/modules/clothing/head/jobs.dm | 2 +- code/modules/clothing/outfits/ert.dm | 2 +- code/modules/clothing/outfits/standard.dm | 4 +- .../clothing/spacesuits/miscellaneous.dm | 4 +- code/modules/clothing/suits/chaplainsuits.dm | 10 +- code/modules/clothing/suits/costume.dm | 4 +- code/modules/clothing/suits/jobs.dm | 8 +- code/modules/clothing/suits/labcoat.dm | 4 +- code/modules/clothing/suits/wintercoats.dm | 28 +- .../crew_objectives/civilian_objectives.dm | 2 +- .../detectivework/footprints_and_rag.dm | 6 +- code/modules/events/shuttle_loan.dm | 6 +- .../exploration_crew/exploration_vendor.dm | 4 +- code/modules/food_and_drinks/drinks/drinks.dm | 629 ------------------ code/modules/food_and_drinks/food.dm | 53 -- .../kitchen_machinery/deep_fryer.dm | 4 +- .../kitchen_machinery/food_cart.dm | 6 +- .../kitchen_machinery/grill.dm | 2 +- .../kitchen_machinery/microwave.dm | 4 +- .../kitchen_machinery/smartfridge.dm | 28 +- code/modules/food_and_drinks/pizzabox.dm | 2 +- code/modules/food_and_drinks/plate.dm | 2 +- .../food_and_drinks/recipes/drinks_recipes.dm | 18 +- .../food_and_drinks/recipes/food_mixtures.dm | 18 - code/modules/hydroponics/beekeeping/beebox.dm | 4 +- .../hydroponics/beekeeping/beekeeper_suit.dm | 2 +- .../hydroponics/beekeeping/honeycomb.dm | 8 +- code/modules/hydroponics/biogenerator.dm | 6 +- code/modules/hydroponics/hydroitemdefines.dm | 18 +- code/modules/jobs/job_mail.dm | 56 +- code/modules/jobs/job_types/mime.dm | 2 +- code/modules/mining/abandoned_crates.dm | 10 +- code/modules/mining/lavaland/ash_flora.dm | 4 +- .../mining/lavaland/necropolis_chests.dm | 14 +- code/modules/mining/machine_vending.dm | 4 +- .../mob/living/silicon/robot/robot_modules.dm | 4 +- .../mob/living/simple_animal/bot/cleanbot.dm | 2 +- .../mob/living/simple_animal/bot/medbot.dm | 2 +- .../mob/living/simple_animal/bot/secbot.dm | 2 +- .../mob/living/simple_animal/hostile/goose.dm | 6 +- .../hostile/mining_mobs/hivelord.dm | 4 +- .../file_system/programs/phys_scanner.dm | 2 +- code/modules/ninja/suit/suit_attackby.dm | 2 +- code/modules/paperwork/fax.dm | 4 +- .../chemistry/machinery/chem_master.dm | 22 +- .../chemistry/machinery/chem_synthesizer.dm | 2 +- .../reagents/chemistry/machinery/pandemic.dm | 4 +- .../chemistry/machinery/reagentgrinder.dm | 2 +- .../chemistry/reagents/drink_reagents.dm | 35 + .../chemistry/reagents/food_reagents.dm | 18 - .../chemistry/recipes/slime_extracts.dm | 2 +- code/modules/reagents/reagent_containers.dm | 45 +- .../reagent_containers/chem_heirloom.dm | 14 +- .../reagent_containers}/condiment.dm | 80 +-- .../{glass.dm => cups/_cup.dm} | 262 +++++--- .../reagent_containers/{ => cups}/bottle.dm | 216 +++--- .../reagent_containers/cups}/drinkingglass.dm | 54 +- .../reagent_containers/cups/drinks.dm | 501 ++++++++++++++ .../reagent_containers/cups/glassbottle.dm} | 491 +++++++------- .../reagents/reagent_containers/cups/soda.dm | 248 +++++++ code/modules/reagents/reagent_dispenser.dm | 2 +- .../research/designs/autolathe_designs.dm | 14 +- .../research/designs/biogenerator_designs.dm | 24 +- .../research/designs/medical_designs.dm | 8 +- .../modules/research/machinery/_production.dm | 4 +- .../xenobiology/crossbreeding/_structures.dm | 4 +- .../ruins/lavalandruin_code/syndicate_base.dm | 2 +- .../ruin_generator/mapping.dm | 10 +- code/modules/uplink/uplink_items.dm | 8 +- code/modules/vending/boozeomat.dm | 102 +-- code/modules/vending/coffee.dm | 10 +- code/modules/vending/cola.dm | 44 +- code/modules/vending/drinnerware.dm | 14 +- code/modules/vending/liberation.dm | 2 +- code/modules/vending/magivend.dm | 2 +- code/modules/vending/medical.dm | 20 +- code/modules/vending/medical_wall.dm | 8 +- code/modules/vending/mining.dm | 4 +- code/modules/vending/nutrimax.dm | 10 +- code/modules/vending/snack.dm | 2 +- code/modules/vending/sovietsoda.dm | 4 +- code/modules/vending/sustenance.dm | 4 +- code/modules/vending/wardrobes.dm | 40 +- .../modules/wiremod/core/component_printer.dm | 4 +- icons/mob/inhands/misc/drinks_lefthand.dmi | Bin 0 -> 1875 bytes icons/mob/inhands/misc/drinks_righthand.dmi | Bin 0 -> 1253 bytes icons/obj/drinks.dmi | Bin 93529 -> 92987 bytes sound/effects/can_pop.ogg | Bin 0 -> 20919 bytes sound/effects/can_shake.ogg | Bin 0 -> 18518 bytes .../Scripts/11701_drinks_refactor.txt | 25 + 342 files changed, 4038 insertions(+), 3767 deletions(-) delete mode 100644 code/modules/food_and_drinks/drinks/drinks.dm delete mode 100644 code/modules/food_and_drinks/food.dm rename code/modules/{food_and_drinks/food => reagents/reagent_containers}/condiment.dm (86%) rename code/modules/reagents/reagent_containers/{glass.dm => cups/_cup.dm} (64%) mode change 100755 => 100644 rename code/modules/reagents/reagent_containers/{ => cups}/bottle.dm (76%) rename code/modules/{food_and_drinks/drinks/drinks => reagents/reagent_containers/cups}/drinkingglass.dm (58%) create mode 100644 code/modules/reagents/reagent_containers/cups/drinks.dm rename code/modules/{food_and_drinks/drinks/drinks/bottle.dm => reagents/reagent_containers/cups/glassbottle.dm} (60%) create mode 100644 code/modules/reagents/reagent_containers/cups/soda.dm create mode 100644 icons/mob/inhands/misc/drinks_lefthand.dmi create mode 100644 icons/mob/inhands/misc/drinks_righthand.dmi create mode 100644 sound/effects/can_pop.ogg create mode 100644 sound/effects/can_shake.ogg create mode 100644 tools/UpdatePaths/Scripts/11701_drinks_refactor.txt diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm index ea0449e2d9a27..bf4f39c690325 100644 --- a/_maps/Prefab/Departments.dmm +++ b/_maps/Prefab/Departments.dmm @@ -362,7 +362,7 @@ /area/security/detectives_office) "ir" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 11; pixel_y = -5 }, diff --git a/_maps/RandomRooms/10x10/rdm_dorms.dmm b/_maps/RandomRooms/10x10/rdm_dorms.dmm index 91df1aebb4e33..a6ad57c148469 100644 --- a/_maps/RandomRooms/10x10/rdm_dorms.dmm +++ b/_maps/RandomRooms/10x10/rdm_dorms.dmm @@ -312,7 +312,7 @@ /area/template_noop) "Vu" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/glass/waterbottle/empty{ +/obj/item/reagent_containers/cup/waterbottle/empty{ pixel_x = -6; pixel_y = 7 }, diff --git a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm index 732ec6abcaf21..4bcb264df0c5b 100644 --- a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm +++ b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm @@ -19,13 +19,13 @@ /turf/open/floor/carpet/royalblack, /area/template_noop) "bq" = ( -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = 5 }, /turf/open/floor/eighties, /area/template_noop) "dZ" = ( -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ list_reagents = list(/datum/reagent/medicine/morphine = 5); pixel_x = 4 }, @@ -196,7 +196,7 @@ /area/template_noop) "Aa" = ( /obj/structure/bed/maint, -/obj/item/reagent_containers/food/drinks/bottle/hcider{ +/obj/item/reagent_containers/cup/glass/bottle/hcider{ pixel_x = 12; pixel_y = -5 }, @@ -243,11 +243,11 @@ /turf/open/floor/iron, /area/template_noop) "Ik" = ( -/obj/item/reagent_containers/food/drinks/bottle/molotov{ +/obj/item/reagent_containers/cup/glass/bottle/molotov{ pixel_x = 10; pixel_y = -6 }, -/obj/item/reagent_containers/food/drinks/bottle/trappist{ +/obj/item/reagent_containers/cup/glass/bottle/trappist{ pixel_y = 2 }, /turf/open/floor/eighties, @@ -261,9 +261,9 @@ /area/template_noop) "Mx" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/reagent_containers/food/drinks/bottle/moonshine, -/obj/item/reagent_containers/food/drinks/bottle/hooch, -/obj/item/reagent_containers/food/drinks/bottle/ale, +/obj/item/reagent_containers/cup/glass/bottle/moonshine, +/obj/item/reagent_containers/cup/glass/bottle/hooch, +/obj/item/reagent_containers/cup/glass/bottle/ale, /obj/item/paper/monitorkey, /turf/open/floor/eighties, /area/template_noop) @@ -288,12 +288,12 @@ /obj/item/gun/syringe{ pixel_y = 7 }, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_x = -7; pixel_y = 13 }, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine{ list_reagents = list(/datum/reagent/medicine/morphine = 20); pixel_x = 7; pixel_y = 2 diff --git a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm index 6a5bfa67322de..7af9523a269de 100644 --- a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm @@ -116,7 +116,7 @@ /turf/open/floor/wood, /area/template_noop) "x" = ( -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, /obj/structure/disposalpipe/segment{ dir = 6 }, diff --git a/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm b/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm index 801eb76b8cb96..2c2f58e3e131f 100644 --- a/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm @@ -56,15 +56,15 @@ /area/template_noop) "m" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = 6; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/bottle/tequila{ +/obj/item/reagent_containers/cup/glass/bottle/tequila{ pixel_x = -6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/plating, /area/template_noop) "n" = ( @@ -133,11 +133,11 @@ /area/template_noop) "y" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 4; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /turf/open/floor/plating, /area/template_noop) "z" = ( @@ -148,7 +148,7 @@ /area/template_noop) "A" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/gin{ +/obj/item/reagent_containers/cup/glass/bottle/gin{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -277,7 +277,7 @@ /turf/open/floor/plating, /area/template_noop) "V" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/structure/sink{ dir = 4; diff --git a/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm b/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm index 2060e30f0642b..55db5b2d1ef9d 100644 --- a/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm @@ -44,7 +44,7 @@ /turf/open/floor/wood, /area/template_noop) "l" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /turf/open/floor/carpet/red, /area/template_noop) "m" = ( @@ -59,7 +59,7 @@ "o" = ( /obj/structure/chair/fancy/comfy, /obj/item/food/popcorn, -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers, +/obj/item/reagent_containers/cup/soda_cans/shamblers, /turf/open/floor/wood, /area/template_noop) "p" = ( @@ -67,7 +67,7 @@ /turf/open/floor/carpet/red, /area/template_noop) "q" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, /turf/open/floor/carpet/red, /area/template_noop) "r" = ( @@ -81,7 +81,7 @@ /area/template_noop) "t" = ( /obj/structure/chair/fancy/comfy, -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind, +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind, /turf/open/floor/wood, /area/template_noop) "u" = ( diff --git a/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm b/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm index a07548908a39a..d31a0a10debfb 100644 --- a/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm @@ -39,7 +39,7 @@ /area/template_noop) "g" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/dark, /area/template_noop) "l" = ( diff --git a/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm b/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm index 821b36e7b9186..b3c4d4672b548 100644 --- a/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm @@ -246,8 +246,8 @@ }, /obj/structure/closet, /obj/item/storage/pill_bottle/mannitol, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /obj/item/gun/syringe, /obj/item/storage/box/syringes, /obj/item/restraints/handcuffs, @@ -368,17 +368,17 @@ /area/template_noop) "KV" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/cup/glass/sillycup{ pixel_x = -4; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/cup/glass/sillycup{ pixel_x = 9; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/sillycup, -/obj/item/reagent_containers/food/drinks/sillycup, -/obj/item/reagent_containers/food/drinks/sillycup, +/obj/item/reagent_containers/cup/glass/sillycup, +/obj/item/reagent_containers/cup/glass/sillycup, +/obj/item/reagent_containers/cup/glass/sillycup, /turf/open/floor/iron/white, /area/template_noop) "Ls" = ( diff --git a/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm b/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm index 14a137e58b4c5..a2de7497ebca4 100644 --- a/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm @@ -104,16 +104,16 @@ /obj/structure/closet/crate/freezer{ name = "Beer Cooler" }, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating/beach/sand, /area/template_noop) "L" = ( diff --git a/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm b/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm index e2c83fb23553a..aa002135e93c6 100644 --- a/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm @@ -129,7 +129,7 @@ /area/template_noop) "qP" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{ +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ pixel_x = 4; pixel_y = 7 }, @@ -176,7 +176,7 @@ /area/template_noop) "AU" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{ +/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ pixel_x = -4; pixel_y = 5 }, @@ -260,7 +260,7 @@ "Qx" = ( /obj/structure/closet, /obj/structure/window/reinforced/tinted/frosted, -/obj/item/reagent_containers/food/drinks/bottle/tequila{ +/obj/item/reagent_containers/cup/glass/bottle/tequila{ pixel_x = -6; pixel_y = 4 }, diff --git a/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm b/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm index d150aa47c9313..de41faf9920dc 100644 --- a/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm @@ -295,7 +295,7 @@ /area/template_noop) "ZH" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{ +/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ pixel_x = -2; pixel_y = 12 }, diff --git a/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm b/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm index 784fc5f25a9cf..305304a90d4e4 100644 --- a/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm @@ -24,19 +24,19 @@ /area/template_noop) "i" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{ +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ pixel_x = -7; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = 12; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ +/obj/item/reagent_containers/cup/soda_cans/starkist{ pixel_x = 10; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/soda_cans/space_up, +/obj/item/reagent_containers/cup/soda_cans/space_up, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -99,11 +99,11 @@ /area/template_noop) "w" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{ +/obj/item/reagent_containers/cup/soda_cans/shamblers{ pixel_x = 9; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/soda_cans/space_up, +/obj/item/reagent_containers/cup/soda_cans/space_up, /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, @@ -117,7 +117,7 @@ /turf/open/floor/plating, /area/template_noop) "A" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ pixel_x = -7; pixel_y = 10 }, @@ -136,7 +136,7 @@ /turf/open/floor/iron, /area/template_noop) "D" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{ +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ pixel_x = 4 }, /turf/open/floor/plating, diff --git a/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm b/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm index 4473fa80c1585..cc7e03f86ec9d 100644 --- a/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm @@ -28,11 +28,11 @@ /area/template_noop) "g" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -8; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 5; pixel_y = 4 }, @@ -184,7 +184,7 @@ /area/template_noop) "J" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 4; pixel_y = 4 }, diff --git a/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm b/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm index b7f72482782ad..49bd54fa4b4f5 100644 --- a/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm @@ -21,8 +21,8 @@ /area/template_noop) "g" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/machinery/light/small{ dir = 4 }, diff --git a/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm b/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm index 06e10c8e996aa..9b7be400425e8 100644 --- a/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm @@ -52,8 +52,8 @@ /obj/item/cultivator{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/grass, /area/template_noop) "k" = ( diff --git a/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm b/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm index 1c0b8fe3e54d4..858f8a63bc9e4 100644 --- a/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm @@ -132,15 +132,15 @@ /area/template_noop) "F" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/tonic{ +/obj/item/reagent_containers/cup/soda_cans/tonic{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/soda_cans/tonic{ +/obj/item/reagent_containers/cup/soda_cans/tonic{ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/soda_cans/tonic{ +/obj/item/reagent_containers/cup/soda_cans/tonic{ pixel_y = -3 }, /turf/open/floor/carpet/orange, diff --git a/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm b/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm index cab51223247e1..57797c4adeb41 100644 --- a/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm @@ -527,7 +527,7 @@ pixel_x = -5; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /turf/open/floor/carpet/green, /area/template_noop) "Ra" = ( diff --git a/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm b/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm index 271274cf8cde1..e9eedc726cc00 100644 --- a/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm +++ b/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm @@ -5,7 +5,7 @@ /area/template_noop) "c" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/cup/glass/bottle/rum{ name = "Captain Pete's Private Reserve Cuban Spaced Rum"; pixel_x = -6; pixel_y = 8 @@ -91,7 +91,7 @@ /turf/open/floor/wood, /area/template_noop) "q" = ( -/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, diff --git a/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm b/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm index 0494353f618ee..61ea44a02775a 100644 --- a/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm @@ -76,8 +76,8 @@ /obj/item/storage/firstaid, /obj/item/storage/firstaid/toxin, /obj/item/storage/box/syringes, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /obj/item/stack/sheet/mineral/silver{ amount = 2 }, @@ -185,22 +185,22 @@ /obj/effect/spawner/lootdrop/teratoma/minor, /obj/effect/spawner/lootdrop/teratoma/minor, /obj/effect/spawner/lootdrop/teratoma/minor, -/obj/item/reagent_containers/food/drinks/beer/light, -/obj/item/reagent_containers/food/drinks/soda_cans/sodawater, -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers, -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers, -/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull, -/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull, -/obj/item/reagent_containers/food/drinks/soda_cans/air, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, -/obj/item/reagent_containers/food/drinks/soda_cans/space_up, -/obj/item/reagent_containers/food/drinks/soda_cans/space_up, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist, +/obj/item/reagent_containers/cup/glass/bottle/beer/light, +/obj/item/reagent_containers/cup/soda_cans/sodawater, +/obj/item/reagent_containers/cup/soda_cans/shamblers, +/obj/item/reagent_containers/cup/soda_cans/shamblers, +/obj/item/reagent_containers/cup/soda_cans/grey_bull, +/obj/item/reagent_containers/cup/soda_cans/grey_bull, +/obj/item/reagent_containers/cup/soda_cans/air, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/pwr_game, +/obj/item/reagent_containers/cup/soda_cans/pwr_game, +/obj/item/reagent_containers/cup/soda_cans/space_up, +/obj/item/reagent_containers/cup/soda_cans/space_up, +/obj/item/reagent_containers/cup/soda_cans/starkist, /obj/item/storage/pill_bottle/happy, /turf/open/floor/carpet{ icon_state = "carpetsymbol" diff --git a/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm b/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm index f73227dfd0a8f..7b69a241b0a61 100644 --- a/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm @@ -39,7 +39,7 @@ /obj/structure/rack, /obj/item/book/manual/wiki/robotics_cyborgs, /obj/item/storage/belt/utility, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, diff --git a/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm b/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm index e4c7ce33eac91..2f1c4580cc273 100644 --- a/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm @@ -113,10 +113,10 @@ "p" = ( /obj/structure/table, /obj/item/shovel/spade, -/obj/item/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ pixel_x = 5 }, -/obj/item/reagent_containers/glass/bottle/nutrient/ez{ +/obj/item/reagent_containers/cup/bottle/nutrient/ez{ pixel_x = -5 }, /obj/item/reagent_containers/syringe, @@ -130,7 +130,7 @@ /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/template_noop) @@ -142,7 +142,7 @@ /obj/structure/table, /obj/item/crowbar, /obj/item/wrench, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/template_noop) diff --git a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm index 04c8cd5a89474..091b60ee966ea 100644 --- a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm @@ -27,11 +27,11 @@ /area/template_noop) "s" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/effect/turf_decal/delivery, diff --git a/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm b/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm index fb74ee00abeb6..b2678159eccdd 100644 --- a/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm @@ -40,18 +40,18 @@ /area/template_noop) "n" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -91,10 +91,10 @@ /area/template_noop) "w" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -112,14 +112,14 @@ /area/template_noop) "C" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, @@ -127,13 +127,13 @@ /area/template_noop) "F" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -141,10 +141,10 @@ /turf/open/floor/iron, /area/template_noop) "I" = ( -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -157,10 +157,10 @@ /area/template_noop) "N" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -171,10 +171,10 @@ /area/template_noop) "Q" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -183,13 +183,13 @@ /area/template_noop) "R" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -201,13 +201,13 @@ /area/template_noop) "X" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -219,10 +219,10 @@ /area/template_noop) "Z" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm b/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm index acca4e479dbbf..84d9ccd80a5a4 100644 --- a/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm @@ -8,7 +8,7 @@ /obj/effect/decal/cleanable/shreds, /obj/item/toy/cards/singlecard, /obj/effect/spawner/lootdrop/maintenance/seven, -/obj/item/reagent_containers/glass/waterbottle/relic, +/obj/item/reagent_containers/cup/waterbottle/relic, /obj/item/cigbutt, /turf/open/floor/plating, /area/template_noop) @@ -168,7 +168,7 @@ /obj/structure/closet/cardboard, /obj/item/storage/toolbox/emergency, /obj/effect/spawner/lootdrop/maintenance/eight, -/obj/item/reagent_containers/food/drinks/bottle/hooch, +/obj/item/reagent_containers/cup/glass/bottle/hooch, /turf/open/floor/plating, /area/template_noop) "L" = ( diff --git a/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm b/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm index 0739616fbf7c3..b52939d9cec8c 100644 --- a/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm @@ -75,7 +75,7 @@ /area/template_noop) "v" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/cup/glass/mug, /turf/open/floor/iron/dark, /area/template_noop) "A" = ( diff --git a/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm b/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm index eb4c4306446f1..64248597f28fa 100644 --- a/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm @@ -96,18 +96,18 @@ /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -1 }, /turf/open/floor/iron/cafeteria, diff --git a/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm b/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm index 6617e2dd2710c..9eba5ed746d0e 100644 --- a/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm @@ -61,11 +61,11 @@ /area/template_noop) "v" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/soda_cans/space_up, +/obj/item/reagent_containers/cup/soda_cans/space_up, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/template_noop) diff --git a/_maps/RandomRooms/3x3/rdm_workout.dmm b/_maps/RandomRooms/3x3/rdm_workout.dmm index 0c011d4e8bf19..963ff0f701ee9 100644 --- a/_maps/RandomRooms/3x3/rdm_workout.dmm +++ b/_maps/RandomRooms/3x3/rdm_workout.dmm @@ -11,7 +11,7 @@ /obj/effect/turf_decal/stripes{ dir = 9 }, -/obj/item/reagent_containers/food/drinks/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = 13; pixel_y = -7 }, diff --git a/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm b/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm index c587509c96aa8..6daed4f93509c 100644 --- a/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm +++ b/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm @@ -6,7 +6,7 @@ /area/template_noop) "c" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating, /area/template_noop) "d" = ( diff --git a/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm b/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm index 58d6b0c48cb28..ddcd0ac416599 100644 --- a/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm +++ b/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm @@ -15,7 +15,7 @@ name = "old sink"; pixel_y = 28 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/template_noop) "g" = ( diff --git a/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm b/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm index 431420bcdb38b..1e9774eb79025 100644 --- a/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm +++ b/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm @@ -18,7 +18,7 @@ /obj/item/hemostat, /obj/item/healthanalyzer, /obj/item/clothing/glasses/eyepatch, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = 3; pixel_y = 2 }, @@ -38,7 +38,7 @@ /area/template_noop) "f" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 8; pixel_y = 2 }, diff --git a/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm b/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm index bc826c4b8fd55..f8d8fb1b02b66 100644 --- a/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm +++ b/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm @@ -20,7 +20,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /turf/open/floor/plating{ broken = 1 @@ -29,7 +29,7 @@ "s" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/mirror{ diff --git a/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm b/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm index 04f787182db82..79e89e56bf672 100644 --- a/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm +++ b/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm @@ -1,11 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 7; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -2; pixel_y = 6 }, @@ -40,23 +40,23 @@ "g" = ( /obj/structure/table/glass, /obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/glass/bottle/random_virus{ +/obj/item/reagent_containers/cup/bottle/random_virus{ pixel_x = -9; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter{ +/obj/item/reagent_containers/cup/soda_cans/canned_laughter{ pixel_x = -2; pixel_y = 9 }, -/obj/item/reagent_containers/glass/bottle/mutagen, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/bottle/mutagen, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = 6; pixel_y = 4 }, /turf/open/floor/plating, /area/template_noop) "h" = ( -/obj/item/reagent_containers/glass/bottle/synaptizine, +/obj/item/reagent_containers/cup/bottle/synaptizine, /obj/structure/table/glass, /obj/effect/spawner/lootdrop/teratoma/major, /obj/effect/spawner/lootdrop/maintenance/three, diff --git a/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm b/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm index b170e37558df0..23b91e43ea937 100644 --- a/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm +++ b/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm @@ -2,7 +2,7 @@ "a" = ( /obj/structure/closet/cardboard, /obj/item/storage/toolbox/emergency, -/obj/item/reagent_containers/food/drinks/bottle/hooch, +/obj/item/reagent_containers/cup/glass/bottle/hooch, /turf/open/floor/plating, /area/template_noop) "b" = ( diff --git a/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm b/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm index a2dfa26e39cb7..d18e242b1d83a 100644 --- a/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm +++ b/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm @@ -2,8 +2,8 @@ "a" = ( /obj/structure/table, /obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/condiment/sugar, /turf/open/floor/plating, /area/template_noop) "b" = ( @@ -43,10 +43,10 @@ /area/template_noop) "i" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2 }, /obj/item/food/mint{ diff --git a/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm b/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm index 9380a05a52138..1891d23f815d3 100644 --- a/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm +++ b/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm @@ -57,8 +57,8 @@ }, /obj/structure/closet, /obj/item/storage/pill_bottle/mannitol, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /obj/item/gun/syringe, /obj/item/storage/box/syringes, /obj/item/restraints/handcuffs, diff --git a/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm b/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm index 268234dd5115c..03b47be28c30c 100644 --- a/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm +++ b/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm @@ -8,11 +8,11 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = 4; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -5; pixel_y = 6 }, diff --git a/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm b/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm index 51be66a5609d5..9493dae1ba257 100644 --- a/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm +++ b/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm @@ -43,7 +43,7 @@ "e" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ desc = "Takes you to a whole new level of thinking."; name = "Meta-Cider" }, diff --git a/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm b/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm index 715857670f706..c1b5ad3c79732 100644 --- a/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm +++ b/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm @@ -16,7 +16,7 @@ /obj/structure/sink/kitchen{ pixel_y = 28 }, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /turf/open/floor/plating, /area/template_noop) "e" = ( diff --git a/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm b/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm index e9618c8efda05..00a9d3cbbf5ec 100644 --- a/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm +++ b/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm @@ -19,9 +19,9 @@ /area/template_noop) "e" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/condiment/rice, /obj/machinery/light/small{ dir = 1 }, @@ -55,7 +55,7 @@ /obj/item/seeds/dionapod, /obj/item/seeds/carrot, /obj/item/seeds/tomato, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, /turf/open/floor/plating, /area/template_noop) "j" = ( diff --git a/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm b/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm index 625353e6c6ed1..8ed123ce80a1a 100644 --- a/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm +++ b/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm @@ -6,8 +6,8 @@ /turf/open/floor/iron/white, /area/template_noop) "i" = ( -/obj/item/reagent_containers/food/drinks/bottle/synthflesh, -/obj/item/reagent_containers/food/drinks/bottle/synthflesh, +/obj/item/reagent_containers/cup/glass/bottle/synthflesh, +/obj/item/reagent_containers/cup/glass/bottle/synthflesh, /obj/structure/closet, /turf/open/floor/iron/white, /area/template_noop) diff --git a/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm b/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm index 70162a872ce86..2b84b5f21a127 100644 --- a/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm +++ b/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm @@ -39,7 +39,7 @@ "i" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/cup/glass/mug, /turf/open/floor/iron, /area/template_noop) "j" = ( diff --git a/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm b/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm index d0ec60f199533..d155aa87f1f81 100644 --- a/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm @@ -61,7 +61,7 @@ /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /turf/open/floor/plating, /area/template_noop) "m" = ( diff --git a/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm b/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm index 684e99df77599..45708d0993c7c 100644 --- a/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm @@ -14,11 +14,11 @@ /area/template_noop) "b" = ( /obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/cup/glass/bottle/rum{ pixel_x = 6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 7 }, /obj/effect/decal/cleanable/dirt, @@ -39,8 +39,8 @@ /area/template_noop) "e" = ( /obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/beaker/cryoxadone, /obj/item/reagent_containers/dropper, /turf/open/floor/plating, /area/template_noop) diff --git a/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm b/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm index 6e53fd6d8973c..911e2cbf7cafd 100644 --- a/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm @@ -1,16 +1,16 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/condiment/flour, /turf/open/floor/plating, /area/template_noop) "c" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/plating, @@ -31,7 +31,7 @@ "f" = ( /obj/structure/table, /obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /turf/open/floor/plating{ broken = 1 }, diff --git a/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm b/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm index d4c361d178aca..fe6b004116ebd 100644 --- a/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm @@ -4,7 +4,7 @@ /obj/structure/sign/departments/medbay{ pixel_y = 32 }, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/plating, /area/template_noop) "b" = ( @@ -24,15 +24,15 @@ /area/template_noop) "d" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 4; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 6; pixel_y = -1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -4; pixel_y = 6 }, @@ -43,7 +43,7 @@ /turf/open/floor/plating, /area/template_noop) "e" = ( -/obj/item/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/cup/bottle/toxin{ pixel_x = 4; pixel_y = 2 }, diff --git a/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm b/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm index 0bdefdca57f09..bf336d9ac4188 100644 --- a/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm @@ -60,7 +60,7 @@ /turf/open/floor/plating, /area/template_noop) "i" = ( -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, /turf/open/floor/plating{ broken = 1 }, diff --git a/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm b/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm index b90724a57434f..155b44094f006 100644 --- a/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm @@ -91,8 +91,8 @@ /obj/item/surgical_drapes, /obj/item/storage/firstaid, /obj/item/storage/box/syringes, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /obj/item/stack/sheet/mineral/silver{ amount = 2 }, diff --git a/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm b/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm index cc28a3652ee57..f1153b82c6430 100644 --- a/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/cup/beaker/cryoxadone, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer, /area/template_noop) diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm index 339f4c479fa9f..13c28c0a646ee 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm @@ -35,7 +35,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/template_noop) diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm index 3241234da08b7..3d4fcf9d4b06e 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm @@ -49,8 +49,8 @@ /area/template_noop) "p" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket{ pixel_x = -8 }, /obj/item/hatchet, @@ -63,12 +63,12 @@ /obj/structure/table, /obj/item/plant_analyzer, /obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ pixel_x = 2; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, /obj/item/reagent_containers/spray/pestspray{ pixel_x = 3; pixel_y = 4 diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm index fe7ad17d7f458..21f5e4fa175c9 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm @@ -31,7 +31,7 @@ /area/template_noop) "k" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/sake{ +/obj/item/reagent_containers/cup/glass/bottle/sake{ pixel_x = 5; pixel_y = 12 }, @@ -95,12 +95,12 @@ /area/template_noop) "G" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -3; pixel_y = 15 }, diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm index 9710dd92ae103..d7e47b8911db1 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm @@ -34,8 +34,8 @@ /obj/item/storage/firstaid, /obj/item/storage/firstaid/toxin, /obj/item/storage/box/syringes, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /obj/item/stack/sheet/mineral/silver{ amount = 2 }, diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm index e6a09e7813810..3e57f73405176 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm @@ -177,7 +177,7 @@ "R" = ( /obj/structure/closet/cardboard, /obj/item/storage/toolbox/emergency, -/obj/item/reagent_containers/food/drinks/bottle/hooch, +/obj/item/reagent_containers/cup/glass/bottle/hooch, /turf/open/floor/plating, /area/template_noop) "S" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index e282e294b0e7e..e240edd2c4f9c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -206,7 +206,7 @@ /area/ruin/powered/beach) "aR" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/tequila, +/obj/item/reagent_containers/cup/glass/bottle/tequila, /turf/open/floor/wood, /area/ruin/powered/beach) "aS" = ( @@ -236,7 +236,7 @@ /area/ruin/powered/beach) "aX" = ( /obj/structure/closet/secure_closet/freezer/meat/open, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/wood, /area/ruin/powered/beach) "aY" = ( @@ -363,7 +363,7 @@ /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bP" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bQ" = ( @@ -592,8 +592,8 @@ "NQ" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, /turf/open/floor/wood, /area/ruin/powered/beach) "QS" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 72a6698515e07..a9e48230deabc 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -274,7 +274,7 @@ }, /area/ruin/powered/clownplanet) "bL" = ( -/obj/item/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/cup/glass/trophy/gold_cup, /obj/structure/table/glass, /turf/open/floor/carpet, /area/ruin/powered/clownplanet) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index baba995eb3e92..344afa36d5b7e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -667,7 +667,7 @@ /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "vL" = ( -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /obj/item/reagent_containers/spray/cleaner, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -745,7 +745,7 @@ /obj/item/trash/cheesie, /obj/item/reagent_containers/syringe/antiviral, /obj/item/bodybag, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, /turf/open/floor/grass{ initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300" }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index adde229bb82d0..fd8cb555089ab 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -290,7 +290,7 @@ dir = 8 }, /obj/machinery/iv_drip, -/obj/item/reagent_containers/glass/waterbottle/large, +/obj/item/reagent_containers/cup/waterbottle/large, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aR" = ( @@ -1305,7 +1305,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dw" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/stone_tile/block/cracked{ dir = 4 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index c4655da79ffb3..62a6df4aaf1e6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -32,7 +32,7 @@ /turf/open/floor/plating, /area/ruin/powered/snow_biodome) "ah" = ( -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/cup/glass/mug, /turf/open/floor/plating, /area/ruin/powered/snow_biodome) "ai" = ( @@ -136,7 +136,7 @@ /area/ruin/powered/snow_biodome) "aF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/cocoa, +/obj/item/reagent_containers/cup/glass/mug/cocoa, /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aG" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index 56f5a21f4a3fe..e78618e875b3a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -32,7 +32,7 @@ }, /area/ruin/powered) "i" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating/asteroid{ name = "dirt" }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index d9bd0c6bfeed7..73e6ae270c375 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -314,16 +314,16 @@ /area/ruin/powered/seedvault) "nO" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 7 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_y = 6 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_y = 6 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = -6; pixel_y = 2 }, @@ -645,10 +645,10 @@ /obj/machinery/reagentgrinder{ pixel_y = 5 }, -/obj/item/reagent_containers/glass/beaker/bluespace, -/obj/item/reagent_containers/glass/beaker/bluespace, -/obj/item/reagent_containers/glass/beaker/bluespace, -/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, /obj/machinery/button{ id = "lifebring"; pixel_y = 32 @@ -1290,7 +1290,7 @@ /area/ruin/powered/seedvault) "Ud" = ( /obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /turf/open/floor/pod, /area/ruin/powered/seedvault) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index ccd5c580b5f42..3d9314923f0f5 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -93,14 +93,14 @@ icon_state = "0-2" }, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bottle/random_virus, -/obj/item/reagent_containers/glass/bottle/random_virus, -/obj/item/reagent_containers/glass/bottle/random_virus, -/obj/item/reagent_containers/glass/bottle/random_virus, -/obj/item/reagent_containers/glass/bottle/random_virus, -/obj/item/reagent_containers/glass/bottle/random_virus, -/obj/item/reagent_containers/glass/bottle/random_virus, -/obj/item/reagent_containers/glass/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, /turf/open/floor/iron/white/side{ dir = 9 }, @@ -119,8 +119,8 @@ dir = 4; pixel_x = 26 }, -/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, -/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, +/obj/item/reagent_containers/cup/soda_cans/canned_laughter, +/obj/item/reagent_containers/cup/soda_cans/canned_laughter, /obj/item/extrapolator, /turf/open/floor/iron/white/side{ dir = 5 @@ -389,10 +389,10 @@ pixel_y = -2 }, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /turf/open/floor/iron/white/corner{ dir = 4 }, @@ -414,7 +414,7 @@ /obj/machinery/reagentgrinder{ pixel_y = 5 }, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron/white/side{ dir = 5 }, @@ -566,10 +566,10 @@ }, /obj/structure/table/glass, /obj/item/folder/white, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3 }, /obj/item/reagent_containers/dropper, @@ -960,21 +960,21 @@ "ft" = ( /obj/effect/turf_decal/box/white/corners, /obj/structure/closet/crate, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large, -/obj/item/reagent_containers/glass/waterbottle/large, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large, +/obj/item/reagent_containers/cup/waterbottle/large, +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 3; pixel_y = -3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 3; pixel_y = -3 }, @@ -2750,7 +2750,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/soap/syndie, /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "kQ" = ( @@ -2898,7 +2898,7 @@ pixel_y = 6 }, /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/wood, /area/ruin/unpowered/syndicate_lava_base/bar) "ll" = ( @@ -3014,11 +3014,11 @@ /area/ruin/unpowered/syndicate_lava_base/bar) "lz" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_x = -4; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 5; pixel_y = -2 }, @@ -4103,7 +4103,7 @@ /area/ruin/unpowered/syndicate_lava_base/main) "qa" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -4849,7 +4849,7 @@ /area/ruin/unpowered/syndicate_lava_base/arrivals) "Fz" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/item/food/chocolatebar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 03e7de95c4eab..2f1b40c5b4bb0 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -1019,7 +1019,7 @@ /turf/open/floor/iron, /area/ruin/space/derelict/bridge/access) "dq" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -1241,7 +1241,7 @@ /turf/open/floor/plating, /area/ruin/space/derelict/bridge/access) "dZ" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/iron, /area/ruin/space/derelict/bridge) "ea" = ( @@ -1489,7 +1489,7 @@ /area/ruin/space/derelict/bridge) "eU" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/structure/window/reinforced{ dir = 4 }, @@ -2520,7 +2520,7 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /turf/open/floor/iron/white/airless, /area/ruin/space/derelict/medical) "iC" = ( @@ -2734,7 +2734,7 @@ }, /area/ruin/space/derelict/medical) "jk" = ( -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /turf/open/floor/iron/airless{ icon_state = "damaged3" }, @@ -3374,7 +3374,7 @@ /area/ruin/space/derelict/hallway/primary) "lq" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ list_reagents = list(/datum/reagent/toxin/acid = 50) }, /obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished, diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 8a9ae9ac8c3e9..e24e01482c05a 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -243,7 +243,7 @@ /area/ruin/space/has_grav/abandonedzoo) "aP" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bottle/random_virus, +/obj/item/reagent_containers/cup/bottle/random_virus, /obj/item/reagent_containers/dropper, /turf/open/floor/iron/dark/side, /area/ruin/space/has_grav/abandonedzoo) @@ -379,7 +379,7 @@ "bi" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/hypospray/medipen/stimpack, -/obj/item/reagent_containers/glass/bottle/mutagen, +/obj/item/reagent_containers/cup/bottle/mutagen, /turf/open/floor/iron/dark/side, /area/ruin/space/has_grav/abandonedzoo) "bj" = ( diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index ab18c9e534dfc..e0c41cdc41d87 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -80,7 +80,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/ruin/space/has_grav/derelictoutpost/cargobay) "aq" = ( diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index 5bae30eefbee6..fa317740e732f 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -50,7 +50,7 @@ /area/ruin/unpowered/no_grav) "al" = ( /obj/effect/decal/cleanable/food/salt, -/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "am" = ( @@ -125,7 +125,7 @@ /area/ruin/unpowered/no_grav) "aC" = ( /obj/structure/fluff/bus/passable, -/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/airless{ icon_state = "bus" @@ -154,7 +154,7 @@ /area/ruin/unpowered/no_grav) "aH" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/cup/glass/coffee, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aI" = ( @@ -199,7 +199,7 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aQ" = ( -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aR" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index c3f63abb553a1..176cc2ac6f00b 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -63,7 +63,7 @@ /area/awaymission/BMPship/Fore) "cl" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/BMPship/Midship) @@ -485,7 +485,7 @@ /turf/open/floor/iron/white, /area/awaymission/BMPship/Aft) "oh" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "ol" = ( @@ -655,7 +655,7 @@ "rv" = ( /obj/structure/table, /obj/item/pen/red, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/iron, /area/awaymission/BMPship/Aft) "rB" = ( @@ -1169,7 +1169,7 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Fore) "Ds" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/iron, /area/awaymission/BMPship/Midship) "Dz" = ( @@ -1195,8 +1195,8 @@ /area/awaymission/BMPship/Midship) "Et" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "Ey" = ( @@ -1221,7 +1221,7 @@ /turf/template_noop, /area/space/nearstation) "Fd" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/BMPship/Midship) @@ -1360,7 +1360,7 @@ /area/awaymission/BMPship/Aft) "HJ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "HL" = ( @@ -1373,7 +1373,7 @@ /turf/closed/wall/mineral/titanium, /area/awaymission/BMPship/Aft) "HZ" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/BMPship/Midship) @@ -1664,7 +1664,7 @@ /obj/structure/table/wood, /obj/item/stack/spacecash/c500, /obj/item/stack/spacecash/c100, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/wood, /area/awaymission/BMPship/Fore) "OE" = ( @@ -1711,7 +1711,7 @@ /turf/template_noop, /area/space/nearstation) "Pd" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/showroomfloor, /area/awaymission/BMPship/Aft) "Pf" = ( @@ -1988,7 +1988,7 @@ "Vr" = ( /obj/structure/table, /obj/item/knife/butcher, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/item/food/meat, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 05e2a42452989..a847cf5a5d9b4 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -379,13 +379,13 @@ dir = 1 }, /obj/item/storage/box/cups, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "aY" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/soysauce{ +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/condiment/soysauce{ pixel_x = 4 }, /obj/machinery/firealarm{ @@ -410,8 +410,8 @@ /area/ruin/space/has_grav/deepstorage/kitchen) "ba" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/peppermill, +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 4; pixel_y = 4 }, @@ -968,11 +968,11 @@ dir = 4 }, /obj/machinery/light, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "cx" = ( @@ -987,7 +987,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "cz" = ( @@ -1009,25 +1009,25 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 2; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -2 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 5 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 1; pixel_y = -3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 8; pixel_y = -3 }, diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm index 1b16fb6b5579b..8a8277243b798 100644 --- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm +++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm @@ -254,20 +254,20 @@ /turf/open/floor/iron/dark/airless, /area/ruin/space/has_grav/gasthelizard) "I" = ( -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = -4; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bottle/chloralhydrate, -/obj/item/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = 5; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/cup/bottle/facid{ name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6 @@ -331,8 +331,8 @@ /obj/structure/table/reinforced, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/glass/bottle/mutagen, -/obj/item/reagent_containers/glass/bottle/mutagen, +/obj/item/reagent_containers/cup/bottle/mutagen, +/obj/item/reagent_containers/cup/bottle/mutagen, /obj/item/razor, /turf/open/floor/iron/dark/airless, /area/ruin/space/has_grav/gasthelizard) diff --git a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm index fd689a7b13664..fa8dacffc4eb9 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm @@ -91,7 +91,7 @@ /area/ruin/space/has_grav/hilbertresearchfacility) "r" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, /turf/open/floor/carpet/grimy{ icon_state = "engine" }, diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index a8432f71eae07..89618fd243b0a 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -788,11 +788,11 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -30 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -4; pixel_y = 14 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 3; pixel_y = 11 }, diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index fdbda4defe1ce..229243a548023 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -28,7 +28,7 @@ "ai" = ( /obj/structure/janitorialcart, /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) @@ -170,13 +170,13 @@ /area/ruin/space/has_grav/powered/cat_man) "aK" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "aL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "aM" = ( @@ -691,7 +691,7 @@ "hz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/food/meat/slab/synthmeat{ desc = "A slab of cat meat. Tastes like furball."; name = "cat meat" diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 67e086897491a..2a114fb99921f 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -1027,8 +1027,8 @@ desc = "A highly-pressurized water tank, this one seems almost empty.."; tank_volume = 1000 }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/hydroponics) @@ -2301,7 +2301,7 @@ "hb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/sec) @@ -2597,14 +2597,14 @@ dir = 4 }, /obj/item/folder/white, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/rnd) "ip" = ( /obj/machinery/chem_master, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -2634,18 +2634,18 @@ /area/ruin/space/has_grav/ancientstation/rnd) "it" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -2714,11 +2714,11 @@ "iL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 5; pixel_y = -2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 2 }, @@ -2744,10 +2744,10 @@ /area/ruin/space/has_grav/ancientstation/rnd) "iR" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3794,10 +3794,10 @@ /area/ruin/space/has_grav/ancientstation/kitchen) "nT" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3806,13 +3806,13 @@ /area/ruin/space/has_grav/ancientstation/rnd) "ot" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -4136,10 +4136,10 @@ /area/ruin/space/has_grav/ancientstation/sec) "AP" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -4201,7 +4201,7 @@ "CJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -4220,13 +4220,13 @@ /area/ruin/space/has_grav/ancientstation/rnd) "En" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -4307,13 +4307,13 @@ /area/ruin/space/has_grav/ancientstation/rnd) "Fn" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -4747,10 +4747,10 @@ /area/ruin/space/has_grav/ancientstation) "Qy" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -4761,10 +4761,10 @@ /area/ruin/space/has_grav/ancientstation/rnd) "QS" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -4904,10 +4904,10 @@ /area/ruin/space/has_grav/ancientstation/sec) "VX" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index a61b507f17af5..38172723b326f 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -982,8 +982,8 @@ /obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/suit/space/hardsuit/syndi, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/cup/glass/bottle/rum, +/obj/item/reagent_containers/cup/glass/bottle/rum, /obj/item/folder/syndicate/mining, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/bridge) diff --git a/_maps/RandomRuins/SpaceRuins/refference.dmm b/_maps/RandomRuins/SpaceRuins/refference.dmm index d7bf8dfabbb83..dc599a1179bde 100644 --- a/_maps/RandomRuins/SpaceRuins/refference.dmm +++ b/_maps/RandomRuins/SpaceRuins/refference.dmm @@ -3,7 +3,7 @@ /turf/open/space/basic, /area/space) "ab" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "ad" = ( diff --git a/_maps/RandomRuins/SpaceRuins/sos6.dmm b/_maps/RandomRuins/SpaceRuins/sos6.dmm index c8dd9f8414a1a..3e3887a518cb2 100644 --- a/_maps/RandomRuins/SpaceRuins/sos6.dmm +++ b/_maps/RandomRuins/SpaceRuins/sos6.dmm @@ -14,7 +14,7 @@ dir = 4 }, /obj/effect/mob_spawn/human/corpse/russian, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, /turf/open/floor/mineral/plastitanium/red, /area/ruin/unpowered) "e" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacearcade.dmm b/_maps/RandomRuins/SpaceRuins/spacearcade.dmm index 565b7f40d1a59..a753d7cb49f4f 100644 --- a/_maps/RandomRuins/SpaceRuins/spacearcade.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacearcade.dmm @@ -76,22 +76,22 @@ /obj/structure/closet/crate/freezer{ name = "refreshment cooler" }, -/obj/item/reagent_containers/food/drinks/beer/light, -/obj/item/reagent_containers/food/drinks/soda_cans/sodawater, -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers, -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers, -/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull, -/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull, -/obj/item/reagent_containers/food/drinks/soda_cans/air, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, -/obj/item/reagent_containers/food/drinks/soda_cans/space_up, -/obj/item/reagent_containers/food/drinks/soda_cans/space_up, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist, +/obj/item/reagent_containers/cup/glass/bottle/beer/light, +/obj/item/reagent_containers/cup/soda_cans/sodawater, +/obj/item/reagent_containers/cup/soda_cans/shamblers, +/obj/item/reagent_containers/cup/soda_cans/shamblers, +/obj/item/reagent_containers/cup/soda_cans/grey_bull, +/obj/item/reagent_containers/cup/soda_cans/grey_bull, +/obj/item/reagent_containers/cup/soda_cans/air, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/pwr_game, +/obj/item/reagent_containers/cup/soda_cans/pwr_game, +/obj/item/reagent_containers/cup/soda_cans/space_up, +/obj/item/reagent_containers/cup/soda_cans/space_up, +/obj/item/reagent_containers/cup/soda_cans/starkist, /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/powered) "r" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index a84a0ece122b4..adeeca1933aa7 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -1853,14 +1853,14 @@ /area/ruin/space/has_grav/hotel/bar) "gb" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "gc" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "ge" = ( @@ -1990,11 +1990,11 @@ /area/ruin/space/has_grav/hotel/bar) "gE" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/pack/hotsauce, -/obj/item/reagent_containers/food/condiment/pack/hotsauce, -/obj/item/reagent_containers/food/condiment/pack/ketchup, -/obj/item/reagent_containers/food/condiment/pack/ketchup, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/condiment/pack/hotsauce, +/obj/item/reagent_containers/condiment/pack/hotsauce, +/obj/item/reagent_containers/condiment/pack/ketchup, +/obj/item/reagent_containers/condiment/pack/ketchup, +/obj/item/reagent_containers/cup/beaker, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "gF" = ( @@ -2056,9 +2056,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/structure/closet/secure_closet/freezer/fridge{ req_access = null; req_access_txt = "200" @@ -2092,7 +2092,7 @@ /area/ruin/space/has_grav/hotel/workroom) "hd" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/tea, +/obj/item/reagent_containers/cup/glass/mug/tea, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/dock) "he" = ( @@ -2152,10 +2152,10 @@ /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/bar) "hm" = ( -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null; req_access_txt = "200" @@ -2240,10 +2240,10 @@ /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/bar) "hx" = ( -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 4 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4 }, /obj/structure/table, @@ -2327,7 +2327,7 @@ /area/ruin/space/has_grav/hotel/bar) "hJ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/soysauce, +/obj/item/reagent_containers/condiment/soysauce, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "hK" = ( @@ -2994,7 +2994,7 @@ /area/ruin/space/has_grav/hotel/power) "kL" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/cup/glass/coffee, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) @@ -3800,7 +3800,7 @@ /area/ruin/space/has_grav/hotel/dock) "yJ" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/reagent_containers/spray/cleaner, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -3904,7 +3904,7 @@ /area/ruin/space/has_grav/hotel/workroom) "Ci" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/bar) @@ -4191,7 +4191,7 @@ /area/ruin/space/has_grav/hotel/pool) "KR" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/bar) @@ -4411,7 +4411,7 @@ "SQ" = ( /obj/structure/table, /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/bar) @@ -4437,10 +4437,10 @@ /area/ruin/space/has_grav/hotel/pool) "TR" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 4 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm index 167aed15b539a..0bab58df25677 100644 --- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -172,11 +172,11 @@ /area/ruin/space/has_grav/turretedoutpost) "aV" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = 3 }, /turf/open/floor/iron, diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 2794aa837cbdc..d6a544e723706 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -297,7 +297,7 @@ }, /obj/structure/janitorialcart, /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/caution, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -353,7 +353,7 @@ /area/awaymission/cabin) "bc" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /turf/open/floor/carpet, /area/awaymission/cabin) "bd" = ( @@ -604,7 +604,7 @@ /area/awaymission/cabin) "bU" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/wood, /area/awaymission/cabin) "bV" = ( @@ -883,25 +883,25 @@ /area/awaymission/cabin) "cJ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 8; pixel_y = 10 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 10 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8 }, /turf/open/floor/iron/cafeteria, /area/awaymission/cabin) "cK" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/sillycup/smallcarton{ +/obj/item/reagent_containers/cup/glass/sillycup/smallcarton{ pixel_y = 4 }, /turf/open/floor/wood, @@ -992,7 +992,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ desc = "A fancy bottle of vodka. The name isn't in Galactic Common though."; name = "Porosha Vodka" }, @@ -1099,7 +1099,7 @@ /area/awaymission/cabin) "dt" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/condiment/mayonnaise, +/obj/item/reagent_containers/condiment/mayonnaise, /turf/open/floor/iron/freezer, /area/awaymission/cabin) "du" = ( @@ -1360,11 +1360,11 @@ /area/awaymission/cabin) "eo" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ desc = "Still hot!"; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ desc = "Still hot!"; pixel_x = 8; pixel_y = 8 @@ -1410,7 +1410,7 @@ /area/awaymission/cabin) "ev" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /turf/open/floor/wood, /area/awaymission/cabin) "ew" = ( @@ -2341,7 +2341,7 @@ /area/awaymission/cabin) "hF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ desc = "Still hot!"; pixel_y = 2 }, @@ -2407,7 +2407,7 @@ /turf/open/floor/plating/snowed, /area/awaymission/cabin/caves) "hQ" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating/snowed, /area/awaymission/cabin/caves) "hR" = ( @@ -2612,7 +2612,7 @@ /area/awaymission/cabin/caves/sovietcave) "is" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/iron/freezer, /area/awaymission/cabin) "it" = ( @@ -2710,7 +2710,7 @@ /area/awaymission/cabin/caves) "iR" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ desc = "Still hot!"; pixel_x = -7; pixel_y = -2 @@ -2719,7 +2719,7 @@ /area/awaymission/cabin) "iS" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ desc = "Still hot!"; pixel_x = 7; pixel_y = 2 @@ -2728,7 +2728,7 @@ /area/awaymission/cabin) "iT" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ desc = "Still hot!"; pixel_x = -4; pixel_y = 4 @@ -2737,12 +2737,12 @@ /area/awaymission/cabin) "iU" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ desc = "Still hot!"; pixel_x = -5; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ desc = "Still hot!"; pixel_x = 7; pixel_y = -2 @@ -3003,14 +3003,14 @@ /area/awaymission/cabin) "jy" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/cup/glass/bottle/wine{ pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -7; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 7; pixel_y = 3 }, @@ -3468,7 +3468,7 @@ "kK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, /turf/open/floor/mineral/plastitanium/red{ name = "soviet floor" }, diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index c02738946b515..dfe81d0620b9f 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -197,7 +197,7 @@ /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "aH" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{ +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ pixel_x = -17; pixel_y = 17 }, @@ -214,7 +214,7 @@ /turf/open/floor/plating/beach/water, /area/awaymission/beach) "aJ" = ( -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = -14; pixel_y = 15 }, @@ -284,7 +284,7 @@ /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "aS" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{ +/obj/item/reagent_containers/cup/soda_cans/lemon_lime{ pixel_x = -12; pixel_y = 14 }, @@ -478,8 +478,8 @@ /turf/open/floor/wood, /area/awaymission/beach) "bu" = ( -/obj/item/reagent_containers/food/drinks/bottle/wine, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/cup/glass/bottle/wine, +/obj/item/reagent_containers/cup/glass/bottle/rum, /obj/structure/table/wood, /turf/open/floor/wood, /area/awaymission/beach) @@ -621,7 +621,7 @@ /area/awaymission/beach) "bO" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/cup/glass/bottle/champagne, /turf/open/floor/wood, /area/awaymission/beach) "bP" = ( @@ -788,14 +788,14 @@ /area/awaymission/beach) "cl" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/wood, /area/awaymission/beach) "cm" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/sunglasses, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/wood, /area/awaymission/beach) "cn" = ( @@ -827,14 +827,14 @@ req_access = list(25) }, /obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/mayonnaise, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/mayonnaise, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/wood, /area/awaymission/beach) "cs" = ( @@ -888,7 +888,7 @@ /area/awaymission/beach) "cB" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/ale, +/obj/item/reagent_containers/cup/glass/bottle/ale, /turf/open/floor/wood, /area/awaymission/beach) "cC" = ( @@ -897,19 +897,19 @@ /area/awaymission/beach) "cD" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_y = 7 }, /turf/open/floor/wood, /area/awaymission/beach) "cE" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /turf/open/floor/wood, /area/awaymission/beach) "cF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, +/obj/item/reagent_containers/cup/soda_cans/lemon_lime, /turf/open/floor/wood, /area/awaymission/beach) "cG" = ( @@ -937,12 +937,12 @@ /area/awaymission/beach) "cK" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cL" = ( @@ -961,12 +961,12 @@ /area/awaymission/beach) "cN" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/sodawater, -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, -/obj/item/reagent_containers/food/drinks/soda_cans/air, -/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, -/obj/item/reagent_containers/food/drinks/soda_cans/tonic, +/obj/item/reagent_containers/cup/soda_cans/sodawater, +/obj/item/reagent_containers/cup/soda_cans/shamblers, +/obj/item/reagent_containers/cup/soda_cans/pwr_game, +/obj/item/reagent_containers/cup/soda_cans/air, +/obj/item/reagent_containers/cup/soda_cans/canned_laughter, +/obj/item/reagent_containers/cup/soda_cans/tonic, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cO" = ( @@ -974,45 +974,45 @@ /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cP" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{ +/obj/item/reagent_containers/cup/soda_cans/lemon_lime{ pixel_x = -12 }, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{ +/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ pixel_x = 13 }, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cQ" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ +/obj/item/reagent_containers/cup/soda_cans/starkist{ pixel_x = -12; pixel_y = 3 }, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cR" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = -8; pixel_y = -4 }, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cS" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{ +/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ pixel_x = -9; pixel_y = -7 }, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cT" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind, +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cU" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = -8; pixel_y = -4 }, -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{ +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ pixel_x = 15 }, /turf/open/floor/plating/beach/sand, @@ -1025,19 +1025,19 @@ /turf/open/floor/plating/beach/coastline_t/sandwater_inner, /area/awaymission/beach) "cW" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{ +/obj/item/reagent_containers/cup/soda_cans/lemon_lime{ pixel_x = -12 }, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cX" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = -5 }, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cY" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ +/obj/item/reagent_containers/cup/soda_cans/starkist{ pixel_x = -6 }, /turf/open/floor/plating/beach/sand, diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index c4b31d08c3fdb..ce6c0ab602e3c 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -1899,7 +1899,7 @@ /area/awaymission/caves/BMP_asteroid) "gf" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/cup/glass/drinkingglass, /turf/open/floor/iron, /area/awaymission/caves/BMP_asteroid) "gg" = ( @@ -1989,7 +1989,7 @@ /turf/open/floor/iron, /area/awaymission/caves/BMP_asteroid) "gy" = ( -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/cup/glass/drinkingglass, /turf/open/floor/iron, /area/awaymission/caves/BMP_asteroid) "gz" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index c7cd6fb0b6ac7..d7c863c10116b 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -904,7 +904,7 @@ /obj/item/book/manual/wiki/barman_recipes{ pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -1223,15 +1223,15 @@ /area/awaymission/moonoutpost19/arrivals) "mE" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = -6; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 3 }, /turf/open/floor/iron/dark, @@ -4289,7 +4289,7 @@ "Nv" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_y = 5 }, /obj/machinery/door/poddoor/shutters{ @@ -4329,10 +4329,10 @@ "NE" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/machinery/door/poddoor/shutters{ @@ -4347,9 +4347,9 @@ name = "refrigerator"; req_access_txt = "201" }, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/item/storage/fancy/egg_box, /turf/open/floor/iron/showroomfloor{ initial_temperature = 273.15 @@ -4851,9 +4851,9 @@ name = "kitchen Cabinet"; req_access_txt = "201" }, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/sugar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor{ initial_temperature = 273.15 @@ -4911,7 +4911,7 @@ /obj/item/reagent_containers/peppercloud_deployer, /obj/item/grenade/flashbang, /obj/item/storage/belt/security, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -3; pixel_y = -2 }, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index b47fee0ad7f33..9bcc9baa59930 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -982,11 +982,11 @@ /area/awaymission/research/interior/cryo) "fd" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -7; pixel_y = 1 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -7; pixel_y = 1 }, @@ -994,11 +994,11 @@ /area/awaymission/research/interior/cryo) "fe" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 492f8e203617e..f6c483d80b1fc 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -737,7 +737,7 @@ /area/awaymission/snowdin/post/kitchen) "dv" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron, /area/awaymission/snowdin/post/kitchen) "dw" = ( @@ -861,7 +861,7 @@ /area/awaymission/snowdin/post/kitchen) "dT" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/plating, /area/awaymission/snowdin/post/kitchen) "dU" = ( @@ -2883,7 +2883,7 @@ /area/awaymission/snowdin/post/hydro) "nA" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) "nB" = ( @@ -3218,7 +3218,7 @@ /obj/structure/closet/crate/hydroponics, /obj/item/shovel/spade, /obj/item/wrench, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/wirecutters, /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) @@ -7625,7 +7625,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /turf/open/floor/mineral/plastitanium/red, @@ -7685,7 +7685,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /turf/open/floor/mineral/plastitanium/red, @@ -7895,7 +7895,7 @@ /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/cave) "Ea" = ( -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /turf/open/floor/iron/dark, @@ -7981,7 +7981,7 @@ /area/awaymission/snowdin/cave) "Eo" = ( /obj/effect/turf_decal/weather/snow, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /turf/open/floor/iron/dark/snowdin, @@ -8007,7 +8007,7 @@ /area/awaymission/snowdin/post/hydro) "Eu" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /turf/open/floor/iron/dark, @@ -8017,7 +8017,7 @@ dir = 4 }, /obj/item/stack/rods, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /turf/open/floor/mineral/plastitanium/red, @@ -8050,7 +8050,7 @@ dir = 10 }, /obj/item/shard, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /turf/open/floor/mineral/plastitanium/red, @@ -8059,7 +8059,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /turf/open/floor/mineral/plastitanium/red, /area/awaymission/snowdin/cave) "ED" = ( @@ -10056,7 +10056,7 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) "Lg" = ( -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -10371,7 +10371,7 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post/messhall) "Md" = ( -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -11910,7 +11910,7 @@ /area/awaymission/snowdin/post/garage) "RW" = ( /obj/item/stack/rods, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null }, /obj/effect/turf_decal/tile/neutral/half/contrasted, diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index d4dd647763d72..c0b26f639246c 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -541,7 +541,7 @@ /area/awaymission/spacebattle/cruiser) "cD" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/iron/cafeteria, /area/awaymission/spacebattle/cruiser) "cE" = ( @@ -2355,7 +2355,7 @@ /area/awaymission/spacebattle/cruiser) "oS" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/spacebattle/cruiser) @@ -2405,7 +2405,7 @@ /area/awaymission/spacebattle/syndicate5) "vH" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/spacebattle/cruiser) diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 35f59016044c6..9f90e95d848f5 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -2754,7 +2754,7 @@ "zn" = ( /obj/structure/table, /obj/item/stack/package_wrap, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -2940,9 +2940,9 @@ /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "zU" = ( -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/item/storage/fancy/egg_box, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/freezer{ @@ -3242,10 +3242,10 @@ /area/awaymission/undergroundoutpost45/research) "AW" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/iron/cafeteria{ @@ -4242,7 +4242,7 @@ "Eh" = ( /obj/structure/table, /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -4604,7 +4604,7 @@ "FB" = ( /obj/structure/table, /obj/item/stack/package_wrap, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -5471,11 +5471,11 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 8; pixel_y = 2 }, @@ -6118,7 +6118,7 @@ /area/awaymission/undergroundoutpost45/engineering) "KM" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -6208,10 +6208,10 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "KZ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -6228,7 +6228,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, @@ -6355,7 +6355,7 @@ /area/awaymission/undergroundoutpost45/engineering) "Lu" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/cup/glass/drinkingglass, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -7279,7 +7279,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 5 }, /obj/effect/decal/cleanable/dirt, @@ -7954,7 +7954,7 @@ /area/awaymission/undergroundoutpost45/gateway) "QS" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, /turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "QT" = ( @@ -8874,7 +8874,7 @@ /area/awaymission/undergroundoutpost45/caves) "TW" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "TX" = ( @@ -8946,7 +8946,7 @@ /obj/item/shovel/spade, /obj/item/wrench, /obj/item/screwdriver, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "Up" = ( @@ -9805,9 +9805,9 @@ name = "kitchen Cabinet"; req_access_txt = "201" }, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/sugar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ dir = 5 diff --git a/_maps/RuinGeneration/13x13_cafe.dmm b/_maps/RuinGeneration/13x13_cafe.dmm index 9d2f9359829c4..e3e17df7d2887 100644 --- a/_maps/RuinGeneration/13x13_cafe.dmm +++ b/_maps/RuinGeneration/13x13_cafe.dmm @@ -148,11 +148,11 @@ /obj/item/book/manual/wiki/barman_recipes{ pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = 6; pixel_y = 2 }, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_x = -3; pixel_y = 2 }, diff --git a/_maps/RuinGeneration/13x13_corgrobotics.dmm b/_maps/RuinGeneration/13x13_corgrobotics.dmm index e093c426f171c..d5776a3b5fbe2 100644 --- a/_maps/RuinGeneration/13x13_corgrobotics.dmm +++ b/_maps/RuinGeneration/13x13_corgrobotics.dmm @@ -315,8 +315,8 @@ /obj/structure/table, /obj/item/stack/package_wrap, /obj/item/stack/package_wrap, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/stripes/line{ dir = 4 }, diff --git a/_maps/RuinGeneration/13x13_hilberttest.dmm b/_maps/RuinGeneration/13x13_hilberttest.dmm index 4e1dec816fa19..43e6c52dc11ce 100644 --- a/_maps/RuinGeneration/13x13_hilberttest.dmm +++ b/_maps/RuinGeneration/13x13_hilberttest.dmm @@ -114,7 +114,7 @@ /area/ruin/unpowered) "S" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, /turf/open/floor/carpet/grimy{ icon_state = "engine" }, diff --git a/_maps/RuinGeneration/13x13_listening_base.dmm b/_maps/RuinGeneration/13x13_listening_base.dmm index 77b6075c3231d..1f1ae3eab42c3 100644 --- a/_maps/RuinGeneration/13x13_listening_base.dmm +++ b/_maps/RuinGeneration/13x13_listening_base.dmm @@ -119,11 +119,11 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -30 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -4; pixel_y = 14 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 3; pixel_y = 11 }, diff --git a/_maps/RuinGeneration/13x13_shotelroom.dmm b/_maps/RuinGeneration/13x13_shotelroom.dmm index 9e11ccf71a09c..504683b88a164 100644 --- a/_maps/RuinGeneration/13x13_shotelroom.dmm +++ b/_maps/RuinGeneration/13x13_shotelroom.dmm @@ -19,7 +19,7 @@ /area/ruin/unpowered) "d" = ( /obj/structure/table/wood/fancy/purple, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ pixel_x = 2; pixel_y = 7 }, @@ -163,7 +163,7 @@ /area/ruin/unpowered) "J" = ( /obj/structure/table/wood/fancy/purple, -/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda{ +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda{ pixel_x = -5; pixel_y = 5 }, @@ -221,7 +221,7 @@ pixel_y = -1 }, /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -8; pixel_y = -1 }, @@ -259,7 +259,7 @@ /area/ruin/unpowered) "Z" = ( /obj/structure/table/wood/fancy/purple, -/obj/item/reagent_containers/food/drinks/bottle/applejack{ +/obj/item/reagent_containers/cup/glass/bottle/applejack{ pixel_y = 2 }, /turf/open/floor/carpet/orange, diff --git a/_maps/RuinGeneration/13x17_permabrig.dmm b/_maps/RuinGeneration/13x17_permabrig.dmm index c06af229e26eb..f74976dc55ce6 100644 --- a/_maps/RuinGeneration/13x17_permabrig.dmm +++ b/_maps/RuinGeneration/13x17_permabrig.dmm @@ -440,7 +440,7 @@ /turf/open/floor/iron, /area/ruin/unpowered) "SX" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/ruin/unpowered) "TT" = ( diff --git a/_maps/RuinGeneration/13x9_medical.dmm b/_maps/RuinGeneration/13x9_medical.dmm index 94ba7360af311..8369045cc4862 100644 --- a/_maps/RuinGeneration/13x9_medical.dmm +++ b/_maps/RuinGeneration/13x9_medical.dmm @@ -138,11 +138,11 @@ /area/ruin/unpowered) "aJ" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 9; pixel_y = 11 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 6; pixel_y = 5 }, @@ -197,7 +197,7 @@ /area/ruin/unpowered) "aR" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/cup/bottle/charcoal, /obj/effect/spawner/lootdrop/ruinloot/medical, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, diff --git a/_maps/RuinGeneration/17x17_charliecrew.dmm b/_maps/RuinGeneration/17x17_charliecrew.dmm index 74b4216144d02..c51fd1c848505 100644 --- a/_maps/RuinGeneration/17x17_charliecrew.dmm +++ b/_maps/RuinGeneration/17x17_charliecrew.dmm @@ -67,7 +67,7 @@ pixel_x = 7; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = -7 }, /turf/open/floor/iron/white, @@ -511,7 +511,7 @@ /turf/open/floor/iron/white, /area/ruin/unpowered) "SR" = ( -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /obj/structure/table, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 diff --git a/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm b/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm index 74e52f9c81eb1..2f8351b7603f0 100644 --- a/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm +++ b/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm @@ -49,7 +49,7 @@ /area/ruin/unpowered) "S" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 8 }, diff --git a/_maps/RuinGeneration/9x13_kitchen.dmm b/_maps/RuinGeneration/9x13_kitchen.dmm index 4e16f38b5494a..fe1c17c793242 100644 --- a/_maps/RuinGeneration/9x13_kitchen.dmm +++ b/_maps/RuinGeneration/9x13_kitchen.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/item/stack/package_wrap, /turf/open/floor/iron/cafeteria, /area/ruin/unpowered) @@ -11,7 +11,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 5 }, /turf/open/floor/iron/cafeteria, @@ -41,10 +41,10 @@ /area/ruin/unpowered) "m" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/iron/cafeteria, diff --git a/_maps/RuinGeneration/9x13_vault.dmm b/_maps/RuinGeneration/9x13_vault.dmm index 1bb78b9a506c8..1b7a3c2ac5c48 100644 --- a/_maps/RuinGeneration/9x13_vault.dmm +++ b/_maps/RuinGeneration/9x13_vault.dmm @@ -104,7 +104,7 @@ /obj/item/paper{ default_raw_text = "IOU - One Very Cool Revolver (Thanks HOP)" }, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark/airless, /area/ruin/unpowered) diff --git a/_maps/RuinGeneration/9x9_chemlab.dmm b/_maps/RuinGeneration/9x9_chemlab.dmm index 413060bdf953f..f2b99cee7a3c9 100644 --- a/_maps/RuinGeneration/9x9_chemlab.dmm +++ b/_maps/RuinGeneration/9x9_chemlab.dmm @@ -250,11 +250,11 @@ /area/ruin) "JC" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = 4 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -6; pixel_y = 2 }, @@ -277,11 +277,11 @@ /area/ruin) "Rt" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -2; pixel_y = 1 }, diff --git a/_maps/arenas/bar.dmm b/_maps/arenas/bar.dmm index 18942cc5a4b78..d16e9c1c60cef 100644 --- a/_maps/arenas/bar.dmm +++ b/_maps/arenas/bar.dmm @@ -8,10 +8,10 @@ /area/tdome/arena) "w" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -76,8 +76,8 @@ /area/tdome/arena) "L" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = -5 }, /obj/structure/sign/plaques/deempisi{ diff --git a/_maps/arenas/beach.dmm b/_maps/arenas/beach.dmm index 5cca3a6b01b76..aa1a0a33ba94b 100644 --- a/_maps/arenas/beach.dmm +++ b/_maps/arenas/beach.dmm @@ -11,7 +11,7 @@ /turf/open/floor/plating/beach/sand, /area/tdome/arena) "c" = ( -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ list_reagents = list(/datum/reagent/consumable/cooking_oil = 50) }, /turf/open/floor/plating/beach/sand, @@ -35,7 +35,7 @@ /turf/open/floor/wood, /area/tdome/arena) "h" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy, +/obj/item/reagent_containers/cup/soda_cans/monkey_energy, /turf/open/floor/plating/beach/sand, /area/tdome/arena) "i" = ( @@ -65,17 +65,17 @@ /area/tdome/arena) "n" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/cup/glass/bottle/rum, /turf/open/floor/wood, /area/tdome/arena) "o" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, +/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium, /turf/open/floor/wood, /area/tdome/arena) "p" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/tequila, +/obj/item/reagent_containers/cup/glass/bottle/tequila, /turf/open/floor/wood, /area/tdome/arena) "q" = ( diff --git a/_maps/arenas/survival pod.dmm b/_maps/arenas/survival pod.dmm index d41f152cf8017..8c1dbf965cc32 100644 --- a/_maps/arenas/survival pod.dmm +++ b/_maps/arenas/survival pod.dmm @@ -60,11 +60,11 @@ /area/tdome/arena) "m" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 7; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/cup/glass/bottle/wine{ pixel_x = -6; pixel_y = 10 }, @@ -126,7 +126,7 @@ /area/tdome/arena) "v" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 7; pixel_y = 2 }, diff --git a/_maps/holodeck/beach.dmm b/_maps/holodeck/beach.dmm index 75a7272ee144d..5586e76354940 100644 --- a/_maps/holodeck/beach.dmm +++ b/_maps/holodeck/beach.dmm @@ -19,7 +19,7 @@ /turf/open/floor/holofloor/beach/coast_b, /area/template_noop) "q" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/holofloor/beach/coast_t, /area/template_noop) "t" = ( diff --git a/_maps/holodeck/lounge.dmm b/_maps/holodeck/lounge.dmm index 6c1c58f31c284..4b649704e4cd2 100644 --- a/_maps/holodeck/lounge.dmm +++ b/_maps/holodeck/lounge.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/structure/table/wood/bar, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_x = 10; pixel_y = 1 }, @@ -51,7 +51,7 @@ /area/template_noop) "i" = ( /obj/structure/table/wood/bar, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" diff --git a/_maps/holodeck/medicalsim.dmm b/_maps/holodeck/medicalsim.dmm index 839b01f7cf3d7..2901a1e9491da 100644 --- a/_maps/holodeck/medicalsim.dmm +++ b/_maps/holodeck/medicalsim.dmm @@ -12,7 +12,7 @@ /area/template_noop) "dl" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -528,9 +528,9 @@ /area/template_noop) "SF" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, +/obj/item/reagent_containers/cup/beaker, +/obj/item/reagent_containers/cup/beaker, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, diff --git a/_maps/holodeck/petpark.dmm b/_maps/holodeck/petpark.dmm index b6b940daa6038..2b530ce0c51ec 100644 --- a/_maps/holodeck/petpark.dmm +++ b/_maps/holodeck/petpark.dmm @@ -118,7 +118,7 @@ /turf/open/floor/holofloor/grass, /area/template_noop) "X" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/holofloor/grass, /area/template_noop) diff --git a/_maps/holodeck/small/beach.dmm b/_maps/holodeck/small/beach.dmm index 6fec9185b3218..4a44f826bef65 100644 --- a/_maps/holodeck/small/beach.dmm +++ b/_maps/holodeck/small/beach.dmm @@ -9,7 +9,7 @@ /turf/open/floor/holofloor/carpet, /area/template_noop) "v" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/shovel/spade, /turf/open/floor/holofloor/beach/coast_t, /area/template_noop) diff --git a/_maps/holodeck/small/kitchen.dmm b/_maps/holodeck/small/kitchen.dmm index c1122e4f4101a..1e6058f1eb543 100644 --- a/_maps/holodeck/small/kitchen.dmm +++ b/_maps/holodeck/small/kitchen.dmm @@ -43,7 +43,7 @@ /area/template_noop) "p" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 1 }, @@ -153,7 +153,7 @@ pixel_x = 5; pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = -6; pixel_y = 4 }, @@ -169,7 +169,7 @@ /area/template_noop) "Q" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -6; pixel_y = 19 }, diff --git a/_maps/holodeck/small/lounge.dmm b/_maps/holodeck/small/lounge.dmm index cb3c53c73486f..3f06ba54ff401 100644 --- a/_maps/holodeck/small/lounge.dmm +++ b/_maps/holodeck/small/lounge.dmm @@ -28,7 +28,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = 4 }, /obj/item/book/manual/wiki/barman_recipes{ @@ -42,7 +42,7 @@ /area/template_noop) "i" = ( /obj/structure/table/wood/bar, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_x = 10; pixel_y = 1 }, diff --git a/_maps/holodeck/small/medicalsim.dmm b/_maps/holodeck/small/medicalsim.dmm index 6777e297407cf..d842508f4e86c 100644 --- a/_maps/holodeck/small/medicalsim.dmm +++ b/_maps/holodeck/small/medicalsim.dmm @@ -311,22 +311,22 @@ /area/template_noop) "Ky" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 10; pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 4; pixel_y = 10 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 5; pixel_y = 11 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -7; pixel_y = 3 }, diff --git a/_maps/holodeck/small/petpark.dmm b/_maps/holodeck/small/petpark.dmm index 227532eb51acf..2371eb8400ba3 100644 --- a/_maps/holodeck/small/petpark.dmm +++ b/_maps/holodeck/small/petpark.dmm @@ -86,7 +86,7 @@ /area/template_noop) "O" = ( /obj/machinery/hydroponics/soil, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/holofloor/grass, /area/template_noop) "R" = ( diff --git a/_maps/holodeck/small/teahouse.dmm b/_maps/holodeck/small/teahouse.dmm index d74ce697bc0ad..fc4a94f202fe1 100644 --- a/_maps/holodeck/small/teahouse.dmm +++ b/_maps/holodeck/small/teahouse.dmm @@ -24,12 +24,12 @@ /area/template_noop) "g" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ icon_state = "sakecup"; pixel_x = -8; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ icon_state = "sakecup"; pixel_x = 8; pixel_y = 3 @@ -47,9 +47,9 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug, -/obj/item/reagent_containers/food/drinks/mug, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/cup/glass/mug, +/obj/item/reagent_containers/cup/glass/mug, +/obj/item/reagent_containers/cup/glass/mug, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" diff --git a/_maps/holodeck/workshop/donut.dmm b/_maps/holodeck/workshop/donut.dmm index 16c4d478c545a..e8d69760d79e5 100644 --- a/_maps/holodeck/workshop/donut.dmm +++ b/_maps/holodeck/workshop/donut.dmm @@ -10,8 +10,8 @@ /obj/item/stack/package_wrap, /obj/item/stack/package_wrap, /obj/item/stack/package_wrap, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/holofloor/monotile/steel, /area/template_noop) "f" = ( @@ -47,11 +47,11 @@ /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -126,20 +126,20 @@ /area/template_noop) "I" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 11 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, /turf/open/floor/holofloor/monotile/steel, /area/template_noop) "J" = ( @@ -177,7 +177,7 @@ /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/item/toy/figure/chef, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -225,12 +225,12 @@ /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/reagent_containers/food/condiment/soymilk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, /obj/effect/turf_decal/stripes/line, /turf/open/floor/holofloor/monotile/steel, /area/template_noop) diff --git a/_maps/holodeck/workshop/plush.dmm b/_maps/holodeck/workshop/plush.dmm index 4a7693aece527..1e1a1e7563a86 100644 --- a/_maps/holodeck/workshop/plush.dmm +++ b/_maps/holodeck/workshop/plush.dmm @@ -78,7 +78,7 @@ /area/template_noop) "L" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/dark_green/fourcorners, /turf/open/floor/holofloor/monotile/steel, /area/template_noop) @@ -121,9 +121,9 @@ "W" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/delivery, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, /obj/effect/turf_decal/tile/dark_green/fourcorners, /turf/open/floor/holofloor/monotile/steel, /area/template_noop) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 28b7c753deaa7..fe6294641882a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1894,7 +1894,7 @@ /obj/structure/closet, /obj/effect/landmark/blobstart, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aAC" = ( @@ -3299,7 +3299,7 @@ "aQh" = ( /obj/structure/table/wood, /obj/item/food/chips, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -3938,7 +3938,7 @@ "aVW" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -5; pixel_y = 9 }, @@ -5041,7 +5041,7 @@ /area/medical/medbay/central) "bhi" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/stripes/end{ dir = 8 }, @@ -8589,11 +8589,11 @@ /obj/item/stack/sheet/mineral/plasma{ pixel_y = 4 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = 3 }, @@ -10842,21 +10842,21 @@ /area/engine/atmos) "ccO" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = -4; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bottle/chloralhydrate, -/obj/item/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = 5; pixel_y = 1 }, /obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/cup/bottle/facid{ name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6 @@ -13777,7 +13777,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_robust{ pixel_x = -3 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 2; pixel_y = 3 }, @@ -15979,7 +15979,7 @@ "daL" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/cup/glass/bottle/holywater, /turf/open/floor/carpet/grimy, /area/chapel/office) "daM" = ( @@ -18951,7 +18951,7 @@ /obj/item/hatchet, /obj/item/crowbar, /obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hydroponics/garden) @@ -20659,12 +20659,12 @@ /area/crew_quarters/kitchen) "eSA" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour{ pixel_x = 4 }, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /turf/open/floor/prison, @@ -24325,7 +24325,7 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 7; pixel_y = 10 }, @@ -24923,7 +24923,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/hydroponics) "gDB" = ( @@ -25184,7 +25184,7 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 }, -/obj/item/reagent_containers/food/drinks/bottle/lizardwine{ +/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ pixel_x = 6; pixel_y = 5 }, @@ -28246,7 +28246,7 @@ /area/maintenance/port/aft) "hYo" = ( /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/machinery/light_switch{ pixel_x = 28 }, @@ -29032,7 +29032,7 @@ pixel_x = -1; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 9; pixel_y = 3 }, @@ -29598,11 +29598,11 @@ "iwV" = ( /obj/structure/safe, /obj/item/clothing/head/costume/bearpelt, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /obj/item/gun/ballistic/revolver/russian, /obj/item/ammo_box/a357, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -30451,11 +30451,11 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 6; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/item/toy/cards/deck{ pixel_x = -10; pixel_y = 6 @@ -31442,7 +31442,7 @@ }, /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/sign/poster/contraband/missing_gloves{ pixel_x = -32 }, @@ -32212,7 +32212,7 @@ /obj/structure/table/wood/fancy, /obj/item/soulstone/anybody/chaplain, /obj/item/organ/heart, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/book/granter/spell/smoke/lesser, /turf/open/floor/iron/dark, /area/chapel/office) @@ -35777,7 +35777,7 @@ /obj/item/pen/charcoal{ pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = -8; pixel_y = 3 }, @@ -37077,15 +37077,15 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/bar/atrium) "loD" = ( -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_y = 7 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 7; pixel_y = 7 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, @@ -37098,7 +37098,7 @@ /obj/item/hatchet, /obj/item/cultivator, /obj/item/crowbar, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/plant_analyzer, /obj/machinery/firealarm{ dir = 4; @@ -37576,81 +37576,81 @@ /turf/open/floor/iron, /area/hallway/primary/central) "lAN" = ( -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, /obj/structure/closet/crate/medical, @@ -37712,7 +37712,7 @@ /turf/open/floor/iron, /area/security/checkpoint/science) "lBV" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/tile/dark_green/half/contrasted, /turf/open/floor/iron, @@ -38157,7 +38157,7 @@ /obj/item/knife, /obj/item/paint/green, /obj/item/pushbroom, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/hallway/secondary/service) "lMW" = ( @@ -40938,7 +40938,7 @@ pixel_y = 5 }, /obj/item/folder/blue, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = -8; pixel_y = 3 }, @@ -41821,11 +41821,11 @@ /area/bridge) "nvZ" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 8; pixel_y = 2 }, @@ -44297,7 +44297,7 @@ "owA" = ( /obj/structure/closet/crate/hydroponics, /obj/item/shovel/spade, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/storage/toolbox/mechanical{ pixel_x = -4; pixel_y = 4 @@ -46280,7 +46280,7 @@ dir = 1 }, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/machinery/light{ bulb_colour = "#22bfa2"; bulb_vacuum_colour = "#22bfa2"; @@ -51366,7 +51366,7 @@ pixel_y = 5 }, /obj/item/clothing/glasses/hud/security/sunglasses, -/obj/item/reagent_containers/food/drinks/flask/det, +/obj/item/reagent_containers/cup/glass/flask/det, /turf/open/floor/carpet/green, /area/security/detectives_office) "rpN" = ( @@ -52187,7 +52187,7 @@ /turf/open/floor/plating, /area/maintenance/port) "rEo" = ( -/obj/item/reagent_containers/glass/bottle/salglu_solution{ +/obj/item/reagent_containers/cup/bottle/salglu_solution{ pixel_x = -8; pixel_y = 10 }, @@ -52203,7 +52203,7 @@ pixel_y = 6; pixel_x = 3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -8; pixel_y = 3 }, @@ -53074,7 +53074,7 @@ pixel_x = -1; pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 13; pixel_y = 17 }, @@ -53712,8 +53712,8 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ pixel_x = 2; pixel_y = 1 }, @@ -54691,7 +54691,7 @@ /obj/item/stack/sheet/mineral/copper{ amount = 5 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/storage/toolbox/drone, /obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 4 @@ -55473,7 +55473,7 @@ pixel_x = 2; pixel_y = 5 }, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/item/stack/sheet/mineral/copper{ amount = 5 }, @@ -55782,10 +55782,10 @@ "sYk" = ( /obj/structure/table, /obj/item/gps/mining/exploration, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 9; pixel_y = -3 }, @@ -61531,11 +61531,11 @@ /area/maintenance/starboard/fore) "vpf" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9 }, /obj/item/storage/box/papersack{ @@ -61867,7 +61867,7 @@ /area/maintenance/starboard/fore) "vuz" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/kitchen/fork, /turf/open/floor/prison, /area/security/prison) @@ -64000,11 +64000,11 @@ "wlD" = ( /obj/structure/table, /obj/machinery/light, -/obj/item/reagent_containers/food/drinks/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = -6; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 8 }, /obj/structure/sign/poster/official/random{ @@ -64510,9 +64510,9 @@ /area/engine/atmos) "wwq" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /obj/structure/noticeboard{ pixel_y = 29 }, @@ -65303,7 +65303,7 @@ /turf/open/floor/iron/dark, /area/security/main) "wMF" = ( -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/cup/glass/mug{ pixel_x = 6; pixel_y = -2 }, @@ -65518,7 +65518,7 @@ "wSz" = ( /obj/item/paper, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -5; pixel_y = 1 }, @@ -65707,7 +65707,7 @@ dir = 1 }, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/hydroponics) "wWP" = ( @@ -66478,23 +66478,23 @@ /area/quartermaster/sorting) "xnm" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = 2; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm index b6f84a728c576..f4625672bfb67 100644 --- a/_maps/map_files/CorgStation/CorgStation.dmm +++ b/_maps/map_files/CorgStation/CorgStation.dmm @@ -1327,7 +1327,7 @@ "anV" = ( /obj/structure/table/glass, /obj/item/candle, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = -7; pixel_y = 10 }, @@ -1924,7 +1924,7 @@ /obj/machinery/requests_console{ pixel_x = 32 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 4; pixel_y = -1 }, @@ -6678,19 +6678,19 @@ "bSa" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 9; pixel_y = 11 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -2; pixel_y = 11 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 6; pixel_y = 5 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -5; pixel_y = 5 }, @@ -9661,7 +9661,7 @@ pixel_x = -1; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -9809,7 +9809,7 @@ }, /obj/structure/table/wood, /obj/item/clothing/glasses/hud/security/sunglasses, -/obj/item/reagent_containers/food/drinks/flask/det, +/obj/item/reagent_containers/cup/glass/flask/det, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -10857,7 +10857,7 @@ pixel_y = -2 }, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 }, @@ -11990,9 +11990,9 @@ dir = 6 }, /obj/structure/rack, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/dark, /area/science/robotics/lab) "dLE" = ( @@ -13438,7 +13438,7 @@ id = "medical_shutters"; name = "medical Shutters" }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/machinery/door/window/northleft{ dir = 4; name = "medbay Interior"; @@ -15104,7 +15104,7 @@ /area/engine/engine_room) "eOo" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100{ pixel_x = -1; @@ -16943,10 +16943,10 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = -1 }, @@ -18058,7 +18058,7 @@ /area/hydroponics) "fLK" = ( /obj/structure/closet/crate, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, /obj/item/storage/fancy/egg_box, /obj/item/storage/fancy/egg_box, /turf/open/floor/plating, @@ -18366,11 +18366,11 @@ /area/security/checkpoint/supply) "fQu" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = -5; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 5; pixel_y = 10 }, @@ -19719,9 +19719,9 @@ /area/science/lab) "goL" = ( /obj/structure/closet/crate, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/sugar, /turf/open/floor/plating, /area/maintenance/starboard/aft) "goM" = ( @@ -24890,7 +24890,7 @@ /turf/open/floor/iron, /area/hallway/secondary/command) "hVH" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/assembly/prox_sensor, /obj/item/mop, /obj/item/bodypart/r_arm/robot, @@ -24921,7 +24921,7 @@ /area/medical/virology) "hWu" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, @@ -25713,8 +25713,8 @@ /obj/structure/table/glass, /obj/item/storage/bag/plants/portaseeder, /obj/item/storage/bag/plants/portaseeder, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, /turf/open/floor/grass, /area/hydroponics/garden) "iiO" = ( @@ -26858,7 +26858,7 @@ /area/engine/atmos) "izd" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -4; pixel_y = 2 }, @@ -27157,7 +27157,7 @@ /area/science/nanite) "iEL" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/hydroponics) @@ -28112,11 +28112,11 @@ /area/science/xenobiology) "iXf" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 3; pixel_y = 4 }, @@ -30030,7 +30030,7 @@ /area/maintenance/fore) "jDX" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /turf/open/floor/prison/dark, /area/security/prison) "jEd" = ( @@ -30629,11 +30629,11 @@ "jOn" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/cooking_to_serve_man, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/sugar, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -32236,7 +32236,7 @@ dir = 1 }, /obj/machinery/airalarm/directional/north, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 }, @@ -32976,8 +32976,8 @@ /obj/structure/table, /obj/item/stack/package_wrap, /obj/item/stack/package_wrap, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -33945,7 +33945,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "kTr" = ( -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ pixel_x = 10 }, /obj/structure/table, @@ -34535,7 +34535,7 @@ /area/teleporter) "lcN" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe/epinephrine, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, @@ -37862,11 +37862,11 @@ /area/maintenance/starboard/aft) "mfc" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/bottle/synthflesh{ +/obj/item/reagent_containers/cup/glass/bottle/synthflesh{ pixel_x = 2; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/bottle/synthflesh{ +/obj/item/reagent_containers/cup/glass/bottle/synthflesh{ pixel_x = -3; pixel_y = 4 }, @@ -39171,11 +39171,11 @@ /area/security/prison) "mxF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 9 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 4 }, @@ -41932,7 +41932,7 @@ /area/janitor) "ntl" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -8; pixel_y = 8 }, @@ -43069,10 +43069,10 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = -1 }, @@ -43364,7 +43364,7 @@ /area/medical/surgery) "nPW" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -1; pixel_y = 4 }, @@ -44149,7 +44149,7 @@ /area/maintenance/starboard/aft) "ods" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 4; pixel_y = 10 }, @@ -45396,15 +45396,15 @@ /area/science/shuttle) "ozd" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/bottle/synthflesh{ +/obj/item/reagent_containers/cup/glass/bottle/synthflesh{ pixel_x = -1; pixel_y = 14 }, -/obj/item/reagent_containers/food/drinks/bottle/synthflesh{ +/obj/item/reagent_containers/cup/glass/bottle/synthflesh{ pixel_x = -7; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 6; pixel_y = 4 }, @@ -46813,11 +46813,11 @@ /area/science/xenobiology) "paH" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = -2; pixel_y = 6 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 2; pixel_y = 4 }, @@ -50792,7 +50792,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -53833,23 +53833,23 @@ /area/hallway/primary/aft) "rup" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = 2; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, @@ -54567,11 +54567,11 @@ /area/hallway/primary/central) "rGa" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -2; pixel_y = 1 }, @@ -55350,7 +55350,7 @@ /area/crew_quarters/fitness/recreation) "rUv" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -9; pixel_y = 4 }, @@ -55708,15 +55708,15 @@ /area/engine/atmos) "sac" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 2; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -5; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 5; pixel_y = 1 }, @@ -55938,11 +55938,11 @@ pixel_y = -1; pixel_x = -7 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 8; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 3; pixel_y = 1 }, @@ -56329,7 +56329,7 @@ /area/science/robotics/lab) "skk" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -2; pixel_y = 13 }, @@ -56348,10 +56348,10 @@ /area/security/prison) "sks" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, @@ -56581,81 +56581,81 @@ /turf/open/floor/iron/white/corner, /area/science/research) "sou" = ( -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, /obj/structure/closet/crate/medical, @@ -57533,7 +57533,7 @@ /area/crew_quarters/heads/chief) "sDy" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 6; pixel_y = 6 }, @@ -57789,11 +57789,11 @@ name = "Hydroponics Desk"; req_access_txt = "35" }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = -1; pixel_y = 1 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 3; pixel_y = 3 }, @@ -59645,9 +59645,9 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/item/reagent_containers/glass/bottle/chloralhydrate, -/obj/item/reagent_containers/glass/bottle/chloralhydrate, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/rag, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, @@ -60253,16 +60253,16 @@ "tzW" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/cooking_to_serve_man, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /obj/machinery/requests_console{ department = "Kitchen"; departmentType = 2; pixel_y = -32 }, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -61113,15 +61113,15 @@ /area/engine/atmos) "tNf" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing{ +/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing{ pixel_x = 4; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -4; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -6; pixel_y = 6 }, @@ -61954,7 +61954,7 @@ /area/hallway/primary/aft) "ucp" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -4; pixel_y = 2 }, @@ -62341,11 +62341,11 @@ pixel_x = -8; pixel_y = 7 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 8; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 8; pixel_y = 6 }, @@ -64173,11 +64173,11 @@ /area/quartermaster/warehouse) "uLg" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 10 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 5 }, @@ -65527,7 +65527,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -1; pixel_y = -1 @@ -67301,7 +67301,7 @@ /obj/structure/desk_bell{ pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 9; pixel_y = -3 }, @@ -67647,7 +67647,7 @@ /area/crew_quarters/heads/chief) "vOe" = ( /obj/structure/table/wood/fancy/royalblue, -/obj/item/reagent_containers/food/drinks/flask/gold{ +/obj/item/reagent_containers/cup/glass/flask/gold{ pixel_x = -1; pixel_y = 9 }, @@ -69455,10 +69455,10 @@ pixel_y = -30 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = -1 }, @@ -70154,10 +70154,10 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = -1 }, @@ -70679,11 +70679,11 @@ pixel_y = 32 }, /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = 4 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -6; pixel_y = 2 }, @@ -73569,9 +73569,9 @@ "xNY" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -74073,23 +74073,23 @@ /obj/effect/turf_decal/tile/neutral, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_y = 2; pixel_x = 11 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_y = 2; pixel_x = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_y = 13; pixel_x = 11 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_y = 13; pixel_x = 3 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = -8; pixel_y = 7 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index ecfb0f5238116..7697c861abef1 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1221,11 +1221,11 @@ /area/maintenance/starboard/fore) "ajQ" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/effect/turf_decal/delivery, @@ -3646,7 +3646,7 @@ /area/engine/atmospherics_engine) "axJ" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -5265,7 +5265,7 @@ /obj/effect/turf_decal/bot, /obj/item/plate/small, /obj/item/food/mint, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5; pixel_x = -4 }, @@ -7453,8 +7453,8 @@ dir = 8; pixel_x = -12 }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/dirt, /obj/item/mop, /obj/item/mop, @@ -8071,7 +8071,7 @@ dir = 1; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/hydroponics) @@ -8345,7 +8345,7 @@ "bdq" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/window/reinforced, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 @@ -8817,7 +8817,7 @@ /obj/structure/table/reinforced, /obj/item/storage/bag/tray, /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /turf/open/floor/iron, /area/crew_quarters/kitchen) "bgt" = ( @@ -8977,7 +8977,7 @@ /area/engine/atmos) "bhy" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/window/reinforced{ dir = 8 }, @@ -8986,7 +8986,7 @@ /area/hydroponics) "bhz" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/window/reinforced{ dir = 4 }, @@ -9621,11 +9621,11 @@ /area/crew_quarters/kitchen) "blA" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/item/knife/kitchen, @@ -14392,8 +14392,8 @@ receive_ore_updates = 1 }, /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -15915,7 +15915,7 @@ }, /obj/item/clothing/mask/cigarette/cigar, /obj/item/clothing/glasses/hud/security/sunglasses, -/obj/item/reagent_containers/food/drinks/flask/det, +/obj/item/reagent_containers/cup/glass/flask/det, /turf/open/floor/carpet/red, /area/security/detectives_office) "ceQ" = ( @@ -16144,7 +16144,7 @@ name = "Captain's Intercom"; pixel_x = -26 }, -/obj/item/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/cup/glass/flask/gold, /obj/item/razor, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) @@ -16529,7 +16529,7 @@ "ciH" = ( /obj/item/paper, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -5; pixel_y = 1 }, @@ -19178,10 +19178,10 @@ /area/crew_quarters/locker) "cxs" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe, /turf/open/floor/iron, /area/medical/medbay/lobby) @@ -20337,7 +20337,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /turf/open/floor/carpet/blue, /area/bridge/showroom/corporate) "cCZ" = ( @@ -21944,8 +21944,8 @@ "cKS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/dropper, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -23500,8 +23500,8 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 5 }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/dropper, /obj/machinery/light{ dir = 4 @@ -25339,8 +25339,8 @@ "dkc" = ( /obj/structure/table/reinforced, /obj/item/folder/white, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/dropper, /obj/structure/extinguisher_cabinet{ pixel_y = -32 @@ -32975,7 +32975,7 @@ "eFd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/maintenance/starboard) "eFj" = ( @@ -34192,12 +34192,12 @@ /area/medical/chemistry) "eZt" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour{ pixel_x = 4 }, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -34848,10 +34848,10 @@ /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/dropper, /obj/item/storage/box/beakers{ pixel_x = -5; @@ -36166,81 +36166,81 @@ /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) "fHD" = ( -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, /obj/structure/closet/crate/medical, @@ -40064,20 +40064,20 @@ /area/crew_quarters/heads/captain) "gOU" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -6; pixel_y = 6 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 6; pixel_y = 6 }, /obj/item/storage/pill_bottle/mannitol, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -2; pixel_y = 9 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 5; pixel_y = 9 }, @@ -40353,7 +40353,7 @@ pixel_x = -1; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 9; pixel_y = 3 }, @@ -41612,7 +41612,7 @@ /area/crew_quarters/locker) "hlk" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/cup/glass/coffee, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -42756,7 +42756,7 @@ /area/medical/virology) "hGh" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -43859,7 +43859,7 @@ "hVg" = ( /obj/structure/table/wood/fancy, /obj/item/organ/heart, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/soulstone/anybody/chaplain, /obj/item/book/granter/spell/smoke/lesser, /turf/open/floor/carpet/grimy, @@ -43989,8 +43989,8 @@ /obj/machinery/reagentgrinder{ pixel_y = 5 }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -45808,7 +45808,7 @@ /area/hallway/primary/central) "iBx" = ( /obj/structure/bonfire, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; name = "Carton of Estus" }, @@ -46794,7 +46794,7 @@ /area/storage/primary) "iVm" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 @@ -49691,7 +49691,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/effect/mapping_helpers/dead_body_placer, /turf/open/floor/iron, /area/medical/morgue) @@ -59961,7 +59961,7 @@ /area/quartermaster/storage) "nkq" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /obj/machinery/camera/directional/east{ c_tag = "Science - Break Room"; name = "science camera" @@ -60951,7 +60951,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/rack, /obj/item/clothing/head/utility/chefhat, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /turf/open/floor/iron, /area/crew_quarters/kitchen) "nze" = ( @@ -63046,7 +63046,7 @@ /area/science/research) "ohm" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -69385,23 +69385,23 @@ /area/science/xenobiology) "qnP" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = 2; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, @@ -70652,7 +70652,7 @@ /area/maintenance/starboard/aft) "qHA" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/kitchen/fork, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -72286,7 +72286,7 @@ /area/quartermaster/office) "rhP" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -72649,12 +72649,12 @@ pixel_y = 2 }, /obj/machinery/vending/wallmed{ - contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1); + contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); name = "Upgraded NanoMed"; pixel_x = -1; pixel_y = -32; premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) + products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) }, /obj/item/reagent_containers/dropper{ pixel_x = 2; @@ -74315,11 +74315,11 @@ /turf/open/floor/iron, /area/science/research) "rMB" = ( -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/structure/table/wood, @@ -76470,7 +76470,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "stW" = ( @@ -77040,7 +77040,7 @@ /area/security/execution/transfer) "sCM" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -79041,17 +79041,17 @@ pixel_x = 25 }, /obj/item/paper_bin, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /turf/open/floor/iron/white, /area/medical/medbay/central) "tku" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = 7; pixel_y = -1 }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = -7; pixel_y = 5 }, @@ -79725,14 +79725,14 @@ name = "Kitchen Counter Shutters" }, /obj/effect/turf_decal/delivery, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/kitchen) @@ -80530,7 +80530,7 @@ "tHG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/maintenance/department/medical/central) "tHM" = ( @@ -83622,7 +83622,7 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = 32 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -84717,7 +84717,7 @@ "vbA" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = 7; pixel_y = 17 }, @@ -84729,7 +84729,7 @@ pixel_x = -6; pixel_y = 6 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 9; pixel_y = 7 }, @@ -85635,7 +85635,7 @@ /obj/item/folder/yellow, /obj/item/pen, /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -85998,7 +85998,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/janitorialcart, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /turf/open/floor/iron/white, /area/janitor/custodian) @@ -86732,15 +86732,15 @@ /area/bridge) "vHo" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -3; pixel_y = 15 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ desc = "Whatever it is, it reeks of foul, putrid froth."; list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 15); name = "Delta-Down"; @@ -93220,10 +93220,10 @@ /area/medical/patients_rooms) "xDQ" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -94858,21 +94858,21 @@ /area/crew_quarters/bar/atrium) "ydf" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = -4; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bottle/chloralhydrate, -/obj/item/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = 5; pixel_y = 1 }, /obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/cup/bottle/facid{ name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6 diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 8fd32c55f820a..b9cf308678185 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -3174,7 +3174,7 @@ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 4; pixel_y = -5 }, @@ -3324,7 +3324,7 @@ pixel_x = -1; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ desc = "Kingston's personal cup."; pixel_x = 16 }, @@ -4709,10 +4709,10 @@ /area/quartermaster/storage) "cbu" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 25 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 21 }, /obj/effect/turf_decal/siding/wood, @@ -6649,7 +6649,7 @@ /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) @@ -9953,7 +9953,7 @@ /area/engine/atmos) "eNg" = ( /obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 12; pixel_y = 7 }, @@ -10346,7 +10346,7 @@ /area/science/robotics) "eVT" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -11951,7 +11951,7 @@ /turf/open/openspace, /area/engineering/hallway) "fKS" = ( -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = -13; pixel_y = -11 }, @@ -12612,7 +12612,7 @@ /turf/closed/wall, /area/maintenance/department/chapel) "fZX" = ( -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = -8; pixel_y = 2 }, @@ -14636,10 +14636,10 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/cafeteria) "haN" = ( -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 25 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 21 }, /obj/structure/table/wood, @@ -15057,7 +15057,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -5; pixel_y = 14 }, @@ -15114,7 +15114,7 @@ icon_state = "0-2" }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 5; pixel_y = 8 }, @@ -15181,7 +15181,7 @@ pixel_x = -5; pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 6; pixel_y = 10 }, @@ -15189,7 +15189,7 @@ pixel_x = -3; pixel_y = -4 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = 9; pixel_y = 1 }, @@ -15339,7 +15339,7 @@ pixel_x = -4; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/cup/glass/bottle/holywater{ pixel_x = 8; pixel_y = 4 }, @@ -15713,7 +15713,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/lizardwine{ +/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ pixel_x = 11; pixel_y = 23 }, @@ -17897,7 +17897,7 @@ pixel_x = 10; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 4; pixel_y = 12 }, @@ -18242,7 +18242,7 @@ /area/maintenance/department/medical/central) "iYE" = ( /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/closet/secure_closet/hydroponics{ req_access = null; req_one_access_txt = "28;25;35" @@ -18807,11 +18807,11 @@ dir = 8 }, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 2 }, @@ -19809,11 +19809,11 @@ dir = 1 }, /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -2; pixel_y = 12 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -6; pixel_y = 9 }, @@ -22179,7 +22179,7 @@ /obj/structure/table, /obj/item/crowbar, /obj/item/wrench, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) @@ -22249,15 +22249,15 @@ /area/maintenance/department/science/central) "kUF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = -8; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = 9; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_y = 3 }, /obj/effect/spawner/lootdrop/glowstick/lit, @@ -22446,7 +22446,7 @@ /area/quartermaster/qm) "lbc" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ dir = 1 }, @@ -23114,7 +23114,7 @@ dir = 10 }, /obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/prison/dark, /area/security/prison) "lsH" = ( @@ -23934,7 +23934,7 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 7; pixel_y = 10 }, @@ -24072,7 +24072,7 @@ /area/asteroid/paradise) "lRO" = ( /obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /obj/machinery/door/window/eastright{ dir = 8; @@ -24531,7 +24531,7 @@ /obj/effect/turf_decal/siding/wood/corner, /obj/structure/closet/secure_closet/captains, /obj/item/book/manual/wiki/security_space_law, -/obj/item/reagent_containers/food/drinks/flask/gold{ +/obj/item/reagent_containers/cup/glass/flask/gold{ pixel_x = 3; pixel_y = 8 }, @@ -27582,7 +27582,7 @@ /turf/open/floor/iron/white, /area/science/lab) "nGn" = ( -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -7; pixel_y = 6 }, @@ -27993,7 +27993,7 @@ pixel_x = 9; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -5; pixel_y = 9 }, @@ -32436,7 +32436,7 @@ /turf/open/floor/iron, /area/maintenance/department/medical/morgue) "pXT" = ( -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 6; pixel_y = 27 }, @@ -32846,7 +32846,7 @@ pixel_x = -8; pixel_y = 15 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 6; pixel_y = 3 }, @@ -33671,7 +33671,7 @@ "qMj" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 9; pixel_y = 6 }, @@ -34858,7 +34858,7 @@ "rnq" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/suit/tan, -/obj/item/reagent_containers/food/drinks/bottle/champagne{ +/obj/item/reagent_containers/cup/glass/bottle/champagne{ pixel_x = 6; pixel_y = 10 }, @@ -35243,10 +35243,10 @@ "rxA" = ( /obj/structure/table, /obj/item/shovel/spade, -/obj/item/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ pixel_x = 5 }, -/obj/item/reagent_containers/glass/bottle/nutrient/ez{ +/obj/item/reagent_containers/cup/bottle/nutrient/ez{ pixel_x = -5 }, /obj/item/reagent_containers/syringe, @@ -36023,7 +36023,7 @@ pixel_y = -33 }, /obj/item/book/manual/hydroponics_pod_people, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/grid/steel, /area/hydroponics) "rSK" = ( @@ -36456,15 +36456,15 @@ }, /obj/machinery/airalarm/directional/east, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 5; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 9; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = -7; pixel_y = 17 }, @@ -38412,11 +38412,11 @@ /area/ai_monitored/security/armory) "teS" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -2; pixel_y = 13 }, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/clothing/head/utility/chefhat{ pixel_x = 5; pixel_y = 4 @@ -39827,11 +39827,11 @@ /area/hallway/primary/fore) "tJw" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/machinery/door/poddoor/shutters{ @@ -41684,7 +41684,7 @@ }, /obj/item/vending_refill/cigarette, /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/iron, /area/hallway/secondary/service) "uIG" = ( @@ -41929,7 +41929,7 @@ "uNj" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 4; pixel_y = 9 }, @@ -43246,11 +43246,11 @@ /obj/structure/chair/fancy/plastic{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8; pixel_y = 17 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -12; pixel_y = 11 }, @@ -45468,7 +45468,7 @@ pixel_x = -1; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 9; pixel_y = 3 }, @@ -46160,10 +46160,10 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 28 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 23 }, /obj/item/paicard, diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index 0247ebe9e24ab..88d3c34a5fa80 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -1800,7 +1800,7 @@ pixel_x = -7; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/flask/det{ +/obj/item/reagent_containers/cup/glass/flask/det{ pixel_x = 4; pixel_y = -1 }, @@ -2447,81 +2447,81 @@ /area/security/main) "aGl" = ( /obj/structure/closet/crate/medical, -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, /obj/item/circuitboard/machine/chem_heater, @@ -3125,7 +3125,7 @@ pixel_y = 1 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 7 }, /obj/item/reagent_containers/dropper, @@ -4874,7 +4874,7 @@ pixel_x = -11 }, /obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /turf/open/floor/iron/dark, /area/security/main) @@ -8372,7 +8372,7 @@ /area/chapel/main) "cgB" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -10316,15 +10316,15 @@ /area/maintenance/department/science) "cIH" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/cup/glass/bottle/holywater{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -3; pixel_y = 15 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -6; pixel_y = 3 }, @@ -11166,19 +11166,19 @@ /turf/open/floor/iron/dark, /area/bridge) "cSw" = ( -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 5; pixel_y = 9 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -2; pixel_y = 9 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 6; pixel_y = 2 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -3; pixel_y = 1 }, @@ -11788,8 +11788,8 @@ /obj/effect/turf_decal/bot, /obj/structure/table, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/flour{ pixel_x = 4 }, /turf/open/floor/iron/cafeteria, @@ -12961,7 +12961,7 @@ /area/quartermaster/sorting) "dqI" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/aft) @@ -13625,8 +13625,8 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 5 }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/dropper, /obj/machinery/camera/directional/north{ c_tag = "Xenobiology - Research Area"; @@ -14531,7 +14531,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/item/dest_tagger, /obj/machinery/computer/security/telescreen/rd{ pixel_y = 30 @@ -16322,23 +16322,23 @@ /area/hallway/primary/aft) "emH" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/patron{ +/obj/item/reagent_containers/cup/glass/bottle/patron{ pixel_x = -5; pixel_y = 16 }, -/obj/item/reagent_containers/food/drinks/bottle/grappa{ +/obj/item/reagent_containers/cup/glass/bottle/grappa{ pixel_x = 10; pixel_y = 15 }, -/obj/item/reagent_containers/food/drinks/bottle/absinthe{ +/obj/item/reagent_containers/cup/glass/bottle/absinthe{ pixel_x = -5; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/kahlua{ +/obj/item/reagent_containers/cup/glass/bottle/kahlua{ pixel_x = 9; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = 2; pixel_y = 4 }, @@ -17061,9 +17061,9 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "exT" = ( -/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/cup/glass/bottle/wine, /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/trophy{ +/obj/item/reagent_containers/cup/glass/trophy{ pixel_x = 9; pixel_y = 8 }, @@ -17466,7 +17466,7 @@ dir = 1 }, /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/maintenance/starboard/aft) "eDN" = ( @@ -18569,7 +18569,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "ePp" = ( -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..." }, /turf/open/floor/cult, @@ -19283,34 +19283,34 @@ "eWR" = ( /obj/effect/turf_decal/bot, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = 2; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, /obj/machinery/firealarm/directional/west, /obj/machinery/vending/wallmed{ - contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1); + contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); name = "Upgraded NanoMed"; pixel_x = -1; pixel_y = -32; premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) + products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) }, /turf/open/floor/iron/grid/steel, /area/medical/virology) @@ -20170,7 +20170,7 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/table, /obj/item/food/dough, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/food/grown/tomato, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) @@ -21021,7 +21021,7 @@ /area/crew_quarters/locker) "ftA" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -1; pixel_y = 9 }, @@ -25881,7 +25881,7 @@ /obj/structure/table, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/seeds/wheat, /obj/item/seeds/wheat, /obj/item/seeds/wheat, @@ -26381,7 +26381,7 @@ /turf/open/floor/iron, /area/engine/atmos) "gJI" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/window/reinforced{ dir = 8 }, @@ -27856,25 +27856,25 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 2; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -2 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 5 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 1; pixel_y = -3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 8; pixel_y = -3 }, @@ -28795,7 +28795,7 @@ pixel_x = 6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = -6; pixel_y = 6 }, @@ -29008,7 +29008,7 @@ /area/maintenance/department/science) "hus" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /obj/machinery/computer/security/telescreen/minisat{ dir = 1; pixel_y = -29 @@ -30117,7 +30117,7 @@ pixel_x = 4; pixel_y = -1 }, -/obj/item/reagent_containers/glass/waterbottle{ +/obj/item/reagent_containers/cup/waterbottle{ pixel_x = -8; pixel_y = -5 }, @@ -31204,7 +31204,7 @@ pixel_y = 2 }, /obj/item/clothing/mask/cigarette/cigar, -/obj/item/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/cup/glass/flask/gold, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "hYU" = ( @@ -31423,8 +31423,8 @@ pixel_y = 31 }, /obj/structure/janitorialcart, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/item/mop, /turf/open/floor/iron/dark/side{ @@ -31852,7 +31852,7 @@ name = "Animal Pen" }, /obj/item/cultivator, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/seeds/tower, /turf/open/floor/plating, /area/hydroponics/garden) @@ -32065,10 +32065,10 @@ /area/quartermaster/sorting) "iiZ" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/dropper, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -32700,7 +32700,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/reagent_containers/glass/mortar, +/obj/item/reagent_containers/cup/mortar, /obj/item/pestle, /obj/item/clothing/glasses/hud/health{ pixel_x = 4; @@ -33755,7 +33755,7 @@ "iDU" = ( /obj/structure/table/wood, /obj/item/storage/lockbox/medal, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "iDW" = ( @@ -34859,7 +34859,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 10; pixel_y = 9 }, @@ -36757,7 +36757,7 @@ /area/hallway/primary/port) "jsw" = ( /obj/structure/bonfire, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; name = "Carton of Estus" }, @@ -36831,7 +36831,7 @@ pixel_y = 5 }, /obj/item/storage/belt/utility, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/delivery, /obj/machinery/requests_console{ department = "Robotics Lab"; @@ -39735,7 +39735,7 @@ /area/security/main) "keX" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/central/secondary) @@ -51244,7 +51244,7 @@ pixel_x = 8; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/book/granter/spell/smoke/lesser, /turf/open/floor/cult, /area/chapel/office) @@ -51729,7 +51729,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/light, /obj/machinery/reagentgrinder, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) @@ -52639,8 +52639,8 @@ /area/science/mixing) "nwP" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, /obj/structure/sign/plaques/deempisi{ pixel_y = 28 }, @@ -55861,7 +55861,7 @@ dir = 6 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /obj/structure/railing, /turf/open/floor/iron/techmaint, /area/science/misc_lab) @@ -60218,7 +60218,7 @@ /area/crew_quarters/heads/hor) "pBN" = ( /obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 4 }, /obj/effect/turf_decal/stripes/line, @@ -61895,7 +61895,7 @@ pixel_x = 1; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 8; pixel_y = -1 }, @@ -63143,7 +63143,7 @@ /area/security/brig) "qpL" = ( /obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /turf/open/floor/iron/techmaint, /area/science/research) @@ -63513,19 +63513,19 @@ pixel_x = 6; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = 8; pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = 8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/sugar{ +/obj/item/reagent_containers/condiment/sugar{ pixel_x = 8; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -4; pixel_y = 17 }, @@ -63819,12 +63819,12 @@ "qxm" = ( /obj/structure/table, /obj/item/food/spaghetti/raw, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/peppermill, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/peppermill, +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 6 }, /obj/effect/turf_decal/bot, @@ -63996,7 +63996,7 @@ /obj/item/screwdriver, /obj/item/wrench, /obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/item/knife/kitchen, /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -66678,7 +66678,7 @@ "rkq" = ( /obj/item/folder, /obj/item/clipboard, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /obj/structure/table/wood, /obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; @@ -68448,7 +68448,7 @@ pixel_x = 1; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -6; pixel_y = 6 }, @@ -70994,7 +70994,7 @@ /area/science/xenobiology) "smb" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/maintenance/department/security/brig) "sme" = ( @@ -71229,10 +71229,10 @@ "soC" = ( /obj/structure/table/wood, /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{ +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ pixel_x = -6 }, -/obj/item/reagent_containers/food/drinks/mug/cocoa{ +/obj/item/reagent_containers/cup/glass/mug/cocoa{ pixel_x = 6 }, /turf/open/floor/iron/sepia, @@ -73905,7 +73905,7 @@ }, /obj/structure/table/reinforced, /obj/item/food/popcorn, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = 4; pixel_y = 6 }, @@ -75597,11 +75597,11 @@ "tvw" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 5; pixel_y = -2 }, @@ -77058,10 +77058,10 @@ /obj/item/food/mint{ pixel_y = 9 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 2 }, /obj/structure/noticeboard{ @@ -80981,11 +80981,11 @@ pixel_x = 28 }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull{ +/obj/item/reagent_containers/cup/soda_cans/grey_bull{ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = 4; pixel_y = 4 }, @@ -81197,10 +81197,10 @@ }, /obj/item/clothing/glasses/science, /obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 3 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3 }, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -82378,7 +82378,7 @@ /turf/open/floor/iron/dark, /area/chapel/main) "vdJ" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/tile/green/opposingcorners, @@ -84370,7 +84370,7 @@ dir = 8 }, /obj/structure/closet/secure_closet/freezer/kitchen/maintenance, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, /obj/item/food/tofu/prison, /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissaryFood) @@ -87734,14 +87734,14 @@ /obj/structure/desk_bell/speed_demon{ pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -6; pixel_y = 14 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; name = "Bottle of Tears"; pixel_x = 8; @@ -88347,20 +88347,20 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/structure/closet/secure_closet/injection, -/obj/item/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/cup/bottle/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/cup/bottle/facid{ name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = 5; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = -4; pixel_y = 1 }, @@ -88369,7 +88369,7 @@ /obj/item/reagent_containers/syringe{ pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/chloralhydrate, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -89401,10 +89401,10 @@ pixel_x = 1; pixel_y = 4 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = 3 }, @@ -89999,7 +89999,7 @@ name = "Virology Desk Window"; req_access_txt = "20" }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = 2; pixel_y = 12 }, @@ -90007,7 +90007,7 @@ pixel_x = -5; pixel_y = -3 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, @@ -93387,7 +93387,7 @@ pixel_y = 2 }, /obj/item/pen, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = -6; pixel_y = 1 }, @@ -95043,8 +95043,8 @@ dir = 1 }, /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker{ pixel_x = 7 }, /obj/item/reagent_containers/dropper, @@ -95436,7 +95436,7 @@ /area/crew_quarters/fitness/recreation) "xTR" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "xUa" = ( @@ -95705,10 +95705,10 @@ /area/hallway/primary/starboard) "xXA" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/shutters/preopen{ @@ -95717,7 +95717,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 5; pixel_y = 1 }, @@ -95936,12 +95936,12 @@ "yaa" = ( /obj/structure/table, /obj/item/kitchen/fork, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ desc = "Salt. From space oceans, presumably. A staple of modern medicine."; pixel_x = -8; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 5; pixel_y = 6 }, diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 4c553ce62a51c..e0c8ee46563a1 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -3353,19 +3353,19 @@ /turf/open/floor/iron, /area/bridge) "aqK" = ( -/obj/item/reagent_containers/food/drinks/flask/gold{ +/obj/item/reagent_containers/cup/glass/flask/gold{ pixel_x = 3; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/cup/glass/bottle/rum{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 7; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /obj/machinery/status_display/evac{ pixel_y = 32 }, @@ -10347,17 +10347,17 @@ /obj/item/storage/box/seccarts{ pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; name = "Bottle of Tears"; pixel_x = 3; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_y = 2 }, /obj/machinery/keycard_auth{ @@ -10684,12 +10684,12 @@ /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; pixel_x = -8; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ desc = "Salt. From space oceans, presumably. A staple of modern medicine."; pixel_x = -8; pixel_y = 12 @@ -10883,12 +10883,12 @@ /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; pixel_x = -8; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ desc = "Salt. From space oceans, presumably. A staple of modern medicine."; pixel_x = -8; pixel_y = 12 @@ -11115,7 +11115,7 @@ /area/crew_quarters/kitchen) "boy" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = 4; pixel_y = 4 }, @@ -11612,17 +11612,17 @@ dir = 4; pixel_x = -27 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; pixel_x = -8; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ desc = "Salt. From space oceans, presumably. A staple of modern medicine."; pixel_x = -8; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 4; pixel_y = 4 }, @@ -11819,7 +11819,7 @@ dir = 4 }, /obj/item/clothing/suit/hooded/chaplain_hoodie, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/soulstone/anybody/chaplain, /obj/item/organ/heart, /obj/item/book/granter/spell/smoke/lesser, @@ -11909,7 +11909,7 @@ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = 8; pixel_y = 6 }, @@ -15537,7 +15537,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bNU" = ( @@ -26264,12 +26264,12 @@ "cYd" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; pixel_x = -8; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ desc = "Salt. From space oceans, presumably. A staple of modern medicine."; pixel_x = -8; pixel_y = 12 @@ -27354,16 +27354,16 @@ }, /obj/structure/table/glass, /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -7 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -7 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 7 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 7 }, /turf/open/floor/iron/showroomfloor, @@ -27379,7 +27379,7 @@ pixel_x = -5; pixel_y = -4 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 9; pixel_y = 5 }, @@ -30240,7 +30240,7 @@ /area/science/mixing) "eja" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -2; pixel_y = 6 }, @@ -32491,15 +32491,15 @@ /area/science/lab) "eWx" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -3; pixel_y = 15 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30); name = "Kilo-Kocktail"; @@ -36155,7 +36155,7 @@ /area/maintenance/central) "giB" = ( /obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/sign/warning/securearea{ @@ -38545,7 +38545,7 @@ }, /obj/item/clothing/glasses/science, /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -6 }, /turf/open/floor/iron/showroomfloor, @@ -39549,7 +39549,7 @@ /area/bridge) "htk" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /turf/open/floor/plating{ burnt = 1 }, @@ -42894,12 +42894,12 @@ /area/science/aft) "izu" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ pixel_x = 6; pixel_y = 7; list_reagents = list(/datum/reagent/consumable/pwr_game = 5) }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -5; pixel_y = 1 }, @@ -42998,7 +42998,7 @@ "iAH" = ( /obj/structure/table/wood, /obj/item/clipboard, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = -2; pixel_y = 2 }, @@ -43006,7 +43006,7 @@ pixel_x = 8; pixel_y = 2 }, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -44720,7 +44720,7 @@ /turf/open/floor/iron, /area/security/execution/transfer) "jcF" = ( -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, /turf/open/floor/plating, /area/quartermaster/warehouse) "jcT" = ( @@ -45990,81 +45990,81 @@ pixel_y = 4 }, /obj/item/circuitboard/machine/chem_heater, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, /obj/structure/closet/crate/secure/plasma{ @@ -47427,7 +47427,7 @@ dir = 4; pixel_x = 11 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /turf/open/floor/plating{ burnt = 1 @@ -50408,16 +50408,16 @@ pixel_y = 27 }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/cup/glass/sillycup{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/cup/glass/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/sillycup, +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = -8; pixel_y = 7 }, @@ -54090,7 +54090,7 @@ /obj/item/crowbar/red, /obj/item/cultivator, /obj/item/wirecutters, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/circuitboard/machine/biogenerator, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -54205,17 +54205,17 @@ /area/crew_quarters/bar) "lZo" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; pixel_x = -8; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ desc = "Salt. From space oceans, presumably. A staple of modern medicine."; pixel_x = -8; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ desc = "An emerald flask, from the Keeper's soul. High in vitamins!"; name = "estus flask"; pixel_x = 4; @@ -57522,7 +57522,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/radio/intercom{ pixel_y = 22 }, @@ -59033,7 +59033,7 @@ /obj/item/crowbar/red, /obj/item/cultivator, /obj/item/wirecutters, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/circuitboard/machine/biogenerator, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -59264,15 +59264,15 @@ "nPI" = ( /obj/structure/table, /obj/item/food/mint, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -2; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/sugar{ +/obj/item/reagent_containers/condiment/sugar{ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -59874,12 +59874,12 @@ /area/security/main) "nZh" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; pixel_x = -8; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ desc = "Salt. From space oceans, presumably. A staple of modern medicine."; pixel_x = -8; pixel_y = 12 @@ -62333,11 +62333,11 @@ dir = 4 }, /obj/item/storage/box/masks, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = -9; pixel_y = 5 }, @@ -63920,7 +63920,7 @@ /area/security/execution/education) "pmx" = ( /obj/structure/bonfire, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; name = "Carton of Estus" }, @@ -67368,17 +67368,17 @@ /area/quartermaster/warehouse) "qti" = ( /obj/item/book/manual/wiki/medicine, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -6; pixel_y = 10 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 6; pixel_y = 10 }, @@ -67960,7 +67960,7 @@ /area/engine/atmos) "qCD" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/book/manual/chef_recipes{ pixel_x = 2; pixel_y = 6 @@ -69029,7 +69029,7 @@ "qVe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -69197,7 +69197,7 @@ name = "Trash Chute"; req_one_access_txt = "26" }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -70444,10 +70444,10 @@ /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -4 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 4 }, /obj/item/reagent_containers/dropper, @@ -74136,7 +74136,7 @@ /area/maintenance/aft) "sHz" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -74422,15 +74422,15 @@ /area/security/prison) "sMK" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -3; pixel_y = 15 }, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/cup/glass/bottle/holywater{ pixel_x = 4; pixel_y = 4 }, @@ -76628,11 +76628,11 @@ pixel_x = 6; pixel_y = 11 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 9; pixel_y = -7 }, @@ -77835,7 +77835,7 @@ "tXJ" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/delivery, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -77882,10 +77882,10 @@ "tZQ" = ( /obj/structure/table, /obj/item/clipboard, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 6 }, /obj/item/clothing/glasses/science, @@ -79910,7 +79910,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, /obj/machinery/light/small, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -80466,7 +80466,7 @@ "uQT" = ( /obj/structure/flora/ausbushes/leafybush, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/grass, /area/security/prison) "uRb" = ( @@ -83733,7 +83733,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -84372,7 +84372,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/chapel/main) @@ -85030,11 +85030,11 @@ pixel_x = -3; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, @@ -85154,7 +85154,7 @@ /obj/item/multitool{ pixel_x = 4 }, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -89113,27 +89113,27 @@ icon_state = "4-8" }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ +/obj/item/reagent_containers/cup/soda_cans/starkist{ pixel_x = 10; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{ +/obj/item/reagent_containers/cup/soda_cans/shamblers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{ +/obj/item/reagent_containers/cup/soda_cans/lemon_lime{ pixel_x = -7; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ pixel_x = -4; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = 6; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{ +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ pixel_y = 20 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -91286,7 +91286,7 @@ dir = 4 }, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6efd704bfb060..0271a1ec07e76 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -4247,8 +4247,8 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ pixel_x = 2; pixel_y = 1 }, @@ -4276,7 +4276,7 @@ dir = 1 }, /obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/hydroponics/garden) @@ -5799,7 +5799,7 @@ /obj/item/hatchet, /obj/item/cultivator, /obj/item/crowbar, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/plant_analyzer, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -8217,7 +8217,7 @@ pixel_y = 2 }, /obj/item/clothing/mask/cigarette/cigar, -/obj/item/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/cup/glass/flask/gold, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "bhv" = ( @@ -10659,7 +10659,7 @@ /area/crew_quarters/heads/captain/private) "byr" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "byv" = ( @@ -12238,11 +12238,11 @@ dir = 1 }, /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 7; pixel_y = -3 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -4; pixel_y = -3 }, @@ -12251,7 +12251,7 @@ pixel_y = -2 }, /obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 8; pixel_y = 2 }, @@ -14576,7 +14576,7 @@ "bUn" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/window/reinforced{ dir = 8 }, @@ -14588,7 +14588,7 @@ dir = 4 }, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/hydroponics) "bUq" = ( @@ -15187,7 +15187,7 @@ /area/hydroponics) "bYn" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/structure/railing{ dir = 1 }, @@ -16769,21 +16769,21 @@ /area/quartermaster/office) "cmb" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = -4; pixel_y = 1 }, -/obj/item/reagent_containers/glass/bottle/chloralhydrate, -/obj/item/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = 5; pixel_y = 1 }, /obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/cup/bottle/facid{ name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6 @@ -17002,7 +17002,7 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) "cou" = ( -/obj/item/reagent_containers/food/drinks/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = 8; pixel_y = 12 }, @@ -18016,7 +18016,7 @@ pixel_x = -13; pixel_y = -10 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -8; pixel_y = 8 }, @@ -18153,11 +18153,11 @@ amount = 4; pixel_y = 4 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 8; pixel_y = 2 }, @@ -18568,7 +18568,7 @@ pixel_y = 5 }, /obj/item/storage/belt/utility, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/robotics/lab) @@ -21717,7 +21717,7 @@ /obj/structure/closet/crate/hydroponics, /obj/item/shovel/spade, /obj/item/wrench, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/cultivator, /obj/item/wirecutters, /turf/open/floor/iron, @@ -23375,7 +23375,7 @@ "dJG" = ( /obj/structure/table/reinforced, /obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -2; pixel_y = 13 }, @@ -28508,10 +28508,10 @@ id = "kitchen"; name = "Serving Hatch" }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/machinery/door/firedoor, @@ -29972,7 +29972,7 @@ /area/security/main) "glg" = ( /obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/cup/glass/bottle/wine{ pixel_x = -9; pixel_y = 6 }, @@ -30738,81 +30738,81 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "gEW" = ( -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, /obj/structure/closet/crate/medical, @@ -34559,7 +34559,7 @@ "hVW" = ( /obj/structure/table/glass, /obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{ +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ pixel_x = -6; pixel_y = 6 }, @@ -36182,10 +36182,10 @@ /obj/item/stack/sheet/mineral/plasma{ pixel_x = 9 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/dropper, /obj/item/storage/box/beakers{ pixel_x = -6; @@ -37195,12 +37195,12 @@ pixel_y = 2 }, /obj/machinery/vending/wallmed{ - contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1); + contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); name = "Upgraded NanoMed"; pixel_x = -1; pixel_y = -32; premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) + products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) }, /obj/item/reagent_containers/dropper{ pixel_x = 2; @@ -40346,8 +40346,8 @@ /obj/machinery/reagentgrinder{ pixel_y = 5 }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron, /area/medical/chemistry) "kiA" = ( @@ -43726,7 +43726,7 @@ /area/crew_quarters/fitness/recreation) "lyj" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/cup/glass/bottle/holywater{ pixel_x = -2; pixel_y = 2 }, @@ -45127,11 +45127,11 @@ pixel_x = 6; pixel_y = 12 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -7; pixel_y = 6 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 6; pixel_y = 4 }, @@ -49730,23 +49730,23 @@ "nIt" = ( /obj/structure/rack, /obj/item/storage/firstaid/regular, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 6 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 6 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8; pixel_y = -2 }, @@ -50058,7 +50058,7 @@ }, /obj/item/storage/box/trackimp, /obj/item/storage/lockbox/loyalty, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /obj/machinery/light/small, /obj/machinery/firealarm{ dir = 4; @@ -50400,20 +50400,20 @@ /area/medical/medbay/aft) "nSE" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/cup/glass/sillycup{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/cup/glass/sillycup, +/obj/item/reagent_containers/cup/glass/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/cup/glass/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/cup/glass/sillycup{ pixel_x = 5; pixel_y = 3 }, @@ -54432,7 +54432,7 @@ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = 8; pixel_y = 12 }, @@ -60169,10 +60169,10 @@ "rwt" = ( /obj/structure/table, /obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /turf/open/floor/iron/checker, @@ -60915,20 +60915,20 @@ /area/crew_quarters/locker) "rMj" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -6; pixel_y = 6 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 6; pixel_y = 6 }, /obj/item/storage/pill_bottle/mannitol, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -2; pixel_y = 9 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 5; pixel_y = 9 }, @@ -63437,7 +63437,7 @@ /obj/item/cultivator, /obj/item/crowbar, /obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/table/glass, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -66234,23 +66234,23 @@ /area/bridge) "tGk" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = 2; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, @@ -66502,10 +66502,10 @@ /area/security/brig) "tLJ" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/effect/turf_decal/siding/wood{ @@ -68756,7 +68756,7 @@ /obj/structure/desk_bell{ pixel_x = 8 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -5; pixel_y = 1 }, @@ -70413,7 +70413,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "vfv" = ( -/obj/item/reagent_containers/food/drinks/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = -4; pixel_y = -7 }, @@ -72018,10 +72018,10 @@ /area/maintenance/central) "vJj" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 5 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 6 }, /obj/item/food/mint, @@ -73069,7 +73069,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/table, /obj/item/storage/bag/plants, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/machinery/light{ dir = 1 }, @@ -73397,8 +73397,8 @@ /area/quartermaster/sorting) "wld" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag{ pixel_y = 5 }, /obj/effect/turf_decal/siding/wood{ @@ -76465,7 +76465,7 @@ dir = 4; pixel_x = 11 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/structure/sign/poster/random{ pixel_x = 32 diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 2f12771147948..ec3253b933315 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -943,10 +943,10 @@ /area/mine/living_quarters) "gD" = ( /obj/structure/closet/secure_closet/freezer/kitchen/maintenance, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, /obj/item/food/tofu/prison, /obj/item/knife/kitchen, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/item/kitchen/rollingpin, /obj/item/wrench, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -2760,7 +2760,7 @@ "tM" = ( /obj/structure/table, /obj/effect/landmark/event_spawn, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /obj/item/shovel/spade, /obj/item/cultivator, /turf/open/floor/iron/grid/steel, @@ -2916,7 +2916,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "uL" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/iron/grid/steel, @@ -3670,15 +3670,15 @@ /area/mine/laborcamp) "Bd" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -4702,10 +4702,10 @@ /area/mine/laborcamp/security) "IX" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -5304,7 +5304,7 @@ /obj/structure/table, /obj/item/plate, /obj/item/kitchen/fork, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -5; pixel_y = 1 }, @@ -5558,10 +5558,10 @@ "Pp" = ( /obj/structure/table, /obj/item/storage/bag/tray, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) "Pz" = ( @@ -5646,8 +5646,8 @@ /area/lavaland/surface/outdoors) "Qc" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee, +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 8; pixel_y = 6 }, @@ -6726,19 +6726,19 @@ /area/lavaland/surface/outdoors) "XP" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/drinkingglass, +/obj/item/reagent_containers/cup/glass/drinkingglass, +/obj/item/reagent_containers/cup/glass/drinkingglass, +/obj/item/reagent_containers/cup/glass/bottle/beer{ desc = "Whatever it is, it reeks of foul, putrid froth."; list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing=15); name = "Delta-Down"; pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/bottle/champagne, -/obj/item/reagent_containers/food/drinks/bottle/cognac, -/obj/item/reagent_containers/food/drinks/bottle/lizardwine, +/obj/item/reagent_containers/cup/glass/bottle/champagne, +/obj/item/reagent_containers/cup/glass/bottle/cognac, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/carpet/black, diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index ee40069275007..23d9aa66dabee 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -19,7 +19,7 @@ }, /obj/structure/closet/secure_closet/captains, /obj/item/book/manual/wiki/security_space_law, -/obj/item/reagent_containers/food/drinks/flask/gold{ +/obj/item/reagent_containers/cup/glass/flask/gold{ pixel_x = 3; pixel_y = 8 }, @@ -2577,15 +2577,15 @@ pixel_x = -6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/absinthe{ +/obj/item/reagent_containers/cup/glass/bottle/absinthe{ pixel_x = -10; pixel_y = 15 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 3; pixel_y = 15 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 9; pixel_y = 10 }, @@ -3068,10 +3068,10 @@ /obj/machinery/light{ light_color = "#7AC3FF" }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 25 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 21 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -4371,7 +4371,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/reagent_containers/glass/mortar, +/obj/item/reagent_containers/cup/mortar, /obj/item/pestle, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -5768,7 +5768,7 @@ pixel_x = -1; pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 13; pixel_y = 17 }, @@ -7282,7 +7282,7 @@ "coF" = ( /obj/machinery/reagentgrinder, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = -9; pixel_y = 1 }, @@ -7879,81 +7879,81 @@ dir = 1 }, /obj/structure/closet/crate/medical, -/obj/item/reagent_containers/glass/bottle/bromine{ +/obj/item/reagent_containers/cup/bottle/bromine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/aluminium{ +/obj/item/reagent_containers/cup/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/carbon{ +/obj/item/reagent_containers/cup/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/copper{ +/obj/item/reagent_containers/cup/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ +/obj/item/reagent_containers/cup/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/fluorine{ +/obj/item/reagent_containers/cup/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/water{ +/obj/item/reagent_containers/cup/bottle/water{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/lithium{ +/obj/item/reagent_containers/cup/bottle/lithium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/oxygen{ +/obj/item/reagent_containers/cup/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ +/obj/item/reagent_containers/cup/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/potassium{ +/obj/item/reagent_containers/cup/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ +/obj/item/reagent_containers/cup/bottle/welding_fuel{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/sacid{ +/obj/item/reagent_containers/cup/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/silicon{ +/obj/item/reagent_containers/cup/bottle/silicon{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/silver{ +/obj/item/reagent_containers/cup/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/bottle/sugar{ +/obj/item/reagent_containers/cup/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/sulfur{ +/obj/item/reagent_containers/cup/bottle/sulfur{ pixel_x = -6 }, /obj/item/circuitboard/machine/chem_heater, @@ -11143,19 +11143,19 @@ /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) "dBb" = ( -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -1; pixel_y = 1 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -2; pixel_y = 11 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 8; pixel_y = 10 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 9 }, /obj/item/storage/pill_bottle/mannitol{ @@ -12558,10 +12558,10 @@ /obj/machinery/light{ light_color = "#7AC3FF" }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 28 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 23 }, /obj/effect/decal/cleanable/dirt, @@ -15716,7 +15716,7 @@ }, /obj/machinery/vending/wallmed{ pixel_y = -32; - products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2) + products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2) }, /obj/machinery/newscaster{ pixel_x = -32; @@ -16114,7 +16114,7 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/carbon, +/obj/item/reagent_containers/cup/bottle/carbon, /turf/open/floor/plating/rust, /area/maintenance/starboard/aft) "fbi" = ( @@ -16849,7 +16849,7 @@ pixel_x = -3; pixel_y = 2 }, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_x = 4; pixel_y = 3 }, @@ -17622,7 +17622,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 7; pixel_y = 1 }, @@ -18697,7 +18697,7 @@ /obj/item/food/donut/apple{ name = "forbidden toilet donut" }, -/obj/item/reagent_containers/food/drinks/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = -10; pixel_y = 17 }, @@ -19134,7 +19134,7 @@ "fWj" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = -2; pixel_y = 10 }, @@ -19340,7 +19340,7 @@ departmentType = 2; pixel_y = 30 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 5 }, @@ -20343,7 +20343,7 @@ /obj/item/clothing/suit/jacket/det_suit{ icon_state = "curator" }, -/obj/item/reagent_containers/food/drinks/flask/det, +/obj/item/reagent_containers/cup/glass/flask/det, /obj/effect/turf_decal/siding/wood{ dir = 9 }, @@ -26077,7 +26077,7 @@ "ijU" = ( /obj/structure/table/wood, /obj/item/toy/foamblade, -/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull{ +/obj/item/reagent_containers/cup/soda_cans/grey_bull{ pixel_x = 7; pixel_y = 15 }, @@ -26664,7 +26664,7 @@ /turf/open/floor/engine/air, /area/engine/atmos) "ivW" = ( -/obj/item/reagent_containers/glass/waterbottle/empty{ +/obj/item/reagent_containers/cup/waterbottle/empty{ pixel_x = -10 }, /obj/item/storage/belt/utility, @@ -29137,7 +29137,7 @@ /turf/open/floor/iron/white, /area/medical/office) "jmw" = ( -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -7; pixel_y = 6 }, @@ -29223,11 +29223,11 @@ /area/hallway/primary/central) "joH" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 4; pixel_y = 13 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -2; pixel_y = 14 }, @@ -32134,7 +32134,7 @@ icon_state = "0-2" }, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/grid/steel, /area/hydroponics) "kkV" = ( @@ -33950,7 +33950,7 @@ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 9; pixel_y = 10 }, @@ -33958,7 +33958,7 @@ pixel_x = -3; pixel_y = -4 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = 8; pixel_y = 1 }, @@ -35335,7 +35335,7 @@ }, /obj/structure/table/wood/fancy/purple, /obj/item/book/granter/spell/smoke/lesser, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/soulstone/anybody/chaplain, /obj/item/organ/heart, /turf/open/floor/carpet/grimy, @@ -37344,7 +37344,7 @@ /area/science/research) "lYd" = ( /obj/effect/decal/cleanable/food/flour, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9; pixel_y = 44 }, @@ -37365,7 +37365,7 @@ /area/hallway/primary/central) "lYy" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/champagne{ +/obj/item/reagent_containers/cup/glass/bottle/champagne{ pixel_x = 6; pixel_y = 10 }, @@ -38627,7 +38627,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "mrr" = ( -/obj/item/reagent_containers/glass/bottle/iodine, +/obj/item/reagent_containers/cup/bottle/iodine, /turf/open/floor/plating, /area/maintenance/starboard/aft) "mrF" = ( @@ -40073,7 +40073,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ pixel_x = -7; pixel_y = 10 }, @@ -42970,7 +42970,7 @@ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -43647,7 +43647,7 @@ "nQW" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/grass, /area/hallway/primary/central) "nQZ" = ( @@ -44791,7 +44791,7 @@ /area/hallway/secondary/exit/departure_lounge) "okF" = ( /obj/machinery/chem_master, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron, /area/medical/apothecary) "okN" = ( @@ -46043,7 +46043,7 @@ /area/hallway/primary/port) "oHE" = ( /obj/structure/lattice/catwalk, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 9; pixel_y = 6 }, @@ -46051,7 +46051,7 @@ pixel_x = -3; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 2; pixel_y = 1 }, @@ -46641,19 +46641,19 @@ /area/security/checkpoint/escape) "oPl" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{ +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ pixel_x = -7; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = 12; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ +/obj/item/reagent_containers/cup/soda_cans/starkist{ pixel_x = 10; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/soda_cans/space_up, +/obj/item/reagent_containers/cup/soda_cans/space_up, /turf/open/floor/iron, /area/maintenance/port/aft) "oPx" = ( @@ -48019,7 +48019,7 @@ /area/crew_quarters/heads/captain/private) "piH" = ( /obj/structure/janitorialcart, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 11; pixel_y = -5 }, @@ -49260,7 +49260,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron, /area/medical/apothecary) "pEF" = ( @@ -55293,15 +55293,15 @@ pixel_x = -22 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 5; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 9; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = -7; pixel_y = 17 }, @@ -56060,7 +56060,7 @@ /obj/structure/closet/cardboard, /obj/item/storage/toolbox/emergency, /obj/effect/spawner/lootdrop/maintenance/eight, -/obj/item/reagent_containers/food/drinks/bottle/hooch, +/obj/item/reagent_containers/cup/glass/bottle/hooch, /turf/open/floor/plating, /area/maintenance/starboard/aft) "rJX" = ( @@ -57213,7 +57213,7 @@ pixel_x = 5; pixel_y = 14 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = -8; pixel_y = 3 }, @@ -60341,7 +60341,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/food/grown/carrot{ pixel_x = 4; pixel_y = 4 @@ -61200,14 +61200,14 @@ pixel_x = -1; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = -8 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = -4 }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket{ pixel_x = 4 }, /obj/item/shovel/spade{ @@ -63699,7 +63699,7 @@ id = "cell"; pixel_x = -25 }, -/obj/item/reagent_containers/food/drinks/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = 11; pixel_y = 15 }, @@ -63876,7 +63876,7 @@ pixel_x = -4; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 2; pixel_y = 9 }, @@ -65464,14 +65464,14 @@ /turf/open/floor/iron/dark, /area/security/nuke_storage) "uLH" = ( -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = 9; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = -8; pixel_y = 11 }, @@ -66221,7 +66221,7 @@ /area/maintenance/department/science) "uZg" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -5; pixel_y = 1 }, @@ -66277,15 +66277,15 @@ "vam" = ( /obj/machinery/recharger, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/cup/glass/bottle/wine{ pixel_x = -9; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 10; pixel_y = 13 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 10; pixel_y = 5 }, @@ -66648,7 +66648,7 @@ /area/hallway/secondary/entry) "viS" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{ +/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ pixel_x = -2; pixel_y = 12 }, @@ -66772,7 +66772,7 @@ /area/chapel/main) "vkC" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/glass/bottle/nutrient/ez{ +/obj/item/reagent_containers/cup/bottle/nutrient/ez{ pixel_x = 9; pixel_y = 4 }, @@ -67664,11 +67664,11 @@ /area/crew_quarters/heads/hor) "vAV" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -7; pixel_y = 2 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 7; pixel_y = -3 }, @@ -67677,17 +67677,17 @@ pixel_x = -3; pixel_y = 2 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -4; pixel_y = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 8; pixel_y = 6 }, /obj/item/reagent_containers/syringe/antiviral, /obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -4; pixel_y = -3 }, @@ -68457,7 +68457,7 @@ /area/solar/starboard/fore) "vPl" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -5; pixel_y = 16 }, @@ -69642,7 +69642,7 @@ dir = 4 }, /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = -6; pixel_y = 3 }, @@ -71531,7 +71531,7 @@ pixel_x = 2; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -5; pixel_y = 5 }, @@ -71704,23 +71704,23 @@ /area/hydroponics) "wUw" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = 2; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ +/obj/item/reagent_containers/cup/bottle/spaceacillin{ pixel_x = 2; pixel_y = -1 }, @@ -72484,7 +72484,7 @@ /turf/open/floor/iron/dark, /area/security/brig/dock) "xjA" = ( -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 3; pixel_y = 12 }, @@ -72613,7 +72613,7 @@ pixel_x = -7; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -8; pixel_y = 10 }, @@ -74135,11 +74135,11 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wideplating/dark, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -6; pixel_y = 9 }, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_x = 6; pixel_y = 8 }, @@ -75247,7 +75247,7 @@ /area/security/execution/education) "yaV" = ( /obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /obj/machinery/door/window/eastleft{ name = "Hydroponics Desk"; diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index b7bddd9b25c04..ada8a8d8a658f 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -190,7 +190,7 @@ "aH" = ( /obj/structure/table, /obj/machinery/reagentgrinder, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron/white, /area/centcom/holding) @@ -492,7 +492,7 @@ "bK" = ( /obj/structure/table/reinforced, /obj/item/food/mint, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -953,7 +953,7 @@ /obj/structure/sign/poster/official/cohiba_robusto_ad{ pixel_x = 32 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = -10; pixel_y = 1 }, @@ -987,7 +987,7 @@ "dH" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 5 }, /obj/machinery/light, @@ -1075,17 +1075,17 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "ef" = ( -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, @@ -1208,7 +1208,7 @@ pixel_y = 7; pixel_x = -4 }, -/obj/item/reagent_containers/food/drinks/mug/tea{ +/obj/item/reagent_containers/cup/glass/mug/tea{ pixel_x = 9 }, /turf/open/floor/iron/dark, @@ -1357,8 +1357,8 @@ "eQ" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -2075,7 +2075,7 @@ /area/tdome/tdomeobserve) "hT" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 5; pixel_y = -2 }, @@ -4195,7 +4195,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 4; pixel_y = 7 }, @@ -4798,7 +4798,7 @@ /area/centcom/evac) "si" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/wood, /area/syndicate_mothership/control) "sj" = ( @@ -5765,7 +5765,7 @@ /area/centcom/holding) "vu" = ( /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/cup/glass/bottle/rum, /obj/structure/table/wood, /turf/open/floor/wood, /area/syndicate_mothership/control) @@ -6226,7 +6226,7 @@ /area/wizard_station) "wR" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/cup/glass/trophy/gold_cup, /turf/open/floor/carpet/grimy, /area/tdome/tdomeobserve) "wS" = ( @@ -7104,7 +7104,7 @@ pixel_x = 6; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -7; pixel_y = -1 }, @@ -8030,7 +8030,7 @@ "Du" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /obj/structure/window/reinforced{ dir = 8 }, @@ -9230,14 +9230,14 @@ "HK" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/tdome/tdomeobserve) @@ -9389,7 +9389,7 @@ /obj/item/trash/candy{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -4; pixel_y = 11 }, @@ -9501,7 +9501,7 @@ /area/tdome/arena) "IG" = ( /obj/structure/bookcase/manuals, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/closed/indestructible/riveted, /area/ctf) "IJ" = ( @@ -9910,18 +9910,18 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/cup/glass/mug{ pixel_x = 11; pixel_y = -2 }, /obj/structure/sign/barsign{ pixel_y = 32 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 12; pixel_y = 15 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 8; pixel_y = 13 }, @@ -10309,12 +10309,12 @@ "LJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 5; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -5 }, /turf/open/floor/iron/dark, @@ -10719,7 +10719,7 @@ "Nh" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/iron/dark, /area/centcom/supplypod) "Nk" = ( @@ -11478,14 +11478,14 @@ "PO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 6 }, /turf/open/floor/iron/dark, @@ -11569,7 +11569,7 @@ "Qf" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -11591,7 +11591,7 @@ /area/centcom/holding) "Qj" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/sake, +/obj/item/reagent_containers/cup/glass/bottle/sake, /turf/open/floor/wood, /area/centcom/holding) "Qk" = ( @@ -11993,10 +11993,10 @@ /area/ctf) "RK" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -4 }, /obj/item/reagent_containers/hypospray/medipen, @@ -12201,7 +12201,7 @@ "Sn" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -12473,11 +12473,11 @@ /area/tdome/tdomeobserve) "Ti" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/item/knife/kitchen, @@ -12489,7 +12489,7 @@ /area/tdome/tdomeobserve) "Tj" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 5 }, /obj/item/clothing/mask/cigarette/cigar/havana{ @@ -13492,8 +13492,8 @@ /obj/item/wrench, /obj/item/watertank, /obj/item/cultivator, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron/white, /area/centcom/holding) @@ -13894,8 +13894,8 @@ /turf/open/floor/iron, /area/centcom/control) "YJ" = ( -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/cup/glass/shaker, /obj/item/book/manual/wiki/barman_recipes, /obj/structure/closet/crate, /turf/open/floor/iron/cafeteria, @@ -13925,7 +13925,7 @@ /area/centcom/supplypod/loading/four) "YQ" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /turf/open/floor/iron/cafeteria, /area/centcom/holding) "YS" = ( diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm index b1720b49d0f1c..e6d1845ee49e6 100644 --- a/_maps/shuttles/emergency/emergency_bar.dmm +++ b/_maps/shuttles/emergency/emergency_bar.dmm @@ -115,7 +115,7 @@ "at" = ( /obj/structure/table/wood/poker, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/machinery/light, /obj/effect/turf_decal/siding/dark, /turf/open/floor/carpet/royalblue, @@ -441,7 +441,7 @@ "hS" = ( /obj/structure/table, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /obj/item/storage/fancy/cigarettes/cigars/havana, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, @@ -726,7 +726,7 @@ }, /obj/structure/table, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/lizardwine, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency/emergency_cere.dmm b/_maps/shuttles/emergency/emergency_cere.dmm index 7dc14e723c105..ebbabaa23f450 100644 --- a/_maps/shuttles/emergency/emergency_cere.dmm +++ b/_maps/shuttles/emergency/emergency_cere.dmm @@ -458,7 +458,7 @@ /area/shuttle/escape) "gd" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/cup/beaker/cryoxadone, /obj/item/wrench, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 diff --git a/_maps/shuttles/emergency/emergency_corg.dmm b/_maps/shuttles/emergency/emergency_corg.dmm index b1d5de11fe706..4f2bb9b67a7d9 100644 --- a/_maps/shuttles/emergency/emergency_corg.dmm +++ b/_maps/shuttles/emergency/emergency_corg.dmm @@ -293,7 +293,7 @@ /area/shuttle/escape) "kD" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe/epinephrine, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -482,10 +482,10 @@ /area/shuttle/escape) "rX" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/item/food/meat/rawbacon, /obj/item/food/meat/rawbacon, /obj/item/food/meat/rawbacon, @@ -1028,7 +1028,7 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /obj/item/food/chocolatebar, diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index de3aa740a6542..cd967380d5889 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -1268,17 +1268,17 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Gd" = ( -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, diff --git a/_maps/shuttles/emergency/emergency_discoinferno.dmm b/_maps/shuttles/emergency/emergency_discoinferno.dmm index 2629b06e99961..d6980dcd1f23e 100644 --- a/_maps/shuttles/emergency/emergency_discoinferno.dmm +++ b/_maps/shuttles/emergency/emergency_discoinferno.dmm @@ -70,7 +70,7 @@ "n" = ( /obj/structure/table/wood/poker, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/machinery/light, /turf/open/floor/mineral/gold, /area/shuttle/escape) @@ -112,12 +112,12 @@ /area/shuttle/escape) "A" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/cup/glass/bottle/cognac, /turf/open/floor/wood, /area/shuttle/escape) "B" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /turf/open/floor/wood, /area/shuttle/escape) "C" = ( @@ -152,9 +152,9 @@ /area/shuttle/escape) "H" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /obj/machinery/light{ dir = 4 }, @@ -176,12 +176,12 @@ /area/shuttle/escape) "K" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/cup/glass/bottle/absinthe, /turf/open/floor/wood, /area/shuttle/escape) "L" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/lizardwine, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine, /turf/open/floor/wood, /area/shuttle/escape) "M" = ( diff --git a/_maps/shuttles/emergency/emergency_donut.dmm b/_maps/shuttles/emergency/emergency_donut.dmm index 9a74f82daa4b4..5b62cf55e6e95 100644 --- a/_maps/shuttles/emergency/emergency_donut.dmm +++ b/_maps/shuttles/emergency/emergency_donut.dmm @@ -359,17 +359,17 @@ /area/shuttle/escape) "bn" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, diff --git a/_maps/shuttles/emergency/emergency_fland.dmm b/_maps/shuttles/emergency/emergency_fland.dmm index 65b2116ce2033..a60fbc50f6c29 100644 --- a/_maps/shuttles/emergency/emergency_fland.dmm +++ b/_maps/shuttles/emergency/emergency_fland.dmm @@ -339,17 +339,17 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "pF" = ( -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, @@ -658,17 +658,17 @@ /area/shuttle/escape) "zB" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, @@ -905,7 +905,7 @@ /obj/item/reagent_containers/hypospray/medipen{ pixel_y = -6 }, -/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/cup/bottle/charcoal, /obj/item/defibrillator/compact/loaded, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm index c6c506d1210bf..f25f156c2401f 100644 --- a/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm +++ b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm @@ -155,16 +155,16 @@ /area/shuttle/escape) "U" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/shuttle/escape) "V" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency/emergency_kilo.dmm b/_maps/shuttles/emergency/emergency_kilo.dmm index 61c5969117929..974cb677e70fe 100644 --- a/_maps/shuttles/emergency/emergency_kilo.dmm +++ b/_maps/shuttles/emergency/emergency_kilo.dmm @@ -463,7 +463,7 @@ /obj/item/reagent_containers/hypospray/medipen{ pixel_y = -6 }, -/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/cup/bottle/charcoal, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "cY" = ( diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index 43daa06db9753..8b1be9081bdbb 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -436,17 +436,17 @@ /area/shuttle/escape) "bJ" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, diff --git a/_maps/shuttles/emergency/emergency_pubby.dmm b/_maps/shuttles/emergency/emergency_pubby.dmm index 638c0e726d90d..f0f93bc16b853 100644 --- a/_maps/shuttles/emergency/emergency_pubby.dmm +++ b/_maps/shuttles/emergency/emergency_pubby.dmm @@ -374,7 +374,7 @@ /area/shuttle/escape) "vo" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/cup/glass/bottle/wine, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, diff --git a/_maps/shuttles/emergency/emergency_raven.dmm b/_maps/shuttles/emergency/emergency_raven.dmm index fe28a505f0961..9a2f8ab6f9f51 100644 --- a/_maps/shuttles/emergency/emergency_raven.dmm +++ b/_maps/shuttles/emergency/emergency_raven.dmm @@ -447,17 +447,17 @@ /turf/open/floor/iron/white/side, /area/shuttle/escape) "bL" = ( -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, diff --git a/_maps/shuttles/emergency/emergency_russiafightpit.dmm b/_maps/shuttles/emergency/emergency_russiafightpit.dmm index be30341adae41..a9f91777a46a4 100644 --- a/_maps/shuttles/emergency/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency/emergency_russiafightpit.dmm @@ -58,7 +58,7 @@ "am" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/cigars/cohiba, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = 5; pixel_y = 18 }, @@ -303,7 +303,7 @@ /area/shuttle/escape) "be" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bf" = ( @@ -396,7 +396,7 @@ pixel_x = 27 }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bv" = ( @@ -459,12 +459,12 @@ /area/shuttle/escape) "bH" = ( /obj/structure/closet, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /turf/open/floor/plating, /area/shuttle/escape) "bI" = ( diff --git a/_maps/shuttles/emergency/emergency_theatre.dmm b/_maps/shuttles/emergency/emergency_theatre.dmm index 445a67b1940c0..c0bdc1ab2577e 100644 --- a/_maps/shuttles/emergency/emergency_theatre.dmm +++ b/_maps/shuttles/emergency/emergency_theatre.dmm @@ -10,17 +10,17 @@ /turf/open/floor/carpet/black, /area/shuttle/escape) "eX" = ( -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, @@ -425,22 +425,22 @@ /area/shuttle/escape) "JO" = ( /obj/structure/table/wood/fancy/royalblue, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_y = 9; pixel_x = -6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_y = 9; pixel_x = 6 }, -/obj/item/reagent_containers/food/drinks/bottle/champagne{ +/obj/item/reagent_containers/cup/glass/bottle/champagne{ pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_y = 4; pixel_x = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_y = 4; pixel_x = -6 }, diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm index 9bdc48160d4e6..a325822887e5f 100644 --- a/_maps/shuttles/emergency/emergency_tiny.dmm +++ b/_maps/shuttles/emergency/emergency_tiny.dmm @@ -323,7 +323,7 @@ /obj/machinery/vending/wallmed{ pixel_x = -32; pixel_y = 1; - products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 6, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2) + products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 6, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2) }, /turf/open/floor/iron/white, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency/emergency_wabbajack.dmm b/_maps/shuttles/emergency/emergency_wabbajack.dmm index 3d71a8948f4e4..cda35866266b3 100644 --- a/_maps/shuttles/emergency/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency/emergency_wabbajack.dmm @@ -186,11 +186,11 @@ /area/shuttle/escape) "aT" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 2; pixel_y = 2 }, -/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/cup/bottle/charcoal, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "be" = ( diff --git a/_maps/shuttles/exploration/exploration_fland.dmm b/_maps/shuttles/exploration/exploration_fland.dmm index 6a75042c81328..8c61415c2cb5c 100644 --- a/_maps/shuttles/exploration/exploration_fland.dmm +++ b/_maps/shuttles/exploration/exploration_fland.dmm @@ -39,7 +39,7 @@ pixel_x = 6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/syndicatebeer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8; pixel_y = 2 }, @@ -645,10 +645,10 @@ /area/shuttle/exploration) "JR" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = 4; pixel_y = 1 }, @@ -783,7 +783,7 @@ dir = 8 }, /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/reagent_containers/spray/cleaner, /obj/effect/turf_decal/box, /turf/open/floor/iron/grid/steel, @@ -870,7 +870,7 @@ /area/shuttle/exploration) "UN" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 9; pixel_y = -3 }, @@ -879,7 +879,7 @@ pixel_x = -3; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = 4; pixel_y = 7 }, @@ -895,7 +895,7 @@ pixel_y = 1 }, /obj/item/trash/pistachios, -/obj/item/reagent_containers/food/drinks/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = -8 }, /obj/machinery/light, diff --git a/_maps/shuttles/hunter/hunter_bounty.dmm b/_maps/shuttles/hunter/hunter_bounty.dmm index 9bc7ba09d5318..ec8b4afb4c495 100644 --- a/_maps/shuttles/hunter/hunter_bounty.dmm +++ b/_maps/shuttles/hunter/hunter_bounty.dmm @@ -29,7 +29,7 @@ }, /obj/effect/turf_decal/delivery, /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/machinery/airalarm/directional/east{ req_access = null; req_access_txt = "181" diff --git a/_maps/shuttles/hunter/hunter_russian.dmm b/_maps/shuttles/hunter/hunter_russian.dmm index ebde43f81b867..3ee9fa8e724bc 100644 --- a/_maps/shuttles/hunter/hunter_russian.dmm +++ b/_maps/shuttles/hunter/hunter_russian.dmm @@ -108,9 +108,9 @@ /obj/item/food/rationpack, /obj/item/food/rationpack, /obj/item/food/rationpack, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, +/obj/item/reagent_containers/cup/glass/bottle/vodka, /turf/open/floor/iron/techmaint, /area/shuttle/hunter) "jP" = ( @@ -157,7 +157,7 @@ /area/shuttle/hunter) "my" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/storage/bag/trash{ pixel_x = 6 }, @@ -689,7 +689,7 @@ /area/shuttle/hunter) "Jx" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = 8; pixel_y = 6 }, @@ -988,7 +988,7 @@ /turf/open/floor/iron/dark, /area/shuttle/hunter) "Ul" = ( -/obj/item/reagent_containers/food/drinks/flask/gold{ +/obj/item/reagent_containers/cup/glass/flask/gold{ list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30); pixel_y = 8; pixel_x = 4 @@ -1030,7 +1030,7 @@ pixel_y = 8; pixel_x = 2 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = -8; pixel_y = 11 }, diff --git a/_maps/shuttles/hunter/hunter_space_cop.dmm b/_maps/shuttles/hunter/hunter_space_cop.dmm index d79dd2d7bba92..8884b78dc8304 100644 --- a/_maps/shuttles/hunter/hunter_space_cop.dmm +++ b/_maps/shuttles/hunter/hunter_space_cop.dmm @@ -232,7 +232,7 @@ pixel_x = 8; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/cup/glass/mug{ pixel_x = 9; pixel_y = -2 }, @@ -389,7 +389,7 @@ pixel_x = -7; pixel_y = -7 }, -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/cup/glass/mug{ pixel_x = -7; pixel_y = 4 }, @@ -1220,7 +1220,7 @@ /obj/effect/decal/cleanable/oil{ pixel_y = 11 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = -8; pixel_y = 2 }, diff --git a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm index c20ea1aae749d..b8e9370fbe87b 100644 --- a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm @@ -34,17 +34,17 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; name = "Bottle of Tears"; pixel_x = 3; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -7; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -7; pixel_y = 4 }, @@ -665,7 +665,7 @@ /obj/item/reagent_containers/hypospray/medipen{ pixel_y = -6 }, -/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/cup/bottle/charcoal, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 1 diff --git a/_maps/shuttles/infiltrator/infiltrator_basic.dmm b/_maps/shuttles/infiltrator/infiltrator_basic.dmm index df51e6e24bafb..7f4b5c79544ef 100644 --- a/_maps/shuttles/infiltrator/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator/infiltrator_basic.dmm @@ -283,17 +283,17 @@ /turf/open/floor/iron/dark, /area/shuttle/syndicate/medical) "bt" = ( -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, @@ -851,8 +851,8 @@ /area/shuttle/syndicate/medical) "Hs" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/dropper, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 diff --git a/_maps/shuttles/pirate/pirate_default.dmm b/_maps/shuttles/pirate/pirate_default.dmm index a7205fb084fdc..9a11216e64085 100644 --- a/_maps/shuttles/pirate/pirate_default.dmm +++ b/_maps/shuttles/pirate/pirate_default.dmm @@ -229,7 +229,7 @@ dir = 8; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/bottle/hooch{ +/obj/item/reagent_containers/cup/glass/bottle/hooch{ pixel_x = 8; pixel_y = 4 }, @@ -402,7 +402,7 @@ pixel_x = 8; pixel_y = -4 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = -9; pixel_y = -7 }, @@ -594,7 +594,7 @@ pixel_x = -8; pixel_y = 14 }, -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/cup/glass/mug{ pixel_x = -14; pixel_y = 1 }, @@ -870,7 +870,7 @@ pixel_y = 10; pixel_x = -5 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = 2; pixel_x = -7 }, @@ -929,7 +929,7 @@ pixel_x = 6; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 10; pixel_y = 19 }, @@ -2004,7 +2004,7 @@ /obj/effect/turf_decal/weather/dirt/corner{ dir = 4 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/item/storage/bag/trash{ pixel_x = 4; @@ -2098,40 +2098,40 @@ /area/shuttle/pirate) "Wx" = ( /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/food/drinks/bottle/moonshine{ +/obj/item/reagent_containers/cup/glass/bottle/moonshine{ pixel_x = 7; pixel_y = -5 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = -6; pixel_x = 5 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = -6; pixel_x = 1 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = -6; pixel_x = -5 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = -6; pixel_x = 5 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = -6; pixel_x = 1 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = -8; pixel_x = 8 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = -10; pixel_x = -3 }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = -8; pixel_x = 8 }, diff --git a/_maps/shuttles/ruin/ruin_caravan_victim.dmm b/_maps/shuttles/ruin/ruin_caravan_victim.dmm index bc43d0d012d66..851f1bd4af8f8 100644 --- a/_maps/shuttles/ruin/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin/ruin_caravan_victim.dmm @@ -415,21 +415,21 @@ locked = 0; name = "fridge" }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 3; pixel_y = -3 }, -/obj/item/reagent_containers/glass/waterbottle{ +/obj/item/reagent_containers/cup/waterbottle{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle, -/obj/item/reagent_containers/glass/waterbottle{ +/obj/item/reagent_containers/cup/waterbottle, +/obj/item/reagent_containers/cup/waterbottle{ pixel_x = 3; pixel_y = -3 }, diff --git a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm index 929f9306ab4d2..cddb5cd3f86d1 100644 --- a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm @@ -357,7 +357,7 @@ /obj/item/storage/box/donkpockets{ pixel_x = -6 }, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/cup/glass/bottle/rum{ pixel_x = 8; pixel_y = 3 }, @@ -368,7 +368,7 @@ /area/shuttle/caravan/pirate) "qX" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -396,11 +396,11 @@ /area/shuttle/caravan/pirate) "to" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/cup/glass/bottle/rum{ pixel_x = 3; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/cup/glass/bottle/rum, /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "tM" = ( diff --git a/_maps/shuttles/whiteship/whiteship_box.dmm b/_maps/shuttles/whiteship/whiteship_box.dmm index 3978cda03d1e8..2276abbd60287 100644 --- a/_maps/shuttles/whiteship/whiteship_box.dmm +++ b/_maps/shuttles/whiteship/whiteship_box.dmm @@ -45,7 +45,7 @@ "am" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/reagent_containers/glass/beaker/synthflesh, +/obj/item/reagent_containers/cup/beaker/synthflesh, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) @@ -250,7 +250,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/item/storage/bag/trash{ pixel_x = 6 @@ -1170,11 +1170,11 @@ pixel_x = -6; pixel_y = 6 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 7; pixel_y = -3 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = -2; pixel_y = -3 }, @@ -1407,7 +1407,7 @@ pixel_x = -5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = 8; pixel_y = 4 }, @@ -1545,25 +1545,25 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 2; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -2 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 5 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 1; pixel_y = -3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 8; pixel_y = -3 }, @@ -1718,11 +1718,11 @@ "sz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -6; pixel_y = 6 }, @@ -1818,7 +1818,7 @@ pixel_x = 6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = -6; pixel_y = 4 }, @@ -1995,12 +1995,12 @@ locked = 0; name = "fridge" }, -/obj/item/reagent_containers/glass/waterbottle{ +/obj/item/reagent_containers/cup/waterbottle{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle, -/obj/item/reagent_containers/glass/waterbottle{ +/obj/item/reagent_containers/cup/waterbottle, +/obj/item/reagent_containers/cup/waterbottle{ pixel_x = 3; pixel_y = -3 }, diff --git a/_maps/shuttles/whiteship/whiteship_delta.dmm b/_maps/shuttles/whiteship/whiteship_delta.dmm index 5295c84560583..5ca8343ad2e6a 100644 --- a/_maps/shuttles/whiteship/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship/whiteship_delta.dmm @@ -85,21 +85,21 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/bot_white, /obj/structure/closet/crate, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large, +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 3; pixel_y = -3 }, -/obj/item/reagent_containers/glass/waterbottle{ +/obj/item/reagent_containers/cup/waterbottle{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle, -/obj/item/reagent_containers/glass/waterbottle{ +/obj/item/reagent_containers/cup/waterbottle, +/obj/item/reagent_containers/cup/waterbottle{ pixel_x = 3; pixel_y = -3 }, @@ -129,7 +129,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/item/storage/bag/trash{ pixel_x = 6 @@ -1267,10 +1267,10 @@ "dN" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/cup/bottle/charcoal{ pixel_x = -3 }, /obj/item/reagent_containers/syringe, @@ -2120,11 +2120,11 @@ name = "fridge" }, /obj/item/food/sausage, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/item/food/sandwich, /obj/structure/spider/stickyweb, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -2225,7 +2225,7 @@ currenthand = list("2 of Diamonds","3 of Clubs"); pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 7; pixel_y = 4 }, diff --git a/_maps/shuttles/whiteship/whiteship_fland.dmm b/_maps/shuttles/whiteship/whiteship_fland.dmm index 95ab48b5e2b7c..29cee5609ea4c 100644 --- a/_maps/shuttles/whiteship/whiteship_fland.dmm +++ b/_maps/shuttles/whiteship/whiteship_fland.dmm @@ -33,25 +33,25 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 2; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -2 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 5 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 1; pixel_y = -3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 8; pixel_y = -3 }, @@ -328,10 +328,10 @@ "qb" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = -4 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 4 }, /turf/open/floor/wood, diff --git a/_maps/shuttles/whiteship/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm index 8b72bbc6a3d41..464a28f46c281 100644 --- a/_maps/shuttles/whiteship/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship/whiteship_meta.dmm @@ -218,25 +218,25 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 2; pixel_y = 3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = -2 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 5 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 1; pixel_y = -3 }, -/obj/item/reagent_containers/glass/waterbottle/large{ +/obj/item/reagent_containers/cup/waterbottle/large{ pixel_x = 8; pixel_y = -3 }, @@ -1207,11 +1207,11 @@ "dQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 10 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 4 }, @@ -1293,7 +1293,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/medical, /obj/item/storage/firstaid/fire, -/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/morphine, /obj/item/reagent_containers/syringe, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -1345,11 +1345,11 @@ /obj/item/knife/kitchen{ pixel_x = 16 }, -/obj/item/reagent_containers/food/condiment/sugar{ +/obj/item/reagent_containers/condiment/sugar{ pixel_x = -9; pixel_y = 14 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -5; pixel_y = 6 }, @@ -1723,11 +1723,11 @@ "qi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/item/food/meat/slab/synthmeat{ pixel_x = -3; pixel_y = 3 @@ -2158,18 +2158,18 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = 16; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/gin{ +/obj/item/reagent_containers/cup/glass/bottle/gin{ pixel_x = -8; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/cognac{ +/obj/item/reagent_containers/cup/glass/bottle/cognac{ pixel_x = 8; pixel_y = 4 }, @@ -2206,7 +2206,7 @@ /obj/item/shovel/spade, /obj/item/cultivator, /obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -2239,19 +2239,19 @@ "Gj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 10 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 1; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ +/obj/item/reagent_containers/cup/soda_cans/cola{ pixel_x = 6 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2265,7 +2265,7 @@ pixel_x = -11; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 6; pixel_y = 14 }, @@ -2491,14 +2491,14 @@ "Pb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/cup/glass/bottle/wine{ pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/vermouth{ +/obj/item/reagent_containers/cup/glass/bottle/vermouth{ pixel_x = -8; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/tequila{ +/obj/item/reagent_containers/cup/glass/bottle/tequila{ pixel_x = 8; pixel_y = 4 }, @@ -2582,7 +2582,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/item/storage/bag/trash{ pixel_x = 6 diff --git a/_maps/templates/hilbertshotel.dmm b/_maps/templates/hilbertshotel.dmm index 09452a387d909..9c372f8188786 100644 --- a/_maps/templates/hilbertshotel.dmm +++ b/_maps/templates/hilbertshotel.dmm @@ -64,7 +64,7 @@ pixel_x = -5; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 9; pixel_y = 2 }, @@ -291,7 +291,7 @@ /area/hilbertshotel) "Z" = ( /obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = -6; pixel_y = 2 }, diff --git a/_maps/templates/holodeck_asylum.dmm b/_maps/templates/holodeck_asylum.dmm index 1168e24f0d6b5..01111577d8445 100644 --- a/_maps/templates/holodeck_asylum.dmm +++ b/_maps/templates/holodeck_asylum.dmm @@ -127,7 +127,7 @@ /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/cup/beaker, /obj/effect/decal/cleanable/dirt, /turf/open/floor/holofloor/white, /area/template_noop) diff --git a/_maps/templates/holodeck_kitchen.dmm b/_maps/templates/holodeck_kitchen.dmm index 8a37b15c0d56a..a5a53108b74a6 100644 --- a/_maps/templates/holodeck_kitchen.dmm +++ b/_maps/templates/holodeck_kitchen.dmm @@ -23,7 +23,7 @@ /obj/structure/window{ dir = 1 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ list_reagents = list() }, /turf/open/floor/holofloor/white, diff --git a/_maps/templates/holodeck_teahouse.dmm b/_maps/templates/holodeck_teahouse.dmm index 440e69bd907e7..2502855cc318e 100644 --- a/_maps/templates/holodeck_teahouse.dmm +++ b/_maps/templates/holodeck_teahouse.dmm @@ -36,12 +36,12 @@ /area/template_noop) "g" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ icon_state = "sakecup"; pixel_x = -8; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ icon_state = "sakecup"; pixel_x = 8; pixel_y = 3 @@ -97,9 +97,9 @@ /area/template_noop) "p" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug, -/obj/item/reagent_containers/food/drinks/mug, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/cup/glass/mug, +/obj/item/reagent_containers/cup/glass/mug, +/obj/item/reagent_containers/cup/glass/mug, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index e7436bfc7c1be..fbbb2fbd82f26 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -112,11 +112,11 @@ light_color = "#DDFFD3" }, /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 7; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/cup/glass/bottle/wine{ pixel_x = -6; pixel_y = 10 }, @@ -162,7 +162,7 @@ /area/survivalpod) "x" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 7; pixel_y = 2 }, diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm index ac53b420e236c..f41c514c9fbe6 100644 --- a/_maps/templates/shelter_3.dmm +++ b/_maps/templates/shelter_3.dmm @@ -42,8 +42,8 @@ /area/survivalpod) "i" = ( /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, /obj/structure/table/wood/fancy/black, /turf/open/floor/pod/dark, /area/survivalpod) @@ -193,11 +193,11 @@ /area/survivalpod) "F" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 4; pixel_y = 4 }, diff --git a/_maps/templates/shelter_4.dmm b/_maps/templates/shelter_4.dmm index 6c4bf512cbc07..5ac8f7bb92da1 100644 --- a/_maps/templates/shelter_4.dmm +++ b/_maps/templates/shelter_4.dmm @@ -112,7 +112,7 @@ "aB" = ( /obj/structure/rack, /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/machinery/light/small, /obj/item/paper/fluff/itemnotice, /turf/open/floor/pod/dark, @@ -202,7 +202,7 @@ /obj/structure/closet, /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/gloves/fingerless, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/machinery/light{ dir = 8 }, @@ -229,7 +229,7 @@ /obj/structure/closet, /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/gloves/fingerless, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/cup/glass/bottle/beer, /obj/item/pickaxe/mini, /obj/item/clothing/under/rank/cargo/miner/lavaland, /turf/open/floor/pod/light, diff --git a/_maps/templates/warped_room.dmm b/_maps/templates/warped_room.dmm index c8c87db0e8828..db521f2c32239 100644 --- a/_maps/templates/warped_room.dmm +++ b/_maps/templates/warped_room.dmm @@ -84,7 +84,7 @@ /area/warped_room) "r" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle, +/obj/item/reagent_containers/cup/glass/bottle, /turf/open/indestructible/hotelwood, /area/warped_room) "s" = ( @@ -100,7 +100,7 @@ /area/warped_room) "u" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, /obj/item/knife/kitchen, /obj/item/kitchen/rollingpin, /turf/open/indestructible/hotelwood, diff --git a/beestation.dme b/beestation.dme index c80536ce36350..841de06de95d0 100644 --- a/beestation.dme +++ b/beestation.dme @@ -2670,13 +2670,8 @@ #include "code\modules\fields\timestop.dm" #include "code\modules\fields\turf_objects.dm" #include "code\modules\flufftext\Dreaming.dm" -#include "code\modules\food_and_drinks\food.dm" #include "code\modules\food_and_drinks\pizzabox.dm" #include "code\modules\food_and_drinks\plate.dm" -#include "code\modules\food_and_drinks\drinks\drinks.dm" -#include "code\modules\food_and_drinks\drinks\drinks\bottle.dm" -#include "code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm" -#include "code\modules\food_and_drinks\food\condiment.dm" #include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm" #include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm" #include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm" @@ -3712,17 +3707,22 @@ #include "code\modules\reagents\chemistry\recipes\toxins.dm" #include "code\modules\reagents\reagent_containers\blood_pack.dm" #include "code\modules\reagents\reagent_containers\borghydro.dm" -#include "code\modules\reagents\reagent_containers\bottle.dm" #include "code\modules\reagents\reagent_containers\chem_bag.dm" #include "code\modules\reagents\reagent_containers\chem_heirloom.dm" +#include "code\modules\reagents\reagent_containers\condiment.dm" #include "code\modules\reagents\reagent_containers\dropper.dm" -#include "code\modules\reagents\reagent_containers\glass.dm" #include "code\modules\reagents\reagent_containers\hypospray.dm" #include "code\modules\reagents\reagent_containers\medspray.dm" #include "code\modules\reagents\reagent_containers\patch.dm" #include "code\modules\reagents\reagent_containers\pill.dm" #include "code\modules\reagents\reagent_containers\spray.dm" #include "code\modules\reagents\reagent_containers\syringes.dm" +#include "code\modules\reagents\reagent_containers\cups\_cup.dm" +#include "code\modules\reagents\reagent_containers\cups\bottle.dm" +#include "code\modules\reagents\reagent_containers\cups\drinkingglass.dm" +#include "code\modules\reagents\reagent_containers\cups\drinks.dm" +#include "code\modules\reagents\reagent_containers\cups\glassbottle.dm" +#include "code\modules\reagents\reagent_containers\cups\soda.dm" #include "code\modules\recycling\conveyor.dm" #include "code\modules\recycling\sortingmachinery.dm" #include "code\modules\recycling\disposal\bin.dm" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm index 1212051c2932a..2b5b5eae98d90 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm @@ -9,6 +9,8 @@ #define COMSIG_PARENT_EXAMINE "atom_examine" /// from base of atom/get_examine_name(): (/mob, list/overrides) #define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name" +///from base of atom/examine_more(): (/mob) +#define COMSIG_PARENT_EXAMINE_MORE "atom_examine_more" //Positions for overrides list #define EXAMINE_POSITION_ARTICLE (1<<0) #define EXAMINE_POSITION_BEFORE (1<<1) diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm index 9be7a55a20cec..a3cd583da4d6f 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm @@ -54,3 +54,8 @@ #define COMSIG_EDIBLE_ON_COMPOST "on_compost" // Used to stop food from being composted. #define COMPONENT_EDIBLE_BLOCK_COMPOST 1 + +//Drink + +///from base of obj/item/reagent_containers/cup/attack(): (mob/M, mob/user) +#define COMSIG_GLASS_DRANK "glass_drank" diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index 84573363b15d6..52ab065c5ae86 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -5,8 +5,12 @@ #define PAYCHECK_EASY 15 #define PAYCHECK_MEDIUM 40 #define PAYCHECK_HARD 70 -#define PAYCHECK_COMMAND_NT 20 // given from nanotrasen to heads -#define PAYCHECK_COMMAND_DEPT 80 // given from department budget +// given from nanotrasen to heads +#define PAYCHECK_COMMAND_NT 20 +// given from department budget +#define PAYCHECK_COMMAND_DEPT 80 +// Command Total +#define PAYCHECK_COMMAND 100 #define PAYCHECK_VIP 2000 /* Note: The current intention for crazy amount of money to VIP is that they can be a rich shitter or be targeted by antags for their money - oh, my, being rich isn't always good. diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 71ab790799e09..2831abed7a3b2 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -234,6 +234,8 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list( #define isgun(A) (istype(A, /obj/item/gun)) +#define is_reagent_container(O) (istype(O, /obj/item/reagent_containers)) + //Assemblies #define isassembly(O) (istype(O, /obj/item/assembly)) diff --git a/code/__HELPERS/randoms.dm b/code/__HELPERS/randoms.dm index ca2e265b1309a..897745ec8ac95 100644 --- a/code/__HELPERS/randoms.dm +++ b/code/__HELPERS/randoms.dm @@ -37,10 +37,11 @@ ///Gets a random drink excluding the blocked type /proc/get_random_drink() - var/list/blocked = list(/obj/item/reagent_containers/food/drinks/soda_cans, - /obj/item/reagent_containers/food/drinks/bottle + var/list/blocked = list( + /obj/item/reagent_containers/cup/soda_cans, + /obj/item/reagent_containers/cup/glass/bottle ) - return pick(subtypesof(/obj/item/reagent_containers/food/drinks) - blocked) + return pick(subtypesof(/obj/item/reagent_containers/cup/glass) - blocked) /// Picks a string of symbols to display as the law number for hacked or ion laws /proc/ion_num() diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm index af65c582983ef..a5d006113a368 100644 --- a/code/__HELPERS/type_processing.dm +++ b/code/__HELPERS/type_processing.dm @@ -10,7 +10,7 @@ /obj/item/clothing/head/helmet/space = "SPESSHELMET", /obj/item/bodypart = "BODYPART", /obj/item/book/manual = "MANUAL", - /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first + /obj/item/reagent_containers/cup/glass = "DRINK", //longest paths comes first /obj/item/food = "FOOD", /obj/item/reagent_containers = "REAGENT_CONTAINERS", /obj/machinery/atmospherics = "ATMOS_MECH", diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 6d91a65083d92..3c7a948fdfa5b 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -341,13 +341,13 @@ GLOBAL_LIST_INIT(smoker_cigarettes, list( )) GLOBAL_LIST_INIT(alcoholic_bottles, list( - /obj/item/reagent_containers/food/drinks/bottle/ale, - /obj/item/reagent_containers/food/drinks/bottle/beer, - /obj/item/reagent_containers/food/drinks/bottle/gin, - /obj/item/reagent_containers/food/drinks/bottle/whiskey, - /obj/item/reagent_containers/food/drinks/bottle/vodka, - /obj/item/reagent_containers/food/drinks/bottle/rum, - /obj/item/reagent_containers/food/drinks/bottle/applejack + /obj/item/reagent_containers/cup/glass/bottle/ale, + /obj/item/reagent_containers/cup/glass/bottle/beer, + /obj/item/reagent_containers/cup/glass/bottle/gin, + /obj/item/reagent_containers/cup/glass/bottle/whiskey, + /obj/item/reagent_containers/cup/glass/bottle/vodka, + /obj/item/reagent_containers/cup/glass/bottle/rum, + /obj/item/reagent_containers/cup/glass/bottle/applejack )) GLOBAL_LIST_INIT(junkie_drugs, list( diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index a70cf8e873378..747d425ee34f2 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -72,11 +72,11 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/poster/random_official = 1, /obj/item/radio/headset = 1, /obj/item/radio/off = 2, - /obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1, + /obj/item/reagent_containers/cup/glass/bottle/homemaderum = 1, /obj/item/food/canned/peaches/maint = 1, /obj/item/food/grown/citrus/orange = 1, /obj/item/food/grown/flower/poppy = 10, - /obj/item/reagent_containers/glass/rag = 3, + /obj/item/reagent_containers/cup/rag = 3, /obj/item/reagent_containers/pill/floorpill = 4, /obj/item/reagent_containers/spray/pestspray = 1, /obj/item/reagent_containers/syringe/used = 4, @@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/weldingtool = 3, /obj/item/wirecutters = 1, /obj/item/wrench = 4, - /obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1, + /obj/item/reagent_containers/cup/glass/bottle/homemaderum = 1, /obj/item/xenoartifact/maint = 1, /obj/item/paper_reader = 1, )) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 39b5f2570be59..28e6409f2435a 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -88,21 +88,21 @@ * * mob/living/user - The mob hitting with this item * * params - Click params of this attack */ -/obj/item/proc/attack(mob/living/M, mob/living/user, params) - var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user, params) +/obj/item/proc/attack(mob/living/target_mob, mob/living/user, params) + var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, target_mob, user, params) if(signal_return & COMPONENT_CANCEL_ATTACK_CHAIN) return TRUE if(signal_return & COMPONENT_SKIP_ATTACK) return - SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user, params) - SEND_SIGNAL(M, COMSIG_MOB_ITEM_ATTACKBY, user, src) + SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, target_mob, user, params) + SEND_SIGNAL(target_mob, COMSIG_MOB_ITEM_ATTACKBY, user, src) var/nonharmfulhit = FALSE if(user.a_intent == INTENT_HELP && !(item_flags & ISWEAPON)) nonharmfulhit = TRUE - for(var/datum/surgery/S in M.surgeries) + for(var/datum/surgery/S in target_mob.surgeries) if(S.failed_step) nonharmfulhit = FALSE //No freebies, if you fail a surgery step you should hit your patient S.failed_step = FALSE //In theory the hit should only happen once, upon failing the step @@ -120,22 +120,22 @@ else if(hitsound) playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0) - M.lastattacker = user.real_name - M.lastattackerckey = user.ckey + target_mob.lastattacker = user.real_name + target_mob.lastattackerckey = user.ckey - user.do_attack_animation(M) + user.do_attack_animation(target_mob) var/time = world.time if(nonharmfulhit) - M.send_item_poke_message(src, user) + target_mob.send_item_poke_message(src, user) user.time_of_last_poke = time else user.record_accidental_poking() - M.attacked_by(src, user) - M.time_of_last_attack_received = time + target_mob.attacked_by(src, user) + target_mob.time_of_last_attack_received = time user.time_of_last_attack_dealt = time user.check_for_accidental_attack() - log_combat(user, M, "[nonharmfulhit ? "poked" : "attacked"]", src, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", important = !nonharmfulhit) + log_combat(user, target_mob, "[nonharmfulhit ? "poked" : "attacked"]", src, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", important = !nonharmfulhit) add_fingerprint(user) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 08cef4d647255..62d52b69f8606 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -115,7 +115,7 @@ SUBSYSTEM_DEF(traumas) "lizards" = typecacheof(list( /obj/item/toy/plush/lizard_plushie, /obj/item/food/kebab/tail, - /obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)), + /obj/item/organ/tail/lizard, /obj/item/reagent_containers/cup/glass/bottle/lizardwine)), "skeletons" = typecacheof(list( /obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone, @@ -205,7 +205,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/katana, /obj/item/food/sashimi, /obj/item/food/chawanmushi, - /obj/item/reagent_containers/food/drinks/bottle/sake, + /obj/item/reagent_containers/cup/glass/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/costume/kitty/genuine, /obj/item/clothing/suit/space/space_ninja, diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index 26d53369ea247..8195daac3be6b 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -151,10 +151,10 @@ have ways of interacting with a specific mob and control it. return top_force_item /datum/ai_controller/monkey/proc/IsEdible(obj/item/thing) - if(istype(thing, /obj/item/food)) + if(IS_EDIBLE(thing)) return TRUE - if(istype(thing, /obj/item/reagent_containers/food/drinks/drinkingglass)) - var/obj/item/reagent_containers/food/drinks/drinkingglass/glass = thing + if(istype(thing, /obj/item/reagent_containers/cup/glass/drinkingglass)) + var/obj/item/reagent_containers/cup/glass/drinkingglass/glass = thing if(glass.reagents.total_volume) // The glass has something in it, time to drink the mystery liquid! return TRUE return FALSE diff --git a/code/datums/components/crafting/crafting_lists/drinks.dm b/code/datums/components/crafting/crafting_lists/drinks.dm index 4749a97cdaff7..2b9aa8963ed3f 100644 --- a/code/datums/components/crafting/crafting_lists/drinks.dm +++ b/code/datums/components/crafting/crafting_lists/drinks.dm @@ -4,7 +4,7 @@ /datum/crafting_recipe/lizardwine name = "Lizard Wine" - result = /obj/item/reagent_containers/food/drinks/bottle/lizardwine + result = /obj/item/reagent_containers/cup/glass/bottle/lizardwine time = 4 SECONDS reqs = list( /obj/item/organ/tail/lizard = 1, @@ -14,20 +14,20 @@ /datum/crafting_recipe/moonshinejug name = "Moonshine Jug" - result = /obj/item/reagent_containers/food/drinks/bottle/moonshine + result = /obj/item/reagent_containers/cup/glass/bottle/moonshine time = 3 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /datum/reagent/consumable/ethanol/moonshine = 100 ) category = CAT_DRINK /datum/crafting_recipe/hoochbottle name = "Hooch Bottle" - result = /obj/item/reagent_containers/food/drinks/bottle/hooch + result = /obj/item/reagent_containers/cup/glass/bottle/hooch time = 3 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /obj/item/storage/box/papersack = 1, /datum/reagent/consumable/ethanol/hooch = 100 ) @@ -35,50 +35,50 @@ /datum/crafting_recipe/blazaambottle name = "Blazaam Bottle" - result = /obj/item/reagent_containers/food/drinks/bottle/blazaam + result = /obj/item/reagent_containers/cup/glass/bottle/blazaam time = 2 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /datum/reagent/consumable/ethanol/blazaam = 100 ) category = CAT_DRINK /datum/crafting_recipe/champagnebottle name = "Champagne Bottle" - result = /obj/item/reagent_containers/food/drinks/bottle/champagne + result = /obj/item/reagent_containers/cup/glass/bottle/champagne time = 3 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /datum/reagent/consumable/ethanol/champagne = 100 ) category = CAT_DRINK /datum/crafting_recipe/trappistbottle name = "Trappist Bottle" - result = /obj/item/reagent_containers/food/drinks/bottle/trappist + result = /obj/item/reagent_containers/cup/glass/bottle/trappist time = 1.5 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank/small = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank/small = 1, /datum/reagent/consumable/ethanol/trappist = 50 ) category = CAT_DRINK /datum/crafting_recipe/goldschlagerbottle name = "Goldschlager Bottle" - result = /obj/item/reagent_containers/food/drinks/bottle/goldschlager + result = /obj/item/reagent_containers/cup/glass/bottle/goldschlager time = 3 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /datum/reagent/consumable/ethanol/goldschlager = 100 ) category = CAT_DRINK /datum/crafting_recipe/patronbottle name = "Patron Bottle" - result = /obj/item/reagent_containers/food/drinks/bottle/patron + result = /obj/item/reagent_containers/cup/glass/bottle/patron time = 3 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /datum/reagent/consumable/ethanol/patron = 100 ) category = CAT_DRINK @@ -87,44 +87,44 @@ /datum/crafting_recipe/holybottle name = "Holy Water Flask" - result = /obj/item/reagent_containers/food/drinks/bottle/holywater + result = /obj/item/reagent_containers/cup/glass/bottle/holywater time = 3 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /datum/reagent/water/holywater = 100 ) category = CAT_DRINK /datum/crafting_recipe/unholybottle name = "Unholy Water Flask" - result = /obj/item/reagent_containers/food/drinks/bottle/unholywater + result = /obj/item/reagent_containers/cup/glass/bottle/unholywater time = 3 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /datum/reagent/fuel/unholywater = 100 ) category = CAT_DRINK /datum/crafting_recipe/nothingbottle name = "Nothing Bottle" - result = /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing + result = /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing time = 3 SECONDS reqs = list( - /obj/item/reagent_containers/food/drinks/bottle/blank = 1, + /obj/item/reagent_containers/cup/glass/bottle/blank = 1, /datum/reagent/consumable/nothing = 100 ) category = CAT_DRINK /datum/crafting_recipe/smallcarton name = "Small Carton" - result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton + result = /obj/item/reagent_containers/cup/glass/sillycup/smallcarton time = 1 SECONDS reqs = list(/obj/item/stack/sheet/cardboard = 1) category = CAT_DRINK /datum/crafting_recipe/honeycomb name = "Honeycomb" - result = /obj/item/reagent_containers/food/drinks/honeycomb + result = /obj/item/reagent_containers/cup/glass/honeycomb always_available = FALSE time = 3 SECONDS reqs = list(/datum/reagent/consumable/sugar = 50) diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm index 08a504aad342f..ffeccbf18c8b6 100644 --- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm +++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm @@ -43,7 +43,7 @@ name = "Egg bowl" result = /obj/item/food/salad/eggbowl reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/boiledrice = 1, /obj/item/food/boiledegg = 1, /obj/item/food/grown/carrot = 1, diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm index 1d79c9f3e02e3..9f2a00e44f707 100644 --- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm +++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm @@ -60,7 +60,7 @@ name = "Flavorless snowcone" result = /obj/item/food/snowcones reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15 ) subcategory = CAT_ICE @@ -69,7 +69,7 @@ name = "Pineapple snowcone" result = /obj/item/food/snowcones/pineapple reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/pineapplejuice = 5 ) @@ -79,7 +79,7 @@ name = "Lime snowcone" result = /obj/item/food/snowcones/lime reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/limejuice = 5 ) @@ -89,7 +89,7 @@ name = "Lemon snowcone" result = /obj/item/food/snowcones/lemon reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/lemonjuice = 5 ) @@ -99,7 +99,7 @@ name = "Apple snowcone" result = /obj/item/food/snowcones/apple reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/applejuice = 5 ) @@ -109,7 +109,7 @@ name = "Grape snowcone" result = /obj/item/food/snowcones/grape reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/berryjuice = 5 ) @@ -119,7 +119,7 @@ name = "Orange snowcone" result = /obj/item/food/snowcones/orange reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/orangejuice = 5 ) @@ -129,7 +129,7 @@ name = "Bluecherry snowcone" result = /obj/item/food/snowcones/blue reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/bluecherryjelly= 5 ) @@ -139,7 +139,7 @@ name = "Cherry snowcone" result = /obj/item/food/snowcones/red reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/cherryjelly= 5 ) @@ -149,7 +149,7 @@ name = "Berry snowcone" result = /obj/item/food/snowcones/berry reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/berryjuice = 5 ) @@ -159,7 +159,7 @@ name = "Fruit Salad snowcone" result = /obj/item/food/snowcones/fruitsalad reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/orangejuice = 5, @@ -172,7 +172,7 @@ name = "Mime snowcone" result = /obj/item/food/snowcones/mime reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/nothing = 5 ) @@ -182,7 +182,7 @@ name = "Clown snowcone" result = /obj/item/food/snowcones/clown reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/laughter = 5 ) @@ -192,7 +192,7 @@ name = "Space Cola snowcone" result = /obj/item/food/snowcones/soda reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/space_cola = 5 ) @@ -202,7 +202,7 @@ name = "Space Mountain Wind snowcone" result = /obj/item/food/snowcones/spacemountainwind reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/spacemountainwind = 5 ) @@ -212,7 +212,7 @@ name = "Pwrgame snowcone" result = /obj/item/food/snowcones/pwrgame reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/pwr_game = 15 ) @@ -222,7 +222,7 @@ name = "Honey snowcone" result = /obj/item/food/snowcones/honey reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/honey = 5 ) @@ -232,7 +232,7 @@ name = "Rainbow snowcone" result = /obj/item/food/snowcones/rainbow reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/cup/glass/sillycup = 1, /datum/reagent/consumable/ice = 15, /datum/reagent/colorful_reagent = 1 //Harder to make ) diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm index 0af7711c7cb0f..12113261ce161 100644 --- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm +++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm @@ -174,7 +174,7 @@ name = "Rice and Pork" result = /obj/item/food/salad/ricepork reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/boiledrice = 1, /obj/item/food/meat/cutlet = 2 ) diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm index 5953785747886..22bb4f42eafc0 100644 --- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm +++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm @@ -91,9 +91,9 @@ reqs = list( /datum/reagent/consumable/ethanol/vodka = 25, /obj/item/food/grown/holymelon = 1, - /obj/item/reagent_containers/food/drinks/bottle/vodka = 1 + /obj/item/reagent_containers/cup/glass/bottle/vodka = 1 ) - parts = list(/obj/item/reagent_containers/food/drinks/bottle/vodka = 1) + parts = list(/obj/item/reagent_containers/cup/glass/bottle/vodka = 1) subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/honeybar @@ -131,7 +131,7 @@ name = "Rice pudding" result = /obj/item/food/salad/ricepudding reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /datum/reagent/consumable/milk = 5, /datum/reagent/consumable/sugar = 5, /obj/item/food/boiledrice = 1 diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm index ab12f7d7725ae..40cc955bc89b3 100644 --- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm +++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm @@ -5,7 +5,7 @@ name = "Herb salad" result = /obj/item/food/salad/herbsalad reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/ambrosia/vulgaris = 3, /obj/item/food/grown/apple = 1 ) @@ -15,7 +15,7 @@ name = "Aesir salad" result = /obj/item/food/salad/aesirsalad reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/ambrosia/deus = 3, /obj/item/food/grown/apple/gold = 1 ) @@ -25,7 +25,7 @@ name = "Valid salad" result = /obj/item/food/salad/validsalad reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/ambrosia/vulgaris = 3, /obj/item/food/grown/potato = 1, /obj/item/food/meatball = 1 @@ -39,7 +39,7 @@ /datum/reagent/consumable/flour = 5, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/monkeycube = 1, /obj/item/food/grown/banana = 1 ) @@ -62,7 +62,7 @@ name = "Fruit salad" result = /obj/item/food/salad/fruit reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/apple = 1, /obj/item/food/grown/grapes = 1, /obj/item/food/grown/citrus/orange = 1, @@ -75,7 +75,7 @@ name = "Jungle salad" result = /obj/item/food/salad/jungle reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/apple = 1, /obj/item/food/grown/grapes = 1, /obj/item/food/grown/banana = 2, @@ -87,7 +87,7 @@ name = "Citrus delight" result = /obj/item/food/salad/citrusdelight reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/citrus/lime = 1, /obj/item/food/grown/citrus/lemon = 1, /obj/item/food/grown/citrus/orange = 1 diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm index b3007f054d364..09e661f555543 100644 --- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm +++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm @@ -6,7 +6,7 @@ result = /obj/item/food/soup/oatmeal reqs = list( /datum/reagent/consumable/milk = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/oat = 1 ) subcategory = CAT_SOUP @@ -16,7 +16,7 @@ result = /obj/item/food/soup/meatball reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/meatball = 1, /obj/item/food/grown/carrot = 1, /obj/item/food/grown/potato = 1 @@ -28,7 +28,7 @@ result = /obj/item/food/soup/vegetable reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/carrot = 1, /obj/item/food/grown/corn = 1, /obj/item/food/grown/eggplant = 1, @@ -41,7 +41,7 @@ result = /obj/item/food/soup/nettle reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/nettle = 1, /obj/item/food/grown/potato = 1, /obj/item/food/boiledegg = 1 @@ -52,7 +52,7 @@ name = "Wingfangchu" result = /obj/item/food/soup/wingfangchu reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /datum/reagent/consumable/soysauce = 5, /obj/item/food/meat/cutlet/xeno = 2 ) @@ -63,7 +63,7 @@ result= /obj/item/food/soup/wish reqs = list( /datum/reagent/water = 20, - /obj/item/reagent_containers/glass/bowl = 1 + /obj/item/reagent_containers/cup/bowl = 1 ) subcategory = CAT_SOUP @@ -71,7 +71,7 @@ name = "Hot chili" result = /obj/item/food/soup/hotchili reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/meat/cutlet = 2, /obj/item/food/grown/chili = 1, /obj/item/food/grown/tomato = 1 @@ -82,7 +82,7 @@ name = "Cold chili" result = /obj/item/food/soup/coldchili reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/meat/cutlet = 2, /obj/item/food/grown/icepepper = 1, /obj/item/food/grown/tomato = 1 @@ -94,7 +94,7 @@ result = /obj/item/food/soup/tomato reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/tomato = 2 ) subcategory = CAT_SOUP @@ -104,7 +104,7 @@ result = /obj/item/food/soup/tomato/eyeball reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/tomato = 2, /obj/item/organ/eyes = 1 ) @@ -115,7 +115,7 @@ result = /obj/item/food/soup/miso reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/soydope = 2, /obj/item/food/tofu = 2 ) @@ -126,7 +126,7 @@ result = /obj/item/food/soup/blood reqs = list( /datum/reagent/blood = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/tomato/blood = 2 ) subcategory = CAT_SOUP @@ -137,7 +137,7 @@ reqs = list( /datum/reagent/water = 10, /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/glass/bowl = 1 + /obj/item/reagent_containers/cup/bowl = 1 ) subcategory = CAT_SOUP @@ -146,7 +146,7 @@ result = /obj/item/food/soup/clownstears reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/banana = 1, /obj/item/stack/sheet/mineral/bananium = 1 ) @@ -157,7 +157,7 @@ result = /obj/item/food/soup/mystery reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/badrecipe = 1, /obj/item/food/tofu = 1, /obj/item/food/boiledegg = 1, @@ -171,7 +171,7 @@ reqs = list( /datum/reagent/consumable/milk = 5, /datum/reagent/water = 5, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/mushroom/chanterelle = 1 ) subcategory = CAT_SOUP @@ -181,7 +181,7 @@ result = /obj/item/food/soup/beet reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/whitebeet = 1, /obj/item/food/grown/cabbage = 1, ) @@ -192,7 +192,7 @@ result = /obj/item/food/soup/stew reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/tomato = 1, /obj/item/food/meat/cutlet = 3, /obj/item/food/grown/potato = 1, @@ -207,7 +207,7 @@ result = /obj/item/food/soup/spacylibertyduff reqs = list( /datum/reagent/consumable/ethanol/vodka = 5, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/mushroom/libertycap = 3 ) subcategory = CAT_SOUP @@ -217,7 +217,7 @@ result = /obj/item/food/soup/amanitajelly reqs = list( /datum/reagent/consumable/ethanol/vodka = 5, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/mushroom/amanita = 3 ) subcategory = CAT_SOUP @@ -228,7 +228,7 @@ reqs = list( /datum/reagent/water = 10, /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/potato/sweet = 2 ) subcategory = CAT_SOUP @@ -238,7 +238,7 @@ result = /obj/item/food/soup/beet/red reqs = list( /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/redbeet = 1, /obj/item/food/grown/cabbage = 1 ) @@ -248,9 +248,9 @@ name = "Bisque" result = /obj/item/food/soup/bisque reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/meat/crab = 1, /obj/item/food/boiledrice = 1 ) @@ -262,7 +262,7 @@ reqs = list( /datum/reagent/water = 5, /datum/reagent/consumable/cream = 5, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/chili = 1, /obj/item/food/grown/bungofruit = 1 ) @@ -274,7 +274,7 @@ reqs = list( /datum/reagent/water = 10, /datum/reagent/consumable/sodiumchloride = 5, - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/grown/mushroom/jupitercup = 1 ) subcategory = CAT_SOUP diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm index 60f0c1f093b85..d21436fc59c67 100644 --- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm +++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm @@ -40,7 +40,7 @@ name = "Beef noodle" result = /obj/item/food/spaghetti/beefnoodle reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/cup/bowl = 1, /obj/item/food/spaghetti/boiledspaghetti = 1, /obj/item/food/meat/cutlet = 2, /obj/item/food/grown/cabbage = 1 diff --git a/code/datums/components/crafting/crafting_lists/misc.dm b/code/datums/components/crafting/crafting_lists/misc.dm index 44c524db78190..1fde5d3a2cbbe 100644 --- a/code/datums/components/crafting/crafting_lists/misc.dm +++ b/code/datums/components/crafting/crafting_lists/misc.dm @@ -311,7 +311,7 @@ /datum/crafting_recipe/paper_cup name= "Paper Cup" - result = /obj/item/reagent_containers/food/drinks/sillycup + result = /obj/item/reagent_containers/cup/glass/sillycup time = 1 SECONDS tools = list(TOOL_WIRECUTTER) reqs = list(/obj/item/paper = 1) diff --git a/code/datums/components/crafting/crafting_lists/primal.dm b/code/datums/components/crafting/crafting_lists/primal.dm index 5bbb930118f4d..8aecf2931c108 100644 --- a/code/datums/components/crafting/crafting_lists/primal.dm +++ b/code/datums/components/crafting/crafting_lists/primal.dm @@ -268,7 +268,7 @@ /datum/crafting_recipe/mushroom_bowl name = "Mushroom Bowl" - result = /obj/item/reagent_containers/glass/bowl/mushroom_bowl + result = /obj/item/reagent_containers/cup/bowl/mushroom_bowl time = 3 SECONDS reqs = list(/obj/item/food/grown/ash_flora/shavings = 5) category = CAT_PRIMAL diff --git a/code/datums/components/crafting/crafting_lists/robots.dm b/code/datums/components/crafting/crafting_lists/robots.dm index 11fc03c3490ab..32d87f82c6c73 100644 --- a/code/datums/components/crafting/crafting_lists/robots.dm +++ b/code/datums/components/crafting/crafting_lists/robots.dm @@ -39,7 +39,7 @@ result = /mob/living/simple_animal/bot/cleanbot time = 4 SECONDS reqs = list( - /obj/item/reagent_containers/glass/bucket = 1, + /obj/item/reagent_containers/cup/bucket = 1, /obj/item/assembly/prox_sensor = 1, /obj/item/bodypart/r_arm/robot = 1 ) diff --git a/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm b/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm index 59d66457b5433..af1eefd2cd594 100644 --- a/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm +++ b/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm @@ -9,9 +9,9 @@ /datum/reagent/fuel = 50, /obj/item/stack/cable_coil = 1, /obj/item/assembly/igniter = 1, - /obj/item/reagent_containers/food/drinks/soda_cans = 1 + /obj/item/reagent_containers/cup/soda_cans = 1 ) - parts = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1) + parts = list(/obj/item/reagent_containers/cup/soda_cans = 1) category = CAT_WEAPONRY subcategory = CAT_WEAPON dangerous_craft = TRUE @@ -47,13 +47,13 @@ /datum/crafting_recipe/molotov name = "Molotov" - result = /obj/item/reagent_containers/food/drinks/bottle/molotov + result = /obj/item/reagent_containers/cup/glass/bottle/molotov time = 4 SECONDS reqs = list( - /obj/item/reagent_containers/glass/rag = 1, - /obj/item/reagent_containers/food/drinks/bottle = 1 + /obj/item/reagent_containers/cup/rag = 1, + /obj/item/reagent_containers/cup/glass/bottle = 1 ) - parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1) + parts = list(/obj/item/reagent_containers/cup/glass/bottle = 1) category = CAT_WEAPONRY subcategory = CAT_WEAPON dangerous_craft = TRUE diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index c5e2c255b9c05..32bdf25d2066e 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -324,11 +324,7 @@ Behavior that's still missing from this component that original food items had t else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat eater.visible_message("[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!", "You cannot force any more of \the [parent] to go down your throat!") return - - - - - + else //If you're feeding it to someone else. if(isbrain(eater)) to_chat(feeder, "[eater] doesn't seem to have a mouth!") diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm index c839dc18d2dfb..9d809165a1d91 100644 --- a/code/datums/components/infective.dm +++ b/code/datums/components/infective.dm @@ -33,6 +33,8 @@ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack)) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(try_infect_equipped)) RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(try_infect_eat)) + if(istype(parent, /obj/item/reagent_containers/cup)) + RegisterSignal(parent, COMSIG_GLASS_DRANK, PROC_REF(try_infect_drink)) else if(istype(parent, /obj/effect/decal/cleanable/blood/gibs)) RegisterSignal(parent, COMSIG_GIBS_STREAK, PROC_REF(try_infect_streak)) @@ -43,7 +45,18 @@ eater.ForceContractDisease(V) try_infect(feeder, BODY_ZONE_L_ARM) +/datum/component/infective/proc/try_infect_drink(datum/source, mob/living/drinker, mob/living/feeder) + SIGNAL_HANDLER + + for(var/disease in diseases) + drinker.ForceContractDisease(disease) + var/appendage_zone = feeder.held_items.Find(source) + appendage_zone = appendage_zone == 0 ? BODY_ZONE_CHEST : appendage_zone % 2 ? BODY_ZONE_R_ARM : BODY_ZONE_L_ARM + try_infect(feeder, appendage_zone) + /datum/component/infective/proc/clean(datum/source, clean_types) + SIGNAL_HANDLER + if(clean_types & required_clean_types) qdel(src) return TRUE diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index aeae6ab3eced1..0b100b4000541 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -107,9 +107,9 @@ /datum/component/storage/concrete/pockets/helmet/Initialize() . = ..() - can_hold = typecacheof(list(/obj/item/reagent_containers/food/drinks/bottle/vodka, - /obj/item/reagent_containers/food/drinks/bottle/molotov, - /obj/item/reagent_containers/food/drinks/drinkingglass, + can_hold = typecacheof(list(/obj/item/reagent_containers/cup/glass/bottle/vodka, + /obj/item/reagent_containers/cup/glass/bottle/molotov, + /obj/item/reagent_containers/cup/glass/drinkingglass, /obj/item/ammo_box/a762)) /datum/component/storage/concrete/pockets/void_cloak diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm index cbb1f5ea64ca9..30a4fb400191b 100644 --- a/code/datums/components/udder.dm +++ b/code/datums/components/udder.dm @@ -48,7 +48,7 @@ SIGNAL_HANDLER var/mob/living/milked = parent - if(milked.stat == CONSCIOUS && istype(milking_tool, /obj/item/reagent_containers/glass)) + if(milked.stat == CONSCIOUS && istype(milking_tool, /obj/item/reagent_containers/cup)) udder.milk(milking_tool, user) if(on_milk_callback) on_milk_callback.Invoke(udder.reagents.total_volume, udder.reagents.maximum_volume) @@ -112,10 +112,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/udder) * Proc called from attacking the component parent with the correct item, moves reagents into the glass basically. * * Arguments: - * * obj/item/reagent_containers/glass/milk_holder - what we are trying to transfer the reagents to + * * obj/item/reagent_containers/cup/milk_holder - what we are trying to transfer the reagents to * * mob/user - who is trying to do this */ -/obj/item/udder/proc/milk(obj/item/reagent_containers/glass/milk_holder, mob/user) +/obj/item/udder/proc/milk(obj/item/reagent_containers/cup/milk_holder, mob/user) if(milk_holder.reagents.total_volume >= milk_holder.volume) to_chat(user, "[milk_holder] is full.") return diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index f50c971df5574..984492979b8e2 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -273,7 +273,7 @@ cure_text = "Something that would kill off the tiny cats." spread_text = "Acute" disease_flags = CURABLE|CAN_CARRY|CAN_RESIST - cures = list(/datum/reagent/consumable/cocoa, /datum/reagent/consumable/cocoa/hot_cocoa) //kills all the tiny cats that infected your organism + cures = list(/datum/reagent/consumable/cocoa, /datum/reagent/consumable/hot_cocoa) //kills all the tiny cats that infected your organism cure_chance = 25 stage_prob = 3 agent = "Nano-feline Toxoplasmosis" diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 9d629931bd06d..6d83539f7fc31 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -165,11 +165,28 @@ /datum/mood_event/sec_insulated_gloves description = "I look like an Assistant..." mood_change = -1 + /datum/mood_event/burnt_wings description = "MY PRECIOUS WINGS!!!" mood_change = -10 timeout = 10 MINUTES +/datum/mood_event/soda_spill + description = "Cool! That's fine, I wanted to wear that soda, not drink it..." + mood_change = -2 + timeout = 1 MINUTES + +/datum/mood_event/observed_soda_spill + description = "Ahaha! It's always funny to see someone get sprayed by a can of soda." + mood_change = 2 + timeout = 30 SECONDS + +/datum/mood_event/observed_soda_spill/add_effects(mob/spilled_mob, atom/soda_can) + if(!spilled_mob) + return + + description = "Ahaha! [spilled_mob] spilled [spilled_mob.p_their()] [soda_can ? soda_can.name : "soda"] all over [spilled_mob.p_them()]self! Classic." + /datum/mood_event/feline_dysmorphia description = "I'm so ugly. I wish I was cuter!" mood_change = -10 diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index 8151b8b548ba3..8f756088a0bd0 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -28,7 +28,7 @@ var/obj/item/pizzabox/pizza_to_spawn = pick(list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, /obj/item/pizzabox/vegetable)) //no pineapple pizza you monster new pizza_to_spawn(toLaunch) for(var/i in 1 to 6) - new /obj/item/reagent_containers/food/drinks/beer(toLaunch) + new /obj/item/reagent_containers/cup/glass/bottle/beer(toLaunch) new /obj/effect/pod_landingzone(T, toLaunch) /datum/station_trait/galactic_grant diff --git a/code/datums/traits/negative_quirk.dm b/code/datums/traits/negative_quirk.dm index d915ed9d07681..52c9026563411 100644 --- a/code/datums/traits/negative_quirk.dm +++ b/code/datums/traits/negative_quirk.dm @@ -151,17 +151,17 @@ if(JOB_NAME_MIME) heirloom_type = /obj/item/food/baguette/mime if(JOB_NAME_JANITOR) - heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket) + heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/cup/bucket) if(JOB_NAME_COOK) - heirloom_type = pick(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/utility/chefhat) + heirloom_type = pick(/obj/item/reagent_containers/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/utility/chefhat) if(JOB_NAME_BOTANIST) - heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie) + heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/cup/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie) if(JOB_NAME_BARTENDER) - heirloom_type = pick(/obj/item/reagent_containers/glass/rag, /obj/item/clothing/head/hats/tophat, /obj/item/reagent_containers/food/drinks/shaker) + heirloom_type = pick(/obj/item/reagent_containers/cup/rag, /obj/item/clothing/head/hats/tophat, /obj/item/reagent_containers/cup/glass/shaker) if(JOB_NAME_CURATOR) heirloom_type = pick(/obj/item/pen/fountain, /obj/item/storage/pill_bottle/dice) if(JOB_NAME_CHAPLAIN) - heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater) + heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/cup/glass/bottle/holywater) if(JOB_NAME_ASSISTANT) heirloom_type = pick(/obj/item/heirloomtoolbox, /obj/item/clothing/gloves/cut/heirloom) if(JOB_NAME_BARBER) @@ -170,7 +170,7 @@ heirloom_type = /obj/item/gun/magic/wand //Security/Command if(JOB_NAME_CAPTAIN) - heirloom_type = /obj/item/reagent_containers/food/drinks/flask/gold + heirloom_type = /obj/item/reagent_containers/cup/glass/flask/gold if(JOB_NAME_HEADOFSECURITY) heirloom_type = /obj/item/book/manual/wiki/security_space_law if(JOB_NAME_WARDEN) @@ -178,7 +178,7 @@ if(JOB_NAME_SECURITYOFFICER) heirloom_type = pick(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec) if(JOB_NAME_DETECTIVE) - heirloom_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey + heirloom_type = /obj/item/reagent_containers/cup/glass/bottle/whiskey if(JOB_NAME_LAWYER) heirloom_type = pick(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law) if(JOB_NAME_BRIGPHYSICIAN) @@ -198,7 +198,7 @@ if(JOB_NAME_PARAMEDIC) heirloom_type = pick(/obj/item/flashlight/pen, /obj/item/sensor_device) if(JOB_NAME_CHEMIST) - heirloom_type = /obj/item/reagent_containers/glass/chem_heirloom + heirloom_type = /obj/item/reagent_containers/cup/chem_heirloom if(JOB_NAME_VIROLOGIST) heirloom_type = /obj/item/reagent_containers/dropper if(JOB_NAME_GENETICIST) @@ -242,8 +242,8 @@ var/family_name = names[names.len] heirloom.AddComponent(/datum/component/heirloom, quirk_holder, family_name) - if(istype(heirloom, /obj/item/reagent_containers/glass/chem_heirloom)) //Edge case for chem_heirloom. Solution to component not being present on init. - var/obj/item/reagent_containers/glass/chem_heirloom/H = heirloom + if(istype(heirloom, /obj/item/reagent_containers/cup/chem_heirloom)) //Edge case for chem_heirloom. Solution to component not being present on init. + var/obj/item/reagent_containers/cup/chem_heirloom/H = heirloom H.update_name() /datum/quirk/family_heirloom/on_process() @@ -623,16 +623,16 @@ medical_record_text = "Patient is an alcohol abuser." process = TRUE var/where_drink //Where the bottle spawned - var/drink_types = list(/obj/item/reagent_containers/food/drinks/bottle/ale, - /obj/item/reagent_containers/food/drinks/bottle/beer, - /obj/item/reagent_containers/food/drinks/bottle/gin, - /obj/item/reagent_containers/food/drinks/bottle/whiskey, - /obj/item/reagent_containers/food/drinks/bottle/vodka, - /obj/item/reagent_containers/food/drinks/bottle/rum, - /obj/item/reagent_containers/food/drinks/bottle/applejack) + var/drink_types = list(/obj/item/reagent_containers/cup/glass/bottle/ale, + /obj/item/reagent_containers/cup/glass/bottle/beer, + /obj/item/reagent_containers/cup/glass/bottle/gin, + /obj/item/reagent_containers/cup/glass/bottle/whiskey, + /obj/item/reagent_containers/cup/glass/bottle/vodka, + /obj/item/reagent_containers/cup/glass/bottle/rum, + /obj/item/reagent_containers/cup/glass/bottle/applejack) var/need = 0 // How much they crave alcohol at the moment var/tick_number = 0 // Keeping track of how many ticks have passed between a check - var/obj/item/reagent_containers/food/drinks/bottle/drink_instance + var/obj/item/reagent_containers/cup/glass/bottle/drink_instance /datum/quirk/alcoholic/on_spawn() drink_instance = read_choice_preference(/datum/preference/choiced/quirk/alcohol_type) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f7ed53101fde0..3e597f42e9fd4 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -677,6 +677,21 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom) SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) +/** + * Called when a mob examines (shift click or verb) this atom twice (or more) within EXAMINE_MORE_WINDOW (default 1 second) + * + * This is where you can put extra information on something that may be superfluous or not important in critical gameplay + * moments, while allowing people to manually double-examine to take a closer look + * + * Produces a signal [COMSIG_PARENT_EXAMINE_MORE] + */ +/atom/proc/examine_more(mob/user) + SHOULD_CALL_PARENT(TRUE) + RETURN_TYPE(/list) + + . = list() + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .) + /** * Updates the appearance of the icon * diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 3ba465848e8c6..a61e6ce240743 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -76,7 +76,7 @@ efficiency = 0 reagents.maximum_volume = 0 fleshamnt = 1 - for(var/obj/item/reagent_containers/glass/G in component_parts) + for(var/obj/item/reagent_containers/cup/G in component_parts) reagents.maximum_volume += G.volume G.reagents.trans_to(src, G.reagents.total_volume) for(var/obj/item/stock_parts/scanning_module/S in component_parts) @@ -584,7 +584,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/clonepod) playsound(src,'sound/hallucinations/wail.ogg', 100, TRUE) /obj/machinery/clonepod/deconstruct(disassembled = TRUE) - for(var/obj/item/reagent_containers/glass/G in component_parts) + for(var/obj/item/reagent_containers/cup/G in component_parts) reagents.trans_to(G, G.reagents.maximum_volume) if(occupant) var/mob/living/mob_occupant = occupant diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm index d13be687a01b4..6038e1d014769 100644 --- a/code/game/machinery/computer/arena.dm +++ b/code/game/machinery/computer/arena.dm @@ -330,7 +330,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/computer/arena) var/arena_turfs = get_arena_turfs() for(var/mob/living/L in GLOB.mob_living_list) if(L.stat != DEAD && (get_turf(L) in arena_turfs)) - var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/G = new(get_turf(L)) + var/obj/item/reagent_containers/cup/glass/trophy/gold_cup/G = new(get_turf(L)) G.name = "[L.real_name]'s Trophy" /obj/machinery/computer/arena/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state) diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index bdbea0b866264..3a79d2ba755aa 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -13,8 +13,8 @@ var/static/list/collectable_items = list( /obj/item/trash/waffles, /obj/item/trash/tray, - /obj/item/reagent_containers/glass/bowl, - /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/reagent_containers/cup/bowl, + /obj/item/reagent_containers/cup/glass/drinkingglass, /obj/item/kitchen/fork, /obj/item/shard, /obj/item/broken_bottle diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index db82e63c621f9..4bf206dfc2fdf 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -14,9 +14,9 @@ var/static/list/drip_containers = typecacheof(list( /obj/item/reagent_containers/blood, /obj/item/reagent_containers/chem_bag, - /obj/item/reagent_containers/food/drinks, + /obj/item/reagent_containers/cup, /obj/item/food, //Fuck it. You want to stab an IV into that 100u blood tomato? Be my guest. - /obj/item/reagent_containers/glass + /obj/item/reagent_containers/cup ) ) var/can_convert = TRUE // If it can be made into an anesthetic machine or not @@ -264,7 +264,7 @@ /obj/machinery/iv_drip/saline/Initialize(mapload) . = ..() - beaker = new /obj/item/reagent_containers/glass/saline(src) + beaker = new /obj/item/reagent_containers/cup/saline(src) /obj/machinery/iv_drip/saline/ComponentInitialize() . = ..() diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 2122eede48407..15afdf7e788e3 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -57,8 +57,8 @@ popup.open() /obj/machinery/limbgrower/on_deconstruction() - for(var/obj/item/reagent_containers/glass/G in component_parts) - reagents.trans_to(G, G.reagents.maximum_volume) + for(var/obj/item/reagent_containers/cup/our_beaker in component_parts) + reagents.trans_to(our_beaker, our_beaker.reagents.maximum_volume) ..() /obj/machinery/limbgrower/attackby(obj/item/O, mob/user, params) @@ -155,9 +155,9 @@ /obj/machinery/limbgrower/RefreshParts() reagents.maximum_volume = 0 - for(var/obj/item/reagent_containers/glass/G in component_parts) - reagents.maximum_volume += G.volume - G.reagents.trans_to(src, G.reagents.total_volume) + for(var/obj/item/reagent_containers/cup/our_beaker in component_parts) + reagents.maximum_volume += our_beaker.volume + our_beaker.reagents.trans_to(src, our_beaker.reagents.total_volume) var/T=1.2 for(var/obj/item/stock_parts/manipulator/M in component_parts) T -= M.rating*0.2 diff --git a/code/game/machinery/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm index 54a919f2bcdd5..4c7981427cfb5 100644 --- a/code/game/machinery/newscaster/newspaper.dm +++ b/code/game/machinery/newscaster/newspaper.dm @@ -29,7 +29,7 @@ I am begging someone to remake this to be more like the paper UI, it's so bad. user.visible_message("[user] is focusing intently on [src]! It looks like [user.p_theyre()] trying to commit sudoku... until [user.p_their()] eyes light up with realization!") user.say(";JOURNALISM IS MY CALLING! EVERYBODY APPRECIATES UNBIASED REPORTI-GLORF", forced="newspaper suicide") var/mob/living/carbon/human/H = user - var/obj/W = new /obj/item/reagent_containers/food/drinks/bottle/whiskey(H.loc) + var/obj/W = new /obj/item/reagent_containers/cup/glass/bottle/whiskey(H.loc) playsound(H.loc, 'sound/items/drink.ogg', rand(10,50), TRUE) W.reagents.trans_to(H, W.reagents.total_volume, transfered_by = user) user.visible_message("[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!") diff --git a/code/game/machinery/sleeper.dm b/code/game/machinery/sleeper.dm index aad043793efa0..bab45ce63be5b 100644 --- a/code/game/machinery/sleeper.dm +++ b/code/game/machinery/sleeper.dm @@ -100,7 +100,7 @@ icon_state = "[initial(icon_state)][state_open ? "-open" : ""]" /obj/machinery/sleeper/attackby(obj/item/I, mob/living/user, params) - if ((istype(I, /obj/item/reagent_containers/glass) \ + if ((istype(I, /obj/item/reagent_containers/cup) \ || istype(I, /obj/item/reagent_containers/chem_bag)) \ && user.a_intent != INTENT_HARM) if (length(inserted_vials) >= max_vials) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index fb24f329629fb..4683a8e6e0add 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -444,12 +444,12 @@ var/list/reactants = list() - for(var/obj/item/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/cup/G in beakers) reactants += G.reagents for(var/obj/item/slime_extract/S in beakers) if(S.Uses) - for(var/obj/item/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/cup/G in beakers) G.reagents.trans_to(S, G.reagents.total_volume) if(S?.reagents?.total_volume) @@ -476,7 +476,7 @@ B.forceMove(drop_location()) beakers -= B return - else if(istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/glass/bottle)) + else if(istype(I, /obj/item/reagent_containers/cup/beaker) || istype(I, /obj/item/reagent_containers/cup/bottle)) if(beakers.len < max_beakers) if(!user.transferItemToLoc(I, src)) return @@ -506,7 +506,7 @@ if(istype(G, /obj/item/grenade/chem_grenade/adv_release)) time_release += 50 // A typical bomb, using basic beakers, will explode over 2-4 seconds. Using two will make the reaction last for less time, but it will be more dangerous overall. - for(var/obj/item/reagent_containers/glass/B in G) + for(var/obj/item/reagent_containers/cup/B in G) if(beakers.len < max_beakers) beakers += B B.forceMove(src) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index d7e77c26c4fd7..2aa9564b3f17f 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -413,7 +413,7 @@ GLOBAL_LIST_INIT(dye_registry, list( to_chat(user, "You need more space cleaner!") return TRUE - else if(istype(W, /obj/item/soap) || istype(W, /obj/item/reagent_containers/glass/rag)) + else if(istype(W, /obj/item/soap) || istype(W, /obj/item/reagent_containers/cup/rag)) var/cleanspeed = 50 if(istype(W, /obj/item/soap)) var/obj/item/soap/used_soap = W diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 59d70bfce96d8..ec726df449cc9 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -41,7 +41,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable) return TRUE /obj/effect/decal/cleanable/attackby(obj/item/W, mob/user, params) - if((istype(W, /obj/item/reagent_containers/glass) && !istype(W, /obj/item/reagent_containers/glass/rag)) || istype(W, /obj/item/reagent_containers/food/drinks)) + if((istype(W, /obj/item/reagent_containers/cup) && !istype(W, /obj/item/reagent_containers/cup/rag)) || istype(W, /obj/item/reagent_containers/cup/glass)) if(src.reagents && W.reagents) . = 1 //so the containers don't splash their content on the src while scooping. if(!src.reagents.total_volume) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index ccdb8b598f528..7ab8ade9e96fc 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -521,7 +521,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/landmark/ruin) if(prob(70)) var/bottle_count = pick(10;1, 5;2, 2;3) for(var/index in 1 to bottle_count) - var/obj/item/reagent_containers/food/drinks/beer/almost_empty/B = new(get_turf(src)) + var/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty/B = new(get_turf(src)) B.pixel_x += rand(-6, 6) B.pixel_y += rand(-6, 6) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index b29a67d9a7b2b..d1d3f705241e2 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -89,7 +89,7 @@ RSF switch(mode) if(1) to_chat(user, "Dispensing Drinking Glass...") - new /obj/item/reagent_containers/food/drinks/drinkingglass(T) + new /obj/item/reagent_containers/cup/glass/drinkingglass(T) use_matter(20, user) if(2) to_chat(user, "Dispensing Paper Sheet...") diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index b5fde44df77be..9826d0a85276c 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -177,7 +177,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM else return ..() -/obj/item/clothing/mask/cigarette/proc/dip(obj/item/reagent_containers/glass/glass, mob/user, proximity) +/obj/item/clothing/mask/cigarette/proc/dip(obj/item/reagent_containers/cup/glass, mob/user, proximity) if(!proximity || lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead) return if(istype(glass)) //you can dip cigarettes into beakers diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 7dd6f4283e877..f6149dafa8299 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -416,7 +416,7 @@ req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, - /obj/item/reagent_containers/glass/beaker = 2) + /obj/item/reagent_containers/cup/beaker = 2) /obj/item/circuitboard/machine/circuit_imprinter/department name = "departmental circuit imprinter (Machine Board)" @@ -451,7 +451,7 @@ req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 2, - /obj/item/reagent_containers/glass/beaker = 2) + /obj/item/reagent_containers/cup/beaker = 2) /obj/item/circuitboard/machine/protolathe/department name = "departmental protolathe (Machine Board)" @@ -519,7 +519,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 2, - /obj/item/reagent_containers/glass/beaker = 2) + /obj/item/reagent_containers/cup/beaker = 2) /obj/item/circuitboard/machine/techfab/department name = "departmental techfab (Machine Board)" @@ -704,11 +704,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge) build_path = /obj/machinery/chem_master desc = "You can turn the \"mode selection\" dial using a screwdriver." req_components = list( - /obj/item/reagent_containers/glass/beaker = 2, + /obj/item/reagent_containers/cup/beaker = 2, /obj/item/stock_parts/manipulator = 1, /obj/item/stack/sheet/glass = 1) def_components = list( - /obj/item/reagent_containers/glass/beaker = /obj/item/reagent_containers/glass/beaker/large) + /obj/item/reagent_containers/cup/beaker = /obj/item/reagent_containers/cup/beaker/large) needs_anchored = FALSE /obj/item/circuitboard/machine/chem_master/attackby(obj/item/I, mob/user, params) @@ -735,7 +735,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge) /obj/item/stock_parts/scanning_module = 2, /obj/item/stock_parts/manipulator = 2, /obj/item/stack/sheet/glass = 1, - /obj/item/reagent_containers/glass/beaker = 2) + /obj/item/reagent_containers/cup/beaker = 2) /obj/item/circuitboard/machine/clonepod/experimental name = "experimental clone pod (Machine Board)" @@ -782,7 +782,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge) build_path = /obj/machinery/limbgrower req_components = list( /obj/item/stock_parts/manipulator = 1, - /obj/item/reagent_containers/glass/beaker = 2, + /obj/item/reagent_containers/cup/beaker = 2, /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/protolathe/department/medical diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index fccd2d2a0d98f..24a721c1345ee 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -210,7 +210,7 @@ flip_cooldown = world.time + 7 //canned laughter -/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter +/obj/item/reagent_containers/cup/soda_cans/canned_laughter name = "Canned Laughter" desc = "Just looking at this makes you want to giggle." icon_state = "laughter" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index fe483c15e7822..c108bb13bf0c3 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -1267,7 +1267,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/extrapolator) if(user.get_active_held_item() != src) to_chat(user, "The extrapolator must be held in your active hand to work!") return - var/obj/item/reagent_containers/glass/bottle/culture_bottle = new(user.drop_location()) + var/obj/item/reagent_containers/cup/bottle/culture_bottle = new(user.drop_location()) culture_bottle.name = "[disease.name] culture bottle" culture_bottle.desc = "A small bottle. Contains [disease.agent] culture in synthblood medium." culture_bottle.reagents.add_reagent(/datum/reagent/blood, 20, data) diff --git a/code/game/objects/items/food/donuts.dm b/code/game/objects/items/food/donuts.dm index cf5c9231a313c..8a454957b507c 100644 --- a/code/game/objects/items/food/donuts.dm +++ b/code/game/objects/items/food/donuts.dm @@ -164,7 +164,7 @@ food_reagents = list( /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3, - /datum/reagent/consumable/cocoa/hot_cocoa = 3, + /datum/reagent/consumable/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1 ) //the cocoa reagent is just bitter. tastes = list("donut" = 4, "bitterness" = 1) @@ -293,7 +293,7 @@ food_reagents = list( /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3, - /datum/reagent/consumable/cocoa/hot_cocoa = 3, + /datum/reagent/consumable/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1 ) //the coco reagent is just bitter. @@ -413,7 +413,7 @@ food_reagents = list( /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3, - /datum/reagent/consumable/cocoa/hot_cocoa = 3, + /datum/reagent/consumable/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1 ) //the cocoa reagent is just bitter. diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm index fd0f23c9853bc..ccec83065a083 100644 --- a/code/game/objects/items/food/frozen.dm +++ b/code/game/objects/items/food/frozen.dm @@ -79,7 +79,7 @@ icon = 'icons/obj/food/frozen_treats.dmi' icon_state = "flavorless_sc" w_class = WEIGHT_CLASS_SMALL - trash_type = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups + trash_type = /obj/item/reagent_containers/cup/glass/sillycup //We dont eat paper cups food_reagents = list( /datum/reagent/water = 11 // We dont get food for water/juices ) diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm index 096ab53d80e56..43f364a22fe7c 100644 --- a/code/game/objects/items/food/salad.dm +++ b/code/game/objects/items/food/salad.dm @@ -2,7 +2,7 @@ ////////////////////////////////////////////SALAD//////////////////////////////////////////// /obj/item/food/salad icon = 'icons/obj/food/soupsalad.dmi' - trash_type = /obj/item/reagent_containers/glass/bowl + trash_type = /obj/item/reagent_containers/cup/bowl bite_consumption = 3 w_class = WEIGHT_CLASS_NORMAL food_reagents = list( @@ -144,7 +144,7 @@ foodtypes = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017 -/obj/item/reagent_containers/glass/bowl +/obj/item/reagent_containers/cup/bowl name = "bowl" desc = "A simple bowl, used for soups and salads." icon = 'icons/obj/food/soupsalad.dmi' @@ -154,7 +154,7 @@ w_class = WEIGHT_CLASS_NORMAL custom_price = PAYCHECK_EASY * 0.6 -/obj/item/reagent_containers/glass/bowl/Initialize(mapload) +/obj/item/reagent_containers/cup/bowl/Initialize(mapload) . = ..() AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/salad/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6) diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm index 7566017be65c0..e673e53bfbb8a 100644 --- a/code/game/objects/items/food/soup.dm +++ b/code/game/objects/items/food/soup.dm @@ -1,7 +1,7 @@ /obj/item/food/soup w_class = WEIGHT_CLASS_NORMAL icon = 'icons/obj/food/soupsalad.dmi' - trash_type = /obj/item/reagent_containers/glass/bowl + trash_type = /obj/item/reagent_containers/cup/bowl bite_consumption = 5 max_volume = 80 food_reagents = list( @@ -73,7 +73,7 @@ name = "wing fang chu" desc = "A savory dish of alien wing wang in soy." icon_state = "wingfangchu" - trash_type = /obj/item/reagent_containers/glass/bowl + trash_type = /obj/item/reagent_containers/cup/bowl food_reagents = list( /datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/soysauce = 10, diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm index 57873a6675487..3ad8b59a3eec4 100644 --- a/code/game/objects/items/food/spaghetti.dm +++ b/code/game/objects/items/food/spaghetti.dm @@ -74,7 +74,7 @@ name = "beef noodle" desc = "Nutritious, beefy and noodly." icon_state = "beefnoodle" - trash_type = /obj/item/reagent_containers/glass/bowl + trash_type = /obj/item/reagent_containers/cup/bowl food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3) tastes = list("noodle" = 1, "meat" = 1) foodtypes = GRAIN | MEAT diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 114822d13d90d..c5cbc97a890c6 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -6,9 +6,16 @@ w_class = WEIGHT_CLASS_SMALL force = 2 var/stage = GRENADE_EMPTY - var/list/obj/item/reagent_containers/glass/beakers = list() - var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/waterbottle) - var/list/banned_containers = list(/obj/item/reagent_containers/glass/beaker/bluespace) //Containers to exclude from specific grenade subtypes + /// The set of reagent containers that have been added to this grenade casing. + var/list/obj/item/reagent_containers/cup/beakers = list() + /// The types of reagent containers that can be added to this grenade casing. + var/list/allowed_containers = list( + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, + /obj/item/reagent_containers/cup/waterbottle + ) + /// The types of reagent containers that can't be added to this grenade casing. + var/list/banned_containers = list(/obj/item/reagent_containers/cup/beaker/bluespace) var/affected_area = 3 var/ignition_temp = 10 // The amount of heat added to the reagents when this grenade goes off. var/threatscale = 1 // Used by advanced grenades to make them slightly more worthy. @@ -37,7 +44,7 @@ if(user.can_see_reagents()) if(beakers.len) . += "You scan the grenade and detect the following reagents:" - for(var/obj/item/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/cup/G in beakers) for(var/datum/reagent/R in G.reagents.reagent_list) . += "[R.volume] units of [R.name] in the [G.name]." if(beakers.len == 1) @@ -48,7 +55,7 @@ if(beakers.len == 2 && beakers[1].name == beakers[2].name) . += "You see two [beakers[1].name]s inside the grenade." else - for(var/obj/item/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/cup/G in beakers) . += "You see a [G.name] inside the grenade." /obj/item/grenade/chem_grenade/attack_self(mob/user) @@ -194,7 +201,7 @@ return var/list/datum/reagents/reactants = list() - for(var/obj/item/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/cup/G in beakers) reactants += G.reagents var/turf/detonation_turf = get_turf(src) @@ -221,7 +228,11 @@ desc = "A custom made large grenade. Larger splash range and increased ignition temperature compared to basic grenades. Fits exotic and bluespace based containers." casedesc = "This casing affects a larger area than the basic model and can fit exotic containers, including slime cores and bluespace beakers. Heats contents by 25 K upon ignition." icon_state = "large_grenade" - allowed_containers = list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/condiment, /obj/item/reagent_containers/food/drinks) + allowed_containers = list( + /obj/item/reagent_containers/cup, + /obj/item/reagent_containers/condiment, + /obj/item/reagent_containers/cup/glass, + ) banned_containers = list() affected_area = 5 ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades. @@ -235,7 +246,7 @@ for(var/obj/item/slime_extract/S in beakers) if(S.Uses) - for(var/obj/item/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/cup/G in beakers) G.reagents.trans_to(S, G.reagents.total_volume) //If there is still a core (sometimes it's used up) @@ -244,7 +255,7 @@ if(S) if(S.reagents?.total_volume) - for(var/obj/item/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/cup/G in beakers) S.reagents.trans_to(G, S.reagents.total_volume) else S.forceMove(get_turf(src)) @@ -335,15 +346,15 @@ /obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src) - B1.reagents.add_reagent(/datum/reagent/aluminium, 30) - B2.reagents.add_reagent(/datum/reagent/foaming_agent, 10) - B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 10) + beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 30) + beaker_two.reagents.add_reagent(/datum/reagent/foaming_agent, 10) + beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 10) - beakers += B1 - beakers += B2 + beakers += beaker_one + beakers += beaker_two /obj/item/grenade/chem_grenade/smart_metal_foam @@ -351,17 +362,18 @@ desc = "Used for emergency sealing of hull breaches, while keeping areas accessible." stage = GRENADE_READY + /obj/item/grenade/chem_grenade/smart_metal_foam/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/large/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src) - B1.reagents.add_reagent(/datum/reagent/aluminium, 75) - B2.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25) - B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 25) + beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 75) + beaker_two.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25) + beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 25) - beakers += B1 - beakers += B2 + beakers += beaker_one + beakers += beaker_two /obj/item/grenade/chem_grenade/incendiary @@ -371,15 +383,15 @@ /obj/item/grenade/chem_grenade/incendiary/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src) - B1.reagents.add_reagent(/datum/reagent/phosphorus, 25) - B2.reagents.add_reagent(/datum/reagent/stable_plasma, 25) - B2.reagents.add_reagent(/datum/reagent/toxin/acid, 25) + beaker_one.reagents.add_reagent(/datum/reagent/phosphorus, 25) + beaker_two.reagents.add_reagent(/datum/reagent/stable_plasma, 25) + beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid, 25) - beakers += B1 - beakers += B2 + beakers += beaker_one + beakers += beaker_two /obj/item/grenade/chem_grenade/antiweed @@ -389,16 +401,16 @@ /obj/item/grenade/chem_grenade/antiweed/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src) - B1.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25) - B1.reagents.add_reagent(/datum/reagent/potassium, 25) - B2.reagents.add_reagent(/datum/reagent/phosphorus, 25) - B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25) + beaker_one.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25) + beaker_one.reagents.add_reagent(/datum/reagent/potassium, 25) + beaker_two.reagents.add_reagent(/datum/reagent/phosphorus, 25) + beaker_two.reagents.add_reagent(/datum/reagent/consumable/sugar, 25) - beakers += B1 - beakers += B2 + beakers += beaker_one + beakers += beaker_two /obj/item/grenade/chem_grenade/cleaner @@ -408,15 +420,15 @@ /obj/item/grenade/chem_grenade/cleaner/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src) - B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40) - B2.reagents.add_reagent(/datum/reagent/water, 40) - B2.reagents.add_reagent(/datum/reagent/space_cleaner, 10) + beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40) + beaker_two.reagents.add_reagent(/datum/reagent/water, 40) + beaker_two.reagents.add_reagent(/datum/reagent/space_cleaner, 10) - beakers += B1 - beakers += B2 + beakers += beaker_one + beakers += beaker_two /obj/item/grenade/chem_grenade/ez_clean @@ -426,15 +438,15 @@ /obj/item/grenade/chem_grenade/ez_clean/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/large/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/large/beaker_two = new(src) - B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40) - B2.reagents.add_reagent(/datum/reagent/water, 40) - B2.reagents.add_reagent(/datum/reagent/space_cleaner/ez_clean, 60) //ensures a t h i c c distribution + beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40) + beaker_two.reagents.add_reagent(/datum/reagent/water, 40) + beaker_two.reagents.add_reagent(/datum/reagent/space_cleaner/ez_clean, 60) //ensures a t h i c c distribution - beakers += B1 - beakers += B2 + beakers += beaker_one + beakers += beaker_two @@ -445,8 +457,8 @@ /obj/item/grenade/chem_grenade/teargas/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src) B1.reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 60) B1.reagents.add_reagent(/datum/reagent/potassium, 40) @@ -464,8 +476,8 @@ /obj/item/grenade/chem_grenade/facid/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src) B1.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 290) B1.reagents.add_reagent(/datum/reagent/potassium, 10) @@ -484,8 +496,8 @@ /obj/item/grenade/chem_grenade/colorful/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/B2 = new(src) B1.reagents.add_reagent(/datum/reagent/colorful_reagent, 25) B1.reagents.add_reagent(/datum/reagent/potassium, 25) @@ -503,8 +515,8 @@ /obj/item/grenade/chem_grenade/glitter/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/B2 = new(src) B1.reagents.add_reagent(glitter_type, 25) B1.reagents.add_reagent(/datum/reagent/potassium, 25) @@ -536,8 +548,8 @@ /obj/item/grenade/chem_grenade/clf3/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src) B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 250) B1.reagents.add_reagent(/datum/reagent/clf3, 50) @@ -554,8 +566,8 @@ /obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src) B1.reagents.add_reagent(/datum/reagent/cryptobiolin, 75) B1.reagents.add_reagent(/datum/reagent/water, 50) @@ -574,8 +586,8 @@ /obj/item/grenade/chem_grenade/tuberculosis/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src) B1.reagents.add_reagent(/datum/reagent/potassium, 50) B1.reagents.add_reagent(/datum/reagent/phosphorus, 50) @@ -594,8 +606,8 @@ /obj/item/grenade/chem_grenade/holy/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src) B1.reagents.add_reagent(/datum/reagent/potassium, 100) B2.reagents.add_reagent(/datum/reagent/water/holywater, 100) @@ -610,8 +622,8 @@ /obj/item/grenade/chem_grenade/ghostbuster/Initialize(mapload) . = ..() - var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) + var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src) + var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src) B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 50) B1.reagents.add_reagent(/datum/reagent/water/holywater, 50) diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index 5d13e9cc741e6..ae5fc7ee8189e 100644 --- a/code/game/objects/items/grenades/ghettobomb.dm +++ b/code/game/objects/items/grenades/ghettobomb.dm @@ -34,7 +34,7 @@ /obj/item/grenade/iedcasing/CheckParts(list/parts_list) ..() - var/obj/item/reagent_containers/food/drinks/soda_cans/can = locate() in contents + var/obj/item/reagent_containers/cup/soda_cans/can = locate() in contents if(can) can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED can.pixel_y = 0 diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 5f94dc3f0f89d..718e93d430268 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -84,7 +84,7 @@ icon_state = "studentuni" item_state = "studentuni" body_parts_covered = ARMS|CHEST - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) /obj/item/storage/box/holy/sentinel name = "Stone Sentinel Kit" diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index c5e7248c6dd7d..7689e50de68dc 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -25,8 +25,8 @@ var/static/list/generic_goodies = list( /obj/item/stack/spacecash/c10 = 22, //the lamest chance to get item, what do you expect really? - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 10, + /obj/item/reagent_containers/cup/soda_cans/pwr_game = 10, + /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 10, /obj/item/food/cheesiehonkers = 10, /obj/item/food/candy = 10, /obj/item/food/chips = 10, @@ -51,8 +51,8 @@ /obj/item/book/granter/spell/mimery_blockade, /obj/item/gun/ballistic/rifle/boltaction/enchanted, /obj/item/melee/classic_baton/police/telescopic, - /obj/item/reagent_containers/glass/bottle/random_virus/minor, - /obj/item/reagent_containers/glass/bottle/random_virus, + /obj/item/reagent_containers/cup/bottle/random_virus/minor, + /obj/item/reagent_containers/cup/bottle/random_virus, /obj/item/gun/ballistic/revolver/nagant ) diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index aa87ec7cd0bb2..25dc5d1e95467 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -48,7 +48,7 @@ var/turf/T = get_turf(A) - if(istype(A, /obj/item/reagent_containers/glass/bucket) || istype(A, /obj/structure/janitorialcart)) + if(istype(A, /obj/item/reagent_containers/cup/bucket) || istype(A, /obj/structure/janitorialcart)) return if(T) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 2d53fad04d176..8026df29df82a 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -931,8 +931,8 @@ name = "container storage apparatus" desc = "A special apparatus for carrying containers without spilling the contents. It can also synthesize new beakers!" icon_state = "borg_beaker_apparatus" - storable = list(/obj/item/reagent_containers/glass) - var/defaultcontainer = /obj/item/reagent_containers/glass/beaker + storable = list(/obj/item/reagent_containers/cup) + var/defaultcontainer = /obj/item/reagent_containers/cup/beaker /obj/item/borg/apparatus/container/Destroy() if(stored) @@ -944,7 +944,7 @@ /obj/item/borg/apparatus/container/examine() . = ..() //apparatus/container/service means this will not always be true. - if(istype(stored, /obj/item/reagent_containers/glass)) + if(istype(stored, /obj/item/reagent_containers/cup)) var/obj/item/reagent_containers/C = stored . += "The apparatus currently has [C] secured, which contains:" if(length(C.reagents.reagent_list)) @@ -962,7 +962,7 @@ stored.pixel_x = 0 stored.pixel_y = 0 var/mutable_appearance/stored_copy = new /mutable_appearance(stored) - if(istype(stored, /obj/item/reagent_containers/glass/beaker)) + if(istype(stored, /obj/item/reagent_containers/cup/beaker)) arm.pixel_y = arm.pixel_y - 3 stored_copy.layer = FLOAT_LAYER stored_copy.plane = FLOAT_PLANE @@ -1038,24 +1038,26 @@ /obj/item/borg/apparatus/container/service name = "versatile service grasper" desc = "Specially designed for carrying glasses, food and seeds. It can also synthesize glasses for drinks!" - storable = list(/obj/item/reagent_containers/food, - /obj/item/reagent_containers/glass, + storable = list( + /obj/item/food, + /obj/item/reagent_containers/condiment, + /obj/item/reagent_containers/cup, /obj/item/seeds, /obj/item/storage/fancy/donut_box, /obj/item/storage/fancy/egg_box, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, - /obj/item/reagent_containers/glass/bucket + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, + /obj/item/reagent_containers/cup/bucket ) - defaultcontainer = /obj/item/reagent_containers/food/drinks/drinkingglass + defaultcontainer = /obj/item/reagent_containers/cup/glass/drinkingglass /obj/item/borg/apparatus/container/service/examine() . = ..() //Parent type handles this type. All other objects held are handled here. - if(!istype(stored, /obj/item/reagent_containers/glass)) + if(!istype(stored, /obj/item/reagent_containers/cup)) . += "You are currently holding [stored]." . += "Alt-click will drop the currently stored [stored]." diff --git a/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm b/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm index fcbc2b8c20551..3750b2d00d725 100644 --- a/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm +++ b/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm @@ -23,8 +23,8 @@ STACKSIZE_MACRO(/obj/item/stack/sheet/snow) GLOBAL_LIST_INIT(plastic_recipes, list( new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 4 SECONDS), \ - new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/waterbottle/empty), \ - new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/waterbottle/large/empty,3), \ + new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/cup/glass/waterbottle/empty), \ + new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/cup/glass/waterbottle/large/empty,3), \ new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2), \ new /datum/stack_recipe("plastic chair", /obj/structure/chair/fancy/plastic, one_per_turf = TRUE, on_floor = TRUE, time = 2 SECONDS), \ )) diff --git a/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm b/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm index 05f8ef3588094..1987c3979daae 100644 --- a/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm +++ b/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("sheet snatcher", /obj/item/storage/bag/sheetsnatcher, 6, time = 4 SECONDS), \ null, \ new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \ - new/datum/stack_recipe("rag", /obj/item/reagent_containers/glass/rag, 1, time = 1 SECONDS), \ + new/datum/stack_recipe("rag", /obj/item/reagent_containers/cup/rag, 1, time = 1 SECONDS), \ new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3, time = 4 SECONDS), \ new/datum/stack_recipe("double bedsheet", /obj/item/bedsheet/double, 6, time = 8 SECONDS), \ new/datum/stack_recipe("empty sandbag", /obj/item/emptysandbag, 4, time = 2 SECONDS), \ diff --git a/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm b/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm index 63d119485eef0..66f69f46b99b6 100644 --- a/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm +++ b/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, one_per_turf = TRUE, on_floor = TRUE, time = 5 SECONDS),\ new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 1.5 SECONDS),\ new/datum/stack_recipe("loom", /obj/structure/loom, 10, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ - new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar, 3), \ + new/datum/stack_recipe("mortar", /obj/item/reagent_containers/cup/mortar, 3), \ new/datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 10 SECONDS), \ null, \ new/datum/stack_recipe_list("pews", list( diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 26c96ec713fe9..2fb6538c07ca5 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -420,7 +420,7 @@ /obj/item/mail, /obj/item/small_delivery, /obj/item/paper, - /obj/item/reagent_containers/food/condiment/milk, + /obj/item/reagent_containers/condiment/milk, /obj/item/food/bread/plain ) ) @@ -731,7 +731,7 @@ new /obj/item/gun/ballistic/automatic/pistol/APS(src) new /obj/item/ammo_box/magazine/pistolm9mm(src) new /obj/item/ammo_box/magazine/pistolm9mm(src) - new /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka(src) + new /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka(src) new /obj/item/reagent_containers/hypospray/medipen/stimulants(src) new /obj/item/storage/firstaid/tactical(src) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 6a9c803c2cc88..279618bf75776 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -251,7 +251,7 @@ STR.max_w_class = WEIGHT_CLASS_NORMAL STR.max_combined_w_class = 100 STR.max_items = 100 - STR.can_hold = typecacheof(list(/obj/item/food/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb, /obj/item/disk/plantgene, /obj/item/food/seaweed_sheet)) + STR.can_hold = typecacheof(list(/obj/item/food/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/cup/glass/honeycomb, /obj/item/disk/plantgene, /obj/item/food/seaweed_sheet)) //////// @@ -429,7 +429,7 @@ STR.max_combined_w_class = 200 STR.max_items = 50 STR.insert_preposition = "in" - STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/medspray, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/waterbottle)) + STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/medspray, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/glass/waterbottle)) /* * Biowaste bag (mostly for xenobiologists) @@ -450,7 +450,7 @@ STR.max_combined_w_class = 200 STR.max_items = 25 STR.insert_preposition = "in" - STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/food/deadmouse, /obj/item/food/monkeycube, /obj/item/organ, /obj/item/bodypart)) + STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/food/deadmouse, /obj/item/food/monkeycube, /obj/item/organ, /obj/item/bodypart)) /obj/item/storage/bag/bio/pre_attack(atom/A, mob/living/user, params) if(istype(A, /obj/item/slimecross/reproductive)) @@ -473,4 +473,4 @@ STR.max_items = 50 STR.max_w_class = WEIGHT_CLASS_SMALL STR.insert_preposition = "in" - STR.can_hold = typecacheof(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/rcd_ammo)) + STR.can_hold = typecacheof(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/cup/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/rcd_ammo)) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index e247252257742..89c5987d00d45 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -92,8 +92,8 @@ var/datum/component/storage/STR = GetComponent(/datum/component/storage) var/static/list/can_hold = typecacheof(list( /obj/item/reagent_containers/spray, - /obj/item/reagent_containers/glass/beaker,//those will usually be used for fertilizer - /obj/item/reagent_containers/glass/bottle,//fertilizer bottles + /obj/item/reagent_containers/cup/beaker,//those will usually be used for fertilizer + /obj/item/reagent_containers/cup/bottle,//fertilizer bottles /obj/item/reagent_containers/syringe,//blood samples for pod cloning /obj/item/reagent_containers/dropper,//on request by forums users /obj/item/plant_analyzer, @@ -228,8 +228,8 @@ /obj/item/healthanalyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/medspray, @@ -392,7 +392,7 @@ /obj/item/stack/sheet/bone, /obj/item/lighter, /obj/item/storage/fancy/cigarettes, - /obj/item/reagent_containers/food/drinks/bottle, + /obj/item/reagent_containers/cup/glass/bottle, /obj/item/stack/medical, /obj/item/knife/combat/survival, /obj/item/tank/internals/emergency_oxygen, @@ -404,7 +404,8 @@ /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/stack/ore, - /obj/item/reagent_containers/food/drinks, + /obj/item/reagent_containers/cup/glass, + /obj/item/reagent_containers/cup/glass/bottle, /obj/item/organ/regenerative_core, /obj/item/wormhole_jaunter, /obj/item/storage/bag/plants, @@ -516,7 +517,7 @@ STR.max_w_class = WEIGHT_CLASS_SMALL var/static/list/can_hold = typecacheof(list( /obj/item/food, - /obj/item/reagent_containers/food/drinks + /obj/item/reagent_containers/cup/glass )) STR.can_hold = can_hold var/amount = 5 @@ -524,27 +525,27 @@ while(contents.len <= amount) rig_snacks = pick(list( /obj/item/food/candy, - /obj/item/reagent_containers/food/drinks/dry_ramen, + /obj/item/food/cheesiehonkers, + /obj/item/food/cheesynachos, + /obj/item/food/cubannachos, /obj/item/food/chips, + /obj/item/food/donkpocket, /obj/item/food/sosjerky, /obj/item/food/syndicake, /obj/item/food/spacetwinkie, - /obj/item/food/cheesiehonkers, /obj/item/food/nachos, - /obj/item/food/cheesynachos, - /obj/item/food/cubannachos, /obj/item/food/nugget, /obj/item/food/spaghetti/pastatomato, /obj/item/food/rofflewaffles, - /obj/item/food/donkpocket, - /obj/item/reagent_containers/food/drinks/soda_cans/cola, - /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind, - /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, - /obj/item/reagent_containers/food/drinks/soda_cans/starkist, - /obj/item/reagent_containers/food/drinks/soda_cans/space_up, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, - /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola + /obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola, + /obj/item/reagent_containers/cup/glass/dry_ramen, + /obj/item/reagent_containers/cup/soda_cans/cola, + /obj/item/reagent_containers/cup/soda_cans/dr_gibb, + /obj/item/reagent_containers/cup/soda_cans/lemon_lime, + /obj/item/reagent_containers/cup/soda_cans/pwr_game, + /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind, + /obj/item/reagent_containers/cup/soda_cans/space_up, + /obj/item/reagent_containers/cup/soda_cans/starkist, )) new rig_snacks(src) @@ -600,7 +601,7 @@ /obj/item/screwdriver, /obj/item/lighter, /obj/item/multitool, - /obj/item/reagent_containers/food/drinks/bottle/molotov, + /obj/item/reagent_containers/cup/glass/bottle/molotov, /obj/item/grenade/plastic/c4, /obj/item/food/grown/cherry_bomb, /obj/item/food/grown/firelemon diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index d18fcc98415a5..1a60b72761a23 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -250,7 +250,7 @@ desc = "To be applied to the head repeatedly." /obj/item/storage/book/bible/booze/PopulateContents() - new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src) + new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src) /obj/item/storage/book/bible/syndicate icon_state ="ebook" diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 738f84b630de7..a9a5c923f2314 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -316,7 +316,7 @@ /obj/item/storage/box/beakers/PopulateContents() for(var/i in 1 to 7) - new /obj/item/reagent_containers/glass/beaker( src ) + new /obj/item/reagent_containers/cup/beaker( src ) /obj/item/storage/box/beakers/bluespace name = "box of bluespace beakers" @@ -324,18 +324,18 @@ /obj/item/storage/box/beakers/bluespace/PopulateContents() for(var/i in 1 to 7) - new /obj/item/reagent_containers/glass/beaker/bluespace(src) + new /obj/item/reagent_containers/cup/beaker/bluespace(src) /obj/item/storage/box/beakers/variety name = "beaker variety box" /obj/item/storage/box/beakers/variety/PopulateContents() - new /obj/item/reagent_containers/glass/beaker(src) - new /obj/item/reagent_containers/glass/beaker/large(src) - new /obj/item/reagent_containers/glass/beaker/plastic(src) - new /obj/item/reagent_containers/glass/beaker/meta(src) - new /obj/item/reagent_containers/glass/beaker/noreact(src) - new /obj/item/reagent_containers/glass/beaker/bluespace(src) + new /obj/item/reagent_containers/cup/beaker(src) + new /obj/item/reagent_containers/cup/beaker/large(src) + new /obj/item/reagent_containers/cup/beaker/plastic(src) + new /obj/item/reagent_containers/cup/beaker/meta(src) + new /obj/item/reagent_containers/cup/beaker/noreact(src) + new /obj/item/reagent_containers/cup/beaker/bluespace(src) /obj/item/storage/box/medsprays name = "box of medical sprayers" @@ -503,7 +503,7 @@ /obj/item/storage/box/drinkingglasses/PopulateContents() for(var/i in 1 to 6) - new /obj/item/reagent_containers/food/drinks/drinkingglass(src) + new /obj/item/reagent_containers/cup/glass/drinkingglass(src) /obj/item/storage/box/condimentbottles name = "box of condiment bottles" @@ -512,7 +512,7 @@ /obj/item/storage/box/condimentbottles/PopulateContents() for(var/i in 1 to 6) - new /obj/item/reagent_containers/food/condiment(src) + new /obj/item/reagent_containers/condiment(src) /obj/item/storage/box/cups name = "box of paper cups" @@ -521,7 +521,7 @@ /obj/item/storage/box/cups/PopulateContents() for(var/i in 1 to 7) - new /obj/item/reagent_containers/food/drinks/sillycup( src ) + new /obj/item/reagent_containers/cup/glass/sillycup( src ) /obj/item/storage/box/donkpockets @@ -1018,7 +1018,7 @@ for(var/i in 1 to 3) new /obj/item/food/grown/tomato(src) new /obj/item/food/meatball(src) - new /obj/item/reagent_containers/food/drinks/bottle/wine(src) + new /obj/item/reagent_containers/cup/glass/bottle/wine(src) /obj/item/storage/box/ingredients/vegetarian theme_name = "vegetarian" @@ -1083,7 +1083,7 @@ new /obj/item/food/grown/oat(src) new /obj/item/food/grown/wheat(src) new /obj/item/food/grown/cocoapod(src) - new /obj/item/reagent_containers/honeycomb(src) + new /obj/item/reagent_containers/cup/glass/honeycomb(src) new /obj/item/seeds/flower/poppy(src) /obj/item/storage/box/ingredients/carnivore diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 89757d2ccb506..879422c37cfcd 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -75,8 +75,8 @@ /obj/item/healthanalyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/medspray, @@ -374,8 +374,8 @@ /obj/item/healthanalyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/medspray, diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index feb0e77a45678..c136caa9b76d8 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -137,7 +137,7 @@ new /obj/item/clothing/under/chameleon(src) new /obj/item/card/id/syndicate(src) new /obj/item/reagent_containers/hypospray/medipen/stimulants(src) - new /obj/item/reagent_containers/glass/rag(src) + new /obj/item/reagent_containers/cup/rag(src) new /obj/item/encryptionkey/syndicate(src) if("ninja") @@ -188,7 +188,7 @@ new /obj/item/clothing/mask/rat/bee(src) // 0 tc new /obj/item/storage/belt/fannypack/yellow(src) // 0 tc new /obj/item/storage/box/syndie_kit/bee_grenades(src) // 15 tc - new /obj/item/reagent_containers/glass/bottle/beesease(src) // 10 tc? + new /obj/item/reagent_containers/cup/bottle/beesease(src) // 10 tc? new /obj/item/gun/chem/bee(src) //priceless if("mr_freeze") @@ -407,19 +407,19 @@ STR.max_items = 14 /obj/item/storage/box/syndie_kit/chemical/PopulateContents() - new /obj/item/reagent_containers/glass/bottle/polonium(src) - new /obj/item/reagent_containers/glass/bottle/venom(src) - new /obj/item/reagent_containers/glass/bottle/fentanyl(src) - new /obj/item/reagent_containers/glass/bottle/formaldehyde(src) - new /obj/item/reagent_containers/glass/bottle/spewium(src) - new /obj/item/reagent_containers/glass/bottle/cyanide(src) - new /obj/item/reagent_containers/glass/bottle/histamine(src) - new /obj/item/reagent_containers/glass/bottle/initropidril(src) - new /obj/item/reagent_containers/glass/bottle/pancuronium(src) - new /obj/item/reagent_containers/glass/bottle/sodium_thiopental(src) - new /obj/item/reagent_containers/glass/bottle/coniine(src) - new /obj/item/reagent_containers/glass/bottle/curare(src) - new /obj/item/reagent_containers/glass/bottle/amanitin(src) + new /obj/item/reagent_containers/cup/bottle/polonium(src) + new /obj/item/reagent_containers/cup/bottle/venom(src) + new /obj/item/reagent_containers/cup/bottle/fentanyl(src) + new /obj/item/reagent_containers/cup/bottle/formaldehyde(src) + new /obj/item/reagent_containers/cup/bottle/spewium(src) + new /obj/item/reagent_containers/cup/bottle/cyanide(src) + new /obj/item/reagent_containers/cup/bottle/histamine(src) + new /obj/item/reagent_containers/cup/bottle/initropidril(src) + new /obj/item/reagent_containers/cup/bottle/pancuronium(src) + new /obj/item/reagent_containers/cup/bottle/sodium_thiopental(src) + new /obj/item/reagent_containers/cup/bottle/coniine(src) + new /obj/item/reagent_containers/cup/bottle/curare(src) + new /obj/item/reagent_containers/cup/bottle/amanitin(src) new /obj/item/reagent_containers/syringe(src) /obj/item/storage/box/syndie_kit/nuke @@ -447,7 +447,7 @@ for(var/i in 1 to 5) new /obj/item/reagent_containers/hypospray/medipen/tuberculosiscure(src) new /obj/item/reagent_containers/syringe(src) - new /obj/item/reagent_containers/glass/bottle/tuberculosiscure(src) + new /obj/item/reagent_containers/cup/bottle/tuberculosiscure(src) /obj/item/storage/box/syndie_kit/chameleon name = "chameleon kit" @@ -502,7 +502,7 @@ new/obj/item/toy/crayon/rainbow(src) /obj/item/storage/box/syndie_kit/romerol/PopulateContents() - new /obj/item/reagent_containers/glass/bottle/romerol(src) + new /obj/item/reagent_containers/cup/bottle/romerol(src) new /obj/item/reagent_containers/syringe(src) new /obj/item/reagent_containers/dropper(src) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index e9ee80ab26f54..0056cc7f57dd4 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -95,7 +95,7 @@ update_icon() /obj/item/toy/balloon/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/reagent_containers/glass)) + if(istype(I, /obj/item/reagent_containers/cup)) if(I.reagents) if(I.reagents.total_volume <= 0) to_chat(user, "[I] is empty.") diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index e7f1c86086950..319bb402e1890 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -184,7 +184,7 @@ if("red") return "#ff0000" return P.colour - else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag)) + else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/cup/rag)) return canvas_color /obj/item/canvas/proc/try_rename(mob/user) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 5fa3965f476c8..0fdd01228f0de 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -15,7 +15,7 @@ /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/head/soft/black = 2, /obj/item/clothing/shoes/sneakers/black = 2, - /obj/item/reagent_containers/glass/rag = 2, + /obj/item/reagent_containers/cup/rag = 2, /obj/item/storage/box/beanbag = 1, /obj/item/clothing/suit/armor/vest/alt = 1, /obj/item/circuitboard/machine/dish_drive = 1, @@ -42,7 +42,7 @@ /obj/item/clothing/suit/toggle/chef = 1, /obj/item/clothing/under/rank/civilian/chef = 1, /obj/item/clothing/head/utility/chefhat = 1, - /obj/item/reagent_containers/glass/rag = 1) + /obj/item/reagent_containers/cup/rag = 1) generate_items_inside(items_inside,src) /obj/structure/closet/jcloset diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index 15e1d8882fbae..5398d2b0d063f 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -32,8 +32,8 @@ new /obj/item/extrapolator(src) new /obj/item/book/manual/wiki/infections(src) new /obj/item/stack/sheet/mineral/plasma(src) - new /obj/item/reagent_containers/food/drinks/bottle/virusfood (src) - new /obj/item/reagent_containers/food/drinks/bottle/virusfood (src) + new /obj/item/reagent_containers/cup/glass/bottle/virusfood (src) + new /obj/item/reagent_containers/cup/glass/bottle/virusfood (src) else new /obj/item/gun/syringe (src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 13c1346ed278e..404a24857a6ac 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -14,5 +14,5 @@ /obj/structure/closet/secure_closet/bar/PopulateContents() ..() for(var/i in 1 to 10) - new /obj/item/reagent_containers/food/drinks/beer( src ) + new /obj/item/reagent_containers/cup/glass/bottle/beer( src ) new /obj/item/etherealballdeployer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index f7d729ba14821..f7bb92fa5d087 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -39,9 +39,9 @@ /obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents() ..() for(var/i in 1 to 3) - new /obj/item/reagent_containers/food/condiment/flour(src) - new /obj/item/reagent_containers/food/condiment/rice(src) - new /obj/item/reagent_containers/food/condiment/sugar(src) + new /obj/item/reagent_containers/condiment/flour(src) + new /obj/item/reagent_containers/condiment/rice(src) + new /obj/item/reagent_containers/condiment/sugar(src) /obj/structure/closet/secure_closet/freezer/kitchen/maintenance name = "maintenance refrigerator" @@ -51,9 +51,9 @@ /obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents() ..() for(var/i in 1 to 5) - new /obj/item/reagent_containers/food/condiment/milk(src) + new /obj/item/reagent_containers/condiment/milk(src) for(var/i in 1 to 5) - new /obj/item/reagent_containers/food/condiment/soymilk(src) + new /obj/item/reagent_containers/condiment/soymilk(src) for(var/i in 1 to 2) new /obj/item/storage/fancy/egg_box(src) @@ -81,9 +81,9 @@ /obj/structure/closet/secure_closet/freezer/fridge/PopulateContents() ..() for(var/i in 1 to 5) - new /obj/item/reagent_containers/food/condiment/milk(src) + new /obj/item/reagent_containers/condiment/milk(src) for(var/i in 1 to 5) - new /obj/item/reagent_containers/food/condiment/soymilk(src) + new /obj/item/reagent_containers/condiment/soymilk(src) for(var/i in 1 to 2) new /obj/item/storage/fancy/egg_box(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index e89ee18d1c0f6..e453101e6ee66 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -7,14 +7,14 @@ /obj/structure/closet/secure_closet/medical1/PopulateContents() ..() var/static/items_inside = list( - /obj/item/reagent_containers/glass/beaker = 2, + /obj/item/reagent_containers/cup/beaker = 2, /obj/item/reagent_containers/dropper = 2, /obj/item/storage/belt/medical = 1, /obj/item/storage/box/syringes = 1, - /obj/item/reagent_containers/glass/bottle/toxin = 1, - /obj/item/reagent_containers/glass/bottle/morphine = 2, - /obj/item/reagent_containers/glass/bottle/epinephrine= 3, - /obj/item/reagent_containers/glass/bottle/charcoal = 3, + /obj/item/reagent_containers/cup/bottle/toxin = 1, + /obj/item/reagent_containers/cup/bottle/morphine = 2, + /obj/item/reagent_containers/cup/bottle/epinephrine= 3, + /obj/item/reagent_containers/cup/bottle/charcoal = 3, /obj/item/storage/box/rxglasses = 1, /obj/item/stack/ducts/fifty = 4, /obj/item/construction/plumbing = 2, @@ -59,12 +59,12 @@ /obj/structure/closet/secure_closet/medicaldanger/PopulateContents() ..() - new /obj/item/reagent_containers/glass/bottle/formaldehyde(src) - new /obj/item/reagent_containers/glass/bottle/formaldehyde(src) - new /obj/item/reagent_containers/glass/bottle/charcoal(src) - new /obj/item/reagent_containers/glass/bottle/chloralhydrate(src) - new /obj/item/reagent_containers/glass/bottle/morphine(src) - new /obj/item/reagent_containers/glass/bottle/sodium_thiopental(src) + new /obj/item/reagent_containers/cup/bottle/formaldehyde(src) + new /obj/item/reagent_containers/cup/bottle/formaldehyde(src) + new /obj/item/reagent_containers/cup/bottle/charcoal(src) + new /obj/item/reagent_containers/cup/bottle/chloralhydrate(src) + new /obj/item/reagent_containers/cup/bottle/morphine(src) + new /obj/item/reagent_containers/cup/bottle/sodium_thiopental(src) new /obj/item/storage/pill_bottle/epinephrine(src) new /obj/item/storage/pill_bottle/charcoal(src) new /obj/item/reagent_containers/syringe/calomel(src) @@ -104,7 +104,7 @@ new /obj/item/storage/lockbox/medal/med(src) new /obj/item/circuitboard/machine/techfab/department/medical(src) - new /obj/item/reagent_containers/food/drinks/bottle/synthflesh(src) + new /obj/item/reagent_containers/cup/glass/bottle/synthflesh(src) // prioritized items new /obj/item/door_remote/chief_medical_officer(src) diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm index cb6ade5af2147..6663c480ded01 100644 --- a/code/game/objects/structures/crates_lockers/crates/wooden.dm +++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm @@ -16,7 +16,7 @@ /obj/structure/closet/crate/wooden/toy/PopulateContents() . = ..() new /obj/item/megaphone/clown(src) - new /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src) + new /obj/item/reagent_containers/cup/soda_cans/canned_laughter(src) new /obj/item/pneumatic_cannon/pie(src) new /obj/item/food/pie/cream(src) new /obj/item/storage/crayons(src) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 244ba8faed02a..a05ddcf0f72f6 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -325,7 +325,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) if(istype(O, /obj/item/stack/medical/gauze)) var/obj/item/stack/medical/gauze/G = O - new /obj/item/reagent_containers/glass/rag(src.loc) + new /obj/item/reagent_containers/cup/rag(src.loc) to_chat(user, "You tear off a strip of gauze and make a rag.") G.use(1) return diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index e7d93aeacb02c..24bc9b2e21f66 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -97,7 +97,7 @@ if("Construct Shell") pickedtype += /obj/structure/constructshell if("Flask of Unholy Water") - pickedtype += /obj/item/reagent_containers/food/drinks/bottle/unholywater + pickedtype += /obj/item/reagent_containers/cup/glass/bottle/unholywater else return if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm index fb20d5e7a8620..1f601e6b76266 100644 --- a/code/modules/antagonists/heretic/items/eldritch_flask.dm +++ b/code/modules/antagonists/heretic/items/eldritch_flask.dm @@ -1,6 +1,6 @@ // An unholy water flask, but for heretics. // Heals heretics, harms non-heretics. Pretty much identical. -/obj/item/reagent_containers/glass/beaker/eldritch +/obj/item/reagent_containers/cup/beaker/eldritch name = "flask of eldritch essence" desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond." icon = 'icons/obj/heretic.dmi' diff --git a/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm b/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm index 196e3c71f98aa..9d674ee44082c 100644 --- a/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm +++ b/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm @@ -14,7 +14,7 @@ /obj/structure/reagent_dispensers/watertank = 1, /obj/item/shard = 1, ) - result_atoms = list(/obj/item/reagent_containers/glass/beaker/eldritch) + result_atoms = list(/obj/item/reagent_containers/cup/beaker/eldritch) cost = 1 route = HERETIC_PATH_SIDE diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 3718dc60e7876..4e3fdb50ea5cb 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -361,7 +361,7 @@ if (!ispath(item, /atom)) // biogenerator outputs to beakers by default if (initial(D.build_type) & BIOGENERATOR) - item = /obj/item/reagent_containers/glass/beaker/large + item = /obj/item/reagent_containers/cup/beaker/large else continue // shouldn't happen, but just in case // hint^ it does fucking happen. this was giving me so much trouble diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 83a01fa87a19c..2c46790844080 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -26,7 +26,7 @@ var/heat_capacity = 20000 var/conduction_coefficient = 0.3 - var/obj/item/reagent_containers/glass/beaker = null + var/obj/item/reagent_containers/cup/beaker = null var/obj/item/radio/radio var/radio_key = /obj/item/encryptionkey/headset_med @@ -317,7 +317,7 @@ close_machine(target) /obj/machinery/atmospherics/components/unary/cryo_cell/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/reagent_containers/glass)) + if(istype(I, /obj/item/reagent_containers/cup)) . = 1 //no afterattack if(beaker) to_chat(user, "A beaker is already loaded into [src]!") diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 07f9fb9f889e9..c9a942f1f5b38 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -157,7 +157,7 @@ light_color = LIGHT_COLOR_PURPLE /turf/open/lava/plasma/attackby(obj/item/I, mob/user, params) - var/obj/item/reagent_containers/glass/C = I + var/obj/item/reagent_containers/cup/C = I if(C.reagents.total_volume >= C.volume) to_chat(user, "[C] is full.") return diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm index 5b7445ce56b86..1b7f46ae791f0 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -70,7 +70,7 @@ SpeakPeace(list("Congratulations.", "By my very loose calculations you've now wasted a decent chunk of the round doing this.", "But you've seen this meme to its conclusion, and that's an experience in itself, right?")) if(251) SpeakPeace(list("Anyway, here.", "I can't give you anything that would impact the progression of the round.","But you've earned this at least.")) - var/obj/item/reagent_containers/food/drinks/trophy/silver_cup/the_ride = new(get_turf(user)) + var/obj/item/reagent_containers/cup/glass/trophy/silver_cup/the_ride = new(get_turf(user)) the_ride.name = "Overextending The Joke: Second Place" the_ride.desc = "There's a point where this needed to stop, and we've clearly passed it." if(252) @@ -81,7 +81,7 @@ SpeakPeace(list("The ends exists somewhere beyond meaningful milestones.", "There will be no more messages until then.", "You disgust me.")) if(5643) user.client.give_award(/datum/award/achievement/misc/time_waste, user) - var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/never_ends = new(get_turf(user)) + var/obj/item/reagent_containers/cup/glass/trophy/gold_cup/never_ends = new(get_turf(user)) never_ends.name = "Overextending The Joke: First Place" never_ends.desc = "And so we are left alone with our regrets." else diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm index 5df4c2808ee77..b9b051d8b55d8 100644 --- a/code/modules/cargo/bounties/mining.dm +++ b/code/modules/cargo/bounties/mining.dm @@ -60,7 +60,7 @@ name = "Mushroom Bowl" description = "Lieutenant Jeb dropped his favorite mushroom bowl. Cheer him up by shipping a new one, will you?" reward = 7500 //5x mushroom shavings - wanted_types = list(/obj/item/reagent_containers/glass/bowl/mushroom_bowl) + wanted_types = list(/obj/item/reagent_containers/cup/bowl/mushroom_bowl) /datum/bounty/item/mining/inocybe_mushroom name = "Mushroom Caps" diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm index ff121a6f59e00..5c967fe71fe70 100644 --- a/code/modules/cargo/bounties/science.dm +++ b/code/modules/cargo/bounties/science.dm @@ -39,7 +39,7 @@ name = "Cryostasis Beaker" description = "Chemists at Central Command have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive payment." reward = 10000 - wanted_types = list(/obj/item/reagent_containers/glass/beaker/noreact) + wanted_types = list(/obj/item/reagent_containers/cup/beaker/noreact) /datum/bounty/item/science/diamond_drill name = "Diamond Mining Drill" diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm index f08aa45471a19..39a8e395c696f 100644 --- a/code/modules/cargo/exports/lavaland.dm +++ b/code/modules/cargo/exports/lavaland.dm @@ -8,7 +8,7 @@ /obj/item/book_of_babel, /obj/item/gun/magic/hook, /obj/item/wisp_lantern, - /obj/item/reagent_containers/glass/bottle/potion/flight, + /obj/item/reagent_containers/cup/bottle/potion/flight, /obj/item/katana/cursed, /obj/item/clothing/glasses/godeye, /obj/item/melee/ghost_sword, diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 61e71bddc32d3..749e7df02665f 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -248,9 +248,9 @@ /obj/item/clothing/suit/utility/radiation, /obj/item/geiger_counter, /obj/item/geiger_counter, - /obj/item/reagent_containers/food/drinks/bottle/vodka, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass) + /obj/item/reagent_containers/cup/glass/bottle/vodka, + /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, + /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass) crate_name = "radiation protection crate" crate_type = /obj/structure/closet/crate/radiation @@ -1657,10 +1657,10 @@ desc = "Contains four 100u cartons of synthflesh in case the cloner ran out of it." cost = 1400 max_supply = 3 - contains = list(/obj/item/reagent_containers/food/drinks/bottle/synthflesh, - /obj/item/reagent_containers/food/drinks/bottle/synthflesh, - /obj/item/reagent_containers/food/drinks/bottle/synthflesh, - /obj/item/reagent_containers/food/drinks/bottle/synthflesh) + contains = list(/obj/item/reagent_containers/cup/glass/bottle/synthflesh, + /obj/item/reagent_containers/cup/glass/bottle/synthflesh, + /obj/item/reagent_containers/cup/glass/bottle/synthflesh, + /obj/item/reagent_containers/cup/glass/bottle/synthflesh) crate_name = "rusty freezer" crate_type = /obj/structure/closet/crate/freezer @@ -1724,19 +1724,19 @@ desc = "Contains thirteen different chemicals, for all the fun experiments you can make." cost = 1000 max_supply = 4 - contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen, - /obj/item/reagent_containers/glass/bottle/carbon, - /obj/item/reagent_containers/glass/bottle/nitrogen, - /obj/item/reagent_containers/glass/bottle/oxygen, - /obj/item/reagent_containers/glass/bottle/fluorine, - /obj/item/reagent_containers/glass/bottle/phosphorus, - /obj/item/reagent_containers/glass/bottle/silicon, - /obj/item/reagent_containers/glass/bottle/chlorine, - /obj/item/reagent_containers/glass/bottle/radium, - /obj/item/reagent_containers/glass/bottle/sacid, - /obj/item/reagent_containers/glass/bottle/ethanol, - /obj/item/reagent_containers/glass/bottle/potassium, - /obj/item/reagent_containers/glass/bottle/sugar, + contains = list(/obj/item/reagent_containers/cup/bottle/hydrogen, + /obj/item/reagent_containers/cup/bottle/carbon, + /obj/item/reagent_containers/cup/bottle/nitrogen, + /obj/item/reagent_containers/cup/bottle/oxygen, + /obj/item/reagent_containers/cup/bottle/fluorine, + /obj/item/reagent_containers/cup/bottle/phosphorus, + /obj/item/reagent_containers/cup/bottle/silicon, + /obj/item/reagent_containers/cup/bottle/chlorine, + /obj/item/reagent_containers/cup/bottle/radium, + /obj/item/reagent_containers/cup/bottle/sacid, + /obj/item/reagent_containers/cup/bottle/ethanol, + /obj/item/reagent_containers/cup/bottle/potassium, + /obj/item/reagent_containers/cup/bottle/sugar, /obj/item/clothing/glasses/science, /obj/item/reagent_containers/dropper, /obj/item/storage/box/beakers) @@ -1766,11 +1766,11 @@ desc = "Contains a little bit of everything needed to stock a medbay or to form your own." cost = 2000 max_supply = 3 - contains = list(/obj/item/reagent_containers/glass/bottle/charcoal, - /obj/item/reagent_containers/glass/bottle/epinephrine, - /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/toxin, - /obj/item/reagent_containers/glass/beaker/large, + contains = list(/obj/item/reagent_containers/cup/bottle/charcoal, + /obj/item/reagent_containers/cup/bottle/epinephrine, + /obj/item/reagent_containers/cup/bottle/morphine, + /obj/item/reagent_containers/cup/bottle/toxin, + /obj/item/reagent_containers/cup/beaker/large, /obj/item/reagent_containers/pill/insulin, /obj/item/stack/medical/gauze, /obj/item/storage/box/beakers, @@ -1827,11 +1827,11 @@ max_supply = 3 access = ACCESS_VIROLOGY access_budget = ACCESS_VIROLOGY - contains = list(/obj/item/reagent_containers/glass/bottle/inorganic_virion, - /obj/item/reagent_containers/glass/bottle/necrotic_virion, - /obj/item/reagent_containers/glass/bottle/evolution_virion, - /obj/item/reagent_containers/glass/bottle/adaptation_virion, - /obj/item/reagent_containers/glass/bottle/aggression_virion) + contains = list(/obj/item/reagent_containers/cup/bottle/inorganic_virion, + /obj/item/reagent_containers/cup/bottle/necrotic_virion, + /obj/item/reagent_containers/cup/bottle/evolution_virion, + /obj/item/reagent_containers/cup/bottle/adaptation_virion, + /obj/item/reagent_containers/cup/bottle/aggression_virion) crate_name = "virus sample crate" crate_type = /obj/structure/closet/crate/secure/plasma dangerous = TRUE @@ -1839,7 +1839,7 @@ /datum/supply_pack/medical/randomvirus/fill(obj/structure/closet/crate/C) for(var/item in contains) if(CONFIG_GET(flag/chemviro_allowed)) - new /obj/item/reagent_containers/glass/bottle/random_virus(C) + new /obj/item/reagent_containers/cup/bottle/random_virus(C) else new item(C) @@ -1851,10 +1851,10 @@ max_supply = 4 access = ACCESS_VIROLOGY contains = list(/obj/item/food/monkeycube, - /obj/item/reagent_containers/food/drinks/bottle/virusfood, - /obj/item/reagent_containers/glass/bottle/mutagen, - /obj/item/reagent_containers/glass/bottle/formaldehyde, - /obj/item/reagent_containers/glass/bottle/synaptizine, + /obj/item/reagent_containers/cup/glass/bottle/virusfood, + /obj/item/reagent_containers/cup/bottle/mutagen, + /obj/item/reagent_containers/cup/bottle/formaldehyde, + /obj/item/reagent_containers/cup/bottle/synaptizine, /obj/item/storage/box/beakers, /obj/item/toy/figure/virologist) crate_name = "Junior Epidemiology Kit" @@ -1877,12 +1877,12 @@ access = ACCESS_CMO access_budget = ACCESS_VIROLOGY contraband = TRUE - contains = list(/obj/item/reagent_containers/glass/bottle/fake_gbs, - /obj/item/reagent_containers/glass/bottle/magnitis, - /obj/item/reagent_containers/glass/bottle/pierrot_throat, - /obj/item/reagent_containers/glass/bottle/brainrot, - /obj/item/reagent_containers/glass/bottle/anxiety, - /obj/item/reagent_containers/glass/bottle/beesease) + contains = list(/obj/item/reagent_containers/cup/bottle/fake_gbs, + /obj/item/reagent_containers/cup/bottle/magnitis, + /obj/item/reagent_containers/cup/bottle/pierrot_throat, + /obj/item/reagent_containers/cup/bottle/brainrot, + /obj/item/reagent_containers/cup/bottle/anxiety, + /obj/item/reagent_containers/cup/bottle/beesease) crate_name = "virus crate" crate_type = /obj/structure/closet/crate/secure/plasma dangerous = TRUE @@ -2100,9 +2100,9 @@ cost = 800 max_supply = 4 access_budget = ACCESS_JANITOR - contains = list(/obj/item/reagent_containers/glass/bucket, - /obj/item/reagent_containers/glass/bucket, - /obj/item/reagent_containers/glass/bucket, + contains = list(/obj/item/reagent_containers/cup/bucket, + /obj/item/reagent_containers/cup/bucket, + /obj/item/reagent_containers/cup/bucket, /obj/item/mop, /obj/item/pushbroom, /obj/item/clothing/suit/caution, @@ -2110,7 +2110,7 @@ /obj/item/clothing/suit/caution, /obj/item/storage/bag/trash, /obj/item/reagent_containers/spray/cleaner, - /obj/item/reagent_containers/glass/rag, + /obj/item/reagent_containers/cup/rag, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner) @@ -2153,15 +2153,15 @@ cost = 1500 max_supply = 5 contains = list(/obj/item/storage/box/drinkingglasses, - /obj/item/reagent_containers/food/drinks/shaker, - /obj/item/reagent_containers/food/drinks/bottle/patron, - /obj/item/reagent_containers/food/drinks/bottle/goldschlager, - /obj/item/reagent_containers/food/drinks/ale, - /obj/item/reagent_containers/food/drinks/ale, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/cup/glass/shaker, + /obj/item/reagent_containers/cup/glass/bottle/patron, + /obj/item/reagent_containers/cup/glass/bottle/goldschlager, + /obj/item/reagent_containers/cup/glass/bottle/ale, + /obj/item/reagent_containers/cup/glass/bottle/ale, + /obj/item/reagent_containers/cup/glass/bottle/beer, + /obj/item/reagent_containers/cup/glass/bottle/beer, + /obj/item/reagent_containers/cup/glass/bottle/beer, + /obj/item/reagent_containers/cup/glass/bottle/beer, /obj/item/flashlight/glowstick, /obj/item/flashlight/glowstick/red, /obj/item/flashlight/glowstick/blue, @@ -2412,15 +2412,15 @@ cost = 1000 max_supply = 4 access_budget = ACCESS_KITCHEN - contains = list(/obj/item/reagent_containers/food/condiment/flour, - /obj/item/reagent_containers/food/condiment/rice, - /obj/item/reagent_containers/food/condiment/milk, - /obj/item/reagent_containers/food/condiment/soymilk, - /obj/item/reagent_containers/food/condiment/saltshaker, - /obj/item/reagent_containers/food/condiment/peppermill, + contains = list(/obj/item/reagent_containers/condiment/flour, + /obj/item/reagent_containers/condiment/rice, + /obj/item/reagent_containers/condiment/milk, + /obj/item/reagent_containers/condiment/soymilk, + /obj/item/reagent_containers/condiment/saltshaker, + /obj/item/reagent_containers/condiment/peppermill, /obj/item/storage/fancy/egg_box, - /obj/item/reagent_containers/food/condiment/enzyme, - /obj/item/reagent_containers/food/condiment/sugar, + /obj/item/reagent_containers/condiment/enzyme, + /obj/item/reagent_containers/condiment/sugar, /obj/item/food/meat/slab/monkey, /obj/item/food/grown/banana, /obj/item/food/grown/banana, @@ -2461,8 +2461,8 @@ access_budget = ACCESS_HYDROPONICS contains = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/reagent_containers/spray/plantbgone, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/reagent_containers/cup/bottle/ammonia, + /obj/item/reagent_containers/cup/bottle/ammonia, /obj/item/hatchet, /obj/item/cultivator, /obj/item/plant_analyzer, @@ -2636,7 +2636,7 @@ crate_type = /obj/structure/closet/crate contains = list(/obj/item/stack/sheet/mineral/coal/five, /obj/machinery/grill/unwrenched, - /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy + /obj/item/reagent_containers/cup/soda_cans/monkey_energy ) crate_name = "grilling starter kit crate" @@ -2647,7 +2647,7 @@ max_supply = 5 crate_type = /obj/structure/closet/crate contains = list(/obj/item/stack/sheet/mineral/coal/ten, - /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy + /obj/item/reagent_containers/cup/soda_cans/monkey_energy ) crate_name = "grilling fuel kit crate" @@ -2915,7 +2915,7 @@ /obj/item/storage/pill_bottle/aranesp, /obj/item/storage/pill_bottle/stimulant, /obj/item/toy/cards/deck/syndicate, - /obj/item/reagent_containers/food/drinks/bottle/absinthe, + /obj/item/reagent_containers/cup/glass/bottle/absinthe, /obj/item/clothing/under/syndicate/tacticool, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, @@ -3067,7 +3067,7 @@ /obj/item/clothing/mask/gas/mime, /obj/item/clothing/head/frenchberet, /obj/item/clothing/suit/suspenders, - /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, + /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing, /obj/item/storage/backpack/mime) crate_name = "standard costume crate" crate_type = /obj/structure/closet/crate/wooden @@ -3459,8 +3459,8 @@ cost = 4000 max_supply = 3 access_budget = ACCESS_CHAPEL_OFFICE - contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater, - /obj/item/reagent_containers/food/drinks/bottle/holywater, + contains = list(/obj/item/reagent_containers/cup/glass/bottle/holywater, + /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/book/bible/booze, /obj/item/storage/book/bible/booze, /obj/item/clothing/neck/crucifix/rosary, diff --git a/code/modules/client/preferences/entries/character/quirks/alcoholic.dm b/code/modules/client/preferences/entries/character/quirks/alcoholic.dm index 849a1e15e4096..bbaa970e6bb35 100644 --- a/code/modules/client/preferences/entries/character/quirks/alcoholic.dm +++ b/code/modules/client/preferences/entries/character/quirks/alcoholic.dm @@ -8,7 +8,7 @@ /datum/preference/choiced/quirk/alcohol_type/compile_constant_data() var/list/data = ..() var/list/clean_names = list("Random" = "Random") - for(var/obj/item/reagent_containers/food/drinks/bottle/S as() in GLOB.alcoholic_bottles) + for(var/obj/item/reagent_containers/cup/glass/bottle/S as() in GLOB.alcoholic_bottles) clean_names[S] = initial(S.name) data[CHOICED_PREFERENCE_DISPLAY_NAMES] = clean_names return data diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 9a98ad4a3d06f..7c7d7e996ff89 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -83,7 +83,7 @@ /obj/item/clothing/head/fedora/det_hat/Initialize(mapload) . = ..() - new /obj/item/reagent_containers/food/drinks/flask/det(src) + new /obj/item/reagent_containers/cup/glass/flask/det(src) /obj/item/clothing/head/fedora/det_hat/examine(mob/user) . = ..() diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index bcf67ded1cdc1..7c329aa4296a0 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -275,7 +275,7 @@ /obj/item/storage/box/lights/mixed=1, /obj/item/melee/baton/loaded=1, /obj/item/mop/advanced=1, - /obj/item/reagent_containers/glass/bucket=1, + /obj/item/reagent_containers/cup/bucket=1, /obj/item/grenade/clusterbuster/cleaner=1, /obj/item/choice_beacon/janicart) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 4c3778b87311f..a3699867c6805 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -79,7 +79,7 @@ suit = null head = null r_hand = /obj/item/mop - l_hand = /obj/item/reagent_containers/glass/bucket + l_hand = /obj/item/reagent_containers/cup/bucket r_pocket = /obj/item/grenade/chem_grenade/cleaner l_pocket = /obj/item/grenade/chem_grenade/cleaner backpack_contents = list(/obj/item/stack/tile/iron=6) @@ -88,7 +88,7 @@ if(visualsOnly) return - var/obj/item/reagent_containers/glass/bucket/bucket = H.get_item_for_held_index(1) + var/obj/item/reagent_containers/cup/bucket/bucket = H.get_item_for_held_index(1) bucket.reagents.add_reagent(/datum/reagent/water,70) /datum/outfit/laser_tag diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 2d712c3fbc15c..e98d310c06585 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -135,7 +135,7 @@ Contains: icon_state = "pirate" item_state = "pirate" w_class = WEIGHT_CLASS_NORMAL - allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum) + allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum) slowdown = 0 armor = list(MELEE = 30, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 60, ACID = 75, STAMINA = 20, BLEED = 20) strip_delay = 40 @@ -277,7 +277,7 @@ Contains: icon_state = "ert_janitor" item_state = "ert_janitor" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/jani - allowed = list(/obj/item/storage/bag/trash, /obj/item/melee/flyswatter, /obj/item/mop, /obj/item/holosign_creator/janibarrier, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/spray/chemsprayer/janitor) + allowed = list(/obj/item/storage/bag/trash, /obj/item/melee/flyswatter, /obj/item/mop, /obj/item/holosign_creator/janibarrier, /obj/item/reagent_containers/cup/bucket, /obj/item/reagent_containers/spray/chemsprayer/janitor) /obj/item/clothing/suit/space/eva name = "EVA suit" diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm index 5ba05f80d4d4f..746af2c1799d4 100644 --- a/code/modules/clothing/suits/chaplainsuits.dm +++ b/code/modules/clothing/suits/chaplainsuits.dm @@ -1,7 +1,7 @@ //Chaplain Suit Subtypes //If any new staple chaplain items get added, put them in these lists /obj/item/clothing/suit/chaplainsuit - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) icon = 'icons/obj/clothing/suits/chaplain.dmi' worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' @@ -14,7 +14,7 @@ equip_delay_other = 60 /obj/item/clothing/suit/hooded/chaplainsuit - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) //Suits /obj/item/clothing/suit/chaplainsuit/holidaypriest @@ -104,7 +104,7 @@ item_state = "clownpriest" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT - allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana) + allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/cup/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana) //The good stuff below @@ -126,7 +126,7 @@ desc = "God wills it!" icon_state = "knight_templar" item_state = null - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) slowdown = 0 move_sound = null @@ -236,7 +236,7 @@ worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' item_state = null body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) hoodtype = /obj/item/clothing/head/hooded/chaplain_hood /obj/item/clothing/head/hooded/chaplain_hood diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index 3df266b753631..ad6e2eb08d999 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -18,7 +18,7 @@ icon_state = "pirate" item_state = null body_parts_covered = CHEST|GROIN|ARMS - allowed = list(/obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum) + allowed = list(/obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum) /obj/item/clothing/suit/costume/pirate/captain name = "pirate captain coat" @@ -109,7 +109,7 @@ item_state = "imperium_monk" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDESHOES|HIDEJUMPSUIT - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) /obj/item/clothing/suit/costume/chickensuit name = "chicken suit" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 28356c7d1a6c8..176f65d639c5e 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -16,8 +16,8 @@ /obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, - /obj/item/reagent_containers/glass/bottle, - /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/cup/bottle, + /obj/item/reagent_containers/cup/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, @@ -35,7 +35,7 @@ item_state = "bio_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT - allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/cup/glass/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) //Chef /obj/item/clothing/suit/toggle/chef @@ -109,7 +109,7 @@ worn_icon = 'icons/mob/clothing/suits/armor.dmi' icon_state = "brig_phys_vest" item_state = "sec_helm"//looks kinda similar, I guess - allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/storage/firstaid, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/storage/firstaid, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 50, ACID = 50, STAMINA = 30, BLEED = 20) //Engineering diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 38daa6ea23bad..568d914a6dc66 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -17,8 +17,8 @@ /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, - /obj/item/reagent_containers/glass/bottle, - /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/cup/bottle, + /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index 1a84fe2a29d0d..7a65f42337de7 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -110,8 +110,8 @@ /obj/item/healthanalyzer, /obj/item/paper, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, @@ -146,8 +146,8 @@ /obj/item/melee/classic_baton/police/telescopic, /obj/item/paper, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, @@ -181,8 +181,8 @@ /obj/item/melee/classic_baton/police/telescopic, /obj/item/paper, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, @@ -218,8 +218,8 @@ /obj/item/melee/classic_baton/police/telescopic, /obj/item/paper, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, @@ -259,8 +259,8 @@ /obj/item/melee/classic_baton/police/telescopic, /obj/item/paper, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, @@ -286,7 +286,7 @@ name = "science winter coat" icon_state = "coatscience" item_state = "coatscience" - allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0) hoodtype = /obj/item/clothing/head/hooded/winterhood/science @@ -317,7 +317,7 @@ name = "hydroponics winter coat" icon_state = "coathydro" item_state = "coathydro" - allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) + allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/cup/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro /obj/item/clothing/head/hooded/winterhood/hydro @@ -336,7 +336,7 @@ /obj/item/clipboard, /obj/item/stamp, /obj/item/export_scanner, - /obj/item/reagent_containers/food/drinks/bottle, + /obj/item/reagent_containers/cup/glass/bottle, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, @@ -363,7 +363,7 @@ /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, - /obj/item/reagent_containers/food/drinks/bottle, + /obj/item/reagent_containers/cup/glass/bottle, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, diff --git a/code/modules/crew_objectives/civilian_objectives.dm b/code/modules/crew_objectives/civilian_objectives.dm index f1f83c0eec1e1..8dca445ea8442 100644 --- a/code/modules/crew_objectives/civilian_objectives.dm +++ b/code/modules/crew_objectives/civilian_objectives.dm @@ -233,7 +233,7 @@ jobs = JOB_NAME_MIME /datum/objective/crew/nothingreallymatterstome/check_completion() - return ..() || owner?.current?.check_contents_for(/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing) + return ..() || owner?.current?.check_contents_for(/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing) /datum/objective/crew/nullrod explanation_text = "Don't lose your nullrod. You can still transform it into another item." diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index af4c592983fc5..3128b19658fc6 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -3,7 +3,7 @@ var/transfer_blood = 0 -/obj/item/reagent_containers/glass/rag +/obj/item/reagent_containers/cup/rag name = "damp rag" desc = "For cleaning up messes, you suppose." w_class = WEIGHT_CLASS_TINY @@ -16,11 +16,11 @@ volume = 5 spillable = FALSE -/obj/item/reagent_containers/glass/rag/suicide_act(mob/living/user) +/obj/item/reagent_containers/cup/rag/suicide_act(mob/living/user) user.visible_message("[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS -/obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity) +/obj/item/reagent_containers/cup/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity) . = ..() if(!proximity) return diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index d0572e5cdd9d1..9794866998a40 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -156,7 +156,7 @@ var/turf/T for(var/i in 1 to 10) if(prob(15)) - shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle) + shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle) else if(prob(15)) shuttle_spawns.Add(/obj/item/reagent_containers/syringe) else if(prob(25)) @@ -164,8 +164,8 @@ T = pick_n_take(empty_shuttle_turfs) new infected_assistant(T) shuttle_spawns.Add(/obj/structure/closet/crate) - shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/pierrot_throat) - shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/magnitis) + shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle/pierrot_throat) + shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle/magnitis) if(DEPARTMENT_RESUPPLY) var/list/crate_types = list( diff --git a/code/modules/exploration_crew/exploration_vendor.dm b/code/modules/exploration_crew/exploration_vendor.dm index 53a3d7c3b9779..117ab4adfae4a 100644 --- a/code/modules/exploration_crew/exploration_vendor.dm +++ b/code/modules/exploration_crew/exploration_vendor.dm @@ -25,8 +25,8 @@ new /datum/data/vendor_equipment("Expanded E. Oxygen Tank", /obj/item/tank/internals/emergency_oxygen/engi, 1000), new /datum/data/vendor_equipment("Survival Knife", /obj/item/knife/combat/survival, 1000), new /datum/data/vendor_equipment("Pizza", /obj/item/pizzabox/margherita, 200), - new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 1000), - new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 1000), + new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/cup/glass/bottle/whiskey, 1000), + new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium, 1000), new /datum/data/vendor_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 1500), new /datum/data/vendor_equipment("Soap", /obj/item/soap/nanotrasen, 2000), new /datum/data/vendor_equipment("Laser Pointer", /obj/item/laser_pointer, 3000), diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm deleted file mode 100644 index 1cf34945a959a..0000000000000 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ /dev/null @@ -1,629 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -/// Drinks. -//////////////////////////////////////////////////////////////////////////////// -/obj/item/reagent_containers/food/drinks - name = "drink" - desc = "yummy" - icon = 'icons/obj/drinks.dmi' - icon_state = null - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' - reagent_flags = OPENCONTAINER | DUNKABLE - var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it. - possible_transfer_amounts = list(5,10,15,20,25,30,50) - volume = 50 - resistance_flags = NONE - var/isGlass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it - var/beingChugged = FALSE //We don't want people downing 100u super fast with drinking glasses - -/obj/item/reagent_containers/food/drinks/on_reagent_change(changetype) - . = ..() - gulp_size = max(round(reagents.total_volume / 5), 5) - -/obj/item/reagent_containers/food/drinks/attack(mob/living/M, mob/user, def_zone) - - if(!reagents || !reagents.total_volume) - to_chat(user, "[src] is empty!") - return 0 - - if(!canconsume(M, user)) - return 0 - - if (!is_drainable()) - to_chat(user, "[src]'s lid hasn't been opened!") - return 0 - var/gulp_amount = gulp_size - if(M == user) - if(user.is_zone_selected(BODY_ZONE_PRECISE_MOUTH, precise_only = TRUE) && !beingChugged) - beingChugged = TRUE - user.visible_message("[user] starts chugging [src].", \ - "You start chugging [src].") - if(!do_after(user, 3 SECONDS, target = M)) - return - if(!reagents || !reagents.total_volume) - return - gulp_amount = 50 - user.visible_message("[user] chugs [src].", \ - "You chug [src].") - beingChugged = FALSE - else - user.visible_message("[user] swallows a gulp of [src].", \ - "You swallow a gulp of [src].") - if(HAS_TRAIT(M, TRAIT_VORACIOUS)) - M.changeNext_move(CLICK_CD_MELEE * 0.5) //chug! chug! chug! - - else - M.visible_message("[user] attempts to feed [M] the contents of [src].", \ - "[user] attempts to feed you the contents of [src].") - if(!do_after(user, 3 SECONDS, target = M)) - return - if(!reagents || !reagents.total_volume) - return // The drink might be empty after the delay, such as by spam-feeding - M.visible_message("[user] fed [M] the contents of [src].", \ - "[user] fed you the contents of [src].") - log_combat(user, M, "fed", reagents.log_list()) - - var/fraction = min(gulp_amount/reagents.total_volume, 1) - checkLiked(fraction, M) - reagents.reaction(M, INGEST, fraction) - reagents.trans_to(M, gulp_amount, transfered_by = user) - playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) - return 1 - -/obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user , proximity) - . = ..() - if(!proximity) - return - - if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it. - if(!reagents.total_volume) - to_chat(user, "[src] is empty.") - return - - if(target.reagents.holder_full()) - to_chat(user, "[target] is full.") - return - - var/refill = reagents.get_master_reagent_id() - var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "You transfer [trans] units of the solution to [target].") - - if(iscyborg(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell - var/mob/living/silicon/robot/bro = user - bro.cell.use(30) - addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, add_reagent), refill, trans), 600) - - else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us. - if (!is_refillable()) - to_chat(user, "[src]'s tab isn't open!") - return - - if(!target.reagents.total_volume) - to_chat(user, "[target] is empty.") - return - - if(reagents.holder_full()) - to_chat(user, "[src] is full.") - return - - var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "You fill [src] with [trans] units of the contents of [target].") - -/obj/item/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params) - var/hotness = I.is_hot() - if(hotness && reagents) - reagents.expose_temperature(hotness) - to_chat(user, "You heat [name] with [I]!") - ..() - -/obj/item/reagent_containers/food/drinks/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - . = ..() - if(!.) //if the bottle wasn't caught - smash(hit_atom, throwingdatum?.thrower, TRUE) - -/obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE) - if(!isGlass) - return - if(QDELING(src) || !target) //Invalid loc - return - if(bartender_check(target) && ranged) - return - var/obj/item/broken_bottle/B = new (loc) - B.icon_state = icon_state - var/icon/I = new('icons/obj/drinks.dmi', src.icon_state) - I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1) - I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) - B.icon = I - B.name = "broken [name]" - if(prob(33)) - var/obj/item/shard/S = new(drop_location()) - target.Bumped(S) - playsound(src, "shatter", 70, 1) - transfer_fingerprints_to(B) - qdel(src) - target.Bumped(B) - -/obj/item/reagent_containers/food/drinks/bullet_act(obj/projectile/P) - . = ..() - if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src)) - var/atom/T = get_turf(src) - smash(T) - return - - - -//////////////////////////////////////////////////////////////////////////////// -/// Drinks. END -//////////////////////////////////////////////////////////////////////////////// - - -/obj/item/reagent_containers/food/drinks/trophy - name = "pewter cup" - desc = "Everyone gets a trophy." - icon_state = "pewter_cup" - w_class = WEIGHT_CLASS_TINY - force = 1 - throwforce = 1 - amount_per_transfer_from_this = 5 - custom_materials = list(/datum/material/iron=100) - possible_transfer_amounts = list() - volume = 5 - flags_1 = CONDUCT_1 - spillable = TRUE - resistance_flags = FIRE_PROOF - isGlass = FALSE - -/obj/item/reagent_containers/food/drinks/trophy/gold_cup - name = "gold cup" - desc = "You're winner!" - icon_state = "golden_cup" - w_class = WEIGHT_CLASS_BULKY - force = 14 - throwforce = 10 - amount_per_transfer_from_this = 20 - custom_materials = list(/datum/material/gold=1000) - volume = 150 - -/obj/item/reagent_containers/food/drinks/trophy/silver_cup - name = "silver cup" - desc = "Best loser!" - icon_state = "silver_cup" - w_class = WEIGHT_CLASS_NORMAL - force = 10 - throwforce = 8 - amount_per_transfer_from_this = 15 - custom_materials = list(/datum/material/silver=800) - volume = 100 - - -/obj/item/reagent_containers/food/drinks/trophy/bronze_cup - name = "bronze cup" - desc = "At least you ranked!" - icon_state = "bronze_cup" - w_class = WEIGHT_CLASS_SMALL - force = 5 - throwforce = 4 - amount_per_transfer_from_this = 10 - custom_materials = list(/datum/material/iron=400) - volume = 25 - -///////////////////////////////////////////////Drinks -//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly -// rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50. -// Formatting is the same as food. - -/obj/item/reagent_containers/food/drinks/coffee - name = "Robust coffee" - desc = "Careful, the beverage you're about to enjoy is extremely hot." - icon_state = "coffee" - list_reagents = list(/datum/reagent/consumable/coffee = 30) - spillable = TRUE - resistance_flags = FREEZE_PROOF - isGlass = FALSE - foodtype = BREAKFAST - -/obj/item/reagent_containers/food/drinks/bubble_tea - name = "Bubble tea" - desc = "Refreshing! You aren't sure what those things in the bottom are." - icon_state = "bubble_tea" - list_reagents = list(/datum/reagent/consumable/bubble_tea = 50) - foodtype = SUGAR - spillable = TRUE - isGlass = FALSE - -/obj/item/reagent_containers/food/drinks/ice - name = "ice cup" - desc = "Careful, cold ice, do not chew." - custom_price = 5 - icon_state = "coffee" - list_reagents = list(/datum/reagent/consumable/ice = 30) - spillable = TRUE - isGlass = FALSE - -/obj/item/reagent_containers/food/drinks/ice/prison - name = "dirty ice cup" - desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones." - list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5) - -/obj/item/reagent_containers/food/drinks/mug/ // parent type is literally just so empty mug sprites are a thing - name = "mug" - desc = "A drink served in a classy mug." - icon_state = "tea" - item_state = "coffee" - spillable = TRUE - -/obj/item/reagent_containers/food/drinks/mug/on_reagent_change(changetype) - if(reagents.total_volume) - icon_state = "tea" - else - icon_state = "tea_empty" - -/obj/item/reagent_containers/food/drinks/mug/tea - name = "Duke Purple tea" - desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." - list_reagents = list(/datum/reagent/consumable/tea = 30) - -/obj/item/reagent_containers/food/drinks/mug/cocoa - name = "Dutch hot cocoa" - desc = "Made in Space South America." - list_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 15, /datum/reagent/consumable/sugar = 5) - foodtype = SUGAR - resistance_flags = FREEZE_PROOF - custom_price = 42 - -/obj/item/reagent_containers/food/drinks/dry_ramen - name = "cup ramen" - desc = "Just add 5ml of water, self heats! A taste that reminds you of your school years. Now new with salty flavour!" - icon_state = "ramen" - list_reagents = list( - /datum/reagent/consumable/dry_ramen = 15, - /datum/reagent/consumable/sodiumchloride = 3, - /datum/reagent/consumable/maltodextrin = 5 - ) - foodtype = GRAIN - isGlass = FALSE - custom_price = 38 - -/obj/item/reagent_containers/food/drinks/beer - name = "space beer" - desc = "Beer. In space." - icon_state = "beer" - list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) - foodtype = GRAIN | ALCOHOL - -/obj/item/reagent_containers/food/drinks/beer/almost_empty - var/amount - list_reagents = null - -/obj/item/reagent_containers/food/drinks/beer/almost_empty/Initialize(mapload) - . = ..() - amount = rand(1,4) - reagents.add_reagent(/datum/reagent/consumable/ethanol/beer, amount) - -/obj/item/reagent_containers/food/drinks/syndicatebeer - name = "syndicate beer" - desc = "Consumed only by the finest syndicate agents. There is a round warning label stating 'Don't drink more than one in quick succession!'" - icon_state = "syndicatebeer" - list_reagents = list(/datum/reagent/consumable/ethanol/beer = 10, /datum/reagent/medicine/antitoxin = 20) - foodtype = GRAIN | ALCOHOL - -/obj/item/reagent_containers/food/drinks/ftliver - name = "Faster-Than-Liver" - desc = "They've gone into plaid!" - icon_state = "ftliver" - list_reagents = list(/datum/reagent/consumable/ethanol/ftliver = 30) - foodtype = ALCOHOL - -/obj/item/reagent_containers/food/drinks/beer/light - name = "Carp Lite" - desc = "Brewed with \"Pure Ice Asteroid Spring Water\"." - list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30) - -/obj/item/reagent_containers/food/drinks/ale - name = "Magm-Ale" - desc = "A true dorf's drink of choice." - icon_state = "alebottle" - item_state = "beer" - list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30) - foodtype = GRAIN | ALCOHOL - -/obj/item/reagent_containers/food/drinks/sillycup - name = "paper cup" - desc = "A paper water cup." - icon_state = "water_cup_e" - possible_transfer_amounts = list() - volume = 10 - spillable = TRUE - isGlass = FALSE - -/obj/item/reagent_containers/food/drinks/sillycup/on_reagent_change(changetype) - if(reagents.total_volume) - icon_state = "water_cup" - else - icon_state = "water_cup_e" - -/obj/item/reagent_containers/food/drinks/sillycup/smallcarton - name = "small carton" - desc = "A small carton, intended for holding drinks." - icon_state = "juicebox" - volume = 15 //I figure if you have to craft these it should at least be slightly better than something you can get for free from a watercooler - -/obj/item/reagent_containers/food/drinks/sillycup/smallcarton/smash(atom/target, mob/thrower, ranged = FALSE) - if(bartender_check(target) && ranged) - return - var/obj/item/broken_bottle/B = new (loc) - B.icon_state = icon_state - var/icon/I = new('icons/obj/drinks.dmi', src.icon_state) - I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1) - I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) - B.icon = I - B.name = "broken [name]" - B.force = 0 - B.throwforce = 0 - B.desc = "A carton with the bottom half burst open. Might give you a papercut." - transfer_fingerprints_to(B) - qdel(src) - target.Bumped(B) - -/obj/item/reagent_containers/food/drinks/sillycup/smallcarton/on_reagent_change(changetype) - if (reagents.reagent_list.len) - switch(reagents.get_master_reagent_id()) - if(/datum/reagent/consumable/orangejuice) - icon_state = "orangebox" - name = "orange juice box" - desc = "A great source of vitamins. Stay healthy!" - foodtype = FRUIT | BREAKFAST - if(/datum/reagent/consumable/milk) - icon_state = "milkbox" - name = "carton of milk" - desc = "An excellent source of calcium for growing space explorers." - foodtype = DAIRY | BREAKFAST - if(/datum/reagent/consumable/applejuice) - icon_state = "juicebox" - name = "apple juice box" - desc = "Sweet apple juice. Don't be late for school!" - foodtype = FRUIT - if(/datum/reagent/consumable/grapejuice) - icon_state = "grapebox" - name = "grape juice box" - desc = "Tasty grape juice in a fun little container. Non-alcoholic!" - foodtype = FRUIT - if(/datum/reagent/consumable/pineapplejuice) - icon_state = "pineapplebox" - name = "pineapple juice box" - desc = "Why would you even want this?" - if(/datum/reagent/consumable/milk/chocolate_milk) - icon_state = "chocolatebox" - name = "carton of chocolate milk" - desc = "Milk for cool kids!" - foodtype = SUGAR - if(/datum/reagent/consumable/ethanol/eggnog) - icon_state = "nog2" - name = "carton of eggnog" - desc = "For enjoying the most wonderful time of the year." - foodtype = MEAT - else - icon_state = "juicebox" - name = "small carton" - desc = "A small carton, intended for holding drinks." - -/obj/item/reagent_containers/food/drinks/honeycomb - name = "Honeycomb" - desc = "A honeycomb made by an apid. It seems to be made out of beeswax and fairly weak." - icon = 'icons/obj/hydroponics/harvest.dmi' - icon_state = "honeycomb" - list_reagents = list(/datum/reagent/consumable/honey = 25) - -/obj/item/reagent_containers/food/drinks/honeycomb/attack_self(mob/user) - if(!reagents.total_volume) - user.visible_message("[user] snaps the [src] into 2 pieces!", - "You snap [src] in half.") - new /obj/item/stack/sheet/wax(user.loc, 2) - qdel(src) - return - return ..() - -//////////////////////////drinkingglass and shaker// -//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink -// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass -// icon states. - -/obj/item/reagent_containers/food/drinks/shaker - name = "shaker" - desc = "A metal shaker to mix drinks in." - icon_state = "shaker" - custom_materials = list(/datum/material/iron=1500) - amount_per_transfer_from_this = 10 - volume = 100 - isGlass = FALSE - -/obj/item/reagent_containers/food/drinks/flask - name = "flask" - desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go." - custom_price = 30 - icon_state = "flask" - custom_materials = list(/datum/material/iron=250) - volume = 60 - isGlass = FALSE - -/obj/item/reagent_containers/food/drinks/flask/gold - name = "captain's flask" - desc = "A gold flask belonging to the captain." - icon_state = "flask_gold" - custom_materials = list(/datum/material/gold=500) - -/obj/item/reagent_containers/food/drinks/flask/det - name = "detective's flask" - desc = "The detective's only true friend." - icon_state = "detflask" - list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30) - -/obj/item/reagent_containers/food/drinks/britcup - name = "cup" - desc = "A cup with the british flag emblazoned on it." - icon_state = "britcup" - volume = 30 - spillable = TRUE - - -//////////////////////////soda_cans// -//These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm - -/obj/item/reagent_containers/food/drinks/soda_cans - name = "soda can" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' - reagent_flags = NONE - spillable = FALSE - isGlass = FALSE - custom_price = 10 - -/obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/human/H) - if(!reagents.total_volume) - H.visible_message("[H] is trying to take a big sip from [src]... The can is empty!") - return SHAME - if(!is_drainable()) - open_soda() - sleep(10) - H.visible_message("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!") - playsound(H,'sound/items/drink.ogg', 80, 1) - reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip - sleep(5) - H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old-fashioned singularity engines anymore.")) - if(H.age >= 30) - H.Stun(50) - sleep(50) - playsound(H,'sound/items/drink.ogg', 80, 1) - H.say(pick("Another day, another dollar.", "I wonder if I should hold?", "Diversifying is for young'ns.", "Yeap, times were good back then.")) - return MANUAL_SUICIDE_NONLETHAL - sleep(20) //dramatic pause - return TOXLOSS - -/obj/item/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user) - if(M == user && !src.reagents.total_volume && user.a_intent == INTENT_HARM && user.is_zone_selected(BODY_ZONE_HEAD)) - user.visible_message("[user] crushes the can of [src] on [user.p_their()] forehead!", "You crush the can of [src] on your forehead.") - playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1) - var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc) - crushed_can.icon_state = icon_state - qdel(src) - ..() - -/obj/item/reagent_containers/food/drinks/soda_cans/bullet_act(obj/projectile/P) - . = ..() - if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src)) - var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc) - crushed_can.icon_state = icon_state - var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs)) - crushed_can.throw_at(throw_target, rand(1,2), 7) - qdel(src) - return - -/obj/item/reagent_containers/food/drinks/soda_cans/proc/open_soda(mob/user) - to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh - ENABLE_BITFIELD(reagents.flags, OPENCONTAINER) - playsound(src, "can_open", 50, 1) - spillable = TRUE - -/obj/item/reagent_containers/food/drinks/soda_cans/attack_self(mob/user) - if(!is_drainable()) - open_soda(user) - return ..() - -/obj/item/reagent_containers/food/drinks/soda_cans/cola - name = "Space Cola" - desc = "Cola. in space." - icon_state = "cola" - list_reagents = list(/datum/reagent/consumable/space_cola = 30) - foodtype = SUGAR - -/obj/item/reagent_containers/food/drinks/soda_cans/tonic - name = "T-Borg's tonic water" - desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." - icon_state = "tonic" - list_reagents = list(/datum/reagent/consumable/tonic = 50) - foodtype = ALCOHOL - -/obj/item/reagent_containers/food/drinks/soda_cans/sodawater - name = "soda water" - desc = "A can of soda water. Why not make a scotch and soda?" - icon_state = "sodawater" - list_reagents = list(/datum/reagent/consumable/sodawater = 50) - -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime - name = "orange soda" - desc = "You wanted ORANGE. It gave you Lemon Lime." - icon_state = "lemon-lime" - list_reagents = list(/datum/reagent/consumable/lemon_lime = 30) - foodtype = FRUIT - -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize(mapload) - . = ..() - name = "lemon-lime soda" - -/obj/item/reagent_containers/food/drinks/soda_cans/space_up - name = "Space-Up!" - desc = "Tastes like a hull breach in your mouth." - icon_state = "space-up" - list_reagents = list(/datum/reagent/consumable/space_up = 30) - foodtype = SUGAR | JUNKFOOD - -/obj/item/reagent_containers/food/drinks/soda_cans/starkist - name = "Star-kist" - desc = "The taste of a star in liquid form. And, a bit of tuna...?" - icon_state = "starkist" - list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15) - foodtype = SUGAR | FRUIT | JUNKFOOD - -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind - name = "Space Mountain Wind" - desc = "Blows right through you like a space wind." - icon_state = "space_mountain_wind" - list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30) - foodtype = SUGAR | JUNKFOOD - -/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko - name = "Thirteen Loko" - desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." - icon_state = "thirteen_loko" - list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30) - foodtype = SUGAR | JUNKFOOD - -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb - name = "Dr. Gibb" - desc = "A delicious mixture of 42 different flavors." - icon_state = "dr_gibb" - list_reagents = list(/datum/reagent/consumable/dr_gibb = 30) - foodtype = SUGAR | JUNKFOOD - -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game - name = "Pwr Game" - desc = "The only drink with the PWR that true gamers crave." - icon_state = "purple_can" - list_reagents = list(/datum/reagent/consumable/pwr_game = 30) - -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers - name = "Shambler's juice" - desc = "~Shake me up some of that Shambler's Juice!~" - icon_state = "shamblers" - list_reagents = list(/datum/reagent/consumable/shamblers = 30) - foodtype = SUGAR | JUNKFOOD - -/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull - name = "Grey Bull" - desc = "Grey Bull, it gives you gloves!" - icon_state = "energy_drink" - list_reagents = list(/datum/reagent/consumable/grey_bull = 20) - foodtype = SUGAR | JUNKFOOD - -/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy - name = "Monkey Energy" - desc = "Unleash the ape!" - icon_state = "monkey_energy" - list_reagents = list(/datum/reagent/consumable/monkey_energy = 50) - foodtype = SUGAR | JUNKFOOD - -/obj/item/reagent_containers/food/drinks/soda_cans/air - name = "canned air" - desc = "There is no air shortage. Do not drink." - icon_state = "air" - list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm deleted file mode 100644 index c56380494a4b3..0000000000000 --- a/code/modules/food_and_drinks/food.dm +++ /dev/null @@ -1,53 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -/// Food. -//////////////////////////////////////////////////////////////////////////////// -/// Note: When adding food items with dummy parents, make sure to add -/// the parent to the exclusion list in code/__HELPERS/unsorted.dm's -/// get_random_food proc. -//////////////////////////////////////////////////////////////////////////////// - -/obj/item/reagent_containers/food - possible_transfer_amounts = list() - volume = 50 //Sets the default container amount for all food items. - reagent_flags = INJECTABLE - resistance_flags = FLAMMABLE - var/foodtype = NONE - var/last_check_time - var/in_container = FALSE //currently just stops "was bitten X times!" messages on canned food - -/obj/item/reagent_containers/food/Initialize(mapload) - . = ..() - if(!mapload) - pixel_x = rand(-5, 5) - pixel_y = rand(-5, 5) - -/obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) - if(last_check_time + 50 < world.time) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE) - - if((foodtype & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST) - SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast) - last_check_time = world.time - - if(!T) //if you don't have a tongue you don't taste.. - return - - if(!HAS_TRAIT(H, TRAIT_AGEUSIA)) - if(foodtype & T.toxic_food) - to_chat(H,"What the hell was that thing?!") - H.adjust_disgust(25 + 30 * fraction) - SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food) - else if(foodtype & T.disliked_food) - to_chat(H,"That didn't taste very good...") - H.adjust_disgust(11 + 15 * fraction) - SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food) - else if(foodtype & T.liked_food) - to_chat(H,"I love this taste!") - H.adjust_disgust(-5 + -2.5 * fraction) - SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food) - else - if(foodtype & T.toxic_food) - to_chat(H, "You don't feel so good...") - H.adjust_disgust(25 + 30 * fraction) diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 84bcfb5270c74..4ed9d8d7ee6a7 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -10,9 +10,9 @@ God bless America. /// Global typecache of things which should never be fried. GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( - /obj/item/reagent_containers/glass, + /obj/item/reagent_containers/cup, /obj/item/reagent_containers/syringe, - /obj/item/reagent_containers/food/condiment, + /obj/item/reagent_containers/condiment, /obj/item/small_delivery, /obj/item/his_grace, ))) diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm index a5186e45ddc8a..95e8c8d7df5b3 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm @@ -34,8 +34,8 @@ if(O.tool_behaviour == TOOL_WRENCH) default_unfasten_wrench(user, O, 0) return TRUE - if(istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass)) - var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = O + if(istype(O, /obj/item/reagent_containers/cup/glass/drinkingglass)) + var/obj/item/reagent_containers/cup/glass/drinkingglass/DG = O if(!DG.reagents.total_volume) //glass is empty qdel(DG) glasses++ @@ -132,7 +132,7 @@ to_chat(usr, "There are no glasses left!") glasses = 0 else - var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = new(loc) + var/obj/item/reagent_containers/cup/glass/drinkingglass/DG = new(loc) if(href_list["pour"]) reagents.trans_id_to(DG, reagents.reagent_list[text2num(href_list["pour"])]?.type, portion) if(href_list["m_pour"]) diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index b4a43d9308d0f..4ecb27d42b8e6 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -51,7 +51,7 @@ if(I.resistance_flags & INDESTRUCTIBLE) to_chat(user, "You don't feel it would be wise to grill [I]...") return ..() - if(istype(I, /obj/item/reagent_containers/glass)) + if(istype(I, /obj/item/reagent_containers/cup)) if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy)) grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy))) to_chat(user, "You pour the Monkey Energy in [src].") diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index ac38d414529c7..1713d03236f04 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -225,7 +225,7 @@ to_chat(user, "You need more space cleaner!") return TRUE - if(istype(O, /obj/item/soap) || istype(O, /obj/item/reagent_containers/glass/rag)) + if(istype(O, /obj/item/soap) || istype(O, /obj/item/reagent_containers/cup/rag)) var/cleanspeed = 50 if(istype(O, /obj/item/soap)) var/obj/item/soap/used_soap = O @@ -331,7 +331,7 @@ muck() return for(var/obj/O in ingredients) - if(istype(O, /obj/item/reagent_containers/food) || istype(O, /obj/item/grown)) + if(istype(O, /obj/item/food) || istype(O, /obj/item/grown)) continue if(prob(min(dirty * 5, 100))) start_can_fail() diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 878c905287fbc..08310ad408ac1 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -398,9 +398,9 @@ desc = "A refrigerated storage unit for tasty tasty alcohol." /obj/machinery/smartfridge/drinks/accept_check(obj/item/O) - if(!istype(O, /obj/item/reagent_containers) || (O.item_flags & ABSTRACT) || !O.reagents || !O.reagents.reagent_list.len) + if(!is_reagent_container(O) || (O.item_flags & ABSTRACT) || !O.reagents || !O.reagents.reagent_list.len) return FALSE - if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks) || istype(O, /obj/item/reagent_containers/food/condiment)) + if(istype(O, /obj/item/reagent_containers/cup) || istype(O, /obj/item/reagent_containers/cup/glass) || istype(O, /obj/item/reagent_containers/condiment)) return TRUE // ---------------------------- @@ -491,7 +491,7 @@ return TRUE if(!O.reagents || !O.reagents.reagent_list.len) // other empty containers not accepted return FALSE - if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) \ + if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/cup/bottle) || istype(O, /obj/item/reagent_containers/cup/beaker) \ || istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray) || istype(O, /obj/item/reagent_containers/chem_bag)) return TRUE return FALSE @@ -500,8 +500,8 @@ initial_contents = list( /obj/item/reagent_containers/pill/epinephrine = 12, /obj/item/reagent_containers/pill/charcoal = 5, - /obj/item/reagent_containers/glass/bottle/epinephrine = 1, - /obj/item/reagent_containers/glass/bottle/charcoal = 1) + /obj/item/reagent_containers/cup/bottle/epinephrine = 1, + /obj/item/reagent_containers/cup/bottle/charcoal = 1) // ---------------------------- // Virology Medical Smartfridge @@ -513,17 +513,17 @@ /obj/machinery/smartfridge/chemistry/virology/preloaded initial_contents = list( /obj/item/reagent_containers/syringe/antiviral = 4, - /obj/item/reagent_containers/glass/bottle/synaptizine = 1, - /obj/item/reagent_containers/glass/bottle/formaldehyde = 1, - /obj/item/reagent_containers/glass/bottle/cryostylane = 1) + /obj/item/reagent_containers/cup/bottle/synaptizine = 1, + /obj/item/reagent_containers/cup/bottle/formaldehyde = 1, + /obj/item/reagent_containers/cup/bottle/cryostylane = 1) /obj/machinery/smartfridge/chemistry/virology/preloaded/Initialize(mapload) .=..() if(CONFIG_GET(flag/allow_virologist)) - new /obj/item/reagent_containers/glass/bottle/cold(src) - new /obj/item/reagent_containers/glass/bottle/flu_virion(src) - new /obj/item/reagent_containers/glass/bottle/mutagen(src) - new /obj/item/reagent_containers/glass/bottle/plasma(src) + new /obj/item/reagent_containers/cup/bottle/cold(src) + new /obj/item/reagent_containers/cup/bottle/flu_virion(src) + new /obj/item/reagent_containers/cup/bottle/mutagen(src) + new /obj/item/reagent_containers/cup/bottle/plasma(src) else desc = "A refrigerated storage unit for volatile sample storage." @@ -541,7 +541,7 @@ symptomholder.Finalize() symptomholder.Refresh() var/list/data = list("viruses" = list(symptomholder)) - var/obj/item/reagent_containers/glass/bottle/B = new + var/obj/item/reagent_containers/cup/bottle/B = new B.name = "[symptomholder.name] culture bottle" B.desc = "A small bottle. Contains [symptomholder.agent] culture in synthblood medium." B.reagents.add_reagent(/datum/reagent/blood, 20, data) @@ -550,7 +550,7 @@ if(!istype(disease, /datum/disease/advance)) var/datum/disease/target = new disease var/list/data = list("viruses" = list(target)) - var/obj/item/reagent_containers/glass/bottle/B = new + var/obj/item/reagent_containers/cup/bottle/B = new B.name = "[target.name] culture bottle" B.desc = "A small bottle. Contains [target.agent] culture in synthblood medium." B.reagents.add_reagent(/datum/reagent/blood, 20, data) diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index 7978435972b18..b6dcfe91218d9 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -221,7 +221,7 @@ else if(is_wire_tool(I)) if(wires && bomb) wires.interact(user) - else if(istype(I, /obj/item/reagent_containers/food)) + else if(istype(I, /obj/item/reagent_containers/cup)) to_chat(user, "That's not a pizza!") ..() diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm index 0d85c78f7db5c..d7a68c3567884 100644 --- a/code/modules/food_and_drinks/plate.dm +++ b/code/modules/food_and_drinks/plate.dm @@ -98,6 +98,6 @@ /obj/item/plate_shard/Initialize(mapload) . = ..() - AddComponent(/datum/component/caltrop, min_damage = force) + AddComponent(/datum/component/caltrop, _min_damage = force) icon_state = "[base_icon_state][pick(1,variants)]" diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 1d6193b28a5b4..d91255e04de1d 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -598,6 +598,22 @@ required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/cocoa = 1) mix_message = "The color changes as the mixture blends smoothly." +/datum/chemical_reaction/hot_cocoa + name = "Hot Coco" + results = list(/datum/reagent/consumable/hot_cocoa = 6) + required_reagents = list(/datum/reagent/consumable/milk = 5, /datum/reagent/consumable/cocoa = 1) + required_temp = 320 + +/datum/chemical_reaction/coffee + name = "Coffee" + results = list(/datum/reagent/consumable/coffee = 5) + required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5) + +/datum/chemical_reaction/tea + name = "Tea" + results = list(/datum/reagent/consumable/tea = 5) + required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5) + /datum/chemical_reaction/eggnog name = /datum/reagent/consumable/ethanol/eggnog id = /datum/reagent/consumable/ethanol/eggnog @@ -688,7 +704,7 @@ name = "Peppermint Patty" id = /datum/reagent/consumable/ethanol/peppermint_patty results = list(/datum/reagent/consumable/ethanol/peppermint_patty = 10) - required_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1) + required_reagents = list(/datum/reagent/consumable/hot_cocoa = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1) mix_message = "The cocoa turns mint green just as the strong scent hits your nose." /datum/chemical_reaction/alexander diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 06a36ca2fbc73..18b1c6b0c3aed 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -37,24 +37,6 @@ for(var/i in 1 to created_volume) new /obj/item/food/chocolatebar(location) -/datum/chemical_reaction/food/hot_cocoa - name = "Hot Cocoa" - id = /datum/reagent/consumable/cocoa/hot_cocoa - results = list(/datum/reagent/consumable/cocoa/hot_cocoa = 5) - required_reagents = list(/datum/reagent/water = 5, /datum/reagent/consumable/cocoa = 1) - -/datum/chemical_reaction/food/coffee - name = "Coffee" - id = /datum/reagent/consumable/coffee - results = list(/datum/reagent/consumable/coffee = 5) - required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5) - -/datum/chemical_reaction/food/tea - name = "Tea" - id = /datum/reagent/consumable/tea - results = list(/datum/reagent/consumable/tea = 5) - required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5) - /datum/chemical_reaction/food/soysauce name = "Soy Sauce" id = /datum/reagent/consumable/soysauce diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index d106fd06f2c46..ddd6aee296999 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -93,7 +93,7 @@ if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST) if(honeycombs.len < get_max_honeycomb()) bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0) - var/obj/item/reagent_containers/honeycomb/HC = new(src) + var/obj/item/reagent_containers/cup/glass/honeycomb/HC = new(src) if(queen_bee.beegent) HC.set_reagent(queen_bee.beegent.type) honeycombs += HC @@ -231,7 +231,7 @@ var/amtH = HF.honeycomb_capacity var/fallen = 0 while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it - var/obj/item/reagent_containers/honeycomb/HC = pick_n_take(honeycombs) + var/obj/item/reagent_containers/cup/glass/honeycomb/HC = pick_n_take(honeycombs) if(HC) HC.forceMove(drop_location()) amtH-- diff --git a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm index a2e2005f31d2f..cfb74ccecebf8 100644 --- a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm +++ b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm @@ -14,4 +14,4 @@ item_state = null body_parts_covered = CHEST|GROIN|LEGS|ARMS clothing_flags = THICKMATERIAL - allowed = list(/obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants) + allowed = list(/obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants) diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm index 0256ec010822b..7986828e2cfad 100644 --- a/code/modules/hydroponics/beekeeping/honeycomb.dm +++ b/code/modules/hydroponics/beekeeping/honeycomb.dm @@ -1,5 +1,5 @@ -/obj/item/reagent_containers/honeycomb +/obj/item/reagent_containers/cup/glass/honeycomb name = "honeycomb" desc = "A hexagonal mesh of honeycomb." icon = 'icons/obj/hydroponics/harvest.dmi' @@ -13,14 +13,14 @@ grind_results = list() var/honey_color = "" -/obj/item/reagent_containers/honeycomb/Initialize(mapload) +/obj/item/reagent_containers/cup/glass/honeycomb/Initialize(mapload) . = ..() pixel_x = rand(8,-8) pixel_y = rand(8,-8) update_icon() -/obj/item/reagent_containers/honeycomb/update_icon() +/obj/item/reagent_containers/cup/glass/honeycomb/update_icon() cut_overlays() var/mutable_appearance/honey_overlay = mutable_appearance(icon, /datum/reagent/consumable/honey) if(honey_color) @@ -29,7 +29,7 @@ add_overlay(honey_overlay) -/obj/item/reagent_containers/honeycomb/proc/set_reagent(reagent) +/obj/item/reagent_containers/cup/glass/honeycomb/proc/set_reagent(reagent) var/datum/reagent/R = GLOB.chemical_reagents_list[reagent] if(istype(R)) name = "honeycomb ([R.name])" diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index ddf667764ba58..e96bd8f4110c6 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -10,7 +10,7 @@ var/processing = FALSE - var/obj/item/reagent_containers/glass/beaker = null + var/obj/item/reagent_containers/cup/beaker = null var/points = 0 var/efficiency = 0 var/productivity = 0 @@ -91,7 +91,7 @@ if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O)) if(beaker) - var/obj/item/reagent_containers/glass/B = beaker + var/obj/item/reagent_containers/cup/B = beaker B.forceMove(drop_location()) beaker = null ui_update() @@ -101,7 +101,7 @@ if(default_deconstruction_crowbar(O)) return - if(istype(O, /obj/item/reagent_containers/glass)) + if(istype(O, /obj/item/reagent_containers/cup)) . = 1 //no afterattack if(!panel_open) if(beaker) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index e23f4ed6ee784..8b995fb82dafe 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -153,50 +153,50 @@ // ************************************* -/obj/item/reagent_containers/glass/bottle/nutrient +/obj/item/reagent_containers/cup/bottle/nutrient name = "bottle of nutrient" volume = 50 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(1,2,5,10,15,25,50) -/obj/item/reagent_containers/glass/bottle/nutrient/Initialize(mapload) +/obj/item/reagent_containers/cup/bottle/nutrient/Initialize(mapload) . = ..() pixel_x = base_pixel_x + rand(-5, 5) pixel_y = base_pixel_y + rand(-5, 5) -/obj/item/reagent_containers/glass/bottle/nutrient/ez +/obj/item/reagent_containers/cup/bottle/nutrient/ez name = "bottle of E-Z-Nutrient" desc = "Contains a fertilizer that causes mild mutations with each harvest." list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 50) icon_state_preview = "bottle_eznutrient" -/obj/item/reagent_containers/glass/bottle/nutrient/l4z +/obj/item/reagent_containers/cup/bottle/nutrient/l4z name = "bottle of Left 4 Zed" desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants." list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 50) icon_state_preview = "bottle_left4zed" -/obj/item/reagent_containers/glass/bottle/nutrient/rh +/obj/item/reagent_containers/cup/bottle/nutrient/rh name = "bottle of Robust Harvest" desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations." list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 50) icon_state_preview = "bottle_robustharvest" -/obj/item/reagent_containers/glass/bottle/nutrient/empty +/obj/item/reagent_containers/cup/bottle/nutrient/empty name = "bottle" -/obj/item/reagent_containers/glass/bottle/killer +/obj/item/reagent_containers/cup/bottle/killer volume = 50 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(1,2,5,10,15,25,50) -/obj/item/reagent_containers/glass/bottle/killer/weedkiller +/obj/item/reagent_containers/cup/bottle/killer/weedkiller name = "bottle of weed killer" desc = "Contains a herbicide." list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 50) -/obj/item/reagent_containers/glass/bottle/killer/pestkiller +/obj/item/reagent_containers/cup/bottle/killer/pestkiller name = "bottle of pest spray" desc = "Contains a pesticide." list_reagents = list(/datum/reagent/toxin/pestkiller = 50) diff --git a/code/modules/jobs/job_mail.dm b/code/modules/jobs/job_mail.dm index 3e2e6525e4a18..9a5d816947ad4 100644 --- a/code/modules/jobs/job_mail.dm +++ b/code/modules/jobs/job_mail.dm @@ -27,20 +27,20 @@ /datum/job/bartender mail_goodies = list( /obj/item/storage/box/rubbershot = 30, - /obj/item/reagent_containers/glass/bottle/clownstears = 10, + /obj/item/reagent_containers/cup/bottle/clownstears = 10, /obj/item/stack/sheet/mineral/plasma = 5, /obj/item/stack/sheet/mineral/uranium = 5, - /obj/item/reagent_containers/food/drinks/bottle/fernet = 3, - /obj/item/reagent_containers/food/drinks/bottle/champagne = 3, - /obj/item/reagent_containers/food/drinks/bottle/trappist = 3, + /obj/item/reagent_containers/cup/glass/bottle/fernet = 3, + /obj/item/reagent_containers/cup/glass/bottle/champagne = 3, + /obj/item/reagent_containers/cup/glass/bottle/trappist = 3, ) //BOTANIST /datum/job/botanist mail_goodies = list( - /obj/item/reagent_containers/glass/bottle/saltpetre = 15, - /obj/item/reagent_containers/glass/bottle/diethylamine = 15, - /obj/item/reagent_containers/glass/bottle/toxin/mutagen = 12, + /obj/item/reagent_containers/cup/bottle/saltpetre = 15, + /obj/item/reagent_containers/cup/bottle/diethylamine = 15, + /obj/item/reagent_containers/cup/bottle/toxin/mutagen = 12, /obj/item/grenade/chem_grenade/antiweed = 10, /obj/item/gun/energy/floragun = 5, // These are strong, rare seeds, so use sparingly. @@ -66,7 +66,7 @@ /obj/item/pen/fountain/captain = 10, /obj/item/coin/plasma = 7, /obj/item/storage/fancy/cigarettes/cigars/havana = 5, - /obj/item/reagent_containers/food/drinks/bottle/champagne = 5, + /obj/item/reagent_containers/cup/glass/bottle/champagne = 5, /obj/item/ammo_box/n762 = 2, /obj/item/gun/ballistic/revolver/nagant = 1, ) @@ -84,7 +84,7 @@ //CHAPLAIN /datum/job/chaplain mail_goodies = list( - /obj/item/reagent_containers/food/drinks/bottle/holywater = 15, + /obj/item/reagent_containers/cup/glass/bottle/holywater = 15, /obj/item/storage/book/bible = 10, /obj/item/grenade/chem_grenade/holy = 5, /obj/item/toy/plush/awakenedplushie = 3, @@ -95,11 +95,11 @@ //CHEMIST /datum/job/chemist mail_goodies = list( - /obj/item/reagent_containers/glass/bottle/flash_powder = 15, + /obj/item/reagent_containers/cup/bottle/flash_powder = 15, /obj/item/reagent_containers/dropper = 10, - /obj/item/reagent_containers/glass/beaker/large = 10, - /obj/item/reagent_containers/glass/beaker/plastic = 10, - /obj/item/reagent_containers/glass/bottle/ketamine = 5, + /obj/item/reagent_containers/cup/beaker/large = 10, + /obj/item/reagent_containers/cup/beaker/plastic = 10, + /obj/item/reagent_containers/cup/bottle/ketamine = 5, ) //CHIEF ENGINEER @@ -107,7 +107,7 @@ mail_goodies = list( //you know. for poly /obj/item/food/cracker = 15, - /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 15, + /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 15, /obj/item/rcd_ammo = 10, /obj/item/wrench/caravan = 3, /obj/item/wirecutters/caravan = 3, @@ -146,12 +146,12 @@ //COOK /datum/job/cook mail_goodies = list( - /obj/item/reagent_containers/glass/bottle/caramel = 20, - /obj/item/reagent_containers/food/condiment/flour = 20, - /obj/item/reagent_containers/food/condiment/rice = 20, - /obj/item/reagent_containers/food/condiment/enzyme = 15, - /obj/item/reagent_containers/food/condiment/soymilk = 15, - /obj/item/reagent_containers/food/condiment/milk = 15, + /obj/item/reagent_containers/cup/bottle/caramel = 20, + /obj/item/reagent_containers/condiment/flour = 20, + /obj/item/reagent_containers/condiment/rice = 20, + /obj/item/reagent_containers/condiment/enzyme = 15, + /obj/item/reagent_containers/condiment/soymilk = 15, + /obj/item/reagent_containers/condiment/milk = 15, //UR SO FAT! /obj/item/food/mint = 12, /obj/item/storage/box/ingredients/wildcard = 10, @@ -194,7 +194,7 @@ mail_goodies = list( /obj/item/storage/fancy/cigarettes = 15, /obj/item/ammo_box/c38 = 10, - /obj/item/reagent_containers/food/drinks/bottle/rum = 10, + /obj/item/reagent_containers/cup/glass/bottle/rum = 10, /obj/item/ammo_box/c38/dumdum = 5, /obj/item/ammo_box/c38/hotshot = 5, /obj/item/ammo_box/c38/iceblox = 5, @@ -306,7 +306,7 @@ mail_goodies = list( /obj/item/healthanalyzer/advanced = 10, /obj/item/storage/pill_bottle/epinephrine = 8, - /obj/item/reagent_containers/glass/bottle/formaldehyde = 6, + /obj/item/reagent_containers/cup/bottle/formaldehyde = 6, /obj/effect/spawner/mail/advmedtool = 4, /obj/effect/spawner/mail/organminor = 5, /obj/effect/spawner/mail/organmajor = 1, @@ -317,7 +317,7 @@ mail_goodies = list( /obj/item/food/baguette/mime = 15, /obj/item/food/cheese/wheel = 10, - /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 10, + /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing = 10, /obj/item/book/mimery = 2, //when you thought it could get worse... /obj/item/book/granter/spell/mimery_blockade = 1, @@ -406,7 +406,7 @@ /datum/job/station_engineer mail_goodies = list( /obj/item/storage/box/lights/mixed = 15, - /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 15, + /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 15, /obj/item/lightreplacer = 10, /obj/item/holosign_creator/engineering = 8, //An assistant can only dream of those... @@ -420,9 +420,9 @@ //keep your workplace clean, please. /obj/item/reagent_containers/spray/cleaner = 15, /obj/item/food/monkeycube = 10, - /obj/item/reagent_containers/glass/bottle/formaldehyde = 10, - /obj/item/reagent_containers/glass/bottle/random_virus/minor = 10, - /obj/item/reagent_containers/glass/bottle/random_virus = 5, + /obj/item/reagent_containers/cup/bottle/formaldehyde = 10, + /obj/item/reagent_containers/cup/bottle/random_virus/minor = 10, + /obj/item/reagent_containers/cup/bottle/random_virus = 5, /obj/item/stock_parts/scanning_module/phasic = 5, //hampter. /obj/item/choice_beacon/pet/hamster = 5, @@ -436,7 +436,7 @@ /obj/item/clothing/ears/headphones = 10, //Only on the iScream 12 /obj/item/clothing/under/syndicate/tacticool = 10, - /obj/item/reagent_containers/food/drinks/flask/gold = 10, + /obj/item/reagent_containers/cup/glass/flask/gold = 10, /obj/item/choice_beacon/pet = 5, /obj/item/storage/bag/money = 5, /obj/item/coin/gold = 5, diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index a6a74bc713df7..4f9a5c62911a7 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -50,7 +50,7 @@ suit = /obj/item/clothing/suit/suspenders backpack_contents = list( /obj/item/book/mimery=1, - /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing=1, + /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing=1, /obj/item/stamp/mime=1 ) diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index f62fc62f87519..b29d72a80de34 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -123,9 +123,9 @@ var/loot = rand(1,100) //100 different crates with varying chances of spawning switch(loot) if(1 to 5) //5% chance - new /obj/item/reagent_containers/food/drinks/bottle/rum(src) + new /obj/item/reagent_containers/cup/glass/bottle/rum(src) new /obj/item/food/grown/ambrosia/deus(src) - new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src) + new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src) new /obj/item/lighter(src) if(6 to 10) new /obj/item/bedsheet(src) @@ -136,7 +136,7 @@ new /obj/item/hatchet(src) new /obj/item/crowbar(src) if(11 to 15) - new /obj/item/reagent_containers/glass/beaker/bluespace(src) + new /obj/item/reagent_containers/cup/beaker/bluespace(src) if(16 to 20) new /obj/item/stack/ore/diamond(src, 10) if(21 to 25) @@ -144,7 +144,7 @@ new /obj/item/poster/random_contraband(src) if(26 to 30) for(var/i in 1 to 3) - new /obj/item/reagent_containers/glass/beaker/noreact(src) + new /obj/item/reagent_containers/cup/beaker/noreact(src) if(31 to 35) new /obj/item/seeds/firelemon(src) if(36 to 40) @@ -235,7 +235,7 @@ new /obj/item/clothing/head/beret(src) new /obj/item/clothing/suit/suspenders(src) new /obj/item/toy/crayon/mime(src) - new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src) + new /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing(src) if(96) new /obj/item/hand_tele(src) if(97) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 1414d9a7abee0..a060e75ef0b1f 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -292,13 +292,13 @@ //CRAFTING -/obj/item/reagent_containers/glass/bowl/mushroom_bowl +/obj/item/reagent_containers/cup/bowl/mushroom_bowl name = "mushroom bowl" desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point." icon = 'icons/obj/lavaland/ash_flora.dmi' icon_state = "mushroom_bowl" -/obj/item/reagent_containers/glass/bowl/mushroom_bowl/update_icon() +/obj/item/reagent_containers/cup/bowl/mushroom_bowl/update_icon() cut_overlays() if(reagents?.total_volume) var/mutable_appearance/filling = mutable_appearance('icons/obj/lavaland/ash_flora.dmi', "fullbowl") diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index a60c049535526..88aa17293bc9a 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -45,8 +45,8 @@ /obj/item/gun/magic/hook = 5, /obj/item/book_of_babel = 5, /obj/item/clothing/neck/necklace/memento_mori = 5, - /obj/item/reagent_containers/glass/waterbottle/relic = 5, - /obj/item/reagent_containers/glass/bottle/necropolis_seed = 5, + /obj/item/reagent_containers/cup/glass/waterbottle/relic = 5, + /obj/item/reagent_containers/cup/bottle/necropolis_seed = 5, /obj/item/borg/upgrade/modkit/lifesteal = 5, /obj/item/shared_storage/red = 5, /obj/item/staff/storm = 5 @@ -302,13 +302,13 @@ qdel(src) // Relic water bottle -/obj/item/reagent_containers/glass/waterbottle/relic +/obj/item/reagent_containers/cup/glass/waterbottle/relic name = "ancient bottle of unknown reagent" desc = "A bottle of water filled with unknown liquids. It seems to be radiating some kind of energy." flip_chance = 100 // FLIPP list_reagents = list() -/obj/item/reagent_containers/glass/waterbottle/relic/Initialize(mapload) +/obj/item/reagent_containers/cup/glass/waterbottle/relic/Initialize(mapload) var/reagents = volume while(reagents) var/newreagent = rand(1, min(reagents, 30)) @@ -588,16 +588,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/shared_storage/blue) //Potion of Flight -/obj/item/reagent_containers/glass/bottle/potion +/obj/item/reagent_containers/cup/bottle/potion icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "potionflask" -/obj/item/reagent_containers/glass/bottle/potion/flight +/obj/item/reagent_containers/cup/bottle/potion/flight name = "strange elixir" desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'." list_reagents = list(/datum/reagent/flightpotion = 5) -/obj/item/reagent_containers/glass/bottle/potion/update_icon() +/obj/item/reagent_containers/cup/bottle/potion/update_icon() if(reagents.total_volume) icon_state = "potionflask" else diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 976f4a1babf2b..f6fdc63876da6 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -210,8 +210,8 @@ new /datum/data/vendor_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500), new /datum/data/vendor_equipment("GAR Mesons", /obj/item/clothing/glasses/meson/gar, 500), new /datum/data/vendor_equipment("Pizza", /obj/item/pizzabox/margherita, 200), - new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100), - new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100), + new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/cup/glass/bottle/whiskey, 100), + new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium, 100), new /datum/data/vendor_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), new /datum/data/vendor_equipment("Soap", /obj/item/soap/nanotrasen, 200), new /datum/data/vendor_equipment("Laser Pointer", /obj/item/laser_pointer, 300), diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 4135e320427ed..3a3cd3f151ba2 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -444,7 +444,7 @@ /obj/item/melee/flyswatter, /obj/item/extinguisher/mini, /obj/item/mop/cyborg, - /obj/item/reagent_containers/glass/bucket, + /obj/item/reagent_containers/cup/bucket, /obj/item/paint/paint_remover, /obj/item/lightreplacer/cyborg, /obj/item/holosign_creator/janibarrier, @@ -537,7 +537,7 @@ /obj/item/robot_module/butler/respawn_consumable(mob/living/silicon/robot/R, coeff = 1) ..() - var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/food/condiment/enzyme) in basic_modules + var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/condiment/enzyme) in basic_modules if(O) O.reagents.add_reagent(/datum/reagent/consumable/enzyme, 2 * coeff) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 9d3538e7f328f..de563e52cd4fa 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -281,7 +281,7 @@ visible_message("[src] blows apart!") var/atom/Tsec = drop_location() - new /obj/item/reagent_containers/glass/bucket(Tsec) + new /obj/item/reagent_containers/cup/bucket(Tsec) new /obj/item/assembly/prox_sensor(Tsec) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 5ed4af3b31cee..3591e458aeb59 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -83,7 +83,7 @@ GLOBAL_VAR(medibot_unique_id_gen) skin = MEDBOT_SKIN_ADVANCED heal_threshold = 30 declare_crit = TRUE - reagent_glass = new /obj/item/reagent_containers/glass/beaker/large/kelobic + reagent_glass = new /obj/item/reagent_containers/cup/beaker/large/kelobic /mob/living/simple_animal/bot/medbot/update_icon() cut_overlays() diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 1b3270e5893a9..b7bd499d3fd2f 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -55,7 +55,7 @@ /mob/living/simple_animal/bot/secbot/beepsky/explode() var/atom/Tsec = drop_location() new /obj/item/stock_parts/cell/potato(Tsec) - var/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/S = new(Tsec) + var/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/S = new(Tsec) S.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15) S.on_reagent_change(ADD_REAGENT) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index c44136d588143..5701f4712fb73 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -111,10 +111,10 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/barf_food(atom/A, hard = FALSE) if (stat == DEAD) return - if(!istype(A, /obj/item/reagent_containers/food)) + if(!istype(A, /obj/item/food)) return var/turf/currentTurf = get_turf(src) - var/obj/item/reagent_containers/food/consumed = A + var/obj/item/food/consumed = A consumed.forceMove(currentTurf) var/destination = get_edge_target_turf(currentTurf, pick(GLOB.alldirs)) //Pick a random direction to toss them in var/throwRange = hard ? rand(2,8) : 1 @@ -174,7 +174,7 @@ "vomit" = CALLBACK(src, PROC_REF(vomit_prestart), 25)), 20) /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/eat() - var/obj/item/reagent_containers/food/tasty = locate() in get_turf(src) + var/obj/item/food/tasty = locate() in get_turf(src) if (tasty) feed(tasty) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 55816114f20c1..55c9e72cdff48 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -328,7 +328,7 @@ belt = null backpack_contents = list() if(prob(70)) - backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/food/grown/banana = 1, /obj/item/megaphone/clown = 1, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter = 1, /obj/item/pneumatic_cannon/pie = 1)) + backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/food/grown/banana = 1, /obj/item/megaphone/clown = 1, /obj/item/reagent_containers/cup/soda_cans/canned_laughter = 1, /obj/item/pneumatic_cannon/pie = 1)) if(prob(30)) backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pick_weight(list( 1 = 3, 2 = 2, 3 = 1))) if(prob(10)) @@ -377,5 +377,5 @@ r_pocket = /obj/item/restraints/legcuffs/bola/cult l_pocket = /obj/item/melee/cultblade/dagger glasses = /obj/item/clothing/glasses/hud/health/night/cultblind - backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15) + backpack_contents = list(/obj/item/reagent_containers/cup/glass/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15) . = ..() diff --git a/code/modules/modular_computers/file_system/programs/phys_scanner.dm b/code/modules/modular_computers/file_system/programs/phys_scanner.dm index d98c8d71917f8..6a81c41c8b27f 100644 --- a/code/modules/modular_computers/file_system/programs/phys_scanner.dm +++ b/code/modules/modular_computers/file_system/programs/phys_scanner.dm @@ -46,7 +46,7 @@ user.visible_message("[user] analyzes [carbon]'s vitals.", "You analyze [carbon]'s vitals.") last_record = chemscan(user, carbon, to_chat = FALSE) return FALSE - else if(!istype(target, /obj/item/reagent_containers/pill/floorpill) && !istype(target, /obj/item/reagent_containers/glass/chem_heirloom)) + else if(!istype(target, /obj/item/reagent_containers/pill/floorpill) && !istype(target, /obj/item/reagent_containers/cup/chem_heirloom)) if(!isnull(target.reagents)) if(target.reagents.reagent_list.len > 0) var/reagents_length = target.reagents.reagent_list.len diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index 0e70569dc52e2..a517c67c4d8b3 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -4,7 +4,7 @@ if(U!=affecting)//Safety, in case you try doing this without wearing the suit/being the person with the suit. return ..() - if(istype(I, /obj/item/reagent_containers/glass))//If it's a glass beaker. + if(istype(I, /obj/item/reagent_containers/cup))//If it's a glass beaker. if(I.reagents.has_reagent(/datum/reagent/uranium/radium, a_transfer) && a_boost < a_maxamount) I.reagents.remove_reagent(/datum/reagent/uranium/radium, a_transfer) a_boost++; diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index a5872a9add45b..c77f5660f2620 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -205,7 +205,7 @@ user.visible_message("[user] cleans \the [src].", "You clean \the [src].") jammed = FALSE return TRUE - if(istype(item, /obj/item/soap) || istype(item, /obj/item/reagent_containers/glass/rag)) + if(istype(item, /obj/item/soap) || istype(item, /obj/item/reagent_containers/cup/rag)) var/cleanspeed = 50 if(istype(item, /obj/item/soap)) var/obj/item/soap/used_soap = item @@ -432,7 +432,7 @@ return "[state_prefix]_cash" if(istype(item, /obj/item/card)) return "[state_prefix]_id" - if(istype(item, /obj/item/reagent_containers/food)) + if (istype(item, /obj/item/food)) return "[state_prefix]_food" if(istype(item, /obj/item/throwing_star)) return "[state_prefix]_star" diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 23505e0d756c8..901dae2967aa7 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -78,7 +78,7 @@ /obj/machinery/chem_master/RefreshParts() reagents.maximum_volume = 0 - for(var/obj/item/reagent_containers/glass/beaker/B in component_parts) + for(var/obj/item/reagent_containers/cup/beaker/B in component_parts) reagents.maximum_volume += B.reagents.maximum_volume /obj/machinery/chem_master/ex_act(severity, target) @@ -445,9 +445,9 @@ reagents.trans_to(P, vol_each, transfered_by = usr) . = TRUE if("bottle") - var/obj/item/reagent_containers/glass/bottle/P + var/obj/item/reagent_containers/cup/bottle/P for(var/i in 1 to amount) - P = new/obj/item/reagent_containers/glass/bottle(drop_location()) + P = new/obj/item/reagent_containers/cup/bottle(drop_location()) P.name = trim("[name] bottle") P.label_name = trim(name) adjust_item_drop_location(P) @@ -463,9 +463,9 @@ reagents.trans_to(P, vol_each, transfered_by = usr) . = TRUE if("condimentPack") - var/obj/item/reagent_containers/food/condiment/pack/P + var/obj/item/reagent_containers/condiment/pack/P for(var/i in 1 to amount) - P = new/obj/item/reagent_containers/food/condiment/pack(drop_location()) + P = new/obj/item/reagent_containers/condiment/pack(drop_location()) P.originalname = name P.name = trim("[name] pack") P.label_name = trim(name) @@ -473,9 +473,9 @@ reagents.trans_to(P, vol_each, transfered_by = usr) . = TRUE if("condimentBottle") - var/obj/item/reagent_containers/food/condiment/P + var/obj/item/reagent_containers/condiment/P for(var/i in 1 to amount) - P = new/obj/item/reagent_containers/food/condiment(drop_location()) + P = new/obj/item/reagent_containers/condiment(drop_location()) if (style) apply_condi_style(P, style) P.renamedByPlayer = TRUE @@ -579,11 +579,11 @@ "frostoil" = list("icon_state" = "coldsauce", "icon_empty" = "", "name" = "coldsauce bottle", "desc" = "Leaves the tongue numb from its passage."), "mayonnaise" = list("icon_state" = "mayonnaise", "icon_empty" = "", "name" = "mayonnaise bottle", "desc" = "An oily condiment made from egg yolks."), "ketchup" = list("icon_state" = "ketchup", "icon_empty" = "", "name" = "ketchup bottle", "desc" = "A tomato slurry in a tall plastic bottle. Somehow still vaguely American."), - "blackpepper" = list("icon_state" = "peppermillsmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."), - "sodiumchloride" = list("icon_state" = "saltshakersmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "salt shaker", "desc" = "Salt. From dead crew, presumably."), + "blackpepper" = list("icon_state" = "peppermillsmall", "item_state" = "", "icon_empty" = "emptyshaker", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."), + "sodiumchloride" = list("icon_state" = "saltshakersmall", "item_state" = "", "icon_empty" = "emptyshaker", "name" = "salt shaker", "desc" = "Salt. From dead crew, presumably."), "milk" = list("icon_state" = "milk", "icon_empty" = "", "name" = "space milk", "desc" = "It's milk. White and nutritious goodness!"), "soymilk" = list("icon_state" = "soymilk", "icon_empty" = "", "name" = "soy milk", "desc" = "It's soy milk. White and nutritious goodness!"), - "soysauce" = list("icon_state" = "soysauce", "inhand_icon_state" = "", "icon_empty" = "", "name" = "soy sauce bottle", "desc" = "A salty soy-based flavoring."), + "soysauce" = list("icon_state" = "soysauce", "item_state" = "", "icon_empty" = "", "name" = "soy sauce bottle", "desc" = "A salty soy-based flavoring."), "bbqsauce" = list("icon_state" = "bbqsauce", "icon_empty" = "", "name" = "bbq sauce bottle", "desc" = "Hand wipes not included."), "oliveoil" = list("icon_state" = "oliveoil", "icon_empty" = "", "name" = "olive oil bottle", "desc" = "A delicious oil made from olives."), "cooking_oil" = list("icon_state" = "cooking_oil", "icon_empty" = "", "name" = "cooking oil bottle", "desc" = "A cooking oil for deep frying."), @@ -633,7 +633,7 @@ * * container - condiment bottle that gets style applied to it * * style - assoc list, must probably one from [/obj/machinery/chem_master/proc/get_condi_styles] */ -/obj/machinery/chem_master/proc/apply_condi_style(obj/item/reagent_containers/food/condiment/container, list/style) +/obj/machinery/chem_master/proc/apply_condi_style(obj/item/reagent_containers/condiment/container, list/style) container.name = style["name"] container.desc = style["desc"] container.icon_state = style["icon_state"] diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm index 88a2060870adf..f0a6b97a0a6fa 100644 --- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm +++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm @@ -58,7 +58,7 @@ if("makecup") if(beaker) return - beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(src) + beaker = new /obj/item/reagent_containers/cup/beaker/bluespace(src) visible_message("[src] dispenses a bluespace beaker.") . = TRUE if("amount") diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 504a8c0f002fa..a526058e5270a 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -222,7 +222,7 @@ new_disease.dormant = FALSE new_disease.Refresh() var/list/data = list("viruses" = list(new_disease)) - var/obj/item/reagent_containers/glass/bottle/culture_bottle = new(drop_location()) + var/obj/item/reagent_containers/cup/bottle/culture_bottle = new(drop_location()) culture_bottle.name = "[new_disease.name] culture bottle" culture_bottle.desc = "A small bottle. Contains [new_disease.agent] culture in synthblood medium." culture_bottle.reagents.add_reagent(/datum/reagent/blood, 20, data) @@ -237,7 +237,7 @@ return var/id = params["index"] var/datum/disease/disease = SSdisease.archive_diseases[id] - var/obj/item/reagent_containers/glass/bottle/vaccine_bottle = new(drop_location()) + var/obj/item/reagent_containers/cup/bottle/vaccine_bottle = new(drop_location()) vaccine_bottle.name = "[disease.name] vaccine bottle" vaccine_bottle.reagents.add_reagent(/datum/reagent/vaccine, 15, list(id)) var/turf/source_turf = get_turf(src) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index fd8c83a09d5ea..e954d56382520 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -31,7 +31,7 @@ if(!typecache_to_take) typecache_to_take = typecacheof(/obj/item/food/grown) holdingitems = list() - beaker = new /obj/item/reagent_containers/glass/beaker/large(src) + beaker = new /obj/item/reagent_containers/cup/beaker/large(src) beaker.desc += " May contain blended dust. Don't breathe this in!" /obj/machinery/reagentgrinder/constructed/Initialize(mapload) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 0e8b74875a4bc..1adcace891a97 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -901,6 +901,26 @@ glass_name = "glass of chocolate milk" glass_desc = "Brown and delicious goodness!" +/datum/reagent/consumable/hot_cocoa + name = "Hot Coco" + description = "Made with love! And coco beans." + nutriment_factor = 4 * REAGENTS_METABOLISM + color = "#403010" // rgb: 64, 48, 16 + taste_description = "creamy chocolate" + glass_icon_state = "chocolateglass" + glass_name = "glass of hot coco" + glass_desc = "A favorite winter drink to warm you up." + chem_flags = CHEMICAL_RNG_BOTANY + +/datum/reagent/consumable/hot_cocoa/on_mob_life(mob/living/carbon/M) + M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal()) + if(M.getBruteLoss() && prob(20)) + M.heal_bodypart_damage(1,0, 0) + . = 1 + if(holder.has_reagent(/datum/reagent/consumable/capsaicin)) + holder.remove_reagent(/datum/reagent/consumable/capsaicin, 2) + ..() + /datum/reagent/consumable/menthol name = "Menthol" description = "Alleviates coughing symptoms one might have." @@ -964,6 +984,21 @@ M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal()) ..() +/datum/reagent/consumable/sol_dry + name = "Sol Dry" + description = "A soothing, mellow drink made from ginger." + color = "#f7d26a" + quality = DRINK_NICE + taste_description = "sweet ginger spice" + glass_icon_state = "soldry" + glass_name = "Sol Dry" + glass_desc = "A soothing, mellow drink made from ginger." + chem_flags = CHEMICAL_RNG_BOTANY | CHEMICAL_GOAL_BARTENDER_SERVING + +/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M) + M.adjust_disgust(-5) + ..() + /datum/reagent/consumable/red_queen name = "Red Queen" description = "DRINK ME." diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 2451329f80abe..345901695efff 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -372,24 +372,6 @@ to_chat(M, "Your insides revolt at the presence of lethal chocolate!") M.vomit(20) - - -/datum/reagent/consumable/cocoa/hot_cocoa - name = "Hot Chocolate" - description = "Made with love! And cocoa beans." - reagent_state = LIQUID - nutriment_factor = 3 * REAGENTS_METABOLISM - color = "#403010" // rgb: 64, 48, 16 - chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_FUN | CHEMICAL_RNG_BOTANY - taste_description = "creamy chocolate" - glass_icon_state = "chocolateglass" - glass_name = "glass of chocolate" - glass_desc = "Tasty." - -/datum/reagent/consumable/cocoa/hot_cocoa/on_mob_life(mob/living/carbon/M) - M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL) - ..() - /datum/reagent/drug/mushroomhallucinogen name = "Mushroom Hallucinogen" description = "A strong hallucinogenic drug derived from certain species of mushroom." diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 7a29f2621d69f..6fca3dfe74e6f 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -673,5 +673,5 @@ required_container = /obj/item/slime_extract/rainbow /datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder) - new /obj/item/reagent_containers/glass/bottle/potion/flight(get_turf(holder.my_atom)) + new /obj/item/reagent_containers/cup/bottle/potion/flight(get_turf(holder.my_atom)) ..() diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 97516887556a5..f2998e7f8de6b 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -64,10 +64,49 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers) balloon_alert(user, "Transferring [amount_per_transfer_from_this]u.") return -/obj/item/reagent_containers/attack(mob/M, mob/user, def_zone) +/obj/item/reagent_containers/attack(mob/living/target_mob, mob/living/user, params) if(user.a_intent == INTENT_HARM) return ..() +/// Tries to splash the target. Used on both right-click and normal click when in combat mode. +/obj/item/reagent_containers/proc/try_splash(mob/user, atom/target) + if (!spillable) + return FALSE + + if (!reagents?.total_volume) + return FALSE + + var/punctuation = ismob(target) ? "!" : "." + + var/reagent_text + user.visible_message( + "[user] splashes the contents of [src] onto [target][punctuation]", + "You splash the contents of [src] onto [target][punctuation]", + ignored_mobs = target, + ) + + if (ismob(target)) + var/mob/target_mob = target + target_mob.show_message( + "[user] splash the contents of [src] onto you!", + MSG_VISUAL, + "You feel drenched!", + ) + + for(var/datum/reagent/reagent as anything in reagents.reagent_list) + reagent_text += "[reagent] ([num2text(reagent.volume)])," + + var/mob/thrown_by = thrownby?.resolve() + if(isturf(target) && reagents.reagent_list.len && thrown_by) + log_combat(thrown_by, target, "splashed (thrown) [english_list(reagents.reagent_list)]") + message_admins("[ADMIN_LOOKUPFLW(thrown_by)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].") + + reagents.reaction(target, TOUCH) + log_combat(user, target, "splashed", reagent_text) + reagents.clear_reagents() + + return TRUE + /obj/item/reagent_containers/proc/canconsume(mob/eater, mob/user) if(!iscarbon(eater)) return FALSE @@ -103,8 +142,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers) if(target.CanPass(src, get_dir(target, src)) && thrown_by && HAS_TRAIT(thrown_by, TRAIT_BOOZE_SLIDER)) . = TRUE -/obj/item/reagent_containers/proc/SplashReagents(atom/target, thrown = FALSE) - if(!reagents || !reagents.total_volume || !spillable) +/obj/item/reagent_containers/proc/SplashReagents(atom/target, thrown = FALSE, override_spillable = FALSE) + if(!reagents || !reagents.total_volume || (!spillable && !override_spillable)) return var/mob/thrown_by = thrownby?.resolve() diff --git a/code/modules/reagents/reagent_containers/chem_heirloom.dm b/code/modules/reagents/reagent_containers/chem_heirloom.dm index 74ee6f208ab60..d016764561812 100644 --- a/code/modules/reagents/reagent_containers/chem_heirloom.dm +++ b/code/modules/reagents/reagent_containers/chem_heirloom.dm @@ -1,7 +1,7 @@ //Chemist's heirloom #define CHEM_H_VOL 100 -/obj/item/reagent_containers/glass/chem_heirloom +/obj/item/reagent_containers/cup/chem_heirloom volume = CHEM_H_VOL //Set this to 0 in init. Doing otherwise breaks add_reagent spillable = FALSE reagent_flags = NONE @@ -12,9 +12,9 @@ var/datum/reagent/rand_cont //Reagent of choice var/datum/callback/roundend_callback -CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom) +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/cup/chem_heirloom) -/obj/item/reagent_containers/glass/chem_heirloom/Initialize(mapload, vol) +/obj/item/reagent_containers/cup/chem_heirloom/Initialize(mapload, vol) ..() volume = 0 update_icon() @@ -22,7 +22,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom) SSticker.OnRoundend(roundend_callback) update_name() //Negative.dm will call this again if it adds the heirloom component. -/obj/item/reagent_containers/glass/chem_heirloom/examine(mob/living/carbon/user) +/obj/item/reagent_containers/cup/chem_heirloom/examine(mob/living/carbon/user) //Add, then remove, reagent contents for examine. . = ..() //This makes the text out of order, but it's hardly noticeable if(!locked) @@ -32,14 +32,14 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom) smartguy = TRUE . += "It contains:\n100 units of [smartguy ? initial(rand_cont.name) : "various reagents"]" //Luckily science goggles say nothing if there's no reagents -/obj/item/reagent_containers/glass/chem_heirloom/update_name() //This has to be done after init, since the heirloom component is added after. +/obj/item/reagent_containers/cup/chem_heirloom/update_name() //This has to be done after init, since the heirloom component is added after. . = ..() rand_cont = get_random_reagent_id(CHEMICAL_RNG_FUN) name ="hard locked bottle of [initial(rand_cont.name)]" var/datum/component/heirloom/H = GetComponent(/datum/component/heirloom) desc = H ? "[ishuman(H.owner) ? "The [H.family_name]" : "[H.owner.name]'s"] family's long-cherished wish is to open this bottle and get its chemical outside. Can you make that wish come true?" : "A hard locked bottle of [initial(rand_cont.name)]." -/obj/item/reagent_containers/glass/chem_heirloom/proc/unlock() +/obj/item/reagent_containers/cup/chem_heirloom/proc/unlock() if(!locked) //A little bird said this would be an issue if a goober-min tried to call this twice. return if(isliving(loc)) @@ -55,7 +55,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom) reagent_flags = OPENCONTAINER reagents.add_reagent(rand_cont, volume) //Add reagents -/obj/item/reagent_containers/glass/chem_heirloom/Destroy() +/obj/item/reagent_containers/cup/chem_heirloom/Destroy() . = ..() LAZYREMOVE(SSticker.round_end_events, roundend_callback) roundend_callback = null diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm similarity index 86% rename from code/modules/food_and_drinks/food/condiment.dm rename to code/modules/reagents/reagent_containers/condiment.dm index 5fcad32579aad..b9f22c89e4e8f 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -5,7 +5,7 @@ // to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code. //Food items that aren't eaten normally and leave an empty container behind. -/obj/item/reagent_containers/food/condiment +/obj/item/reagent_containers/condiment name = "condiment bottle" desc = "Just your average condiment bottle." icon = 'icons/obj/food/containers.dmi' @@ -23,7 +23,7 @@ /// Holder for original icon_state value if it was overwritten by icon_emty to change back to var/icon_preempty -/obj/item/reagent_containers/food/condiment/update_icon_state() +/obj/item/reagent_containers/condiment/update_icon_state() . = ..() if (reagents.reagent_list.len) if (icon_preempty) @@ -34,11 +34,11 @@ icon_preempty = icon_state icon_state = icon_empty -/obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user) +/obj/item/reagent_containers/condiment/suicide_act(mob/living/carbon/user) user.visible_message("[user] is trying to eat the entire [src]! It looks like [user.p_they()] forgot how food works!") return OXYLOSS -/obj/item/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone) +/obj/item/reagent_containers/condiment/attack(mob/M, mob/user, def_zone) if(!reagents || !reagents.total_volume) to_chat(user, "None of [src] left, oh no!") @@ -67,7 +67,7 @@ playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) return 1 -/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity) +/obj/item/reagent_containers/condiment/afterattack(obj/target, mob/user , proximity) . = ..() if(!proximity) return @@ -95,14 +95,14 @@ var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) to_chat(user, "You transfer [trans] units of the condiment to [target].") -/obj/item/reagent_containers/food/condiment/enzyme +/obj/item/reagent_containers/condiment/enzyme name = "universal enzyme" desc = "Used in cooking various dishes." icon_state = "enzyme" list_reagents = list(/datum/reagent/consumable/enzyme = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/enzyme/examine(mob/user) +/obj/item/reagent_containers/condiment/enzyme/examine(mob/user) . = ..() var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cheesewheel] var/milk_required = recipe.required_reagents[/datum/reagent/consumable/milk] @@ -110,7 +110,7 @@ . += "[milk_required] milk, [enzyme_required] enzyme and you got cheese." . += "Remember, the enzyme isn't used up, so return it to the bottle, dingus!" -/obj/item/reagent_containers/food/condiment/sugar +/obj/item/reagent_containers/condiment/sugar name = "sugar sack" desc = "Tasty spacey sugar!" icon_state = "sugar" @@ -120,7 +120,7 @@ list_reagents = list(/datum/reagent/consumable/sugar = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/sugar/examine(mob/user) +/obj/item/reagent_containers/condiment/sugar/examine(mob/user) . = ..() var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cakebatter] var/flour_required = recipe.required_reagents[/datum/reagent/consumable/flour] @@ -128,7 +128,7 @@ var/sugar_required = recipe.required_reagents[/datum/reagent/consumable/sugar] . += "[flour_required] flour, [eggyolk_required] egg yolk (or soy milk), [sugar_required] sugar makes cake dough. You can make pie dough from it." -/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then +/obj/item/reagent_containers/condiment/saltshaker //Separate from above since it's a small shaker rather then name = "salt shaker" // a large one. desc = "Salt. From space oceans, presumably." icon_state = "saltshakersmall" @@ -140,7 +140,7 @@ list_reagents = list(/datum/reagent/consumable/sodiumchloride = 20) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/living/user) +/obj/item/reagent_containers/condiment/saltshaker/suicide_act(mob/living/user) user.visible_message("[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide!") var/newname = "[name]" name = "[user.name]" @@ -149,7 +149,7 @@ desc = "Salt. From dead crew, presumably." return (TOXLOSS) -/obj/item/reagent_containers/food/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity) +/obj/item/reagent_containers/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity) . = ..() if(!proximity) return @@ -162,7 +162,7 @@ new/obj/effect/decal/cleanable/food/salt(target) return -/obj/item/reagent_containers/food/condiment/peppermill +/obj/item/reagent_containers/condiment/peppermill name = "pepper mill" desc = "Often used to flavor food or make people sneeze." icon_state = "peppermillsmall" @@ -174,7 +174,7 @@ list_reagents = list(/datum/reagent/consumable/blackpepper = 20) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/milk +/obj/item/reagent_containers/condiment/milk name = "space milk" desc = "It's milk. White and nutritious goodness!" icon_state = "milk" @@ -184,7 +184,7 @@ list_reagents = list(/datum/reagent/consumable/milk = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/milk/examine(mob/user) +/obj/item/reagent_containers/condiment/milk/examine(mob/user) . = ..() var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cheesewheel] var/milk_required = recipe.required_reagents[/datum/reagent/consumable/milk] @@ -192,7 +192,7 @@ . += "[milk_required] milk, [enzyme_required] enzyme and you got cheese." . += "Remember, the enzyme isn't used up, so return it to the bottle, dingus!" -/obj/item/reagent_containers/food/condiment/flour +/obj/item/reagent_containers/condiment/flour name = "flour sack" desc = "A big bag of flour. Good for baking!" icon_state = "flour" @@ -202,7 +202,7 @@ list_reagents = list(/datum/reagent/consumable/flour = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/flour/examine(mob/user) +/obj/item/reagent_containers/condiment/flour/examine(mob/user) . = ..() var/datum/chemical_reaction/recipe_dough = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/dough] var/datum/chemical_reaction/recipe_cakebatter = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cakebatter] @@ -215,7 +215,7 @@ . += "[dough_flour_required] flour, [dough_water_required] water makes normal dough. You can make flat dough from it." . += "[cakebatter_flour_required] flour, [cakebatter_eggyolk_required] egg yolk (or soy milk), [cakebatter_sugar_required] sugar makes cake dough. You can make pie dough from it." -/obj/item/reagent_containers/food/condiment/soymilk +/obj/item/reagent_containers/condiment/soymilk name = "soy milk" desc = "It's soy milk. White and nutritious goodness!" icon_state = "soymilk" @@ -225,7 +225,7 @@ list_reagents = list(/datum/reagent/consumable/soymilk = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/rice +/obj/item/reagent_containers/condiment/rice name = "rice sack" desc = "A big bag of rice. Good for cooking!" icon_state = "rice" @@ -240,27 +240,27 @@ name = "cornmeal box" desc = "A big box of cornmeal. Great for southern style cooking." icon_state = "cornmeal" - inhand_icon_state = "carton" - lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi' - righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' + item_state = "carton" + lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi' list_reagents = list(/datum/reagent/consumable/cornmeal = 30) fill_icon_thresholds = null */ -/obj/item/reagent_containers/food/condiment/bbqsauce +/obj/item/reagent_containers/condiment/bbqsauce name = "bbq sauce" desc = "Hand wipes not included." icon_state = "bbqsauce" list_reagents = list(/datum/reagent/consumable/bbqsauce = 50) -/obj/item/reagent_containers/food/condiment/soysauce +/obj/item/reagent_containers/condiment/soysauce name = "soy sauce" desc = "A salty soy-based flavoring." icon_state = "soysauce" list_reagents = list(/datum/reagent/consumable/soysauce = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/mayonnaise +/obj/item/reagent_containers/condiment/mayonnaise name = "mayonnaise" desc = "An oily condiment made from egg yolks." icon_state = "mayonnaise" @@ -276,7 +276,7 @@ fill_icon_thresholds = null */ -/obj/item/reagent_containers/food/condiment/cooking_oil +/obj/item/reagent_containers/condiment/cooking_oil name = "cooking oil" desc = "For all your deep-frying needs." icon_state = "cooking_oil" @@ -306,21 +306,21 @@ fill_icon_thresholds = null */ -/obj/item/reagent_containers/food/condiment/cherryjelly +/obj/item/reagent_containers/condiment/cherryjelly name = "cherry jelly" desc = "A jar of super-sweet cherry jelly." icon_state = "cherryjelly" list_reagents = list(/datum/reagent/consumable/cherryjelly = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/honey +/obj/item/reagent_containers/condiment/honey name = "honey" desc = "A jar of sweet and viscous honey." icon_state = "honey" list_reagents = list(/datum/reagent/consumable/honey = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/ketchup +/obj/item/reagent_containers/condiment/ketchup name = "ketchup" // At time of writing, "ketchup" mechanically, is just ground tomatoes, // rather than // tomatoes plus vinegar plus sugar. @@ -329,13 +329,13 @@ list_reagents = list(/datum/reagent/consumable/ketchup = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/hotsauce +/obj/item/reagent_containers/condiment/hotsauce name = "hotsauce bottle" desc= "You can almost TASTE the stomach ulcers!" icon_state = "hotsauce" list_reagents = list(/datum/reagent/consumable/capsaicin = 50) -/obj/item/reagent_containers/food/condiment/coldsauce +/obj/item/reagent_containers/condiment/coldsauce name = "coldsauce bottle" desc= "Leaves the tongue numb from its passage." icon_state = "coldsauce" @@ -343,7 +343,7 @@ //Food packs. To easily apply deadly toxi... delicious sauces to your food! -/obj/item/reagent_containers/food/condiment/pack +/obj/item/reagent_containers/condiment/pack name = "condiment pack" desc = "A small plastic pack with condiments to put on your food." icon_state = "condi_empty" @@ -372,13 +372,13 @@ /// Can't use initial(name) for this. This stores the name set by condimasters. var/originalname = "condiment" -/obj/item/reagent_containers/food/condiment/pack/update_icon() +/obj/item/reagent_containers/condiment/pack/update_icon() return -/obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly. +/obj/item/reagent_containers/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly. return -/obj/item/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity) +/obj/item/reagent_containers/condiment/pack/afterattack(obj/target, mob/user , proximity) if(!proximity) return @@ -399,7 +399,7 @@ return . = ..() -/obj/item/reagent_containers/food/condiment/pack/on_reagent_change(changetype) +/obj/item/reagent_containers/condiment/pack/on_reagent_change(changetype) if(reagents.reagent_list.len > 0) var/main_reagent = reagents.get_master_reagent_id() if(main_reagent in possible_states) @@ -414,23 +414,23 @@ desc = "A small condiment pack. It is empty." //Ketchup -/obj/item/reagent_containers/food/condiment/pack/ketchup +/obj/item/reagent_containers/condiment/pack/ketchup name = "ketchup pack" originalname = "ketchup" list_reagents = list(/datum/reagent/consumable/ketchup = 10) //Hot sauce -/obj/item/reagent_containers/food/condiment/pack/hotsauce +/obj/item/reagent_containers/condiment/pack/hotsauce name = "hotsauce pack" originalname = "hotsauce" list_reagents = list(/datum/reagent/consumable/capsaicin = 10) -/obj/item/reagent_containers/food/condiment/pack/astrotame +/obj/item/reagent_containers/condiment/pack/astrotame name = "astrotame pack" originalname = "astrotame" list_reagents = list(/datum/reagent/consumable/astrotame = 5) -/obj/item/reagent_containers/food/condiment/pack/bbqsauce +/obj/item/reagent_containers/condiment/pack/bbqsauce name = "bbq sauce pack" originalname = "bbq sauce" list_reagents = list(/datum/reagent/consumable/bbqsauce = 10) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm old mode 100755 new mode 100644 similarity index 64% rename from code/modules/reagents/reagent_containers/glass.dm rename to code/modules/reagents/reagent_containers/cups/_cup.dm index b55cbae95bfa5..dbfcb2515d70a --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -1,5 +1,4 @@ - -/obj/item/reagent_containers/glass +/obj/item/reagent_containers/cup name = "glass" amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50) @@ -9,8 +8,59 @@ spillable = TRUE resistance_flags = ACID_PROOF -/obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target) - if(!canconsume(M, user)) + lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi' + + ///Like Edible's food type, what kind of drink is this? + var/drink_type = NONE + ///The last time we have checked for taste. + var/last_check_time + ///How much we drink at once, shot glasses drink more. + var/gulp_size = 5 + ///Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it. + var/isGlass = FALSE + +/obj/item/reagent_containers/cup/examine(mob/user) + . = ..() + if(drink_type) + var/list/types = bitfield_to_list(drink_type, FOOD_FLAGS) + . += "It is [LOWER_TEXT(english_list(types))]." + +/obj/item/reagent_containers/cup/proc/checkLiked(fraction, mob/M) + if(last_check_time + 50 >= world.time) + return + if(!ishuman(M)) + return + var/mob/living/carbon/human/H = M + var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE) + + if((drink_type & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast) + last_check_time = world.time + + if(!T) //if you don't have a tongue you don't taste.. + return + + if(HAS_TRAIT(H, TRAIT_AGEUSIA)) + if(drink_type & T.toxic_food) + to_chat(H, "You don't feel so good...") + H.adjust_disgust(25 + 30 * fraction) + else + if(drink_type & T.toxic_food) + to_chat(H, "What the hell was that thing?!") + H.adjust_disgust(25 + 30 * fraction) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food) + else if(drink_type & T.disliked_food) + to_chat(H, "That didn't taste very good...") + H.adjust_disgust(11 + 15 * fraction) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food) + else if(drink_type & T.liked_food) + to_chat(H, "I love this taste!") + H.adjust_disgust(-5 + -2.5 * fraction) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food) + +/obj/item/reagent_containers/cup/attack(mob/living/target_mob, mob/living/user, obj/target) + if(!canconsume(target_mob, user)) return if(!spillable) @@ -20,40 +70,45 @@ to_chat(user, "[src] is empty!") return - if(istype(M)) - if(user.a_intent == INTENT_HARM) - var/R - M.visible_message("[user] splashes the contents of [src] onto [M]!", \ - "[user] splashes the contents of [src] onto you!") - if(reagents) - for(var/datum/reagent/A in reagents.reagent_list) - R += "[A] ([num2text(A.volume)])," - - if(isturf(target) && reagents.reagent_list.len && thrownby) - log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]") - message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].") - reagents.reaction(M, TOUCH) - log_combat(user, M, "splashed", R) - reagents.clear_reagents() - else - if(M != user) - M.visible_message("[user] attempts to feed [M] something from [src].", \ - "[user] attempts to feed you something from [src].") - if(!do_after(user, 3 SECONDS, target = M)) - return - if(!reagents || !reagents.total_volume) - return // The drink might be empty after the delay, such as by spam-feeding - M.visible_message("[user] feeds [M] something from [src].", \ - "[user] feeds you something from [src].") - log_combat(user, M, "fed", reagents.log_list()) - else - to_chat(user, "You swallow a gulp of [src].") - var/fraction = min(5/reagents.total_volume, 1) - reagents.reaction(M, INGEST, fraction) - addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, 5), 5) - playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) - -/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity) + if(!istype(target_mob)) + return + + if(user.a_intent == INTENT_HARM) + //Early terminate, move to afterattack where we splash + return + + if(target_mob != user) + target_mob.visible_message("[user] attempts to feed [target_mob] something from [src].", \ + "[user] attempts to feed you something from [src].") + if(!do_after(user, 3 SECONDS, target = target_mob)) + return + if(!reagents || !reagents.total_volume) + return // The drink might be empty after the delay, such as by spam-feeding + target_mob.visible_message("[user] feeds [target_mob] something from [src].", \ + "[user] feeds you something from [src].") + log_combat(user, target_mob, "fed", reagents.log_list()) + else + to_chat(user, "You swallow a gulp of [src].") + + SEND_SIGNAL(src, COMSIG_GLASS_DRANK, target_mob, user) + var/fraction = min(gulp_size/reagents.total_volume, 1) + reagents.trans_to(target_mob, gulp_size, transfered_by = user, method = INGEST) + checkLiked(fraction, target_mob) + playsound(target_mob.loc,'sound/items/drink.ogg', rand(10,50), TRUE) + if(!iscarbon(target_mob)) + return + var/mob/living/carbon/carbon_drinker = target_mob + var/list/diseases = carbon_drinker.get_static_viruses() + if(!LAZYLEN(diseases)) + return + var/list/datum/disease/diseases_to_add = list() + for(var/datum/disease/malady as anything in diseases) + if(malady.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS) + diseases_to_add += malady + if(LAZYLEN(diseases_to_add)) + AddComponent(/datum/component/infective, diseases_to_add) + +/obj/item/reagent_containers/cup/afterattack(obj/target, mob/living/user, proximity) . = ..() if((!proximity) || !check_allowed_items(target,target_self=1)) return @@ -92,44 +147,47 @@ reagents.reaction(target, TOUCH) reagents.clear_reagents() -/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params) - var/hotness = I.is_hot() +/obj/item/reagent_containers/cup/attackby(obj/item/attacking_item, mob/user, params) + var/hotness = attacking_item.is_hot() if(hotness && reagents) reagents.expose_temperature(hotness) - to_chat(user, "You heat [name] with [I]!") - - if(istype(I, /obj/item/food/egg)) //breaking eggs - var/obj/item/food/egg/E = I - if(reagents) - if(reagents.total_volume >= reagents.maximum_volume) - to_chat(user, "[src] is full.") - else - to_chat(user, "You break [E] in [src].") - E.reagents.trans_to(src, E.reagents.total_volume, transfered_by = user) - qdel(E) + to_chat(user, "You heat [name] with [attacking_item]!") + return + + if(istype(attacking_item, /obj/item/food/egg)) //breaking eggs + var/obj/item/food/egg/attacking_egg = attacking_item + if(!reagents) return - ..() + if(reagents.total_volume >= reagents.maximum_volume) + to_chat(user, "[src] is full.") + else + to_chat(user, "You break [attacking_egg] in [src].") + attacking_egg.reagents.trans_to(src, attacking_egg.reagents.total_volume, transfered_by = user) + qdel(attacking_egg) + return + + return ..() -/obj/item/reagent_containers/glass/beaker +/obj/item/reagent_containers/cup/beaker name = "beaker" desc = "A beaker. It can hold up to 50 units." icon = 'icons/obj/chemical.dmi' icon_state = "beaker" item_state = "beaker" + worn_icon_state = "beaker" custom_materials = list(/datum/material/glass=500) fill_icon_thresholds = list(1, 10, 20, 40, 60, 80, 100) label_icon = "label_beaker" -/obj/item/reagent_containers/glass/beaker/Initialize(mapload) +/obj/item/reagent_containers/cup/beaker/Initialize(mapload) . = ..() - update_icon() - + update_appearance() -/obj/item/reagent_containers/glass/beaker/get_part_rating() +/obj/item/reagent_containers/cup/beaker/get_part_rating() return reagents.maximum_volume -/obj/item/reagent_containers/glass/beaker/jar +/obj/item/reagent_containers/cup/beaker/jar name = "honey jar" desc = "A jar for honey. It can hold up to 50 units of sweet delight." icon = 'icons/obj/chemical.dmi' @@ -138,7 +196,7 @@ fill_icon_thresholds = null label_icon = null -/obj/item/reagent_containers/glass/beaker/large +/obj/item/reagent_containers/cup/beaker/large name = "large beaker" desc = "A large beaker. Can hold up to 100 units." icon_state = "beakerlarge" @@ -148,7 +206,7 @@ possible_transfer_amounts = list(5,10,15,20,25,30,50,100) label_icon = "label_beakerlarge" -/obj/item/reagent_containers/glass/beaker/plastic +/obj/item/reagent_containers/cup/beaker/plastic name = "x-large beaker" desc = "An extra-large beaker. Can hold up to 120 units." icon_state = "beakerwhite" @@ -158,7 +216,7 @@ possible_transfer_amounts = list(5,10,15,20,25,30,60,120) label_icon = "label_beakerlarge" -/obj/item/reagent_containers/glass/beaker/meta +/obj/item/reagent_containers/cup/beaker/meta name = "metamaterial beaker" desc = "A large beaker. Can hold up to 180 units." icon_state = "beakergold" @@ -169,7 +227,7 @@ fill_icon_thresholds = list(1, 10, 25, 35, 50, 60, 80, 100) label_icon = "label_beakerlarge" -/obj/item/reagent_containers/glass/beaker/noreact +/obj/item/reagent_containers/cup/beaker/noreact name = "cryostasis beaker" desc = "A cryostasis beaker that allows for chemical storage without \ reactions. Can hold up to 50 units." @@ -182,7 +240,7 @@ fill_icon_thresholds = null label_icon = null -/obj/item/reagent_containers/glass/beaker/bluespace +/obj/item/reagent_containers/cup/beaker/bluespace name = "bluespace beaker" desc = "A bluespace beaker, powered by experimental bluespace technology \ and Element Cuban combined with the Compound Pete. Can hold up to \ @@ -196,39 +254,39 @@ fill_icon_thresholds = null label_icon = "label_beakerlarge" -/obj/item/reagent_containers/glass/beaker/cryoxadone +/obj/item/reagent_containers/cup/beaker/cryoxadone list_reagents = list(/datum/reagent/medicine/cryoxadone = 30) -/obj/item/reagent_containers/glass/beaker/sulfuric +/obj/item/reagent_containers/cup/beaker/sulfuric list_reagents = list(/datum/reagent/toxin/acid = 50) -/obj/item/reagent_containers/glass/beaker/slime +/obj/item/reagent_containers/cup/beaker/slime list_reagents = list(/datum/reagent/toxin/slimejelly = 50) -/obj/item/reagent_containers/glass/beaker/large/styptic +/obj/item/reagent_containers/cup/beaker/large/styptic name = "styptic reserve tank" list_reagents = list(/datum/reagent/medicine/styptic_powder = 50) -/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine +/obj/item/reagent_containers/cup/beaker/large/silver_sulfadiazine name = "silver sulfadiazine reserve tank" list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50) -/obj/item/reagent_containers/glass/beaker/large/charcoal +/obj/item/reagent_containers/cup/beaker/large/charcoal name = "charcoal reserve tank" list_reagents = list(/datum/reagent/medicine/charcoal = 50) -/obj/item/reagent_containers/glass/beaker/large/epinephrine +/obj/item/reagent_containers/cup/beaker/large/epinephrine name = "epinephrine reserve tank" list_reagents = list(/datum/reagent/medicine/epinephrine = 50) -/obj/item/reagent_containers/glass/beaker/large/kelobic +/obj/item/reagent_containers/cup/beaker/large/kelobic name = "kelotane-bicaridine reserve tank" list_reagents = list(/datum/reagent/medicine/kelotane = 50, /datum/reagent/medicine/bicaridine = 50) -/obj/item/reagent_containers/glass/beaker/synthflesh +/obj/item/reagent_containers/cup/beaker/synthflesh list_reagents = list(/datum/reagent/medicine/synthflesh = 50) -/obj/item/reagent_containers/glass/bucket +/obj/item/reagent_containers/cup/bucket name = "bucket" desc = "It's a bucket." icon = 'icons/obj/janitor.dmi' @@ -257,7 +315,7 @@ ITEM_SLOT_DEX_STORAGE ) -/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params) +/obj/item/reagent_containers/cup/bucket/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/mop)) if(reagents.total_volume < 1) to_chat(user, "[src] is out of water!") @@ -265,16 +323,18 @@ reagents.trans_to(O, 5, transfered_by = user) to_chat(user, "You wet [O] in [src].") playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + return else if(isprox(O)) to_chat(user, "You add [O] to [src].") qdel(O) qdel(src) user.put_in_hands(new /obj/item/bot_assembly/cleanbot) - else - ..() + return -/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot) - ..() + return ..() + +/obj/item/reagent_containers/cup/bucket/equipped(mob/user, slot) + . = ..() if (slot == ITEM_SLOT_HEAD) if(reagents.total_volume) to_chat(user, "[src]'s contents spill all over you!") @@ -282,11 +342,11 @@ reagents.clear_reagents() reagents.flags = NONE -/obj/item/reagent_containers/glass/bucket/dropped(mob/user) +/obj/item/reagent_containers/cup/bucket/dropped(mob/user) ..() reagents.flags = initial(reagent_flags) -/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M) +/obj/item/reagent_containers/cup/bucket/equip_to_best_slot(mob/M) if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head var/index = slot_equipment_priority.Find(ITEM_SLOT_HEAD) slot_equipment_priority.Remove(ITEM_SLOT_HEAD) @@ -295,7 +355,7 @@ return return ..() -/obj/item/reagent_containers/glass/waterbottle +/obj/item/reagent_containers/cup/waterbottle name = "bottle of water" desc = "A bottle of water filled at an old Earth bottling facility." icon = 'icons/obj/drinks.dmi' @@ -314,19 +374,19 @@ var/mutable_appearance/cap_overlay var/flip_chance = 10 -/obj/item/reagent_containers/glass/waterbottle/Initialize(mapload) +/obj/item/reagent_containers/cup/waterbottle/Initialize(mapload) . = ..() cap_overlay = mutable_appearance(icon, cap_icon_state) if(cap_on) spillable = FALSE update_icon() -/obj/item/reagent_containers/glass/waterbottle/update_overlays() +/obj/item/reagent_containers/cup/waterbottle/update_overlays() . = ..() if(cap_on) . += cap_overlay -/obj/item/reagent_containers/glass/waterbottle/examine(mob/user) +/obj/item/reagent_containers/cup/waterbottle/examine(mob/user) . = ..() if(cap_lost) . += "The cap seems to be missing." @@ -335,7 +395,7 @@ else . += "The cap has been taken off. Alt-click to put a cap on." -/obj/item/reagent_containers/glass/waterbottle/AltClick(mob/user) +/obj/item/reagent_containers/cup/waterbottle/AltClick(mob/user) if(!user.canUseTopic(src, BE_CLOSE)) return if(cap_lost) @@ -358,35 +418,35 @@ to_chat(user, "You put the cap on [src].") update_icon() -/obj/item/reagent_containers/glass/waterbottle/is_refillable() +/obj/item/reagent_containers/cup/waterbottle/is_refillable() if(cap_on) return FALSE . = ..() -/obj/item/reagent_containers/glass/waterbottle/is_drainable() +/obj/item/reagent_containers/cup/waterbottle/is_drainable() if(cap_on) return FALSE . = ..() -/obj/item/reagent_containers/glass/waterbottle/attack(mob/M, mob/user, obj/target) +/obj/item/reagent_containers/cup/waterbottle/attack(mob/M, mob/user, obj/target) if(cap_on && reagents.total_volume && istype(M)) to_chat(user, "You must remove the cap before you can do that!") return . = ..() -/obj/item/reagent_containers/glass/waterbottle/afterattack(obj/target, mob/user, proximity) +/obj/item/reagent_containers/cup/waterbottle/afterattack(obj/target, mob/user, proximity) if(cap_on && (target.is_refillable() || target.is_drainable() || (reagents.total_volume && user.a_intent == INTENT_HARM))) to_chat(user, "You must remove the cap before you can do that!") return - else if(istype(target, /obj/item/reagent_containers/glass/waterbottle)) - var/obj/item/reagent_containers/glass/waterbottle/WB = target + else if(istype(target, /obj/item/reagent_containers/cup/waterbottle)) + var/obj/item/reagent_containers/cup/waterbottle/WB = target if(WB.cap_on) to_chat(user, "[WB] has a cap firmly twisted on!") . = ..() // heehoo bottle flipping -/obj/item/reagent_containers/glass/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) +/obj/item/reagent_containers/cup/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() if(cap_on && reagents.total_volume) if(prob(flip_chance)) // landed upright @@ -396,15 +456,15 @@ else // landed on it's side animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0) -/obj/item/reagent_containers/glass/waterbottle/pickup(mob/user) +/obj/item/reagent_containers/cup/waterbottle/pickup(mob/user) ..() animate(src, transform = null, time = 1, loop = 0) -/obj/item/reagent_containers/glass/waterbottle/empty +/obj/item/reagent_containers/cup/waterbottle/empty list_reagents = list() cap_on = FALSE -/obj/item/reagent_containers/glass/waterbottle/large +/obj/item/reagent_containers/cup/waterbottle/large desc = "A fresh commercial-sized bottle of water." icon_state = "largebottle" custom_materials = list(/datum/material/glass=0) @@ -414,7 +474,7 @@ cap_icon_state = "bottle_cap" icon_state_preview = "waterbottle_large" -/obj/item/reagent_containers/glass/waterbottle/large/empty +/obj/item/reagent_containers/cup/waterbottle/large/empty list_reagents = list() cap_on = FALSE @@ -425,7 +485,7 @@ icon_state = "pestle" force = 7 -/obj/item/reagent_containers/glass/mortar +/obj/item/reagent_containers/cup/mortar name = "mortar" desc = "A specially formed bowl of ancient design. It is possible to crush or juice items placed in it using a pestle; however the process, unlike modern methods, is slow and physically exhausting. Alt click to eject the item." icon_state = "mortar" @@ -437,7 +497,7 @@ spillable = TRUE var/obj/item/grinded -/obj/item/reagent_containers/glass/mortar/AltClick(mob/user) +/obj/item/reagent_containers/cup/mortar/AltClick(mob/user) if(!user.canUseTopic(src, BE_CLOSE)) return if(grinded) @@ -445,7 +505,7 @@ grinded = null to_chat(user, "You eject the item inside.") -/obj/item/reagent_containers/glass/mortar/attackby(obj/item/I, mob/living/carbon/human/user) +/obj/item/reagent_containers/cup/mortar/attackby(obj/item/I, mob/living/carbon/human/user) ..() if(istype(I,/obj/item/pestle)) if(grinded) @@ -487,12 +547,12 @@ return to_chat(user, "You can't grind this!") -/obj/item/reagent_containers/glass/saline +/obj/item/reagent_containers/cup/saline name = "saline canister" volume = 5000 list_reagents = list(/datum/reagent/medicine/salglu_solution = 5000) -/obj/item/reagent_containers/glass/saline/Moved(atom/OldLoc, Dir) +/obj/item/reagent_containers/cup/saline/Moved(atom/OldLoc, Dir) if (loc && !istype(loc, /obj/machinery/iv_drip/saline)) qdel(src) return diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm similarity index 76% rename from code/modules/reagents/reagent_containers/bottle.dm rename to code/modules/reagents/reagent_containers/cups/bottle.dm index b472573497d63..e63aba15744f2 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/cups/bottle.dm @@ -1,75 +1,76 @@ -//Not to be confused with /obj/item/reagent_containers/food/drinks/bottle +//Not to be confused with /obj/item/reagent_containers/cup/glass/bottle -/obj/item/reagent_containers/glass/bottle +/obj/item/reagent_containers/cup/bottle name = "bottle" desc = "A small bottle." icon_state = "bottle" + fill_icon_state = "bottle" item_state = "atoxinbottle" possible_transfer_amounts = list(5,10,15,25,30) volume = 30 fill_icon_thresholds = list(1, 10, 20, 40, 60, 80, 100) label_icon = "label_bottle" -/obj/item/reagent_containers/glass/bottle/Initialize(mapload) +/obj/item/reagent_containers/cup/bottle/Initialize(mapload) . = ..() if(!icon_state) icon_state = "bottle" - update_icon() + update_appearance() -/obj/item/reagent_containers/glass/bottle/epinephrine +/obj/item/reagent_containers/cup/bottle/epinephrine name = "epinephrine bottle" label_name = "epinephrine" desc = "A small bottle. Contains epinephrine - used to stabilize patients." list_reagents = list(/datum/reagent/medicine/epinephrine = 30) icon_state_preview = "bottle_epinephrine" -/obj/item/reagent_containers/glass/bottle/tricordrazine +/obj/item/reagent_containers/cup/bottle/tricordrazine name = "tricordrazine bottle" label_name = "tricordrazine" desc = "A small bottle of tricordrazine. Used to aid in patient recovery." list_reagents = list(/datum/reagent/medicine/tricordrazine = 30) icon_state_preview = "bottle_tricordrazine" -/obj/item/reagent_containers/glass/bottle/spaceacillin +/obj/item/reagent_containers/cup/bottle/spaceacillin name = "spaceacillin bottle" label_name = "spaceacillin" desc = "A small bottle of spaceacillin. Used to cure some diseases." list_reagents = list(/datum/reagent/medicine/spaceacillin = 30) icon_state_preview = "bottle_spaceacillin" -/obj/item/reagent_containers/glass/bottle/antitoxin +/obj/item/reagent_containers/cup/bottle/antitoxin name = "antitoxin bottle" label_name = "antitoxin" desc = "A small bottle of anti-toxin. Used to treat toxin damage." list_reagents = list(/datum/reagent/medicine/antitoxin = 30) -/obj/item/reagent_containers/glass/bottle/toxin/mutagen +/obj/item/reagent_containers/cup/bottle/toxin/mutagen name = "mutagen toxin bottle" label_name = "mutagen toxin" desc = "A small bottle of mutagen toxins. Do not drink, Might cause unpredictable mutations." list_reagents = list(/datum/reagent/toxin/mutagen = 30) icon_state_preview = "bottle_mutagen" -/obj/item/reagent_containers/glass/bottle/toxin +/obj/item/reagent_containers/cup/bottle/toxin name = "toxin bottle" label_name = "toxin" desc = "A small bottle of toxins. Do not drink, it is poisonous." list_reagents = list(/datum/reagent/toxin = 30) icon_state_preview = "bottle_toxin" -/obj/item/reagent_containers/glass/bottle/cyanide +/obj/item/reagent_containers/cup/bottle/cyanide name = "cyanide bottle" label_name = "cyanide" desc = "A small bottle of cyanide. Bitter almonds?" list_reagents = list(/datum/reagent/toxin/cyanide = 30) -/obj/item/reagent_containers/glass/bottle/spewium +/obj/item/reagent_containers/cup/bottle/spewium name = "spewium bottle" label_name = "spewium" desc = "A small bottle of spewium." list_reagents = list(/datum/reagent/toxin/spewium = 30) -/obj/item/reagent_containers/glass/bottle/morphine +/obj/item/reagent_containers/cup/bottle/morphine name = "morphine bottle" label_name = "morphine" desc = "A small bottle of morphine." @@ -77,76 +78,87 @@ list_reagents = list(/datum/reagent/medicine/morphine = 30) icon_state_preview = "bottle_morphine" -/obj/item/reagent_containers/glass/bottle/chloralhydrate +/obj/item/reagent_containers/cup/bottle/chloralhydrate name = "chloral hydrate bottle" label_name = "chloral hydrate" desc = "A small bottle of Choral Hydrate. Mickey's Favorite!" list_reagents = list(/datum/reagent/toxin/chloralhydrate = 30) icon_state_preview = "bottle_chloralhydrate" -/obj/item/reagent_containers/glass/bottle/mannitol +/obj/item/reagent_containers/cup/bottle/mannitol name = "mannitol bottle" label_name = "mannitol" desc = "A small bottle of Mannitol. Useful for healing brain damage." list_reagents = list(/datum/reagent/medicine/mannitol = 30) -/obj/item/reagent_containers/glass/bottle/charcoal +/obj/item/reagent_containers/cup/bottle/charcoal name = "charcoal bottle" label_name = "charcoal" desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream." list_reagents = list(/datum/reagent/medicine/charcoal = 30) icon_state_preview = "bottle_charcoal" -/obj/item/reagent_containers/glass/bottle/mutagen +/obj/item/reagent_containers/cup/bottle/phlogiston + name = "Phlogiston bottle" + desc = "A small bottle of Phlogiston, that will set you on fire if used." + volume = 50 + list_reagents = list(/datum/reagent/phlogiston = 30) + +/obj/item/reagent_containers/cup/bottle/calomel + name = "calomel bottle" + desc = "A small bottle of calomel, which quickly purges all chemicals from the patient. Causes toxin damage if the patient is not heavily injured." + list_reagents = list(/datum/reagent/medicine/calomel = 30) + +/obj/item/reagent_containers/cup/bottle/mutagen name = "unstable mutagen bottle" label_name = "unstable mutagen" desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact." list_reagents = list(/datum/reagent/toxin/mutagen = 30) -/obj/item/reagent_containers/glass/bottle/plasma +/obj/item/reagent_containers/cup/bottle/plasma name = "liquid plasma bottle" label_name = "liquid plasma" desc = "A small bottle of liquid plasma. Extremely toxic and reacts with micro-organisms inside blood." list_reagents = list(/datum/reagent/toxin/plasma = 30) -/obj/item/reagent_containers/glass/bottle/synaptizine +/obj/item/reagent_containers/cup/bottle/synaptizine name = "synaptizine bottle" label_name = "synaptizine" desc = "A small bottle of synaptizine." list_reagents = list(/datum/reagent/medicine/synaptizine = 30) -/obj/item/reagent_containers/glass/bottle/formaldehyde +/obj/item/reagent_containers/cup/bottle/formaldehyde name = "formaldehyde bottle" label_name = "formaldehyde" desc = "A small bottle of formaldehyde." list_reagents = list(/datum/reagent/toxin/formaldehyde = 30) -/obj/item/reagent_containers/glass/bottle/cryostylane +/obj/item/reagent_containers/cup/bottle/cryostylane name = "cryostylane bottle" label_name = "cryostylane" desc = "A small bottle of cryostylane. It feels cold to the touch." list_reagents = list(/datum/reagent/cryostylane = 30) -/obj/item/reagent_containers/glass/bottle/ammonia +/obj/item/reagent_containers/cup/bottle/ammonia name = "ammonia bottle" label_name = "ammonia" desc = "A small bottle of ammonia." list_reagents = list(/datum/reagent/ammonia = 30) icon_state_preview = "bottle_ammonia" -/obj/item/reagent_containers/glass/bottle/diethylamine +/obj/item/reagent_containers/cup/bottle/diethylamine name = "diethylamine bottle" label_name = "diethylamine" desc = "A small bottle of diethylamine." list_reagents = list(/datum/reagent/diethylamine = 30) -/obj/item/reagent_containers/glass/bottle/facid +/obj/item/reagent_containers/cup/bottle/facid name = "Fluorosulfuric Acid bottle" label_name = "Fluorosulfuric Acid" desc = "A small bottle. Contains a small amount of fluorosulfuric acid." list_reagents = list(/datum/reagent/toxin/acid/fluacid = 30) -/obj/item/reagent_containers/glass/bottle/adminordrazine +/obj/item/reagent_containers/cup/bottle/adminordrazine name = "Adminordrazine bottle" label_name = "Adminordrazine" desc = "A small bottle. Contains the liquid essence of the gods." @@ -155,221 +167,221 @@ list_reagents = list(/datum/reagent/medicine/adminordrazine = 30) label_icon = null -/obj/item/reagent_containers/glass/bottle/viralbase +/obj/item/reagent_containers/cup/bottle/viralbase name = "Highly potent Viral Base bottle" label_name = "Highly potent Viral Base" desc = "A small bottle. Contains a trace amount of a substance found by scientists that can be used to create extremely advanced diseases once exposed to uranium." list_reagents = list(/datum/reagent/consumable/virus_food/viralbase = 1) -/obj/item/reagent_containers/glass/bottle/capsaicin +/obj/item/reagent_containers/cup/bottle/capsaicin name = "Capsaicin bottle" label_name = "Capsaicin" desc = "A small bottle. Contains hot sauce." list_reagents = list(/datum/reagent/consumable/capsaicin = 30) -/obj/item/reagent_containers/glass/bottle/frostoil +/obj/item/reagent_containers/cup/bottle/frostoil name = "Frost Oil bottle" label_name = "Frost Oil" desc = "A small bottle. Contains cold sauce." list_reagents = list(/datum/reagent/consumable/frostoil = 30) -/obj/item/reagent_containers/glass/bottle/traitor +/obj/item/reagent_containers/cup/bottle/traitor name = "syndicate bottle" label_name = "syndicate" desc = "A small bottle. Contains a random nasty chemical." icon = 'icons/obj/chemical.dmi' var/extra_reagent = null -/obj/item/reagent_containers/glass/bottle/traitor/Initialize(mapload) +/obj/item/reagent_containers/cup/bottle/traitor/Initialize(mapload) . = ..() extra_reagent = pick(/datum/reagent/toxin/polonium, /datum/reagent/toxin/histamine, /datum/reagent/toxin/formaldehyde, /datum/reagent/toxin/venom, /datum/reagent/toxin/fentanyl, /datum/reagent/toxin/cyanide) reagents.add_reagent(extra_reagent, 3) -/obj/item/reagent_containers/glass/bottle/polonium +/obj/item/reagent_containers/cup/bottle/polonium name = "polonium bottle" label_name = "polonium" desc = "A small bottle. Contains Polonium." list_reagents = list(/datum/reagent/toxin/polonium = 30) -/obj/item/reagent_containers/glass/bottle/magillitis +/obj/item/reagent_containers/cup/bottle/magillitis name = "magillitis bottle" label_name = "magillitis" desc = "A small bottle. Contains a serum known only as 'magillitis'." list_reagents = list(/datum/reagent/magillitis = 5) -/obj/item/reagent_containers/glass/bottle/venom +/obj/item/reagent_containers/cup/bottle/venom name = "venom bottle" label_name = "venom" desc = "A small bottle. Contains Venom." list_reagents = list(/datum/reagent/toxin/venom = 30) -/obj/item/reagent_containers/glass/bottle/fentanyl +/obj/item/reagent_containers/cup/bottle/fentanyl name = "fentanyl bottle" label_name = "fentanyl" desc = "A small bottle. Contains Fentanyl." list_reagents = list(/datum/reagent/toxin/fentanyl = 30) -/obj/item/reagent_containers/glass/bottle/formaldehyde +/obj/item/reagent_containers/cup/bottle/formaldehyde name = "formaldehyde bottle" label_name = "formaldehyde" desc = "A small bottle. Contains Formaldehyde." list_reagents = list(/datum/reagent/toxin/formaldehyde = 30) icon_state_preview = "bottle_formaldehyde" -/obj/item/reagent_containers/glass/bottle/initropidril +/obj/item/reagent_containers/cup/bottle/initropidril name = "initropidril bottle" label_name = "initropidril" desc = "A small bottle. Contains initropidril." list_reagents = list(/datum/reagent/toxin/initropidril = 30) -/obj/item/reagent_containers/glass/bottle/pancuronium +/obj/item/reagent_containers/cup/bottle/pancuronium name = "pancuronium bottle" label_name = "pancuronium" desc = "A small bottle. Contains pancuronium." list_reagents = list(/datum/reagent/toxin/pancuronium = 30) -/obj/item/reagent_containers/glass/bottle/sodium_thiopental +/obj/item/reagent_containers/cup/bottle/sodium_thiopental name = "sodium thiopental bottle" label_name = "sodium thiopental" desc = "A small bottle. Contains sodium thiopental." list_reagents = list(/datum/reagent/toxin/sodium_thiopental = 30) -/obj/item/reagent_containers/glass/bottle/coniine +/obj/item/reagent_containers/cup/bottle/coniine name = "coniine bottle" label_name = "coniine" desc = "A small bottle. Contains coniine." list_reagents = list(/datum/reagent/toxin/coniine = 30) -/obj/item/reagent_containers/glass/bottle/curare +/obj/item/reagent_containers/cup/bottle/curare name = "curare bottle" label_name = "curare" desc = "A small bottle. Contains curare." list_reagents = list(/datum/reagent/toxin/curare = 30) -/obj/item/reagent_containers/glass/bottle/amanitin +/obj/item/reagent_containers/cup/bottle/amanitin name = "amanitin bottle" label_name = "amanitin" desc = "A small bottle. Contains amanitin." list_reagents = list(/datum/reagent/toxin/amanitin = 30) -/obj/item/reagent_containers/glass/bottle/histamine +/obj/item/reagent_containers/cup/bottle/histamine name = "histamine bottle" label_name = "histamine" desc = "A small bottle. Contains Histamine." list_reagents = list(/datum/reagent/toxin/histamine = 30) -/obj/item/reagent_containers/glass/bottle/diphenhydramine +/obj/item/reagent_containers/cup/bottle/diphenhydramine name = "antihistamine bottle" label_name = "antihistamine" desc = "A small bottle of diphenhydramine." list_reagents = list(/datum/reagent/medicine/diphenhydramine = 30) -/obj/item/reagent_containers/glass/bottle/potass_iodide +/obj/item/reagent_containers/cup/bottle/potass_iodide name = "anti-radiation bottle" label_name = "anti-radiation" desc = "A small bottle of potassium iodide." list_reagents = list(/datum/reagent/medicine/potass_iodide = 30) -/obj/item/reagent_containers/glass/bottle/salglu_solution +/obj/item/reagent_containers/cup/bottle/salglu_solution name = "saline-glucose bottle" label_name = "saline-glucose" desc = "A small bottle of saline-glucose solution. Useful for patients lacking in blood volume." list_reagents = list(/datum/reagent/medicine/salglu_solution = 30) icon_state_preview = "bottle_salineglucose" -/obj/item/reagent_containers/glass/bottle/atropine +/obj/item/reagent_containers/cup/bottle/atropine name = "atropine bottle" label_name = "atropine" desc = "A small bottle of atropine." list_reagents = list(/datum/reagent/medicine/atropine = 30) -/obj/item/reagent_containers/glass/bottle/romerol +/obj/item/reagent_containers/cup/bottle/romerol name = "romerol bottle" label_name = "romerol" desc = "A small bottle of Romerol. The REAL zombie powder." list_reagents = list(/datum/reagent/romerol = 30) -/obj/item/reagent_containers/glass/bottle/random_virus/minor //for mail only...yet +/obj/item/reagent_containers/cup/bottle/random_virus/minor //for mail only...yet name = "Minor experimental disease culture bottle" label_name = "Minor experimental disease culture" desc = "A small bottle. Contains a weak version of an untested viral culture in synthblood medium." spawned_disease = /datum/disease/advance/random/minor -/obj/item/reagent_containers/glass/bottle/random_virus +/obj/item/reagent_containers/cup/bottle/random_virus name = "Experimental disease culture bottle" label_name = "Experimental disease culture" desc = "A small bottle. Contains an untested viral culture in synthblood medium." spawned_disease = /datum/disease/advance/random icon_state_preview = "bottle_virusblood" -/obj/item/reagent_containers/glass/bottle/pierrot_throat +/obj/item/reagent_containers/cup/bottle/pierrot_throat name = "Pierrot's Throat culture bottle" label_name = "Pierrot's Throat culture" desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium." spawned_disease = /datum/disease/pierrot_throat -/obj/item/reagent_containers/glass/bottle/cold +/obj/item/reagent_containers/cup/bottle/cold name = "Rhinovirus culture bottle" label_name = "Rhinovirus culture" desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium." spawned_disease = /datum/disease/advance/cold -/obj/item/reagent_containers/glass/bottle/flu_virion +/obj/item/reagent_containers/cup/bottle/flu_virion name = "Flu virion culture bottle" label_name = "Flu virion culture" desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium." spawned_disease = /datum/disease/advance/flu -/obj/item/reagent_containers/glass/bottle/inorganic_virion +/obj/item/reagent_containers/cup/bottle/inorganic_virion name = "Inorganic Biology virion culture bottle" label_name = "Inorganic Biology virion culture" desc = "A small bottle. Contains a benign virion culture capable of infecting inorganic organisms in synthblood medium." spawned_disease = /datum/disease/advance/inorganic -/obj/item/reagent_containers/glass/bottle/necrotic_virion +/obj/item/reagent_containers/cup/bottle/necrotic_virion name = "Necrotic Adaptation culture bottle" label_name = "Necrotic Adaptation virion culture" desc = "A small bottle. Contains a benign virion culture capable of metabolizing in deceased organisms in synthblood medium." spawned_disease = /datum/disease/advance/necrotic -/obj/item/reagent_containers/glass/bottle/evolution_virion +/obj/item/reagent_containers/cup/bottle/evolution_virion name = "Viral Evolutionary Acceleration virion culture bottle" label_name = "Viral Evolutionary Acceleration virion culture" desc = "A small bottle. Contains a benign, mutative virion culture in synthblood medium." spawned_disease = /datum/disease/advance/evolution -/obj/item/reagent_containers/glass/bottle/adaptation_virion +/obj/item/reagent_containers/cup/bottle/adaptation_virion name = "Viral Evolutionary Adaptation virion culture bottle" label_name = "Viral Evolutionary Adaptation virion culture" desc = "A small bottle. Contains a benign, resilient virion culture in synthblood medium." spawned_disease = /datum/disease/advance/adaptation -/obj/item/reagent_containers/glass/bottle/aggression_virion +/obj/item/reagent_containers/cup/bottle/aggression_virion name = "Viral Aggressive Metabolism virion culture bottle" label_name = "Viral Aggressive Metabolism virion culture" desc = "A small bottle. Contains a benign, aggressive virion culture in synthblood medium." spawned_disease = /datum/disease/advance/aggression -/obj/item/reagent_containers/glass/bottle/retrovirus +/obj/item/reagent_containers/cup/bottle/retrovirus name = "Retrovirus culture bottle" label_name = "Retrovirus culture" desc = "A small bottle. Contains a retrovirus culture in a synthblood medium." spawned_disease = /datum/disease/dna_retrovirus -/obj/item/reagent_containers/glass/bottle/gbs +/obj/item/reagent_containers/cup/bottle/gbs name = "GBS culture bottle" label_name = "GBS culture" desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit amount_per_transfer_from_this = 5 spawned_disease = /datum/disease/gbs -/obj/item/reagent_containers/glass/bottle/fake_gbs +/obj/item/reagent_containers/cup/bottle/fake_gbs name = "GBS culture bottle" label_name = "GBS culture" desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit spawned_disease = /datum/disease/fake_gbs -/obj/item/reagent_containers/glass/bottle/brainrot +/obj/item/reagent_containers/cup/bottle/brainrot name = "Brainrot culture bottle" label_name = "Brainrot culture" desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium." @@ -377,49 +389,49 @@ spawned_disease = /datum/disease/brainrot label_icon = null -/obj/item/reagent_containers/glass/bottle/magnitis +/obj/item/reagent_containers/cup/bottle/magnitis name = "Magnitis culture bottle" label_name = "Magnitis culture" desc = "A small bottle. Contains a small dosage of Fukkos Miracos." spawned_disease = /datum/disease/magnitis -/obj/item/reagent_containers/glass/bottle/wizarditis +/obj/item/reagent_containers/cup/bottle/wizarditis name = "Wizarditis culture bottle" label_name = "Wizarditis culture" desc = "A small bottle. Contains a sample of Rincewindus Vulgaris." spawned_disease = /datum/disease/wizarditis -/obj/item/reagent_containers/glass/bottle/anxiety +/obj/item/reagent_containers/cup/bottle/anxiety name = "Severe Anxiety culture bottle" label_name = "Severe Anxiety culture" desc = "A small bottle. Contains a sample of Lepidopticides." spawned_disease = /datum/disease/anxiety -/obj/item/reagent_containers/glass/bottle/beesease +/obj/item/reagent_containers/cup/bottle/beesease name = "Beesease culture bottle" label_name = "Beesease culture" desc = "A small bottle. Contains a sample of invasive Apidae." spawned_disease = /datum/disease/beesease -/obj/item/reagent_containers/glass/bottle/fluspanish +/obj/item/reagent_containers/cup/bottle/fluspanish name = "Spanish flu culture bottle" label_name = "Spanish flu culture" desc = "A small bottle. Contains a sample of Inquisitius." spawned_disease = /datum/disease/fluspanish -/obj/item/reagent_containers/glass/bottle/tuberculosis +/obj/item/reagent_containers/cup/bottle/tuberculosis name = "Fungal Tuberculosis culture bottle" label_name = "Fungal Tuberculosis culture" desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus." spawned_disease = /datum/disease/tuberculosis -/obj/item/reagent_containers/glass/bottle/tuberculosiscure +/obj/item/reagent_containers/cup/bottle/tuberculosiscure name = "BVAK bottle" label_name = "BVAK" desc = "A small bottle containing Bio Virus Antidote Kit." list_reagents = list(/datum/reagent/medicine/atropine = 5, /datum/reagent/medicine/epinephrine = 5, /datum/reagent/medicine/salbutamol = 10, /datum/reagent/medicine/spaceacillin = 10) -/obj/item/reagent_containers/glass/bottle/necropolis_seed +/obj/item/reagent_containers/cup/bottle/necropolis_seed name = "bowl of blood" label_name = "blood" desc = "A clay bowl containing a fledgling Necropolis, preserved in blood. A robust virologist may be able to unlock its full potential..." @@ -427,19 +439,19 @@ spawned_disease = /datum/disease/advance/random/necropolis label_icon = null -/obj/item/reagent_containers/glass/bottle/felinid +/obj/item/reagent_containers/cup/bottle/felinid name = "Nano-Feline Assimilative Toxoplasmosis culture bottle" label_name = "Nano-Feline Assimilative Toxoplasmosis culture" desc = "A small bottle. Contains a sample of nano-feline toxoplasma in synthblood medium." spawned_disease = /datum/disease/transformation/felinid/contagious -/obj/item/reagent_containers/glass/bottle/advanced_felinid +/obj/item/reagent_containers/cup/bottle/advanced_felinid name = "Feline Hysteria culture bottle" label_name = "Feline Hysteria culture" desc = "A small bottle. Contains a sample of a dangerous A.R.C. experimental disease" spawned_disease = /datum/disease/advance/feline_hysteria -/obj/item/reagent_containers/glass/bottle/psyphoza +/obj/item/reagent_containers/cup/bottle/psyphoza name = "Acute Fungal Infection culture bottle" label_name = "Acute Fungal Infection culture" desc = "A small bottle. Contains a sample of an agressive fungal species in synthblood medium." @@ -447,159 +459,159 @@ //Oldstation.dmm chemical storage bottles -/obj/item/reagent_containers/glass/bottle/hydrogen +/obj/item/reagent_containers/cup/bottle/hydrogen name = "hydrogen bottle" label_name = "hydrogen" list_reagents = list(/datum/reagent/hydrogen = 30) -/obj/item/reagent_containers/glass/bottle/lithium +/obj/item/reagent_containers/cup/bottle/lithium name = "lithium bottle" label_name = "lithium" list_reagents = list(/datum/reagent/lithium = 30) -/obj/item/reagent_containers/glass/bottle/carbon +/obj/item/reagent_containers/cup/bottle/carbon name = "carbon bottle" label_name = "carbon" list_reagents = list(/datum/reagent/carbon = 30) -/obj/item/reagent_containers/glass/bottle/nitrogen +/obj/item/reagent_containers/cup/bottle/nitrogen name = "nitrogen bottle" label_name = "nitrogen" list_reagents = list(/datum/reagent/nitrogen = 30) -/obj/item/reagent_containers/glass/bottle/oxygen +/obj/item/reagent_containers/cup/bottle/oxygen name = "oxygen bottle" label_name = "oxygen" list_reagents = list(/datum/reagent/oxygen = 30) -/obj/item/reagent_containers/glass/bottle/fluorine +/obj/item/reagent_containers/cup/bottle/fluorine name = "fluorine bottle" label_name = "fluorine" list_reagents = list(/datum/reagent/fluorine = 30) -/obj/item/reagent_containers/glass/bottle/sodium +/obj/item/reagent_containers/cup/bottle/sodium name = "sodium bottle" label_name = "sodium" list_reagents = list(/datum/reagent/sodium = 30) -/obj/item/reagent_containers/glass/bottle/aluminium +/obj/item/reagent_containers/cup/bottle/aluminium name = "aluminium bottle" label_name = "aluminium" list_reagents = list(/datum/reagent/aluminium = 30) -/obj/item/reagent_containers/glass/bottle/silicon +/obj/item/reagent_containers/cup/bottle/silicon name = "silicon bottle" label_name = "silicon" list_reagents = list(/datum/reagent/silicon = 30) -/obj/item/reagent_containers/glass/bottle/phosphorus +/obj/item/reagent_containers/cup/bottle/phosphorus name = "phosphorus bottle" label_name = "phosphorus" list_reagents = list(/datum/reagent/phosphorus = 30) -/obj/item/reagent_containers/glass/bottle/sulfur +/obj/item/reagent_containers/cup/bottle/sulfur name = "sulfur bottle" label_name = "sulfur" list_reagents = list(/datum/reagent/sulfur = 30) -/obj/item/reagent_containers/glass/bottle/chlorine +/obj/item/reagent_containers/cup/bottle/chlorine name = "chlorine bottle" label_name = "chlorine" list_reagents = list(/datum/reagent/chlorine = 30) -/obj/item/reagent_containers/glass/bottle/potassium +/obj/item/reagent_containers/cup/bottle/potassium name = "potassium bottle" label_name = "potassium" list_reagents = list(/datum/reagent/potassium = 30) -/obj/item/reagent_containers/glass/bottle/iron +/obj/item/reagent_containers/cup/bottle/iron name = "iron bottle" label_name = "iron" list_reagents = list(/datum/reagent/iron = 30) -/obj/item/reagent_containers/glass/bottle/copper +/obj/item/reagent_containers/cup/bottle/copper name = "copper bottle" label_name = "copper" list_reagents = list(/datum/reagent/copper = 30) -/obj/item/reagent_containers/glass/bottle/mercury +/obj/item/reagent_containers/cup/bottle/mercury name = "mercury bottle" label_name = "mercury" list_reagents = list(/datum/reagent/mercury = 30) -/obj/item/reagent_containers/glass/bottle/radium +/obj/item/reagent_containers/cup/bottle/radium name = "radium bottle" label_name = "radium" list_reagents = list(/datum/reagent/uranium/radium = 30) -/obj/item/reagent_containers/glass/bottle/water +/obj/item/reagent_containers/cup/bottle/water name = "water bottle" label_name = "water" list_reagents = list(/datum/reagent/water = 30) -/obj/item/reagent_containers/glass/bottle/ethanol +/obj/item/reagent_containers/cup/bottle/ethanol name = "ethanol bottle" label_name = "ethanol" list_reagents = list(/datum/reagent/consumable/ethanol = 30) icon_state_preview = "bottle_ethanol" -/obj/item/reagent_containers/glass/bottle/sugar +/obj/item/reagent_containers/cup/bottle/sugar name = "sugar bottle" label_name = "sugar" list_reagents = list(/datum/reagent/consumable/sugar = 30) -/obj/item/reagent_containers/glass/bottle/sacid +/obj/item/reagent_containers/cup/bottle/sacid name = "sulfuric acid bottle" label_name = "sulfuric acid" list_reagents = list(/datum/reagent/toxin/acid = 30) -/obj/item/reagent_containers/glass/bottle/welding_fuel +/obj/item/reagent_containers/cup/bottle/welding_fuel name = "welding fuel bottle" label_name = "welding fuel" list_reagents = list(/datum/reagent/fuel = 30) -/obj/item/reagent_containers/glass/bottle/silver +/obj/item/reagent_containers/cup/bottle/silver name = "silver bottle" label_name = "silver" list_reagents = list(/datum/reagent/silver = 30) -/obj/item/reagent_containers/glass/bottle/iodine +/obj/item/reagent_containers/cup/bottle/iodine name = "iodine bottle" label_name = "iodine" list_reagents = list(/datum/reagent/iodine = 30) -/obj/item/reagent_containers/glass/bottle/bromine +/obj/item/reagent_containers/cup/bottle/bromine name = "bromine bottle" label_name = "bromine" list_reagents = list(/datum/reagent/bromine = 30) // Bottles for mail goodies. -/obj/item/reagent_containers/glass/bottle/clownstears +/obj/item/reagent_containers/cup/bottle/clownstears name = "bottle of distilled clown misery" label_name = "distilled clown misery" desc = "A small bottle. Contains a mythical liquid used by sublime bartenders; made from the unhappiness of clowns." list_reagents = list(/datum/reagent/consumable/clownstears = 30) -/obj/item/reagent_containers/glass/bottle/saltpetre +/obj/item/reagent_containers/cup/bottle/saltpetre name = "saltpetre bottle" label_name = "saltpetre" desc = "A small bottle. Contains saltpetre." list_reagents = list(/datum/reagent/saltpetre = 30) -/obj/item/reagent_containers/glass/bottle/flash_powder +/obj/item/reagent_containers/cup/bottle/flash_powder name = "flash powder bottle" label_name = "flash powder" desc = "A small bottle. Contains flash powder." list_reagents = list(/datum/reagent/flash_powder = 30) -/obj/item/reagent_containers/glass/bottle/caramel +/obj/item/reagent_containers/cup/bottle/caramel name = "bottle of caramel" label_name = "caramel" desc = "A bottle containing caramalized sugar, also known as caramel. Do not lick." list_reagents = list(/datum/reagent/consumable/caramel = 30) -/obj/item/reagent_containers/glass/bottle/ketamine +/obj/item/reagent_containers/cup/bottle/ketamine name = "ketamine bottle" label_name = "ketamine" desc = "A small bottle. Contains ketamine, why?" diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm similarity index 58% rename from code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm rename to code/modules/reagents/reagent_containers/cups/drinkingglass.dm index c14efb097464b..692bef27ff80d 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm @@ -1,6 +1,4 @@ - - -/obj/item/reagent_containers/food/drinks/drinkingglass +/obj/item/reagent_containers/cup/glass/drinkingglass name = "drinking glass" desc = "Your standard drinking glass." custom_price = 5 @@ -15,7 +13,7 @@ drop_sound = 'sound/items/handling/drinkglass_drop.ogg' pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg' -/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype) +/obj/item/reagent_containers/cup/glass/drinkingglass/on_reagent_change(changetype) cut_overlays() if(reagents.reagent_list.len) var/datum/reagent/R = reagents.get_master_reagent() @@ -39,7 +37,7 @@ // You can only mix the ported-over drinks in shot glasses for now (they'll mix in a shaker, but the sprite won't change for glasses). // // This is on a case-by-case basis, and you can even make a separate sprite for shot glasses if you want. // -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass name = "shot glass" desc = "A shot glass - the universal symbol for bad decisions." custom_price = 5 @@ -50,7 +48,7 @@ volume = 15 custom_materials = list(/datum/material/glass=100) -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype) +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/on_reagent_change(changetype) cut_overlays() gulp_size = max(round(reagents.total_volume / 15), 15) @@ -75,57 +73,21 @@ desc = "A shot glass - the universal symbol for bad decisions." return -/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize(mapload) +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/Initialize(mapload) . = ..() on_reagent_change(ADD_REAGENT) -/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda name = "Soda Water" list_reagents = list(/datum/reagent/consumable/sodawater = 50) icon_state_preview = "glass_clear" -/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola name = "Space Cola" list_reagents = list(/datum/reagent/consumable/space_cola = 50) icon_state_preview = "glass_brown" -/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola name = "Nuka Cola" list_reagents = list(/datum/reagent/consumable/nuka_cola = 50) icon_state_preview = "nuka_colaglass" - -/obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/food/egg)) //breaking eggs - var/obj/item/food/egg/E = I - if(reagents) - if(reagents.total_volume >= reagents.maximum_volume) - to_chat(user, "[src] is full.") - else - to_chat(user, "You break [E] in [src].") - reagents.add_reagent(/datum/reagent/consumable/eggyolk, 5) - qdel(E) - return - else - ..() - -/obj/item/reagent_containers/food/drinks/drinkingglass/attack(obj/target, mob/user) - if(user.a_intent == INTENT_HARM && ismob(target) && target.reagents && reagents.total_volume) - target.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "[user] splashes the contents of [src] onto you!") - log_combat(user, target, "splashed", src) - reagents.reaction(target, TOUCH) - reagents.clear_reagents() - return - ..() - -/obj/item/reagent_containers/food/drinks/drinkingglass/afterattack(obj/target, mob/user, proximity) - . = ..() - if((!proximity) || !check_allowed_items(target,target_self=1)) - return - - else if(reagents.total_volume && user.a_intent == INTENT_HARM) - user.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "You splash the contents of [src] onto [target].") - reagents.reaction(target, TOUCH) - reagents.clear_reagents() - return diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm new file mode 100644 index 0000000000000..f5b50d8473a31 --- /dev/null +++ b/code/modules/reagents/reagent_containers/cups/drinks.dm @@ -0,0 +1,501 @@ +//////////////////////////////////////////////////////////////////////////////// +/// Drinks. +//////////////////////////////////////////////////////////////////////////////// +/obj/item/reagent_containers/cup/glass + name = "drink" + desc = "yummy" + icon = 'icons/obj/drinks.dmi' + icon_state = null + possible_transfer_amounts = list(5,10,15,20,25,30,50) + resistance_flags = NONE + + isGlass = TRUE + + +/obj/item/reagent_containers/cup/glass/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + . = ..() + if(!.) //if the bottle wasn't caught + smash(hit_atom, throwingdatum?.thrower, TRUE) + +/obj/item/reagent_containers/cup/glass/proc/smash(atom/target, mob/thrower, ranged = FALSE) + if(!isGlass) + return + if(QDELING(src) || !target) //Invalid loc + return + if(bartender_check(target) && ranged) + return + SplashReagents(target, ranged, override_spillable = TRUE) + var/obj/item/broken_bottle/B = new (loc) + B.mimic_broken(src, target) + qdel(src) + target.Bumped(B) + +/obj/item/reagent_containers/cup/glass/bullet_act(obj/projectile/P) + . = ..() + if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src)) + var/atom/T = get_turf(src) + smash(T) + + +/obj/item/reagent_containers/cup/glass/trophy + name = "pewter cup" + desc = "Everyone gets a trophy." + icon_state = "pewter_cup" + w_class = WEIGHT_CLASS_TINY + force = 1 + throwforce = 1 + amount_per_transfer_from_this = 5 + custom_materials = list(/datum/material/iron=100) + possible_transfer_amounts = list(5) + volume = 5 + flags_1 = CONDUCT_1 + spillable = TRUE + resistance_flags = FIRE_PROOF + isGlass = FALSE + +/obj/item/reagent_containers/cup/glass/trophy/gold_cup + name = "gold cup" + desc = "You're winner!" + icon_state = "golden_cup" + w_class = WEIGHT_CLASS_BULKY + force = 14 + throwforce = 10 + amount_per_transfer_from_this = 20 + custom_materials = list(/datum/material/gold=1000) + volume = 150 + +/obj/item/reagent_containers/cup/glass/trophy/silver_cup + name = "silver cup" + desc = "Best loser!" + icon_state = "silver_cup" + w_class = WEIGHT_CLASS_NORMAL + force = 10 + throwforce = 8 + amount_per_transfer_from_this = 15 + custom_materials = list(/datum/material/silver=800) + volume = 100 + + +/obj/item/reagent_containers/cup/glass/trophy/bronze_cup + name = "bronze cup" + desc = "At least you ranked!" + icon_state = "bronze_cup" + w_class = WEIGHT_CLASS_SMALL + force = 5 + throwforce = 4 + amount_per_transfer_from_this = 10 + custom_materials = list(/datum/material/iron=400) + volume = 25 + +///////////////////////////////////////////////Drinks +//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly +// rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50. +// Formatting is the same as food. + +/obj/item/reagent_containers/cup/glass/coffee + name = "robust coffee" + desc = "Careful, the beverage you're about to enjoy is extremely hot." + icon_state = "coffee" + list_reagents = list(/datum/reagent/consumable/coffee = 30) + spillable = TRUE + resistance_flags = FREEZE_PROOF + isGlass = FALSE + drink_type = BREAKFAST + +/obj/item/reagent_containers/cup/glass/bubble_tea + name = "Bubble tea" + desc = "Refreshing! You aren't sure what those things in the bottom are." + icon_state = "bubble_tea" + list_reagents = list(/datum/reagent/consumable/bubble_tea = 50) + drink_type = SUGAR + spillable = TRUE + isGlass = FALSE + +/obj/item/reagent_containers/cup/glass/ice + name = "ice cup" + desc = "Careful, cold ice, do not chew." + custom_price = PAYCHECK_EASY * 0.6 + icon_state = "icecup" + list_reagents = list(/datum/reagent/consumable/ice = 30) + spillable = TRUE + isGlass = FALSE + +/obj/item/reagent_containers/cup/glass/ice/prison + name = "dirty ice cup" + desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones." + list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5) + +/obj/item/reagent_containers/cup/glass/mug // parent type is literally just so empty mug sprites are a thing + name = "mug" + desc = "A drink served in a classy mug." + icon_state = "tea" + item_state = "coffee" + spillable = TRUE + +/obj/item/reagent_containers/cup/glass/mug/update_icon_state() + icon_state = reagents.total_volume ? "tea" : "tea_empty" + return ..() + +/obj/item/reagent_containers/cup/glass/mug/tea + name = "Duke Purple tea" + desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." + list_reagents = list(/datum/reagent/consumable/tea = 30) + +/obj/item/reagent_containers/cup/glass/mug/cocoa + name = "Dutch hot coco" + desc = "Made in Space South America." + list_reagents = list(/datum/reagent/consumable/hot_cocoa = 15, /datum/reagent/consumable/sugar = 5) + drink_type = SUGAR + resistance_flags = FREEZE_PROOF + custom_price = PAYCHECK_MEDIUM * 1.2 + + +/obj/item/reagent_containers/cup/glass/dry_ramen + name = "cup ramen" + desc = "Just add 5ml of water, self heats! A taste that reminds you of your school years. Now new with salty flavour!" + icon_state = "ramen" + list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3) + drink_type = GRAIN + isGlass = FALSE + custom_price = PAYCHECK_MEDIUM * 0.9 + +/obj/item/reagent_containers/cup/glass/waterbottle + name = "bottle of water" + desc = "A bottle of water filled at an old Earth bottling facility." + icon = 'icons/obj/drinks.dmi' + icon_state = "smallbottle" + item_state = "bottle" + list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard + custom_materials = list(/datum/material/plastic=1000) + volume = 50 + amount_per_transfer_from_this = 10 + fill_icon_thresholds = list(0, 10, 25, 50, 75, 80, 90) + isGlass = FALSE + // The 2 bottles have separate cap overlay icons because if the bottle falls over while bottle flipping the cap stays fucked on the moved overlay + var/cap_icon_state = "bottle_cap_small" + var/cap_on = TRUE + var/cap_lost = FALSE + var/mutable_appearance/cap_overlay + var/flip_chance = 10 + custom_price = PAYCHECK_EASY * 0.8 + +/obj/item/reagent_containers/cup/glass/waterbottle/Initialize(mapload) + . = ..() + cap_overlay = mutable_appearance(icon, cap_icon_state) + if(cap_on) + spillable = FALSE + update_appearance() + +/obj/item/reagent_containers/cup/glass/waterbottle/update_overlays() + . = ..() + if(cap_on) + . += cap_overlay + +/obj/item/reagent_containers/cup/glass/waterbottle/examine(mob/user) + . = ..() + if(cap_lost) + . += "The cap seems to be missing." + else if(cap_on) + . += "The cap is firmly on to prevent spilling. Alt-click to remove the cap." + else + . += "The cap has been taken off. Alt-click to put a cap on." + +/obj/item/reagent_containers/cup/glass/waterbottle/AltClick(mob/user) + . = ..() + if(cap_lost) + to_chat(user, "The cap seems to be missing! Where did it go?") + return + + var/fumbled = HAS_TRAIT(user, TRAIT_CLUMSY) && prob(5) + if(cap_on || fumbled) + cap_on = FALSE + spillable = TRUE + animate(src, transform = null, time = 2, loop = 0) + if(fumbled) + to_chat(user, "You fumble with [src]'s cap! The cap falls onto the ground and simply vanishes. Where the hell did it go?") + cap_lost = TRUE + else + to_chat(user, "You remove the cap from [src].") + else + cap_on = TRUE + spillable = FALSE + to_chat(user, "You put the cap on [src].") + update_appearance() + +/obj/item/reagent_containers/cup/glass/waterbottle/is_refillable() + if(cap_on) + return FALSE + return ..() + +/obj/item/reagent_containers/cup/glass/waterbottle/is_drainable() + if(cap_on) + return FALSE + return ..() + +/obj/item/reagent_containers/cup/glass/waterbottle/attack(mob/target, mob/living/user, def_zone) + if(!target) + return + + if(cap_on && reagents.total_volume && istype(target)) + to_chat(user, "You must remove the cap before you can do that!") + return + + return ..() + +/obj/item/reagent_containers/cup/glass/waterbottle/afterattack(obj/target, mob/living/user, proximity) + if(cap_on && (target.is_refillable() || target.is_drainable() || (reagents.total_volume && !user.a_intent == INTENT_HARM))) + to_chat(user, "You must remove the cap before you can do that!") + return + + else if(istype(target, /obj/item/reagent_containers/cup/glass/waterbottle)) + var/obj/item/reagent_containers/cup/glass/waterbottle/other_bottle = target + if(other_bottle.cap_on) + to_chat(user, "[other_bottle] has a cap firmly twisted on!") + return + + return ..() + +// heehoo bottle flipping +/obj/item/reagent_containers/cup/glass/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + . = ..() + if(QDELETED(src)) + return + if(!cap_on || !reagents.total_volume) + return + if(prob(flip_chance)) // landed upright + src.visible_message("[src] lands upright!") + if(throwingdatum.thrower) + var/mob/living/living_thrower = throwingdatum.thrower + SEND_SIGNAL(living_thrower, COMSIG_ADD_MOOD_EVENT, "bottle_flip", /datum/mood_event/bottle_flip) + else // landed on it's side + animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0) + +/obj/item/reagent_containers/cup/glass/waterbottle/pickup(mob/user) + . = ..() + animate(src, transform = null, time = 1, loop = 0) + +/obj/item/reagent_containers/cup/glass/waterbottle/empty + list_reagents = list() + cap_on = FALSE + +/obj/item/reagent_containers/cup/glass/waterbottle/large + desc = "A fresh commercial-sized bottle of water." + icon_state = "largebottle" + custom_materials = list(/datum/material/plastic=3000) + list_reagents = list(/datum/reagent/water = 100) + volume = 100 + amount_per_transfer_from_this = 10 + possible_transfer_amounts = list(5,10,15,20,25,30,50,100) + cap_icon_state = "bottle_cap" + +/obj/item/reagent_containers/cup/glass/waterbottle/large/empty + list_reagents = list() + cap_on = FALSE + +// Admin spawn +/obj/item/reagent_containers/cup/glass/waterbottle/relic + name = "mysterious bottle" + desc = "A bottle quite similar to a water bottle, but with some words scribbled on with a marker. It seems to be radiating some kind of energy." + flip_chance = 100 // FLIPP + +/obj/item/reagent_containers/cup/glass/waterbottle/relic/Initialize(mapload) + var/reagent_id = get_random_reagent_id() + var/datum/reagent/random_reagent = new reagent_id + list_reagents = list(random_reagent.type = 50) + . = ..() + desc += "The writing reads '[random_reagent.name]'." + update_appearance() + + +/obj/item/reagent_containers/cup/glass/sillycup + name = "paper cup" + desc = "A paper water cup." + icon_state = "water_cup_e" + possible_transfer_amounts = list(10) + volume = 10 + spillable = TRUE + isGlass = FALSE + +/obj/item/reagent_containers/cup/glass/sillycup/update_icon_state() + icon_state = reagents.total_volume ? "water_cup" : "water_cup_e" + return ..() + +/obj/item/reagent_containers/cup/glass/sillycup/smallcarton + name = "small carton" + desc = "A small carton, intended for holding drinks." + icon_state = "juicebox" + volume = 15 //I figure if you have to craft these it should at least be slightly better than something you can get for free from a watercooler + +/// Reagent container icon updates, especially this one, are complete jank. I will need to rework them after this is merged. +/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/on_reagent_change(datum/reagents/holder, ...) + . = ..() + if(!length(reagents.reagent_list)) + drink_type = NONE /// Why are drink types on the _container_? TODO: move these to the reagents //im waiting + return + + switch(reagents.get_master_reagent_id()) + if(/datum/reagent/consumable/orangejuice) + drink_type = FRUIT | BREAKFAST + if(/datum/reagent/consumable/milk) + drink_type = DAIRY | BREAKFAST + if(/datum/reagent/consumable/applejuice) + drink_type = FRUIT + if(/datum/reagent/consumable/grapejuice) + drink_type = FRUIT + if(/datum/reagent/consumable/pineapplejuice) + drink_type = FRUIT | PINEAPPLE + if(/datum/reagent/consumable/milk/chocolate_milk) + drink_type = SUGAR + if(/datum/reagent/consumable/ethanol/eggnog) + drink_type = MEAT + +/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_name(updates) + . = ..() + if(!length(reagents.reagent_list)) + name = "small carton" + return + + switch(reagents.get_master_reagent_id()) + if(/datum/reagent/consumable/orangejuice) + name = "orange juice box" + if(/datum/reagent/consumable/milk) + name = "carton of milk" + if(/datum/reagent/consumable/applejuice) + name = "apple juice box" + if(/datum/reagent/consumable/grapejuice) + name = "grape juice box" + if(/datum/reagent/consumable/pineapplejuice) + name = "pineapple juice box" + if(/datum/reagent/consumable/milk/chocolate_milk) + name = "carton of chocolate milk" + if(/datum/reagent/consumable/ethanol/eggnog) + name = "carton of eggnog" + +/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_desc(updates) + . = ..() + if(!length(reagents.reagent_list)) + desc = "A small carton, intended for holding drinks." + return + + switch(reagents.get_master_reagent_id()) + if(/datum/reagent/consumable/orangejuice) + desc = "A great source of vitamins. Stay healthy!" + if(/datum/reagent/consumable/milk) + desc = "An excellent source of calcium for growing space explorers." + if(/datum/reagent/consumable/applejuice) + desc = "Sweet apple juice. Don't be late for school!" + if(/datum/reagent/consumable/grapejuice) + desc = "Tasty grape juice in a fun little container. Non-alcoholic!" + if(/datum/reagent/consumable/pineapplejuice) + desc = "Why would you even want this?" + if(/datum/reagent/consumable/milk/chocolate_milk) + desc = "Milk for cool kids!" + if(/datum/reagent/consumable/ethanol/eggnog) + desc = "For enjoying the most wonderful time of the year." + + +/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_icon_state() + . = ..() + if(!length(reagents.reagent_list)) + icon_state = "juicebox" + return + + switch(reagents.get_master_reagent_id()) // Thanks to update_name not existing we need to do this whole switch twice + if(/datum/reagent/consumable/orangejuice) + icon_state = "orangebox" + if(/datum/reagent/consumable/milk) + icon_state = "milkbox" + if(/datum/reagent/consumable/applejuice) + icon_state = "juicebox" + if(/datum/reagent/consumable/grapejuice) + icon_state = "grapebox" + if(/datum/reagent/consumable/pineapplejuice) + icon_state = "pineapplebox" + if(/datum/reagent/consumable/milk/chocolate_milk) + icon_state = "chocolatebox" + if(/datum/reagent/consumable/ethanol/eggnog) + icon_state = "nog2" + else + icon_state = "juicebox" + +/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/smash(atom/target, mob/thrower, ranged = FALSE) + if(bartender_check(target) && ranged) + return + SplashReagents(target, ranged, override_spillable = TRUE) + var/obj/item/broken_bottle/bottle_shard = new (loc) + bottle_shard.mimic_broken(src, target) + qdel(src) + target.Bumped(bottle_shard) + +/obj/item/reagent_containers/cup/glass/colocup + name = "colo cup" + desc = "A cheap, mass produced style of cup, typically used at parties. They never seem to come out red, for some reason..." + icon = 'icons/obj/drinks.dmi' + icon_state = "colocup" + item_state = "colocup" + custom_materials = list(/datum/material/plastic = 1000) + possible_transfer_amounts = list(5, 10, 15, 20) + volume = 20 + amount_per_transfer_from_this = 5 + isGlass = FALSE + /// Allows the lean sprite to display upon crafting + var/random_sprite = TRUE + +/obj/item/reagent_containers/cup/glass/colocup/Initialize(mapload) + . = ..() + pixel_x = rand(-4,4) + pixel_y = rand(-4,4) + if(!random_sprite) + return + icon_state = "colocup[rand(0, 6)]" + if(icon_state == "colocup6") + desc = "A cheap, mass produced style of cup, typically used at parties. Woah, this one is in red! What the hell?" + +//////////////////////////drinkingglass and shaker// +//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink +// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass +// icon states. + +/obj/item/reagent_containers/cup/glass/shaker + name = "shaker" + desc = "A metal shaker to mix drinks in." + icon_state = "shaker" + custom_materials = list(/datum/material/iron=1500) + amount_per_transfer_from_this = 10 + volume = 100 + isGlass = FALSE + +/obj/item/reagent_containers/cup/glass/shaker/Initialize(mapload) + . = ..() + if(prob(10)) + name = "\improper Nanotrasen 20th Anniversary Shaker" + desc += " It has an emblazoned Nanotrasen logo on it." + icon_state = "shaker_n" + +/obj/item/reagent_containers/cup/glass/flask + name = "flask" + desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go." + custom_price = PAYCHECK_COMMAND * 2 + icon_state = "flask" + custom_materials = list(/datum/material/iron=250) + volume = 60 + isGlass = FALSE + +/obj/item/reagent_containers/cup/glass/flask/gold + name = "captain's flask" + desc = "A gold flask belonging to the captain." + icon_state = "flask_gold" + custom_materials = list(/datum/material/gold=500) + +/obj/item/reagent_containers/cup/glass/flask/det + name = "detective's flask" + desc = "The detective's only true friend." + icon_state = "detflask" + list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30) + +/obj/item/reagent_containers/cup/glass/britcup + name = "cup" + desc = "A cup with the british flag emblazoned on it." + icon_state = "britcup" + volume = 30 + spillable = TRUE diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm similarity index 60% rename from code/modules/food_and_drinks/drinks/drinks/bottle.dm rename to code/modules/reagents/reagent_containers/cups/glassbottle.dm index 7da7d67eaa45c..f8f00ac416a61 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -1,64 +1,61 @@ - +#define BOTTLE_KNOCKDOWN_DEFAULT_DURATION (1.3 SECONDS) ///////////////////////////////////////////////Alchohol bottles! -Agouri ////////////////////////// //Functionally identical to regular drinks. The only difference is that the default bottle size is 100. - Darem //Bottles now knockdown and break when smashed on people's heads. - Giacom -/obj/item/reagent_containers/food/drinks/bottle +/obj/item/reagent_containers/cup/glass/bottle + name = "glass bottle" + desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents." + icon_state = "glassbottle" + worn_icon_state = "bottle" + fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90) + custom_price = PAYCHECK_MEDIUM * 1.1 amount_per_transfer_from_this = 10 volume = 100 + force = 15 //Smashing bottles over someone's head hurts. throwforce = 15 item_state = "broken_beer" //Generic held-item sprite until unique ones are made. - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' - isGlass = TRUE - foodtype = ALCOHOL + var/broken_item_state = "broken_beer" + lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi' + drink_type = ALCOHOL item_flags = ISWEAPON ///Directly relates to the 'knockdown' duration. Lowered by armor (i.e. helmets) - var/bottle_knockdown_duration = 1.3 SECONDS + var/bottle_knockdown_duration = BOTTLE_KNOCKDOWN_DEFAULT_DURATION + +/obj/item/reagent_containers/cup/glass/bottle/small + name = "small glass bottle" + desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents." + icon_state = "glassbottlesmall" + volume = 50 + custom_price = PAYCHECK_MEDIUM * 0.9 -/obj/item/reagent_containers/food/drinks/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE) - //Creates a shattering noise and replaces the bottle with a broken_bottle +/obj/item/reagent_containers/cup/glass/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE) if(bartender_check(target) && ranged) return - var/obj/item/broken_bottle/B = new (loc) + SplashReagents(target, ranged, override_spillable = TRUE) + var/obj/item/broken_bottle/B = new(loc) if(!ranged && thrower) thrower.put_in_hands(B) - B.icon_state = icon_state - - var/icon/I = new('icons/obj/drinks.dmi', src.icon_state) - I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1) - I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) - B.icon = I - - if(isGlass) - if(prob(33)) - var/obj/item/shard/S = new(drop_location()) - target.Bumped(S) - playsound(src, "shatter", 70, 1) - else - B.force = 0 - B.throwforce = 0 - B.desc = "A carton with the bottom half burst open. Might give you a papercut." - B.name = "broken [name]" - transfer_fingerprints_to(B) + B.mimic_broken(src, target) qdel(src) target.Bumped(B) -/obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user) +/obj/item/reagent_containers/cup/glass/bottle/try_splash(mob/living/user, atom/target) - if(!target) - return + if(!target || !isliving(target)) + return ..() - if(user.a_intent != INTENT_HARM || !isGlass) + if(!isGlass) return ..() if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, "You don't want to harm [target]!") - return + return FALSE - force = 15 //Smashing bottles over someoen's head hurts. + var/mob/living/living_target = target var/armor_block = 0 //Get the target's armor values for normal attack damage. var/armor_duration = 0 //The more force the bottle has, the longer the duration. @@ -71,34 +68,29 @@ var/mob/living/carbon/human/H = target var/headarmor = 0 // Target's head armor - armor_block = H.run_armor_check(target_zone, MELEE,"","",armour_penetration) // For normal attack damage + armor_block = H.run_armor_check(target_zone, MELEE, "", "", armour_penetration) // For normal attack damage //If they have a hat/helmet and the user is targeting their head. if(istype(H.head, /obj/item/clothing/head) && target_zone == BODY_ZONE_HEAD) - headarmor = H.head.armor.melee - else - headarmor = 0 - + headarmor = H.head.get_armor_rating(MELEE) //Calculate the knockdown duration for the target. armor_duration = (bottle_knockdown_duration - headarmor) + force else //Only humans can have armor, right? - armor_block = target.run_armor_check(target_zone, MELEE) + armor_block = living_target.run_armor_check(target_zone, MELEE) if(target_zone == BODY_ZONE_HEAD) armor_duration = bottle_knockdown_duration + force - //Apply the damage! armor_block = min(90,armor_block) - target.apply_damage(force, BRUTE, target_zone, armor_block) + living_target.apply_damage(force, BRUTE, target_zone, armor_block) // You are going to knock someone down for longer if they are not wearing a helmet. var/head_attack_message = "" - if(target_zone == BODY_ZONE_HEAD && istype(target, /mob/living/carbon/)) + if(target_zone == BODY_ZONE_HEAD && iscarbon(target)) head_attack_message = " on the head" - //Knock down the target for the duration that we calculated and divide it by 5. if(armor_duration) - target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN) + living_target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN) //Display an attack message. if(target != user) @@ -111,13 +103,10 @@ //Attack logs log_combat(user, target, "attacked", src) - //The reagents in the bottle splash all over the target, thanks for the idea Nodrak - SplashReagents(target) - //Finally, smash the bottle. This kills (del) the bottle. smash(target, user) - return + return TRUE //Keeping this here for now, I'll ask if I should keep it here. /obj/item/broken_bottle @@ -130,7 +119,9 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_TINY - item_state = "beer" + item_state = "broken_beer" + lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi' hitsound = 'sound/weapons/bladeslice.ogg' attack_verb_continuous = list("stabs", "slashes", "attacks") attack_verb_simple = list("stab", "slash", "attack") @@ -140,121 +131,175 @@ /obj/item/broken_bottle/Initialize(mapload) . = ..() + AddComponent(/datum/component/caltrop, _min_damage = force) AddComponent(/datum/component/butchering, 200, 55) -/obj/item/reagent_containers/food/drinks/bottle/gin +/// Mimics the appearance and properties of the passed in bottle. +/// Takes the broken bottle to mimic, and the thing the bottle was broken agaisnt as args +/obj/item/broken_bottle/proc/mimic_broken(obj/item/reagent_containers/cup/glass/to_mimic, atom/target) + icon_state = to_mimic.icon_state + var/icon/drink_icon = new('icons/obj/drinks.dmi', icon_state) + drink_icon.Blend(broken_outline, ICON_OVERLAY, rand(5), 1) + drink_icon.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) + icon = drink_icon + + if(istype(to_mimic, /obj/item/reagent_containers/cup/glass/bottle/juice)) + force = 0 + throwforce = 0 + desc = "A carton with the bottom half burst open. Might give you a papercut." + else + if(prob(33)) + var/obj/item/shard/stab_with = new(to_mimic.drop_location()) + target.Bumped(stab_with) + playsound(src, "shatter", 70, TRUE) + name = "broken [to_mimic.name]" + to_mimic.transfer_fingerprints_to(src) + +/obj/item/reagent_containers/cup/glass/bottle/beer + name = "space beer" + desc = "Beer. In space." + icon_state = "beer" + volume = 30 + list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) + drink_type = GRAIN | ALCOHOL + custom_price = PAYCHECK_MEDIUM + +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty + list_reagents = list(/datum/reagent/consumable/ethanol/beer = 1) + +/obj/item/reagent_containers/cup/glass/bottle/beer/syndicate + name = "syndicate beer" + desc = "Consumed only by the finest syndicate agents. There is a round warning label stating 'Don't drink more than one in quick succession!'" + icon_state = "syndicatebeer" + list_reagents = list(/datum/reagent/consumable/ethanol/beer = 10, /datum/reagent/medicine/antitoxin = 20) + +/obj/item/reagent_containers/cup/glass/bottle/beer/light + name = "Carp Lite" + desc = "Brewed with \"Pure Ice Asteroid Spring Water\"." + list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30) + +/obj/item/reagent_containers/cup/glass/bottle/ale + name = "Magm-Ale" + desc = "A true dorf's drink of choice." + icon_state = "alebottle" + volume = 30 + list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30) + drink_type = GRAIN | ALCOHOL + custom_price = PAYCHECK_MEDIUM + +/obj/item/reagent_containers/cup/glass/bottle/gin name = "Griffeater gin" desc = "A bottle of high quality gin, produced in the New London Space Station." icon_state = "ginbottle" list_reagents = list(/datum/reagent/consumable/ethanol/gin = 100) -/obj/item/reagent_containers/food/drinks/bottle/whiskey +/obj/item/reagent_containers/cup/glass/bottle/whiskey name = "Uncle Git's special reserve" desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES." icon_state = "whiskeybottle" list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100) -/obj/item/reagent_containers/food/drinks/bottle/vodka +/obj/item/reagent_containers/cup/glass/bottle/vodka name = "Tunguska triple distilled" desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide." icon_state = "vodkabottle" list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100) -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka name = "Badminka vodka" desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'." icon_state = "badminka" list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100) -/obj/item/reagent_containers/food/drinks/bottle/tequila +/obj/item/reagent_containers/cup/glass/bottle/tequila name = "Caccavo guaranteed quality tequila" desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" icon_state = "tequilabottle" list_reagents = list(/datum/reagent/consumable/ethanol/tequila = 100) -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing +/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing name = "bottle of nothing" desc = "A bottle filled with nothing." icon_state = "bottleofnothing" list_reagents = list(/datum/reagent/consumable/nothing = 100) - foodtype = NONE + drink_type = NONE -/obj/item/reagent_containers/food/drinks/bottle/patron +/obj/item/reagent_containers/cup/glass/bottle/patron name = "Wrapp Artiste Patron" desc = "Silver laced tequila, served in space night clubs across the galaxy." icon_state = "patronbottle" list_reagents = list(/datum/reagent/consumable/ethanol/patron = 100) -/obj/item/reagent_containers/food/drinks/bottle/rum +/obj/item/reagent_containers/cup/glass/bottle/rum name = "Captain Pete's Cuban spiced rum" desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." icon_state = "rumbottle" list_reagents = list(/datum/reagent/consumable/ethanol/rum = 100) -/obj/item/reagent_containers/food/drinks/bottle/holywater +/obj/item/reagent_containers/cup/glass/bottle/holywater name = "flask of holy water" desc = "A flask of the chaplain's holy water." icon_state = "holyflask" list_reagents = list(/datum/reagent/water/holywater = 100) - foodtype = NONE + drink_type = NONE -/obj/item/reagent_containers/food/drinks/bottle/unholywater +/obj/item/reagent_containers/cup/glass/bottle/unholywater name = "flask of unholy water" desc = "Toxic to nonbelievers, reinvigorating to the faithful." icon_state = "holyflask" list_reagents = list(/datum/reagent/fuel/unholywater = 100) - foodtype = NONE + drink_type = NONE -/obj/item/reagent_containers/food/drinks/bottle/hellwater +/obj/item/reagent_containers/cup/glass/bottle/hellwater name = "flask of holy water?" desc = "A flask of holy water...it's been sitting in the Necropolis a while though." - icon_state = "holyflask" list_reagents = list(/datum/reagent/hellwater = 100) - foodtype = NONE -/obj/item/reagent_containers/food/drinks/bottle/vermouth +/obj/item/reagent_containers/cup/glass/bottle/vermouth name = "Goldeneye vermouth" desc = "Sweet, sweet dryness~" icon_state = "vermouthbottle" list_reagents = list(/datum/reagent/consumable/ethanol/vermouth = 100) -/obj/item/reagent_containers/food/drinks/bottle/kahlua +/obj/item/reagent_containers/cup/glass/bottle/kahlua name = "Robert Robust's coffee liqueur" desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK." icon_state = "kahluabottle" list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100) - foodtype = VEGETABLES + drink_type = VEGETABLES -/obj/item/reagent_containers/food/drinks/bottle/goldschlager +/obj/item/reagent_containers/cup/glass/bottle/goldschlager name = "College Girl goldschlager" desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." icon_state = "goldschlagerbottle" list_reagents = list(/datum/reagent/consumable/ethanol/goldschlager = 100) -/obj/item/reagent_containers/food/drinks/bottle/cognac +/obj/item/reagent_containers/cup/glass/bottle/cognac name = "Chateau de Baton premium cognac" desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 100) -/obj/item/reagent_containers/food/drinks/bottle/wine +/obj/item/reagent_containers/cup/glass/bottle/wine name = "Doublebeard's bearded special wine" desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "winebottle" list_reagents = list(/datum/reagent/consumable/ethanol/wine = 100) - foodtype = FRUIT | ALCOHOL + drink_type = FRUIT | ALCOHOL + +//Vintage wine code goes here -/obj/item/reagent_containers/food/drinks/bottle/absinthe +/obj/item/reagent_containers/cup/glass/bottle/absinthe name = "extra-strong absinthe" - desc = "An strong alcoholic drink brewed and distributed by" + desc = "A strong alcoholic drink brewed and distributed by" icon_state = "absinthebottle" list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100) -/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize(mapload) +/obj/item/reagent_containers/cup/glass/bottle/absinthe/Initialize(mapload) . = ..() redact() -/obj/item/reagent_containers/food/drinks/bottle/absinthe/proc/redact() +/obj/item/reagent_containers/cup/glass/bottle/absinthe/proc/redact() // There was a large fight in the coderbus about a player reference // in absinthe. Ergo, this is why the name generation is now so // complicated. Judge us kindly. @@ -268,9 +313,14 @@ fullname = "Ash and Asher" if("Generic") fullname = "Nanotrasen Cheap Imitations" - var/removals = list("\[REDACTED\]", "\[EXPLETIVE DELETED\]", - "\[EXPUNGED\]", "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]", - "\[MOVE ALONG CITIZEN\]", "\[NOTHING TO SEE HERE\]") + var/removals = list( + "\[REDACTED\]", + "\[EXPLETIVE DELETED\]", + "\[EXPUNGED\]", + "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]", + "\[MOVE ALONG CITIZEN\]", + "\[NOTHING TO SEE HERE\]", + ) var/chance = 50 if(prob(chance)) @@ -289,41 +339,41 @@ desc = "[desc] [fullname] Inc." -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium +/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium name = "Gwyn's premium absinthe" desc = "A potent alcoholic beverage, almost makes you forget the ash in your lungs." icon_state = "absinthepremium" -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium/redact() +/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium/redact() return -/obj/item/reagent_containers/food/drinks/bottle/lizardwine +/obj/item/reagent_containers/cup/glass/bottle/lizardwine name = "bottle of lizard wine" desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff." icon_state = "lizardwine" list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100) - foodtype = FRUIT | ALCOHOL + drink_type = FRUIT | ALCOHOL -/obj/item/reagent_containers/food/drinks/bottle/hcider +/obj/item/reagent_containers/cup/glass/bottle/hcider name = "Jian Hard Cider" desc = "Apple juice for adults." icon_state = "hcider" volume = 50 list_reagents = list(/datum/reagent/consumable/ethanol/hcider = 50) -/obj/item/reagent_containers/food/drinks/bottle/grappa - name = "Phillipes well-aged Grappa" +/obj/item/reagent_containers/cup/glass/bottle/grappa + name = "Phillipe's well-aged Grappa" desc = "Bottle of Grappa." icon_state = "grappabottle" list_reagents = list(/datum/reagent/consumable/ethanol/grappa = 100) -/obj/item/reagent_containers/food/drinks/bottle/sake +/obj/item/reagent_containers/cup/glass/bottle/sake name = "Ryo's traditional sake" desc = "Sweet as can be, and burns like fire going down." icon_state = "sakebottle" list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100) -/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize(mapload) +/obj/item/reagent_containers/cup/glass/bottle/sake/Initialize(mapload) . = ..() if(prob(10)) name = "Fluffy Tail Sake" @@ -334,227 +384,142 @@ desc += " Awoo." icon_state = "sakebottle_i" -/obj/item/reagent_containers/food/drinks/bottle/fernet +/obj/item/reagent_containers/cup/glass/bottle/fernet name = "Fernet Bronca" desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station" icon_state = "fernetbottle" list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100) -/obj/item/reagent_containers/food/drinks/bottle/beer - name = "Space Beer" - desc = "Beer. In space. In a bigger bottle." - icon_state = "beer" - list_reagents = list(/datum/reagent/consumable/ethanol/beer = 100) - -/obj/item/reagent_containers/food/drinks/bottle/ale - name = "Magm-Ale" - desc = "A true dorf's drink of choice, now in a MANLY bottle." - icon_state = "alebottle" - list_reagents = list(/datum/reagent/consumable/ethanol/ale = 100) - -/obj/item/reagent_containers/food/drinks/bottle/homemaderum +/obj/item/reagent_containers/cup/glass/bottle/homemaderum name = "Cookie's Homemade Rum" desc = "Brewed all the way back on Space Station 3. Might tell you where those basket-hats of fruit keep coming from." icon_state = "moonshinebottle" list_reagents = list(/datum/reagent/consumable/ethanol/rum = 95, /datum/reagent/drug/mushroomhallucinogen = 5) -//////////////////////////JUICES AND STUFF /////////////////////// - -/obj/item/reagent_containers/food/drinks/bottle/orangejuice - name = "orange juice" - desc = "Full of vitamins and deliciousness!" - custom_price = 10 - icon_state = "orangejuice" - item_state = "carton" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' - isGlass = FALSE - list_reagents = list(/datum/reagent/consumable/orangejuice = 100) - foodtype = FRUIT | BREAKFAST - -/obj/item/reagent_containers/food/drinks/bottle/cream - name = "milk cream" - desc = "It's cream. Made from milk. What else did you think you'd find in there?" - custom_price = 10 - icon_state = "cream" - item_state = "carton" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' - isGlass = FALSE - list_reagents = list(/datum/reagent/consumable/cream = 100) - foodtype = DAIRY - -/obj/item/reagent_containers/food/drinks/bottle/tomatojuice - name = "tomato juice" - desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." - custom_price = 10 - icon_state = "tomatojuice" - item_state = "carton" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' - isGlass = FALSE - list_reagents = list(/datum/reagent/consumable/tomatojuice = 100) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/drinks/bottle/limejuice - name = "lime juice" - desc = "Sweet-sour goodness." - custom_price = 10 - icon_state = "limejuice" - item_state = "carton" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' - isGlass = FALSE - list_reagents = list(/datum/reagent/consumable/limejuice = 100) - foodtype = FRUIT - -/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice - name = "pineapple juice" - desc = "Extremely tart, yellow juice." - custom_price = 10 - icon_state = "pineapplejuice" - item_state = "carton" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' - isGlass = FALSE - list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100) - foodtype = FRUIT | PINEAPPLE - -/obj/item/reagent_containers/food/drinks/bottle/menthol - name = "menthol" - desc = "Tastes naturally minty, and imparts a very mild numbing sensation." - custom_price = 10 - icon_state = "mentholbox" - item_state = "carton" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' - isGlass = FALSE - list_reagents = list(/datum/reagent/consumable/menthol = 100) - -/obj/item/reagent_containers/food/drinks/bottle/grenadine +/obj/item/reagent_containers/cup/glass/bottle/grenadine name = "Jester Grenadine" desc = "Contains 0% real cherries!" - custom_price = 10 + custom_price = PAYCHECK_MEDIUM icon_state = "grenadine" - isGlass = TRUE list_reagents = list(/datum/reagent/consumable/grenadine = 100) - foodtype = FRUIT + drink_type = FRUIT -/obj/item/reagent_containers/food/drinks/bottle/synthflesh +/obj/item/reagent_containers/cup/glass/bottle/synthflesh name = "carton of synthflesh" desc = "A No-Name carton of synthflesh. It seems moldy. And it seems that YOUR INCOMPETENT ASS IS THE ONLY FUCKING REASON THIS THING EVEN EXISTS!!!!" - custom_price = 10 icon_state = "synthflesh" item_state = "carton" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' isGlass = FALSE list_reagents = list(/datum/reagent/medicine/synthflesh = 100) -/obj/item/reagent_containers/food/drinks/bottle/virusfood +/obj/item/reagent_containers/cup/glass/bottle/virusfood name = "carton of virus food" desc = "A carton of ready-mixed virus food. Do not drink." - custom_price = 10 icon_state = "virusfood" item_state = "carton" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' isGlass = FALSE list_reagents = list(/datum/reagent/consumable/virus_food = 100) -/obj/item/reagent_containers/food/drinks/bottle/applejack +/obj/item/reagent_containers/cup/glass/bottle/applejack name = "Buckin' Bronco's Applejack" desc = "Kicks like a horse, tastes like an apple!" - custom_price = 10 + custom_price = PAYCHECK_MEDIUM icon_state = "applejack_bottle" - isGlass = TRUE list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100) - foodtype = FRUIT + drink_type = FRUIT -/obj/item/reagent_containers/food/drinks/bottle/champagne +/obj/item/reagent_containers/cup/glass/bottle/champagne name = "Eau d' Dandy Brut Champagne" desc = "Finely sourced from only the most pretentious French vineyards." - custom_premium_price = 200 icon_state = "champagne_bottle" - isGlass = TRUE + base_icon_state = "champagne_bottle" + reagent_flags = TRANSPARENT + spillable = FALSE list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100) -/obj/item/reagent_containers/food/drinks/bottle/blazaam +/obj/item/reagent_containers/cup/glass/bottle/blazaam name = "Ginbad's Blazaam" desc = "You feel like you should give the bottle a good rub before opening." icon_state = "blazaambottle" list_reagents = list(/datum/reagent/consumable/ethanol/blazaam = 100) -/obj/item/reagent_containers/food/drinks/bottle/trappist +/obj/item/reagent_containers/cup/glass/bottle/trappist name = "Mont de Requin Trappistes Bleu" desc = "Brewed in space-Belgium. Fancy!" - custom_premium_price = 50 icon_state = "trappistbottle" volume = 50 list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50) -/obj/item/reagent_containers/food/drinks/bottle/hooch +/obj/item/reagent_containers/cup/glass/bottle/hooch name = "hooch bottle" desc = "A bottle of rotgut. Its owner has applied some street wisdom to cleverly disguise it as a brown paper bag." icon_state = "hoochbottle" list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100) -/obj/item/reagent_containers/food/drinks/bottle/moonshine +/obj/item/reagent_containers/cup/glass/bottle/moonshine name = "moonshine jug" - desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle." + desc = "It is said that the ancient Appalachians used these stoneware jugs to capture lightning in a bottle." icon_state = "moonshinebottle" list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100) -/obj/item/reagent_containers/food/drinks/bottle/blank //Don't let players print these from a lathe, bottles should be obtained in mass from the bar only. +/obj/item/reagent_containers/cup/glass/bottle/blank //Don't let players print these from a lathe, bottles should be obtained in mass from the bar only. name = "glass bottle" desc = "This blank bottle is unyieldingly anonymous, offering no clues to it's contents." icon_state = "glassbottle" fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90) -/obj/item/reagent_containers/food/drinks/bottle/blank/update_icon() +/obj/item/reagent_containers/cup/glass/bottle/blank/update_icon() ..() add_overlay("[initial(icon_state)]shine") -/obj/item/reagent_containers/food/drinks/bottle/blank/small +/obj/item/reagent_containers/cup/glass/bottle/blank/small name = "small glass bottle" desc = "This small bottle is unyieldingly anonymous, offering no clues to it's contents." icon_state = "glassbottlesmall" volume = 50 ////////////////////////// MOLOTOV /////////////////////// -/obj/item/reagent_containers/food/drinks/bottle/molotov +/obj/item/reagent_containers/cup/glass/bottle/molotov name = "molotov cocktail" desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss." icon_state = "vodkabottle" list_reagents = list() - var/list/accelerants = list( /datum/reagent/consumable/ethanol, /datum/reagent/fuel, /datum/reagent/clf3, /datum/reagent/phlogiston, - /datum/reagent/napalm, /datum/reagent/hellwater, /datum/reagent/toxin/plasma, /datum/reagent/toxin/spore_burning) - var/active = 0 - -/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list) + var/active = FALSE + var/list/accelerants = list( + /datum/reagent/consumable/ethanol, + /datum/reagent/fuel, + /datum/reagent/clf3, + /datum/reagent/phlogiston, + /datum/reagent/napalm, + /datum/reagent/hellwater, + /datum/reagent/toxin/plasma, + /datum/reagent/toxin/spore_burning + ) + +/obj/item/reagent_containers/cup/glass/bottle/molotov/CheckParts(list/parts_list) ..() - var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents + var/obj/item/reagent_containers/cup/glass/bottle/B = locate() in contents if(B) icon_state = B.icon_state - B.reagents.copy_to(src,100) - if(!B.isGlass) + B.reagents.copy_to(src, 100) + if(istype(B, /obj/item/reagent_containers/cup/glass/bottle/juice)) desc += " You're not sure if making this out of a carton was the brightest idea." isGlass = FALSE return -/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) +/obj/item/reagent_containers/cup/glass/bottle/molotov/smash(atom/target, mob/thrower, ranged = FALSE) var/firestarter = 0 - for(var/datum/reagent/R in reagents.reagent_list) - for(var/A in accelerants) - if(istype(R,A)) + for(var/datum/reagent/contained_reagent in reagents.reagent_list) + for(var/accelerant_type in accelerants) + if(istype(contained_reagent, accelerant_type)) firestarter = 1 break if(firestarter && active) - hit_atom.fire_act() - new /obj/effect/hotspot(get_turf(hit_atom)) + target.fire_act() + new /obj/effect/hotspot(get_turf(target)) ..() -/obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params) +/obj/item/reagent_containers/cup/glass/bottle/molotov/attackby(obj/item/I, mob/user, params) if(I.is_hot() && !active) active = TRUE log_bomber(user, "has primed a", src, "for detonation") @@ -562,25 +527,79 @@ to_chat(user, "You light [src] on fire.") add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay) if(!isGlass) - spawn(50) - if(active) - var/counter - var/target = src.loc - for(counter = 0, counter<2, counter++) - if(istype(target, /obj/item/storage)) - var/obj/item/storage/S = target - target = S.loc - if(istype(target, /atom)) - var/atom/A = target - SplashReagents(A) - A.fire_act() - qdel(src) - -/obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user) + addtimer(CALLBACK(src, PROC_REF(explode)), 5 SECONDS) + +/obj/item/reagent_containers/cup/glass/bottle/molotov/proc/explode() + if(!active) + return + if(get_turf(src)) + var/atom/target = loc + for(var/i in 1 to 2) + if(istype(target, /obj/item/storage)) + target = target.loc + SplashReagents(target, override_spillable = TRUE) + target.fire_act() + qdel(src) + +/obj/item/reagent_containers/cup/glass/bottle/molotov/attack_self(mob/user) if(active) if(!isGlass) to_chat(user, "The flame's spread too far on it!") return to_chat(user, "You snuff out the flame on [src].") cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay) - active = 0 + active = FALSE + return + return ..() + +/** + * Cartons + * Subtype of glass that don't break, and share a common carton hand state. + * Meant to be a subtype for use in Molotovs + */ +/obj/item/reagent_containers/cup/glass/bottle/juice + custom_price = PAYCHECK_MEDIUM + item_state = "carton" + isGlass = FALSE + +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice + name = "orange juice" + desc = "Full of vitamins and deliciousness!" + icon_state = "orangejuice" + list_reagents = list(/datum/reagent/consumable/orangejuice = 100) + drink_type = FRUIT | BREAKFAST + +/obj/item/reagent_containers/cup/glass/bottle/juice/cream + name = "milk cream" + desc = "It's cream. Made from milk. What else did you think you'd find in there?" + icon_state = "cream" + list_reagents = list(/datum/reagent/consumable/cream = 100) + drink_type = DAIRY + +/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice + name = "tomato juice" + desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." + icon_state = "tomatojuice" + list_reagents = list(/datum/reagent/consumable/tomatojuice = 100) + drink_type = VEGETABLES + +/obj/item/reagent_containers/cup/glass/bottle/juice/limejuice + name = "lime juice" + desc = "Sweet-sour goodness." + icon_state = "limejuice" + list_reagents = list(/datum/reagent/consumable/limejuice = 100) + drink_type = FRUIT + +/obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice + name = "pineapple juice" + desc = "Extremely tart, yellow juice." + icon_state = "pineapplejuice" + list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100) + drink_type = FRUIT | PINEAPPLE + +/obj/item/reagent_containers/cup/glass/bottle/juice/menthol + name = "menthol" + desc = "Tastes naturally minty, and imparts a very mild numbing sensation." + list_reagents = list(/datum/reagent/consumable/menthol = 100) + +#undef BOTTLE_KNOCKDOWN_DEFAULT_DURATION diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm new file mode 100644 index 0000000000000..d70f97dd16eb4 --- /dev/null +++ b/code/modules/reagents/reagent_containers/cups/soda.dm @@ -0,0 +1,248 @@ + +//////////////////////////soda_cans// +//These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm +/// How much fizziness is added to the can of soda by throwing it, in percentage points +#define SODA_FIZZINESS_THROWN 15 +/// How much fizziness is added to the can of soda by shaking it, in percentage points +#define SODA_FIZZINESS_SHAKE 5 + +/obj/item/reagent_containers/cup/soda_cans + name = "soda can" + icon = 'icons/obj/drinks.dmi' + reagent_flags = NONE + spillable = FALSE + custom_price = PAYCHECK_MEDIUM * 0.9 + obj_flags = CAN_BE_HIT + possible_transfer_amounts = list(5, 10, 15, 25, 30) + volume = 30 + throwforce = 12 // set to 0 upon being opened. Have you ever been domed by a soda can? Those things fucking hurt + /// If the can hasn't been opened yet, this is the measure of how fizzed up it is from being shaken or thrown around. When opened, this is rolled as a percentage chance to burst + var/fizziness = 0 + +/obj/item/reagent_containers/cup/soda_cans/random/Initialize(mapload) + ..() + var/T = pick(subtypesof(/obj/item/reagent_containers/cup/soda_cans) - /obj/item/reagent_containers/cup/soda_cans/random) + new T(loc) + return INITIALIZE_HINT_QDEL + +/obj/item/reagent_containers/cup/soda_cans/suicide_act(mob/living/carbon/human/H) + if(!reagents.total_volume) + H.visible_message("[H] is trying to take a big sip from [src]... The can is empty!") + return SHAME + if(!is_drainable()) + open_soda() + sleep(10) + H.visible_message("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!") + playsound(H,'sound/items/drink.ogg', 80, TRUE) + reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip + sleep(5) + H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old-fashioned singularity engines anymore.")) + if(H.age >= 30) + H.Stun(50) + sleep(50) + playsound(H,'sound/items/drink.ogg', 80, TRUE) + H.say(pick("Another day, another dollar.", "I wonder if I should hold?", "Diversifying is for young'ns.", "Yeap, times were good back then.")) + return MANUAL_SUICIDE_NONLETHAL + sleep(20) //dramatic pause + return TOXLOSS + +/obj/item/reagent_containers/cup/soda_cans/attack(mob/M, mob/user) + if(iscarbon(M) && !reagents.total_volume && user.a_intent == INTENT_HARM && user.is_zone_selected(BODY_ZONE_HEAD)) + if(M == user) + user.visible_message("[user] crushes the can of [src] on [user.p_their()] forehead!", "You crush the can of [src] on your forehead.") + else + user.visible_message("[user] crushes the can of [src] on [M]'s forehead!", "You crush the can of [src] on [M]'s forehead.") + playsound(M,'sound/weapons/pierce.ogg', rand(10,50), TRUE) + var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(M.loc) + crushed_can.icon_state = icon_state + qdel(src) + return TRUE + return ..() + +/obj/item/reagent_containers/cup/soda_cans/bullet_act(obj/projectile/P) + . = ..() + if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src)) + var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc) + crushed_can.icon_state = icon_state + var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs)) + crushed_can.throw_at(throw_target, rand(1,2), 7) + qdel(src) + return + +/obj/item/reagent_containers/cup/soda_cans/proc/open_soda(mob/user) + if(prob(fizziness)) + user.visible_message("[user] opens [src], and is suddenly sprayed by the fizzing contents!", "You pull back the tab of [src], and are suddenly sprayed with a torrent of liquid! Ahhh!!") + burst_soda(user) + return + to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh + reagents.flags |= OPENCONTAINER + playsound(src, "can_open", 50, TRUE) + spillable = TRUE + throwforce = 0 + +/** + * Burst the soda open on someone. Fun! Opens and empties the soda can, but does not crush it. + * + * Arguments: + * * target - Who's getting covered in soda + * * hide_message - Stops the generic fizzing message, so you can do your own + */ +/obj/item/reagent_containers/cup/soda_cans/proc/burst_soda(atom/target, hide_message = FALSE) + if(!target) + return + + if(ismob(target)) + var/mob/living/target_mob = target + SEND_SIGNAL(target_mob, COMSIG_ADD_MOOD_EVENT, "soda_spill", /datum/mood_event/soda_spill, src) + for(var/mob/living/iter_mob in view(src, 7)) + if(iter_mob != target) + SEND_SIGNAL(iter_mob, COMSIG_ADD_MOOD_EVENT, "observed_soda_spill", /datum/mood_event/observed_soda_spill, target, src) + + playsound(src, 'sound/effects/can_pop.ogg', 80, TRUE) + if(!hide_message) + visible_message("[src] spills over, fizzing its contents all over [target]!") + spillable = TRUE + reagents.flags |= OPENCONTAINER + reagents.reaction(target, TOUCH) + reagents.clear_reagents() + throwforce = 0 + +/obj/item/reagent_containers/cup/soda_cans/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + . = ..() + if(. || spillable || !reagents.total_volume) // if it was caught, already opened, or has nothing in it + return + + fizziness += SODA_FIZZINESS_THROWN + if(!prob(fizziness)) + return + + burst_soda(hit_atom, hide_message = TRUE) + visible_message("[src]'s impact with [hit_atom] causes it to rupture, spilling everywhere!") + var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc) + crushed_can.icon_state = icon_state + moveToNullspace() + QDEL_IN(src, 1 SECONDS) // give it a second so it can still be logged for the throw impact + +/obj/item/reagent_containers/cup/soda_cans/attack_self(mob/user) + if(!is_drainable()) + open_soda(user) + return + return ..() + +/obj/item/reagent_containers/cup/soda_cans/examine_more(mob/user) + . = ..() + if(!in_range(user, src)) + return + if(fizziness > 30 && prob(fizziness * 2)) + . += "You examine [src] closer, and note the following..." + . += "\t["You get a menacing aura of fizziness from it..."]" + +#undef SODA_FIZZINESS_THROWN +#undef SODA_FIZZINESS_SHAKE + +/obj/item/reagent_containers/cup/soda_cans/cola + name = "Space Cola" + desc = "Cola. in space." + icon_state = "cola" + list_reagents = list(/datum/reagent/consumable/space_cola = 30) + drink_type = SUGAR + +/obj/item/reagent_containers/cup/soda_cans/tonic + name = "T-Borg's tonic water" + desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." + icon_state = "tonic" + list_reagents = list(/datum/reagent/consumable/tonic = 50) + drink_type = ALCOHOL + +/obj/item/reagent_containers/cup/soda_cans/sodawater + name = "soda water" + desc = "A can of soda water. Why not make a scotch and soda?" + icon_state = "sodawater" + list_reagents = list(/datum/reagent/consumable/sodawater = 50) + +/obj/item/reagent_containers/cup/soda_cans/lemon_lime + name = "orange soda" + desc = "You wanted ORANGE. It gave you Lemon Lime." + icon_state = "lemon-lime" + list_reagents = list(/datum/reagent/consumable/lemon_lime = 30) + drink_type = FRUIT + +/obj/item/reagent_containers/cup/soda_cans/lemon_lime/Initialize(mapload) + . = ..() + name = "lemon-lime soda" + +/obj/item/reagent_containers/cup/soda_cans/sol_dry + name = "Sol Dry" + desc = "Maybe this will help your tummy feel better. Maybe not." + icon_state = "sol_dry" + list_reagents = list(/datum/reagent/consumable/sol_dry = 30) + drink_type = SUGAR + +/obj/item/reagent_containers/cup/soda_cans/space_up + name = "Space-Up!" + desc = "Tastes like a hull breach in your mouth." + icon_state = "space-up" + list_reagents = list(/datum/reagent/consumable/space_up = 30) + drink_type = SUGAR | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/starkist + name = "Star-kist" + desc = "The taste of a star in liquid form. And, a bit of tuna...?" + icon_state = "starkist" + list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15) + drink_type = SUGAR | FRUIT | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind + name = "Space Mountain Wind" + desc = "Blows right through you like a space wind." + icon_state = "space_mountain_wind" + list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30) + drink_type = SUGAR | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/thirteenloko + name = "Thirteen Loko" + desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." + icon_state = "thirteen_loko" + list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30) + drink_type = SUGAR | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/dr_gibb + name = "Dr. Gibb" + desc = "A delicious mixture of 42 different flavors." + icon_state = "dr_gibb" + list_reagents = list(/datum/reagent/consumable/dr_gibb = 30) + drink_type = SUGAR | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/pwr_game + name = "Pwr Game" + desc = "The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to." + icon_state = "purple_can" + list_reagents = list(/datum/reagent/consumable/pwr_game = 30) + +/obj/item/reagent_containers/cup/soda_cans/shamblers + name = "Shambler's juice" + desc = "~Shake me up some of that Shambler's Juice!~" + icon_state = "shamblers" + list_reagents = list(/datum/reagent/consumable/shamblers = 30) + drink_type = SUGAR | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/grey_bull + name = "Grey Bull" + desc = "Grey Bull, it gives you gloves!" + icon_state = "energy_drink" + list_reagents = list(/datum/reagent/consumable/grey_bull = 20) + drink_type = SUGAR | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/monkey_energy + name = "Monkey Energy" + desc = "Unleash the ape!" + icon_state = "monkey_energy" + item_state = "monkey_energy" + list_reagents = list(/datum/reagent/consumable/monkey_energy = 50) + drink_type = SUGAR | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/air + name = "canned air" + desc = "There is no air shortage. Do not drink." + icon_state = "air" + list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 0221fce1e147f..fd1e798805540 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -268,7 +268,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/peppertank, 30) to_chat(user, "There aren't any cups left!") return user.visible_message("[user] takes a cup from [src].", "You take a paper cup from [src].") - var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src)) + var/obj/item/reagent_containers/cup/glass/sillycup/S = new(get_turf(src)) user.put_in_hands(S) paper_cups-- diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 2243e49db7577..fed0d9be41574 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -7,7 +7,7 @@ id = "bucket" build_type = AUTOLATHE | PROTOLATHE materials = list(/datum/material/iron = 200) - build_path = /obj/item/reagent_containers/glass/bucket + build_path = /obj/item/reagent_containers/cup/bucket category = list("initial","Tools","Tool Designs") departmental_flags = DEPARTMENTAL_FLAG_SERVICE @@ -390,7 +390,7 @@ id = "bowl" build_type = AUTOLATHE materials = list(/datum/material/glass = 500) - build_path = /obj/item/reagent_containers/glass/bowl + build_path = /obj/item/reagent_containers/cup/bowl category = list("initial","Dinnerware") /datum/design/drinking_glass @@ -398,7 +398,7 @@ id = "drinking_glass" build_type = AUTOLATHE materials = list(/datum/material/glass = 500) - build_path = /obj/item/reagent_containers/food/drinks/drinkingglass + build_path = /obj/item/reagent_containers/cup/glass/drinkingglass category = list("initial","Dinnerware") /datum/design/shot_glass @@ -406,7 +406,7 @@ id = "shot_glass" build_type = AUTOLATHE materials = list(/datum/material/glass = 100) - build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass + build_path = /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass category = list("initial","Dinnerware") /datum/design/shaker @@ -414,7 +414,7 @@ id = "shaker" build_type = AUTOLATHE materials = list(/datum/material/iron = 1500) - build_path = /obj/item/reagent_containers/food/drinks/shaker + build_path = /obj/item/reagent_containers/cup/glass/shaker category = list("initial","Dinnerware") /datum/design/cultivator @@ -538,7 +538,7 @@ id = "beaker" build_type = AUTOLATHE | PROTOLATHE materials = list(/datum/material/glass = 500) - build_path = /obj/item/reagent_containers/glass/beaker + build_path = /obj/item/reagent_containers/cup/beaker category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE @@ -547,7 +547,7 @@ id = "large_beaker" build_type = AUTOLATHE | PROTOLATHE materials = list(/datum/material/glass = 2500) - build_path = /obj/item/reagent_containers/glass/beaker/large + build_path = /obj/item/reagent_containers/cup/beaker/large category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index f41cad1fba302..c2afe25e57c91 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -23,7 +23,7 @@ id = "milk_carton" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 100) - build_path = /obj/item/reagent_containers/food/condiment/milk + build_path = /obj/item/reagent_containers/condiment/milk category = list("initial","Food") /datum/design/cream_carton @@ -31,7 +31,7 @@ id = "cream_carton" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 300) - build_path = /obj/item/reagent_containers/food/drinks/bottle/cream + build_path = /obj/item/reagent_containers/cup/glass/bottle/juice/cream category = list("initial","Food") /datum/design/black_pepper @@ -47,7 +47,7 @@ id = "pepper_mill" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 50) - build_path = /obj/item/reagent_containers/food/condiment/peppermill + build_path = /obj/item/reagent_containers/condiment/peppermill make_reagents = list() category = list("initial","Food") @@ -65,14 +65,14 @@ id = "flour_sack" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 150) - build_path = /obj/item/reagent_containers/food/condiment/flour + build_path = /obj/item/reagent_containers/condiment/flour category = list("initial","Food") /datum/design/sugar_sack name = "Sugar Sack" id = "sugar_sack" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 200) - build_path = /obj/item/reagent_containers/food/condiment/sugar + build_path = /obj/item/reagent_containers/condiment/sugar category = list("initial","Food") /datum/design/monkey_cube @@ -88,7 +88,7 @@ id = "ez_nut" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 10) - build_path = /obj/item/reagent_containers/glass/bottle/nutrient/ez + build_path = /obj/item/reagent_containers/cup/bottle/nutrient/ez category = list("initial","Botany Chemicals") /datum/design/l4z_nut @@ -96,7 +96,7 @@ id = "l4z_nut" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 20) - build_path = /obj/item/reagent_containers/glass/bottle/nutrient/l4z + build_path = /obj/item/reagent_containers/cup/bottle/nutrient/l4z category = list("initial","Botany Chemicals") /datum/design/rh_nut @@ -104,7 +104,7 @@ id = "rh_nut" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 25) - build_path = /obj/item/reagent_containers/glass/bottle/nutrient/rh + build_path = /obj/item/reagent_containers/cup/bottle/nutrient/rh category = list("initial","Botany Chemicals") /datum/design/weed_killer @@ -112,7 +112,7 @@ id = "weed_killer" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 50) - build_path = /obj/item/reagent_containers/glass/bottle/killer/weedkiller + build_path = /obj/item/reagent_containers/cup/bottle/killer/weedkiller category = list("initial","Botany Chemicals") /datum/design/pest_spray @@ -120,7 +120,7 @@ id = "pest_spray" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 50) - build_path = /obj/item/reagent_containers/glass/bottle/killer/pestkiller + build_path = /obj/item/reagent_containers/cup/bottle/killer/pestkiller category = list("initial","Botany Chemicals") /datum/design/botany_bottle @@ -128,7 +128,7 @@ id = "botany_bottle" build_type = BIOGENERATOR materials = list(/datum/material/biomass= 5) - build_path = /obj/item/reagent_containers/glass/bottle/nutrient/empty + build_path = /obj/item/reagent_containers/cup/bottle/nutrient/empty category = list("initial", "Botany Chemicals") /datum/design/cloth @@ -216,7 +216,7 @@ id = "soy_milk_carton" build_type = BIOGENERATOR materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/food/condiment/soymilk + build_path = /obj/item/reagent_containers/condiment/soymilk category = list("initial","Food") /datum/design/seaweed_sheet diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index fb92bc2cbda16..b204d1c7e712d 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -30,7 +30,7 @@ id = "bluespacebeaker" build_type = PROTOLATHE materials = list(/datum/material/glass = 5000, /datum/material/plasma = 3000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000) - build_path = /obj/item/reagent_containers/glass/beaker/bluespace + build_path = /obj/item/reagent_containers/cup/beaker/bluespace category = list("Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE @@ -40,7 +40,7 @@ id = "splitbeaker" build_type = PROTOLATHE materials = list(/datum/material/iron = 3000) - build_path = /obj/item/reagent_containers/glass/beaker/noreact + build_path = /obj/item/reagent_containers/cup/beaker/noreact category = list("Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL @@ -50,7 +50,7 @@ build_type = PROTOLATHE departmental_flags = DEPARTMENTAL_FLAG_MEDICAL materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000) - build_path = /obj/item/reagent_containers/glass/beaker/plastic + build_path = /obj/item/reagent_containers/cup/beaker/plastic category = list("Medical Designs") /datum/design/meta_beaker @@ -59,7 +59,7 @@ build_type = PROTOLATHE departmental_flags = DEPARTMENTAL_FLAG_MEDICAL materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000, /datum/material/gold = 1000, /datum/material/titanium = 1000) - build_path = /obj/item/reagent_containers/glass/beaker/meta + build_path = /obj/item/reagent_containers/cup/beaker/meta category = list("Medical Designs") /datum/design/blood_pack diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 29346083d02dc..a462f5d0cdb6f 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -275,7 +275,7 @@ efficiency_coeff = 1 if(reagents) //If reagents/materials aren't initialized, don't bother, we'll be doing this again after reagents init anyways. reagents.maximum_volume = 0 - for(var/obj/item/reagent_containers/glass/G in component_parts) + for(var/obj/item/reagent_containers/cup/G in component_parts) reagents.maximum_volume += G.volume G.reagents.trans_to(src, G.reagents.total_volume) if(materials) @@ -294,7 +294,7 @@ //we eject the materials upon deconstruction. /obj/machinery/rnd/production/on_deconstruction() - for(var/obj/item/reagent_containers/glass/G in component_parts) + for(var/obj/item/reagent_containers/cup/G in component_parts) reagents.trans_to(G, G.reagents.maximum_volume) return ..() diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm index ab787839b0cb7..2eb76203360ba 100644 --- a/code/modules/research/xenobiology/crossbreeding/_structures.dm +++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm @@ -476,10 +476,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cerulean_slime_crystal) if(blood_amt < 10) return ..() - if(!istype(I, /obj/item/reagent_containers/glass/beaker)) + if(!istype(I, /obj/item/reagent_containers/cup/beaker)) return ..() - var/obj/item/reagent_containers/glass/beaker/item_beaker = I + var/obj/item/reagent_containers/cup/beaker/item_beaker = I if(!item_beaker.is_refillable() || (item_beaker.reagents.total_volume + 10 > item_beaker.reagents.maximum_volume)) return ..() diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm index df939dd57e34c..0ba4f2b5d30fa 100644 --- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm +++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm @@ -17,7 +17,7 @@ /obj/item/grenade/chem_grenade/pyro = 5, /obj/item/grenade/chem_grenade/cryo = 5, /obj/item/grenade/chem_grenade/adv_release = 5, - /obj/item/reagent_containers/food/drinks/bottle/holywater = 1) + /obj/item/reagent_containers/cup/glass/bottle/holywater = 1) product_slogans = "It's not pyromania if you're getting paid!;You smell that? Plasma, son. Nothing else in the world smells like that.;I love the smell of Plasma in the morning." resistance_flags = FIRE_PROOF diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm index 9ae0a323336fa..06d4cdba82252 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm @@ -52,14 +52,14 @@ /obj/item/reagent_containers/medspray/sterilizine = 1, /obj/item/reagent_containers/medspray/silver_sulf = 1, /obj/item/reagent_containers/medspray/styptic = 1, - /obj/item/reagent_containers/food/drinks/bottle/synthflesh = 1, + /obj/item/reagent_containers/cup/glass/bottle/synthflesh = 1, /obj/item/clothing/glasses/hud/health/sunglasses = 1, /obj/item/surgical_drapes = 1, /obj/item/stack/medical/bruise_pack = 1, /obj/item/stack/medical/ointment = 1, /obj/item/stack/medical/gauze = 1, - /obj/item/reagent_containers/glass/bottle/epinephrine = 1, - /obj/item/reagent_containers/glass/bottle/charcoal = 1, + /obj/item/reagent_containers/cup/bottle/epinephrine = 1, + /obj/item/reagent_containers/cup/bottle/charcoal = 1, /obj/item/storage/pill_bottle/floorpill/full = 1, /obj/item/storage/pill_bottle/antirad = 1, /obj/item/clothing/neck/stethoscope = 1, @@ -139,8 +139,8 @@ /obj/item/clothing/suit/armor/vest = 2, /obj/item/clothing/suit/armor/bulletproof = 1, /obj/item/storage/secure/briefcase = 1, - /obj/item/reagent_containers/glass/rag = 1, - /obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, + /obj/item/reagent_containers/cup/rag = 1, + /obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/grenade/flashbang = 2, /obj/item/grenade/chem_grenade/teargas = 1, /obj/item/reagent_containers/peppercloud_deployer = 1, diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index e7eb5897f2d0e..1706046bbeed9 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -2379,7 +2379,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list( name = "Spanish Flu Culture" desc = "A bottle of cursed blood, full of angry spirits which will burn all the heretics with the fires of hell. \ At least, that's what the label says" - item = /obj/item/reagent_containers/glass/bottle/fluspanish + item = /obj/item/reagent_containers/cup/bottle/fluspanish cost = 12 restricted_roles = list(JOB_NAME_CHAPLAIN, JOB_NAME_VIROLOGIST) @@ -2387,7 +2387,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list( name = "Retrovirus Culture Bottle" desc = "A bottle of contagious DNA bugs, which will manually rearrange the DNA of hosts. \ At least, that's what the label says." - item = /obj/item/reagent_containers/glass/bottle/retrovirus + item = /obj/item/reagent_containers/cup/bottle/retrovirus cost = 12 restricted_roles = list(JOB_NAME_VIROLOGIST, JOB_NAME_GENETICIST) @@ -2395,7 +2395,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list( name = "Anxiety Culture Bottle" desc = "A bottle of contagious anxiety-inducing virus. \ At least, that's what the label says" - item = /obj/item/reagent_containers/glass/bottle/anxiety + item = /obj/item/reagent_containers/cup/bottle/anxiety cost = 4 restricted_roles = list(JOB_NAME_VIROLOGIST) @@ -2576,7 +2576,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list( name = "Syndicate Beer" desc = "Syndicate brand 'beer' designed to flush toxins out of your system. \ Warning: Do not consume more than one!" - item = /obj/item/reagent_containers/food/drinks/syndicatebeer + item = /obj/item/reagent_containers/cup/glass/bottle/beer/syndicate cost = 4 illegal_tech = FALSE diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 0016925aeb80c..2238d3280d9d2 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -3,43 +3,43 @@ desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." icon_state = "boozeomat" icon_deny = "boozeomat-deny" - products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 30, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12, - /obj/item/reagent_containers/food/drinks/flask = 3, - /obj/item/reagent_containers/food/drinks/ice = 10, - /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, - /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4, - /obj/item/reagent_containers/food/drinks/bottle/limejuice = 4, - /obj/item/reagent_containers/food/drinks/bottle/cream = 4, - /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, - /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, - /obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15, - /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4, - /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, - /obj/item/reagent_containers/food/drinks/ale = 6, - /obj/item/reagent_containers/food/drinks/beer = 6, - /obj/item/reagent_containers/food/drinks/bottle/gin = 5, - /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5, - /obj/item/reagent_containers/food/drinks/bottle/tequila = 5, - /obj/item/reagent_containers/food/drinks/bottle/vodka = 5, - /obj/item/reagent_containers/food/drinks/bottle/vermouth = 5, - /obj/item/reagent_containers/food/drinks/bottle/rum = 5, - /obj/item/reagent_containers/food/drinks/bottle/wine = 5, - /obj/item/reagent_containers/food/drinks/bottle/cognac = 5, - /obj/item/reagent_containers/food/drinks/bottle/kahlua = 5, - /obj/item/reagent_containers/food/drinks/bottle/hcider = 5, - /obj/item/reagent_containers/food/drinks/bottle/absinthe = 5, - /obj/item/reagent_containers/food/drinks/bottle/grappa = 5, - /obj/item/reagent_containers/food/drinks/bottle/sake = 5, - /obj/item/reagent_containers/food/drinks/bottle/applejack = 5, - /obj/item/reagent_containers/food/drinks/bottle/blank = 15, - /obj/item/reagent_containers/food/drinks/bottle/blank/small = 15 + products = list(/obj/item/reagent_containers/cup/glass/drinkingglass = 30, + /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 12, + /obj/item/reagent_containers/cup/glass/flask = 3, + /obj/item/reagent_containers/cup/glass/ice = 10, + /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/cream = 4, + /obj/item/reagent_containers/cup/soda_cans/cola = 8, + /obj/item/reagent_containers/cup/soda_cans/tonic = 8, + /obj/item/reagent_containers/cup/soda_cans/sodawater = 15, + /obj/item/reagent_containers/cup/glass/bottle/grenadine = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/menthol = 4, + /obj/item/reagent_containers/cup/glass/bottle/ale = 6, + /obj/item/reagent_containers/cup/glass/bottle/beer = 6, + /obj/item/reagent_containers/cup/glass/bottle/gin = 5, + /obj/item/reagent_containers/cup/glass/bottle/whiskey = 5, + /obj/item/reagent_containers/cup/glass/bottle/tequila = 5, + /obj/item/reagent_containers/cup/glass/bottle/vodka = 5, + /obj/item/reagent_containers/cup/glass/bottle/vermouth = 5, + /obj/item/reagent_containers/cup/glass/bottle/rum = 5, + /obj/item/reagent_containers/cup/glass/bottle/wine = 5, + /obj/item/reagent_containers/cup/glass/bottle/cognac = 5, + /obj/item/reagent_containers/cup/glass/bottle/kahlua = 5, + /obj/item/reagent_containers/cup/glass/bottle/hcider = 5, + /obj/item/reagent_containers/cup/glass/bottle/absinthe = 5, + /obj/item/reagent_containers/cup/glass/bottle/grappa = 5, + /obj/item/reagent_containers/cup/glass/bottle/sake = 5, + /obj/item/reagent_containers/cup/glass/bottle/applejack = 5, + /obj/item/reagent_containers/cup/glass/bottle/blank = 15, + /obj/item/reagent_containers/cup/glass/bottle/blank/small = 15 ) - contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12, - /obj/item/reagent_containers/food/drinks/bottle/fernet = 5) - premium = list(/obj/item/reagent_containers/glass/bottle/ethanol = 4, - /obj/item/reagent_containers/food/drinks/bottle/champagne = 5, - /obj/item/reagent_containers/food/drinks/bottle/trappist = 5) + contraband = list(/obj/item/reagent_containers/cup/glass/mug/tea = 12, + /obj/item/reagent_containers/cup/glass/bottle/fernet = 5) + premium = list(/obj/item/reagent_containers/cup/bottle/ethanol = 4, + /obj/item/reagent_containers/cup/glass/bottle/champagne = 5, + /obj/item/reagent_containers/cup/glass/bottle/trappist = 5) product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" @@ -63,24 +63,24 @@ /obj/machinery/vending/boozeomat/maint //abandoned bar on randomaints usually desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This one is kinda run down, almost forgotten down here..." - products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, - /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1, - /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1, - /obj/item/reagent_containers/food/drinks/bottle/cream = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass = 10, - /obj/item/reagent_containers/food/drinks/ice = 3, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6, - /obj/item/reagent_containers/food/drinks/flask = 1) + products = list(/obj/item/reagent_containers/cup/glass/bottle/whiskey = 1, + /obj/item/reagent_containers/cup/glass/bottle/absinthe = 1, + /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 1, + /obj/item/reagent_containers/cup/glass/bottle/juice/cream = 1, + /obj/item/reagent_containers/cup/soda_cans/tonic = 1, + /obj/item/reagent_containers/cup/glass/drinkingglass = 10, + /obj/item/reagent_containers/cup/glass/ice = 3, + /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 6, + /obj/item/reagent_containers/cup/glass/flask = 1) req_access = null /obj/machinery/vending/boozeomat/captain//Captain's quarters variant desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This one has less items, yet more fit for a captain." - products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1, - /obj/item/reagent_containers/food/drinks/bottle/wine = 1, - /obj/item/reagent_containers/food/drinks/ale = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass = 6, - /obj/item/reagent_containers/food/drinks/ice = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4); + products = list(/obj/item/reagent_containers/cup/glass/bottle/rum = 1, + /obj/item/reagent_containers/cup/glass/bottle/wine = 1, + /obj/item/reagent_containers/cup/glass/bottle/ale = 1, + /obj/item/reagent_containers/cup/glass/drinkingglass = 6, + /obj/item/reagent_containers/cup/glass/ice = 1, + /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 4); req_access = list(ACCESS_CAPTAIN) diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm index b02d84427ae75..6020237fba089 100644 --- a/code/modules/vending/coffee.dm +++ b/code/modules/vending/coffee.dm @@ -4,11 +4,11 @@ product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies" icon_state = "coffee" icon_vend = "coffee-vend" - products = list(/obj/item/reagent_containers/food/drinks/coffee = 6, - /obj/item/reagent_containers/food/drinks/mug/tea = 6, - /obj/item/reagent_containers/food/drinks/mug/cocoa = 3, - /obj/item/reagent_containers/food/drinks/bubble_tea = 4) - contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12) + products = list(/obj/item/reagent_containers/cup/glass/coffee = 6, + /obj/item/reagent_containers/cup/glass/mug/tea = 6, + /obj/item/reagent_containers/cup/glass/mug/cocoa = 3, + /obj/item/reagent_containers/cup/glass/bubble_tea = 4) + contraband = list(/obj/item/reagent_containers/cup/glass/ice = 12) refill_canister = /obj/item/vending_refill/coffee default_price = 10 extra_price = 25 diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 46b0afdf71c31..b1957e387f4c1 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -5,20 +5,20 @@ icon_state = "Cola_Machine" product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." - products = list(/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, - /obj/item/reagent_containers/glass/waterbottle = 10) - contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) - premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/air = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1) + products = list(/obj/item/reagent_containers/cup/soda_cans/cola = 10, + /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10, + /obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10, + /obj/item/reagent_containers/cup/soda_cans/starkist = 10, + /obj/item/reagent_containers/cup/soda_cans/space_up = 10, + /obj/item/reagent_containers/cup/soda_cans/pwr_game = 10, + /obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10, + /obj/item/reagent_containers/cup/glass/waterbottle = 10) + contraband = list(/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6, + /obj/item/reagent_containers/cup/soda_cans/shamblers = 6) + premium = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1, + /obj/item/reagent_containers/cup/soda_cans/air = 1, + /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 1, + /obj/item/reagent_containers/cup/soda_cans/grey_bull = 1) refill_canister = /obj/item/vending_refill/cola default_price = 5 extra_price = 60 @@ -80,14 +80,14 @@ desc = "~Shake me up some of that Shambler's Juice!~" icon_state = "shamblers_juice" products = list( - /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10 + /obj/item/reagent_containers/cup/soda_cans/cola = 10, + /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10, + /obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10, + /obj/item/reagent_containers/cup/soda_cans/starkist = 10, + /obj/item/reagent_containers/cup/soda_cans/space_up = 10, + /obj/item/reagent_containers/cup/soda_cans/pwr_game = 10, + /obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10, + /obj/item/reagent_containers/cup/soda_cans/shamblers = 10 ) product_slogans = "~Shake me up some of that Shambler's Juice!~" product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp." diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 287b36fd3e716..f534dbc99f6ed 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -5,14 +5,14 @@ icon_state = "dinnerware" products = list( /obj/item/storage/bag/tray = 8, - /obj/item/reagent_containers/glass/bowl = 20, + /obj/item/reagent_containers/cup/bowl = 20, /obj/item/kitchen/fork = 6, - /obj/item/reagent_containers/food/drinks/drinkingglass = 8, - /obj/item/reagent_containers/food/condiment/pack/ketchup = 5, - /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5, - /obj/item/reagent_containers/food/condiment/pack/astrotame = 5, - /obj/item/reagent_containers/food/condiment/saltshaker = 5, - /obj/item/reagent_containers/food/condiment/peppermill = 5, + /obj/item/reagent_containers/cup/glass/drinkingglass = 8, + /obj/item/reagent_containers/condiment/pack/ketchup = 5, + /obj/item/reagent_containers/condiment/pack/hotsauce = 5, + /obj/item/reagent_containers/condiment/pack/astrotame = 5, + /obj/item/reagent_containers/condiment/saltshaker = 5, + /obj/item/reagent_containers/condiment/peppermill = 5, /obj/item/clothing/suit/apron/chef = 2, /obj/item/kitchen/rollingpin = 2, /obj/item/knife/kitchen = 2, diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm index 9175f244939b7..fe317ec612061 100644 --- a/code/modules/vending/liberation.dm +++ b/code/modules/vending/liberation.dm @@ -8,7 +8,7 @@ products = list(/obj/item/food/burger/plain = 5, //O say can you see, by the dawn's early light /obj/item/food/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming /obj/item/food/fries = 5, //Whose broad stripes and bright stars through the perilous fight - /obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming? + /obj/item/reagent_containers/cup/glass/bottle/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming? /obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2, /obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2, /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm index 8cc38fc040920..7392cebfe599b 100644 --- a/code/modules/vending/magivend.dm +++ b/code/modules/vending/magivend.dm @@ -13,7 +13,7 @@ /obj/item/clothing/suit/wizrobe/yellow = 1, /obj/item/clothing/shoes/sandal/magic = 1, /obj/item/staff = 2) - contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave + contraband = list(/obj/item/reagent_containers/cup/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50, STAMINA = 0, BLEED = 0) resistance_flags = FIRE_PROOF default_price = 25 diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index 4931af82685c1..f8ba4d5332202 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -9,22 +9,22 @@ /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, - /obj/item/reagent_containers/glass/bottle = 10, + /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, - /obj/item/reagent_containers/glass/bottle/epinephrine = 4, - /obj/item/reagent_containers/glass/bottle/charcoal = 4, - /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, - /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, - /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, - /obj/item/reagent_containers/glass/bottle/morphine = 2, - /obj/item/reagent_containers/glass/bottle/toxin = 4, + /obj/item/reagent_containers/cup/bottle/epinephrine = 4, + /obj/item/reagent_containers/cup/bottle/charcoal = 4, + /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, + /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, + /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, + /obj/item/reagent_containers/cup/bottle/morphine = 2, + /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) - contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, + contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, - /obj/item/reagent_containers/glass/bottle/random_virus = 1) + /obj/item/reagent_containers/cup/bottle/random_virus = 1) premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 45d13c763715e..aaa9597a4b248 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -8,11 +8,11 @@ /obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, - /obj/item/reagent_containers/glass/bottle/epinephrine = 2, - /obj/item/reagent_containers/glass/bottle/charcoal = 2, + /obj/item/reagent_containers/cup/bottle/epinephrine = 2, + /obj/item/reagent_containers/cup/bottle/charcoal = 2, /obj/item/reagent_containers/medspray/sterilizine = 3) - contraband = list(/obj/item/reagent_containers/glass/bottle/toxin = 1, - /obj/item/reagent_containers/glass/bottle/morphine = 1) + contraband = list(/obj/item/reagent_containers/cup/bottle/toxin = 1, + /obj/item/reagent_containers/cup/bottle/morphine = 1) armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50, STAMINA = 0, BLEED = 0) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/wallmed diff --git a/code/modules/vending/mining.dm b/code/modules/vending/mining.dm index 34f54180393da..80ae04361ab79 100644 --- a/code/modules/vending/mining.dm +++ b/code/modules/vending/mining.dm @@ -7,8 +7,8 @@ products = list(/obj/item/food/donkpocket/warm = 8, /obj/item/food/salad/herbsalad = 6, /obj/item/food/canned/beans = 4, - /obj/item/reagent_containers/glass/waterbottle/large = 10) - contraband = list(/obj/item/reagent_containers/food/drinks/coffee = 10, + /obj/item/reagent_containers/cup/glass/waterbottle/large = 10) + contraband = list(/obj/item/reagent_containers/cup/glass/coffee = 10, /obj/item/food/chips = 6, /obj/item/food/icecreamsandwich = 6) refill_canister = /obj/item/vending_refill/mining diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm index 2c4ab4845f433..9856eb5036c4a 100644 --- a/code/modules/vending/nutrimax.dm +++ b/code/modules/vending/nutrimax.dm @@ -6,17 +6,17 @@ icon_state = "nutri" icon_deny = "nutri-deny" light_mask = "nutri-light-mask" - products = list(/obj/item/reagent_containers/glass/bottle/nutrient/ez = 30, - /obj/item/reagent_containers/glass/bottle/nutrient/l4z = 20, - /obj/item/reagent_containers/glass/bottle/nutrient/rh = 10, + products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez = 30, + /obj/item/reagent_containers/cup/bottle/nutrient/l4z = 20, + /obj/item/reagent_containers/cup/bottle/nutrient/rh = 10, /obj/item/reagent_containers/spray/pestspray = 20, /obj/item/reagent_containers/syringe = 5, /obj/item/storage/bag/plants = 5, /obj/item/cultivator = 3, /obj/item/shovel/spade = 3, /obj/item/plant_analyzer = 4) - contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10, - /obj/item/reagent_containers/glass/bottle/diethylamine = 5) + contraband = list(/obj/item/reagent_containers/cup/bottle/ammonia = 10, + /obj/item/reagent_containers/cup/bottle/diethylamine = 5) refill_canister = /obj/item/vending_refill/hydronutrients default_price = 10 extra_price = 50 diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 319dccb0ec710..d34c56945c970 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -11,7 +11,7 @@ /obj/item/food/chips = 6, /obj/item/food/sosjerky = 6, /obj/item/food/no_raisin = 6, - /obj/item/reagent_containers/food/drinks/dry_ramen = 3, + /obj/item/reagent_containers/cup/glass/dry_ramen = 3, /obj/item/food/energybar = 6) contraband = list(/obj/item/food/syndicake = 6, /obj/item/food/swirl_lollipop = 2) diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm index 92c59260c1184..f38b9eba0fc88 100644 --- a/code/modules/vending/sovietsoda.dm +++ b/code/modules/vending/sovietsoda.dm @@ -4,8 +4,8 @@ icon_state = "sovietsoda" light_mask = "soviet-light-mask" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." - products = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30) - contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20) + products = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda = 30) + contraband = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola = 20) refill_canister = /obj/item/vending_refill/sovietsoda resistance_flags = FIRE_PROOF default_price = 1 diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm index 8bbc0b17b5f47..b66068ab0d050 100644 --- a/code/modules/vending/sustenance.dm +++ b/code/modules/vending/sustenance.dm @@ -6,10 +6,10 @@ icon_state = "sustenance" light_mask = "snack-light-mask" products = list(/obj/item/food/tofu/prison = 24, - /obj/item/reagent_containers/food/drinks/ice/prison = 12, + /obj/item/reagent_containers/cup/glass/ice/prison = 12, /obj/item/food/candy_corn/prison = 6) contraband = list(/obj/item/knife/kitchen = 6, - /obj/item/reagent_containers/food/drinks/coffee = 12, + /obj/item/reagent_containers/cup/glass/coffee = 12, /obj/item/tank/internals/emergency_oxygen = 6, /obj/item/clothing/mask/breath = 6) refill_canister = /obj/item/vending_refill/sustenance diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 1e810e04b5928..c1cfd17d79391 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -310,7 +310,7 @@ /obj/item/clothing/suit/apron/purple_bartender = 2, /obj/item/clothing/head/soft/black = 2, /obj/item/clothing/shoes/sneakers/black = 2, - /obj/item/reagent_containers/glass/rag = 2, + /obj/item/reagent_containers/cup/rag = 2, /obj/item/storage/box/beanbag = 1, /obj/item/clothing/suit/armor/vest/alt = 1, /obj/item/circuitboard/machine/dish_drive = 1, @@ -348,7 +348,7 @@ /obj/item/clothing/under/rank/civilian/chef/skirt = 2, /obj/item/clothing/under/rank/civilian/altchef = 1, /obj/item/clothing/head/utility/chefhat = 3, - /obj/item/reagent_containers/glass/rag = 1, + /obj/item/reagent_containers/cup/rag = 1, /obj/item/clothing/suit/hooded/wintercoat = 2) refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe dept_req_for_free = ACCOUNT_SRV_BITFLAG @@ -547,23 +547,25 @@ icon_state = "detdrobe" product_ads = "Apply your brilliant deductive methods in style!" vend_reply = "Thank you for using the DetDrobe!" - products = list(/obj/item/clothing/under/rank/security/detective = 2, - /obj/item/clothing/under/rank/security/detective/skirt = 2, - /obj/item/clothing/shoes/sneakers/brown = 2, - /obj/item/clothing/suit/jacket/det_suit = 2, - /obj/item/clothing/suit/hooded/wintercoat/detective = 2, - /obj/item/clothing/head/fedora/det_hat = 2, - /obj/item/clothing/under/rank/security/detective/grey = 2, - /obj/item/clothing/under/rank/security/detective/grey/skirt = 2, - /obj/item/clothing/accessory/waistcoat = 2, - /obj/item/clothing/shoes/laceup = 2, - /obj/item/clothing/suit/jacket/det_suit/dark = 1, - /obj/item/clothing/suit/jacket/det_suit/noir = 1, - /obj/item/clothing/head/fedora/det_hat/noir = 2, - /obj/item/clothing/gloves/color/black = 2, - /obj/item/clothing/gloves/color/latex = 2, - /obj/item/reagent_containers/food/drinks/flask/det = 2, - /obj/item/storage/fancy/cigarettes = 5) + products = list( + /obj/item/clothing/under/rank/security/detective = 2, + /obj/item/clothing/under/rank/security/detective/skirt = 2, + /obj/item/clothing/shoes/sneakers/brown = 2, + /obj/item/clothing/suit/jacket/det_suit = 2, + /obj/item/clothing/suit/hooded/wintercoat/detective = 2, + /obj/item/clothing/head/fedora/det_hat = 2, + /obj/item/clothing/under/rank/security/detective/grey = 2, + /obj/item/clothing/under/rank/security/detective/grey/skirt = 2, + /obj/item/clothing/accessory/waistcoat = 2, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/suit/jacket/det_suit/dark = 1, + /obj/item/clothing/suit/jacket/det_suit/noir = 1, + /obj/item/clothing/head/fedora/det_hat/noir = 2, + /obj/item/clothing/gloves/color/black = 2, + /obj/item/clothing/gloves/color/latex = 2, + /obj/item/reagent_containers/cup/glass/flask/det = 2, + /obj/item/storage/fancy/cigarettes = 5 + ) premium = list(/obj/item/clothing/head/flatcap = 1, /obj/item/clothing/suit/armor/vest/det_suit = 1) refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe extra_price = 350 diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm index 3495bb2a7b839..9d40bb6204c60 100644 --- a/code/modules/wiremod/core/component_printer.dm +++ b/code/modules/wiremod/core/component_printer.dm @@ -45,7 +45,7 @@ req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 2, - /obj/item/reagent_containers/glass/beaker = 2, //this doesn't make any sense, yet i wasn't allowed to fix it. + /obj/item/reagent_containers/cup/beaker = 2, //this doesn't make any sense, yet i wasn't allowed to fix it. ) /// Module duplicator, allows you to save and recreate module components. @@ -268,5 +268,5 @@ req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 2, - /obj/item/reagent_containers/glass/beaker = 2, + /obj/item/reagent_containers/cup/beaker = 2, ) diff --git a/icons/mob/inhands/misc/drinks_lefthand.dmi b/icons/mob/inhands/misc/drinks_lefthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c4fb929d5270afd277d88a497d7cd6dada42a497 GIT binary patch literal 1875 zcmYL_c{r4d7sp>qWbay1L$WW4%zcRoUAY)y43n&5DVh+*wNsX)8(A6`F=??ib`q|v z!zBzu52hJ~v1G{}vSfRI)9>D%&hwn}ea=7M?>V0YD@&vRFN_xe00A>oBMbnrNq_I7 z8~^~wIlH`ONvD;CjWJ6TugaBrsvsoUbfwscL}G7mF9bm`0MHKr8~qm`h%i0OtWVg2FqT&UgV|vm zYdMIpu@5r35$GP^a5)nOy32S%df6NB#_Sbk!2db9S1M_f|fGC*KT}XmJwz)kA#AS~Lbbdw1DH z>2zCi6CpyrPF4X_N?6q3Z2UXoq(9vkCHa`b2_{)QNXm~Su?zYK8c2`z6>#|ITsW2 z%fkTR$ggHbmu$kGE|1=Jazq?!z2?Z!W!7%tjEl>My>A=Pc;Dxi@~bj)YKI5bq*Eqq`*1iJWKen zf+-FT&SH6`rK&vi%)k*kozW#^pT6LJCY@w337-*wH(6W0YEcRu&GHiWG;X0JSXzZq z9VY;yvyqXz%ImW3j4yGYJpU>ySFk_&Z{+_cqh=3}i$2)g6eU*+ZP8C;J2@E!-MR&~ z?FRUbZ1txc8~gAECaTimb2e+*;lX@?MBG~^2uR# z`}XyngKH^#nAyMYeEAC9F=YYSjw!6`4A`;ekG8-_BkFE!r=2)VpXQ|0b8DhBU(8&V zj7lL(`TF(N>^=G!0c6pj1_%kxe(tS0rhgcazFiVq@0*b(A`=mSF?-eWbR@*FJmvJ4 ztIYN_hMrwPuP>rBezM0Qc2mDz?LGc38`8DIKTkwdDsao0KN|f#SOF_tFZ|qJ67?7O zpANO^{zPSks65)%^DXgZ2u=3W+r}Lk&S-3ty*IL4k(Nj2d-w1oT4o2NY$gi6At_&v5+ z>*e7o(Y##UBH6+a?iszdag3%GrxS9QA^Yc$sHxUvN0t2~^$LT`>pFd)DR}v?i9hP0 zVnm_}7bU}VLxn_3 z&&+@^7+c3B81T|03!xSbu!AXQhua$P5nL@8NOFAp?4s#Vlb~IMS5+6!mbQMR$yL2OH1yA% z;42SR2>J(R=aRz}^qTE*Q{CX316s-%zgCmW*7kL@-W4!2i4BHZU+2mcQRG1xl7V4O z4tw!ObLw)X5ME<3I)2PUU`B*ayqHd6o(qsheY52k$4Jj~**Aw)Kj1hJq4}J7N6?KV zkk-Z*-BGm$;!k+PFXrRZH+h~_yTR&(@6!r{D!jmTQPVwsn5%R!><1vL9Ni6k-uz%@ zWhePP#aZs=R9x-zOQF##Wl*5yHuvo4*o(crL!JimyXxw~`Fk;nkA@w=Y%U4v)!fwG z&+GB!TA)|hJ;WJ#8qziQ%}Y`{(=F(J$8OPjce&PM+mSs?qgYeTKIK8ZL{d2cdm1H$ zp6h-U(q;FjEwZi|OYsfu=Nem;D_q=A=C$$G4|562+5wWyR{Xbr+2em0HED*}kM|3n zM(HW9MpaB74;Np69pSRvAF^s33O^BfuJ-hWG;;eL%A7@`!l{hM>ulMoh##K;1m?Jj zPWsvH(Ro;dTi)mfsj;a^Pgt{R#eC+u_E;BEW_M>evT8Jtq`E3&eOFkXc%D~uFgcz? f5nx$N1b^f1KAG`;jU#jUyQ7)0rBQ{UTkQV;pX+&p literal 0 HcmV?d00001 diff --git a/icons/mob/inhands/misc/drinks_righthand.dmi b/icons/mob/inhands/misc/drinks_righthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4f01313df37193df4ebb03280c907600fc63f2a0 GIT binary patch literal 1253 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fj-_z$e5NNY9)(^YrP{=NK3o z7#RNlKlAyV)qw*C($mx3I@1_pv}dNBNi&}L|BUhfG~@sO{~Mn%Hcm5cckTSo!0=$< zqyIKG|4&W*|NH+;ph5qE+Kr9RFwFd)_WwVFvGM0|Vc^d&g`Zp;fuo;LL5GS!X6roapQ8d;k9ZWYJID zK$96ug8YIR9G=}s19E;nNZ_+;@h=2o%dXsvgZ5O-*LL!op~{rEv+qbM(peBmv8@E)jz$suvuWD=l&Om z->nP~HoK(yX^(yg`;D?szKbFnS;9@NcWZ?-E1sL@w3prbK+oxRjiTh`Er;iOB_68s zTxvD#MdiAHcjiwMKd)|=Z!S;B^0v%-X~4lCdEE9ni%WjC0dv2K*hwD`Uq2sVpYG79 zR~>R*7VfbmTc8KdF@w;ZC&jZb?Iqei$wUY1~M=(z4LT&45^s&_HJablA%QFLykoXN?Pxl zth07+IP>9u{p|;5T0_-j{k2wluBn?J?LW7~PAR5Es|S<}7#K2E^@e3DTS)~3-THNG z%k9}oMVs&T>2EBticTt8eYsP=@W#8YgYU|kCVjeQ&Zw^7*s1$~MMb0V#uWAkoTpT` z=~gn#TM)wpHVQ}?>f8hzmD;+RVNkY8+7PzGa>fEN~|+kSw}?{(0Q}8K1ko4J#`P<>Heh`_+?*jO30_ zx0n;(d2scuzwA?Ps9jI`aBH*Y&LfJTP}+F+1oIBhfJX(I{0D@mc;{UI#9-sN6K-gV z$Zw|@UH7Mq{PSsq1q z37a&q=<;peDKP8&BkMa%Y!en8HH-i8{oDDRhqo79dpNC@!Tase+4_&I=X_EBuCiP3 z_xF8U=0EHH#koS3b(XI9qnC4a#k|Xd-fLX^GrN4d|K`fOr`MFjoNys!|FuPj9aWe9 z+$$!_tD$+Wz+wvfhI4Myr=)M4#J(Zw=yVZ{1O`qot}8znU-ZB8{P*B5u)tan`Hw;B Vl4U_}WmXEvBu`gAmvv4FO#om~FeLy0 literal 0 HcmV?d00001 diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index a661d7cf28b264865fbcdcd832260b1b531feeee..a014f15f1ffed8de534d6366ee9e51550a08c06b 100644 GIT binary patch delta 91916 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 literal 93529 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%0DxjAljgx;`A8Mvs+$FyF19k1#5<1Z^)y2 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�`xP6T9f~e|XQ0 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
    +

    18 October 2024

    +

    ktlwjec updated:

    +
      +
    • Breaking grilles no longer drop invisible rods.
      • +
    +

    rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend updated:

    +
      +
    • repaths drinks and reagent containers to a centralized file. Food reagent_containers no longer exist.
      • +
    • fixed a few outlying food checks that still expected reagent_containers
      • +
    • fixed caltrop bug with plates
      • +
    • hot chocolate no longer spontaneously becomes chocolate milk when put in a different container
      • +
    • moves hot chocolate, tea, coffee "food" recipes to drink recipes
      • +
    • hot chocolate now inherits milk's healing (its made from milk, get it?)
      • +
    • caltrop now applies to broken bottles
      • +
    • drinking from used glasses can now pass diseases, same as food. Bartenders! Clean your glasses!
      • +
    • adds soda shaking. Shaking/throwing a soda around before opening may make it erupt when opened.
      • +
    • soda shaking noises
      • +
    +

    16 October 2024

    BeeLover66 updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 90b806a3ff51d..5c4a2ad684f52 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44632,3 +44632,21 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. BeeLover66: - bugfix: Radio channels no longer always default to common when no encryption key is installed +2024-10-18: + ktlwjec: + - bugfix: Breaking grilles no longer drop invisible rods. + rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend: + - refactor: repaths drinks and reagent containers to a centralized file. Food reagent_containers + no longer exist. + - bugfix: fixed a few outlying food checks that still expected reagent_containers + - bugfix: fixed caltrop bug with plates + - bugfix: hot chocolate no longer spontaneously becomes chocolate milk when put + in a different container + - code_imp: moves hot chocolate, tea, coffee "food" recipes to drink recipes + - tweak: hot chocolate now inherits milk's healing (its made from milk, get it?) + - tweak: caltrop now applies to broken bottles + - tweak: drinking from used glasses can now pass diseases, same as food. Bartenders! + Clean your glasses! + - tweak: adds soda shaking. Shaking/throwing a soda around before opening may make + it erupt when opened. + - rscadd: soda shaking noises diff --git a/html/changelogs/AutoChangeLog-pr-11688.yml b/html/changelogs/AutoChangeLog-pr-11688.yml deleted file mode 100644 index a1e2e2d4312e0..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11688.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: ktlwjec -delete-after: true -changes: - - bugfix: Breaking grilles no longer drop invisible rods. diff --git a/html/changelogs/AutoChangeLog-pr-11701.yml b/html/changelogs/AutoChangeLog-pr-11701.yml deleted file mode 100644 index 9837f38fc3888..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11701.yml +++ /dev/null @@ -1,17 +0,0 @@ -author: rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend -delete-after: true -changes: - - refactor: repaths drinks and reagent containers to a centralized file. Food reagent_containers - no longer exist. - - bugfix: fixed a few outlying food checks that still expected reagent_containers - - bugfix: fixed caltrop bug with plates - - bugfix: hot chocolate no longer spontaneously becomes chocolate milk when put - in a different container - - code_imp: moves hot chocolate, tea, coffee "food" recipes to drink recipes - - tweak: hot chocolate now inherits milk's healing (its made from milk, get it?) - - tweak: caltrop now applies to broken bottles - - tweak: drinking from used glasses can now pass diseases, same as food. Bartenders! - Clean your glasses! - - tweak: adds soda shaking. Shaking/throwing a soda around before opening may make - it erupt when opened. - - rscadd: soda shaking noises From 394fdb7247496d7ecd5c6be6458d8c0bafdf2242 Mon Sep 17 00:00:00 2001 From: ClownMoff <148357670+ClownMoff@users.noreply.github.com> Date: Sat, 19 Oct 2024 12:19:45 +0100 Subject: [PATCH 11/69] Update FlandStation.dmm (#11713) --- _maps/map_files/FlandStation/FlandStation.dmm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index 88d3c34a5fa80..d837c4acca285 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -46210,6 +46210,12 @@ /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, /area/security/prison) +"lJu" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/oven, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "lJz" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -119702,7 +119708,7 @@ mib dam czD mib -iyS +lJu wRF hvk vmw From 8fddd1cf7f574743b8b68711d72a7eb651c4d279 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 06:28:22 -0500 Subject: [PATCH 12/69] Automatic changelog generation for PR #11713 [ci skip] --- html/changelogs/AutoChangeLog-pr-11713.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11713.yml diff --git a/html/changelogs/AutoChangeLog-pr-11713.yml b/html/changelogs/AutoChangeLog-pr-11713.yml new file mode 100644 index 0000000000000..19c0e8ee55627 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11713.yml @@ -0,0 +1,5 @@ +author: ClownMoff +delete-after: true +changes: + - rscadd: 'FlandStation: Adds a missing oven on the kitchen' + - rscdel: 'FlandStation: Deletes one of the 2 deepfryers on the kitchen.' From 8e24e3f8c7ad19ad1dd30fb03044d58328251d3d Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 12:05:20 +0000 Subject: [PATCH 13/69] Automatic changelog compile [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-11713.yml | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11713.yml diff --git a/html/changelog.html b/html/changelog.html index 4c1b8089ef563..6e380ce137e12 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
      +

      19 October 2024

      +

      ClownMoff updated:

      +
        +
      • FlandStation: Adds a missing oven on the kitchen
        • +
      • FlandStation: Deletes one of the 2 deepfryers on the kitchen.
        • +
      +

      18 October 2024

      ktlwjec updated:

        diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 5c4a2ad684f52..69ebcf2b9cf7a 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44650,3 +44650,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: adds soda shaking. Shaking/throwing a soda around before opening may make it erupt when opened. - rscadd: soda shaking noises +2024-10-19: + ClownMoff: + - rscadd: 'FlandStation: Adds a missing oven on the kitchen' + - rscdel: 'FlandStation: Deletes one of the 2 deepfryers on the kitchen.' diff --git a/html/changelogs/AutoChangeLog-pr-11713.yml b/html/changelogs/AutoChangeLog-pr-11713.yml deleted file mode 100644 index 19c0e8ee55627..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11713.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: ClownMoff -delete-after: true -changes: - - rscadd: 'FlandStation: Adds a missing oven on the kitchen' - - rscdel: 'FlandStation: Deletes one of the 2 deepfryers on the kitchen.' From 1d6e163a8fe3707617805157f46a865fa620b2e8 Mon Sep 17 00:00:00 2001 From: Sarchutar <53494785+Sarchutar@users.noreply.github.com> Date: Sat, 19 Oct 2024 14:37:40 +0200 Subject: [PATCH 14/69] clockcult deconversion message (#11725) --- code/modules/antagonists/clock_cult/servant_of_ratvar.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/antagonists/clock_cult/servant_of_ratvar.dm b/code/modules/antagonists/clock_cult/servant_of_ratvar.dm index 55875f70da1e3..155e456db44e9 100644 --- a/code/modules/antagonists/clock_cult/servant_of_ratvar.dm +++ b/code/modules/antagonists/clock_cult/servant_of_ratvar.dm @@ -56,6 +56,10 @@ GLOB.all_servants_of_ratvar -= owner GLOB.human_servants_of_ratvar -= owner GLOB.cyborg_servants_of_ratvar -= owner + if(!silent) + owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current) + to_chat(owner.current, "An unfamiliar white light flashes through your mind, cleansing the taint of the Clockwork Justicar and all your memories as his servant.") + owner.current.log_message("has renounced the cult of Rat'var!", LOG_ATTACK, color="#960000") . = ..() /datum/antagonist/servant_of_ratvar/apply_innate_effects(mob/living/M) From 25a79d25b808e3d9d9c8ab38e8e0c3f6579f300f Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 07:46:18 -0500 Subject: [PATCH 15/69] Automatic changelog generation for PR #11725 [ci skip] --- html/changelogs/AutoChangeLog-pr-11725.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11725.yml diff --git a/html/changelogs/AutoChangeLog-pr-11725.yml b/html/changelogs/AutoChangeLog-pr-11725.yml new file mode 100644 index 0000000000000..c7e5380c3146f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11725.yml @@ -0,0 +1,4 @@ +author: Sarchutar +delete-after: true +changes: + - bugfix: Deconverting clock cultists now show a message when it was successful From fba357f10c6d96e72951eb0a8f6218aea51c942d Mon Sep 17 00:00:00 2001 From: Markus Larsson <82539179+MarkusLarsson421@users.noreply.github.com> Date: Sat, 19 Oct 2024 14:37:48 +0200 Subject: [PATCH 16/69] Update robot_bodyparts.dm (#11722) --- code/modules/surgery/bodyparts/robot_bodyparts.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index d2a495c9e8bb1..7eef7c02d5cf8 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -238,6 +238,7 @@ should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC change_exempt_flags = BP_BLOCK_CHANGE_SPECIES + w_class = WEIGHT_CLASS_NORMAL brute_reduction = 5 burn_reduction = 4 From 44970fe076d1422ab1551ccfd1fecdeb91a2865a Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 08:02:49 -0500 Subject: [PATCH 17/69] Automatic changelog generation for PR #11722 [ci skip] --- html/changelogs/AutoChangeLog-pr-11722.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11722.yml diff --git a/html/changelogs/AutoChangeLog-pr-11722.yml b/html/changelogs/AutoChangeLog-pr-11722.yml new file mode 100644 index 0000000000000..562e3154de702 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11722.yml @@ -0,0 +1,4 @@ +author: MarkusLarsson421 +delete-after: true +changes: + - bugfix: Changed Robotic Head from bulky to normal. From 1c5dfdf8de4cc31c984cbf000f00eaef6f44460f Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 13:08:42 +0000 Subject: [PATCH 18/69] Automatic changelog compile [ci skip] --- html/changelog.html | 8 ++++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-11722.yml | 4 ---- html/changelogs/AutoChangeLog-pr-11725.yml | 4 ---- 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11722.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11725.yml diff --git a/html/changelog.html b/html/changelog.html index 6e380ce137e12..1678893757239 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -62,6 +62,14 @@

        ClownMoff updated:

      • FlandStation: Adds a missing oven on the kitchen
      • FlandStation: Deletes one of the 2 deepfryers on the kitchen.
      +

      MarkusLarsson421 updated:

      +
        +
      • Changed Robotic Head from bulky to normal.
        • +
      +

      Sarchutar updated:

      +
        +
      • Deconverting clock cultists now show a message when it was successful
        • +

      18 October 2024

      ktlwjec updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 69ebcf2b9cf7a..feed965949ea1 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44654,3 +44654,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. ClownMoff: - rscadd: 'FlandStation: Adds a missing oven on the kitchen' - rscdel: 'FlandStation: Deletes one of the 2 deepfryers on the kitchen.' + MarkusLarsson421: + - bugfix: Changed Robotic Head from bulky to normal. + Sarchutar: + - bugfix: Deconverting clock cultists now show a message when it was successful diff --git a/html/changelogs/AutoChangeLog-pr-11722.yml b/html/changelogs/AutoChangeLog-pr-11722.yml deleted file mode 100644 index 562e3154de702..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11722.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: MarkusLarsson421 -delete-after: true -changes: - - bugfix: Changed Robotic Head from bulky to normal. diff --git a/html/changelogs/AutoChangeLog-pr-11725.yml b/html/changelogs/AutoChangeLog-pr-11725.yml deleted file mode 100644 index c7e5380c3146f..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11725.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Sarchutar -delete-after: true -changes: - - bugfix: Deconverting clock cultists now show a message when it was successful From 176b86a7e01d036c17f4ff373b99d5cf232593dc Mon Sep 17 00:00:00 2001 From: Sarchutar <53494785+Sarchutar@users.noreply.github.com> Date: Sat, 19 Oct 2024 14:38:21 +0200 Subject: [PATCH 19/69] fix ert and syndi hardsuit light (#11724) - removes some overrides of ui_action_click that did the same the parent did but not actually calling it and therefore causing some problems - also fixes ert hardsuit helmets with lights turned on turning into engineering ones --- code/modules/clothing/spacesuits/hardsuit.dm | 15 +-------------- .../clothing/spacesuits/miscellaneous.dm | 19 +++++-------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index de815debceead..4507bd3c45d09 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -476,7 +476,7 @@ if(/datum/action/item_action/toggle_helmet_mode) attack_self(user) return - ..() + . = ..() /obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user) //Toggle Helmet if(!isturf(user.loc)) @@ -1031,14 +1031,6 @@ . = ..() AddComponent(/datum/component/anti_artifact, INFINITY, FALSE, 100) -/obj/item/clothing/suit/space/hardsuit/shielded/syndi/ui_action_click(mob/user, datum/actiontype) - switch(actiontype.type) - if(/datum/action/item_action/toggle_helmet) - ToggleHelmet() - if(/datum/action/item_action/toggle_beacon) - toggle_beacon(user) - if(/datum/action/item_action/toggle_beacon_frequency) - set_beacon_freq(user) //Helmet - With built in HUD @@ -1066,11 +1058,6 @@ else AddComponent(/datum/component/team_monitor/worn, "synd", -1) -/obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi/ui_action_click(mob/user, datum/action) - switch(action.type) - if(/datum/action/item_action/toggle_beacon_hud) - toggle_hud(user) - ///SWAT version /obj/item/clothing/suit/space/hardsuit/shielded/swat name = "death commando spacesuit" diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index e98d310c06585..439a039cfa676 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -147,6 +147,7 @@ Contains: desc = "The integrated helmet of an ERT hardsuit, this one has blue highlights." icon_state = "hardsuit0-ert_commander" item_state = "hardsuit0-ert_commander" + hardsuit_type = "ert_commander" armor = list(MELEE = 65, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 100, RAD = 100, FIRE = 80, ACID = 80, STAMINA = 70, BLEED = 70) strip_delay = 130 light_range = 7 @@ -173,11 +174,6 @@ Contains: else AddComponent(/datum/component/team_monitor, "cent", -1) -/obj/item/clothing/head/helmet/space/hardsuit/ert/ui_action_click(mob/user, datum/action) - switch(action.type) - if(/datum/action/item_action/toggle_beacon_hud) - toggle_hud(user) - /obj/item/clothing/suit/space/hardsuit/ert name = "emergency response team commander hardsuit" desc = "The standard issue hardsuit of the ERT, this one has blue highlights. Offers superb protection against environmental hazards." @@ -202,21 +198,13 @@ Contains: . = ..() AddElement(/datum/element/empprotection, EMP_PROTECT_CONTENTS) -/obj/item/clothing/suit/space/hardsuit/ert/ui_action_click(mob/user, datum/actiontype) - switch(actiontype.type) - if(/datum/action/item_action/toggle_helmet) - ToggleHelmet() - if(/datum/action/item_action/toggle_beacon) - toggle_beacon(user) - if(/datum/action/item_action/toggle_beacon_frequency) - set_beacon_freq(user) - //ERT Security /obj/item/clothing/head/helmet/space/hardsuit/ert/sec name = "emergency response team security helmet" desc = "The integrated helmet of an ERT hardsuit, this one has red highlights." icon_state = "hardsuit0-ert_security" item_state = "hardsuit0-ert_security" + hardsuit_type = "ert_security" beacon_colour = "#ec4848" beacon_zdiff_colour = "#ca7878" @@ -234,6 +222,7 @@ Contains: desc = "The integrated helmet of an ERT hardsuit, this one has orange highlights." icon_state = "hardsuit0-ert_engineer" item_state = "hardsuit0-ert_engineer" + hardsuit_type = "ert_engineer" beacon_colour = "#ecaa48" beacon_zdiff_colour = "#daa960" @@ -251,6 +240,7 @@ Contains: desc = "The integrated helmet of an ERT hardsuit, this one has white highlights." icon_state = "hardsuit0-ert_medical" item_state = "hardsuit0-ert_medical" + hardsuit_type = "ert_medical" beacon_colour = "#88ecec" beacon_zdiff_colour = "#4f8888" @@ -268,6 +258,7 @@ Contains: desc = "The integrated helmet of an ERT hardsuit, this one has purple highlights." icon_state = "hardsuit0-ert_janitor" item_state = "hardsuit0-ert_janitor" + hardsuit_type = "ert_janitor" beacon_colour = "#be43ce" beacon_zdiff_colour = "#895d8f" From f27064d261f055e2e898830dd4878e79b3a12720 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 08:21:55 -0500 Subject: [PATCH 20/69] Automatic changelog generation for PR #11724 [ci skip] --- html/changelogs/AutoChangeLog-pr-11724.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11724.yml diff --git a/html/changelogs/AutoChangeLog-pr-11724.yml b/html/changelogs/AutoChangeLog-pr-11724.yml new file mode 100644 index 0000000000000..9121c7af4787b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11724.yml @@ -0,0 +1,6 @@ +author: Sarchutar +delete-after: true +changes: + - bugfix: Fixed ERT hardsuit lights not being able to be turned on + - bugfix: Fixed ERT hardsuit helmets turning into engineering ones when the light + is turned on From adbf62341911b6e8da60d4081fe0e428fc63a93a Mon Sep 17 00:00:00 2001 From: Therealdoooc213 Date: Sat, 19 Oct 2024 20:40:03 +0800 Subject: [PATCH 21/69] Changes to hallucinations (#11718) * IF THE JOKER COULD BEATBOX... * WE LIVE WE LOVE WE DIE --- code/modules/hallucination/chat.dm | 1 + strings/hallucination.json | 86 +++++++++++++++++------------- 2 files changed, 50 insertions(+), 37 deletions(-) diff --git a/code/modules/hallucination/chat.dm b/code/modules/hallucination/chat.dm index be7b58978a35f..a7261e5ad3c45 100644 --- a/code/modules/hallucination/chat.dm +++ b/code/modules/hallucination/chat.dm @@ -25,6 +25,7 @@ "[pick_list_replacements(HAL_LINES_FILE, "aggressive")]",\ "[pick_list_replacements(HAL_LINES_FILE, "help")]!!",\ "[pick_list_replacements(HAL_LINES_FILE, "escape")]",\ + "[pick_list_replacements(HAL_LINES_FILE, "reportadvice")]",\ "I'm infected, [pick_list_replacements(HAL_LINES_FILE, "infection_advice")]!") var/radio_messages = list("[pick_list_replacements(HAL_LINES_FILE, "people")] is [pick_list_replacements(HAL_LINES_FILE, "accusations")]!",\ diff --git a/strings/hallucination.json b/strings/hallucination.json index 8e50c401703b4..a58cd076f41ab 100644 --- a/strings/hallucination.json +++ b/strings/hallucination.json @@ -1,7 +1,7 @@ { "suspicion": [ "@pick(add_name)i'm watching you...", - "@pick(add_name)i know what you're doing", + "@pick(add_name)i know what you've done..", "@pick(add_name)what are you hiding?", "I saw that" ], @@ -74,8 +74,10 @@ "aggressive": [ "@pick(add_name)give me that!", "@pick(add_name)stop it!", - "@pick(add_name)i'm going to kill you!", - "@pick(add_name)fuck you!" + "@pick(add_name)i'm gonna kill you!", + "@pick(add_name)fuck you!", + "@pick(add_name)i'll stab you!", + "@pick(add_name)you asshole!" ], "help": [ @@ -110,51 +112,50 @@ "people": [ "Captain", - "Hos", - "Cmo", - "Rd", - "Ce", - "Hop", + "Head of Security", + "Chief Medical Officer", + "Research Director", + "Chief Engineer", + "Head of Personnel", "Janitor", "AI", - "Viro", - "Qm", + "Quartermaster", + "Assistant", + "Doctor", + "Scientist", + "Roboticist", + "Cargo Technician", + "Chemist", + "Security Officer", + "Detective", + "Clown", + "Mime", "%TARGETNAME%" ], "accusations": [ "dead", "rogue", - "cult", - "a cultist", - "clockcult", - "a clock cultist", - "a revhead", - "a rev", - "a gang leader", - "a gangster", - "a traitor", - "a tator", - "a ling", - "a changeling" + "a freak", + "a lunatic", + "a union rep", + "creep", + "asshole" ], "threat": [ - "Cult", - "Wizard", - "Blob", - "Ling", - "Ops", - "Swarmers", + "Tiny robot", "Spiders", - "Xenos", - "Revenant", - "Traitor", + "Alien", + "Ghost", "Harm", - "Blue APC", - "I hear flashing", + "Weird APC", + "I hear strange sounds", "Help", - "%TARGETNAME%" + "%TARGETNAME%", + "Maniac", + "Murderer", + "Cluwne" ], "location": [ @@ -180,7 +181,7 @@ "tool storage", "botany", "the kitchen", - "the ai sat" + "the AI satellite" ], "sublocation": [ @@ -204,7 +205,7 @@ "tool storage", "botany", "the kitchen", - "the ai sat" + "the AI satellite" ], "advice": [ @@ -218,7 +219,18 @@ "You should go somewhere else. Quickly.", "Good luck. You'll need it.", "You have my permission. Do it.", - "Just do it." + "Just do it.", + "He knows what you did! Kill them!!", + "She knows what you did! Kill them!!" + ], + + "reportadvice": [ + "%TARGETNAME% report to @pick(location) please.", + "%TARGETNAME% come to @pick(location) fast!", + "%TARGETNAME%, we need you at @pick(location)!", + "%TARGETNAME%, get your ass to @pick(location) or you're fired!", + "Hey %TARGETNAME%, can you come to @pick(location) please?", + "%TARGETNAME% GET TO @pick(location) NOW!!!!!" ], "chemicals": [ From 366a292b90f91df7f93c88aba6524970370e892d Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 08:36:18 -0500 Subject: [PATCH 22/69] Automatic changelog generation for PR #11718 [ci skip] --- html/changelogs/AutoChangeLog-pr-11718.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11718.yml diff --git a/html/changelogs/AutoChangeLog-pr-11718.yml b/html/changelogs/AutoChangeLog-pr-11718.yml new file mode 100644 index 0000000000000..7fac6ddc9b897 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11718.yml @@ -0,0 +1,5 @@ +author: Therealdoooc213 +delete-after: true +changes: + - rscdel: Removes LRPspeak from hallucinations + - rscadd: New hallucination types! From d4366f8ddc94796fd52b0c8248c184a5e8acdd17 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 14:03:20 +0000 Subject: [PATCH 23/69] Automatic changelog compile [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 6 ++++++ html/changelogs/AutoChangeLog-pr-11718.yml | 5 ----- html/changelogs/AutoChangeLog-pr-11724.yml | 6 ------ 4 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11718.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11724.yml diff --git a/html/changelog.html b/html/changelog.html index 1678893757239..eee77003c395e 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -69,6 +69,13 @@

      MarkusLarsson421 updated:

      Sarchutar updated:

      • Deconverting clock cultists now show a message when it was successful
        • +
      • Fixed ERT hardsuit lights not being able to be turned on
        • +
      • Fixed ERT hardsuit helmets turning into engineering ones when the light is turned on
        • +
      +

      Therealdoooc213 updated:

      +
        +
      • Removes LRPspeak from hallucinations
        • +
      • New hallucination types!

      18 October 2024

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index feed965949ea1..0573f451e3665 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44658,3 +44658,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Changed Robotic Head from bulky to normal. Sarchutar: - bugfix: Deconverting clock cultists now show a message when it was successful + - bugfix: Fixed ERT hardsuit lights not being able to be turned on + - bugfix: Fixed ERT hardsuit helmets turning into engineering ones when the light + is turned on + Therealdoooc213: + - rscdel: Removes LRPspeak from hallucinations + - rscadd: New hallucination types! diff --git a/html/changelogs/AutoChangeLog-pr-11718.yml b/html/changelogs/AutoChangeLog-pr-11718.yml deleted file mode 100644 index 7fac6ddc9b897..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11718.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Therealdoooc213 -delete-after: true -changes: - - rscdel: Removes LRPspeak from hallucinations - - rscadd: New hallucination types! diff --git a/html/changelogs/AutoChangeLog-pr-11724.yml b/html/changelogs/AutoChangeLog-pr-11724.yml deleted file mode 100644 index 9121c7af4787b..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11724.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Sarchutar -delete-after: true -changes: - - bugfix: Fixed ERT hardsuit lights not being able to be turned on - - bugfix: Fixed ERT hardsuit helmets turning into engineering ones when the light - is turned on From 36d584ded56673d40ca39343c93a501a97f4ac44 Mon Sep 17 00:00:00 2001 From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com> Date: Sat, 19 Oct 2024 11:21:36 -0400 Subject: [PATCH 24/69] Moves integrity to the atom level (#11290) * blastcannon buff * Revert "blastcannon buff" This reverts commit e8aa1a298579ff755572d376b8b7ac35e28819bc. * tank integrity refactor * before threading into turf integrity * hmmm, nearly there. * Revert "hmmm, nearly there." This reverts commit 70bc9817b60b7ee39a2ba7ca8fa8a711359604c7. * better * finished * merge skew * merge skew * search&replace * ifndef * reviews * REALBASELINE * convert fland * REALBASELINE * meta & echo * i like to singa * please fix yourself --- _maps/RuinGeneration/13x13_ai-lab.dmm | 56 +- _maps/map_files/BoxStation/BoxStation.dmm | 1742 +++++------ _maps/map_files/EchoStation/EchoStation.dmm | 1526 ++++----- _maps/map_files/FlandStation/FlandStation.dmm | 2742 ++++++++--------- _maps/map_files/KiloStation/KiloStation.dmm | 2282 +++++++------- _maps/map_files/MetaStation/MetaStation.dmm | 1774 +++++------ _maps/map_files/RadStation/RadStation.dmm | 2122 ++++++------- beestation.dme | 1 + .../signals_atom/signals_atom_attack.dm | 10 + .../signals_item/signals_itemattack.dm | 2 +- .../signals_machine/signals_machinery.dm | 2 +- .../dcs/signals/signals_obj/signals_object.dm | 11 - code/_onclick/item_attack.dm | 29 +- code/datums/components/shell.dm | 2 +- code/datums/elements/obj_regen.dm | 4 +- code/game/atom_defense.dm | 131 + code/game/atoms.dm | 23 + code/game/data_huds.dm | 2 +- code/game/machinery/PDApainter.dm | 4 +- code/game/machinery/_machinery.dm | 6 +- code/game/machinery/airlock_cycle_control.dm | 2 +- code/game/machinery/announcement_system.dm | 2 +- code/game/machinery/aug_manipulator.dm | 4 +- code/game/machinery/camera/camera.dm | 6 +- code/game/machinery/computer/_computer.dm | 6 +- code/game/machinery/computer/arcade.dm | 2 +- code/game/machinery/defibrillator_mount.dm | 2 +- code/game/machinery/digital_clock.dm | 4 +- code/game/machinery/doors/airlock.dm | 28 +- code/game/machinery/doors/brigdoors.dm | 2 +- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 2 +- code/game/machinery/droneDispenser.dm | 4 +- code/game/machinery/firealarm.dm | 8 +- code/game/machinery/flasher.dm | 4 +- code/game/machinery/hologram.dm | 2 +- code/game/machinery/iv_drip.dm | 2 +- .../newscaster/newscaster_machine.dm | 6 +- .../machinery/porta_turret/portable_turret.dm | 4 +- code/game/machinery/shieldgen.dm | 9 +- code/game/machinery/stasis.dm | 6 +- code/game/machinery/syndicatebomb.dm | 12 +- .../machinery/telecomms/telecomunications.dm | 2 +- code/game/objects/effects/glowshroom.dm | 2 +- code/game/objects/effects/spiders.dm | 2 +- code/game/objects/items.dm | 2 +- code/game/objects/items/RPD.dm | 2 +- code/game/objects/items/crab17.dm | 10 +- .../objects/items/deployable/barricade.dm | 10 +- .../objects/items/devices/transfer_valve.dm | 6 + code/game/objects/items/extinguisher.dm | 2 +- code/game/objects/items/inducer.dm | 2 +- code/game/objects/items/shields.dm | 18 +- code/game/objects/items/tanks/tanks.dm | 150 +- code/game/objects/obj_defense.dm | 123 +- code/game/objects/objs.dm | 23 +- code/game/objects/structures.dm | 2 +- code/game/objects/structures/aliens.dm | 6 +- code/game/objects/structures/barsigns.dm | 2 +- .../structures/crates_lockers/closets.dm | 2 +- .../closets/secure/secure_closets.dm | 2 +- .../crates_lockers/crates/secure.dm | 2 +- code/game/objects/structures/displaycase.dm | 14 +- code/game/objects/structures/extinguisher.dm | 2 +- code/game/objects/structures/fireaxe.dm | 10 +- code/game/objects/structures/grille.dm | 27 +- .../objects/structures/lavaland/geyser.dm | 2 +- code/game/objects/structures/manned_turret.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 6 +- code/game/objects/structures/mirror.dm | 4 +- .../objects/structures/petrified_statue.dm | 6 +- code/game/objects/structures/popout_cake.dm | 2 +- code/game/objects/structures/railings.dm | 4 +- code/game/objects/structures/reflector.dm | 4 +- code/game/objects/structures/window.dm | 18 +- code/game/turfs/closed/walls.dm | 3 + code/game/turfs/turf.dm | 9 + code/game/turfs/turf_integrity.dm | 37 +- .../antagonists/blob/structures/_blob.dm | 14 +- .../antagonists/blob/structures/core.dm | 2 +- .../antagonists/blob/structures/shield.dm | 10 +- .../antagonists/clock_cult/clockwork_turfs.dm | 12 +- .../clock_cult/items/clockwork_weapon.dm | 2 +- .../clock_cult/items/integration_cog.dm | 2 +- .../antagonists/cult/cult_structures.dm | 8 +- .../heretic/structures/mawed_crucible.dm | 2 +- .../antagonists/space_dragon/carp_rift.dm | 2 +- code/modules/aquarium/aquarium.dm | 4 +- .../atmospherics/machinery/airalarm.dm | 2 +- .../atmospherics/machinery/pipes/pipes.dm | 2 +- .../machinery/portable/canister.dm | 2 +- code/modules/clothing/clothing.dm | 8 +- code/modules/clothing/gloves/color.dm | 2 +- .../discovery_research/discovery_scanner.dm | 2 +- .../kitchen_machinery/smartfridge.dm | 17 + .../living/carbon/alien/special/facehugger.dm | 4 +- .../computers/item/computer.dm | 14 +- .../computers/item/computer_damage.dm | 2 +- .../computers/item/tablet.dm | 4 +- .../modular_computers/file_system/program.dm | 4 +- .../file_system/programs/phys_scanner.dm | 2 +- .../modular_computers/hardware/_hardware.dm | 4 +- code/modules/paperwork/photocopier.dm | 2 +- code/modules/power/apc/apc_attack.dm | 8 +- code/modules/power/apc/apc_power_proc.dm | 2 +- code/modules/power/floodlight.dm | 2 +- code/modules/power/gravitygenerator.dm | 2 +- code/modules/power/lighting/light_items.dm | 2 +- code/modules/power/singularity/collector.dm | 2 +- code/modules/power/smes.dm | 4 +- code/modules/power/solar.dm | 6 +- code/modules/power/tracker.dm | 2 +- code/modules/power/turbine.dm | 8 +- code/modules/projectiles/autofire.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- .../projectiles/guns/misc/blastcannon.dm | 32 +- code/modules/reagents/reagent_dispenser.dm | 2 +- code/modules/recycling/conveyor.dm | 2 +- code/modules/recycling/disposal/pipe.dm | 2 +- code/modules/religion/sects/carp_sect.dm | 2 +- .../xenobiology/crossbreeding/_structures.dm | 2 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 2 +- code/modules/security/genpop.dm | 4 +- code/modules/surgery/anesthetic_machine.dm | 2 +- code/modules/vehicles/_vehicle.dm | 2 +- code/modules/vehicles/atv.dm | 12 +- code/modules/vehicles/cars/car.dm | 2 +- code/modules/vehicles/cars/clowncar.dm | 2 +- code/modules/vehicles/mecha/_mecha.dm | 12 +- code/modules/vehicles/mecha/combat/durand.dm | 4 +- code/modules/vehicles/mecha/combat/honker.dm | 2 +- code/modules/vehicles/mecha/mecha_defense.dm | 14 +- code/modules/vehicles/mecha/mecha_topic.dm | 2 +- code/modules/vehicles/motorized_wheelchair.dm | 2 +- code/modules/vehicles/secway.dm | 12 +- code/modules/vehicles/wheelchair.dm | 2 +- code/modules/vending/_vending.dm | 2 +- .../Scripts/11290_atomintegrity.txt | 1 + 138 files changed, 6735 insertions(+), 6667 deletions(-) create mode 100644 code/game/atom_defense.dm create mode 100644 tools/UpdatePaths/Scripts/11290_atomintegrity.txt diff --git a/_maps/RuinGeneration/13x13_ai-lab.dmm b/_maps/RuinGeneration/13x13_ai-lab.dmm index c56d2437a73d3..bc953c40b687e 100644 --- a/_maps/RuinGeneration/13x13_ai-lab.dmm +++ b/_maps/RuinGeneration/13x13_ai-lab.dmm @@ -173,6 +173,22 @@ /obj/machinery/door/poddoor/shutters/preopen, /turf/open/floor/iron/tech/grid, /area/ruin/unpowered) +"wO" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 1; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/mob_spawn/human/corpse/nanotrasensoldier, +/turf/open/floor/carpet/black, +/area/ruin/unpowered) "za" = ( /obj/item/kirbyplants/photosynthetic{ pixel_y = 10 @@ -269,20 +285,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/ruin/unpowered) -"Lx" = ( -/obj/effect/decal/cleanable/robot_debris/old, -/obj/machinery/camera{ - c_tag = "Telecomms - Server Room - Aft-Port"; - dir = 6 - }, -/obj/effect/decal/cleanable/blood/tracks, -/obj/item/ammo_casing/c9mm{ - dir = 8; - pixel_x = 3; - pixel_y = 3 - }, -/turf/open/floor/carpet/black, -/area/ruin/unpowered) "MV" = ( /obj/structure/rack, /obj/machinery/light, @@ -334,20 +336,18 @@ "SV" = ( /turf/open/floor/iron/tech/grid, /area/ruin/unpowered) -"WV" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 1; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" +"TP" = ( +/obj/effect/decal/cleanable/robot_debris/old, +/obj/machinery/camera{ + c_tag = "Telecomms - Server Room - Aft-Port"; + dir = 6 }, /obj/effect/decal/cleanable/blood/tracks, -/obj/effect/mob_spawn/human/corpse/nanotrasensoldier, +/obj/item/ammo_casing/c9mm{ + dir = 8; + pixel_x = 3; + pixel_y = 3 + }, /turf/open/floor/carpet/black, /area/ruin/unpowered) "WX" = ( @@ -537,8 +537,8 @@ tO KU za SV -WV -Lx +wO +TP nN JS "} diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index fe6294641882a..9880972e72166 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -897,6 +897,17 @@ /obj/structure/closet/toolcloset, /turf/open/floor/iron, /area/storage/tools) +"ama" = ( +/obj/structure/table/greyscale, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = -3 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "ami" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -1890,13 +1901,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"aAv" = ( -/obj/structure/closet, -/obj/effect/landmark/blobstart, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "aAC" = ( /obj/structure/sign/warning/docking, /turf/closed/wall/r_wall, @@ -3296,15 +3300,6 @@ /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, /area/bridge) -"aQh" = ( -/obj/structure/table/wood, -/obj/item/food/chips, -/obj/item/reagent_containers/cup/soda_cans/cola, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/carpet, -/area/hallway/secondary/entry) "aQj" = ( /obj/machinery/gulag_teleporter, /obj/machinery/light{ @@ -3935,26 +3930,6 @@ /obj/item/camera_film, /turf/open/floor/wood, /area/library) -"aVW" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/toy/cards/deck{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/coin/diamond{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/structure/desk_bell/speed_demon{ - pixel_x = -8 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/captain) "aWd" = ( /obj/machinery/computer/rdconsole/production{ dir = 4 @@ -5039,17 +5014,6 @@ "bhh" = ( /turf/open/floor/iron/white, /area/medical/medbay/central) -"bhi" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/security/prison) "bhp" = ( /obj/structure/table/glass, /obj/item/stack/ducts/fifty, @@ -6342,6 +6306,20 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"bue" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/obj/machinery/light{ + bulb_colour = "#22bfa2"; + bulb_vacuum_colour = "#22bfa2"; + dir = 4; + nightshift_light_color = "#22bfa2" + }, +/turf/open/floor/iron, +/area/hydroponics) "buj" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics2"; @@ -6693,6 +6671,31 @@ "byE" = ( /turf/open/floor/iron, /area/quartermaster/miningdock) +"byH" = ( +/obj/structure/table, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/item/folder/red{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/folder/blue, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -8; + pixel_y = 3 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/turf/open/floor/iron, +/area/tcommsat/computer) "byI" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -8575,35 +8578,6 @@ }, /turf/open/floor/iron, /area/science/xenobiology) -"bPJ" = ( -/obj/structure/table/glass, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/dropper, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/reagent_containers/dropper, -/turf/open/floor/iron, -/area/science/xenobiology) "bPV" = ( /obj/machinery/door/airlock/maintenance{ name = "Maint Bar Access"; @@ -10840,71 +10814,6 @@ }, /turf/open/floor/engine/co2, /area/engine/atmos) -"ccO" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/bottle/chloralhydrate, -/obj/item/reagent_containers/cup/bottle/toxin{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/cup/bottle/facid{ - name = "fluorosulfuric acid bottle"; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/reagent_containers/syringe{ - pixel_y = 5 - }, -/obj/item/reagent_containers/dropper, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/button/ignition{ - id = "executionburn"; - name = "Justice Ignition Switch"; - pixel_x = -25; - pixel_y = 36 - }, -/obj/machinery/button/door{ - id = "executionfireblast"; - name = "Justice Area Lockdown"; - pixel_x = -25; - pixel_y = 26; - req_access_txt = "2" - }, -/obj/item/assembly/signaler{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/button/flasher{ - id = "justiceflash"; - name = "Justice Flash Control"; - pixel_x = -36; - pixel_y = 36; - req_access_txt = "1" - }, -/obj/machinery/button/door{ - id = "SecJusticeChamber"; - name = "Justice Vent Control"; - pixel_x = -36; - pixel_y = 26; - req_access_txt = "3" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/security/execution/transfer) "ccP" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -12263,6 +12172,18 @@ }, /turf/open/floor/iron, /area/crew_quarters/heads/hop) +"cmF" = ( +/obj/structure/safe, +/obj/item/clothing/head/costume/bearpelt, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/ammo_box/a357, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ai_monitored/nuke_storage) "cmU" = ( /turf/open/floor/engine/n2, /area/engine/atmos) @@ -13772,17 +13693,6 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/engine/supermatter) -"cAR" = ( -/obj/structure/table/greyscale, -/obj/item/storage/fancy/cigarettes/cigpack_robust{ - pixel_x = -3 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 2; - pixel_y = 3 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "cAZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -15976,12 +15886,6 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/iron/dark, /area/security/prison) -"daL" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/item/reagent_containers/cup/glass/bottle/holywater, -/turf/open/floor/carpet/grimy, -/area/chapel/office) "daM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -16683,6 +16587,16 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/prison/dark, /area/security/prison) +"drl" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/clothing/glasses/hud/security/sunglasses, +/obj/item/reagent_containers/cup/glass/flask/det, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "drN" = ( /obj/structure/reagent_dispensers/peppertank/directional/south, /turf/open/floor/carpet/red, @@ -18405,6 +18319,18 @@ }, /turf/open/floor/iron, /area/science/research) +"eau" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 4 + }, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 5 + }, +/turf/open/floor/prison, +/area/security/prison) "eaC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -18945,16 +18871,13 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"emv" = ( -/obj/structure/table/glass, -/obj/item/cultivator, -/obj/item/hatchet, -/obj/item/crowbar, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/hydroponics/garden) +"emA" = ( +/obj/structure/closet, +/obj/effect/landmark/blobstart, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "emD" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "meetingshutter"; @@ -19859,6 +19782,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"eFe" = ( +/obj/structure/table/wood, +/obj/item/food/chips, +/obj/item/reagent_containers/cup/soda_cans/cola, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/carpet, +/area/hallway/secondary/entry) "eFj" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; @@ -20446,6 +20378,18 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"ePs" = ( +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + pixel_x = 4; + req_access_txt = "16" + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/ai) "ePu" = ( /obj/structure/cable{ icon_state = "1-8" @@ -20657,18 +20601,6 @@ }, /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) -"eSA" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = 4 - }, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 5 - }, -/turf/open/floor/prison, -/area/security/prison) "eSF" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 @@ -23228,6 +23160,17 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"fWB" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 6 + }, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ + pixel_x = 6; + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "fWD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -23403,18 +23346,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) -"gad" = ( -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - pixel_x = 4; - req_access_txt = "16" - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai) "gat" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -24321,23 +24252,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) -"gsG" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/item/storage/box/matches{ - pixel_x = -5; - pixel_y = 7 - }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/turf/open/floor/carpet/green, -/area/crew_quarters/bar/atrium) "gsK" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -24913,19 +24827,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engine/engineering) -"gDA" = ( -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/iron, -/area/hydroponics) "gDB" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/turf_decal/caution{ @@ -25179,17 +25080,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"gJh" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 6 - }, -/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ - pixel_x = 6; - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) "gJm" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -26351,6 +26241,14 @@ }, /turf/open/floor/carpet/royalblack, /area/lawoffice) +"hmY" = ( +/obj/effect/turf_decal/tile/dark_green{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron, +/area/hydroponics) "hnc" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, @@ -26424,6 +26322,18 @@ dir = 5 }, /area/science/research) +"hoF" = ( +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Tertiary AI Core Access"; + atom_integrity = 300; + pixel_x = -3; + req_access_txt = "16" + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/ai) "hoL" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -26562,6 +26472,18 @@ }, /turf/open/floor/iron, /area/science/mixing/chamber) +"hrn" = ( +/obj/item/reagent_containers/cup/glass/mug{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/newspaper{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/vacant_room/office) "hrM" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -26615,6 +26537,52 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/grid, /area/medical/patients_rooms) +"hsE" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -9 + }, +/obj/item/storage/box/papersack{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/machinery/camera/directional/north, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "hsH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -28244,14 +28212,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"hYo" = ( -/obj/item/mop, -/obj/item/reagent_containers/cup/bucket, -/obj/machinery/light_switch{ - pixel_x = 28 - }, -/turf/open/floor/iron, -/area/janitor) "hYu" = ( /obj/effect/turf_decal/stripes/line, /obj/item/kirbyplants/random, @@ -28354,6 +28314,36 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/exit) +"ibk" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/virology) "ibG" = ( /obj/machinery/nanite_programmer, /obj/effect/turf_decal/bot, @@ -29023,30 +29013,6 @@ }, /turf/open/floor/carpet, /area/library) -"ilG" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/cultivator{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/shovel/spade{ - pixel_x = -5; - pixel_y = -4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/prison/dark, -/area/security/prison) "ilV" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "meetingshutter"; @@ -29234,6 +29200,28 @@ }, /turf/open/floor/carpet, /area/security/brig) +"ipU" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer, +/obj/item/toy/cards/deck{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "ipZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/door/poddoor/preopen{ @@ -29595,18 +29583,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"iwV" = ( -/obj/structure/safe, -/obj/item/clothing/head/costume/bearpelt, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, -/obj/item/gun/ballistic/revolver/russian, -/obj/item/ammo_box/a357, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/nuke_storage) "ixa" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -30296,6 +30272,16 @@ }, /turf/open/floor/iron/dark/side, /area/engine/atmos) +"iNP" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/book/manual/wiki/barman_recipes, +/obj/item/reagent_containers/cup/rag, +/obj/structure/noticeboard{ + pixel_y = 29 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "iNS" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Door" @@ -30443,28 +30429,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/medbay/lobby) -"iQZ" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer, -/obj/item/toy/cards/deck{ - pixel_x = -10; - pixel_y = 6 - }, -/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{ - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "iRe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -31436,25 +31400,6 @@ /obj/item/pen, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) -"jlh" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/obj/structure/sign/poster/contraband/missing_gloves{ - pixel_x = -32 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron, -/area/hallway/secondary/service) "jlI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31547,6 +31492,16 @@ }, /turf/open/floor/iron/dark, /area/security/prison) +"jnn" = ( +/obj/structure/table/glass, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/crowbar, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/hydroponics/garden) "jnC" = ( /obj/machinery/rnd/production/techfab/department/medical, /obj/effect/turf_decal/tile/blue, @@ -32201,21 +32156,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"jyJ" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/camera/directional/west, -/obj/structure/table/wood/fancy, -/obj/item/soulstone/anybody/chaplain, -/obj/item/organ/heart, -/obj/item/reagent_containers/cup/glass/bottle/holywater, -/obj/item/book/granter/spell/smoke/lesser, -/turf/open/floor/iron/dark, -/area/chapel/office) "jzf" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -32721,6 +32661,32 @@ /obj/machinery/atmospherics/components/unary/tank/air, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) +"jJz" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/sopservice{ + pixel_x = 11; + pixel_y = 6 + }, +/obj/item/shovel/spade, +/obj/item/stack/sheet/mineral/copper{ + amount = 5 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/storage/toolbox/drone, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/red_rum{ + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "jJF" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -33661,18 +33627,6 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"kbn" = ( -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Tertiary AI Core Access"; - obj_integrity = 300; - pixel_x = -3; - req_access_txt = "16" - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai) "kbu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -34644,6 +34598,27 @@ dir = 4 }, /area/maintenance/starboard) +"kuh" = ( +/obj/item/clipboard{ + pixel_y = 7 + }, +/obj/item/paper{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/pen/charcoal{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -8; + pixel_y = 3 + }, +/obj/structure/table/wood, +/obj/structure/extinguisher_cabinet{ + pixel_x = -26 + }, +/turf/open/floor/carpet/grimy, +/area/vacant_room/office) "kum" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -35766,27 +35741,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hop) -"kQa" = ( -/obj/item/clipboard{ - pixel_y = 7 - }, -/obj/item/paper{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/pen/charcoal{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/structure/table/wood, -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, -/turf/open/floor/carpet/grimy, -/area/vacant_room/office) "kQe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, @@ -37076,37 +37030,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/bar/atrium) -"loD" = ( -/obj/item/reagent_containers/cup/beaker/cryoxadone, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/storage/pill_bottle/mannitol, -/obj/structure/table/glass, -/turf/open/floor/iron/dark, -/area/medical/cryo) -"loU" = ( -/obj/structure/table/glass, -/obj/item/hatchet, -/obj/item/cultivator, -/obj/item/crowbar, -/obj/item/reagent_containers/cup/bucket, -/obj/item/plant_analyzer, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/hydroponics/garden) "lpu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -37575,88 +37498,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"lAN" = ( -/obj/item/reagent_containers/cup/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/aluminium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sulfur{ - pixel_x = -6 - }, -/obj/structure/closet/crate/medical, -/obj/item/circuitboard/machine/chem_heater, -/turf/open/floor/iron/white, -/area/medical/virology) "lAO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -37711,12 +37552,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/science) -"lBV" = ( -/obj/item/reagent_containers/cup/bucket, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, -/turf/open/floor/iron, -/area/hydroponics) "lBW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -38145,21 +37980,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"lMV" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/effect/turf_decal/bot, -/obj/item/knife, -/obj/item/paint/green, -/obj/item/pushbroom, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/iron, -/area/hallway/secondary/service) "lMW" = ( /obj/machinery/light/small, /obj/machinery/camera/directional/south, @@ -38326,6 +38146,25 @@ /obj/machinery/camera/directional/east, /turf/open/floor/iron, /area/storage/tools) +"lRm" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/obj/structure/sign/poster/contraband/missing_gloves{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/hallway/secondary/service) "lRI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -39881,6 +39720,35 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/hydroponics) +"mFd" = ( +/obj/structure/table/glass, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/dropper, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/reagent_containers/dropper, +/turf/open/floor/iron, +/area/science/xenobiology) "mFg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/light{ @@ -39939,6 +39807,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"mGG" = ( +/obj/item/paper, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -5; + pixel_y = 1 + }, +/turf/open/floor/prison, +/area/security/prison) "mGI" = ( /obj/machinery/door/airlock/command{ name = "Teleporter Maintenance"; @@ -40098,6 +39975,88 @@ }, /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/fore) +"mLE" = ( +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/structure/closet/crate/medical, +/obj/item/circuitboard/machine/chem_heater, +/turf/open/floor/iron/white, +/area/medical/virology) "mLR" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/arrivals_external{ @@ -40922,31 +40881,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/theatre/backstage) -"ndh" = ( -/obj/structure/table, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/item/folder/red{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/item/folder/blue, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/turf/open/floor/iron, -/area/tcommsat/computer) "ndk" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -41102,6 +41036,29 @@ /obj/machinery/teleport/hub, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) +"nfG" = ( +/obj/item/reagent_containers/cup/bottle/salglu_solution{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/reagentgrinder{ + pixel_y = 6; + pixel_x = 3 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -8; + pixel_y = 3 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "ngx" = ( /obj/machinery/power/terminal{ dir = 1 @@ -41819,7 +41776,7 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"nvZ" = ( +"nwg" = ( /obj/structure/table/glass, /obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; @@ -42023,6 +41980,19 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) +"nBa" = ( +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron, +/area/hydroponics) "nBo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42961,6 +42931,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/science/storage) +"nSx" = ( +/obj/structure/table/glass, +/obj/item/hatchet, +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/reagent_containers/cup/bucket, +/obj/item/plant_analyzer, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/hydroponics/garden) "nSD" = ( /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -43231,6 +43215,19 @@ }, /turf/open/floor/noslip/standard, /area/security/prison) +"nXI" = ( +/obj/structure/table, +/obj/item/gps/mining/exploration, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -8 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/quartermaster/exploration_prep) "nXU" = ( /obj/machinery/holopad, /obj/machinery/button/door{ @@ -43656,6 +43653,12 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"ogF" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/item/reagent_containers/cup/glass/bottle/holywater, +/turf/open/floor/carpet/grimy, +/area/chapel/office) "ogJ" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -44294,21 +44297,6 @@ }, /turf/open/floor/iron/dark/side, /area/engine/atmos) -"owA" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/reagent_containers/cup/bucket, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/multitool{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted, -/turf/open/floor/iron, -/area/hydroponics) "owM" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -45673,6 +45661,12 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"ped" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bowl, +/obj/item/kitchen/fork, +/turf/open/floor/prison, +/area/security/prison) "pef" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -46275,20 +46269,6 @@ }, /turf/open/floor/iron/checker, /area/engine/break_room) -"pqa" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 1 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/obj/machinery/light{ - bulb_colour = "#22bfa2"; - bulb_vacuum_colour = "#22bfa2"; - dir = 4; - nightshift_light_color = "#22bfa2" - }, -/turf/open/floor/iron, -/area/hydroponics) "pqq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood{ @@ -48479,6 +48459,30 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/fore) +"qiL" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/cultivator{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/shovel/spade{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/prison/dark, +/area/security/prison) "qiN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -49134,6 +49138,29 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) +"qxu" = ( +/obj/machinery/button/door{ + id = "robotics"; + name = "Shutters Control Button"; + pixel_x = 6; + pixel_y = 24; + req_access_txt = "29" + }, +/obj/structure/table, +/obj/item/book/manual/wiki/robotics_cyborgs{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/stack/sheet/mineral/copper{ + amount = 5 + }, +/obj/machinery/camera/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/robotics/lab) "qxL" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -49264,6 +49291,26 @@ }, /turf/open/floor/iron, /area/security/brig) +"qzV" = ( +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/pestspray{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/structure/table/glass, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics/garden) "qAd" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -51359,16 +51406,6 @@ }, /turf/open/floor/iron, /area/science/mixing) -"rpl" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/clothing/glasses/hud/security/sunglasses, -/obj/item/reagent_containers/cup/glass/flask/det, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "rpN" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -52186,29 +52223,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"rEo" = ( -/obj/item/reagent_containers/cup/bottle/salglu_solution{ - pixel_x = -8; - pixel_y = 10 - }, -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/reagentgrinder{ - pixel_y = 6; - pixel_x = 3 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -8; - pixel_y = 3 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "rEE" = ( /obj/structure/table, /obj/item/razor, @@ -53065,24 +53079,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"rVp" = ( -/obj/structure/table, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 8 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 13; - pixel_y = 17 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "rVz" = ( /obj/machinery/button/ignition{ id = "Incinerator"; @@ -53706,26 +53702,6 @@ }, /turf/open/floor/iron/dark, /area/security/detectives_office) -"sjz" = ( -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/reagent_containers/spray/pestspray{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/bottle/nutrient/ez, -/obj/item/reagent_containers/cup/bottle/nutrient/rh{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/structure/table/glass, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics/garden) "skg" = ( /obj/machinery/computer/atmos_alert, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -54681,32 +54657,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"sEv" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/sopservice{ - pixel_x = 11; - pixel_y = 6 - }, -/obj/item/shovel/spade, -/obj/item/stack/sheet/mineral/copper{ - amount = 5 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/storage/toolbox/drone, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "sEx" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -55460,29 +55410,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"sRc" = ( -/obj/machinery/button/door{ - id = "robotics"; - name = "Shutters Control Button"; - pixel_x = 6; - pixel_y = 24; - req_access_txt = "29" - }, -/obj/structure/table, -/obj/item/book/manual/wiki/robotics_cyborgs{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/stack/sheet/mineral/copper{ - amount = 5 - }, -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/science/robotics/lab) "sRe" = ( /obj/machinery/door/poddoor/shutters{ id = "teleshutter"; @@ -55779,19 +55706,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"sYk" = ( -/obj/structure/table, -/obj/item/gps/mining/exploration, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -8 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/quartermaster/exploration_prep) "sYn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -55848,6 +55762,14 @@ }, /turf/open/floor/plating, /area/vacant_room/commissary) +"sZv" = ( +/obj/item/mop, +/obj/item/reagent_containers/cup/bucket, +/obj/machinery/light_switch{ + pixel_x = 28 + }, +/turf/open/floor/iron, +/area/janitor) "sZW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -56943,6 +56865,71 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"tvL" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/toxin{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/cup/bottle/facid{ + name = "fluorosulfuric acid bottle"; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/reagent_containers/syringe{ + pixel_y = 5 + }, +/obj/item/reagent_containers/dropper, +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = -24 + }, +/obj/machinery/button/ignition{ + id = "executionburn"; + name = "Justice Ignition Switch"; + pixel_x = -25; + pixel_y = 36 + }, +/obj/machinery/button/door{ + id = "executionfireblast"; + name = "Justice Area Lockdown"; + pixel_x = -25; + pixel_y = 26; + req_access_txt = "2" + }, +/obj/item/assembly/signaler{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/button/flasher{ + id = "justiceflash"; + name = "Justice Flash Control"; + pixel_x = -36; + pixel_y = 36; + req_access_txt = "1" + }, +/obj/machinery/button/door{ + id = "SecJusticeChamber"; + name = "Justice Vent Control"; + pixel_x = -36; + pixel_y = 26; + req_access_txt = "3" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/security/execution/transfer) "tvP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -57217,6 +57204,24 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/crew_quarters/fitness) +"tAc" = ( +/obj/structure/table, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 13; + pixel_y = 17 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "tAf" = ( /obj/machinery/light/small, /turf/open/floor/engine/o2, @@ -58001,6 +58006,21 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/wood, /area/crew_quarters/theatre) +"tMt" = ( +/obj/machinery/airalarm/directional/west{ + pixel_x = -22 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/machinery/camera/directional/west, +/obj/structure/table/wood/fancy, +/obj/item/soulstone/anybody/chaplain, +/obj/item/organ/heart, +/obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/item/book/granter/spell/smoke/lesser, +/turf/open/floor/iron/dark, +/area/chapel/office) "tMw" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -59677,6 +59697,21 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"uzG" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/effect/turf_decal/bot, +/obj/item/knife, +/obj/item/paint/green, +/obj/item/pushbroom, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron, +/area/hallway/secondary/service) "uzT" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -60222,6 +60257,26 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"uNR" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/toy/cards/deck{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/coin/diamond{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/structure/desk_bell/speed_demon{ + pixel_x = -8 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/captain) "uNY" = ( /obj/machinery/camera/directional/east, /obj/effect/turf_decal/tile/brown/anticorner/contrasted, @@ -60368,6 +60423,23 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/checker, /area/crew_quarters/bar/atrium) +"uQP" = ( +/obj/item/reagent_containers/cup/beaker/cryoxadone, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/structure/table/glass, +/turf/open/floor/iron/dark, +/area/medical/cryo) "uRq" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -60819,6 +60891,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) +"vbC" = ( +/obj/item/reagent_containers/cup/bucket, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/turf/open/floor/iron, +/area/hydroponics) "vbT" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -61529,52 +61607,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"vpf" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -9; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -9 - }, -/obj/item/storage/box/papersack{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/machinery/camera/directional/north, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "vpk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -61865,12 +61897,6 @@ /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"vuz" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bowl, -/obj/item/kitchen/fork, -/turf/open/floor/prison, -/area/security/prison) "vuA" = ( /obj/structure/noticeboard{ dir = 4; @@ -63997,22 +64023,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) -"wlD" = ( -/obj/structure/table, -/obj/machinery/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 8 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/quartermaster/exploration_prep) "wlI" = ( /obj/machinery/light/small{ dir = 1 @@ -64433,6 +64443,17 @@ /obj/structure/rack, /turf/open/floor/iron/dark, /area/engine/engineering) +"wuh" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "wur" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/pods{ @@ -64476,6 +64497,23 @@ }, /turf/open/floor/iron/grid/steel, /area/hydroponics) +"wvB" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/storage/box/matches{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/bar/atrium) "wvD" = ( /obj/machinery/nuclearbomb/selfdestruct, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -64508,16 +64546,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron, /area/engine/atmos) -"wwq" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/cup/rag, -/obj/structure/noticeboard{ - pixel_y = 29 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "wwv" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/airalarm/directional/west, @@ -64977,6 +65005,21 @@ /obj/structure/table/glass, /turf/open/floor/iron/dark, /area/medical/storage) +"wHb" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/reagent_containers/cup/bucket, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/multitool{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron, +/area/hydroponics) "wHs" = ( /turf/closed/wall/r_wall, /area/security/courtroom) @@ -65302,18 +65345,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"wMF" = ( -/obj/item/reagent_containers/cup/glass/mug{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/newspaper{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/vacant_room/office) "wMQ" = ( /obj/effect/turf_decal/delivery, /obj/structure/sign/warning/nosmoking{ @@ -65368,6 +65399,22 @@ /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, /area/space/nearstation) +"wOL" = ( +/obj/structure/table, +/obj/machinery/light, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 8 + }, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/quartermaster/exploration_prep) "wOZ" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -65515,15 +65562,6 @@ /obj/structure/flora/rock/pile, /turf/open/floor/grass, /area/hallway/secondary/command) -"wSz" = ( -/obj/item/paper, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -5; - pixel_y = 1 - }, -/turf/open/floor/prison, -/area/security/prison) "wSL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65702,14 +65740,6 @@ }, /turf/open/floor/iron/white, /area/medical/genetics/cloning) -"wWE" = ( -/obj/effect/turf_decal/tile/dark_green{ - dir = 1 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/iron, -/area/hydroponics) "wWP" = ( /obj/machinery/newscaster{ pixel_x = -30 @@ -66476,36 +66506,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/quartermaster/sorting) -"xnm" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "xnu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -82044,7 +82044,7 @@ jPx vfk czK wnx -kQa +kuh jAo vSG qnN @@ -82294,7 +82294,7 @@ aGZ aIM ofr jIB -aQh +eFe iFG oZu jPx @@ -83329,7 +83329,7 @@ ulq aSd czK hvV -wMF +hrn tHS aXL aXL @@ -83831,7 +83831,7 @@ aAP vIU aAP mDJ -emv +jnn azF omw dad @@ -84604,7 +84604,7 @@ aDg aAQ aAQ ntl -loU +nSx aKn aLE fqu @@ -85374,7 +85374,7 @@ iHT aAP aAQ gtV -sjz +qzV ksp azF iPA @@ -90256,7 +90256,7 @@ aBa hPU qKo bDR -iwV +cmF aBa aaa aKt @@ -92806,7 +92806,7 @@ qzt ugl sVh muJ -bhi +wuh hQH lVr acd @@ -92836,7 +92836,7 @@ aNm aSs aSs aTL -hYo +sZv aWD tav mXU @@ -93058,7 +93058,7 @@ tNE fuY yfx obR -wSz +mGG qzt ugl vKc @@ -93806,7 +93806,7 @@ afA afA afA kCN -ccO +tvL fMY kPq afA @@ -93831,8 +93831,8 @@ rhb fcq jHS vjl -eSA -vuz +eau +ped muJ siT vrb @@ -94093,7 +94093,7 @@ aai aai qXG bfG -ilG +qiL aai aai aai @@ -95168,7 +95168,7 @@ pWe mVe nUh jLJ -gJh +fWB wot tyH waL @@ -96222,7 +96222,7 @@ jfW bVJ bVJ tLN -ndh +byH bZv jWq bUc @@ -100513,7 +100513,7 @@ hLZ tqF rPl ubW -rpl +drl mRT xPR sjn @@ -100813,7 +100813,7 @@ uzV bmx dqH cMw -aVW +uNR doS lTj aZV @@ -103135,7 +103135,7 @@ btZ eNz hLO lJF -loD +uQP cBD hev ndT @@ -103377,7 +103377,7 @@ wWY wgP fyT lyC -gsG +wvB hUm aYV aYV @@ -104506,7 +104506,7 @@ cwq jyC qVw cwq -kbn +hoF qVw jyC cwq @@ -105939,7 +105939,7 @@ pet jUv deN aJC -wwq +iNP rvC vqa pLg @@ -106048,7 +106048,7 @@ cwq ilv qVw cwq -gad +ePs qVw ilv cwq @@ -106766,7 +106766,7 @@ vzw uFk kUD hjj -lAN +mLE lgX bNd kOf @@ -106964,7 +106964,7 @@ abI jJX hTn dZF -vpf +hsE jhX wpm gok @@ -107240,7 +107240,7 @@ aYV bok cQf anS -rEo +nfG lhV ecZ hAF @@ -107269,7 +107269,7 @@ wNc bNd ylV ogb -xnm +ibk sqF bSQ tsY @@ -107994,7 +107994,7 @@ aEY dZF kFe mEM -rVp +tAc ruD iWk bfX @@ -108497,7 +108497,7 @@ xtm arj arj cVb -jlh +lRm xmP cVb vrZ @@ -108771,7 +108771,7 @@ gcJ eAk kqk mEO -lBV +vbC eAk eAk eUF @@ -109011,9 +109011,9 @@ qCJ xWy pAd cVb -sEv +jJz jjA -lMV +uzG cVb xdh anf @@ -109022,7 +109022,7 @@ aIp fwV xEh ktH -gDA +nBa aCf jPb ffd @@ -109784,7 +109784,7 @@ nzX cVb kRe qyo -iQZ +ipU cVb inq nYO @@ -110050,7 +110050,7 @@ aIp piR tiU ilm -owA +wHb aCf fhl gyt @@ -110313,10 +110313,10 @@ pRp fNP ntV mNg -pqa +bue deD aAj -wWE +hmY aIp aYV mNB @@ -110350,7 +110350,7 @@ oTT hRc jSZ jiW -cAR +ama qoi cBd clf @@ -112610,7 +112610,7 @@ anf anf anf apE -aAv +emA aAs alP hWb @@ -113389,7 +113389,7 @@ aBF aFw gWQ aJJ -jyJ +tMt aMW aFw aFu @@ -113407,7 +113407,7 @@ aXq aYV bfV bfV -sRc +qxu biL cHP cHR @@ -113946,7 +113946,7 @@ bJN bMq bPD bMi -bPJ +mFd bJN bEm bEm @@ -114673,7 +114673,7 @@ fUO aFw pom tCH -daL +ogF nGk ruS aFw @@ -117006,7 +117006,7 @@ qcK bgc bhF xNj -nvZ +nwg dpp xRJ wRV @@ -117788,8 +117788,8 @@ dtC wPp eEA tYC -sYk -wlD +nXI +wOL kch fGF bEA diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index b9cf308678185..0078b4a5e3336 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -922,6 +922,26 @@ /obj/machinery/computer/med_data, /turf/open/floor/iron, /area/bridge) +"asj" = ( +/obj/machinery/light, +/obj/machinery/firealarm/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/table, +/obj/item/food/dough{ + pixel_x = 4 + }, +/obj/item/food/dough{ + pixel_x = 9; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -5; + pixel_y = 9 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "asv" = ( /turf/open/floor/iron/dark, /area/engine/atmos) @@ -1860,6 +1880,19 @@ }, /turf/open/floor/iron/dark/side, /area/hallway/primary/central) +"aKe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 28 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 23 + }, +/obj/item/paicard, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "aKf" = ( /obj/machinery/door/poddoor/incinerator_toxmix, /turf/open/floor/engine/vacuum, @@ -2081,6 +2114,17 @@ }, /turf/open/floor/iron, /area/security/brig) +"aOL" = ( +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 6; + pixel_y = 27 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron/dark, +/area/science/mixing) "aOT" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -3163,33 +3207,6 @@ /obj/structure/chair/wood/normal, /turf/open/floor/wood, /area/crew_quarters/dorms) -"boc" = ( -/obj/structure/sign/poster/official/walk{ - pixel_x = 32 - }, -/obj/structure/janitorialcart{ - dir = 1 - }, -/obj/item/mop{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 4; - pixel_y = -5 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/grid/steel, -/area/janitor) "bod" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -3312,25 +3329,6 @@ /obj/machinery/light, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) -"bqp" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/computer/med_data/laptop{ - density = 0; - dir = 1; - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - desc = "Kingston's personal cup."; - pixel_x = 16 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "bqq" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Access"; @@ -4707,23 +4705,6 @@ "cbm" = ( /turf/closed/mineral/random/air, /area/quartermaster/storage) -"cbu" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 25 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 21 - }, -/obj/effect/turf_decal/siding/wood, -/obj/item/food/spaghetti/beefnoodle{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/effect/turf_decal/siding/white, -/obj/structure/railing, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "cbI" = ( /obj/structure/railing, /turf/open/floor/iron/stairs/right{ @@ -4836,6 +4817,36 @@ }, /turf/open/floor/circuit/red, /area/ai_monitored/turret_protected/ai) +"cfg" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = 9; + pixel_y = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/clothing/glasses/science{ + pixel_x = -4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/science/lab) "cfp" = ( /obj/structure/railing/corner{ dir = 4 @@ -5033,6 +5044,36 @@ /obj/machinery/vending/boozeomat, /turf/closed/wall, /area/crew_quarters/kitchen) +"clV" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/wrench/medical{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "cmd" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -5965,6 +6006,23 @@ /obj/structure/ladder, /turf/open/floor/pod/dark, /area/maintenance/department/security/brig) +"cFc" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 4; + pixel_y = 9 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Chefwindow"; + name = "Chef Window" + }, +/obj/item/toy/figure/chef{ + pixel_x = -4; + pixel_y = -1 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "cFf" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating, @@ -6210,6 +6268,32 @@ }, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) +"cOJ" = ( +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/turretid{ + control_area = "/area/ai_monitored/turret_protected/ai"; + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = -1; + pixel_y = 29 + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "cPg" = ( /obj/structure/fence/corner{ dir = 1 @@ -6232,6 +6316,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) +"cPP" = ( +/obj/structure/table, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "cQe" = ( /obj/structure/stairs{ dir = 8 @@ -6644,15 +6736,6 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/security/brig) -"dbT" = ( -/obj/machinery/seed_extractor, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "dbV" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/planetary, @@ -6893,6 +6976,23 @@ }, /turf/open/floor/iron, /area/storage/primary) +"dhV" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 25 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 21 + }, +/obj/effect/turf_decal/siding/wood, +/obj/item/food/spaghetti/beefnoodle{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/turf_decal/siding/white, +/obj/structure/railing, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "dii" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8359,6 +8459,24 @@ }, /turf/open/openspace, /area/hallway/primary/fore) +"dUd" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/table, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -9; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "dUi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -9951,22 +10069,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"eNg" = ( -/obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/item/seeds/carrot/parsnip, -/obj/item/seeds/carrot/parsnip, -/obj/item/seeds/carrot/parsnip, -/obj/item/seeds/carrot/parsnip, -/obj/item/seeds/carrot/parsnip, -/obj/item/seeds/carrot/parsnip, -/obj/item/seeds/carrot/parsnip, -/obj/item/seeds/carrot/parsnip, -/turf/open/floor/wood, -/area/asteroid/paradise/surface) "eNn" = ( /obj/item/radio/intercom{ pixel_y = -34 @@ -10344,14 +10446,6 @@ "eVJ" = ( /turf/open/floor/iron/white, /area/science/robotics) -"eVT" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/medical/apothecary) "eWk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -11950,14 +12044,6 @@ /obj/structure/lattice, /turf/open/openspace, /area/engineering/hallway) -"fKS" = ( -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_x = -13; - pixel_y = -11 - }, -/obj/structure/chair/fancy/plastic, -/turf/open/floor/plating/beach/sand, -/area/asteroid/paradise/surface/sand) "fLl" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -12611,19 +12697,6 @@ "fZR" = ( /turf/closed/wall, /area/maintenance/department/chapel) -"fZX" = ( -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -8; - pixel_y = 2 - }, -/obj/structure/table/wood, -/obj/machinery/reagentgrinder{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "gaj" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -13356,6 +13429,19 @@ }, /turf/open/floor/plating, /area/security/brig) +"guf" = ( +/obj/structure/closet/secure_closet/hydroponics{ + req_access = null; + req_one_access_txt = "28;25;35" + }, +/obj/effect/turf_decal/bot, +/obj/structure/extinguisher_cabinet{ + pixel_y = -33 + }, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "gup" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -14635,24 +14721,6 @@ }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/cafeteria) -"haN" = ( -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 25 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 21 - }, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood, -/obj/item/plate{ - pixel_y = 3 - }, -/obj/item/food/donkpocket/pizza{ - pixel_x = -1; - pixel_y = 4 - }, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "hbs" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -15051,29 +15119,6 @@ /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, /area/science/lab) -"hoc" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -5; - pixel_y = 14 - }, -/obj/item/kitchen/rollingpin{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/knife/shiv/carrot{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/prison/dark, -/area/security/prison) "hos" = ( /obj/machinery/power/terminal{ dir = 8 @@ -15105,25 +15150,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/crew_quarters/heads/hop) -"hoH" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/restraints/handcuffs{ - pixel_x = -2; - pixel_y = -2 - }, -/turf/open/floor/iron, -/area/security/brig) "hoO" = ( /obj/structure/dresser, /obj/machinery/light_switch{ @@ -15170,36 +15196,6 @@ }, /turf/open/floor/circuit/telecomms/server, /area/science/server) -"hqd" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = 9; - pixel_y = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/item/clothing/glasses/science{ - pixel_x = -4 - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron, -/area/science/lab) "hqu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -15334,30 +15330,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"htj" = ( -/obj/item/book/granter/spell/smoke/lesser{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/holywater{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/soulstone/anybody/chaplain{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/table/wood, -/obj/structure/sign/painting/library{ - pixel_x = 33; - pixel_y = -1 - }, -/obj/item/organ/heart{ - pixel_x = -5; - pixel_y = -1 - }, -/turf/open/floor/wood, -/area/chapel/office) "htm" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -15563,6 +15535,33 @@ }, /turf/open/floor/iron, /area/security/brig) +"hyX" = ( +/obj/structure/sign/poster/official/walk{ + pixel_x = 32 + }, +/obj/structure/janitorialcart{ + dir = 1 + }, +/obj/item/mop{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 4; + pixel_y = -5 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/grid/steel, +/area/janitor) "hyZ" = ( /obj/structure/railing{ dir = 1 @@ -15708,24 +15707,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) -"hBA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ - pixel_x = 11; - pixel_y = 23 - }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) "hBY" = ( /obj/machinery/computer/rdconsole/production{ dir = 4 @@ -16106,6 +16087,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/engine/engineering) +"hNM" = ( +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/machinery/light{ + dir = 1; + light_color = "#7AC3FF" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -1; + pixel_y = 31 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "hNR" = ( /obj/machinery/door/airlock/command{ name = "Server Room"; @@ -16700,6 +16701,30 @@ /obj/machinery/camera/directional/north, /turf/open/floor/plating/asteroid/basalt/planetary, /area/quartermaster/storage) +"ieL" = ( +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/cultivator{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/shovel/spade{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "ifj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -16966,6 +16991,28 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"ikS" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -2; + pixel_y = 13 + }, +/obj/item/reagent_containers/cup/bowl, +/obj/item/clothing/head/utility/chefhat{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "ili" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -17888,21 +17935,6 @@ }, /turf/open/floor/carpet/orange, /area/quartermaster/qm) -"iMQ" = ( -/obj/effect/turf_decal/stripes/box, -/obj/machinery/mineral/ore_redemption{ - input_dir = 2 - }, -/obj/item/food/donkpocket/pizza{ - pixel_x = 10; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 4; - pixel_y = 12 - }, -/turf/open/floor/iron/dark, -/area/quartermaster/storage) "iNk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, @@ -18240,20 +18272,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"iYE" = ( -/obj/effect/turf_decal/bot, -/obj/item/reagent_containers/cup/bucket, -/obj/structure/closet/secure_closet/hydroponics{ - req_access = null; - req_one_access_txt = "28;25;35" - }, -/obj/machinery/light, -/obj/item/clothing/suit/toggle/chef, -/obj/structure/sign/painting/library{ - pixel_y = -32 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "iYV" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ dir = 5 @@ -18474,6 +18492,20 @@ }, /turf/open/floor/carpet/red, /area/medical/exam_room) +"jge" = ( +/obj/structure/chair/fancy/plastic{ + dir = 8 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -8; + pixel_y = 17 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -12; + pixel_y = 11 + }, +/turf/open/floor/plating/beach/sand, +/area/asteroid/paradise/surface) "jgs" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -18802,24 +18834,6 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"jpI" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/structure/table, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -9; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "jqb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -19280,6 +19294,21 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"jAb" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -8 + }, +/obj/machinery/door/poddoor/shutters{ + id = "commissaryshutters2"; + name = "Vacant Commissary Shutters #3" + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) "jAg" = ( /obj/item/flashlight/lantern{ pixel_x = -6; @@ -19797,36 +19826,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"jLG" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/wrench/medical{ - pixel_x = 5; - pixel_y = 6 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "jLI" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -22175,14 +22174,6 @@ /obj/effect/turf_decal/stripes/end, /turf/open/floor/noslip/white, /area/medical/medbay/central) -"kSY" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "kTG" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -22247,22 +22238,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/maintenance/department/science/central) -"kUF" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_x = -8; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_y = 3 - }, -/obj/effect/spawner/lootdrop/glowstick/lit, -/turf/open/floor/wood/broken, -/area/hallway/secondary/service) "kVv" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -22444,21 +22419,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/qm) -"lbc" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/airalarm/directional/north, -/obj/item/vending_refill/hydroseeds{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/storage/bag/plants, -/obj/item/kitchen/rollingpin, -/turf/open/floor/iron, -/area/hallway/secondary/service) "lbv" = ( /obj/effect/turf_decal/siding/blue{ dir = 1 @@ -23107,16 +23067,6 @@ }, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) -"lsE" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/biogenerator, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/prison/dark, -/area/security/prison) "lsH" = ( /obj/structure/table/reinforced, /obj/item/mmi{ @@ -23930,20 +23880,6 @@ }, /turf/open/floor/plating, /area/science/lab) -"lPY" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/item/storage/box/matches{ - pixel_x = -5; - pixel_y = 7 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/cafeteria) "lQd" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -24070,17 +24006,6 @@ /obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"lRO" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/bot, -/obj/machinery/door/window/eastright{ - dir = 8; - name = "Hydroponics Desk"; - req_one_access_txt = "28;25;35" - }, -/turf/open/floor/iron, -/area/hydroponics) "lSc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -24527,19 +24452,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/medical/morgue) -"mcN" = ( -/obj/effect/turf_decal/siding/wood/corner, -/obj/structure/closet/secure_closet/captains, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = 3; - pixel_y = 8 - }, -/obj/item/pinpointer/nuke{ - pixel_y = 5 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain/private) "mcO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/sepia, @@ -25130,6 +25042,19 @@ /obj/item/book/manual/wiki/sopengineering, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) +"mtL" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/closet/secure_closet/captains, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/pinpointer/nuke{ + pixel_y = 5 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain/private) "mtO" = ( /turf/open/floor/iron/white, /area/medical/apothecary) @@ -25597,6 +25522,25 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"mET" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/restraints/handcuffs{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/security/brig) "mFq" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -26431,6 +26375,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"naJ" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/storage/box/matches{ + pixel_x = -5; + pixel_y = 7 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/cafeteria) "naW" = ( /obj/effect/turf_decal/box/white, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -27581,26 +27539,6 @@ }, /turf/open/floor/iron/white, /area/science/lab) -"nGn" = ( -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/machinery/light{ - dir = 1; - light_color = "#7AC3FF" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -1; - pixel_y = 31 - }, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "nGu" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27979,26 +27917,23 @@ }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/central) -"nOu" = ( -/obj/machinery/light, -/obj/machinery/firealarm/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, +"nOV" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/table, -/obj/item/food/dough{ - pixel_x = 4 - }, -/obj/item/food/dough{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 9; - pixel_y = 2 + pixel_y = 6 }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = -5; - pixel_y = 9 +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 3 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/obj/item/pen{ + pixel_x = -4; + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "nPk" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -28148,6 +28083,16 @@ "nWb" = ( /turf/closed/wall/r_wall, /area/maintenance/department/cargo) +"nWm" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/biogenerator, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/prison/dark, +/area/security/prison) "nWu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -28389,6 +28334,19 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"ocY" = ( +/obj/effect/turf_decal/tile/dark_green{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/bar{ + req_access_txt = "25" + }, +/obj/item/vending_refill/cigarette, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/glass/shaker, +/turf/open/floor/iron, +/area/hallway/secondary/service) "odM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small{ @@ -30046,6 +30004,21 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) +"oPI" = ( +/obj/effect/turf_decal/stripes/box, +/obj/machinery/mineral/ore_redemption{ + input_dir = 2 + }, +/obj/item/food/donkpocket/pizza{ + pixel_x = 10; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 4; + pixel_y = 12 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/storage) "oPR" = ( /obj/effect/turf_decal/siding/blue{ alpha = 100; @@ -30589,6 +30562,30 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/crew_quarters/heads/hop) +"pbv" = ( +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/light_switch{ + pixel_x = 6; + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "pbw" = ( /obj/machinery/door/airlock{ name = "Hydroponics"; @@ -31398,6 +31395,22 @@ dir = 4 }, /area/hallway/primary/fore) +"pzM" = ( +/obj/effect/turf_decal/siding/wood, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/item/seeds/carrot/parsnip, +/obj/item/seeds/carrot/parsnip, +/obj/item/seeds/carrot/parsnip, +/obj/item/seeds/carrot/parsnip, +/obj/item/seeds/carrot/parsnip, +/obj/item/seeds/carrot/parsnip, +/obj/item/seeds/carrot/parsnip, +/obj/item/seeds/carrot/parsnip, +/turf/open/floor/wood, +/area/asteroid/paradise/surface) "pzQ" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, @@ -32435,17 +32448,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) -"pXT" = ( -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 6; - pixel_y = 27 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/dark, -/area/science/mixing) "pYd" = ( /turf/open/floor/wood/broken, /area/hallway/secondary/service) @@ -32528,30 +32530,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) -"qbo" = ( -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/light_switch{ - pixel_x = 6; - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera/directional/south, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "qbw" = ( /obj/structure/lattice/catwalk/over, /obj/item/wirecutters{ @@ -32737,6 +32715,24 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"qgR" = ( +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 25 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 21 + }, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood, +/obj/item/plate{ + pixel_y = 3 + }, +/obj/item/food/donkpocket/pizza{ + pixel_x = -1; + pixel_y = 4 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "qgW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -32837,21 +32833,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/medical/surgery) -"qiO" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_x = -8; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 6; - pixel_y = 3 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "qji" = ( /obj/machinery/portable_thermomachine, /obj/effect/turf_decal/bot{ @@ -33668,23 +33649,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science/central) -"qMj" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = -4; - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) "qMw" = ( /obj/machinery/shuttle/engine/plasma{ dir = 1 @@ -33869,6 +33833,20 @@ /obj/machinery/telecomms/server/presets/command, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) +"qSy" = ( +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/bucket, +/obj/structure/closet/secure_closet/hydroponics{ + req_access = null; + req_one_access_txt = "28;25;35" + }, +/obj/machinery/light, +/obj/item/clothing/suit/toggle/chef, +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "qSC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ @@ -33945,6 +33923,16 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) +"qTZ" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/under/suit/tan, +/obj/item/reagent_containers/cup/glass/bottle/champagne{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "qUa" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -34518,6 +34506,14 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) +"rgd" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/medical/apothecary) "rgj" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -34855,16 +34851,6 @@ /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"rnq" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/under/suit/tan, -/obj/item/reagent_containers/cup/glass/bottle/champagne{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/purple, -/area/crew_quarters/dorms) "rnv" = ( /obj/structure/railing{ dir = 10 @@ -35089,6 +35075,29 @@ /obj/item/stack/sheet/mineral/plasma/ten, /turf/open/floor/plating, /area/engine/engineering) +"rsk" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 5; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ + pixel_x = -7; + pixel_y = 17 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) "rsH" = ( /obj/effect/turf_decal/numbers{ dir = 1 @@ -35240,20 +35249,6 @@ "rxi" = ( /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) -"rxA" = ( -/obj/structure/table, -/obj/item/shovel/spade, -/obj/item/reagent_containers/cup/bottle/nutrient/rh{ - pixel_x = 5 - }, -/obj/item/reagent_containers/cup/bottle/nutrient/ez{ - pixel_x = -5 - }, -/obj/item/reagent_containers/syringe, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "rxQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -35972,6 +35967,17 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"rRi" = ( +/obj/machinery/biogenerator, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/bot, +/obj/machinery/door/window/eastright{ + dir = 8; + name = "Hydroponics Desk"; + req_one_access_txt = "28;25;35" + }, +/turf/open/floor/iron, +/area/hydroponics) "rRm" = ( /obj/effect/turf_decal/box/white, /obj/machinery/atmospherics/pipe/heat_exchanging/junction, @@ -36013,19 +36019,6 @@ "rSr" = ( /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) -"rSE" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = null; - req_one_access_txt = "28;25;35" - }, -/obj/effect/turf_decal/bot, -/obj/structure/extinguisher_cabinet{ - pixel_y = -33 - }, -/obj/item/book/manual/hydroponics_pod_people, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "rSK" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -36450,29 +36443,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"sdw" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/airalarm/directional/east, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 5; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 9; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ - pixel_x = -7; - pixel_y = 17 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/security/nuke_storage) "sdD" = ( /turf/closed/wall/r_wall/rust, /area/science/test_area) @@ -37855,6 +37825,15 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"sRn" = ( +/obj/machinery/seed_extractor, +/obj/machinery/status_display/evac{ + pixel_y = -32 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "sRD" = ( /turf/closed/wall/r_wall, /area/security/prison) @@ -38089,6 +38068,25 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"sXp" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/computer/med_data/laptop{ + density = 0; + dir = 1; + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + desc = "Kingston's personal cup."; + pixel_x = 16 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "sXB" = ( /turf/closed/wall/r_wall, /area/engine/engineering) @@ -38388,6 +38386,22 @@ }, /turf/open/floor/glass/reinforced, /area/medical/medbay/central) +"tew" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_y = 3 + }, +/obj/effect/spawner/lootdrop/glowstick/lit, +/turf/open/floor/wood/broken, +/area/hallway/secondary/service) "teA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -38410,28 +38424,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"teS" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -2; - pixel_y = 13 - }, -/obj/item/reagent_containers/cup/bowl, -/obj/item/clothing/head/utility/chefhat{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/turf/open/floor/prison/dark, -/area/security/prison) "teU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/beacon{ @@ -39825,21 +39817,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"tJw" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -8 - }, -/obj/machinery/door/poddoor/shutters{ - id = "commissaryshutters2"; - name = "Vacant Commissary Shutters #3" - }, -/turf/open/floor/plating, -/area/maintenance/department/crew_quarters/dorms) "tJH" = ( /obj/structure/railing{ dir = 8 @@ -40768,6 +40745,20 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron, /area/hallway/primary/fore) +"uht" = ( +/obj/structure/table, +/obj/item/shovel/spade, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ + pixel_x = 5 + }, +/obj/item/reagent_containers/cup/bottle/nutrient/ez{ + pixel_x = -5 + }, +/obj/item/reagent_containers/syringe, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "uhy" = ( /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, @@ -41011,6 +41002,30 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"uoP" = ( +/obj/item/book/granter/spell/smoke/lesser{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/soulstone/anybody/chaplain{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/table/wood, +/obj/structure/sign/painting/library{ + pixel_x = 33; + pixel_y = -1 + }, +/obj/item/organ/heart{ + pixel_x = -5; + pixel_y = -1 + }, +/turf/open/floor/wood, +/area/chapel/office) "upy" = ( /obj/machinery/door/airlock/engineering{ name = "Telecomms Storage"; @@ -41280,32 +41295,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/chapel) -"uwJ" = ( -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/turretid{ - control_area = "/area/ai_monitored/turret_protected/ai"; - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = -1; - pixel_y = 29 - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "uwN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -41674,19 +41663,6 @@ /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, /area/asteroid/paradise/surface/grass) -"uIx" = ( -/obj/effect/turf_decal/tile/dark_green{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, -/obj/item/vending_refill/cigarette, -/obj/effect/turf_decal/bot, -/obj/item/reagent_containers/cup/glass/shaker, -/turf/open/floor/iron, -/area/hallway/secondary/service) "uIG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -41926,23 +41902,6 @@ "uNa" = ( /turf/closed/wall/mineral/titanium/survival, /area/hallway/primary/fore) -"uNj" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 4; - pixel_y = 9 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Chefwindow"; - name = "Chef Window" - }, -/obj/item/toy/figure/chef{ - pixel_x = -4; - pixel_y = -1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "uNB" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -42545,6 +42504,14 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/storage/tech) +"uYX" = ( +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = -13; + pixel_y = -11 + }, +/obj/structure/chair/fancy/plastic, +/turf/open/floor/plating/beach/sand, +/area/asteroid/paradise/surface/sand) "uZh" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -43242,20 +43209,6 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"vpZ" = ( -/obj/structure/chair/fancy/plastic{ - dir = 8 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -8; - pixel_y = 17 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -12; - pixel_y = 11 - }, -/turf/open/floor/plating/beach/sand, -/area/asteroid/paradise/surface) "vqp" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -44167,6 +44120,21 @@ }, /turf/open/floor/iron, /area/security/prison) +"vUq" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -8; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 6; + pixel_y = 3 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "vVo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -45002,6 +44970,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"wrd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ + pixel_x = 11; + pixel_y = 23 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "wru" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, @@ -45463,30 +45449,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/hallway/secondary/service) -"wEb" = ( -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/cultivator{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/shovel/spade{ - pixel_x = -5; - pixel_y = -4 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/prison/dark, -/area/security/prison) "wEn" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -45600,6 +45562,21 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"wHa" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/obj/item/vending_refill/hydroseeds{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/storage/bag/plants, +/obj/item/kitchen/rollingpin, +/turf/open/floor/iron, +/area/hallway/secondary/service) "wHe" = ( /obj/structure/window/reinforced{ dir = 1 @@ -46156,19 +46133,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) -"wVz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 28 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 23 - }, -/obj/item/paicard, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "wVF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -47076,6 +47040,29 @@ }, /turf/open/floor/iron/grid/steel, /area/hydroponics) +"xrm" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -5; + pixel_y = 14 + }, +/obj/item/kitchen/rollingpin{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/knife/shiv/carrot{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "xrC" = ( /obj/effect/turf_decal/numbers/two_nine{ dir = 1 @@ -48873,6 +48860,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/warden) +"yjS" = ( +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -8; + pixel_y = 2 + }, +/obj/structure/table/wood, +/obj/machinery/reagentgrinder{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "yjV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58838,9 +58838,9 @@ eXB pDi eXB uVy -lbc +wHa nDA -uIx +ocY pll uVy jQL @@ -59101,7 +59101,7 @@ rYY wDW vnV pYd -kUF +tew azS iaR jrB @@ -59893,7 +59893,7 @@ dSI sWT hlL ezA -iMQ +oPI vHe alg kIo @@ -61449,7 +61449,7 @@ pjs eJz kDx pIl -sdw +rsk roc eJz gHW @@ -62457,14 +62457,14 @@ xGl tEI wht qbW -rnq +qTZ lQi wvu fMX nor fVr rFV -qMj +nOV ooy ueV iMI @@ -65778,7 +65778,7 @@ vqI eXB hmA kWH -tJw +jAb rPT oxK oxK @@ -120785,7 +120785,7 @@ egS luF luF luF -rxA +uht kQw vqI vqI @@ -121042,7 +121042,7 @@ vhX pXA luF luF -dbT +sRn kQw vqI vqI @@ -122070,7 +122070,7 @@ kxR pXA luF luF -kSY +cPP kQw kQw kQw @@ -123886,7 +123886,7 @@ vIE xYT bIO bgS -wEb +ieL uNJ tHj gdk @@ -125670,7 +125670,7 @@ dFu jzm wAN aKH -iYE +qSy bDD drs ttY @@ -125684,9 +125684,9 @@ wjR axZ ubl xYT -teS -hoc -lsE +ikS +xrm +nWm tPg aCN amC @@ -125927,13 +125927,13 @@ iEf rpH rGq wMY -rSE +guf bDD fWF ttY pGC sAD -jLG +clV xPe fMk cxj @@ -126177,7 +126177,7 @@ suO afw fFZ rnU -jpI +dUd rys rwn bDD @@ -126453,7 +126453,7 @@ fcl uTR xIr mFB -eVT +rgd dqV dHs sLu @@ -126947,10 +126947,10 @@ lxo afw mxy xdb -qiO +vUq llQ umB -nOu +asj bDD ejD tuz @@ -127218,7 +127218,7 @@ liG ttY uQc dFk -bqp +sXp tSb ncK uIU @@ -127462,7 +127462,7 @@ afw laf gcq uGp -uNj +cFc ohu acw bDD @@ -127723,7 +127723,7 @@ haF kAa giU bDD -lRO +rRi oHV voT bDD @@ -128488,7 +128488,7 @@ vdv gMh hhu kcD -wVz +aKe fsb jeo oLK @@ -128748,7 +128748,7 @@ tkv oFn fsb lnp -lPY +naJ tov iXB qJS @@ -129265,7 +129265,7 @@ xTb mzC wzi qgB -cbu +dhV gyy gyy gyy @@ -130029,8 +130029,8 @@ vWg lrk mJg tYd -nGn -haN +hNM +qgR tYu bkx pKl @@ -130539,7 +130539,7 @@ vqI tYd mJs lQZ -boc +hyX xuC ryA tYd @@ -130836,7 +130836,7 @@ saH oLi cDz ajB -fZX +yjS xsj wJA inZ @@ -132101,7 +132101,7 @@ tmO pCQ tmO tmO -hqd +cfg uyf qsr geJ @@ -132119,7 +132119,7 @@ nwu kfl bBz rpu -hBA +wrd mFI nzZ liQ @@ -132640,7 +132640,7 @@ bga mSE dwk eUm -mcN +mtL gSc mSE cwz @@ -132866,7 +132866,7 @@ rHO eWv eKX czE -htj +uoP qYu tmO iTz @@ -136736,7 +136736,7 @@ vqI vqI aqu kIt -pXT +aOL nIr aqu piQ @@ -190713,7 +190713,7 @@ pub vsU aiK vqE -hoH +mET jXs fbe dNl @@ -194544,7 +194544,7 @@ fdh hbs aEi aEi -uwJ +cOJ aEi ceR gMP @@ -195058,7 +195058,7 @@ fdh fdh aEi aEi -qbo +pbv aEi aYp fHo @@ -253390,7 +253390,7 @@ lAN wdQ nEX lAN -eNg +pzM xxa nKl yli @@ -259401,7 +259401,7 @@ uDA uDA uDA uDA -fKS +uYX erN mZd bMS @@ -267571,7 +267571,7 @@ kiZ qbN lyK dxH -vpZ +jge uDA uDA wQy diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index d837c4acca285..9bb8b9ec73da5 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -83,6 +83,32 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"abi" = ( +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/wrench/medical, +/obj/item/storage/pill_bottle/mannitol, +/obj/structure/table/glass, +/turf/open/floor/iron/dark, +/area/medical/cryo) "abm" = ( /turf/closed/wall, /area/construction) @@ -1794,26 +1820,6 @@ }, /turf/open/floor/iron/dark/side, /area/hallway/secondary/exit/departure_lounge) -"ayM" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/glass/flask/det{ - pixel_x = 4; - pixel_y = -1 - }, -/obj/item/storage/secure/safe{ - pixel_x = 6; - pixel_y = 29 - }, -/obj/item/clothing/glasses/hud/security/sunglasses{ - pixel_x = 4; - pixel_y = 1 - }, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "aze" = ( /obj/machinery/camera/directional/south{ c_tag = "Medbay - Cloning Lab"; @@ -2445,88 +2451,6 @@ }, /turf/open/floor/iron, /area/security/main) -"aGl" = ( -/obj/structure/closet/crate/medical, -/obj/item/reagent_containers/cup/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/aluminium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sulfur{ - pixel_x = -6 - }, -/obj/item/circuitboard/machine/chem_heater, -/turf/open/floor/iron/techmaint, -/area/medical/virology) "aGq" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -3119,29 +3043,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/quartermaster/sorting) -"aLS" = ( -/obj/machinery/newscaster{ - pixel_x = -28; - pixel_y = 1 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/obj/item/reagent_containers/dropper, -/obj/item/radio/headset/headset_med, -/obj/item/flashlight/pen{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/genetics) "aLT" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room"; @@ -4865,19 +4766,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"bgd" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -11 - }, -/obj/structure/mopbucket, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/turf/open/floor/iron/dark, -/area/security/main) "bgk" = ( /obj/machinery/gulag_teleporter, /obj/effect/turf_decal/bot, @@ -4980,6 +4868,22 @@ }, /turf/open/floor/iron/techmaint, /area/quartermaster/qm) +"bhK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table/reinforced, +/obj/item/food/popcorn, +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/machinery/airalarm/directional/west{ + pixel_x = -22 + }, +/obj/structure/railing, +/turf/open/floor/iron/techmaint, +/area/science/misc_lab) "bhR" = ( /obj/machinery/light{ dir = 1 @@ -5151,6 +5055,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/genetics) +"bkf" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/pen, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "bkl" = ( /obj/structure/railing, /turf/open/floor/plating, @@ -5597,6 +5515,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main) +"bqg" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/central/secondary) "bqi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7451,6 +7375,26 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/hydroponics) +"bSN" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/glass/flask/det{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/storage/secure/safe{ + pixel_x = 6; + pixel_y = 29 + }, +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = 4; + pixel_y = 1 + }, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "bSS" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -8370,12 +8314,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"cgB" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/glass/bottle/whiskey, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port/fore) "cgG" = ( /obj/machinery/nuclearbomb/beer, /obj/structure/window/reinforced{ @@ -10314,28 +10252,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) -"cIH" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/holywater{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -3; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/carpet, -/area/chapel/office) "cIO" = ( /obj/structure/table/wood, /obj/item/folder, @@ -11165,32 +11081,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) -"cSw" = ( -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/wrench/medical, -/obj/item/storage/pill_bottle/mannitol, -/obj/structure/table/glass, -/turf/open/floor/iron/dark, -/area/medical/cryo) "cSz" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -11522,6 +11412,16 @@ dir = 5 }, /area/quartermaster/warehouse) +"cVU" = ( +/obj/structure/table, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/bucket, +/obj/item/seeds/wheat, +/obj/item/seeds/wheat, +/obj/item/seeds/wheat, +/turf/open/floor/grass, +/area/hydroponics/garden) "cWa" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -11769,31 +11669,6 @@ }, /turf/open/floor/iron/dark, /area/gateway) -"dam" = ( -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "dap" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 @@ -12959,12 +12834,6 @@ dir = 1 }, /area/quartermaster/sorting) -"dqI" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/glass/bottle/whiskey, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/aft) "dqS" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 8 @@ -13153,6 +13022,23 @@ dir = 1 }, /area/hallway/secondary/exit/departure_lounge) +"dsX" = ( +/obj/structure/rack, +/obj/item/book/manual/wiki/robotics_cyborgs{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/storage/belt/utility, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/delivery, +/obj/machinery/requests_console{ + department = "Robotics Lab"; + name = "Robotics RC"; + pixel_y = 30; + receive_ore_updates = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/science/robotics/lab) "dtE" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -13619,24 +13505,6 @@ /obj/structure/sign/departments/minsky/engineering/engineering, /turf/closed/wall/r_wall, /area/maintenance/solars/port) -"dBq" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker, -/obj/item/reagent_containers/dropper, -/obj/machinery/camera/directional/north{ - c_tag = "Xenobiology - Research Area"; - name = "xenobiology camera" - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "dBt" = ( /mob/living/simple_animal/cow{ desc = "Allegedly a bull."; @@ -14525,19 +14393,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) -"dMN" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/dest_tagger, -/obj/machinery/computer/security/telescreen/rd{ - pixel_y = 30 - }, -/turf/open/floor/iron/dark, -/area/bridge) "dMR" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow{ @@ -14747,6 +14602,30 @@ }, /turf/open/floor/iron/techmaint, /area/security/execution/education) +"dOQ" = ( +/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/door/window{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Secure Creature Pen Shield Holder"; + atom_integrity = 300; + req_one_access_txt = "55" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/sign/warning/electricshock{ + pixel_x = -32 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating, +/area/science/xenobiology) "dOV" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 5 @@ -16017,6 +15896,21 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) +"ejc" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/table, +/obj/item/toy/batong{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "eje" = ( /obj/machinery/door/window/eastright{ dir = 1; @@ -16320,36 +16214,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) -"emH" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/patron{ - pixel_x = -5; - pixel_y = 16 - }, -/obj/item/reagent_containers/cup/glass/bottle/grappa{ - pixel_x = 10; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/bottle/absinthe{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/kahlua{ - pixel_x = 9; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_y = 24 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "emV" = ( /obj/machinery/light{ dir = 1 @@ -17060,15 +16924,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/crew_quarters/heads/chief) -"exT" = ( -/obj/item/reagent_containers/cup/glass/bottle/wine, -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/cup/glass/trophy{ - pixel_x = 9; - pixel_y = 8 - }, -/turf/open/floor/carpet/grimy, -/area/chapel/main) "eya" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -17461,14 +17316,6 @@ /obj/effect/landmark/start/randommaint/psychiatrist, /turf/open/floor/wood, /area/medical/exam_room) -"eDM" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "eDN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -18568,12 +18415,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"ePp" = ( -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..." - }, -/turf/open/floor/cult, -/area/chapel/office) "ePI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -19280,40 +19121,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"eWR" = ( -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/machinery/firealarm/directional/west, -/obj/machinery/vending/wallmed{ - contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); - name = "Upgraded NanoMed"; - pixel_x = -1; - pixel_y = -32; - premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "eWS" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -20166,14 +19973,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"fiV" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/structure/table, -/obj/item/food/dough, -/obj/item/reagent_containers/cup/bowl, -/obj/item/food/grown/tomato, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "fiW" = ( /obj/effect/turf_decal/stripes/end, /obj/effect/turf_decal/stripes/red/end, @@ -20410,6 +20209,15 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/engine/atmos) +"fmn" = ( +/obj/machinery/biogenerator, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/techmaint, +/area/security/prison) "fmo" = ( /obj/structure/rack, /obj/structure/window/reinforced{ @@ -20648,6 +20456,32 @@ }, /turf/open/floor/iron/grid/steel, /area/science/explab) +"fpa" = ( +/obj/structure/table/wood, +/obj/item/paper/fluff{ + default_raw_text = "

      Subject: Deepest apologies!

      ___

      Dear Sir or Madam,

      We extend our deepest apologies for any inconvenience caused by the current location of your office. Your feedback is invaluable, and we are committed to addressing your concerns promptly.

      In response to your request for a more suitable workplace, we are actively working on relocating your office to a more convenient setting. The necessary arrangements will be implemented during the upcoming shift.

      Thank you for your understanding and continued support.

      Best regards,

      -NT Official

      "; + name = "Deepest apoligies"; + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/paper/fluff{ + default_raw_text = "

      Subject: Deepest apologies!

      ___

      Dear Sir or Madam,

      We acknowledge receipt of your recent emails emphasizing the urgency of expediting the transfer process. Regrettably, we must address the matter with utmost consideration, given the choice words employed in your communications.

      Apon careful review, we have revisited the proposal to relocate your office to the security department. However, owing to the recent renovation in the security facilities; you will find the northern access point is now in closer proximity to your current office location. Consequently, the feasibility of relocating your office based on financial considerations has been reassessed, and it is not deemed necessary at this time.

      We appreciate your understanding and cooperation in this matter. If you have any further inquiries or would like to discuss alternative solutions, please feel free to reach out to your onboard representative.

      Thank you for your continued cooperation.

      Best regards,

      -NT Official

      "; + name = "re:Deepest apoligies"; + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/paper/fluff{ + default_raw_text = "

      Subject: re:re:Deepest apologies!

      ___

      Dear Sir or madam,

      We sincerely apologize for the delay in our response and appreciate your loyal, dedicated work during these times.

      In our commitment to improving working conditions, we have successfully moved your office closer to the western access point. However, we regret to inform you that due to the financial burden of this relocation, a deduction of 5,000 credits will be made indefinably from your future pay cheques to cover the renovation expenses. Please enjoy the complementary high quality whisky for your continued effort

      We value your understanding and cooperation throughout this transition. If you have any further concerns or inquiries, please feel free to contact your onboard representative.

      Best regards,

      -NT official"; + name = "re:re:Deepest apoligies"; + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "fpe" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -21019,18 +20853,6 @@ burnt = 1 }, /area/crew_quarters/locker) -"ftA" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -1; - pixel_y = 9 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/turf/open/floor/iron, -/area/construction) "ftG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22240,6 +22062,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/lab) +"fIp" = ( +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..." + }, +/turf/open/floor/cult, +/area/chapel/office) "fIq" = ( /obj/structure/railing{ dir = 1 @@ -22454,6 +22282,35 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/quartermaster/storage) +"fLf" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/apothecary) "fLr" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, @@ -23172,38 +23029,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) -"fTU" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 28 - }, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_y = 24 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_y = -28 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 8; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "fTX" = ( /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -23570,6 +23395,29 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) +"fYC" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/syringe, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/turf/open/floor/iron/dark, +/area/medical/medbay/lobby) "fYR" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -23752,6 +23600,15 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"gbd" = ( +/obj/item/reagent_containers/cup/glass/bottle/wine, +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_x = 9; + pixel_y = 8 + }, +/turf/open/floor/carpet/grimy, +/area/chapel/main) "gbx" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ @@ -24032,30 +23889,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_smes) -"geN" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Secure Creature Pen Shield Holder"; - obj_integrity = 300; - req_one_access_txt = "55" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating, -/area/science/xenobiology) "gfc" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/chair/fancy/comfy{ @@ -24434,6 +24267,28 @@ dir = 4 }, /area/quartermaster/office) +"gjN" = ( +/obj/structure/table, +/obj/item/kitchen/fork, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/effect/spawner/lootdrop/three_course_meal, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/cafeteria) "gkd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -24730,22 +24585,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"gnN" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 1; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "aicoredoor"; - name = "AI Core Shutter" - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "gnX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -25560,28 +25399,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/library/lounge) -"gzm" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 4; - icon_state = "leftsecure"; - name = "Secure Creature Pen Shield Holder"; - obj_integrity = 300; - req_access_txt = "55" - }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 - }, -/obj/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating, -/area/science/xenobiology) "gzo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -25877,16 +25694,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/central) -"gCw" = ( -/obj/structure/table, -/obj/item/storage/bag/plants/portaseeder, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/cup/bucket, -/obj/item/seeds/wheat, -/obj/item/seeds/wheat, -/obj/item/seeds/wheat, -/turf/open/floor/grass, -/area/hydroponics/garden) "gCA" = ( /obj/item/food/canned/beans{ pixel_x = -5; @@ -26221,6 +26028,17 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"gHI" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/glass/mug/cocoa{ + pixel_x = 6 + }, +/turf/open/floor/iron/sepia, +/area/engine/break_room) "gHS" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/table, @@ -26380,19 +26198,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"gJI" = ( -/obj/item/reagent_containers/cup/bucket, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "gJJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -26531,6 +26336,29 @@ }, /turf/open/floor/iron/dark/side, /area/engine/atmos) +"gLr" = ( +/obj/item/food/canned/peaches{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/food/canned/peaches{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/food/canned/beans{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/waterbottle{ + pixel_x = -8; + pixel_y = -5 + }, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/turf/open/floor/iron/techmaint, +/area/security/prison/shielded) "gLs" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27146,6 +26974,31 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"gSV" = ( +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "gSY" = ( /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/turf_decal/stripes/closeup, @@ -27712,6 +27565,12 @@ /obj/item/food/chips, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"haU" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/oven, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "hbb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27852,40 +27711,6 @@ "hds" = ( /turf/closed/wall/rust, /area/maintenance/port) -"hdx" = ( -/obj/structure/closet/crate{ - name = "food crate" - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = -2 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 5 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 8; - pixel_y = -3 - }, -/obj/machinery/status_display/ai{ - pixel_x = -32 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/turf/open/floor/engine, -/area/security/nuke_storage) "hdy" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/circuit/green{ @@ -28138,21 +27963,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"hih" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "aicoredoor"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window{ - base_state = "rightsecure"; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "hij" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -28775,32 +28585,6 @@ /obj/item/dice/d1, /turf/open/floor/iron/dark, /area/library/lounge) -"hqs" = ( -/obj/structure/table/wood, -/obj/item/paper/fluff{ - default_raw_text = "

      Subject: Deepest apologies!

      ___

      Dear Sir or Madam,

      We extend our deepest apologies for any inconvenience caused by the current location of your office. Your feedback is invaluable, and we are committed to addressing your concerns promptly.

      In response to your request for a more suitable workplace, we are actively working on relocating your office to a more convenient setting. The necessary arrangements will be implemented during the upcoming shift.

      Thank you for your understanding and continued support.

      Best regards,

      -NT Official

      "; - name = "Deepest apoligies"; - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/paper/fluff{ - default_raw_text = "

      Subject: Deepest apologies!

      ___

      Dear Sir or Madam,

      We acknowledge receipt of your recent emails emphasizing the urgency of expediting the transfer process. Regrettably, we must address the matter with utmost consideration, given the choice words employed in your communications.

      Apon careful review, we have revisited the proposal to relocate your office to the security department. However, owing to the recent renovation in the security facilities; you will find the northern access point is now in closer proximity to your current office location. Consequently, the feasibility of relocating your office based on financial considerations has been reassessed, and it is not deemed necessary at this time.

      We appreciate your understanding and cooperation in this matter. If you have any further inquiries or would like to discuss alternative solutions, please feel free to reach out to your onboard representative.

      Thank you for your continued cooperation.

      Best regards,

      -NT Official

      "; - name = "re:Deepest apoligies"; - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/paper/fluff{ - default_raw_text = "

      Subject: re:re:Deepest apologies!

      ___

      Dear Sir or madam,

      We sincerely apologize for the delay in our response and appreciate your loyal, dedicated work during these times.

      In our commitment to improving working conditions, we have successfully moved your office closer to the western access point. However, we regret to inform you that due to the financial burden of this relocation, a deduction of 5,000 credits will be made indefinably from your future pay cheques to cover the renovation expenses. Please enjoy the complementary high quality whisky for your continued effort

      We value your understanding and cooperation throughout this transition. If you have any further concerns or inquiries, please feel free to contact your onboard representative.

      Best regards,

      -NT official"; - name = "re:re:Deepest apoligies"; - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "hqF" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -29006,23 +28790,36 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/maintenance/department/science) -"hus" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/machinery/computer/security/telescreen/minisat{ - dir = 1; - pixel_y = -29 +"hux" = ( +/obj/structure/table/reinforced, +/obj/item/seeds/soya, +/obj/item/seeds/cabbage, +/obj/item/seeds/corn, +/obj/item/seeds/onion, +/obj/item/seeds/potato, +/obj/item/seeds/wheat, +/obj/item/seeds/carrot, +/obj/item/storage/bag/plants/portaseeder{ + pixel_x = 1; + pixel_y = 3 }, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ - pixel_x = 3 +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 8; + pixel_y = -1 }, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/clothing/mask/cigarette/cigar/havana{ - pixel_x = -3 +/obj/item/cultivator{ + pixel_x = 1; + pixel_y = -1 }, -/obj/machinery/light/small, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) +/obj/item/shovel/spade{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "huM" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -29623,6 +29420,29 @@ }, /turf/open/floor/iron, /area/security/checkpoint/escape) +"hDD" = ( +/obj/structure/table, +/obj/item/food/mint{ + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 2 + }, +/obj/structure/noticeboard{ + dir = 8; + pixel_x = 26 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/obj/machinery/newscaster{ + pixel_y = -28 + }, +/turf/open/floor/iron/cafeteria, +/area/vacant_room/commissary/commissaryFood) "hDG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -30104,29 +29924,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/bridge) -"hKB" = ( -/obj/item/food/canned/peaches{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/food/canned/peaches{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/food/canned/beans{ - pixel_x = 4; - pixel_y = -1 - }, -/obj/item/reagent_containers/cup/waterbottle{ - pixel_x = -8; - pixel_y = -5 - }, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/turf/open/floor/iron/techmaint, -/area/security/prison/shielded) "hKD" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall, @@ -31197,16 +30994,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"hYl" = ( -/obj/structure/table/wood, -/obj/item/razor{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/reagent_containers/cup/glass/flask/gold, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) "hYU" = ( /obj/structure/table/wood/fancy, /obj/item/flashlight/lantern, @@ -31418,19 +31205,6 @@ broken = 1 }, /area/maintenance/central) -"ial" = ( -/obj/machinery/newscaster{ - pixel_y = 31 - }, -/obj/structure/janitorialcart, -/obj/item/reagent_containers/cup/bucket, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/item/mop, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/janitor) "ian" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31845,17 +31619,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"ifl" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "Animal Pen" - }, -/obj/item/cultivator, -/obj/item/reagent_containers/cup/bucket, -/obj/item/seeds/tower, -/turf/open/floor/plating, -/area/hydroponics/garden) "ifn" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/vending/hydronutrients, @@ -32063,41 +31826,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"iiZ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/dropper, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "chemisttop"; - name = "Chemistry Shutter Control"; - pixel_x = 7; - pixel_y = -24; - req_access_txt = "33" - }, -/obj/machinery/button/door{ - id = "chemistbot"; - name = "Chemistry Shutter Control"; - pixel_x = -6; - pixel_y = -24; - req_access_txt = "33" - }, -/obj/item/storage/pill_bottle, -/obj/item/reagent_containers/medspray{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/apothecary) "ijh" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -32139,38 +31867,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hydroponics) -"iki" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_y = 24 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_y = -28 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 28 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 8; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "ikr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -32694,20 +32390,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"irn" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/mortar, -/obj/item/pestle, -/obj/item/clothing/glasses/hud/health{ - pixel_x = 4; - pixel_y = -1 - }, -/turf/open/floor/iron/grid, -/area/medical/virology) "irr" = ( /obj/machinery/camera/directional/south{ c_tag = "Atmospherics - Plasma Cell" @@ -33614,6 +33296,15 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/security/prison) +"iBZ" = ( +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/machinery/light, +/obj/machinery/reagentgrinder, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "iCg" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -33752,12 +33443,6 @@ /obj/effect/turf_decal/siding/wideplating_new/dark, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"iDU" = ( -/obj/structure/table/wood, -/obj/item/storage/lockbox/medal, -/obj/item/reagent_containers/cup/glass/shaker, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/captain) "iDW" = ( /obj/machinery/light{ dir = 8 @@ -34851,27 +34536,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) -"iRk" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 10; - pixel_y = 9 - }, -/obj/item/food/donut/berry{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/genpop_interface{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/security/prison) "iRo" = ( /obj/structure/sign/warning/docking, /turf/closed/wall/r_wall, @@ -35304,6 +34968,15 @@ }, /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) +"iXG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/obj/structure/railing, +/turf/open/floor/iron/techmaint, +/area/science/misc_lab) "iYf" = ( /obj/structure/cable{ icon_state = "0-2" @@ -36550,6 +36223,22 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) +"jpj" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 1; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "aicoredoor"; + name = "AI Core Shutter" + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "jpl" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -36755,27 +36444,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) -"jsw" = ( -/obj/structure/bonfire, -/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ - desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; - name = "Carton of Estus" - }, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/item/melee/baseball_bat{ - desc = "Don't tell anyone you put any points into dex, though."; - icon_state = "swordon"; - item_state = "swordon"; - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'; - name = "moonlight greatsword"; - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - }, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/port) "jsN" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -36824,23 +36492,6 @@ }, /turf/open/floor/iron/techmaint, /area/crew_quarters/fitness/recreation) -"jti" = ( -/obj/structure/rack, -/obj/item/book/manual/wiki/robotics_cyborgs{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/storage/belt/utility, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/delivery, -/obj/machinery/requests_console{ - department = "Robotics Lab"; - name = "Robotics RC"; - pixel_y = 30; - receive_ore_updates = 1 - }, -/turf/open/floor/iron/grid/steel, -/area/science/robotics/lab) "jtj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -37512,6 +37163,27 @@ /obj/structure/chair/wood/normal, /turf/open/floor/iron/dark, /area/security/courtroom) +"jDR" = ( +/obj/structure/bonfire, +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ + desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; + name = "Carton of Estus" + }, +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/item/melee/baseball_bat{ + desc = "Don't tell anyone you put any points into dex, though."; + icon_state = "swordon"; + item_state = "swordon"; + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'; + name = "moonlight greatsword"; + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + }, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/maintenance/port) "jEa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37634,6 +37306,19 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) +"jFK" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/sink/kitchen{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + dir = 4; + name = "old sink"; + pixel_x = -11 + }, +/obj/structure/mopbucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/turf/open/floor/iron/dark, +/area/security/main) "jFT" = ( /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/rack, @@ -39733,12 +39418,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"keX" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/glass/bottle/whiskey, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/central/secondary) "kfb" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/grid/steel, @@ -39817,6 +39496,21 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"kgy" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "aicoredoor"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window{ + base_state = "rightsecure"; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "kgB" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -40280,6 +39974,11 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) +"kmD" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/turf/open/floor/carpet/grimy, +/area/hallway/primary/port) "kmL" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -41140,6 +40839,88 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"kxf" = ( +/obj/structure/closet/crate/medical, +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/item/circuitboard/machine/chem_heater, +/turf/open/floor/iron/techmaint, +/area/medical/virology) "kxg" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -41171,6 +40952,16 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"kyc" = ( +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "kyh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/kirbyplants/random, @@ -41750,6 +41541,28 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"kGy" = ( +/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 4; + icon_state = "leftsecure"; + name = "Secure Creature Pen Shield Holder"; + atom_integrity = 300; + req_access_txt = "55" + }, +/obj/structure/sign/warning/electricshock{ + pixel_x = -32 + }, +/obj/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/science/xenobiology) "kGA" = ( /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -44131,6 +43944,34 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/exit/departure_lounge) +"lil" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/color/latex{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/science{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/glasses/science, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 3 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "lim" = ( /turf/open/floor/iron/dark/corner{ dir = 1 @@ -45239,6 +45080,19 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/medical) +"lvi" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/dest_tagger, +/obj/machinery/computer/security/telescreen/rd{ + pixel_y = 30 + }, +/turf/open/floor/iron/dark, +/area/bridge) "lvk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -45639,6 +45493,20 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"lAL" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/obj/item/reagent_containers/dropper, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/turf/open/floor/iron/dark, +/area/science/lab) "lAV" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -46210,12 +46078,6 @@ /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, /area/security/prison) -"lJu" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/oven, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "lJz" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -47874,6 +47736,38 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) +"mif" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 28 + }, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_y = 24 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_y = -28 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 8; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "mii" = ( /obj/effect/turf_decal/trimline/red/arrow_cw{ dir = 4 @@ -48401,6 +48295,40 @@ "mqi" = ( /turf/open/floor/iron, /area/hallway/primary/starboard) +"mqw" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Virology Desk Window"; + req_access_txt = "20" + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/storage/box/masks{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/machinery/door/window/northleft{ + dir = 2; + name = "Virology Desk Window" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "mqx" = ( /obj/effect/turf_decal/stripes/full, /obj/machinery/power/smes{ @@ -50351,6 +50279,19 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) +"mQj" = ( +/obj/item/reagent_containers/cup/bucket, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "mQl" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -50703,6 +50644,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/central) +"mUs" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Animal Pen" + }, +/obj/item/cultivator, +/obj/item/reagent_containers/cup/bucket, +/obj/item/seeds/tower, +/turf/open/floor/plating, +/area/hydroponics/garden) "mUv" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -50906,6 +50858,27 @@ }, /turf/closed/wall/r_wall, /area/engine/supermatter) +"mYp" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 10; + pixel_y = 9 + }, +/obj/item/food/donut/berry{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/genpop_interface{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/security/prison) "mYB" = ( /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, @@ -51243,17 +51216,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/genetics) -"ndu" = ( -/obj/structure/table/wood/fancy, -/obj/item/soulstone/anybody/chaplain, -/obj/item/organ/heart{ - pixel_x = 8; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/glass/bottle/holywater, -/obj/item/book/granter/spell/smoke/lesser, -/turf/open/floor/cult, -/area/chapel/office) "ndM" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 4 @@ -51730,15 +51692,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"njG" = ( -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/machinery/light, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "njM" = ( /obj/effect/turf_decal/bot, /obj/machinery/shieldwallgen, @@ -52643,23 +52596,6 @@ }, /turf/open/floor/plating, /area/science/mixing) -"nwP" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/reagent_containers/cup/rag, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/obj/item/book/manual/wiki/barman_recipes{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/structure/noticeboard{ - dir = 4; - pixel_x = -27 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "nwT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -54007,6 +53943,20 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, /area/storage/tech) +"nPp" = ( +/obj/item/folder, +/obj/item/clipboard, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/obj/structure/table/wood, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/radio/intercom{ + pixel_y = 24 + }, +/turf/open/floor/iron/dark, +/area/science/breakroom) "nPL" = ( /obj/item/stack/cable_coil/cut/yellow, /obj/structure/cable/yellow{ @@ -55609,6 +55559,38 @@ /obj/machinery/light/small, /turf/open/floor/engine, /area/engine/supermatter) +"onm" = ( +/obj/structure/table/reinforced, +/obj/item/book/granter/crafting_recipe/cooking_sweets_101{ + pixel_x = 6; + pixel_y = 16 + }, +/obj/item/book/manual/chef_recipes{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/sugar{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -4; + pixel_y = 17 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/iron/techmaint, +/area/security/prison) "ono" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Server Room"; @@ -55815,6 +55797,11 @@ }, /turf/open/floor/iron/dark, /area/science/shuttle) +"opu" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/plating, +/area/maintenance/department/security/brig) "opD" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -55862,15 +55849,6 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/fore) -"oqj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/obj/structure/railing, -/turf/open/floor/iron/techmaint, -/area/science/misc_lab) "oqm" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -57883,6 +57861,22 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) +"oUy" = ( +/obj/structure/rack, +/obj/item/stack/cable_coil/random/five, +/obj/item/screwdriver, +/obj/item/wrench, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/knife/kitchen, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/turf/open/floor/iron/dark, +/area/vacant_room/commissary/commissaryFood) "oUA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59581,6 +59575,42 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/hydroponics) +"ptv" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/closet/secure_closet/injection, +/obj/item/reagent_containers/cup/bottle/toxin{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/facid{ + name = "fluorosulfuric acid bottle"; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe{ + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/techmaint, +/area/security/execution/education) "ptH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -60222,15 +60252,6 @@ }, /turf/open/floor/iron/techmaint, /area/crew_quarters/heads/hor) -"pBN" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/techmaint, -/area/security/prison) "pBR" = ( /obj/docking_port/stationary{ dir = 2; @@ -60298,6 +60319,12 @@ }, /turf/open/floor/iron/techmaint, /area/science/xenobiology) +"pCA" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/turf/open/floor/iron/techmaint, +/area/science/research) "pCN" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, @@ -60343,6 +60370,26 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) +"pDz" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/machinery/door/poddoor/shutters{ + id = "kitchencounter"; + name = "Kitchen Bar Counter Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/turf/open/floor/iron/techmaint, +/area/crew_quarters/kitchen) "pDL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61749,6 +61796,19 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"pXS" = ( +/obj/machinery/newscaster{ + pixel_y = 31 + }, +/obj/structure/janitorialcart, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/item/mop, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/janitor) "pYk" = ( /obj/structure/window/reinforced{ dir = 8 @@ -61888,36 +61948,28 @@ /obj/machinery/light, /turf/open/floor/wood, /area/library/lounge) -"pZt" = ( -/obj/structure/table/reinforced, -/obj/item/seeds/soya, -/obj/item/seeds/cabbage, -/obj/item/seeds/corn, -/obj/item/seeds/onion, -/obj/item/seeds/potato, -/obj/item/seeds/wheat, -/obj/item/seeds/carrot, -/obj/item/storage/bag/plants/portaseeder{ - pixel_x = 1; - pixel_y = 3 +"pZF" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = 4; + pixel_y = 4 }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 8; - pixel_y = -1 +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -3; + pixel_y = 15 }, -/obj/item/cultivator{ - pixel_x = 1; - pixel_y = -1 +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 3 }, -/obj/item/shovel/spade{ - pixel_x = -5; - pixel_y = -4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/turf/open/floor/iron/techmaint, -/area/security/prison) +/turf/open/floor/carpet, +/area/chapel/office) "pZM" = ( /obj/structure/chair/fancy/sofa/old{ color = "#742925"; @@ -63147,12 +63199,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"qpL" = ( -/obj/structure/mopbucket, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/turf/open/floor/iron/techmaint, -/area/science/research) "qpP" = ( /obj/structure/noticeboard{ pixel_y = 26 @@ -63509,38 +63555,6 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"qtM" = ( -/obj/structure/table/reinforced, -/obj/item/book/granter/crafting_recipe/cooking_sweets_101{ - pixel_x = 6; - pixel_y = 16 - }, -/obj/item/book/manual/chef_recipes{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = 8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/sugar{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = -4; - pixel_y = 17 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/iron/techmaint, -/area/security/prison) "qtS" = ( /obj/effect/turf_decal/trimline/blue/warning{ dir = 8 @@ -63822,21 +63836,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"qxm" = ( -/obj/structure/table, -/obj/item/food/spaghetti/raw, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/condiment/peppermill, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 6 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "qxp" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 8 @@ -63996,22 +63995,6 @@ }, /turf/open/floor/iron/checker, /area/quartermaster/storage) -"qzO" = ( -/obj/structure/rack, -/obj/item/stack/cable_coil/random/five, -/obj/item/screwdriver, -/obj/item/wrench, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/condiment/enzyme, -/obj/item/knife/kitchen, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/turf/open/floor/iron/dark, -/area/vacant_room/commissary/commissaryFood) "qAh" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -64577,6 +64560,40 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) +"qGZ" = ( +/obj/structure/closet/crate{ + name = "food crate" + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = -2 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 5 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/machinery/status_display/ai{ + pixel_x = -32 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/engine, +/area/security/nuke_storage) "qHa" = ( /obj/machinery/photocopier, /turf/open/floor/wood, @@ -65610,6 +65627,15 @@ }, /turf/open/floor/iron, /area/maintenance/disposal) +"qTl" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/food/tofu/prison, +/turf/open/floor/iron/dark, +/area/vacant_room/commissary/commissaryFood) "qTo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -66681,20 +66707,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/department/medical) -"rkq" = ( -/obj/item/folder, -/obj/item/clipboard, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/obj/structure/table/wood, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/radio/intercom{ - pixel_y = 24 - }, -/turf/open/floor/iron/dark, -/area/science/breakroom) "rkv" = ( /obj/structure/table/wood, /turf/open/floor/carpet, @@ -68445,21 +68457,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/atmos) -"rGZ" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/structure/table, -/obj/item/toy/batong{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/iron/techmaint, -/area/security/prison) "rHd" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -70998,11 +70995,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/iron/white, /area/science/xenobiology) -"smb" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/plating, -/area/maintenance/department/security/brig) "sme" = ( /obj/structure/sign/departments/security, /turf/closed/wall/r_wall, @@ -71232,17 +71224,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"soC" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/bot, -/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/glass/mug/cocoa{ - pixel_x = 6 - }, -/turf/open/floor/iron/sepia, -/area/engine/break_room) "soH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -73905,22 +73886,6 @@ /obj/structure/closet/toolcloset, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port) -"sYd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table/reinforced, -/obj/item/food/popcorn, -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/structure/railing, -/turf/open/floor/iron/techmaint, -/area/science/misc_lab) "sYg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -74807,6 +74772,21 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"tkK" = ( +/obj/structure/table, +/obj/item/food/spaghetti/raw, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/reagent_containers/condiment/peppermill, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 6 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "tkM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -75432,6 +75412,12 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron/dark, /area/engine/storage) +"ttm" = ( +/obj/structure/table/wood, +/obj/item/storage/lockbox/medal, +/obj/item/reagent_containers/cup/glass/shaker, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/captain) "ttn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -75581,6 +75567,24 @@ /obj/machinery/light, /turf/open/floor/grass/no_border, /area/hallway/primary/port) +"tuO" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker, +/obj/item/reagent_containers/dropper, +/obj/machinery/camera/directional/north{ + c_tag = "Xenobiology - Research Area"; + name = "xenobiology camera" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) "tuT" = ( /obj/structure/lattice, /turf/open/space, @@ -75600,26 +75604,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/bar/atrium) -"tvw" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/machinery/door/poddoor/shutters{ - id = "kitchencounter"; - name = "Kitchen Bar Counter Shutters" - }, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/turf/open/floor/iron/techmaint, -/area/crew_quarters/kitchen) "tvz" = ( /obj/item/soap/nanotrasen, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -77059,29 +77043,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, /area/teleporter) -"tPo" = ( -/obj/structure/table, -/obj/item/food/mint{ - pixel_y = 9 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 2 - }, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 26 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = -28 - }, -/turf/open/floor/iron/cafeteria, -/area/vacant_room/commissary/commissaryFood) "tPD" = ( /obj/machinery/light_switch{ pixel_x = -24; @@ -77709,6 +77670,40 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissary2) +"tXb" = ( +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/vending/wallmed{ + contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); + name = "Upgraded NanoMed"; + pixel_x = -1; + pixel_y = -32; + premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); + products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "tXc" = ( /obj/structure/window/reinforced{ dir = 4 @@ -79160,6 +79155,29 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint) +"uqM" = ( +/obj/machinery/newscaster{ + pixel_x = -28; + pixel_y = 1 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/obj/item/reagent_containers/dropper, +/obj/item/radio/headset/headset_med, +/obj/item/flashlight/pen{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/genetics) "uqQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/side{ @@ -80982,22 +81000,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"uNi" = ( -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/grey_bull{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/machinery/camera/directional/east, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "uNj" = ( /turf/open/floor/iron/dark, /area/science/robotics/mechbay) @@ -81190,34 +81192,6 @@ }, /turf/open/floor/iron/techmaint, /area/science/shuttle) -"uPL" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/glasses/science{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/glasses/science, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 3 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "uPN" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, @@ -82383,16 +82357,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main) -"vdJ" = ( -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "vdU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -82704,6 +82668,23 @@ }, /turf/open/floor/iron/sepia, /area/engine/break_room) +"viq" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/machinery/computer/security/telescreen/minisat{ + dir = 1; + pixel_y = -29 + }, +/obj/item/clothing/mask/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/clothing/mask/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/machinery/light/small, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain) "vit" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -83625,6 +83606,17 @@ }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) +"vsd" = ( +/obj/structure/table/wood/fancy, +/obj/item/soulstone/anybody/chaplain, +/obj/item/organ/heart{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/item/book/granter/spell/smoke/lesser, +/turf/open/floor/cult, +/area/chapel/office) "vsi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -83695,6 +83687,35 @@ broken = 1 }, /area/maintenance/port) +"vsI" = ( +/obj/structure/table/wood, +/obj/item/folder/blue{ + pixel_x = 8 + }, +/obj/item/stamp/captain{ + pixel_x = 8 + }, +/obj/structure/desk_bell/speed_demon{ + pixel_x = -8 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; + name = "Bottle of Tears"; + pixel_x = 8; + pixel_y = 20 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "vsR" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -84371,15 +84392,6 @@ /obj/structure/closet/secure_closet/medical1, /turf/open/floor/iron/grid/steel, /area/medical/virology) -"vye" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/food/tofu/prison, -/turf/open/floor/iron/dark, -/area/vacant_room/commissary/commissaryFood) "vym" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 @@ -85440,6 +85452,22 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"vLO" = ( +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/grey_bull{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/camera/directional/east, +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) "vMl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -86159,6 +86187,18 @@ }, /turf/open/floor/wood, /area/library) +"vSU" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/construction) "vTc" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ @@ -87117,6 +87157,20 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/apothecary) +"wge" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/mortar, +/obj/item/pestle, +/obj/item/clothing/glasses/hud/health{ + pixel_x = 4; + pixel_y = -1 + }, +/turf/open/floor/iron/grid, +/area/medical/virology) "wgl" = ( /obj/machinery/light, /turf/open/floor/iron, @@ -87531,6 +87585,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/break_room) +"wmv" = ( +/obj/structure/table/wood, +/obj/item/razor{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/reagent_containers/cup/glass/flask/gold, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "wmy" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -87729,35 +87793,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/port) -"wok" = ( -/obj/structure/table/wood, -/obj/item/folder/blue{ - pixel_x = 8 - }, -/obj/item/stamp/captain{ - pixel_x = 8 - }, -/obj/structure/desk_bell/speed_demon{ - pixel_x = -8 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; - name = "Bottle of Tears"; - pixel_x = 8; - pixel_y = 20 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "woq" = ( /turf/closed/wall, /area/chapel/main) @@ -87815,6 +87850,14 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"wpp" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/table, +/obj/item/food/dough, +/obj/item/reagent_containers/cup/bowl, +/obj/item/food/grown/tomato, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "wpw" = ( /obj/structure/sign/warning/pods{ pixel_x = -32 @@ -88348,42 +88391,6 @@ }, /turf/open/floor/iron/dark, /area/science/lobby) -"wvS" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/closet/secure_closet/injection, -/obj/item/reagent_containers/cup/bottle/toxin{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/facid{ - name = "fluorosulfuric acid bottle"; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/syringe{ - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/chloralhydrate, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron/techmaint, -/area/security/execution/education) "wwl" = ( /turf/open/floor/plating{ burnt = 1 @@ -88608,6 +88615,41 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"wzo" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/dropper, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "chemisttop"; + name = "Chemistry Shutter Control"; + pixel_x = 7; + pixel_y = -24; + req_access_txt = "33" + }, +/obj/machinery/button/door{ + id = "chemistbot"; + name = "Chemistry Shutter Control"; + pixel_x = -6; + pixel_y = -24; + req_access_txt = "33" + }, +/obj/item/storage/pill_bottle, +/obj/item/reagent_containers/medspray{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/apothecary) "wzw" = ( /obj/structure/sign/directions/science{ dir = 1; @@ -89304,6 +89346,38 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/entry) +"wIW" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_y = 24 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_y = -28 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 28 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 8; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "wIX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -89387,35 +89461,6 @@ /obj/machinery/vending/modularpc, /turf/open/floor/iron/white, /area/science/lobby) -"wKu" = ( -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/syringe{ - pixel_x = 1; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3; - pixel_y = 3 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/apothecary) "wKB" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -89640,6 +89685,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"wNm" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/aft) "wNp" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -89998,40 +90049,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"wSr" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "Virology Desk Window"; - req_access_txt = "20" - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/storage/box/masks{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "Isolation Shutters" - }, -/obj/structure/desk_bell{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/machinery/door/window/northleft{ - dir = 2; - name = "Virology Desk Window" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "wSw" = ( /obj/effect/landmark/start/atmospheric_technician, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -92913,6 +92930,14 @@ }, /turf/open/floor/iron/techmaint, /area/crew_quarters/dorms) +"xvy" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "xvL" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -93047,6 +93072,23 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"xxe" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, +/obj/structure/sign/plaques/deempisi{ + pixel_y = 28 + }, +/obj/item/book/manual/wiki/barman_recipes{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/structure/noticeboard{ + dir = 4; + pixel_x = -27 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "xxf" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -93386,20 +93428,6 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) -"xAu" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/pen, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = -6; - pixel_y = 1 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "xAA" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ @@ -95044,20 +95072,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/catwalk_floor, /area/bridge) -"xPy" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/obj/item/reagent_containers/dropper, -/obj/item/hand_labeler, -/obj/item/stack/package_wrap, -/turf/open/floor/iron/dark, -/area/science/lab) "xPz" = ( /obj/effect/turf_decal/stripes/closeup, /obj/effect/spawner/structure/window/plasma/reinforced, @@ -95220,6 +95234,12 @@ }, /turf/open/floor/iron/stairs/left, /area/hallway/primary/central) +"xRu" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/port/fore) "xRw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -95440,11 +95460,6 @@ dir = 8 }, /area/crew_quarters/fitness/recreation) -"xTR" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/turf/open/floor/carpet/grimy, -/area/hallway/primary/port) "xUa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -95709,29 +95724,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) -"xXA" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/syringe, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/turf/open/floor/iron/dark, -/area/medical/medbay/lobby) "xXH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -95939,28 +95931,36 @@ "xZW" = ( /turf/open/floor/iron, /area/quartermaster/storage) -"yaa" = ( -/obj/structure/table, -/obj/item/kitchen/fork, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 +"yab" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/patron{ + pixel_x = -5; + pixel_y = 16 }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 5; - pixel_y = 6 +/obj/item/reagent_containers/cup/glass/bottle/grappa{ + pixel_x = 10; + pixel_y = 15 }, -/obj/effect/spawner/lootdrop/three_course_meal, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light/small{ - dir = 4 +/obj/item/reagent_containers/cup/glass/bottle/absinthe{ + pixel_x = -5; + pixel_y = 4 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/item/reagent_containers/cup/glass/bottle/kahlua{ + pixel_x = 9; + pixel_y = 7 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/cafeteria) +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = 24 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "yag" = ( /obj/effect/turf_decal/guideline/guideline_in/red, /turf/open/floor/iron/dark/corner{ @@ -111748,7 +111748,7 @@ bXv vQG wpn wxd -jsw +jDR wxd kHH kHH @@ -113492,7 +113492,7 @@ leT leT leT eFZ -cgB +xRu wXp eFZ leT @@ -114301,7 +114301,7 @@ ovf ocT cZb qar -vye +qTl sha xDh wxd @@ -114803,7 +114803,7 @@ cXA cXA cXA dCU -ifl +mUs dCU dCU cXA @@ -115586,7 +115586,7 @@ rNo tjo sha led -qzO +oUy sha wuE amH @@ -115840,7 +115840,7 @@ cqq cXA foJ mxb -tPo +hDD sha sha sha @@ -116051,8 +116051,8 @@ abN abN kHH yjW -ePp -ndu +fIp +vsd yjW aMO byH @@ -116093,7 +116093,7 @@ jbB mbf tNe tNe -gCw +cVU cXA sha sha @@ -116615,7 +116615,7 @@ lsd tkV xfm rxd -nwP +xxe wOu gci nnV @@ -116872,7 +116872,7 @@ ahM rxd rxd rxd -emH +yab qqr hkQ vlF @@ -116920,7 +116920,7 @@ abm msj wUY uQX -ftA +vSU jpl sGf ygc @@ -117338,7 +117338,7 @@ abN bau blm cAg -cIH +pZF mvI dQg beY @@ -118119,7 +118119,7 @@ fgq woq hQe hQe -exT +gbd erC swI swI @@ -118150,7 +118150,7 @@ arZ arZ arZ arZ -gJI +mQj oje rxd oSW @@ -118407,7 +118407,7 @@ mbT mEz txf tdp -vdJ +kyc hin rxd aib @@ -119191,7 +119191,7 @@ eqe vqH vqH sRp -tvw +pDz sRp sxz vqH @@ -119705,10 +119705,10 @@ ttS roM fhD mib -dam +gSV czD mib -lJu +haU wRF hvk vmw @@ -119963,9 +119963,9 @@ mib mib rfs sis -fiV +wpp mib -njG +iBZ jOJ oZr bwH @@ -120217,7 +120217,7 @@ mWm xNi iLg pYP -qxm +tkK mib mLj czD @@ -121525,7 +121525,7 @@ xTG cnU uOq avq -xTR +kmD lPp piR xPG @@ -122248,7 +122248,7 @@ ygM hZS pgb tNV -aLS +uqM gms xJa ifW @@ -122258,7 +122258,7 @@ cxE hMo dgU aWV -cSw +abi oRE xvj wqJ @@ -122539,7 +122539,7 @@ qQj qQj hUT xNh -ial +pXS qlN eJK qKp @@ -123567,7 +123567,7 @@ qQj sXP hUT qQj -smb +opu pji qjc nfx @@ -123772,7 +123772,7 @@ cWr bIL ddX jGv -eWR +tXb aeJ rqd aya @@ -124057,7 +124057,7 @@ mhb esg fTN jId -xAu +bkf fdE uYN wqJ @@ -124287,7 +124287,7 @@ cpH atK nWX bkU -wSr +mqw ozj uuW aQZ @@ -124543,7 +124543,7 @@ rGy hfy eBn nbL -irn +wge aPd vqt uuW @@ -125852,7 +125852,7 @@ lvn tNk dkR iLD -xXA +fYC kXx vhU gwS @@ -126592,7 +126592,7 @@ crQ asn aeJ fqS -aGl +kxf aeJ fXx hxg @@ -126626,7 +126626,7 @@ vhU vhU vhU vhU -wKu +fLf heB kVj vhU @@ -127396,7 +127396,7 @@ pyX iyB heB ocm -uPL +lil uho lMx nDy @@ -127656,7 +127656,7 @@ lMx lMx lPU lMx -iiZ +wzo vhU shm xCx @@ -127944,8 +127944,8 @@ cSo snr hUT iSJ -ayM -hqs +bSN +fpa cmy wPJ oRk @@ -128435,7 +128435,7 @@ wrM vUR wdH rGl -bgd +jFK vUR szG hUW @@ -129505,7 +129505,7 @@ cnM cnM oVz rAx -keX +bqg isS vDc qbd @@ -129768,7 +129768,7 @@ mMf qbd gtO yfq -jti +dsX kAx fIf xJr @@ -130300,7 +130300,7 @@ oth tAi eUq ehQ -rkq +nPp kDo akh xip @@ -130829,13 +130829,13 @@ eNp ozc oYg dlC -geN +dOQ rxv lis tCO lis ide -gzm +kGy siW qTo bmB @@ -131079,7 +131079,7 @@ kJm eUi iHz aZB -dBq +tuO iQp swU rcR @@ -131286,7 +131286,7 @@ uGP nHb gjj pXI -iRk +mYp fUO ssT ybT @@ -131876,7 +131876,7 @@ sMR qTc tBr qTc -uNi +vLO haP ozc nnx @@ -132557,7 +132557,7 @@ xIV wyg kkX nVS -wvS +ptv iyg iOw nVS @@ -133343,7 +133343,7 @@ nWr mCC cuR tJu -pZt +hux bcg qOM mju @@ -133659,7 +133659,7 @@ ere kFN lkl eLS -sYd +bhK mHj abN nnx @@ -133842,7 +133842,7 @@ wOG wzW wyg wYw -rGZ +ejc kjg nBj dOq @@ -133857,9 +133857,9 @@ oEf oEf tWe rDR -qtM +onm tLe -pBN +fmn eRO uxl oYl @@ -134173,7 +134173,7 @@ sTZ eeu mKd iIX -oqj +iXG mHj abN abN @@ -134624,7 +134624,7 @@ fsb hcE mPD aJK -hKB +gLr fsb ehr cNy @@ -135941,7 +135941,7 @@ xrc gEs wBR cTl -qpL +pCA xSV uAE myi @@ -136194,7 +136194,7 @@ rlX gad wLT wZg -xPy +lAL gEs abA wiV @@ -141266,7 +141266,7 @@ hFK hFi nFb wfA -iDU +ttm gwI ivi dVN @@ -141324,7 +141324,7 @@ cBt tXM oPn qyd -soC +gHI pFP ykQ gfk @@ -141521,14 +141521,14 @@ hrQ wfA hip hGf -hYl +wmv wfA uzu gwI ivG gUi jvr -hus +viq yiC mqi aTF @@ -141770,7 +141770,7 @@ csJ nnx nnx yeb -dMN +lvi osY flj tPT @@ -142811,7 +142811,7 @@ wfA puK tvl tvl -wok +vsI hcD oFa yiC @@ -143935,7 +143935,7 @@ ylJ ylJ kEC vXB -dqI +wNm ylJ ylJ uBK @@ -144092,7 +144092,7 @@ ydm xVC fvs gCA -hdx +qGZ hKK qIr ydm @@ -150815,7 +150815,7 @@ wZD xyd qjE yic -yaa +gjN qjE wCr anQ @@ -152100,7 +152100,7 @@ wZR ptW wDO vPF -eDM +xvy wDI vjo ycc @@ -153342,9 +153342,9 @@ flv gLC eYA bti -gnN +jpj fLF -hih +kgy bti ifi rPA @@ -154625,13 +154625,13 @@ aYu aYu kOu kOu -fTU +mif kOu goB gQS hnr kOu -iki +wIW kOu kOu aYu diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e0c8ee46563a1..f3a2253a807ac 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1688,6 +1688,38 @@ /obj/structure/fans/tiny/invisible, /turf/open/space/basic, /area/space) +"agN" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = -10; + pixel_y = 22 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = -27 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = -10; + pixel_y = -25 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + pixel_x = 4; + req_access_txt = "16" + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "agP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -3352,26 +3384,6 @@ }, /turf/open/floor/iron, /area/bridge) -"aqK" = ( -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = 3; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/glass/bottle/rum{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "aqQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8942,6 +8954,35 @@ }, /turf/open/floor/engine, /area/science/mixing/chamber) +"bbG" = ( +/obj/item/book/manual/wiki/medicine, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/cable/yellow, +/obj/machinery/power/apc{ + areastring = "/area/medical/cryo"; + dir = 4; + name = "Cryogenics APC"; + pixel_x = 24 + }, +/obj/item/wrench/medical, +/obj/structure/table/glass, +/obj/item/reagent_containers/syringe, +/turf/open/floor/iron/showroomfloor, +/area/medical/cryo) "bbI" = ( /obj/machinery/doppler_array/research/science{ dir = 4 @@ -10342,39 +10383,6 @@ "bkP" = ( /turf/closed/wall/rust, /area/quartermaster/sorting) -"bkU" = ( -/obj/structure/table/wood, -/obj/item/storage/box/seccarts{ - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; - name = "Bottle of Tears"; - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_y = 2 - }, -/obj/machinery/keycard_auth{ - pixel_x = -6; - pixel_y = -24 - }, -/obj/machinery/button/door{ - id = "hosspace"; - name = "Space Blast door Toggle"; - pixel_x = 7; - pixel_y = -24 - }, -/obj/effect/turf_decal/siding/wood/end{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/hos) "bkW" = ( /obj/machinery/door/poddoor/shutters{ id = "teleshutter"; @@ -10680,27 +10688,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/miningoffice) -"bmS" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen_2"; - name = "Hallway Hatch" - }, -/obj/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/kitchen) "bmZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -10879,27 +10866,6 @@ }, /turf/open/floor/grass, /area/hydroponics) -"bnL" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "Serving Hatch" - }, -/obj/item/toy/figure/chef, -/turf/open/floor/plating, -/area/crew_quarters/kitchen) "bnP" = ( /obj/structure/window/reinforced{ dir = 1 @@ -11113,18 +11079,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) -"boy" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/candle/infinite{ - pixel_x = -4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/central) "boB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -11313,6 +11267,28 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/office) +"bpR" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/paicard{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "bpV" = ( /obj/structure/sign/departments/botany, /turf/closed/wall, @@ -11603,31 +11579,6 @@ burnt = 1 }, /area/engine/engineering) -"brB" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/noticeboard{ - dir = 4; - pixel_x = -27 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) "brD" = ( /turf/closed/wall, /area/crew_quarters/toilet/restrooms) @@ -11813,18 +11764,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) -"bta" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/item/clothing/suit/hooded/chaplain_hoodie, -/obj/item/reagent_containers/cup/glass/bottle/holywater, -/obj/item/soulstone/anybody/chaplain, -/obj/item/organ/heart, -/obj/item/book/granter/spell/smoke/lesser, -/turf/open/floor/iron/dark, -/area/chapel/office) "btb" = ( /obj/machinery/mass_driver{ dir = 1; @@ -11902,29 +11841,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/chapel/office) -"btq" = ( -/obj/structure/table/wood/fancy, -/obj/effect/turf_decal/stripes/corner, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/pen, -/obj/machinery/requests_console{ - department = "Chapel"; - departmentType = 2; - name = "Chapel RC"; - pixel_y = -30 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood, -/area/chapel/office) "btw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -14525,6 +14441,27 @@ /obj/structure/cable/yellow, /turf/open/floor/iron/dark, /area/quartermaster/sorting) +"bHy" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ + desc = "An emerald flask, from the Keeper's soul. High in vitamins!"; + name = "estus flask"; + pixel_x = 4; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "bHB" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -15195,38 +15132,6 @@ }, /turf/open/floor/plating, /area/quartermaster/office) -"bLM" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = 10; - pixel_y = 22 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 27 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = 10; - pixel_y = -25 - }, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Tertiary AI Core Access"; - obj_integrity = 300; - pixel_x = -3; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "bLS" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15533,13 +15438,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"bNT" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "bNU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -17180,6 +17078,17 @@ }, /turf/open/floor/engine/vacuum, /area/engine/atmos) +"caP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/warehouse) "caT" = ( /obj/structure/lattice, /obj/structure/grille, @@ -17772,28 +17681,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"cdW" = ( -/obj/machinery/turretid{ - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = 3; - pixel_y = 28 - }, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "cdX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -18247,26 +18134,6 @@ /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"cfK" = ( -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/light_switch{ - pixel_x = 6; - pixel_y = 24 - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "cfL" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 5 @@ -24540,6 +24407,23 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) +"cKw" = ( +/obj/structure/table, +/obj/item/food/mint, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/sugar{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/beaker, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/kitchen) "cKx" = ( /obj/effect/turf_decal/stripes/corner, /turf/closed/wall/r_wall, @@ -26261,28 +26145,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"cYd" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/paicard{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) "cYh" = ( /obj/structure/chair/office/light{ dir = 4 @@ -26898,6 +26760,10 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"dhi" = ( +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/turf/open/floor/plating, +/area/quartermaster/warehouse) "dhx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ @@ -27345,46 +27211,6 @@ broken = 1 }, /area/maintenance/port/fore) -"dpR" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/bot, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -7 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -7 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/chemistry) -"dpY" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/table/wood, -/obj/item/cultivator{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/shovel/spade{ - pixel_x = -5; - pixel_y = -4 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 9; - pixel_y = 5 - }, -/turf/open/floor/grass, -/area/security/prison) "dqg" = ( /obj/structure/chair/fancy/sofa/old/left{ color = "#742925" @@ -27516,6 +27342,23 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/theatre) +"drK" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 6 + }, +/obj/item/clothing/glasses/science, +/obj/item/clothing/glasses/science, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/science/lab) "drL" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/anticorner/contrasted, @@ -28039,38 +27882,6 @@ }, /turf/open/floor/iron/dark, /area/science/aft) -"dAW" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = -10; - pixel_y = 22 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = -27 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = -10; - pixel_y = -25 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - pixel_x = 4; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "dBa" = ( /obj/machinery/light{ dir = 4 @@ -28850,6 +28661,35 @@ broken = 1 }, /area/maintenance/starboard) +"dOp" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/item/radio/intercom{ + pixel_y = 27 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup, +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = -8; + pixel_y = 7 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/aft) "dOw" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/engineering, @@ -29511,6 +29351,38 @@ }, /turf/open/floor/iron, /area/bridge) +"dZB" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 10; + pixel_y = 22 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 27 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = 10; + pixel_y = -25 + }, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Tertiary AI Core Access"; + atom_integrity = 300; + pixel_x = -3; + req_access_txt = "16" + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "dZN" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/corner{ @@ -30238,16 +30110,6 @@ }, /turf/open/floor/iron/dark, /area/science/mixing) -"eja" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/kitchen/rollingpin, -/obj/item/clothing/head/utility/chefhat, -/turf/open/floor/iron/techmaint, -/area/security/prison) "ejj" = ( /obj/structure/table, /obj/item/storage/box/donkpockets{ @@ -30864,6 +30726,23 @@ burnt = 1 }, /area/maintenance/central) +"etq" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/table/wood, +/obj/item/cultivator{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/shovel/spade{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 9; + pixel_y = 5 + }, +/turf/open/floor/grass, +/area/security/prison) "etx" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -31176,6 +31055,27 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/quartermaster/storage) +"exI" = ( +/obj/structure/bonfire, +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ + desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; + name = "Carton of Estus" + }, +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/item/melee/baseball_bat{ + desc = "Don't tell anyone you put any points into dex, though."; + icon_state = "swordon"; + item_state = "swordon"; + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'; + name = "moonlight greatsword"; + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + }, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/maintenance/starboard/fore) "eym" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -32489,25 +32389,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/lab) -"eWx" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -3; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; - list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30); - name = "Kilo-Kocktail"; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet/green, -/area/lawoffice) "eWy" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -35790,6 +35671,28 @@ /obj/effect/spawner/mail/maintloot, /turf/open/floor/plating, /area/maintenance/port/aft) +"gbr" = ( +/obj/machinery/turretid{ + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = 3; + pixel_y = 28 + }, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "gbw" = ( /obj/effect/landmark/start/scientist, /obj/structure/cable/yellow{ @@ -36153,16 +36056,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/maintenance/central) -"giB" = ( -/obj/structure/mopbucket, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/structure/sign/warning/securearea{ - pixel_x = -32 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "gjd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ @@ -37174,6 +37067,25 @@ burnt = 1 }, /area/maintenance/starboard/fore) +"gEQ" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -3; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; + list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30); + name = "Kilo-Kocktail"; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/carpet/green, +/area/lawoffice) "gFe" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/engine/vacuum, @@ -38261,6 +38173,39 @@ }, /turf/open/floor/iron/dark, /area/science/xenobiology) +"gYn" = ( +/obj/structure/table/wood, +/obj/item/storage/box/seccarts{ + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; + name = "Bottle of Tears"; + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_y = 2 + }, +/obj/machinery/keycard_auth{ + pixel_x = -6; + pixel_y = -24 + }, +/obj/machinery/button/door{ + id = "hosspace"; + name = "Space Blast door Toggle"; + pixel_x = 7; + pixel_y = -24 + }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/hos) "gYq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -38339,6 +38284,18 @@ }, /turf/open/floor/wood, /area/crew_quarters/locker) +"gZV" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/candle/infinite{ + pixel_x = -4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/central) "hak" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -38529,27 +38486,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"hec" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_y = 22 - }, -/obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/glasses/science{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/glasses/science, -/obj/effect/turf_decal/bot, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -6 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/chemistry) "hef" = ( /obj/machinery/light_switch{ pixel_x = 1; @@ -39290,6 +39226,29 @@ }, /turf/open/floor/iron, /area/quartermaster/miningoffice) +"hqf" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -7 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -7 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/chemistry) "hqi" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -39547,13 +39506,6 @@ }, /turf/open/floor/iron, /area/bridge) -"htk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/quartermaster/warehouse) "htu" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -28 @@ -40444,6 +40396,31 @@ broken = 1 }, /area/maintenance/starboard/fore) +"hGj" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -3; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 24 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/chapel/office) "hGq" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42400,6 +42377,24 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) +"iod" = ( +/obj/structure/table/wood, +/obj/item/clipboard, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/toy/figure/bartender{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/rag, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "iok" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -42892,19 +42887,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/science/aft) -"izu" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/pwr_game{ - pixel_x = 6; - pixel_y = 7; - list_reagents = list(/datum/reagent/consumable/pwr_game = 5) - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -5; - pixel_y = 1 - }, -/turf/open/floor/wood, -/area/security/prison) "izz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42995,24 +42977,36 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) -"iAH" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -2; - pixel_y = 2 +"iAJ" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = -9; + pixel_y = 3 }, -/obj/item/toy/figure/bartender{ - pixel_x = 8; - pixel_y = 2 +/obj/item/pen{ + pixel_x = -8; + pixel_y = 3 }, -/obj/item/reagent_containers/cup/rag, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/storage/box/syringes{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = -7 + }, +/obj/machinery/light{ + bulb_colour = "#22bfa2"; + bulb_vacuum_colour = "#22bfa2"; + dir = 4; + nightshift_light_color = "#22bfa2" }, -/obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, -/area/crew_quarters/bar) +/area/medical/virology) "iAR" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -44719,10 +44713,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/execution/transfer) -"jcF" = ( -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/turf/open/floor/plating, -/area/quartermaster/warehouse) "jcT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -45985,95 +45975,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"juC" = ( -/obj/item/restraints/handcuffs{ - pixel_y = 4 - }, -/obj/item/circuitboard/machine/chem_heater, -/obj/item/reagent_containers/cup/bottle/sulfur{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/aluminium{ - pixel_x = 6 - }, -/obj/structure/closet/crate/secure/plasma{ - name = "virology crate"; - req_access_txt = "39" - }, -/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/medical/virology) "juE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -47412,27 +47313,6 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) -"jQD" = ( -/obj/machinery/airalarm/directional/south{ - pixel_y = -22 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/disposal) "jQL" = ( /obj/effect/turf_decal/plaque{ icon_state = "L2" @@ -50400,35 +50280,6 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/quartermaster/exploration_dock) -"kRc" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/item/radio/intercom{ - pixel_y = 27 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup, -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/aft) "kRl" = ( /obj/structure/girder, /turf/open/floor/plating{ @@ -52716,6 +52567,48 @@ }, /turf/open/floor/iron, /area/teleporter) +"lAa" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + color = "#439C1E" + }, +/obj/structure/closet/crate/secure/plasma{ + name = "virology crate"; + req_access_txt = "39" + }, +/obj/item/book/manual/wiki/infections, +/obj/item/book/manual/wiki/infections, +/obj/item/extrapolator, +/obj/item/storage/box/beakers{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/syringes{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/virology) "lAi" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -53225,6 +53118,27 @@ }, /turf/open/floor/iron/showroomfloor, /area/quartermaster/exploration_prep) +"lJJ" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Serving Hatch" + }, +/obj/item/toy/figure/chef, +/turf/open/floor/plating, +/area/crew_quarters/kitchen) "lJO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -54083,24 +53997,6 @@ burnt = 1 }, /area/maintenance/port/aft) -"lXx" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/wrench, -/obj/item/crowbar/red, -/obj/item/cultivator, -/obj/item/wirecutters, -/obj/item/reagent_containers/cup/bucket, -/obj/item/circuitboard/machine/biogenerator, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/quartermaster/warehouse) "lXA" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -54164,6 +54060,26 @@ broken = 1 }, /area/maintenance/port) +"lZd" = ( +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/light_switch{ + pixel_x = 6; + pixel_y = 24 + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "lZf" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -54203,27 +54119,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) -"lZo" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ - desc = "An emerald flask, from the Keeper's soul. High in vitamins!"; - name = "estus flask"; - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) "lZN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -55614,6 +55509,34 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/hydroponics) +"mBH" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor{ + name = "Virology Desk"; + req_access_txt = "39"; + dir = 4 + }, +/obj/item/storage/box/masks, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/medical/virology) "mBL" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -57517,21 +57440,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/prison, /area/security/prison) -"nkq" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/reagent_containers/cup/bucket, -/obj/item/radio/intercom{ - pixel_y = 22 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/janitor) "nkU" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 8; @@ -57756,6 +57664,15 @@ burnt = 1 }, /area/maintenance/port/aft) +"npf" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bowl, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "npg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -58449,6 +58366,12 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) +"nDC" = ( +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/grass, +/area/security/prison) "nDT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -58937,6 +58860,19 @@ }, /turf/open/floor/iron, /area/security/brig/aft) +"nKS" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ + pixel_x = 6; + pixel_y = 7; + list_reagents = list(/datum/reagent/consumable/pwr_game = 5) + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -5; + pixel_y = 1 + }, +/turf/open/floor/wood, +/area/security/prison) "nKU" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -59019,27 +58955,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"nLF" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/hydroponics, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/shovel/spade, -/obj/item/wrench, -/obj/item/crowbar/red, -/obj/item/cultivator, -/obj/item/wirecutters, -/obj/item/reagent_containers/cup/bucket, -/obj/item/circuitboard/machine/biogenerator, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "nLN" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -59261,23 +59176,6 @@ broken = 1 }, /area/maintenance/starboard) -"nPI" = ( -/obj/structure/table, -/obj/item/food/mint, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/reagent_containers/condiment/sugar{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/beaker, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/kitchen) "nPL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -59872,31 +59770,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/security/main) -"nZh" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/kitchen) "nZk" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable/yellow{ @@ -60022,6 +59895,24 @@ broken = 1 }, /area/maintenance/starboard) +"oau" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/item/cultivator, +/obj/item/wirecutters, +/obj/item/reagent_containers/cup/bucket, +/obj/item/circuitboard/machine/biogenerator, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/quartermaster/warehouse) "oaH" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -60474,6 +60365,20 @@ broken = 1 }, /area/maintenance/aft) +"ohR" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/chapel/main) "ohU" = ( /obj/machinery/power/solar{ id = "aftstarboard"; @@ -61255,6 +61160,27 @@ burnt = 1 }, /area/maintenance/port/fore) +"ouh" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_y = 22 + }, +/obj/structure/table/glass, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/glasses/science{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/science, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -6 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/chemistry) "ouu" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating{ @@ -62321,34 +62247,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) -"oMW" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "Isolation Shutters" - }, -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - name = "Virology Desk"; - req_access_txt = "39"; - dir = 4 - }, -/obj/item/storage/box/masks, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -9; - pixel_y = 5 - }, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/medical/virology) "oNj" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -62365,6 +62263,18 @@ broken = 1 }, /area/engine/engineering) +"oNw" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/clothing/suit/hooded/chaplain_hoodie, +/obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/item/soulstone/anybody/chaplain, +/obj/item/organ/heart, +/obj/item/book/granter/spell/smoke/lesser, +/turf/open/floor/iron/dark, +/area/chapel/office) "oNy" = ( /obj/machinery/light, /obj/machinery/light_switch{ @@ -63063,6 +62973,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/science/research) +"oYX" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/delivery, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "oZd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, @@ -63918,27 +63837,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/security/execution/education) -"pmx" = ( -/obj/structure/bonfire, -/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ - desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; - name = "Carton of Estus" - }, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/item/melee/baseball_bat{ - desc = "Don't tell anyone you put any points into dex, though."; - icon_state = "swordon"; - item_state = "swordon"; - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'; - name = "moonlight greatsword"; - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - }, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/starboard/fore) "pmM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -64119,6 +64017,27 @@ /obj/item/clothing/accessory/maidapron, /turf/open/floor/iron/dark, /area/security/brig) +"ppB" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/hydroponics, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/item/cultivator, +/obj/item/wirecutters, +/obj/item/reagent_containers/cup/bucket, +/obj/item/circuitboard/machine/biogenerator, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "ppJ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -64794,6 +64713,31 @@ }, /turf/open/floor/iron/dark, /area/maintenance/fore) +"pzi" = ( +/obj/structure/table, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/noticeboard{ + dir = 4; + pixel_x = -27 + }, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "pzm" = ( /obj/machinery/conveyor{ dir = 5; @@ -65687,6 +65631,21 @@ /obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, /turf/open/floor/iron/dark, /area/medical/morgue) +"pPm" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/reagent_containers/cup/bucket, +/obj/item/radio/intercom{ + pixel_y = 22 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/janitor) "pPG" = ( /obj/machinery/light/small{ dir = 4 @@ -66691,6 +66650,19 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/teleporter) +"qgk" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "qgm" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/secure_closet/personal, @@ -67366,35 +67338,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/quartermaster/warehouse) -"qti" = ( -/obj/item/book/manual/wiki/medicine, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/structure/cable/yellow, -/obj/machinery/power/apc{ - areastring = "/area/medical/cryo"; - dir = 4; - name = "Cryogenics APC"; - pixel_x = 24 - }, -/obj/item/wrench/medical, -/obj/structure/table/glass, -/obj/item/reagent_containers/syringe, -/turf/open/floor/iron/showroomfloor, -/area/medical/cryo) "qtn" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -67556,6 +67499,26 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/port/aft) +"qvp" = ( +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain) "qvr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -67958,15 +67921,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/engine/atmos) -"qCD" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bowl, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/turf/open/floor/iron/techmaint, -/area/security/prison) "qCI" = ( /obj/structure/girder/displaced, /turf/open/floor/plating, @@ -68128,6 +68082,31 @@ burnt = 1 }, /area/maintenance/starboard/fore) +"qFg" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/kitchen) "qFB" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -69026,17 +69005,6 @@ }, /turf/open/floor/noslip/white, /area/security/main) -"qVe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/quartermaster/warehouse) "qVl" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -69185,25 +69153,6 @@ }, /turf/open/floor/iron/dark, /area/hydroponics) -"qXR" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11; - pixel_y = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/loading_area, -/obj/machinery/door/window/southright{ - name = "Trash Chute"; - req_one_access_txt = "26" - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron, -/area/janitor) "qXV" = ( /obj/effect/spawner/randomvend/cola, /obj/effect/turf_decal/bot, @@ -69728,6 +69677,16 @@ /obj/structure/sign/warning/docking, /turf/closed/wall, /area/science/shuttledock) +"rft" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bucket, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating{ + broken = 1 + }, +/area/maintenance/central) "rfv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -69805,6 +69764,21 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/storage) +"rgL" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/chapel/main) "rgZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash, @@ -70437,29 +70411,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"rpF" = ( -/obj/structure/table, -/obj/item/folder, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -4 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 4 - }, -/obj/item/reagent_containers/dropper, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/science/xenobiology) "rqo" = ( /obj/effect/turf_decal/box, /obj/machinery/power/solar{ @@ -71172,6 +71123,46 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"rEb" = ( +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = 32 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/starkist{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/shamblers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/lemon_lime{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ + pixel_x = -4; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ + pixel_y = 20 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/aft) "rFb" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -74134,16 +74125,6 @@ broken = 1 }, /area/maintenance/aft) -"sHz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/bucket, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating{ - broken = 1 - }, -/area/maintenance/central) "sId" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -74420,31 +74401,6 @@ /obj/item/soap/nanotrasen, /turf/open/floor/noslip/white, /area/security/prison) -"sMK" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -3; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/bottle/holywater{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/chapel/office) "sMT" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/binary/pump{ @@ -76614,36 +76570,6 @@ }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) -"tyw" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/item/storage/box/syringes{ - pixel_x = 6; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = -7 - }, -/obj/machinery/light{ - bulb_colour = "#22bfa2"; - bulb_vacuum_colour = "#22bfa2"; - dir = 4; - nightshift_light_color = "#22bfa2" - }, -/turf/open/floor/iron/dark, -/area/medical/virology) "tyN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -77832,15 +77758,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/research) -"tXJ" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/delivery, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "tXU" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -77879,23 +77796,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/quartermaster/office) -"tZQ" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 6 - }, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/science, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/science/lab) "uad" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -78810,6 +78710,95 @@ /obj/machinery/fax/cargo, /turf/open/floor/iron, /area/quartermaster/storage) +"upK" = ( +/obj/item/restraints/handcuffs{ + pixel_y = 4 + }, +/obj/item/circuitboard/machine/chem_heater, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/structure/closet/crate/secure/plasma{ + name = "virology crate"; + req_access_txt = "39" + }, +/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted, +/turf/open/floor/iron/showroomfloor, +/area/medical/virology) "upL" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; @@ -79192,6 +79181,27 @@ }, /turf/open/floor/plating, /area/quartermaster/warehouse) +"uuH" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen_2"; + name = "Hallway Hatch" + }, +/obj/structure/window/reinforced, +/turf/open/floor/plating, +/area/crew_quarters/kitchen) "uuY" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -79903,19 +79913,6 @@ broken = 1 }, /area/maintenance/starboard) -"uGS" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/delivery, -/obj/machinery/light/small, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "uHp" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -80021,6 +80018,29 @@ burnt = 1 }, /area/bridge) +"uKa" = ( +/obj/structure/table/wood/fancy, +/obj/effect/turf_decal/stripes/corner, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/pen, +/obj/machinery/requests_console{ + department = "Chapel"; + departmentType = 2; + name = "Chapel RC"; + pixel_y = -30 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/chapel/office) "uKd" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 1 @@ -80195,6 +80215,29 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/science/mixing) +"uLP" = ( +/obj/structure/table, +/obj/item/folder, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 4 + }, +/obj/item/reagent_containers/dropper, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/science/xenobiology) "uMj" = ( /obj/structure/chair{ dir = 4 @@ -80463,12 +80506,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) -"uQT" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/grass, -/area/security/prison) "uRb" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/corner{ @@ -83726,19 +83763,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"vSy" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "vSA" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -84362,20 +84386,6 @@ "waD" = ( /turf/open/floor/plating/asteroid/airless, /area/quartermaster/warehouse) -"waM" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/chapel/main) "waU" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -85011,48 +85021,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"wkJ" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - color = "#439C1E" - }, -/obj/structure/closet/crate/secure/plasma{ - name = "virology crate"; - req_access_txt = "39" - }, -/obj/item/book/manual/wiki/infections, -/obj/item/book/manual/wiki/infections, -/obj/item/extrapolator, -/obj/item/storage/box/beakers{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/syringes{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/virology) "wkP" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -85142,24 +85110,6 @@ /obj/effect/loot_jobscale/medical/medkits, /turf/open/floor/iron/showroomfloor, /area/medical/storage) -"wms" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/multitool, -/obj/item/storage/toolbox/electrical, -/obj/item/multitool{ - pixel_x = 4 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/science/robotics/lab) "wmQ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/corner{ @@ -85346,6 +85296,25 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"wps" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11; + pixel_y = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/loading_area, +/obj/machinery/door/window/southright{ + name = "Trash Chute"; + req_one_access_txt = "26" + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/janitor) "wpt" = ( /obj/structure/closet/secure_closet/RD, /obj/effect/turf_decal/delivery, @@ -86643,6 +86612,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"wIv" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/small, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "wIP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/purple{ @@ -87650,6 +87632,27 @@ }, /turf/open/floor/plating, /area/engine/atmos) +"wXc" = ( +/obj/machinery/airalarm/directional/south{ + pixel_y = -22 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/maintenance/disposal) "wXg" = ( /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ @@ -87686,6 +87689,13 @@ name = "mainframe floor" }, /area/tcommsat/server) +"wXE" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "wXN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/room/threexthree, @@ -88136,6 +88146,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/engine/atmos) +"xeX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/quartermaster/warehouse) "xfb" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -89104,46 +89121,6 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, /area/security/main) -"xuS" = ( -/obj/structure/sign/directions/evac{ - dir = 8; - pixel_y = 32 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/starkist{ - pixel_x = 10; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/soda_cans/shamblers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/soda_cans/lemon_lime{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/soda_cans/pwr_game{ - pixel_x = -4; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = 6; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ - pixel_y = 20 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/aft) "xuX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -89317,6 +89294,24 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/aft) +"xyt" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/multitool, +/obj/item/storage/toolbox/electrical, +/obj/item/multitool{ + pixel_x = 4 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/science/robotics/lab) "xyv" = ( /obj/structure/sign/departments/engineering{ pixel_x = 32; @@ -90268,6 +90263,16 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"xOz" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/sign/warning/securearea{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "xON" = ( /obj/machinery/computer/holodeck/prison, /obj/effect/turf_decal/stripes/line{ @@ -90695,6 +90700,16 @@ burnt = 1 }, /area/maintenance/starboard) +"xVd" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/kitchen/rollingpin, +/obj/item/clothing/head/utility/chefhat, +/turf/open/floor/iron/techmaint, +/area/security/prison) "xVl" = ( /obj/effect/turf_decal/bot, /turf/open/floor/glass/reinforced, @@ -91280,21 +91295,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/bar/atrium) -"yeC" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/chapel/main) "yeI" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -108976,7 +108976,7 @@ qvH qvH nmY vbU -eja +xVd bQy hEG ciO @@ -109233,7 +109233,7 @@ qvH qvH jel iTH -qCD +npf aav mkY aXg @@ -109510,7 +109510,7 @@ gSb njG uoK njG -giB +xOz eyz njG aaa @@ -110797,7 +110797,7 @@ mbD hbo fmb woS -bkU +gYn wVu aUz aaa @@ -111028,7 +111028,7 @@ aav ijY epb ukl -izu +nKS qbu iQT gJr @@ -111246,7 +111246,7 @@ aNG pUD fbp ixg -qti +bbG nfy iVR fzU @@ -112289,7 +112289,7 @@ dbg lkt aQW afe -oMW +mBH cBi oDA afe @@ -112313,8 +112313,8 @@ uFY lCW yhn tja -uQT -dpY +nDC +etq avR rnM nhx @@ -112797,7 +112797,7 @@ xfL exk hDh aNn -hec +ouh yak cJW swl @@ -113311,7 +113311,7 @@ ttH prh jGn aQW -dpR +hqf yak vIG kwL @@ -113322,8 +113322,8 @@ bMi wKN bAN aWM -wkJ -juC +lAa +upK jWX aoH tjn @@ -114347,7 +114347,7 @@ buc soa ruo drQ -tyw +iAJ qyz iNU vlT @@ -114836,7 +114836,7 @@ aWG wCV btf btk -btq +uKa aWG hQz phw @@ -115348,7 +115348,7 @@ sSv kRL bsm xTj -sMK +hGj xna lXA aWG @@ -115861,7 +115861,7 @@ abN alf unx aWG -bta +oNw btC vJx gfr @@ -116380,7 +116380,7 @@ aWG bto xEe aWG -waM +ohR raS bwX btA @@ -116637,7 +116637,7 @@ bsm aWG cJQ aWG -yeC +rgL qZQ xqa wRe @@ -116672,7 +116672,7 @@ aoh prB bEY cIB -eWx +gEQ nHM aoA wUH @@ -118191,7 +118191,7 @@ ant uRI iEg btH -iAH +iod gbc lSB iAC @@ -119426,7 +119426,7 @@ aAg aAg asZ asZ -dAW +agN asZ asZ aAg @@ -119743,7 +119743,7 @@ rFb apX bkj qyJ -boy +gZV apX bmJ bAm @@ -120197,7 +120197,7 @@ aay acd cdY cdZ -cdW +gbr cdY acx acR @@ -120711,7 +120711,7 @@ aaU aaN cdZ cdY -cfK +lZd cdY abV acj @@ -121482,7 +121482,7 @@ asZ asZ aAg asZ -bLM +dZB asZ aAg asZ @@ -124378,7 +124378,7 @@ aox aox bAx asx -aqK +qvp azC bHG cIE @@ -124386,7 +124386,7 @@ cIL asx asx bOM -sHz +rft kPh aox vln @@ -125905,7 +125905,7 @@ bqK xjj lBA xfM -brB +pzi bar izD ajt @@ -125924,7 +125924,7 @@ rhI dcE cIA bnT -uGS +wIv bmM wlv bew @@ -126138,7 +126138,7 @@ aLh evG iny cDD -pmx +exI cFm vzg ejK @@ -126168,7 +126168,7 @@ jlV brQ jfd tNl -nZh +qFg mmO uZa bjn @@ -126416,7 +126416,7 @@ rKa ggQ bna dNG -lZo +bHy eIg ucI kLS @@ -126424,7 +126424,7 @@ eeK ohZ dsr fKZ -nPI +cKw xQc ubM icj @@ -126936,7 +126936,7 @@ teM teM teM fRS -bnL +lJJ fNb jJE pbs @@ -126953,7 +126953,7 @@ urA vgt drL kEB -nLF +ppB bmM aZd hdf @@ -127191,7 +127191,7 @@ ybb hCi snt wou -cYd +bpR qjA ajt dxY @@ -127206,8 +127206,8 @@ pmM yar sXZ vNK -vSy -tXJ +qgk +oYX boa boh bon @@ -127454,7 +127454,7 @@ bwi ajt rGx bph -bmS +uuH bmZ aZd bqS @@ -127694,7 +127694,7 @@ ixh gjd pzN eLw -wms +xyt aYH vOl rKa @@ -128991,7 +128991,7 @@ vpZ bch aYd vmw -tZQ +drK aYd bfn cbk @@ -129021,7 +129021,7 @@ bNM wAq lis siW -qXR +wps cjz bNv yaT @@ -129222,7 +129222,7 @@ nJt bzt nJt uZV -rpF +uLP dNN iBw dZe @@ -129789,7 +129789,7 @@ eEB cZB xGh bNM -nkq +pPm vqC wag bOH @@ -130344,7 +130344,7 @@ fkE coC cNF iKN -jQD +wXc cnu cnu cnd @@ -130509,7 +130509,7 @@ bbx aWJ bfs alB -kRc +dOp uhr ewi baL @@ -131280,7 +131280,7 @@ alB bwe bwe alB -xuS +rEb qSD aSr aZF @@ -132352,7 +132352,7 @@ ags exE inM bhQ -bNT +wXE bSz dpg qJq @@ -144596,7 +144596,7 @@ hHu cCU gzN rag -qVe +caP act tjz vpC @@ -144851,7 +144851,7 @@ abq iHi lga fde -lXx +oau wtt oGh act @@ -146659,7 +146659,7 @@ sMc iCX kHh act -jcF +dhi ega wKL cCr @@ -147941,7 +147941,7 @@ pWT kfw fnM lYs -htk +xeX dDY act act diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0271a1ec07e76..b50d40b457b81 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1120,6 +1120,32 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/port/fore) +"ald" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/wrench/medical, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/medical/patients_rooms) "aln" = ( /obj/machinery/computer/holodeck{ dir = 4 @@ -4241,24 +4267,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/crew_quarters/dorms) -"aKp" = ( -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/reagent_containers/spray/pestspray{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/bottle/nutrient/ez, -/obj/item/reagent_containers/cup/bottle/nutrient/rh{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/structure/table, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/hydroponics/garden) "aKq" = ( /obj/machinery/biogenerator, /obj/machinery/firealarm{ @@ -4267,19 +4275,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/hydroponics/garden) -"aKr" = ( -/obj/structure/table, -/obj/item/cultivator, -/obj/item/hatchet, -/obj/item/crowbar, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/hydroponics/garden) "aKt" = ( /obj/item/seeds/apple, /obj/item/seeds/banana, @@ -5794,18 +5789,6 @@ }, /turf/open/floor/iron, /area/hydroponics/garden) -"aSk" = ( -/obj/structure/table, -/obj/item/hatchet, -/obj/item/cultivator, -/obj/item/crowbar, -/obj/item/reagent_containers/cup/bucket, -/obj/item/plant_analyzer, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics/garden) "aSn" = ( /obj/item/storage/bag/plants/portaseeder, /obj/structure/table, @@ -6975,70 +6958,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) -"aZQ" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = -10; - pixel_y = 22 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = -27 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = -10; - pixel_y = -25 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - pixel_x = 4; - req_access_txt = "16" - }, -/turf/open/floor/circuit/green, -/area/ai_monitored/turret_protected/ai) -"aZY" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = 10; - pixel_y = 22 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 27 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = 10; - pixel_y = -25 - }, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Tertiary AI Core Access"; - obj_integrity = 300; - pixel_x = -3; - req_access_txt = "16" - }, -/turf/open/floor/circuit/green, -/area/ai_monitored/turret_protected/ai) "aZZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -7376,6 +7295,15 @@ "bbY" = ( /turf/open/floor/iron, /area/hallway/primary/port) +"bbZ" = ( +/obj/structure/table/glass, +/obj/item/storage/box/donkpockets, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/engine/break_room) "bcc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -8207,19 +8135,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) -"bhu" = ( -/obj/machinery/light_switch{ - pixel_y = -25 - }, -/obj/structure/table/wood, -/obj/item/razor{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/reagent_containers/cup/glass/flask/gold, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) "bhv" = ( /obj/item/kirbyplants/random, /turf/open/floor/carpet/royalblue, @@ -10025,6 +9940,15 @@ /obj/item/stamp/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) +"btj" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron, +/area/hydroponics) "btu" = ( /obj/item/storage/toolbox/emergency, /obj/effect/spawner/lootdrop/maintenance, @@ -10657,11 +10581,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain/private) -"byr" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/shaker, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) "byv" = ( /obj/machinery/firealarm{ dir = 4; @@ -12233,34 +12152,6 @@ }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) -"bHJ" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = 7; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark_blue, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "bHK" = ( /obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; @@ -14573,24 +14464,6 @@ }, /turf/open/floor/iron, /area/hydroponics) -"bUn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) -"bUo" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/iron, -/area/hydroponics) "bUq" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -15185,14 +15058,6 @@ }, /turf/open/floor/iron, /area/hydroponics) -"bYn" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bowl, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/prison, -/area/security/prison) "bYs" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -16767,71 +16632,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/quartermaster/office) -"cmb" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/bottle/chloralhydrate, -/obj/item/reagent_containers/cup/bottle/toxin{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/cup/bottle/facid{ - name = "fluorosulfuric acid bottle"; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/reagent_containers/syringe{ - pixel_y = 5 - }, -/obj/item/reagent_containers/dropper, -/obj/machinery/button/ignition{ - id = "executionburn"; - name = "Justice Ignition Switch"; - pixel_x = -25; - pixel_y = 36 - }, -/obj/machinery/button/door{ - id = "executionfireblast"; - name = "Justice Area Lockdown"; - pixel_x = -25; - pixel_y = 26; - req_access_txt = "2" - }, -/obj/item/assembly/signaler{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/button/flasher{ - id = "justiceflash"; - name = "Justice Flash Control"; - pixel_x = -36; - pixel_y = 36; - req_access_txt = "1" - }, -/obj/machinery/button/door{ - id = "SecJusticeChamber"; - name = "Justice Vent Control"; - pixel_x = -36; - pixel_y = 26; - req_access_txt = "3" - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/security/execution/education) "cmc" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment, @@ -17001,19 +16801,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) -"cou" = ( -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/science/shuttledock) "cow" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17905,6 +17692,28 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"cwo" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/crew_quarters/fitness/recreation) "cwA" = ( /turf/open/floor/iron/white, /area/medical/genetics) @@ -18010,23 +17819,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"cxP" = ( -/obj/structure/table/wood/poker, -/obj/item/toy/cards/deck{ - pixel_x = -13; - pixel_y = -10 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -8; - pixel_y = 8 - }, -/obj/item/holochip{ - credits = 30; - pixel_x = 5; - pixel_y = -4 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttledock) "cxT" = ( /obj/machinery/light{ dir = 4; @@ -18147,26 +17939,6 @@ }, /turf/open/floor/iron/dark, /area/science/xenobiology) -"cyJ" = ( -/obj/structure/table/glass, -/obj/item/stack/sheet/mineral/plasma{ - amount = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/dropper, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/science/xenobiology) "cyK" = ( /obj/structure/chair/office/light{ dir = 1 @@ -18558,20 +18330,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/robotics/lab) -"cDe" = ( -/obj/structure/sign/warning/nosmoking{ - pixel_y = 32 - }, -/obj/structure/rack, -/obj/item/book/manual/wiki/robotics_cyborgs{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/storage/belt/utility, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/science/robotics/lab) "cDi" = ( /turf/closed/wall, /area/science/robotics/lab) @@ -19742,6 +19500,34 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"cPY" = ( +/obj/structure/table/glass, +/obj/item/folder/white{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -2; + pixel_y = -4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/requests_console{ + department = "Chemistry Lab"; + name = "Chemistry RC"; + pixel_x = 32; + pixel_y = -2; + receive_ore_updates = 1 + }, +/turf/open/floor/iron, +/area/medical/chemistry) "cPZ" = ( /obj/structure/closet/crate/coffin, /turf/open/floor/plating, @@ -21198,6 +20984,34 @@ }, /turf/open/floor/engine, /area/engine/supermatter) +"dfn" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "dfp" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -21707,21 +21521,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"diw" = ( -/obj/machinery/firealarm{ - pixel_y = 29 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/wrench, -/obj/item/reagent_containers/cup/bucket, -/obj/item/cultivator, -/obj/item/wirecutters, -/turf/open/floor/iron, -/area/hydroponics) "diz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -23372,16 +23171,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/storage_shared) -"dJG" = ( -/obj/structure/table/reinforced, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -2; - pixel_y = 13 - }, -/obj/item/clothing/head/utility/chefhat, -/turf/open/floor/prison, -/area/security/prison) "dJI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -24009,6 +23798,71 @@ }, /turf/open/floor/iron, /area/medical/storage) +"dVH" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/toxin{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/cup/bottle/facid{ + name = "fluorosulfuric acid bottle"; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/reagent_containers/syringe{ + pixel_y = 5 + }, +/obj/item/reagent_containers/dropper, +/obj/machinery/button/ignition{ + id = "executionburn"; + name = "Justice Ignition Switch"; + pixel_x = -25; + pixel_y = 36 + }, +/obj/machinery/button/door{ + id = "executionfireblast"; + name = "Justice Area Lockdown"; + pixel_x = -25; + pixel_y = 26; + req_access_txt = "2" + }, +/obj/item/assembly/signaler{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/button/flasher{ + id = "justiceflash"; + name = "Justice Flash Control"; + pixel_x = -36; + pixel_y = 36; + req_access_txt = "1" + }, +/obj/machinery/button/door{ + id = "SecJusticeChamber"; + name = "Justice Vent Control"; + pixel_x = -36; + pixel_y = 26; + req_access_txt = "3" + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/obj/machinery/airalarm/all_access{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/security/execution/education) "dWb" = ( /obj/machinery/computer/shuttle_flight/mining{ dir = 4 @@ -26109,6 +25963,23 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/central) +"ePG" = ( +/obj/structure/rack, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/trackimp, +/obj/item/storage/lockbox/loyalty, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/machinery/light/small, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -26 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/security/main) "eQa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -26799,6 +26670,11 @@ }, /turf/open/floor/iron/smooth_half, /area/security/prison) +"feb" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "feW" = ( /turf/open/floor/iron, /area/maintenance/department/medical/central) @@ -28502,21 +28378,6 @@ }, /turf/open/floor/iron, /area/medical/storage) -"fIY" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "Serving Hatch" - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -3 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 3 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "fJp" = ( /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark/smooth_corner, @@ -29433,6 +29294,24 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"fZX" = ( +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/pestspray{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/structure/table, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/hydroponics/garden) "fZY" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -29825,6 +29704,18 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) +"ghT" = ( +/obj/structure/table, +/obj/item/hatchet, +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/reagent_containers/cup/bucket, +/obj/item/plant_analyzer, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics/garden) "giF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -29970,14 +29861,6 @@ /obj/item/restraints/handcuffs, /turf/open/floor/iron/dark/smooth_large, /area/security/main) -"glg" = ( -/obj/structure/table/wood/poker, -/obj/item/reagent_containers/cup/glass/bottle/wine{ - pixel_x = -9; - pixel_y = 6 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttledock) "glr" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30011,6 +29894,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/gravity_generator) +"glP" = ( +/obj/structure/sign/warning/nosmoking{ + pixel_y = 32 + }, +/obj/structure/rack, +/obj/item/book/manual/wiki/robotics_cyborgs{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/storage/belt/utility, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/science/robotics/lab) "gme" = ( /obj/item/radio/intercom{ pixel_y = 21 @@ -30688,6 +30585,29 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"gEa" = ( +/obj/machinery/button/door{ + id = "chemistbot"; + name = "Chemistry Shutter Control"; + pixel_x = -36; + pixel_y = 37; + req_access_txt = "33" + }, +/obj/item/radio/intercom{ + pixel_x = -32; + pixel_y = 23 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/iron, +/area/medical/chemistry) "gEg" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -30737,91 +30657,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"gEW" = ( -/obj/item/reagent_containers/cup/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/aluminium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sulfur{ - pixel_x = -6 - }, -/obj/structure/closet/crate/medical, -/obj/effect/turf_decal/box, -/obj/item/circuitboard/machine/chem_heater, -/obj/machinery/firealarm/directional/west, -/obj/machinery/camera/directional/west, -/turf/open/floor/iron, -/area/medical/virology) "gEX" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/closet/crate{ @@ -30907,6 +30742,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"gGw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/structure/sign/poster/random{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/janitor) "gGB" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -31303,6 +31151,30 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"gPx" = ( +/obj/structure/table, +/obj/item/food/grown/tomato/blood{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/machinery/vending/wallmed{ + contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); + name = "Upgraded NanoMed"; + pixel_x = -1; + pixel_y = -32; + premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); + products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) + }, +/obj/item/reagent_containers/dropper{ + pixel_x = 2; + pixel_y = -5 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "gPy" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -31781,6 +31653,19 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"gWD" = ( +/obj/machinery/light_switch{ + pixel_y = -25 + }, +/obj/structure/table/wood, +/obj/item/razor{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/reagent_containers/cup/glass/flask/gold, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "gWG" = ( /obj/structure/rack, /obj/item/storage/box/syringes{ @@ -34556,15 +34441,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) -"hVW" = ( -/obj/structure/table/glass, -/obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/engine/break_room) "hVX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -34864,6 +34740,14 @@ }, /turf/open/floor/iron, /area/maintenance/disposal) +"icb" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bowl, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/prison, +/area/security/prison) "icd" = ( /obj/machinery/door/airlock/research/glass{ name = "science Shuttle Dock"; @@ -35742,6 +35626,23 @@ "irA" = ( /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) +"irE" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck{ + pixel_x = -13; + pixel_y = -10 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/holochip{ + credits = 30; + pixel_x = 5; + pixel_y = -4 + }, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) "irK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36166,33 +36067,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/crew_quarters/heads/hor) -"iBJ" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light, -/obj/item/stack/sheet/mineral/plasma{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_x = 5 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_x = 9 - }, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/dropper, -/obj/item/storage/box/beakers{ - pixel_x = -6; - pixel_y = 9 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "iBM" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, @@ -37184,30 +37058,6 @@ }, /turf/open/floor/iron, /area/engine/break_room) -"iTJ" = ( -/obj/structure/table, -/obj/item/food/grown/tomato/blood{ - pixel_x = 7; - pixel_y = 8 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/machinery/vending/wallmed{ - contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); - name = "Upgraded NanoMed"; - pixel_x = -1; - pixel_y = -32; - premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) - }, -/obj/item/reagent_containers/dropper{ - pixel_x = 2; - pixel_y = -5 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "iTT" = ( /obj/machinery/firealarm{ dir = 4; @@ -37681,6 +37531,16 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"jgA" = ( +/obj/structure/table/reinforced, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -2; + pixel_y = 13 + }, +/obj/item/clothing/head/utility/chefhat, +/turf/open/floor/prison, +/area/security/prison) "jgG" = ( /obj/effect/turf_decal/tile/red/half, /obj/structure/extinguisher_cabinet{ @@ -38056,6 +37916,15 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plating, /area/medical/morgue) +"jru" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hydroponics) "jrE" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -38210,6 +38079,28 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"jtD" = ( +/obj/machinery/turretid{ + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = 3; + pixel_y = -23 + }, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/newscaster{ + pixel_x = 4; + pixel_y = 33 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/ai) "jtK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38943,6 +38834,18 @@ }, /turf/open/floor/wood/big, /area/crew_quarters/bar) +"jIT" = ( +/obj/structure/table/wood/poker, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = 8; + pixel_y = 12 + }, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) "jJj" = ( /obj/machinery/camera/directional/east{ c_tag = "Teleporter Room" @@ -40207,6 +40110,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) +"kfb" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/item/storage/bag/plants, +/obj/item/reagent_containers/cup/bucket, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/kitchen/rollingpin, +/obj/item/book/manual/wiki/sopservice, +/turf/open/floor/iron, +/area/hallway/secondary/service) "kfm" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/airalarm/directional/north{ @@ -40327,29 +40242,6 @@ "kiq" = ( /turf/open/floor/iron/freezer, /area/security/prison) -"kir" = ( -/obj/machinery/button/door{ - id = "chemistbot"; - name = "Chemistry Shutter Control"; - pixel_x = -36; - pixel_y = 37; - req_access_txt = "33" - }, -/obj/item/radio/intercom{ - pixel_x = -32; - pixel_y = 23 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker/large, -/turf/open/floor/iron, -/area/medical/chemistry) "kiA" = ( /obj/structure/sign/warning/radiation/rad_area{ pixel_y = 32 @@ -40918,6 +40810,19 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"kuA" = ( +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/science/shuttledock) "kuC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, @@ -42944,21 +42849,6 @@ }, /turf/open/floor/iron/white/textured_large, /area/security/brig) -"ljh" = ( -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/camera/directional/north{ - c_tag = "AI Chamber - Core" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai) "ljm" = ( /obj/machinery/door/airlock{ name = "Toilet Unit" @@ -43724,17 +43614,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) -"lyj" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/holywater{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/organ/heart, -/obj/item/soulstone/anybody/chaplain, -/obj/item/book/granter/spell/smoke/lesser, -/turf/open/floor/cult, -/area/chapel/office) "lyF" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -44097,6 +43976,17 @@ }, /turf/open/floor/iron/dark/smooth_half, /area/security/brig) +"lGc" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/organ/heart, +/obj/item/soulstone/anybody/chaplain, +/obj/item/book/granter/spell/smoke/lesser, +/turf/open/floor/cult, +/area/chapel/office) "lGm" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -44444,6 +44334,34 @@ }, /turf/open/floor/iron, /area/science/robotics/mechbay) +"lLe" = ( +/obj/structure/rack, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -5 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -5 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) "lLf" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Upload"; @@ -44806,6 +44724,17 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"lRg" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag{ + pixel_y = 5 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "lRs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44931,6 +44860,33 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"lST" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = 5 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = 9 + }, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/beakers{ + pixel_x = -6; + pixel_y = 9 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "lTw" = ( /obj/structure/window/reinforced{ dir = 8 @@ -45121,34 +45077,6 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"lXA" = ( -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -2; - pixel_y = -4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/requests_console{ - department = "Chemistry Lab"; - name = "Chemistry RC"; - pixel_x = 32; - pixel_y = -2; - receive_ore_updates = 1 - }, -/turf/open/floor/iron, -/area/medical/chemistry) "lXH" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -48082,6 +48010,19 @@ }, /turf/open/floor/iron, /area/medical/genetics) +"mZk" = ( +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/shuttledock) "mZn" = ( /obj/structure/table/wood, /obj/structure/cable/yellow{ @@ -49727,34 +49668,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"nIt" = ( -/obj/structure/rack, -/obj/item/storage/firstaid/regular, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -5 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -5 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -8; - pixel_y = -2 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -8; - pixel_y = -2 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttledock) "nII" = ( /obj/structure/table/reinforced, /obj/item/transfer_valve{ @@ -50050,23 +49963,6 @@ /obj/machinery/digital_clock/directional, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) -"nNC" = ( -/obj/structure/rack, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/trackimp, -/obj/item/storage/lockbox/loyalty, -/obj/item/reagent_containers/cup/bottle/morphine, -/obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/security/main) "nNG" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;4;5;6;29" @@ -50398,28 +50294,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/aft) -"nSE" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/fitness/recreation) "nSF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -51237,6 +51111,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) +"ogP" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "ohh" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ name = "euthanization chamber freezer" @@ -52943,6 +52830,25 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"oJk" = ( +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 8 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "oJn" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -54426,18 +54332,6 @@ /obj/item/xenoartifact, /turf/open/floor/engine, /area/science/explab) -"ppT" = ( -/obj/structure/table/wood/poker, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = 8; - pixel_y = 12 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttledock) "ppV" = ( /obj/structure/disposalpipe/segment, /obj/machinery/holopad, @@ -55487,6 +55381,17 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"pLS" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "pLY" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -55675,6 +55580,21 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"pPq" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Serving Hatch" + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "pPJ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -56487,6 +56407,14 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) +"qdo" = ( +/obj/structure/table/wood/poker, +/obj/item/reagent_containers/cup/glass/bottle/wine{ + pixel_x = -9; + pixel_y = 6 + }, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) "qdC" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -60166,17 +60094,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"rwt" = ( -/obj/structure/table, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 3 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -3 - }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "rxb" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "kitchen"; @@ -60913,32 +60830,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"rMj" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/pill_bottle/mannitol, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/wrench/medical, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/medical/patients_rooms) "rMo" = ( /obj/structure/cable{ icon_state = "0-8" @@ -63433,17 +63324,6 @@ }, /turf/open/floor/iron, /area/science/storage) -"sGn" = ( -/obj/item/cultivator, -/obj/item/crowbar, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/cup/bucket, -/obj/structure/table/glass, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "sGG" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -63668,6 +63548,19 @@ /obj/effect/mapping_helpers/make_non_slip, /turf/open/floor/iron, /area/engine/engineering) +"sKq" = ( +/obj/structure/table, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/crowbar, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/hydroponics/garden) "sKv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65976,6 +65869,21 @@ /mob/living/carbon/monkey, /turf/open/floor/iron/freezer, /area/medical/genetics) +"tAZ" = ( +/obj/machinery/firealarm{ + pixel_y = 29 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/cup/bucket, +/obj/item/cultivator, +/obj/item/wirecutters, +/turf/open/floor/iron, +/area/hydroponics) "tBl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -66232,30 +66140,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"tGk" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "tGF" = ( /obj/structure/table, /obj/item/storage/box/evidence, @@ -66500,19 +66384,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) -"tLJ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -3 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 3 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "tLK" = ( /obj/structure/chair{ dir = 4 @@ -68484,6 +68355,38 @@ }, /turf/closed/wall, /area/quartermaster/sorting) +"uuJ" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 10; + pixel_y = 22 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 27 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = 10; + pixel_y = -25 + }, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Tertiary AI Core Access"; + atom_integrity = 300; + pixel_x = -3; + req_access_txt = "16" + }, +/turf/open/floor/circuit/green, +/area/ai_monitored/turret_protected/ai) "uuZ" = ( /obj/machinery/light{ dir = 1 @@ -68751,25 +68654,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/aft) -"uzP" = ( -/obj/structure/table/reinforced, -/obj/structure/desk_bell{ - pixel_x = 8 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "uAd" = ( /obj/machinery/door/poddoor/preopen{ id = "executionfireblast" @@ -69823,6 +69707,26 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/white, /area/science/xenobiology) +"uUg" = ( +/obj/structure/table/glass, +/obj/item/stack/sheet/mineral/plasma{ + amount = 4; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/dropper, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/science/xenobiology) "uUA" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -70412,19 +70316,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) -"vfv" = ( -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = -4; - pixel_y = -7 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/shuttledock) "vfy" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -71509,6 +71400,38 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) +"vzK" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = -10; + pixel_y = 22 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = -27 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = -10; + pixel_y = -25 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + pixel_x = 4; + req_access_txt = "16" + }, +/turf/open/floor/circuit/green, +/area/ai_monitored/turret_protected/ai) "vzS" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/delivery/red, @@ -72016,17 +71939,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/central) -"vJj" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 5 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 6 - }, -/obj/item/food/mint, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "vJo" = ( /obj/machinery/power/apc{ areastring = "/area/construction/storage_wing"; @@ -72421,6 +72333,17 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"vOq" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 5 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 6 + }, +/obj/item/food/mint, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "vOs" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -73065,18 +72988,6 @@ }, /turf/open/floor/iron/white/smooth_corner, /area/security/brig) -"wdI" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table, -/obj/item/storage/bag/plants, -/obj/item/reagent_containers/cup/bucket, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/kitchen/rollingpin, -/obj/item/book/manual/wiki/sopservice, -/turf/open/floor/iron, -/area/hallway/secondary/service) "wdQ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -73395,17 +73306,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"wld" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/reagent_containers/cup/rag{ - pixel_y = 5 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "wlg" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -76459,19 +76359,6 @@ "xol" = ( /turf/closed/wall, /area/medical/medbay/aft) -"xop" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/structure/sign/poster/random{ - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/janitor) "xoA" = ( /obj/machinery/camera/directional/north, /obj/machinery/power/apc{ @@ -77444,28 +77331,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/aisat) -"xFe" = ( -/obj/machinery/turretid{ - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = 3; - pixel_y = -23 - }, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/newscaster{ - pixel_x = 4; - pixel_y = 33 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai) "xFt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -77802,6 +77667,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/aft) +"xKt" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "xLb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -77814,6 +77703,91 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) +"xLx" = ( +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/structure/closet/crate/medical, +/obj/effect/turf_decal/box, +/obj/item/circuitboard/machine/chem_heater, +/obj/machinery/firealarm/directional/west, +/obj/machinery/camera/directional/west, +/turf/open/floor/iron, +/area/medical/virology) "xLI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -78181,6 +78155,21 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"xRG" = ( +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/camera/directional/north{ + c_tag = "AI Chamber - Core" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/ai) "xSa" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot, @@ -78702,6 +78691,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/brig) +"ybm" = ( +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/bucket, +/obj/structure/table/glass, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "ybn" = ( /obj/structure/chair/fancy/comfy, /obj/effect/landmark/blobstart, @@ -98701,7 +98701,7 @@ dle wEb npX rEg -gEW +xLx osp fKN dDz @@ -98956,7 +98956,7 @@ dSx jNU ybs lzI -tGk +xKt gFh vdt lzI @@ -99218,7 +99218,7 @@ dQx mnd coa lzI -iTJ +gPx cDL avr avr @@ -100737,7 +100737,7 @@ mpW mpW feW ycr -rMj +ald smE nqq vNW @@ -101795,7 +101795,7 @@ cCe eEV jRz cLa -lyj +lGc cLa oUI cOh @@ -102720,9 +102720,9 @@ ttO ttO ttO ttO -bYn +icb kZQ -dJG +jgA qOU tlg aqj @@ -103232,7 +103232,7 @@ abx abV acm uAd -cmb +dVH adm sdu iiC @@ -103819,7 +103819,7 @@ bSS bSS nll lJT -uzP +oJk bya otF vxg @@ -104587,7 +104587,7 @@ aYX iov bXN mdh -bHJ +dfn tMi sRD lQG @@ -105107,7 +105107,7 @@ uNs rhj wsV fHf -kir +gEa pFa gvA acB @@ -105627,7 +105627,7 @@ pYp gVH spm kUs -iBJ +lST cga oIj rdQ @@ -106135,7 +106135,7 @@ oJb aAv tiS rrO -lXA +cPY kKG uml wsV @@ -106327,7 +106327,7 @@ jIc veD fnW ipQ -nNC +ePG aqa lFK qUA @@ -108724,7 +108724,7 @@ ctL ctL ctL cCq -cDe +glP fzR oPJ gHe @@ -109699,7 +109699,7 @@ iCU bcj bdI bfz -bhu +gWD bjg egk bjg @@ -109965,7 +109965,7 @@ bqX cDV dCP mZn -byr +feb iWz bcj bDs @@ -112296,7 +112296,7 @@ soe oxO oxO mkI -sGn +ybm tjn vgq bSS @@ -112534,7 +112534,7 @@ boM brd bmO nXB -wld +lRg oFU eaJ eNK @@ -112804,7 +112804,7 @@ hfh ujJ paP qqj -vJj +vOq bST bUf vWU @@ -113059,7 +113059,7 @@ blf rxb ujJ ujJ -rwt +pLS qqj nSl bST @@ -113602,7 +113602,7 @@ cvX lft cwY thn -cyJ +uUg cSt pVv gWG @@ -113827,7 +113827,7 @@ xTu kJK xTu blf -fIY +pPq ujJ nuZ wde @@ -114078,7 +114078,7 @@ kky bmP ifc jIy -tLJ +ogP tkd xTu kJK @@ -114797,7 +114797,7 @@ aaa aaf aaa acQ -nSE +cwo kAr mbZ tsT @@ -115119,7 +115119,7 @@ bOX bQI uee bST -bUn +jru mPh gzi nrx @@ -115376,7 +115376,7 @@ rFZ rFZ aoW bST -bUo +btj bVy bWU xSD @@ -115594,7 +115594,7 @@ dIq aCH eYL aJh -aKp +fZX hWI vAZ oUR @@ -115857,7 +115857,7 @@ aNi mlI aNi cNf -aSk +ghT aJh ltK dnR @@ -116108,7 +116108,7 @@ mpL hmU twq aJh -aKr +sKq mhI aNi lcQ @@ -116149,7 +116149,7 @@ cgF bSY bUq bKe -diw +tAZ pvg sLD gba @@ -116663,7 +116663,7 @@ byN rPM tUh bVz -wdI +kfb nKe bVz ogw @@ -116684,10 +116684,10 @@ ovj mjJ nBT lzk -cou -nIt +kuA +lLe qjB -ppT +jIT jqu pVN dJI @@ -116943,8 +116943,8 @@ xGh ubB eal oFp -cxP -glg +irE +qdo tMl fmT ggj @@ -117457,7 +117457,7 @@ mjJ mjJ kvL uFK -vfv +mZk hUs hUs bxk @@ -117955,7 +117955,7 @@ oxX bcd xdW lUZ -xop +gGw kwL bcd nbv @@ -121009,7 +121009,7 @@ iKI iKI ofV fvZ -hVW +bbZ bne owR owR @@ -133338,7 +133338,7 @@ aRy aTV aTV aTV -aZQ +vzK aTV aTV aTV @@ -134109,7 +134109,7 @@ aTV aVn aWN aTV -xFe +jtD aTV aTV sUk @@ -134623,7 +134623,7 @@ aTX taY aWP aTV -ljh +xRG aTV aTV bew @@ -135394,7 +135394,7 @@ aRy aTV aTV aTV -aZY +uuJ aTV aTV aTV diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index 23d9aa66dabee..9dc77b97fe12b 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -12,25 +12,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/tech, /area/engine/engine_room) -"aak" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 32; - pixel_y = -1 - }, -/obj/structure/closet/secure_closet/captains, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = 3; - pixel_y = 8 - }, -/obj/item/pinpointer/nuke{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain/private) "aap" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -843,6 +824,20 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"ane" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 13; + pixel_y = 17 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "anx" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -1338,6 +1333,30 @@ /obj/structure/sign/departments/minsky/research/dorms, /turf/closed/wall, /area/maintenance/central) +"aug" = ( +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 9 + }, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = -10; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/table/glass, +/turf/open/floor/iron, +/area/medical/cryo) "aui" = ( /obj/machinery/conveyor{ id = "MailConv" @@ -2571,29 +2590,6 @@ "aNU" = ( /turf/closed/wall/r_wall, /area/ai_monitored/storage/satellite) -"aOm" = ( -/obj/structure/table, -/obj/item/food/spaghetti/meatballspaghetti{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/absinthe{ - pixel_x = -10; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 3; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 9; - pixel_y = 10 - }, -/obj/item/candle/infinite{ - pixel_x = 8 - }, -/turf/open/floor/iron/dark, -/area/security/execution/education) "aOq" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -3064,22 +3060,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/carpet/royalblack, /area/library) -"aVk" = ( -/obj/machinery/light{ - light_color = "#7AC3FF" - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 25 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 21 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "aVu" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -4250,6 +4230,40 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"bqq" = ( +/obj/effect/turf_decal/tile/black/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -8 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 4 + }, +/obj/item/shovel/spade{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/cultivator{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/iron/techmaint, +/area/security/prison) "bqy" = ( /obj/machinery/requests_console{ department = "Security"; @@ -4366,18 +4380,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"brj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/mortar, -/obj/item/pestle, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron, -/area/vacant_room/commissary/commissary2) "brn" = ( /obj/structure/railing/corner{ dir = 1 @@ -5760,20 +5762,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"bPM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 8 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 13; - pixel_y = 17 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "bPR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6610,6 +6598,15 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"cey" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/paper, +/turf/open/floor/wood, +/area/security/prison) "ceW" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -7261,6 +7258,43 @@ }, /turf/open/floor/iron/dark, /area/storage/primary) +"col" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/obj/item/wallframe/defib_mount, +/obj/item/clothing/neck/stethoscope{ + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/medical/sleeper) "cow" = ( /obj/effect/turf_decal/tile/neutral/half, /obj/machinery/camera/directional/east, @@ -7279,22 +7313,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/chemistry) -"coF" = ( -/obj/machinery/reagentgrinder, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -9; - pixel_y = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "coH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -7874,91 +7892,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/security/checkpoint/medical) -"cxD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/closet/crate/medical, -/obj/item/reagent_containers/cup/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/aluminium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sulfur{ - pixel_x = -6 - }, -/obj/item/circuitboard/machine/chem_heater, -/turf/open/floor/iron/dark, -/area/medical/virology) "cxF" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -9708,17 +9641,6 @@ }, /turf/open/floor/iron/dark/side, /area/hallway/primary/central) -"dcy" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/machinery/door/window{ - base_state = "leftsecure"; - icon_state = "leftsecure"; - name = "Tertiary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/engine/o2, -/area/ai_monitored/turret_protected/ai) "dcB" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -11142,30 +11064,6 @@ /obj/effect/landmark/start/mime, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) -"dBb" = ( -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 8; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 9 - }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -10; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/table/glass, -/turf/open/floor/iron, -/area/medical/cryo) "dBO" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -12554,27 +12452,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"dWm" = ( -/obj/machinery/light{ - light_color = "#7AC3FF" - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 28 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 23 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/crayons{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "dWt" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; @@ -12662,6 +12539,15 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"dXx" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ + pixel_x = -2; + pixel_y = 12 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/carpet/royalblack, +/area/maintenance/port/aft) "dXE" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/bot, @@ -12939,6 +12825,35 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"edN" = ( +/obj/structure/closet/secure_closet/detective, +/obj/item/assembly/flash/handheld, +/obj/item/restraints/handcuffs, +/obj/item/clothing/head/fedora/det_hat{ + icon_state = "curator" + }, +/obj/item/clothing/suit/jacket/det_suit{ + icon_state = "curator" + }, +/obj/item/reagent_containers/cup/glass/flask/det, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/light_switch{ + pixel_x = -25; + pixel_y = -8 + }, +/obj/item/storage/secure/safe{ + pixel_x = -25; + pixel_y = 8 + }, +/obj/machinery/requests_console{ + department = "Detective's office"; + pixel_y = 25 + }, +/obj/item/holosign_creator/security, +/turf/open/floor/carpet/red, +/area/security/detectives_office) "een" = ( /obj/structure/chair/office/light{ dir = 4 @@ -15708,22 +15623,6 @@ }, /turf/open/floor/iron/tech, /area/engine/atmos) -"eUV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/fancy/sofa/old/right{ - dir = 4 - }, -/obj/machinery/vending/wallmed{ - pixel_y = -32; - products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2) - }, -/obj/machinery/newscaster{ - pixel_x = -32; - pixel_y = 2 - }, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "eVa" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 @@ -16108,15 +16007,6 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/sepia, /area/maintenance/port/central) -"faQ" = ( -/obj/effect/spawner/lootdrop/ruinloot/medical, -/obj/effect/decal/cleanable/glass{ - dir = 1 - }, -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/bottle/carbon, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/aft) "fbi" = ( /obj/structure/flora/rock/jungle, /mob/living/simple_animal/chick, @@ -16834,28 +16724,6 @@ "flg" = ( /turf/closed/wall/rust, /area/quartermaster/warehouse) -"fls" = ( -/obj/structure/table, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/item/clothing/mask/muzzle{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/clothing/glasses/blindfold{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/assembly/signaler{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/rag{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark, -/area/security/execution/education) "flw" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -17614,20 +17482,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/heads/hop) -"fxG" = ( -/obj/structure/table/wood, -/obj/item/toy/cards/deck{ - pixel_x = 1; - pixel_y = 13 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 7; - pixel_y = 1 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/cafeteria) "fxR" = ( /turf/closed/wall, /area/medical/office) @@ -18684,25 +18538,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/security/checkpoint/escape) -"fOF" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/light/small, -/obj/machinery/status_display/door_timer{ - id = "cell"; - name = "Solitary confinement timer"; - pixel_y = 32 - }, -/obj/item/food/donut/apple{ - name = "forbidden toilet donut" - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = -10; - pixel_y = 17 - }, -/turf/open/floor/iron/freezer, -/area/security/prison) "fOG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19131,15 +18966,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"fWj" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = -2; - pixel_y = 10 - }, -/turf/open/floor/iron/dark, -/area/security/execution/education) "fWm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/disposalpipe/segment{ @@ -19305,47 +19131,18 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"fZt" = ( -/obj/structure/table, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; +"fZx" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/bottle/nutrient/ez{ + pixel_x = 9; pixel_y = 4 }, -/obj/item/storage/box/papersack{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; - pixel_y = 30 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -9; +/obj/item/pen/fountain/captain{ + pixel_x = -5; pixel_y = 5 }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) +/turf/open/floor/wood, +/area/crew_quarters/dorms) "fZF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -19815,6 +19612,14 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/hallway/primary/starboard) +"ggz" = ( +/obj/effect/decal/cleanable/food/flour, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -9; + pixel_y = 44 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "ggC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -20333,35 +20138,6 @@ }, /turf/open/floor/iron, /area/science/robotics) -"gnE" = ( -/obj/structure/closet/secure_closet/detective, -/obj/item/assembly/flash/handheld, -/obj/item/restraints/handcuffs, -/obj/item/clothing/head/fedora/det_hat{ - icon_state = "curator" - }, -/obj/item/clothing/suit/jacket/det_suit{ - icon_state = "curator" - }, -/obj/item/reagent_containers/cup/glass/flask/det, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = -8 - }, -/obj/item/storage/secure/safe{ - pixel_x = -25; - pixel_y = 8 - }, -/obj/machinery/requests_console{ - department = "Detective's office"; - pixel_y = 25 - }, -/obj/item/holosign_creator/security, -/turf/open/floor/carpet/red, -/area/security/detectives_office) "gnN" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -22431,6 +22207,33 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) +"gXg" = ( +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/effect/spawner/lootdrop/glowstick/lit, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/central) +"gXu" = ( +/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -6; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/maintenance/central) "gXC" = ( /obj/structure/chair/office{ dir = 1 @@ -22648,6 +22451,21 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) +"hbi" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/science/misc_lab) "hbo" = ( /obj/structure/sink{ dir = 1; @@ -23252,6 +23070,10 @@ }, /turf/open/floor/iron, /area/maintenance/department/science) +"hlD" = ( +/obj/item/reagent_containers/cup/bottle/iodine, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "hlI" = ( /obj/machinery/flasher{ id = "aicore"; @@ -23328,6 +23150,23 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/crew_quarters/cafeteria) +"hmL" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/soda_cans/starkist{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/space_up, +/turf/open/floor/iron, +/area/maintenance/port/aft) "hmO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -23476,6 +23315,29 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) +"hpV" = ( +/obj/structure/table, +/obj/item/food/spaghetti/meatballspaghetti{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle/absinthe{ + pixel_x = -10; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 3; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 9; + pixel_y = 10 + }, +/obj/item/candle/infinite{ + pixel_x = 8 + }, +/turf/open/floor/iron/dark, +/area/security/execution/education) "hqd" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ alpha = 200; @@ -24683,6 +24545,24 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) +"hKK" = ( +/obj/effect/turf_decal/tile/black/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/kitchen/rollingpin, +/obj/item/clothing/head/utility/chefhat, +/turf/open/floor/iron/techmaint, +/area/security/prison) "hKT" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -26074,16 +25954,6 @@ }, /turf/open/floor/carpet/red, /area/security/detectives_office) -"ijU" = ( -/obj/structure/table/wood, -/obj/item/toy/foamblade, -/obj/item/reagent_containers/cup/soda_cans/grey_bull{ - pixel_x = 7; - pixel_y = 15 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/wood, -/area/library) "ikf" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26529,6 +26399,47 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/office) +"isM" = ( +/obj/structure/table, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/storage/box/papersack{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + pixel_y = 30 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "isP" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -26663,13 +26574,6 @@ /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) -"ivW" = ( -/obj/item/reagent_containers/cup/waterbottle/empty{ - pixel_x = -10 - }, -/obj/item/storage/belt/utility, -/turf/open/floor/iron/sepia, -/area/maintenance/port/central) "ivY" = ( /obj/machinery/power/terminal{ dir = 8 @@ -27067,6 +26971,16 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"iCN" = ( +/obj/structure/table/wood, +/obj/item/toy/foamblade, +/obj/item/reagent_containers/cup/soda_cans/grey_bull{ + pixel_x = 7; + pixel_y = 15 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood, +/area/library) "iCT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27269,6 +27183,34 @@ /obj/structure/closet/secure_closet/hos, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"iIc" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/structure/reagent_dispensers/virusfood{ + pixel_x = 31; + pixel_y = -1 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "iIs" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -29136,17 +29078,6 @@ }, /turf/open/floor/iron/white, /area/medical/office) -"jmw" = ( -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "jne" = ( /obj/structure/sign/warning/pods, /turf/closed/wall, @@ -29221,21 +29152,6 @@ /obj/structure/railing/corner, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) -"joH" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 4; - pixel_y = 13 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -2; - pixel_y = 14 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/siding/wideplating/dark, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "joI" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/railing, @@ -30495,6 +30411,16 @@ }, /turf/open/floor/iron, /area/science/lobby) +"jIO" = ( +/obj/machinery/biogenerator, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/bot, +/obj/machinery/door/window/eastleft{ + name = "Hydroponics Desk"; + req_one_access_txt = "35;28" + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "jIR" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -32126,17 +32052,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"kkQ" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "kkV" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted{ alpha = 180; @@ -33239,6 +33154,17 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) +"kDF" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table/wood/fancy/purple, +/obj/item/book/granter/spell/smoke/lesser, +/obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/item/soulstone/anybody/chaplain, +/obj/item/organ/heart, +/turf/open/floor/carpet/grimy, +/area/chapel/office) "kDQ" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -33625,6 +33551,13 @@ /obj/machinery/vendor/exploration, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"kKb" = ( +/obj/item/reagent_containers/cup/waterbottle/empty{ + pixel_x = -10 + }, +/obj/item/storage/belt/utility, +/turf/open/floor/iron/sepia, +/area/maintenance/port/central) "kKx" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -33936,37 +33869,6 @@ /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"kPB" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/clothing/glasses/welding{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 9; - pixel_y = 10 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -32 - }, -/turf/open/floor/iron, -/area/science/lab) "kPT" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass, @@ -35329,17 +35231,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"llV" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/table/wood/fancy/purple, -/obj/item/book/granter/spell/smoke/lesser, -/obj/item/reagent_containers/cup/glass/bottle/holywater, -/obj/item/soulstone/anybody/chaplain, -/obj/item/organ/heart, -/turf/open/floor/carpet/grimy, -/area/chapel/office) "lmb" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/decal/cleanable/dirt, @@ -35359,6 +35250,36 @@ }, /turf/open/space/basic, /area/space/nearstation) +"lmH" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small, +/obj/machinery/status_display/door_timer{ + id = "cell"; + name = "Solitary confinement timer"; + pixel_y = 32 + }, +/obj/item/food/donut/apple{ + name = "forbidden toilet donut" + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = -10; + pixel_y = 17 + }, +/turf/open/floor/iron/freezer, +/area/security/prison) +"lmI" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "lmN" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -35926,6 +35847,28 @@ /obj/structure/closet/crate, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"lvp" = ( +/obj/structure/table, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/mask/muzzle{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/clothing/glasses/blindfold{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/assembly/signaler{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/security/execution/education) "lvs" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -36106,6 +36049,25 @@ /obj/structure/chair, /turf/open/floor/plating, /area/maintenance/department/bridge) +"lyW" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/gun/energy/disabler{ + pixel_x = 2 + }, +/obj/item/clothing/glasses/sunglasses/advanced{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/security/warden) "lzD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, @@ -37342,14 +37304,6 @@ dir = 1 }, /area/science/research) -"lYd" = ( -/obj/effect/decal/cleanable/food/flour, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -9; - pixel_y = 44 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "lYp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -37363,18 +37317,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark/corner, /area/hallway/primary/central) -"lYy" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/champagne{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/stack/cable_coil/random/five{ - pixel_x = 2; - pixel_y = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "lYX" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -38626,10 +38568,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"mrr" = ( -/obj/item/reagent_containers/cup/bottle/iodine, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "mrF" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, @@ -40069,17 +40007,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"mLo" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/item/reagent_containers/cup/soda_cans/pwr_game{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/trash/can, -/turf/open/floor/plating, -/area/maintenance/port/aft) "mLp" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/three, @@ -40189,6 +40116,34 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/chapel/main) +"mNu" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/camera/motion{ + c_tag = "vault"; + dir = 10; + pixel_y = 8 + }, +/obj/machinery/airalarm/directional/west{ + pixel_x = -22 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 5; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ + pixel_x = -7; + pixel_y = 17 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) "mNL" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, @@ -40565,6 +40520,20 @@ "mTR" = ( /turf/open/space/basic, /area/ai_monitored/turret_protected/ai) +"mTY" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_x = 6; + pixel_y = 8 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "mUd" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ alpha = 200; @@ -41727,6 +41696,25 @@ }, /turf/open/floor/iron/dark, /area/science/nanite) +"nlX" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 32; + pixel_y = -1 + }, +/obj/structure/closet/secure_closet/captains, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/pinpointer/nuke{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain/private) "nmf" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -42957,25 +42945,6 @@ }, /turf/open/floor/engine/n2, /area/engine/atmos) -"nFk" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/gun/energy/disabler{ - pixel_x = 2 - }, -/obj/item/clothing/glasses/sunglasses/advanced{ - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/security/warden) "nFs" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/engine/vacuum, @@ -43644,12 +43613,6 @@ /obj/effect/landmark/prisonspawn, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) -"nQW" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/grass, -/area/hallway/primary/central) "nQZ" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -44468,6 +44431,21 @@ /obj/machinery/meter, /turf/open/floor/iron/tech, /area/engine/engine_room) +"oeW" = ( +/obj/effect/landmark/start/security_officer, +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/machinery/flasher{ + id = "cell"; + pixel_x = -25 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = 11; + pixel_y = 15 + }, +/turf/open/floor/iron/dark, +/area/security/prison/shielded) "oeZ" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180 @@ -44654,6 +44632,18 @@ /obj/machinery/deepfryer, /turf/open/floor/iron, /area/hallway/secondary/service) +"ohw" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/champagne{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/stack/cable_coil/random/five{ + pixel_x = 2; + pixel_y = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "ohL" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/teleport/hub, @@ -44789,11 +44779,29 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/no_border, /area/hallway/secondary/exit/departure_lounge) -"okF" = ( -/obj/machinery/chem_master, -/obj/item/reagent_containers/cup/beaker/large, -/turf/open/floor/iron, -/area/medical/apothecary) +"oks" = ( +/obj/structure/table, +/obj/item/toy/cards/deck{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/item/book/manual/wiki/sopsecurity{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "okN" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -46041,29 +46049,6 @@ /obj/effect/turf_decal/guideline/guideline_edge/brown, /turf/open/floor/iron, /area/hallway/primary/port) -"oHE" = ( -/obj/structure/lattice/catwalk, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/item/trash/can{ - pixel_x = 11; - pixel_y = -4 - }, -/obj/item/cigbutt{ - pixel_x = -9 - }, -/turf/open/space/basic, -/area/space/nearstation) "oHG" = ( /turf/open/floor/circuit/telecomms/server, /area/science/xenobiology) @@ -46639,23 +46624,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/escape) -"oPl" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/soda_cans/starkist{ - pixel_x = 10; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/soda_cans/space_up, -/turf/open/floor/iron, -/area/maintenance/port/aft) "oPx" = ( /obj/structure/chair/fancy/bench/right{ dir = 8 @@ -46814,6 +46782,28 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/maintenance/port/aft) +"oRm" = ( +/obj/machinery/recharger, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/wine{ + pixel_x = -9; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 10; + pixel_y = 13 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 10; + pixel_y = 5 + }, +/obj/machinery/light, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/carpet, +/area/quartermaster/exploration_prep) "oRo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -48017,24 +48007,27 @@ /obj/item/bedsheet/captain, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) -"piH" = ( -/obj/structure/janitorialcart, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 11; - pixel_y = -5 +"piS" = ( +/obj/machinery/light{ + light_color = "#7AC3FF" }, -/obj/item/mop{ - pixel_x = -6; - pixel_y = 3 +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 28 }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 23 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/crayons{ + pixel_x = 3; + pixel_y = 7 }, -/turf/open/floor/iron, -/area/janitor) +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "pjf" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; @@ -49251,18 +49244,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig/dock) -"pED" = ( -/obj/machinery/chem_master, -/obj/effect/turf_decal/bot, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/reagent_containers/cup/beaker/large, -/turf/open/floor/iron, -/area/medical/apothecary) "pEF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -52205,6 +52186,29 @@ /obj/item/grenade/chem_grenade/smart_metal_foam, /turf/open/floor/iron/dark, /area/engine/atmos) +"qBv" = ( +/obj/structure/lattice/catwalk, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/trash/can{ + pixel_x = 11; + pixel_y = -4 + }, +/obj/item/cigbutt{ + pixel_x = -9 + }, +/turf/open/space/basic, +/area/space/nearstation) "qBy" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/machinery/light_switch{ @@ -53825,6 +53829,22 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) +"rbv" = ( +/obj/machinery/reagentgrinder, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -9; + pixel_y = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "rbJ" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -54092,6 +54112,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/storage) +"rge" = ( +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/effect/turf_decal/bot, +/obj/structure/table/wood{ + name = "Coffee warmer" + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "rgh" = ( /obj/structure/sign/departments/minsky/security/command, /turf/closed/wall, @@ -54749,6 +54781,11 @@ }, /turf/open/floor/iron, /area/security/prison) +"rpT" = ( +/obj/machinery/chem_master, +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/iron, +/area/medical/apothecary) "rqd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55280,34 +55317,6 @@ }, /turf/open/floor/iron, /area/science/lobby) -"ryj" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera/motion{ - c_tag = "vault"; - dir = 10; - pixel_y = 8 - }, -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 5; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 9; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ - pixel_x = -7; - pixel_y = 17 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/security/nuke_storage) "ryr" = ( /obj/effect/turf_decal/guideline/guideline_edge/purple{ dir = 8 @@ -55632,6 +55641,19 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/teleporter) +"rDv" = ( +/obj/structure/table/wood, +/obj/machinery/reagentgrinder{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -8; + pixel_y = 3 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "rDB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -56055,14 +56077,6 @@ }, /turf/open/floor/iron/dark, /area/storage/primary) -"rJL" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/cardboard, -/obj/item/storage/toolbox/emergency, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/item/reagent_containers/cup/glass/bottle/hooch, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "rJX" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/plating, @@ -56342,6 +56356,15 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/port/central) +"rPL" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -2; + pixel_y = 10 + }, +/turf/open/floor/iron/dark, +/area/security/execution/education) "rQd" = ( /turf/closed/wall/r_wall/rust, /area/crew_quarters/heads/hor) @@ -57207,19 +57230,6 @@ "seT" = ( /turf/closed/wall, /area/lawoffice) -"seW" = ( -/obj/structure/table/wood, -/obj/machinery/reagentgrinder{ - pixel_x = 5; - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "seY" = ( /obj/effect/turf_decal/tile/neutral{ alpha = 140; @@ -57471,6 +57481,22 @@ }, /turf/open/floor/iron/techmaint, /area/science/xenobiology) +"sjq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/fancy/sofa/old/right{ + dir = 4 + }, +/obj/machinery/vending/wallmed{ + pixel_y = -32; + products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2) + }, +/obj/machinery/newscaster{ + pixel_x = -32; + pixel_y = 2 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "sjy" = ( /obj/effect/turf_decal/guideline/guideline_in/purple{ dir = 1 @@ -58492,6 +58518,18 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"sDP" = ( +/obj/machinery/chem_master, +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/iron, +/area/medical/apothecary) "sEj" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /obj/effect/decal/cleanable/dirt/dust, @@ -59003,6 +59041,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) +"sLF" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck{ + pixel_x = 1; + pixel_y = 13 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 7; + pixel_y = 1 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/cafeteria) "sLM" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -59238,6 +59290,14 @@ }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/central) +"sQu" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/closet/cardboard, +/obj/item/storage/toolbox/emergency, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/item/reagent_containers/cup/glass/bottle/hooch, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "sQy" = ( /obj/docking_port/stationary/random{ dir = 8; @@ -60336,34 +60396,6 @@ dir = 9 }, /area/bridge) -"thT" = ( -/obj/structure/table/reinforced, -/obj/structure/railing{ - dir = 1 - }, -/obj/item/reagent_containers/cup/bowl, -/obj/item/food/grown/carrot{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/food/grown/carrot{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/food/grown/carrot{ - pixel_x = -1; - pixel_y = 11 - }, -/obj/item/food/grown/carrot{ - pixel_x = -6; - pixel_y = 12 - }, -/obj/effect/turf_decal/tile/black/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron/techmaint, -/area/security/prison) "tib" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/tree/jungle/small, @@ -60479,6 +60511,12 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"tjK" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/grass, +/area/hallway/primary/central) "tjM" = ( /obj/structure/window/reinforced{ dir = 1 @@ -60505,6 +60543,22 @@ }, /turf/open/floor/iron, /area/engine/engine_room) +"tkG" = ( +/obj/machinery/light{ + light_color = "#7AC3FF" + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 25 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 21 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "tkM" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ alpha = 200; @@ -61190,40 +61244,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) -"tuz" = ( -/obj/effect/turf_decal/tile/black/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = -8 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = -4 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 4 - }, -/obj/item/shovel/spade{ - pixel_x = -5; - pixel_y = -4 - }, -/obj/item/cultivator{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/iron/techmaint, -/area/security/prison) "tuD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -62539,6 +62559,24 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) +"tNs" = ( +/obj/structure/table/reinforced, +/obj/item/paper/fluff/jobs/medical/hippocratic{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/item/toy/plush/renault{ + pixel_x = 8 + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/turf/open/floor/iron/white, +/area/medical/office) "tNG" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -63111,6 +63149,15 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/construction/mining/aux_base) +"tYe" = ( +/obj/effect/spawner/lootdrop/ruinloot/medical, +/obj/effect/decal/cleanable/glass{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/carbon, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/aft) "tYf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -63162,6 +63209,17 @@ }, /turf/open/floor/iron/white, /area/medical/cryo) +"tYF" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/trash/can, +/turf/open/floor/plating, +/area/maintenance/port/aft) "tYL" = ( /obj/structure/closet, /obj/item/clothing/under/color/random, @@ -63690,21 +63748,6 @@ dir = 4 }, /area/medical/sleeper) -"ugA" = ( -/obj/effect/landmark/start/security_officer, -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/machinery/flasher{ - id = "cell"; - pixel_x = -25 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = 11; - pixel_y = 15 - }, -/turf/open/floor/iron/dark, -/area/security/prison/shielded) "ugK" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 @@ -63870,24 +63913,6 @@ }, /turf/open/floor/iron, /area/construction/mining/aux_base) -"ukp" = ( -/obj/structure/table/reinforced, -/obj/item/paper/fluff/jobs/medical/hippocratic{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 2; - pixel_y = 9 - }, -/obj/item/toy/plush/renault{ - pixel_x = 8 - }, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/turf/open/floor/iron/white, -/area/medical/office) "uku" = ( /obj/structure/railing/corner{ dir = 1 @@ -64101,6 +64126,34 @@ /obj/structure/curtain/directional, /turf/open/floor/plating, /area/security/courtroom) +"uod" = ( +/obj/structure/table/reinforced, +/obj/structure/railing{ + dir = 1 + }, +/obj/item/reagent_containers/cup/bowl, +/obj/item/food/grown/carrot{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/food/grown/carrot{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/food/grown/carrot{ + pixel_x = -1; + pixel_y = 11 + }, +/obj/item/food/grown/carrot{ + pixel_x = -6; + pixel_y = 12 + }, +/obj/effect/turf_decal/tile/black/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "uog" = ( /obj/item/rollerbed, /turf/open/floor/plating, @@ -65463,22 +65516,6 @@ }, /turf/open/floor/iron/dark, /area/security/nuke_storage) -"uLH" = ( -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_x = -8; - pixel_y = 11 - }, -/obj/effect/spawner/lootdrop/glowstick/lit, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/central) "uLR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -66052,6 +66089,21 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"uWO" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 4; + pixel_y = 13 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -2; + pixel_y = 14 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/siding/wideplating/dark, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "uXd" = ( /obj/machinery/light, /obj/machinery/newscaster{ @@ -66219,15 +66271,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/department/science) -"uZg" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/item/paper, -/turf/open/floor/wood, -/area/security/prison) "uZs" = ( /obj/structure/chair/office{ dir = 1 @@ -66274,28 +66317,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/sepia, /area/maintenance/port/central) -"vam" = ( -/obj/machinery/recharger, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/wine{ - pixel_x = -9; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 10; - pixel_y = 13 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 10; - pixel_y = 5 - }, -/obj/machinery/light, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/machinery/camera/directional/south, -/turf/open/floor/carpet, -/area/quartermaster/exploration_prep) "vaU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ @@ -66561,6 +66582,17 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/bridge) +"vgV" = ( +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "vhc" = ( /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -66646,15 +66678,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"viS" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ - pixel_x = -2; - pixel_y = 12 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/carpet/royalblack, -/area/maintenance/port/aft) "viW" = ( /obj/structure/railing{ dir = 6 @@ -66770,18 +66793,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"vkC" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/bottle/nutrient/ez{ - pixel_x = 9; - pixel_y = 4 - }, -/obj/item/pen/fountain/captain{ - pixel_x = -5; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "vkD" = ( /obj/structure/sign/warning/radiation_shelter{ pixel_x = 1; @@ -67662,43 +67673,6 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) -"vAV" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = 7; - pixel_y = -3 - }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow, -/obj/item/wallframe/defib_mount, -/obj/item/clothing/neck/stethoscope{ - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/medical/sleeper) "vBo" = ( /obj/effect/turf_decal/guideline/guideline_edge/purple, /turf/open/floor/iron/white/side{ @@ -68455,21 +68429,6 @@ }, /turf/open/space/basic, /area/solar/starboard/fore) -"vPl" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -5; - pixel_y = 16 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/science/misc_lab) "vPD" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -69637,17 +69596,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"wks" = ( -/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = -6; - pixel_y = 3 - }, -/turf/open/floor/iron, -/area/maintenance/central) "wkt" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/disposal/bin, @@ -70047,6 +69995,91 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) +"wsh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/closet/crate/medical, +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/item/circuitboard/machine/chem_heater, +/turf/open/floor/iron/dark, +/area/medical/virology) "wsJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/extinguisher_cabinet{ @@ -70103,6 +70136,24 @@ }, /turf/open/floor/iron, /area/bridge) +"wuh" = ( +/obj/structure/janitorialcart, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 11; + pixel_y = -5 + }, +/obj/item/mop{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/janitor) "wul" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; @@ -71521,24 +71572,6 @@ /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"wQT" = ( -/obj/effect/turf_decal/tile/black/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/kitchen/rollingpin, -/obj/item/clothing/head/utility/chefhat, -/turf/open/floor/iron/techmaint, -/area/security/prison) "wRl" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -71702,34 +71735,6 @@ }, /turf/open/floor/iron/grid/steel, /area/hydroponics) -"wUw" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/structure/reagent_dispensers/virusfood{ - pixel_x = 31; - pixel_y = -1 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "wUE" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/guideline/guideline_edge/red{ @@ -72483,18 +72488,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig/dock) -"xjA" = ( -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/effect/turf_decal/bot, -/obj/structure/table/wood{ - name = "Coffee warmer" - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) "xjC" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -72607,29 +72600,6 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) -"xkF" = ( -/obj/structure/table, -/obj/item/toy/cards/deck{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -8; - pixel_y = 10 - }, -/obj/item/book/manual/wiki/sopsecurity{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/main) "xkS" = ( /obj/effect/turf_decal/loading_area, /obj/machinery/firealarm/directional/west, @@ -74131,20 +74101,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"xHw" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/siding/wideplating/dark, -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/rag{ - pixel_x = 6; - pixel_y = 8 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "xHy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -74204,6 +74160,18 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/central) +"xIv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/mortar, +/obj/item/pestle, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/vacant_room/commissary/commissary2) "xII" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 @@ -75245,16 +75213,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/education) -"yaV" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/bot, -/obj/machinery/door/window/eastleft{ - name = "Hydroponics Desk"; - req_one_access_txt = "35;28" - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "ybh" = ( /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/airlock/maintenance_hatch{ @@ -75355,6 +75313,17 @@ }, /turf/open/floor/iron, /area/medical/storage) +"ycV" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/machinery/door/window{ + base_state = "leftsecure"; + icon_state = "leftsecure"; + name = "Tertiary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/turf/open/floor/engine/o2, +/area/ai_monitored/turret_protected/ai) "ydA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -75486,6 +75455,37 @@ }, /turf/open/floor/iron/tech, /area/engine/atmos) +"yhq" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/clothing/glasses/welding{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 9; + pixel_y = 10 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/science/lab) "yhv" = ( /obj/structure/window/reinforced{ dir = 4 @@ -96779,7 +96779,7 @@ bgA hCg eua ayc -vam +oRm cMW fVz uKR @@ -97050,7 +97050,7 @@ frc frc fFP stS -vPl +hbi sLX sxX lfC @@ -98773,8 +98773,8 @@ xdi yaG cgq bAj -fls -aOm +lvp +hpV pmV kZu bAj @@ -98826,7 +98826,7 @@ ndT nQZ ggJ dvu -kPB +yhq ykj dLu mGb @@ -99039,7 +99039,7 @@ gsA gsA eSK xkc -ryj +mNu wGq eBH eSK @@ -99290,7 +99290,7 @@ trr yaP asB qNP -fWj +rPL bAj nmf nmf @@ -100658,7 +100658,7 @@ fAl qZZ sfR qZZ -viS +dXx rHt vEn xbP @@ -101178,7 +101178,7 @@ clJ clJ clJ qZZ -oPl +hmL vQr qZZ gsA @@ -101435,7 +101435,7 @@ jDt eYH efJ fAl -mLo +tYF gNm fAl gsA @@ -102154,7 +102154,7 @@ aSr lka jdV gOK -ivW +kKb nnB qRH saq @@ -102620,7 +102620,7 @@ hzk bpo qKg rVu -xkF +oks vwL bNr dTx @@ -102630,7 +102630,7 @@ rgL iZE rWM cUa -gnE +edN tJT rnw rAQ @@ -104676,7 +104676,7 @@ rqE hGk qLO xNd -nFk +lyW bDs pVy ifC @@ -104937,7 +104937,7 @@ mJF het sSE ifC -ugA +oeW byu ifC erK @@ -105704,7 +105704,7 @@ bjP bjP qdm jrH -tuz +bqq lHT bBO sFf @@ -105956,7 +105956,7 @@ mtI mtI mtI mtI -thT +uod paj tQy pym @@ -106214,7 +106214,7 @@ mtI mtI mtI eDH -wQT +hKK pNF iee kOb @@ -106474,7 +106474,7 @@ hQk uQP pNF xtP -uZg +cey dyS ldH wNH @@ -106716,7 +106716,7 @@ fZF kjm hsm hsm -aak +nlX piE coK hhv @@ -107037,7 +107037,7 @@ bzO mcm hBR cSY -brj +xIv bzO cFO nxD @@ -107481,7 +107481,7 @@ kYM sZZ kjF tpC -seW +rDv jXy rYf uLj @@ -107504,7 +107504,7 @@ wgN lCM uml mTK -fOF +lmH mTK dhT kTx @@ -107713,7 +107713,7 @@ xze uuQ uuQ uTv -dcy +ycV ahL vsb ycm @@ -109083,7 +109083,7 @@ nfS vDd mTH vJo -nQW +tjK tLv tmM jgD @@ -109255,7 +109255,7 @@ iVd uuQ uuQ uTv -dcy +ycV ahL mhA aoX @@ -109280,7 +109280,7 @@ vkS nlk pXK dbZ -xjA +rge rQC ydT bqh @@ -109366,7 +109366,7 @@ aCS rQG xBF tIG -pED +sDP aba lwM cKB @@ -110609,7 +110609,7 @@ leD cru dNE reS -piH +wuh ntf wkt oGS @@ -110641,7 +110641,7 @@ oIs fxR jlQ mbT -ukp +tNs lvJ kDQ xwH @@ -110650,7 +110650,7 @@ kfv vpR uig xBF -okF +rpT rAO oZL uFU @@ -111108,7 +111108,7 @@ yeA gsA efr mIj -uLH +gXg vmu sSv kui @@ -111376,7 +111376,7 @@ aMA mVN mfr hdp -wks +gXu mdB aMA pCi @@ -111429,7 +111429,7 @@ dwu fYI msM teB -faQ +tYe bgr oUC xVm @@ -111615,7 +111615,7 @@ rNr dea dzY gyP -llV +kDF rNr gsA yeA @@ -111938,7 +111938,7 @@ lLX diq ujr tWQ -vAV +col shZ ibc pfL @@ -112407,7 +112407,7 @@ iOn oio izn uxW -xHw +mTY kok ult hjM @@ -112919,17 +112919,17 @@ nXc nXc nXc nXc -coF +rbv soB vge kok bLt oJe -fxG +sLF qXx ykz lFE -eUV +sjq rfl iJe kgH @@ -113186,7 +113186,7 @@ iWh qXx mWi ubo -dWm +piS rfl iJe kgH @@ -113944,7 +113944,7 @@ qDa qFY eVo jgI -bPM +ane mQc pGW gmj @@ -114179,11 +114179,11 @@ cvT bMn wII rYG -vkC +fZx boZ wII mws -lYy +ohw wII kEh jUB @@ -114209,7 +114209,7 @@ lFS umg hnl eXD -joH +uWO szP tdk lSp @@ -114713,8 +114713,8 @@ wAq mBT dhK fwL -fZt -lYd +isM +ggz wlj sZT jlg @@ -114727,8 +114727,8 @@ qVc kok bSd mWi -jmw -aVk +vgV +tkG rfl iJe pZb @@ -115535,7 +115535,7 @@ wOB hjA opp sYS -dBb +aug sdl xat kMc @@ -116051,7 +116051,7 @@ qjI gqW jBS lQB -rJL +sQu iuX dkt maw @@ -116259,7 +116259,7 @@ otE otE iks hmO -yaV +jIO kcZ iks bPo @@ -117596,7 +117596,7 @@ kkj wLd ujz kMc -mrr +hlD dwU wKX xDh @@ -117797,7 +117797,7 @@ uKl uKl pKx sxp -kkQ +lmI bJj vft egv @@ -118070,7 +118070,7 @@ fZQ uTB wTw fZb -ijU +iCN ekZ sPf eUC @@ -119131,7 +119131,7 @@ kxl tfq sWR lsT -wUw +iIc baz pZF uhG @@ -119682,7 +119682,7 @@ pQd pQd gsA ewB -oHE +qBv gsA yeA yeA @@ -120417,7 +120417,7 @@ tfq hzd oWM qRi -cxD +wsh coJ koC oJV diff --git a/beestation.dme b/beestation.dme index 841de06de95d0..8fe549e383066 100644 --- a/beestation.dme +++ b/beestation.dme @@ -1017,6 +1017,7 @@ #include "code\datums\wires\tesla_coil.dm" #include "code\datums\wires\vending.dm" #include "code\game\alternate_appearance.dm" +#include "code\game\atom_defense.dm" #include "code\game\atoms.dm" #include "code\game\atoms_movable.dm" #include "code\game\communications.dm" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm index 2008f9d67a21f..c5d3e717def13 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm @@ -14,6 +14,16 @@ #define COMSIG_ATOM_ATTACK_ANIMAL "attack_animal" //from base of atom/attack_basic_mob(): (/mob/user) #define COMSIG_ATOM_ATTACK_BASIC_MOB "attack_basic_mob" +/// from /atom/proc/atom_break: (damage_flag) +#define COMSIG_ATOM_BREAK "atom_break" +/// from base of [/atom/proc/atom_fix]: () +#define COMSIG_ATOM_FIX "atom_fix" +///from base of [/atom/proc/update_integrity]: (old_value, new_value) +#define COMSIG_ATOM_INTEGRITY_CHANGED "atom_integrity_changed" +///from base of [/atom/proc/take_damage]: (damage_amount, damage_type, damage_flag, sound_effect, attack_dir, aurmor_penetration) +#define COMSIG_ATOM_TAKE_DAMAGE "atom_take_damage" + /// Return bitflags for the above signal which prevents the atom taking any damage. + #define COMPONENT_NO_TAKE_DAMAGE (1<<0) /* Attack signals. They should share the returned flags, to standardize the attack chain. */ /// tool_act -> pre_attack -> target.attackby (item.attack) -> afterattack diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm index dc127a0a0714f..512340addc76a 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm @@ -9,7 +9,7 @@ #define COMSIG_MOB_ITEM_ATTACKBY "item_attackby" ///from base of obj/item/attack_self(): (/mob) #define COMSIG_ITEM_ATTACK_SELF "item_attack_self" -///from base of obj/item/attack_obj(): (/obj, /mob) +///from base of obj/item/attack_atom(): (/obj, /mob) #define COMSIG_ITEM_ATTACK_OBJ "item_attack_obj" ///from base of obj/item/pre_attack(): (atom/target, mob/user, params) #define COMSIG_ITEM_PRE_ATTACK "item_pre_attack" diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm index 21102eba3950d..70a267b692555 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm @@ -8,7 +8,7 @@ #define COMSIG_MACHINE_OPEN "machine_open" /// Sent from /obj/machinery/close_machine(): (atom/movable/target) #define COMSIG_MACHINE_CLOSE "machine_close" -//from /obj/machinery/obj_break(damage_flag): (damage_flag) +//from /obj/machinery/atom_break(damage_flag): (damage_flag) #define COMSIG_MACHINERY_BROKEN "machinery_broken" ///from base power_change() when power is lost #define COMSIG_MACHINERY_POWER_LOST "machinery_power_lost" diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm index c3eb6af24a09d..357d32dc19ae0 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm @@ -4,12 +4,6 @@ // /obj signals -///from base of [/obj/proc/take_damage]: (damage_amount, damage_type, damage_flag, sound_effect, attack_dir, aurmor_penetration) -#define COMSIG_OBJ_TAKE_DAMAGE "obj_take_damage" - /// Return bitflags for the above signal which prevents the object taking any damage. - #define COMPONENT_NO_TAKE_DAMAGE (1<<0) -///from base of [/obj/proc/update_integrity]: (old_value, new_value) -#define COMSIG_OBJ_INTEGRITY_CHANGED "obj_integrity_changed" ///from base of obj/deconstruct(): (disassembled) #define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" ///from base of code/game/machinery @@ -17,11 +11,6 @@ ///from base of /turf/proc/levelupdate(). (intact) true to hide and false to unhide #define COMSIG_OBJ_HIDE "obj_hide" -/// from /obj/proc/obj_break: () -#define COMSIG_OBJ_BREAK "obj_break" -/// from base of [/obj/proc/obj_fix]: () -#define COMSIG_OBJ_FIX "obj_fix" - /// from /obj/proc/make_unfrozen() #define COMSIG_OBJ_UNFREEZE "obj_unfreeze" diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 28e6409f2435a..c97cea153202f 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -48,19 +48,19 @@ * Called on an object being hit by an item * * Arguments: - * * obj/item/W - The item hitting this atom + * * obj/item/attacking_item - The item hitting this atom * * mob/user - The wielder of this item * * params - click params such as alt/shift etc * * See: [/obj/item/proc/melee_attack_chain] */ -/atom/proc/attackby(obj/item/W, mob/user, params) - if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, params) & COMPONENT_NO_AFTERATTACK) +/atom/proc/attackby(obj/item/attacking_item, mob/user, params) + if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, attacking_item, user, params) & COMPONENT_NO_AFTERATTACK) return TRUE return FALSE /obj/attackby(obj/item/I, mob/living/user, params) - return ..() || ((obj_flags & CAN_BE_HIT) && I.attack_obj(src, user)) + return ..() || ((obj_flags & CAN_BE_HIT) && I.attack_atom(src, user, params)) /mob/living/attackby(obj/item/I, mob/living/user, params) if(..()) @@ -139,21 +139,21 @@ add_fingerprint(user) -/// The equivalent of the standard version of [/obj/item/proc/attack] but for object targets. -/obj/item/proc/attack_obj(obj/O, mob/living/user) - if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, O, user) & COMPONENT_CANCEL_ATTACK_CHAIN) +/// The equivalent of the standard version of [/obj/item/proc/attack] but for non mob targets. +/obj/item/proc/attack_atom(atom/attacked_atom, mob/living/user, params) + if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, attacked_atom, user) & COMPONENT_CANCEL_ATTACK_CHAIN) return if(item_flags & NOBLUDGEON) return user.changeNext_move(CLICK_CD_MELEE) - user.do_attack_animation(O) - O.attacked_by(src, user) + user.do_attack_animation(attacked_atom) + attacked_atom.attacked_by(src, user) -/// Called from [/obj/item/proc/attack_obj] and [/obj/item/proc/attack] if the attack succeeds -/atom/proc/attacked_by() - return +/// Called from [/obj/item/proc/attack_atom] and [/obj/item/proc/attack] if the attack succeeds +/atom/proc/attacked_by(obj/item/attacking_item, mob/living/user) + if(!uses_integrity) + CRASH("attacked_by() was called on an object that doesnt use integrity!") -/obj/attacked_by(obj/item/attacking_item, mob/living/user) if(!attacking_item.force) return @@ -164,6 +164,9 @@ "You hit [src] with [attacking_item][damage ? "." : ", without leaving a mark!"]", null, COMBAT_MESSAGE_RANGE) log_combat(user, src, "attacked", attacking_item) +/area/attacked_by(obj/item/attacking_item, mob/living/user) + CRASH("areas are NOT supposed to have attacked_by() called on them!") + /mob/living/attacked_by(obj/item/I, mob/living/user) send_item_attack_message(I, user) if(!I.force) diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm index 9a98e816e6d5e..06a109abd096c 100644 --- a/code/datums/components/shell.dm +++ b/code/datums/components/shell.dm @@ -133,7 +133,7 @@ if(istype(item, /obj/item/inducer)) var/obj/item/inducer/inducer = item - INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, attack_obj), attached_circuit, attacker, list()) + INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, attack_atom), attached_circuit, attacker, list()) return COMPONENT_NO_AFTERATTACK if(attached_circuit) diff --git a/code/datums/elements/obj_regen.dm b/code/datums/elements/obj_regen.dm index c27d23adee610..efb55f4bfa7c0 100644 --- a/code/datums/elements/obj_regen.dm +++ b/code/datums/elements/obj_regen.dm @@ -21,14 +21,14 @@ return ELEMENT_INCOMPATIBLE rate = _rate - RegisterSignal(target, COMSIG_OBJ_TAKE_DAMAGE, PROC_REF(on_take_damage)) + RegisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(on_take_damage)) if(target.get_integrity() < target.max_integrity) if(!length(processing)) START_PROCESSING(SSobj, src) processing |= target /datum/element/obj_regen/Detach(obj/target) - UnregisterSignal(target, COMSIG_OBJ_TAKE_DAMAGE) + UnregisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE) processing -= target if(!length(processing)) STOP_PROCESSING(SSobj, src) diff --git a/code/game/atom_defense.dm b/code/game/atom_defense.dm new file mode 100644 index 0000000000000..c51f88f08b7f6 --- /dev/null +++ b/code/game/atom_defense.dm @@ -0,0 +1,131 @@ +/// The essential proc to call when an atom must receive damage of any kind. +/atom/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", sound_effect = TRUE, attack_dir, armour_penetration = 0) + if(!uses_integrity) + CRASH("[src] had /atom/proc/take_damage() called on it without it being a type that has uses_integrity = TRUE!") + if(QDELETED(src)) + CRASH("[src] taking damage after deletion") + if(atom_integrity <= 0) + CRASH("[src] taking damage while having <= 0 integrity") + if(sound_effect) + play_attack_sound(damage_amount, damage_type, damage_flag) + if((resistance_flags & INDESTRUCTIBLE)) + return + damage_amount = run_atom_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration) + if(damage_amount < DAMAGE_PRECISION) + return + if(SEND_SIGNAL(src, COMSIG_ATOM_TAKE_DAMAGE, damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration) & COMPONENT_NO_TAKE_DAMAGE) + return + + . = damage_amount + + update_integrity(atom_integrity - damage_amount) + + //BREAKING FIRST + if(integrity_failure && atom_integrity <= integrity_failure * max_integrity) + atom_break(damage_flag) + + //DESTROYING SECOND + if(atom_integrity <= 0) + atom_destruction(damage_flag) + +/// Proc for recovering atom_integrity. Returns the amount repaired by +/atom/proc/repair_damage(amount) + if(amount <= 0) // We only recover here + return + var/new_integrity = min(max_integrity, atom_integrity + amount) + . = new_integrity - atom_integrity + + update_integrity(new_integrity) + + if(integrity_failure && atom_integrity > integrity_failure * max_integrity) + atom_fix() + +/// Handles the integrity of an atom changing. This must be called instead of changing integrity directly. +/atom/proc/update_integrity(new_value) + SHOULD_NOT_OVERRIDE(TRUE) + if(!uses_integrity) + CRASH("/atom/proc/update_integrity() was called on [src] when it doesnt use integrity!") + var/old_value = atom_integrity + new_value = max(0, new_value) + if(atom_integrity == new_value) + return + atom_integrity = new_value + SEND_SIGNAL(src, COMSIG_ATOM_INTEGRITY_CHANGED, old_value, new_value) + +/// This mostly exists to keep atom_integrity private. Might be useful in the future. +/atom/proc/get_integrity() + SHOULD_BE_PURE(TRUE) + return atom_integrity + +///returns the damage value of the attack after processing the atom's various armor protections +/atom/proc/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) + if(!uses_integrity) + CRASH("/atom/proc/run_atom_armor was called on [src] without being implemented as a type that uses integrity!") + if(damage_flag == MELEE && damage_amount < damage_deflection) + return 0 + switch(damage_type) + if(BRUTE) + if(BURN) + else + return 0 + var/armor_protection = 0 + if(damage_flag) + armor_protection = armor?.getRating(damage_flag) + if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. + armor_protection = clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100) + return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) + +///the sound played when the atom is damaged. +/atom/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) + switch(damage_type) + if(BRUTE) + if(damage_amount) + playsound(src, 'sound/weapons/smash.ogg', 50, TRUE) + else + playsound(src, 'sound/weapons/tap.ogg', 50, TRUE) + if(BURN) + playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE) + +///Called to get the damage that hulks will deal to the atom. +/atom/proc/hulk_damage() + return 150 //the damage hulks do on punches to this atom, is affected by melee armor + +/atom/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime + if(!uses_integrity) + CRASH("unimplemented /atom/proc/attack_generic()!") + user.do_attack_animation(src) + user.changeNext_move(CLICK_CD_MELEE) + return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration) + +/// Called after the atom takes damage and integrity is below integrity_failure level +/atom/proc/atom_break(damage_flag) + SHOULD_CALL_PARENT(TRUE) + SEND_SIGNAL(src, COMSIG_ATOM_BREAK) + +/// Called when integrity is repaired above the breaking point having been broken before +/atom/proc/atom_fix() + SHOULD_CALL_PARENT(TRUE) + SEND_SIGNAL(src, COMSIG_ATOM_FIX) + +///what happens when the atom's integrity reaches zero. +/atom/proc/atom_destruction(damage_flag) + return + +///changes max_integrity while retaining current health percentage, returns TRUE if the atom got broken. +/atom/proc/modify_max_integrity(new_max, can_break = TRUE, damage_type = BRUTE) + if(!uses_integrity) + CRASH("/atom/proc/modify_max_integrity() was called on [src] when it doesnt use integrity!") + var/current_integrity = atom_integrity + var/current_max = max_integrity + + if(current_integrity != 0 && current_max != 0) + var/percentage = current_integrity / current_max + current_integrity = max(1, round(percentage * new_max)) //don't destroy it as a result + atom_integrity = current_integrity + + max_integrity = new_max + + if(can_break && integrity_failure && current_integrity <= integrity_failure * max_integrity) + atom_break(damage_type) + return TRUE + return FALSE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 3e597f42e9fd4..09eeb7f68d196 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -124,6 +124,20 @@ ///AI controller that controls this atom. type on init, then turned into an instance during runtime var/datum/ai_controller/ai_controller + ///any atom that uses integrity and can be damaged must set this to true, otherwise the integrity procs will throw an error + var/uses_integrity = FALSE + + var/datum/armor/armor + VAR_PRIVATE/atom_integrity //defaults to max_integrity + var/max_integrity = 500 + var/integrity_failure = 0 //0 if we have no special broken behavior, otherwise is a percentage of at what point the atom breaks. 0.5 being 50% + ///Damage under this value will be completely ignored + var/damage_deflection = 0 + /// Maximum damage that can be taken in a single hit + var/max_hit_damage = null + + var/resistance_flags = NONE // INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF + /// Lazylist of all messages currently on this atom var/list/chat_messages @@ -232,6 +246,15 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom) // apply materials properly from the default custom_materials value set_custom_materials(custom_materials) + if(uses_integrity) + if (islist(armor)) + armor = getArmor(arglist(armor)) + else if (!armor) + armor = getArmor() + else if (!istype(armor, /datum/armor)) + stack_trace("Invalid type [armor.type] found in .armor during /atom Initialize()") + atom_integrity = max_integrity + ComponentInitialize() InitializeAIController() diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index ae1f16fa499db..6fd745f7dcecf 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -400,7 +400,7 @@ var/image/holder = hud_list[DIAG_MECH_HUD] var/icon/I = icon(icon, icon_state, dir) holder.pixel_y = I.Height() - world.icon_size - holder.icon_state = "huddiag[RoundDiagBar(obj_integrity/max_integrity)]" + holder.icon_state = "huddiag[RoundDiagBar(atom_integrity/max_integrity)]" /obj/vehicle/sealed/mecha/proc/diag_hud_set_mechcell() diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 8c6adca5ef43c..fcda0cd57525b 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -149,7 +149,7 @@ return to_chat(user, "You repair [src].") set_machine_stat(machine_stat & ~BROKEN) - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() else to_chat(user, "[src] does not need repairs.") @@ -157,7 +157,7 @@ return ..() /obj/machinery/pdapainter/deconstruct(disassembled = TRUE) - obj_break() + atom_break() /obj/machinery/pdapainter/attack_hand(mob/user) if(!..()) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 6750dbcd92ae4..78cbdbe27c36d 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -557,7 +557,7 @@ Class Procs: new_frame.update_integrity(new_frame.max_integrity * 0.5) //the frame is already half broken transfer_fingerprints_to(new_frame) -/obj/machinery/obj_break(damage_flag) +/obj/machinery/atom_break(damage_flag) SHOULD_CALL_PARENT(TRUE) . = ..() if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) @@ -585,7 +585,7 @@ Class Procs: deconstruct(FALSE) return ..() -/obj/machinery/run_obj_armor(damage_amount, damage_type, damage_flag = NONE, attack_dir) +/obj/machinery/run_atom_armor(damage_amount, damage_type, damage_flag = NONE, attack_dir) if(damage_flag == MELEE && damage_amount < damage_deflection) return 0 return ..() @@ -739,7 +739,7 @@ Class Procs: if(!(resistance_flags & INDESTRUCTIBLE)) if(resistance_flags & ON_FIRE) . += "It's on fire!" - var/healthpercent = (obj_integrity/max_integrity) * 100 + var/healthpercent = (atom_integrity/max_integrity) * 100 switch(healthpercent) if(50 to 99) . += "It looks slightly damaged." diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm index 817eca6e9aaa5..8496516b8090a 100644 --- a/code/game/machinery/airlock_cycle_control.dm +++ b/code/game/machinery/airlock_cycle_control.dm @@ -812,7 +812,7 @@ visible_message("Sparks fly out of [src]!", "You emag [src], disabling its safeties.") playsound(src, "sparks", 50, 1) -/obj/machinery/advanced_airlock_controller/obj_break(damage_flag) +/obj/machinery/advanced_airlock_controller/atom_break(damage_flag) ..() update_icon() diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 8e6868d461959..31bf598145500 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) return TRUE /obj/machinery/announcement_system/proc/act_up() //does funny breakage stuff - if(!obj_break()) // if badmins flag this unbreakable or its already broken + if(!atom_break()) // if badmins flag this unbreakable or its already broken return arrival = pick("#!@%ERR-34%2 CANNOT LOCAT@# JO# F*LE!", "CRITICAL ERROR 99.", "ERR)#: DA#AB@#E NOT F(*ND!") diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index b4a41b00fae9f..0ee6fc56590a7 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -73,7 +73,7 @@ update_icon() else if(O.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!O.tool_start_check(user, amount=0)) return @@ -86,7 +86,7 @@ return to_chat(user, "You repair [src].") set_machine_stat(machine_stat & ~BROKEN) - obj_integrity = max(obj_integrity, max_integrity) + atom_integrity = max(atom_integrity, max_integrity) update_icon() else to_chat(user, "[src] does not need repairs.") diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index dadb0460a41ff..1af3f53d807e0 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -243,7 +243,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/camera) if(!panel_open) return FALSE toggle_cam(user, 1) - obj_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex. + atom_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex. I.play_tool_sound(src) return TRUE @@ -387,12 +387,12 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/camera) return ..() -/obj/machinery/camera/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/machinery/camera/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 12 && !(machine_stat & BROKEN)) return 0 . = ..() -/obj/machinery/camera/obj_break(damage_flag) +/obj/machinery/camera/atom_break(damage_flag) if(!status) return . = ..() diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index ebaa93ed3ada6..9425e4b6368f8 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -119,7 +119,7 @@ if(BURN) playsound(src.loc, 'sound/items/welder.ogg', 100, 1) -/obj/machinery/computer/obj_break(damage_flag) +/obj/machinery/computer/atom_break(damage_flag) if(!circuit) //no circuit, no breaking return . = ..() @@ -133,10 +133,10 @@ switch(severity) if(1) if(prob(50)) - obj_break(ENERGY) + atom_break(ENERGY) if(2) if(prob(10)) - obj_break(ENERGY) + atom_break(ENERGY) /obj/machinery/computer/deconstruct(disassembled = TRUE, mob/user) on_deconstruction() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index fe6205bdde6cb..4f121b443a7e0 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -277,7 +277,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) if(obj_flags & EMAGGED) - new /obj/effect/spawner/newbomb/timer/syndicate(loc) + new /obj/effect/spawner/newbomb/timer(loc) new /obj/item/clothing/head/collectable/petehat(loc) message_admins("[ADMIN_LOOKUPFLW(usr)] has outbombed Cuban Pete and been awarded a bomb.") log_game("[key_name(usr)] has outbombed Cuban Pete and been awarded a bomb.") diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index abfb524aa0587..9426c196232bf 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -31,7 +31,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount/loaded, 28) end_processing() . = ..() -/obj/machinery/defibrillator_mount/obj_destruction() +/obj/machinery/defibrillator_mount/atom_destruction() if(defib) defib.forceMove(get_turf(src)) defib.visible_message("[defib] falls to the ground from the destroyed wall mount.") diff --git a/code/game/machinery/digital_clock.dm b/code/game/machinery/digital_clock.dm index a833cbcd8669a..5a2d5c7954e1e 100644 --- a/code/game/machinery/digital_clock.dm +++ b/code/game/machinery/digital_clock.dm @@ -37,14 +37,14 @@ . = ..() if(user.a_intent == INTENT_HARM) return - if(obj_integrity >= max_integrity) + if(atom_integrity >= max_integrity) balloon_alert(user, "it doesn't need repairs!") return TRUE to_chat(user, "You start to repair [name]...") if(!tool.use_tool(src, user, 4 SECONDS, amount = 0, volume=50)) return TRUE to_chat(user, "You finish to repair [name]...") - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) update_appearance() return TRUE diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 9bc1d1aa1b878..3aeb15a6cc0da 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -122,10 +122,10 @@ if(glass) airlock_material = "glass" if(security_level > AIRLOCK_SECURITY_IRON) - obj_integrity = normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER + atom_integrity = normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER max_integrity = normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER else - obj_integrity = normal_integrity + atom_integrity = normal_integrity max_integrity = normal_integrity if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_IRON) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R @@ -642,9 +642,9 @@ SSvis_overlays.add_vis_overlay(src, overlays_file, "lights_emergency", FLOAT_LAYER, FLOAT_PLANE, dir) if(welded) SSvis_overlays.add_vis_overlay(src, overlays_file, "welded", FLOAT_LAYER, FLOAT_PLANE, dir) - if(obj_integrity < integrity_failure * max_integrity) + if(atom_integrity < integrity_failure * max_integrity) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_broken", FLOAT_LAYER, FLOAT_PLANE, dir) - else if(obj_integrity < (0.75 * max_integrity)) + else if(atom_integrity < (0.75 * max_integrity)) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_damaged", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_DENY) @@ -653,25 +653,25 @@ SSvis_overlays.add_vis_overlay(src, overlays_file, "lights_denied", FLOAT_LAYER, FLOAT_PLANE, dir) if(welded) SSvis_overlays.add_vis_overlay(src, overlays_file, "welded", FLOAT_LAYER, FLOAT_PLANE, dir) - if(obj_integrity < integrity_failure * max_integrity) + if(atom_integrity < integrity_failure * max_integrity) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_broken", FLOAT_LAYER, FLOAT_PLANE, dir) - else if(obj_integrity < (0.75 * max_integrity)) + else if(atom_integrity < (0.75 * max_integrity)) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_damaged", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_EMAG) if(welded) SSvis_overlays.add_vis_overlay(src, overlays_file, "welded", FLOAT_LAYER, FLOAT_PLANE, dir) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks", FLOAT_LAYER, FLOAT_PLANE, dir) - if(obj_integrity < integrity_failure * max_integrity) + if(atom_integrity < integrity_failure * max_integrity) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_broken", FLOAT_LAYER, FLOAT_PLANE, dir) - else if(obj_integrity < (0.75 * max_integrity)) + else if(atom_integrity < (0.75 * max_integrity)) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_damaged", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_CLOSING) if(lights && hasPower()) SSvis_overlays.add_vis_overlay(src, overlays_file, "lights_closing", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_OPEN) - if(obj_integrity < (0.75 * max_integrity)) + if(atom_integrity < (0.75 * max_integrity)) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_open", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_OPENING) @@ -1129,14 +1129,14 @@ log_combat(user, src, welded? "welded shut":"unwelded", important = FALSE) update_icon() else - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return user.visible_message("[user] is welding the airlock.", \ "You begin repairing the airlock...", \ "You hear welding.") if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user))) - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) user.visible_message("[user.name] has repaired [src].", \ "You finish repairing the airlock.") @@ -1430,9 +1430,11 @@ add_hiddenprint(user) /obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) + if((damage_amount >= atom_integrity) && (damage_flag == BOMB)) + flags_1 |= NODECONSTRUCT_1 //If an explosive took us out, don't drop the assembly . = ..() - if(obj_integrity < (0.75 * max_integrity)) - update_icon() + if(atom_integrity < (0.75 * max_integrity)) + update_appearance() /obj/machinery/door/airlock/deconstruct(disassembled = TRUE, mob/user) if(!(flags_1 & NODECONSTRUCT_1)) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 5ee9958d26fb2..3a8560b9dc526 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -48,7 +48,7 @@ closets += WEAKREF(C) if(!length(doors) && !length(flashers) && length(closets)) - obj_break() + atom_break() //Main door timer loop, if it's timing and time is >0 reduce time by 1. // if it's less than 0, open door, reset timer diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index b303eb31cd972..c2c178a990861 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -227,7 +227,7 @@ /obj/machinery/door/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) + if(. && atom_integrity > 0) if(damage_amount >= 10 && prob(30)) spark_system.start() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 58bae417d81cd..044eb5c6069bd 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -62,7 +62,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) /obj/machinery/door/window/Destroy() set_density(FALSE) air_update_turf(1) - if(obj_integrity == 0) + if(atom_integrity == 0) playsound(src, "shatter", 70, 1) electronics = null return ..() diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 9ac48367e42cc..b28f12dc17ee3 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -227,12 +227,12 @@ "You restore [src] to operation.") set_machine_stat(machine_stat & ~BROKEN) - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() else return ..() -/obj/machinery/droneDispenser/obj_break(damage_flag) +/obj/machinery/droneDispenser/atom_break(damage_flag) . = ..() if(!.) return diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index e1a78a1e48294..42e3e8d6c421a 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -211,13 +211,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) if(panel_open) if(W.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return to_chat(user, "You begin repairing [src]...") if(W.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity to_chat(user, "You repair [src].") else to_chat(user, "[src] is already in good condition!") @@ -323,7 +323,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() if(.) //damage received - if(obj_integrity > 0 && !(machine_stat & BROKEN) && buildstage != 0) + if(atom_integrity > 0 && !(machine_stat & BROKEN) && buildstage != 0) if(prob(33)) alarm() @@ -332,7 +332,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) deconstruct() ..() -/obj/machinery/firealarm/obj_break(damage_flag) +/obj/machinery/firealarm/atom_break(damage_flag) if(buildstage == 0) //can't break the electronics if there isn't any inside. return . = ..() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index d27471b9f74ae..a3ce6831e8a1b 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -101,7 +101,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/flasher) if(anchored) flash() -/obj/machinery/flasher/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/machinery/flasher/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 10) //any melee attack below 10 dmg does nothing return 0 . = ..() @@ -144,7 +144,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/flasher) bulb.burn_out() power_change() -/obj/machinery/flasher/obj_break(damage_flag) +/obj/machinery/flasher/atom_break(damage_flag) . = ..() if(. && bulb) bulb.burn_out() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 6cb424f3feda4..2d5ad6ac59d0c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -134,7 +134,7 @@ Possible to do for anyone motivated enough: if(outgoing_call) outgoing_call.ConnectionFailure(src) -/obj/machinery/holopad/obj_break() +/obj/machinery/holopad/atom_break() . = ..() if(outgoing_call) outgoing_call.ConnectionFailure(src) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 4bf206dfc2fdf..0f3264d83d3cc 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -30,7 +30,7 @@ QDEL_NULL(beaker) return ..() -/obj/machinery/iv_drip/obj_destruction() +/obj/machinery/iv_drip/atom_destruction() if(beaker) beaker.forceMove(drop_location()) beaker.SplashReagents(drop_location()) diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index 04d4207fc0a84..0371af613d490 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -95,7 +95,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/newscaster) . += emissive_appearance(icon, "[base_icon_state]_alert", layer, alpha = src.alpha) ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) - var/hp_percent = (obj_integrity * 100) / max_integrity + var/hp_percent = (atom_integrity * 100) / max_integrity switch(hp_percent) if(75 to 100) return @@ -551,7 +551,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/newscaster) if(!(machine_stat & BROKEN)) return to_chat(user, "You repair [src].") - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) update_icon() else @@ -585,7 +585,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/newscaster) new /obj/item/shard(loc) qdel(src) -/obj/machinery/newscaster/obj_break(damage_flag) +/obj/machinery/newscaster/atom_break(damage_flag) . = ..() if(.) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 346c2b6fc4aa8..d8df4f3c5d524 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -374,7 +374,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret) /obj/machinery/porta_turret/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) //damage received + if(. && atom_integrity > 0) //damage received if(prob(30)) spark_system.start() if(on && !attacked && !(obj_flags & EMAGGED)) @@ -387,7 +387,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret) /obj/machinery/porta_turret/deconstruct(disassembled = TRUE) qdel(src) -/obj/machinery/porta_turret/obj_break(damage_flag) +/obj/machinery/porta_turret/atom_break(damage_flag) . = ..() if(.) power_change() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index a92709d21a5bb..1f3ea33523970 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -115,11 +115,8 @@ /obj/machinery/shieldgen/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) - if(!(machine_stat && BROKEN)) - set_machine_stat(machine_stat | BROKEN) - locked = pick(0,1) - update_icon() + atom_break() + locked = pick(0,1) /obj/machinery/shieldgen/interact(mob/user) . = ..() @@ -165,7 +162,7 @@ if(coil.get_amount() < 1) return coil.use(1) - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) to_chat(user, "You repair \the [src].") update_icon() diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index fb20f6b958b2f..61975b7a673ed 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -108,10 +108,10 @@ return icon_state = "stasis" -/obj/machinery/stasis/obj_break(damage_flag) +/obj/machinery/stasis/atom_break(damage_flag) . = ..() - play_power_sound() - update_icon() + if(.) + play_power_sound() /obj/machinery/stasis/power_change() . = ..() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 4683a8e6e0add..8dd5ec0baa082 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -59,11 +59,11 @@ var/obj/item/transfer_valve/valve_payload = payload valve_payload.toggle_valve() -/obj/machinery/syndicatebomb/obj_break() +/obj/machinery/syndicatebomb/atom_break() if(!try_detonate()) ..() -/obj/machinery/syndicatebomb/obj_destruction() +/obj/machinery/syndicatebomb/atom_destruction() if(!try_detonate()) ..() @@ -193,11 +193,11 @@ to_chat(user, "You need at least [PLASTEEL_REPAIR_AMOUNT] sheets of plasteel to repair [src].") return if(do_after(user, delay = 2.5 SECONDS, target = src) && stack_sheets.use(PLASTEEL_REPAIR_AMOUNT)) - obj_integrity = min(obj_integrity + 100, max_integrity) + atom_integrity = min(atom_integrity + 100, max_integrity) else - var/old_integ = obj_integrity + var/old_integ = atom_integrity . = ..() - if((old_integ > obj_integrity) && active && (payload in src)) + if((old_integ > atom_integrity) && active && (payload in src)) to_chat(user, "That seems like a really bad idea...") /obj/machinery/syndicatebomb/interact(mob/user) @@ -230,7 +230,7 @@ if(!anchored) to_chat(user, "[src] must be anchored in order to arm!") return - if(obj_integrity != max_integrity) + if(atom_integrity != max_integrity) to_chat(user, "[src] must be undamaged in order to arm!") return visible_message("[icon2html(src, viewers(loc))] [timer_set] seconds until detonation, please clear the area.") diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 3fd2baed0fc38..14f3005bc80b3 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -228,7 +228,7 @@ GLOBAL_LIST_EMPTY(telecomms_list) if(traffic > 0) traffic -= netspeed * delta_time -/obj/machinery/telecomms/obj_break(damage_flag) +/obj/machinery/telecomms/atom_break(damage_flag) . = ..() update_power() diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 700439c06377a..1a66796e2dae7 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -56,7 +56,7 @@ myseed.adjust_production(rand(-3,6)) myseed.adjust_endurance(rand(-3,6)) delay = delay - myseed.production * 100 //So the delay goes DOWN with better stats instead of up. :I - obj_integrity = round(myseed.endurance / 2) + atom_integrity = round(myseed.endurance / 2) max_integrity = round(myseed.endurance / 2) var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) if(ispath(G)) // Seeds were ported to initialize so their genes are still typepaths here, luckily their initializer is smart enough to handle us doing this diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 8a84e300264da..b6e2940429b69 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -20,7 +20,7 @@ to_chat(user, "The [I] gets stuck in \the [src]!") return ..() -/obj/structure/spider/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/spider/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE) switch(damage_type) if(BURN) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a5e3b0c6ec052..185206955f905 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -280,7 +280,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/blob_act(obj/structure/blob/B) if(B.loc == loc && !(resistance_flags & INDESTRUCTIBLE)) - qdel(src) + atom_destruction(MELEE) /obj/item/ComponentInitialize() . = ..() diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 92c7348a3c81c..dbb91d6441ab4 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -433,7 +433,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( spark_system.start() playsound(get_turf(src), 'sound/effects/pop.ogg', 50, FALSE) -/obj/item/pipe_dispenser/attack_obj(obj/O, mob/living/user) +/obj/item/pipe_dispenser/attack_atom(obj/O, mob/living/user) // don't attempt to attack what we don't want to attack if(is_type_in_typecache(O, atmos_constructs) || is_type_in_typecache(O, rpd_targets) || is_type_in_typecache(O, rpd_whitelist)) return diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index a7382025dfd41..28b072da7a69c 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -61,7 +61,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) addtimer(CALLBACK(src, PROC_REF(startUp)), 50) player_modifier = length(GLOB.player_list) max_integrity = min(300+player_modifier*15, 600) - obj_integrity = max_integrity + atom_integrity = max_integrity calculate_runaway_condition() existing_machines++ @@ -69,7 +69,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) /obj/structure/checkoutmachine/examine(mob/living/user) . = ..() - . += "It's integrated integrity meter reads: HEALTH: [obj_integrity]." + . += "It's integrated integrity meter reads: HEALTH: [atom_integrity]." /obj/structure/checkoutmachine/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/card/id)) @@ -91,7 +91,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) return ..() /obj/structure/checkoutmachine/proc/calculate_runaway_condition() - next_health_to_teleport = obj_integrity - RUN_AWAY_THRESHOLD_HP - clamp((20-player_modifier)*10, 0, 100) + next_health_to_teleport = atom_integrity - RUN_AWAY_THRESHOLD_HP - clamp((20-player_modifier)*10, 0, 100) /* the less player you have, it will less run away: [1 pop] 315-75-dead [5 pop] 375-135-dead @@ -216,7 +216,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) var/link = FOLLOW_LINK(M, src) to_chat(M, "[link] [name] [total_credits_stolen ? "siphons total [total_credits_stolen] credits from [victim_count] bank accounts." : "tried to siphon bank accounts, but there're no victims."] location: [get_area(src)]") - if(obj_integrity>25) + if(atom_integrity>25) next_health_to_teleport -= round(max_integrity/60) take_damage(round(max_integrity/60)) // self-damage for self-destruction @@ -228,7 +228,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) Move(get_step(src, anydir), anydir) // Oh no, it RUNS AWAY!!! - if(obj_integrity && obj_integrity < next_health_to_teleport) // checks if obj_integrity is positive first + if(atom_integrity && atom_integrity < next_health_to_teleport) // checks if atom_integrity is positive first calculate_runaway_condition() var/turf/targetturf for(var/i in 1 to 100) // teleporting across z-levels is painful diff --git a/code/game/objects/items/deployable/barricade.dm b/code/game/objects/items/deployable/barricade.dm index 38688c4cc8eed..d08f3ddfcf5d9 100644 --- a/code/game/objects/items/deployable/barricade.dm +++ b/code/game/objects/items/deployable/barricade.dm @@ -54,13 +54,13 @@ /obj/structure/barricade/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM && bar_material == METAL) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!I.tool_start_check(user, amount=0)) return to_chat(user, "You begin repairing [src]...") if(I.use_tool(src, user, 40, volume=40)) - obj_integrity = clamp(obj_integrity + 20, 0, max_integrity) + atom_integrity = clamp(atom_integrity + 20, 0, max_integrity) else if(I.GetID() && initial(locked_down)) if(allowed(user)) @@ -92,7 +92,7 @@ if(over_object == usr && Adjacent(usr)) if(!ishuman(usr) || !usr.canUseTopic(src, BE_CLOSE)) return - if(!pickup_damaged && obj_integrity < max_integrity) + if(!pickup_damaged && atom_integrity < max_integrity) to_chat(usr, "[src] is damaged! You'll have to repair it before you can relocate it.") return if(locked_down) @@ -104,9 +104,9 @@ //If the barricade is made of parts, some of them are damaged when the barricade is damaged so we set how many are being returned here if(initial(drop_amount) > 1) - drop_amount = round(drop_amount * (obj_integrity/max_integrity)) + drop_amount = round(drop_amount * (atom_integrity/max_integrity)) //If we are only picking up one item at most, it has a chance to fall apart based on damage the barricade accrued. Will always succeed if pickup_damaged is false. - else if(!prob(round((obj_integrity/max_integrity), 0.01) * 100)) + else if(!prob(round((atom_integrity/max_integrity), 0.01) * 100)) usr.visible_message("[usr] tries to pick up [src] but it falls apart!", "[src] is too damaged and falls apart!") qdel(src) return diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 3e38084aca31a..24914e3ff031e 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -249,3 +249,9 @@ ui_update() update_icon() + +/** + * Returns if this is ready to be detonated. Checks if both tanks are in place. + */ +/obj/item/transfer_valve/proc/ready() + return tank_one && tank_two diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index d25de6a13e892..d0f9a52121852 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -85,7 +85,7 @@ else return ..() -/obj/item/extinguisher/attack_obj(obj/O, mob/living/user) +/obj/item/extinguisher/attack_atom(obj/O, mob/living/user, params) if(AttemptRefill(O, user)) refilling = TRUE return FALSE diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index 04ccf705ba49e..e0cf0ab0d6b8a 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -33,7 +33,7 @@ if(cell && !(. & EMP_PROTECT_CONTENTS)) cell.emp_act(severity) -/obj/item/inducer/attack_obj(obj/O, mob/living/carbon/user) +/obj/item/inducer/attack_atom(obj/O, mob/living/carbon/user, params) if(user.a_intent == INTENT_HARM) return ..() diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 89f5ab3cae700..cff95a2585838 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -42,10 +42,10 @@ owner.visible_message("[L] injures themselves on [owner]'s [src]!") if(attackforce) owner.changeNext_move(CLICK_CD_MELEE) - if (obj_integrity <= attackforce) + if (atom_integrity <= attackforce) var/turf/T = get_turf(owner) T.visible_message("[hitby] destroys [src]!") - obj_integrity = 1 + atom_integrity = 1 shatter(owner) return FALSE take_damage(attackforce * ((100-(block_power))/100)) @@ -55,13 +55,13 @@ /obj/item/shield/attackby(obj/item/weldingtool/W, mob/living/user, params) if(istype(W)) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return user.visible_message("[user] is welding the [src].", \ "You begin repairing the [src]]...") if(W.use_tool(src, user, 40, volume=50)) - obj_integrity += 10 + atom_integrity += 10 user.visible_message("[user.name] has repaired some dents on [src].", \ "You finish repairing some of the dents on [src].") else @@ -70,7 +70,7 @@ /obj/item/shield/examine(mob/user) . = ..() - var/healthpercent = round((obj_integrity/max_integrity) * 100, 1) + var/healthpercent = round((atom_integrity/max_integrity) * 100, 1) switch(healthpercent) if(50 to 99) . += "It looks slightly damaged." @@ -110,12 +110,12 @@ playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) cooldown = world.time else if(istype(W, /obj/item/stack/sheet/mineral/titanium)) - if (obj_integrity >= max_integrity) + if (atom_integrity >= max_integrity) to_chat(user, "[src] is already in perfect condition.") else var/obj/item/stack/sheet/mineral/titanium/T = W T.use(1) - obj_integrity = max_integrity + atom_integrity = max_integrity to_chat(user, "You repair [src] with [T].") else return ..() @@ -316,8 +316,8 @@ w_class = WEIGHT_CLASS_BULKY playsound(user, 'sound/weapons/saberon.ogg', 35, 1) to_chat(user, "[src] is now active and back at full power.") - if(obj_integrity <= 1) - obj_integrity = max_integrity + if(atom_integrity <= 1) + atom_integrity = max_integrity else force = initial(force) throwforce = initial(throwforce) diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 6405e4b22a110..bffb7ab089494 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -1,5 +1,7 @@ #define TTV_NO_CASING_MOD 0.25 #define REACTIONS_BEFORE_EXPLOSION 3 +/// How much time (in seconds) is assumed to pass while assuming air. Used to scale overpressure/overtemp damage when assuming air. +#define ASSUME_AIR_DT_FACTOR 1 /obj/item/tank name = "tank" @@ -18,10 +20,15 @@ custom_materials = list(/datum/material/iron = 500) actions_types = list(/datum/action/item_action/set_internals) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 80, ACID = 30, STAMINA = 0, BLEED = 0) + integrity_failure = 0.5 + /// The gases this tank contains. var/datum/gas_mixture/air_contents = null - var/distribute_pressure = ONE_ATMOSPHERE - var/integrity = 3 + /// The volume of this tank. var/volume = 70 + /// Whether the tank is currently leaking. + var/leaking = FALSE + /// The pressure of the gases this tank supplies to internals. + var/distribute_pressure = ONE_ATMOSPHERE /// Mob that is currently breathing from the tank. var/mob/living/carbon/breathing_mob = null @@ -77,7 +84,7 @@ QDEL_NULL(air_contents) STOP_PROCESSING(SSobj, src) - . = ..() + return ..() /obj/item/tank/examine(mob/user) var/obj/icon = src @@ -109,25 +116,13 @@ . += "It feels [descriptive]." -/obj/item/tank/blob_act(obj/structure/blob/B) - if(B && B.loc == loc) - var/turf/location = get_turf(src) - if(!location) - qdel(src) - - if(air_contents) - location.assume_air(air_contents) - - qdel(src) - /obj/item/tank/deconstruct(disassembled = TRUE) - if(!disassembled) - var/turf/T = get_turf(src) - if(T) - T.assume_air(air_contents) - air_update_turf() - playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) - qdel(src) + var/turf/location = get_turf(src) + if(location) + location.assume_air(air_contents) + location.air_update_turf(FALSE, FALSE) + playsound(location, 'sound/effects/spray.ogg', 10, TRUE, -3) + return ..() /obj/item/tank/suicide_act(mob/living/user) var/mob/living/carbon/human/human_user = user @@ -221,21 +216,20 @@ /obj/item/tank/assume_air(datum/gas_mixture/giver) air_contents.merge(giver) - - check_status() - return 1 + handle_tolerances(ASSUME_AIR_DT_FACTOR) + return TRUE /obj/item/tank/assume_air_moles(datum/gas_mixture/giver, moles) giver.transfer_to(air_contents, moles) - check_status() - return 1 + handle_tolerances(ASSUME_AIR_DT_FACTOR) + return TRUE /obj/item/tank/assume_air_ratio(datum/gas_mixture/giver, ratio) giver.transfer_ratio_to(air_contents, ratio) - check_status() - return 1 + handle_tolerances(ASSUME_AIR_DT_FACTOR) + return TRUE /obj/item/tank/proc/remove_air_volume(volume_to_return) if(!air_contents) @@ -249,23 +243,71 @@ return remove_air(moles_needed) -/obj/item/tank/process() +/obj/item/tank/process(delta_time) + if(!air_contents) + return + //Allow for reactions air_contents.react(src) - check_status() - -/obj/item/tank/proc/check_status() - //Handle exploding, leaking, and rupturing of the tank - + handle_tolerances(delta_time) + if(QDELETED(src) || !leaking || !air_contents) + return + var/turf/location = get_turf(src) + if(!location) + return + var/datum/gas_mixture/leaked_gas = air_contents.remove_ratio(0.25) + location.assume_air(leaked_gas) + location.air_update_turf(FALSE, FALSE) + +/** + * Handles the minimum and maximum pressure tolerances of the tank. + * + * Arguments: + * - delta_time: How long has passed between ticks. + */ +/obj/item/tank/proc/handle_tolerances(delta_time) if(!air_contents) - return 0 + return FALSE var/pressure = air_contents.return_pressure() var/temperature = air_contents.return_temperature() + if(temperature >= TANK_MELT_TEMPERATURE) + var/temperature_damage_ratio = (temperature - TANK_MELT_TEMPERATURE) / temperature + take_damage(max_integrity * temperature_damage_ratio * delta_time, BURN, FIRE, FALSE, NONE) + if(QDELETED(src)) + return TRUE + + if(pressure >= TANK_LEAK_PRESSURE) + var/pressure_damage_ratio = (pressure - TANK_LEAK_PRESSURE) / (TANK_RUPTURE_PRESSURE - TANK_LEAK_PRESSURE) + take_damage(max_integrity * pressure_damage_ratio * delta_time, BRUTE, BOMB, FALSE, NONE) + return TRUE + +/// Handles the tank springing a leak. +/obj/item/tank/atom_break(damage_flag) + . = ..() + if(leaking) + return + + leaking = TRUE + if(atom_integrity < 0) // So we don't play the alerts while we are exploding or rupturing. + return + visible_message("[src] springs a leak!") + playsound(src, 'sound/effects/spray.ogg', 10, TRUE, -3) +/// Handles rupturing and fragmenting +/obj/item/tank/atom_destruction(damage_flag) + if(!air_contents) + return ..() + + var/turf/location = get_turf(src) + if(!location) + return ..() + + /// Handle fragmentation + var/pressure = air_contents.return_pressure() if(pressure > TANK_FRAGMENT_PRESSURE) var/explosion_mod = 1 - if(!istype(src.loc, /obj/item/transfer_valve)) + if(!istype(loc, /obj/item/transfer_valve)) log_bomber(details = "[src.fingerprintslast] was the last key to touch", bomb = src, additional_details = ", which ruptured explosively") else if(!istype(src.loc?.loc, /obj/machinery/syndicatebomb)) explosion_mod = TTV_NO_CASING_MOD @@ -274,38 +316,10 @@ air_contents.react(src) pressure = air_contents.return_pressure() var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE - var/turf/epicenter = get_turf(loc) - - - explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5), cap_modifier = explosion_mod) - if(istype(src.loc, /obj/item/transfer_valve)) - qdel(src.loc) - else - qdel(src) - - else if(pressure > TANK_RUPTURE_PRESSURE || temperature > TANK_MELT_TEMPERATURE) - if(integrity <= 0) - var/turf/T = get_turf(src) - if(!T) - return - T.assume_air(air_contents) - playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) - qdel(src) - else - integrity-- - - else if(pressure > TANK_LEAK_PRESSURE) - if(integrity <= 0) - var/turf/T = get_turf(src) - if(!T) - return - var/datum/gas_mixture/leaked_gas = air_contents.remove_ratio(0.25) - T.assume_air(leaked_gas) - else - integrity-- - - else if(integrity < 3) - integrity++ + + explosion(location, round(range*0.25), round(range*0.5), round(range), round(range*1.5), cap_modifier = explosion_mod) + return ..() #undef TTV_NO_CASING_MOD #undef REACTIONS_BEFORE_EXPLOSION +#undef ASSUME_AIR_DT_FACTOR diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 4fee093fd8c17..85177a5e04007 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -1,87 +1,3 @@ - -//the essential proc to call when an obj must receive damage of any kind. -/obj/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) - if(QDELETED(src)) - stack_trace("[src] taking damage after deletion") - return - if(obj_integrity <= 0) - stack_trace("[src] taking damage while having <= 0 integrity") - return - if(sound_effect) - play_attack_sound(damage_amount, damage_type, damage_flag) - if(resistance_flags & INDESTRUCTIBLE) - return - damage_amount = run_obj_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration) - if(damage_amount < DAMAGE_PRECISION) - return - if (!isnull(max_hit_damage)) - damage_amount = min(damage_amount, max_hit_damage) - //Object is basssiiiiccaalllyyy guaranteed to take damage by this point, lets run our signal - if(SEND_SIGNAL(src, COMSIG_OBJ_TAKE_DAMAGE, damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration) & COMPONENT_NO_TAKE_DAMAGE) - return - . = damage_amount - - update_integrity(obj_integrity - damage_amount) - - //BREAKING FIRST - if(integrity_failure && obj_integrity <= integrity_failure * max_integrity) - obj_break(damage_flag) - - //DESTROYING SECOND - if(obj_integrity <= 0) - obj_destruction(damage_flag) - -/// Proc for recovering obj_integrity. Returns the amount repaired by -/obj/proc/repair_damage(amount) - if(amount <= 0) // We only recover here - return - var/new_integrity = min(max_integrity, obj_integrity + amount) - . = new_integrity - obj_integrity - - update_integrity(new_integrity) - - if(integrity_failure && obj_integrity > integrity_failure * max_integrity) - obj_fix() - -/// Handles the integrity of an object changing. This must be called instead of changing integrity directly. -/obj/proc/update_integrity(new_value) - SHOULD_NOT_OVERRIDE(TRUE) - new_value = max(0, new_value) - if(obj_integrity == new_value) - return - obj_integrity = new_value - SEND_SIGNAL(src, COMSIG_OBJ_INTEGRITY_CHANGED) - -/// This mostly exists to keep obj_integrity private. Might be useful in the future. -/obj/proc/get_integrity() - SHOULD_BE_PURE(TRUE) - return obj_integrity - -//returns the damage value of the attack after processing the obj's various armor protections -/obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) - switch(damage_type) - if(BRUTE) - if(BURN) - else - return 0 - var/armor_protection = 0 - if(damage_flag) - armor_protection = armor.getRating(damage_flag) - if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. - armor_protection = clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100) - return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) - -//the sound played when the obj is damaged. -/obj/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - switch(damage_type) - if(BRUTE) - if(damage_amount) - playsound(src, 'sound/weapons/smash.ogg', 50, 1) - else - playsound(src, 'sound/weapons/tap.ogg', 50, 1) - if(BURN) - playsound(src.loc, 'sound/items/welder.ogg', 100, 1) - /obj/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) ..() take_damage(AM.throwforce, BRUTE, MELEE, 1, get_dir(src, AM)) @@ -113,9 +29,6 @@ if(P.suppressed != SUPPRESSED_VERY) visible_message("[src] is hit by \a [P][damage ? "" : ", without leaving a mark"]!", null, null, COMBAT_MESSAGE_RANGE) -/obj/proc/hulk_damage() - return 150 //the damage hulks do on punches to this object, is affected by melee armor - /obj/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if(user.a_intent == INTENT_HARM) ..(user, 1) @@ -138,11 +51,6 @@ return take_damage(400, BRUTE, MELEE, 0, get_dir(src, B)) -/obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime - user.do_attack_animation(src) - user.changeNext_move(CLICK_CD_MELEE) - return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration) - /obj/attack_alien(mob/living/carbon/alien/humanoid/user) if(attack_generic(user, 60, BRUTE, MELEE, 0)) playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) @@ -286,19 +194,8 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e SEND_SIGNAL(src, COMSIG_OBJ_DECONSTRUCT, disassembled) qdel(src) -/// Called after the obj takes damage and integrity is below integrity_failure level -/obj/proc/obj_break(damage_flag) - SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL(src, COMSIG_OBJ_BREAK) - -/// Called when integrity is repaired above the breaking point having been broken before -/obj/proc/obj_fix() - SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL(src, COMSIG_OBJ_FIX) - //what happens when the obj's integrity reaches zero. -/obj/proc/obj_destruction(damage_flag) - +/obj/atom_destruction(damage_flag) if(damage_flag == ACID) acid_melt() else if(damage_flag == FIRE) @@ -306,24 +203,6 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e else deconstruct(FALSE) -//changes max_integrity while retaining current health percentage -//returns TRUE if the obj broke, FALSE otherwise -/obj/proc/modify_max_integrity(new_max, can_break = TRUE, damage_type = BRUTE) - var/current_integrity = obj_integrity - var/current_max = max_integrity - - if(current_integrity != 0 && current_max != 0) - var/percentage = current_integrity / current_max - current_integrity = max(1, round(percentage * new_max)) //don't destroy it as a result - obj_integrity = current_integrity - - max_integrity = new_max - - if(can_break && integrity_failure && current_integrity <= integrity_failure * max_integrity) - obj_break(damage_type) - return TRUE - return FALSE - //returns how much the object blocks an explosion /obj/proc/GetExplosionBlock() CRASH("Unimplemented GetExplosionBlock()") diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index f0cee5f78010a..b76b9ac15ac60 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -13,12 +13,12 @@ CREATION_TEST_IGNORE_SELF(/obj) /// How much bleeding damage do we cause, see __DEFINES/mobs.dm var/bleed_force = 0 + /* var/datum/armor/armor - /// The integrity the object starts at. Defaults to max_integrity. - VAR_PRIVATE/obj_integrity //defaults to max_integrity + VAR_PRIVATE/atom_integrity //defaults to max_integrity /// The maximum integrity the object can have. var/max_integrity = 500 - /// The object will break once obj_integrity reaches this amount in take_damage(). 0 if we have no special broken behavior, otherwise is a percentage of at what point the obj breaks. 0.5 being 50% + /// The object will break once atom_integrity reaches this amount in take_damage(). 0 if we have no special broken behavior, otherwise is a percentage of at what point the obj breaks. 0.5 being 50% var/integrity_failure = 0 /// Damage under this value will be completely ignored var/damage_deflection = 0 @@ -27,6 +27,7 @@ CREATION_TEST_IGNORE_SELF(/obj) /// INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF var/resistance_flags = NONE + */ /// How much acid is on that obj var/acid_level = 0 @@ -58,6 +59,8 @@ CREATION_TEST_IGNORE_SELF(/obj) /// broadcasted to as long as the other guys network is on the same branch or above. var/network_id = null + uses_integrity = TRUE + var/investigate_flags = NONE // ADMIN_INVESTIGATE_TARGET: investigate_log on pickup/drop /// If the emag behavior should be toggleable @@ -70,13 +73,13 @@ CREATION_TEST_IGNORE_SELF(/obj) return ..() /obj/Initialize(mapload) - if (islist(armor)) - armor = getArmor(arglist(armor)) - else if (!armor) - armor = getArmor() - else if (!istype(armor, /datum/armor)) - stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()") - obj_integrity = max_integrity + //if (islist(armor)) + // armor = getArmor(arglist(armor)) + //else if (!armor) + // armor = getArmor() + //else if (!istype(armor, /datum/armor)) + // stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()") + //atom_integrity = max_integrity . = ..() //Do this after, else mat datums is mad. diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 3f97e790cae44..18018afc5874c 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -47,7 +47,7 @@ . += examine_status /obj/structure/proc/examine_status(mob/user) //An overridable proc, mostly for falsewalls. - var/healthpercent = (obj_integrity/max_integrity) * 100 + var/healthpercent = (atom_integrity/max_integrity) * 100 switch(healthpercent) if(50 to 99) return "It looks slightly damaged." diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 8517bb98133d6..cb218efabd838 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -11,7 +11,7 @@ icon = 'icons/mob/alien.dmi' max_integrity = 100 -/obj/structure/alien/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/alien/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE) switch(damage_type) if(BRUTE) @@ -258,7 +258,7 @@ addtimer(CALLBACK(src, PROC_REF(Grow)), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) proximity_monitor = new(src, status == GROWN ? 1 : 0) if(status == BURST) - obj_integrity = integrity_failure * max_integrity + atom_integrity = integrity_failure * max_integrity /obj/structure/alien/egg/update_icon() ..() @@ -331,7 +331,7 @@ child.Leap(C) break -/obj/structure/alien/egg/obj_break(damage_flag) +/obj/structure/alien/egg/atom_break(damage_flag) . = ..() if(!(flags_1 & NODECONSTRUCT_1)) if(status != BURST) diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index 2ca66cc88647d..037da95a4b9a0 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -42,7 +42,7 @@ var/new_sign = new D return set_sign(new_sign) -/obj/structure/sign/barsign/obj_break(damage_flag) +/obj/structure/sign/barsign/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) broken = TRUE diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8c8d67e3aec7d..c8ed5d023e6ec 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -315,7 +315,7 @@ new material_drop(loc, material_drop_amount) qdel(src) -/obj/structure/closet/obj_break(damage_flag) +/obj/structure/closet/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) bust_open() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index f459dda04fb4a..a52f0d6c0dee3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -7,7 +7,7 @@ armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80, STAMINA = 0, BLEED = 0) secure = TRUE -/obj/structure/closet/secure_closet/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/closet/secure_closet/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 20) return 0 . = ..() diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index d55a930f1260f..45fb0291f6174 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -9,7 +9,7 @@ var/tamperproof = 0 icon_door = "crate" -/obj/structure/closet/crate/secure/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/closet/crate/secure/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 25) return 0 . = ..() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 9fece4d8b7fe8..2f2dcb4932e7a 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -99,7 +99,7 @@ trigger_alarm() qdel(src) -/obj/structure/displaycase/obj_break(damage_flag) +/obj/structure/displaycase/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) set_density(FALSE) @@ -149,13 +149,13 @@ to_chat(user, "You open [src].") toggle_lock(user) else if(W.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=5)) return to_chat(user, "You begin repairing [src]...") if(W.use_tool(src, user, 40, amount=5, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() to_chat(user, "You repair [src].") else @@ -190,7 +190,7 @@ if(do_after(user, 20, target = src)) G.use(2) broken = FALSE - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() else return ..() @@ -563,11 +563,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/showpiece_dummy) /obj/structure/displaycase/forsale/multitool_act(mob/living/user, obj/item/I) . = ..() - if(obj_integrity <= (integrity_failure * max_integrity)) + if(atom_integrity <= (integrity_failure * max_integrity)) to_chat(user, "You start recalibrating [src]'s hover field...") if(do_after(user, 20, target = src)) broken = FALSE - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() ui_update() return TRUE @@ -606,7 +606,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/showpiece_dummy) if(broken) . += "[src] is sparking and the hover field generator seems to be overloaded. Use a multitool to fix it." -/obj/structure/displaycase/forsale/obj_break(damage_flag) +/obj/structure/displaycase/forsale/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) broken = TRUE diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 27089c6c0b6f8..0452c98fff789 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -137,7 +137,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/extinguisher_cabinet) else icon_state = "extinguisher_empty" -/obj/structure/extinguisher_cabinet/obj_break(damage_flag) +/obj/structure/extinguisher_cabinet/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) broken = 1 diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index e4720096c9765..0f9bd1ad18a70 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -29,13 +29,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) if(iscyborg(user) || I.tool_behaviour == TOOL_MULTITOOL) toggle_lock(user) else if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!I.tool_start_check(user, amount=2)) return to_chat(user, "You begin repairing [src].") if(I.use_tool(src, user, 40, volume=50, amount=2)) - obj_integrity = max_integrity + atom_integrity = max_integrity update_appearance() to_chat(user, "You repair [src].") else @@ -49,7 +49,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) to_chat(user, "You start fixing [src]...") if(do_after(user, 20, target = src) && G.use(2)) broken = 0 - obj_integrity = max_integrity + atom_integrity = max_integrity update_appearance() else if(open || broken) if(istype(I, /obj/item/fireaxe) && !fireaxe) @@ -85,7 +85,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) if(.) update_appearance() -/obj/structure/fireaxecabinet/obj_break(damage_flag) +/obj/structure/fireaxecabinet/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) update_appearance() @@ -148,7 +148,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) if(fireaxe) add_overlay("axe") if(!open) - var/hp_percent = obj_integrity/max_integrity * 100 + var/hp_percent = atom_integrity/max_integrity * 100 if(broken) add_overlay("glass4") else diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index b9326d3200972..fe5d05fc53efa 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -6,6 +6,7 @@ name = "grille" icon = 'icons/obj/structures.dmi' icon_state = "grille" + base_icon_state = "grille" density = TRUE anchored = TRUE flags_1 = CONDUCT_1 @@ -26,21 +27,19 @@ /obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - update_icon() + update_appearance() -/obj/structure/grille/update_icon() +/obj/structure/grille/update_appearance(updates) if(QDELETED(src) || broken) return - var/ratio = obj_integrity / max_integrity - ratio = CEILING(ratio*4, 1) * 25 - + . = ..() if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) QUEUE_SMOOTH(src) - if(ratio > 50) - return - icon_state = "grille50_[rand(0,3)]" +/obj/structure/grille/update_icon_state() + icon_state = "[base_icon_state][((atom_integrity / max_integrity) <= 0.5) ? "50_[rand(0, 3)]" : null]" + return ..() /obj/structure/grille/examine(mob/user) . = ..() @@ -278,12 +277,12 @@ qdel(src) ..() -/obj/structure/grille/obj_break() +/obj/structure/grille/atom_break() . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) icon_state = "brokengrille" - density = FALSE - obj_integrity = 20 + set_density(FALSE) + atom_integrity = 20 broken = TRUE rods_amount = 1 rods_broken = FALSE @@ -297,8 +296,8 @@ /obj/structure/grille/proc/repair_grille() if(broken) icon_state = "grille" - density = TRUE - obj_integrity = max_integrity + set_density(TRUE) + atom_integrity = max_integrity broken = FALSE rods_amount = 2 rods_broken = TRUE @@ -386,7 +385,7 @@ src.device.activate() ..() -/obj/structure/grille/prison/obj_break() +/obj/structure/grille/prison/atom_break() var/turf/T = get_turf(src) var/obj/structure/cable/C = T.get_cable_node() if(C?.powernet) diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index 0ed3926978cdb..fe7364c5679ad 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -60,7 +60,7 @@ var/plunge_mod = 1 //time*plunge_mod = total time we take to plunge an object var/reinforced = FALSE //whether we do heavy duty stuff like geysers -/obj/item/plunger/attack_obj(obj/O, mob/living/user) +/obj/item/plunger/attack_atom(obj/O, mob/living/user) if(!O.plunger_act(src, user, reinforced)) return ..() diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index d46b64636271b..0ca845c67b855 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -200,7 +200,7 @@ /obj/item/gun_control/CanItemAutoclick() return TRUE -/obj/item/gun_control/attack_obj(obj/O, mob/living/user) +/obj/item/gun_control/attack_atom(obj/O, mob/living/user, params) user.changeNext_move(CLICK_CD_MELEE) O.attacked_by(src, user) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 0f28eb2d11f3f..e47a0f3c8afb4 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -316,7 +316,7 @@ /obj/structure/mineral_door/paperframe/examine(mob/user) . = ..() - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) . += "It looks a bit damaged, you may be able to fix it with some paper." /obj/structure/mineral_door/paperframe/pickaxe_door(mob/living/user, obj/item/I) @@ -333,10 +333,10 @@ fire_act(I.is_hot()) return - if((user.a_intent != INTENT_HARM) && istype(I, /obj/item/paper) && (obj_integrity < max_integrity)) + if((user.a_intent != INTENT_HARM) && istype(I, /obj/item/paper) && (atom_integrity < max_integrity)) user.visible_message("[user] starts to patch the holes in [src].", "You start patching some of the holes in [src]!") if(do_after(user, 20, src)) - obj_integrity = min(obj_integrity+4,max_integrity) + atom_integrity = min(atom_integrity+4,max_integrity) qdel(I) user.visible_message("[user] patches some of the holes in [src].", "You patch some of the holes in [src]!") return TRUE diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 5f7c20babfaaa..9146087aa93c9 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -19,7 +19,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/mirror) /obj/structure/mirror/Initialize(mapload, dir, building) . = ..() if(icon_state == "mirror_broke" && !broken) - obj_break(null, mapload) + atom_break(null, mapload) /obj/structure/mirror/attack_hand(mob/user) . = ..() @@ -57,7 +57,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/mirror) return list()// no message spam return ..() -/obj/structure/mirror/obj_break(damage_flag, mapload) +/obj/structure/mirror/atom_break(damage_flag, mapload) . = ..() if(broken || (flags_1 & NODECONSTRUCT_1)) return diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index 62987b94c02d6..06c17e96e169d 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -24,8 +24,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/statue/petrified) ADD_TRAIT(L, TRAIT_NO_BLOOD, STATUE_MUTE) L.faction += "mimic" //Stops mimics from instaqdeling people in statues L.status_flags |= GODMODE - obj_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues - max_integrity = obj_integrity + atom_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues + max_integrity = atom_integrity START_PROCESSING(SSobj, src) /obj/structure/statue/petrified/process(delta_time) @@ -64,7 +64,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/statue/petrified) petrified_mob.forceMove(loc) REMOVE_TRAIT(petrified_mob, TRAIT_MUTE, STATUE_MUTE) REMOVE_TRAIT(petrified_mob, TRAIT_NO_BLOOD, STATUE_MUTE) - petrified_mob.take_overall_damage((petrified_mob.health - obj_integrity + 100)) //any new damage the statue incurred is transfered to the mob + petrified_mob.take_overall_damage((petrified_mob.health - atom_integrity + 100)) //any new damage the statue incurred is transfered to the mob petrified_mob.faction -= "mimic" petrified_mob = null return ..() diff --git a/code/game/objects/structures/popout_cake.dm b/code/game/objects/structures/popout_cake.dm index 271f6e3fb7f4a..083ecf02a838c 100644 --- a/code/game/objects/structures/popout_cake.dm +++ b/code/game/objects/structures/popout_cake.dm @@ -41,7 +41,7 @@ to_chat(user, "There's already someone inside!") return - if(obj_integrity <= integrity_failure) + if(atom_integrity <= integrity_failure) to_chat(user, "The [src] is too damaged to hold anyone inside!") return diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 1a2b538b39d9e..cd6f467120bcc 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -37,13 +37,13 @@ add_fingerprint(user) if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!I.tool_start_check(user, amount=0)) return to_chat(user, "You begin repairing [src]...") if(I.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity to_chat(user, "You repair [src].") else to_chat(user, "[src] is already in good condition!") diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index c55b152ab3394..c5c45d270c918 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -101,7 +101,7 @@ new buildstacktype(drop_location(), buildstackamount) qdel(src) else if(W.tool_behaviour == TOOL_WELDER) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return @@ -109,7 +109,7 @@ "You begin repairing [src]...", "You hear welding.") if(W.use_tool(src, user, 40, volume=40)) - obj_integrity = max_integrity + atom_integrity = max_integrity user.visible_message("[user] has repaired [src].", \ "You finish repairing [src].") diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 7c791af59dd82..55de8fdee8216 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -186,13 +186,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) add_fingerprint(user) if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!I.tool_start_check(user, amount=0)) return to_chat(user, "You begin repairing [src]...") if(I.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity update_nearby_icons() to_chat(user, "You repair [src].") else @@ -351,7 +351,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) if(!fulltile) return - var/ratio = obj_integrity / max_integrity + var/ratio = atom_integrity / max_integrity ratio = CEILING(ratio*4, 1) * 25 if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) @@ -507,7 +507,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) /obj/structure/window/depleteduranium/unanchored anchored = FALSE -/* Full Tile Windows (more obj_integrity) */ +/* Full Tile Windows (more atom_integrity) */ /obj/structure/window/fulltile icon = 'icons/obj/smooth_structures/windows/window.dmi' @@ -690,7 +690,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) /obj/structure/window/paperframe/examine(mob/user) . = ..() - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) . += "It looks a bit damaged, you may be able to fix it with some paper." /obj/structure/window/paperframe/spawnDebris(location) @@ -715,7 +715,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) update_appearance() /obj/structure/window/paperframe/update_icon() - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) cut_overlay(paper) add_overlay(torn) set_opacity(FALSE) @@ -732,13 +732,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) return if(user.a_intent == INTENT_HARM) return ..() - if(istype(W, /obj/item/paper) && obj_integrity < max_integrity) + if(istype(W, /obj/item/paper) && atom_integrity < max_integrity) user.visible_message("[user] starts to patch the holes in \the [src].") if(do_after(user, 20, target = src)) - obj_integrity = min(obj_integrity+4,max_integrity) + atom_integrity = min(atom_integrity+4,max_integrity) qdel(W) user.visible_message("[user] patches some of the holes in \the [src].") - if(obj_integrity == max_integrity) + if(atom_integrity == max_integrity) update_appearance() return ..() diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 15e769167b12b..b6296fa9f14d4 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -46,6 +46,9 @@ underlay_appearance.icon_state = fixed_underlay["icon_state"] underlays += underlay_appearance +/turf/closed/wall/atom_destruction(damage_flag) + dismantle_wall(TRUE, FALSE) + /turf/closed/wall/Destroy() if(is_station_level(z)) GLOB.station_turfs -= src diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 2a1875a7ad17d..d4fd9cea32f72 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -148,6 +148,15 @@ CREATION_TEST_IGNORE_SELF(/turf) set_custom_materials(temp_list) ComponentInitialize() + + if(uses_integrity) + atom_integrity = max_integrity + + if (islist(armor)) + armor = getArmor(arglist(armor)) + else if (!armor) + armor = getArmor() + if(isopenturf(src)) var/turf/open/O = src __auxtools_update_turf_temp_info(isspaceturf(get_z_base_turf()) && !O.planetary_atmos) diff --git a/code/game/turfs/turf_integrity.dm b/code/game/turfs/turf_integrity.dm index 316ea436512ec..dc685c2952001 100644 --- a/code/game/turfs/turf_integrity.dm +++ b/code/game/turfs/turf_integrity.dm @@ -9,16 +9,14 @@ var/can_hit = TRUE /// Has armour been generated yet? var/armor_generated - /// The armour of the turf. Capable of being null for optimisation purposes - var/datum/armor/armor /// The integrity that the turf starts at, defaulting to max_integrity var/integrity /// The maximum integrity that the turf has - var/max_integrity = 450 + max_integrity = 450 /// INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF - var/resistance_flags = NONE + resistance_flags = NONE /// If damage is less than this value for melee attacks, it will deal 0 damage - var/damage_deflection = 5 + damage_deflection = 5 /turf/examine(mob/user) . = ..() @@ -56,12 +54,14 @@ else armor = armour_val -/turf/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) +/turf/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) + if(QDELETED(src)) + CRASH("[src] taking damage after deletion") if(sound_effect) play_attack_sound(damage_amount, damage_type, damage_flag) if((resistance_flags & INDESTRUCTIBLE) || integrity <= 0) return - damage_amount = run_obj_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration) + damage_amount = run_atom_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration) if(damage_amount < DAMAGE_PRECISION) return . = damage_amount @@ -75,7 +75,7 @@ after_damage(damage_amount, damage_type, damage_flag) //returns the damage value of the attack after processing the obj's various armor protections -/turf/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) +/turf/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) if(damage_flag == MELEE && damage_amount < damage_deflection) return 0 switch(damage_type) @@ -88,21 +88,10 @@ if (!armor_generated) generate_armor() armor_protection = armor?.getRating(damage_flag) - if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. + if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. armor_protection = clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100) return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) -//the sound played when the obj is damaged. -/turf/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - switch(damage_type) - if(BRUTE) - if(damage_amount) - playsound(src, 'sound/weapons/smash.ogg', 50, 1) - else - playsound(src, 'sound/weapons/tap.ogg', 50, 1) - if(BURN) - playsound(src, 'sound/items/welder.ogg', 100, 1) - /turf/proc/after_damage(damage_amount, damage_type, damage_flag) return @@ -248,9 +237,6 @@ // Mob Attacks //==================================== -/turf/proc/hulk_damage() - return 150 //the damage hulks do on punches to this object, is affected by melee armor - /turf/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if (!can_hit) return ..() @@ -273,11 +259,6 @@ return take_damage(400, BRUTE, MELEE, 0, get_dir(src, B)) -/turf/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime - user.do_attack_animation(src) - user.changeNext_move(CLICK_CD_MELEE) - return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration) - /turf/attack_alien(mob/living/carbon/alien/humanoid/user) if (!can_hit) return ..() diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index 49b62ad129736..8836bba8305f8 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -116,7 +116,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) if(pulse_timestamp <= world.time) ConsumeTile() if(heal_timestamp <= world.time) - obj_integrity = min(max_integrity, obj_integrity+health_regen) + atom_integrity = min(max_integrity, atom_integrity+health_regen) heal_timestamp = world.time + 20 update_icon() pulse_timestamp = world.time + 10 @@ -250,7 +250,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) /obj/structure/blob/proc/typereport(mob/user) RETURN_TYPE(/list) return list("Blob Type: [uppertext(initial(name))]", - "Health: [obj_integrity]/[max_integrity]", + "Health: [atom_integrity]/[max_integrity]", "Effects: [scannerreport()]") @@ -269,7 +269,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) if(BURN) playsound(src.loc, 'sound/items/welder.ogg', 100, 1) -/obj/structure/blob/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/blob/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) switch(damage_type) if(BRUTE) damage_amount *= brute_resist @@ -288,10 +288,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) /obj/structure/blob/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) + if(. && atom_integrity > 0) update_icon() -/obj/structure/blob/obj_destruction(damage_flag) +/obj/structure/blob/atom_destruction(damage_flag) if(overmind) overmind.blobstrain.death_reaction(src, damage_flag) ..() @@ -343,13 +343,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) update_integrity(21) //doesn't start at full health /obj/structure/blob/normal/scannerreport() - if(obj_integrity <= 15) + if(atom_integrity <= 15) return "Currently weak to brute damage." return "N/A" /obj/structure/blob/normal/update_icon() ..() - if(obj_integrity <= 15) + if(atom_integrity <= 15) icon_state = "blob_damaged" name = "fragile blob" desc = "A thin lattice of slightly twitching tendrils." diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm index 6b563022aeb6c..d1d503ba7b95a 100644 --- a/code/modules/antagonists/blob/structures/core.dm +++ b/code/modules/antagonists/blob/structures/core.dm @@ -50,7 +50,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob/core) /obj/structure/blob/core/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(obj_integrity > 0) + if(atom_integrity > 0) if(overmind) //we should have an overmind, but... overmind.update_health_hud() diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm index f39f8613c25e7..2246e8ba44c8e 100644 --- a/code/modules/antagonists/blob/structures/shield.dm +++ b/code/modules/antagonists/blob/structures/shield.dm @@ -21,20 +21,20 @@ /obj/structure/blob/shield/update_name(updates) . = ..() - name = "[(obj_integrity < (max_integrity * 0.5)) ? "weakened " : null][initial(name)]" + name = "[(atom_integrity < (max_integrity * 0.5)) ? "weakened " : null][initial(name)]" /obj/structure/blob/shield/update_desc(updates) . = ..() - desc = (obj_integrity < (max_integrity * 0.5)) ? "[damaged_desc]" : initial(desc) + desc = (atom_integrity < (max_integrity * 0.5)) ? "[damaged_desc]" : initial(desc) /obj/structure/blob/shield/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) - atmosblock = obj_integrity < (max_integrity * 0.5) + if(. && atom_integrity > 0) + atmosblock = atom_integrity < (max_integrity * 0.5) air_update_turf(TRUE) /obj/structure/blob/shield/update_icon_state() - icon_state = "[initial(icon_state)][(obj_integrity < (max_integrity * 0.5)) ? "_damaged" : null]" + icon_state = "[initial(icon_state)][(atom_integrity < (max_integrity * 0.5)) ? "_damaged" : null]" return ..() /obj/structure/blob/shield/reflective diff --git a/code/modules/antagonists/clock_cult/clockwork_turfs.dm b/code/modules/antagonists/clock_cult/clockwork_turfs.dm index 67e43966441e2..67406d57e8c28 100644 --- a/code/modules/antagonists/clock_cult/clockwork_turfs.dm +++ b/code/modules/antagonists/clock_cult/clockwork_turfs.dm @@ -392,7 +392,7 @@ /obj/machinery/door/airlock/clockwork/hasPower() return TRUE //yes we do have power -/obj/machinery/door/airlock/clockwork/obj_break(damage_flag) +/obj/machinery/door/airlock/clockwork/atom_break(damage_flag) . = ..() if(!.) //not a clue if this will work out propely... return @@ -496,12 +496,12 @@ /obj/structure/grille/ratvar/ratvar_act() return -/obj/structure/grille/ratvar/obj_break() +/obj/structure/grille/ratvar/atom_break() . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) icon_state = "brokenratvargrille" - density = FALSE - obj_integrity = 20 + set_density(FALSE) + atom_integrity = 20 broken = TRUE rods_amount = 1 rods_broken = FALSE @@ -515,8 +515,8 @@ /obj/structure/grille/ratvar/repair_grille() if(broken) icon_state = "ratvargrille" - density = TRUE - obj_integrity = max_integrity + set_density(TRUE) + atom_integrity = max_integrity broken = FALSE rods_amount = 2 rods_broken = TRUE diff --git a/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm b/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm index 830ecd6b589c6..97c61732910c2 100644 --- a/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm +++ b/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm @@ -140,7 +140,7 @@ to_chat(user, "You strike [target] with an electromagnetic pulse!") playsound(user, 'sound/magic/lightningshock.ogg', 40) -/obj/item/clockwork/weapon/brass_sword/attack_obj(obj/O, mob/living/user) +/obj/item/clockwork/weapon/brass_sword/attack_atom(obj/O, mob/living/user) ..() if(!(istype(O, /obj/vehicle/sealed/mecha) && is_reebe(user.z))) return diff --git a/code/modules/antagonists/clock_cult/items/integration_cog.dm b/code/modules/antagonists/clock_cult/items/integration_cog.dm index 6c2ba0c8b3b38..dd970991fdbb2 100644 --- a/code/modules/antagonists/clock_cult/items/integration_cog.dm +++ b/code/modules/antagonists/clock_cult/items/integration_cog.dm @@ -5,7 +5,7 @@ clockwork_desc = "A sharp cog that can cut through and be inserted into APCs to extract power for the gateway." item_flags = ISWEAPON -/obj/item/clockwork/integration_cog/attack_obj(obj/O, mob/living/user) +/obj/item/clockwork/integration_cog/attack_atom(obj/O, mob/living/user) if(!is_servant_of_ratvar(user)) return ..() if(!istype(O, /obj/machinery/power/apc)) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 24bc9b2e21f66..b1ad2aae50664 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -42,17 +42,17 @@ if(iscultist(user) || isobserver(user)) var/t_It = p_they(TRUE) var/t_is = p_are() - return "[t_It] [t_is] at [round(obj_integrity * 100 / max_integrity)]% stability." + return "[t_It] [t_is] at [round(atom_integrity * 100 / max_integrity)]% stability." return ..() /obj/structure/destructible/cult/attack_animal(mob/living/simple_animal/M) if(istype(M, /mob/living/simple_animal/hostile/construct/artificer)) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) M.changeNext_move(CLICK_CD_MELEE) - obj_integrity = min(max_integrity, obj_integrity + 5) + atom_integrity = min(max_integrity, atom_integrity + 5) Beam(M, icon_state="sendbeam", time=4) M.visible_message("[M] repairs \the [src].", \ - "You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.") + "You repair [src], leaving [p_they()] at [round(atom_integrity * 100 / max_integrity)]% stability.") else to_chat(M, "You cannot repair [src], as [p_theyre()] undamaged!") else diff --git a/code/modules/antagonists/heretic/structures/mawed_crucible.dm b/code/modules/antagonists/heretic/structures/mawed_crucible.dm index 154b6ed7f7754..09f3ea581b82d 100644 --- a/code/modules/antagonists/heretic/structures/mawed_crucible.dm +++ b/code/modules/antagonists/heretic/structures/mawed_crucible.dm @@ -55,7 +55,7 @@ /obj/structure/destructible/eldritch_crucible/examine_status(mob/user) if(IS_HERETIC_OR_MONSTER(user) || isobserver(user)) - return "It's at [round(obj_integrity * 100 / max_integrity)]% stability." + return "It's at [round(atom_integrity * 100 / max_integrity)]% stability." return ..() /obj/structure/destructible/eldritch_crucible/attacked_by(obj/item/weapon, mob/living/user) diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm index 9b6576fb36478..1a7385229810f 100644 --- a/code/modules/antagonists/space_dragon/carp_rift.dm +++ b/code/modules/antagonists/space_dragon/carp_rift.dm @@ -169,7 +169,7 @@ charge_state = CHARGE_COMPLETED var/area/A = get_area(src) priority_announce("Spatial object has reached peak energy charge in [initial(A.name)], please stand-by.", "Central Command Wildlife Observations") - obj_integrity = INFINITY + atom_integrity = INFINITY icon_state = "carp_rift_charged" set_light_color(LIGHT_COLOR_DIM_YELLOW) update_light() diff --git a/code/modules/aquarium/aquarium.dm b/code/modules/aquarium/aquarium.dm index 5884be2514680..ae5de231d9eaf 100644 --- a/code/modules/aquarium/aquarium.dm +++ b/code/modules/aquarium/aquarium.dm @@ -111,7 +111,7 @@ if(do_after(user, 2 SECONDS, target = src)) glass.use(2) broken = FALSE - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() return TRUE else @@ -228,7 +228,7 @@ ui = new(user, src, "Aquarium", name) ui.open() -/obj/structure/aquarium/obj_break(damage_flag) +/obj/structure/aquarium/atom_break(damage_flag) . = ..() if(!broken) aquarium_smash() diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 7d445ac6eed0a..4f07e1fff707c 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -858,7 +858,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/airalarm) visible_message("Sparks fly out of [src]!", "You emag [src], disabling its safeties.") playsound(src, "sparks", 50, 1) -/obj/machinery/airalarm/obj_break(damage_flag) +/obj/machinery/airalarm/atom_break(damage_flag) ..() update_icon() diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index 1258f5504392b..fe07d92789a8d 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -106,7 +106,7 @@ /obj/machinery/atmospherics/pipe/returnPipenets() . = list(parent) -/obj/machinery/atmospherics/pipe/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/machinery/atmospherics/pipe/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 12) return 0 . = ..() diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 587ed2f6e1529..9939d30ac3fb9 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -342,7 +342,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/portable_atmospherics/canister) return TRUE -/obj/machinery/portable_atmospherics/canister/obj_break(damage_flag) +/obj/machinery/portable_atmospherics/canister/atom_break(damage_flag) . = ..() if(!.) return diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 1a176335e5520..cd400331bccf8 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -166,7 +166,7 @@ /// Set the clothing's integrity back to 100%, remove all damage to bodyparts, and generally fix it up /obj/item/clothing/proc/repair(mob/user, params) update_clothes_damaged_state(CLOTHING_PRISTINE) - obj_integrity = max_integrity + atom_integrity = max_integrity name = initial(name) // remove "tattered" or "shredded" if there's a prefix body_parts_covered = initial(body_parts_covered) slot_flags = initial(slot_flags) @@ -231,7 +231,7 @@ body_parts_covered &= ~i if(body_parts_covered == NONE) // if there are no more parts to break then the whole thing is kaput - obj_destruction((damage_type == BRUTE ? "melee" : "laser")) // melee/laser is good enough since this only procs from direct attacks anyway and not from fire/bombs + atom_destruction((damage_type == BRUTE ? MELEE : LASER)) // melee/laser is good enough since this only procs from direct attacks anyway and not from fire/bombs return switch(zones_disabled) @@ -390,7 +390,7 @@ else if (armor_value < compare_value) . = "[.]" -/obj/item/clothing/obj_break(damage_flag) +/obj/item/clothing/atom_break(damage_flag) . = ..() update_clothes_damaged_state(CLOTHING_DAMAGED) @@ -544,7 +544,7 @@ BLIND // can't see anything /obj/item/clothing/proc/_spawn_shreds() new /obj/effect/decal/cleanable/shreds(get_turf(src), name) -/obj/item/clothing/obj_destruction(damage_flag) +/obj/item/clothing/atom_destruction(damage_flag) if(damage_flag == BOMB) //so the shred survives potential turf change from the explosion. addtimer(CALLBACK(src, PROC_REF(_spawn_shreds)), 1) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index e83b3e298df58..9fec37410bc64 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -206,7 +206,7 @@ else REMOVE_TRAIT(user, carrytrait, CLOTHING_TRAIT) -/obj/item/clothing/gloves/color/latex/obj_break() +/obj/item/clothing/gloves/color/latex/atom_break() ..() if(ishuman(loc)) REMOVE_TRAIT(loc, carrytrait, CLOTHING_TRAIT) diff --git a/code/modules/exploration_crew/discovery_research/discovery_scanner.dm b/code/modules/exploration_crew/discovery_research/discovery_scanner.dm index ec72019ab85f4..109f7b4aa3875 100644 --- a/code/modules/exploration_crew/discovery_research/discovery_scanner.dm +++ b/code/modules/exploration_crew/discovery_research/discovery_scanner.dm @@ -24,7 +24,7 @@ . += "[src] has unlimited range." . += "Science goggles can help detect researchable items." -/obj/item/discovery_scanner/attack_obj(obj/O, mob/living/user) +/obj/item/discovery_scanner/attack_atom(obj/O, mob/living/user) if(istype(O, /obj/machinery/computer/rdconsole)) to_chat(user, "You link [src] to [O].") var/obj/machinery/computer/rdconsole/rdconsole = O diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 08310ad408ac1..0471c256df0ae 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -277,6 +277,23 @@ update_appearance() return TRUE +/obj/machinery/smartfridge/welder_act(mob/living/user, obj/item/I) + . = ..() + if(machine_stat & BROKEN) + if(!I.tool_start_check(user, amount=0)) + return + user.visible_message("[user] is repairing [src].", \ + "You begin repairing [src]...", \ + "You hear welding.") + if(I.use_tool(src, user, 40, volume=50)) + if(!(machine_stat & BROKEN)) + return + to_chat(user, "You repair [src].") + atom_integrity = max_integrity + set_machine_stat(machine_stat & ~BROKEN) + update_icon() + else + to_chat(user, "[src] does not need repairs.") // ---------------------------- // Drying Rack 'smartfridge' diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index f14ccc217ffdd..40168e56f1f3d 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -61,11 +61,11 @@ /obj/item/clothing/mask/facehugger/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(obj_integrity < 90) + if(atom_integrity < 90) Die() /obj/item/clothing/mask/facehugger/attackby(obj/item/O, mob/user, params) - return O.attack_obj(src, user) + return O.attack_atom(src, user, params) /obj/item/clothing/mask/facehugger/attack_alien(mob/user) //can be picked up by aliens return attack_hand(user) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 3ceb2011d325c..16bdb8e72f7c5 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -280,9 +280,9 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar /obj/item/modular_computer/examine(mob/user) . = ..() - if(obj_integrity <= integrity_failure * max_integrity) + if(atom_integrity <= integrity_failure * max_integrity) . += "It is heavily damaged!" - else if(obj_integrity < max_integrity) + else if(atom_integrity < max_integrity) . += "It is damaged." . += get_modular_computer_parts_examine(user) @@ -302,7 +302,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar if(can_store_pai && stored_pai_card) add_overlay(stored_pai_card.pai ? mutable_appearance(init_icon, "pai-overlay") : mutable_appearance(init_icon, "pai-off-overlay")) - if(obj_integrity <= integrity_failure * max_integrity) + if(atom_integrity <= integrity_failure * max_integrity) add_overlay(mutable_appearance(init_icon, "bsod")) add_overlay(mutable_appearance(init_icon, "broken")) @@ -312,7 +312,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar ui_interact(user) return TRUE var/issynth = issilicon(user) // Robots and AIs get different activation messages. - if(obj_integrity <= integrity_failure * max_integrity) + if(atom_integrity <= integrity_failure * max_integrity) if(issynth) to_chat(user, "You send an activation signal to \the [src], but it responds with an error code. It must be damaged.") else @@ -347,7 +347,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar last_power_usage = 0 return 0 - if(obj_integrity <= integrity_failure * max_integrity) + if(atom_integrity <= integrity_failure * max_integrity) shutdown_computer() return 0 @@ -672,7 +672,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar return if(attacking_item.tool_behaviour == TOOL_WELDER) - if(obj_integrity == max_integrity) + if(atom_integrity == max_integrity) to_chat(user, "\The [src] does not require repairs.") return @@ -681,7 +681,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar to_chat(user, "You begin repairing damage to \the [src]...") if(attacking_item.use_tool(src, user, 20, volume=50, amount=1)) - obj_integrity = max_integrity + atom_integrity = max_integrity to_chat(user, "You repair \the [src].") update_icon() return diff --git a/code/modules/modular_computers/computers/item/computer_damage.dm b/code/modules/modular_computers/computers/item/computer_damage.dm index 0898aaebca071..586cae2887d48 100644 --- a/code/modules/modular_computers/computers/item/computer_damage.dm +++ b/code/modules/modular_computers/computers/item/computer_damage.dm @@ -1,6 +1,6 @@ /obj/item/modular_computer/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - var/component_probability = min(50, max(damage_amount*0.1, 1 - obj_integrity/max_integrity)) + var/component_probability = min(50, max(damage_amount*0.1, 1 - atom_integrity/max_integrity)) switch(damage_flag) if(BULLET) component_probability = damage_amount * 0.5 diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index d725676716c81..a0a9ed32d700e 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -108,11 +108,11 @@ return ..() -/obj/item/modular_computer/tablet/attack_obj(obj/target, mob/living/user) +/obj/item/modular_computer/tablet/attack_atom(obj/target, mob/living/user) // Send to programs for processing - this should go LAST // Used to implement the gas scanner. for(var/datum/computer_file/program/thread in (idle_threads + active_program)) - if(thread.use_attack_obj && !thread.attack_obj(target, user)) + if(thread.use_attack_obj && !thread.attack_atom(target, user)) return ..() diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 86bf1f179c06f..bb8d49e964e71 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -33,7 +33,7 @@ var/alert_pending = FALSE /// If this program should process attack calls var/use_attack = FALSE - /// If this program should process attack_obj calls + /// If this program should process attack_atom calls var/use_attack_obj = FALSE /datum/computer_file/program/New(obj/item/modular_computer/comp = null) @@ -188,7 +188,7 @@ /// Return TRUE if nothing was processed. Return FALSE to prevent further actions running. /// Set use_attack_obj = TRUE to receive proccalls from the parent computer. -/datum/computer_file/program/proc/attack_obj(obj/target, mob/living/user) +/datum/computer_file/program/proc/attack_atom(obj/target, mob/living/user) return TRUE /// Called when the datum/tgui is initialized by the computer diff --git a/code/modules/modular_computers/file_system/programs/phys_scanner.dm b/code/modules/modular_computers/file_system/programs/phys_scanner.dm index 6a81c41c8b27f..024c580d821ec 100644 --- a/code/modules/modular_computers/file_system/programs/phys_scanner.dm +++ b/code/modules/modular_computers/file_system/programs/phys_scanner.dm @@ -76,7 +76,7 @@ return FALSE return ..() -/datum/computer_file/program/phys_scanner/attack_obj(obj/target, mob/living/user) +/datum/computer_file/program/phys_scanner/attack_atom(obj/target, mob/living/user) switch(current_mode) if(DISK_ATMOS) var/scan_result = atmosanalyzer_scan(user, target, silent = TRUE, to_chat = FALSE) diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index b2398841278f8..61eee31e9d43e 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -54,12 +54,12 @@ // Cable coil. Works as repair method, but will probably require multiple applications and more cable. if(istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/S = I - if(obj_integrity == max_integrity) + if(atom_integrity == max_integrity) to_chat(user, "\The [src] doesn't seem to require repairs.") return 1 if(S.use(1)) to_chat(user, "You patch up \the [src] with a bit of \the [I].") - obj_integrity = min(obj_integrity + 10, max_integrity) + atom_integrity = min(atom_integrity + 10, max_integrity) return 1 if(try_insert(I, user)) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index e44c66410cc99..f5681ea4cfec9 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -422,7 +422,7 @@ else return ..() -/obj/machinery/photocopier/obj_break(damage_flag) +/obj/machinery/photocopier/atom_break(damage_flag) . = ..() if(. && toner_cartridge.charges) new /obj/effect/decal/cleanable/oil(get_turf(src)) diff --git a/code/modules/power/apc/apc_attack.dm b/code/modules/power/apc/apc_attack.dm index fbc7b20d60116..0143ec06186ec 100644 --- a/code/modules/power/apc/apc_attack.dm +++ b/code/modules/power/apc/apc_attack.dm @@ -103,7 +103,7 @@ to_chat(user, "[src] has both electronics and a cell.") return else if (istype(W, /obj/item/wallframe/apc) && opened) - if (!(machine_stat & BROKEN || opened==APC_COVER_REMOVED || obj_integrity < max_integrity)) // There is nothing to repair + if (!(machine_stat & BROKEN || opened==APC_COVER_REMOVED || atom_integrity < max_integrity)) // There is nothing to repair to_chat(user, "You find no reason for repairing this APC.") return if (!(machine_stat & BROKEN) && opened==APC_COVER_REMOVED) @@ -125,7 +125,7 @@ to_chat(user, "You replace the damaged APC frame with a new one.") qdel(W) set_machine_stat(machine_stat & ~BROKEN) - obj_integrity = max_integrity + atom_integrity = max_integrity if (opened==APC_COVER_REMOVED) opened = APC_COVER_OPENED update_appearance() @@ -231,7 +231,7 @@ if((machine_stat & MAINT) && !opened) //no board; no interface return -/obj/machinery/power/apc/obj_break(damage_flag) +/obj/machinery/power/apc/atom_break(damage_flag) . = ..() if(.) set_broken() @@ -272,8 +272,8 @@ /obj/machinery/power/apc/proc/set_broken() if(malfai && operating) malfai.malf_picker.processing_time = clamp(malfai.malf_picker.processing_time - 10,0,1000) - machine_stat |= BROKEN operating = FALSE + atom_break() if(occupier) malfvacate(1) update_appearance() diff --git a/code/modules/power/apc/apc_power_proc.dm b/code/modules/power/apc/apc_power_proc.dm index 29eeaf55daf04..131ae6f002564 100644 --- a/code/modules/power/apc/apc_power_proc.dm +++ b/code/modules/power/apc/apc_power_proc.dm @@ -184,7 +184,7 @@ area.power_environ = FALSE area.power_change() -/obj/machinery/power/apc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/machinery/power/apc/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 10 && (!(machine_stat & BROKEN) || malfai)) return 0 . = ..() diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index f93c25bc167d7..c21dc653f888d 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -112,7 +112,7 @@ /obj/machinery/power/floodlight/attack_silicon(mob/user) return attack_hand(user) -/obj/machinery/power/floodlight/obj_break(damage_flag) +/obj/machinery/power/floodlight/atom_break(damage_flag) . = ..() if(!.) return diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index a3f750b502701..4f91bdd2f00c7 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -58,7 +58,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne qdel(src) /obj/machinery/gravity_generator/proc/set_broken() - set_machine_stat(machine_stat | BROKEN) + atom_break() /obj/machinery/gravity_generator/proc/set_fix() set_machine_stat(machine_stat & ~BROKEN) diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm index a346f2e03f75c..bfe3dd776cc38 100644 --- a/code/modules/power/lighting/light_items.dm +++ b/code/modules/power/lighting/light_items.dm @@ -111,7 +111,7 @@ ..() shatter() -/obj/item/light/attack_obj(obj/O, mob/living/user) +/obj/item/light/attack_atom(obj/O, mob/living/user, params) ..() shatter() diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index f0dd2565fb238..ce00cf86dfd14 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -199,7 +199,7 @@ else . += "[src]'s display displays the words: \"Research point production mode. Please insert Tritium and Oxygen. Use a multitool to change production modes.\"" -/obj/machinery/power/rad_collector/obj_break(damage_flag) +/obj/machinery/power/rad_collector/atom_break(damage_flag) . = ..() if(.) eject() diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index f50fec2850a5b..3bfe60777db2d 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -58,7 +58,7 @@ break dir_loop if(!terminal) - set_machine_stat(machine_stat | BROKEN) + atom_break() return terminal.master = src update_icon() @@ -205,7 +205,7 @@ if(terminal) terminal.master = null terminal = null - set_machine_stat(machine_stat | BROKEN) + atom_break() /obj/machinery/power/smes/update_icon() diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index a6001958c924a..db004a2371de6 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -54,7 +54,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/solar) S.forceMove(src) if(S.glass_type == /obj/item/stack/sheet/rglass) //if the panel is in reinforced glass max_integrity *= 2 //this need to be placed here, because panels already on the map don't have an assembly linked to - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() /obj/machinery/power/solar/crowbar_act(mob/user, obj/item/I) @@ -77,7 +77,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/solar) playsound(loc, 'sound/items/welder.ogg', 100, 1) -/obj/machinery/power/solar/obj_break(damage_flag) +/obj/machinery/power/solar/atom_break(damage_flag) . = ..() if(.) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) @@ -458,7 +458,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/solar) if(BURN) playsound(src.loc, 'sound/items/welder.ogg', 100, 1) -/obj/machinery/power/solar_control/obj_break(damage_flag) +/obj/machinery/power/solar_control/atom_break(damage_flag) . = ..() if(.) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 79f18024c8052..111b9cfb71c4d 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -70,7 +70,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/tracker) deconstruct(TRUE) return TRUE -/obj/machinery/power/tracker/obj_break(damage_flag) +/obj/machinery/power/tracker/atom_break(damage_flag) . = ..() if(.) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 85f1e7f1e998f..f4a77de779931 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -83,7 +83,7 @@ inturf = get_step(src, dir) locate_machinery() if(!turbine) - set_machine_stat(machine_stat | BROKEN) + atom_break() #define COMPFRICTION 5e5 @@ -119,7 +119,7 @@ set_machine_stat(machine_stat & ~BROKEN) else to_chat(user, "Turbine not connected.") - set_machine_stat(machine_stat | BROKEN) + atom_break() return default_deconstruction_crowbar(I) @@ -176,7 +176,7 @@ outturf = get_step(src, dir) locate_machinery() if(!compressor) - set_machine_stat(machine_stat | BROKEN) + atom_break() connect_to_network() /obj/machinery/power/turbine/RefreshParts() @@ -249,7 +249,7 @@ set_machine_stat(machine_stat & ~BROKEN) else to_chat(user, "Compressor not connected.") - set_machine_stat(machine_stat | BROKEN) + atom_break() return default_deconstruction_crowbar(I) diff --git a/code/modules/projectiles/autofire.dm b/code/modules/projectiles/autofire.dm index 3d8bc6dd8e0ac..0aae2de156984 100644 --- a/code/modules/projectiles/autofire.dm +++ b/code/modules/projectiles/autofire.dm @@ -96,7 +96,7 @@ Everything else should be handled for you. Good luck soldier. if(L.Adjacent(autofire_target)) //Melee attack? Or ranged attack? if(isobj(autofire_target)) next_process = world.time + CLICK_CD_MELEE - G.attack_obj(autofire_target, L) + G.attack_atom(autofire_target, L) return else if(isliving(autofire_target) && L.a_intent == INTENT_HARM) // Prevents trying to attack turfs next to the shooter G.attack(autofire_target, L) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index dd9e4ae8ebd38..e32e75a4cf3ba 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -516,7 +516,7 @@ return ..() return -/obj/item/gun/attack_obj(obj/O, mob/user) +/obj/item/gun/attack_atom(obj/O, mob/living/user, params) if(user.a_intent == INTENT_HARM) if(bayonet) O.attackby(bayonet, user) diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm index 741be266bf6bb..5cdc74638340d 100644 --- a/code/modules/projectiles/guns/misc/blastcannon.dm +++ b/code/modules/projectiles/guns/misc/blastcannon.dm @@ -54,24 +54,25 @@ name = initial(name) desc = initial(desc) -/obj/item/gun/blastcannon/attackby(obj/O, mob/user) - if(istype(O, /obj/item/transfer_valve)) - var/obj/item/transfer_valve/T = O - if(!T.tank_one || !T.tank_two) - to_chat(user, "What good would an incomplete bomb do?") - return FALSE - if(!user.transferItemToLoc(T, src)) - to_chat(user, "[T] seems to be stuck to your hand!") - return FALSE - user.visible_message("[user] attaches [T] to [src]!") - bomb = T - update_icon() - return TRUE - return ..() +/obj/item/gun/blastcannon/attackby(obj/item/transfer_valve/bomb_to_attach, mob/user) + if(!istype(bomb_to_attach)) + return ..() + + if(!bomb_to_attach.ready()) + to_chat(user, "What good would an incomplete bomb do?") + return FALSE + if(!user.transferItemToLoc(bomb_to_attach, src)) + to_chat(user, "[bomb_to_attach] seems to be stuck to your hand!") + return FALSE + + user.visible_message("[user] attaches [bomb_to_attach] to [src]!") + bomb = bomb_to_attach + update_icon() + return TRUE //returns the third value of a bomb blast /obj/item/gun/blastcannon/proc/calculate_bomb() - if(!istype(bomb) || !istype(bomb.tank_one) || !istype(bomb.tank_two)) + if(!istype(bomb) || !bomb.ready()) return 0 var/datum/gas_mixture/temp = new(max(reaction_volume_mod, 0)) bomb.merge_gases(temp) @@ -83,7 +84,6 @@ for(var/i in 1 to reaction_cycles) temp.react(src) var/pressure = temp.return_pressure() - qdel(temp) if(pressure < TANK_FRAGMENT_PRESSURE) return 0 return ((pressure - TANK_FRAGMENT_PRESSURE) / TANK_FRAGMENT_SCALE) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index fd1e798805540..197effcb27bfa 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -49,7 +49,7 @@ /obj/structure/reagent_dispensers/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) + if(. && atom_integrity > 0) if(tank_volume && (damage_flag == BULLET || damage_flag == LASER)) boom() diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index f72c7c9419320..5eeb1484b13fe 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -273,7 +273,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/conveyor) // make the conveyor broken // also propagate inoperability to any connected conveyor with the same ID /obj/machinery/conveyor/proc/broken() - set_machine_stat(machine_stat | BROKEN) + atom_break() update() var/obj/machinery/conveyor/C = locate() in get_step(src, dir) diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 6e9af35d0cf19..b16f44e2e14f3 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -116,7 +116,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/disposalpipe) H.contents_explosion(severity, target) -/obj/structure/disposalpipe/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/disposalpipe/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 10) return 0 return ..() diff --git a/code/modules/religion/sects/carp_sect.dm b/code/modules/religion/sects/carp_sect.dm index b1626b865fb45..47ad695bcc376 100644 --- a/code/modules/religion/sects/carp_sect.dm +++ b/code/modules/religion/sects/carp_sect.dm @@ -104,7 +104,7 @@ /datum/religion_rites/summon_carpsuit/invoke_effect(mob/living/user, atom/religious_tool) if(!QDELETED(chosen_clothing) && get_turf(religious_tool) == chosen_clothing.loc) //check if the same clothing is still there user.visible_message("The [chosen_clothing] transforms!") - chosen_clothing.obj_destruction() + chosen_clothing.atom_destruction() chosen_clothing = null new /obj/item/clothing/suit/hooded/carp_costume/spaceproof/old(get_turf(religious_tool)) playsound(get_turf(religious_tool), 'sound/effects/slosh.ogg', 50, TRUE) diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm index 2eb76203360ba..f54a072c32e76 100644 --- a/code/modules/research/xenobiology/crossbreeding/_structures.dm +++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) if(master_crystal) invisibility = INVISIBILITY_MAXIMUM max_integrity = 1000 - obj_integrity = 1000 + atom_integrity = 1000 /obj/structure/slime_crystal/Initialize(mapload) . = ..() diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index cebfb3a5bf7ec..4bb90f5ba2c76 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -60,7 +60,7 @@ meat_counter++ H.investigate_log("has been gibbed by the necropolis tendril.", INVESTIGATE_DEATHS) H.gib() - obj_integrity = min(obj_integrity + max_integrity*0.05,max_integrity)//restores 5% hp of tendril + atom_integrity = min(atom_integrity + max_integrity*0.05,max_integrity)//restores 5% hp of tendril for(var/mob/living/L in viewers(5, src)) if(L.mind?.has_antag_datum(/datum/antagonist/ashwalker)) SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "oogabooga", /datum/mood_event/sacrifice_good) diff --git a/code/modules/security/genpop.dm b/code/modules/security/genpop.dm index d4b9b929abe5b..2643546f05395 100644 --- a/code/modules/security/genpop.dm +++ b/code/modules/security/genpop.dm @@ -260,14 +260,14 @@ qdel(src) return - if(obj_integrity >= max_integrity) + if(atom_integrity >= max_integrity) to_chat(user, "The turnstile doesn't need repairing.") return user.visible_message("[user] is welding the turnstile.", \ "You begin repairing the turnstile...", \ "You hear welding.") if(I.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) user.visible_message("[user.name] has repaired [src].", \ "You finish repairing the turnstile.") diff --git a/code/modules/surgery/anesthetic_machine.dm b/code/modules/surgery/anesthetic_machine.dm index dbfb594cf514c..ad976e999608f 100644 --- a/code/modules/surgery/anesthetic_machine.dm +++ b/code/modules/surgery/anesthetic_machine.dm @@ -103,7 +103,7 @@ QDEL_NULL(attached_mask) . = ..() -/obj/machinery/anesthetic_machine/obj_destruction() +/obj/machinery/anesthetic_machine/atom_destruction() if(mask_out) retract_mask() QDEL_NULL(attached_mask) diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index bacce6c3aee88..6a41365f0ca2b 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -44,7 +44,7 @@ . = ..() if(resistance_flags & ON_FIRE) . += "It's on fire!" - var/healthpercent = obj_integrity/max_integrity * 100 + var/healthpercent = atom_integrity/max_integrity * 100 switch(healthpercent) if(50 to 99) . += "It looks slightly damaged." diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index a81633cf9a561..1c674b0c1b940 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -67,21 +67,21 @@ /obj/vehicle/ridden/atv/attackby(obj/item/W as obj, mob/user as mob, params) if(W.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(W.use_tool(src, user, 0, volume=50, amount=1)) user.visible_message("[user] repairs some damage to [name].", "You repair some damage to \the [src].") - obj_integrity += min(10, max_integrity-obj_integrity) - if(obj_integrity == max_integrity) + atom_integrity += min(10, max_integrity-atom_integrity) + if(atom_integrity == max_integrity) to_chat(user, "It looks to be fully repaired now.") return TRUE return ..() -/obj/vehicle/ridden/secway/obj_break() +/obj/vehicle/ridden/secway/atom_break() START_PROCESSING(SSobj, src) return ..() /obj/vehicle/ridden/atv/process(delta_time) - if(obj_integrity >= integrity_failure * max_integrity) + if(atom_integrity >= integrity_failure * max_integrity) return PROCESS_KILL if(DT_PROB(10, delta_time)) return @@ -96,7 +96,7 @@ return TRUE return ..() -/obj/vehicle/ridden/atv/obj_destruction() +/obj/vehicle/ridden/atv/atom_destruction() explosion(src, -1, 0, 2, 4, flame_range = 3) return ..() diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm index f7e4b33402b25..6c1fc5ce6f5e5 100644 --- a/code/modules/vehicles/cars/car.dm +++ b/code/modules/vehicles/cars/car.dm @@ -101,7 +101,7 @@ M.forceMove(src) add_occupant(M, VEHICLE_CONTROL_KIDNAPPED) -/obj/vehicle/sealed/car/obj_destruction(damage_flag) +/obj/vehicle/sealed/car/atom_destruction(damage_flag) explosion(loc, 0, 1, 2, 3, 0) log_message("[src] exploded due to destruction", LOG_ATTACK) return ..() diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 1d6fe84f3d1ca..c382fc7de1363 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -60,7 +60,7 @@ . = ..() if(istype(I, /obj/item/food/grown/banana)) var/obj/item/food/grown/banana/banana = I - obj_integrity += min(banana.seed.potency, max_integrity-obj_integrity) + atom_integrity += min(banana.seed.potency, max_integrity-atom_integrity) to_chat(user, "You use the [banana] to repair the [src]!") qdel(banana) diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index ba4154222f30c..601b44e634860 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -256,7 +256,7 @@ GLOB.mechas_list -= src //global mech list return ..() -/obj/vehicle/sealed/mecha/obj_destruction() +/obj/vehicle/sealed/mecha/atom_destruction() loc.assume_air(cabin_air) air_update_turf(FALSE, FALSE) Eject() @@ -353,7 +353,7 @@ /obj/vehicle/sealed/mecha/examine(mob/user) . = ..() - var/integrity = obj_integrity*100/max_integrity + var/integrity = atom_integrity*100/max_integrity switch(integrity) if(85 to 100) . += "It's fully intact." @@ -459,7 +459,7 @@ else occupant.throw_alert("charge", /atom/movable/screen/alert/emptycell) - var/integrity = obj_integrity/max_integrity*100 + var/integrity = atom_integrity/max_integrity*100 switch(integrity) if(30 to 45) occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 1) @@ -736,7 +736,7 @@ if(!islist(possible_int_damage) || !length(possible_int_damage)) return if(prob(20)) - if(ignore_threshold || obj_integrity*100/max_integrity < internal_damage_threshold) + if(ignore_threshold || atom_integrity*100/max_integrity < internal_damage_threshold) for(var/T in possible_int_damage) if(internal_damage & T) possible_int_damage -= T @@ -744,7 +744,7 @@ if(int_dam_flag) set_internal_damage(int_dam_flag) if(prob(5)) - if(ignore_threshold || obj_integrity*100/max_integrity < internal_damage_threshold) + if(ignore_threshold || atom_integrity*100/max_integrity < internal_damage_threshold) if(LAZYLEN(equipment)) var/obj/item/mecha_parts/mecha_equipment/ME = safepick(equipment) qdel(ME) @@ -922,7 +922,7 @@ visible_message("[M] starts to climb into [name].") if(do_after(M, enter_delay, target = src)) - if(obj_integrity <= 0) + if(atom_integrity <= 0) to_chat(M, "You cannot get in the [name], it has been destroyed!") else if(LAZYLEN(occupants) >= max_occupants) to_chat(M, "[occupants[occupants.len]] was faster! Try better next time, loser.")//get the last one that hopped in diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm index 14e478a16c73d..fc3cd7d44734f 100644 --- a/code/modules/vehicles/mecha/combat/durand.dm +++ b/code/modules/vehicles/mecha/combat/durand.dm @@ -229,13 +229,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/durand_shield) return . = ..() flick("shield_impact", src) - if(!chassis.use_power((max_integrity - obj_integrity) * 100)) + if(!chassis.use_power((max_integrity - atom_integrity) * 100)) chassis.cell?.charge = 0 for(var/O in chassis.occupants) var/mob/living/occupant = O var/datum/action/action = LAZYACCESSASSOC(chassis.occupant_actions, occupant, /datum/action/vehicle/sealed/mecha/mech_defense_mode) action.Trigger(FALSE) - obj_integrity = 10000 + atom_integrity = 10000 /obj/durand_shield/play_attack_sound() playsound(src, 'sound/mecha/mech_shield_deflect.ogg', 100, TRUE) diff --git a/code/modules/vehicles/mecha/combat/honker.dm b/code/modules/vehicles/mecha/combat/honker.dm index 07ae4e6faaf0b..7648a9dd0a713 100644 --- a/code/modules/vehicles/mecha/combat/honker.dm +++ b/code/modules/vehicles/mecha/combat/honker.dm @@ -17,7 +17,7 @@ var/squeak = 0 /obj/vehicle/sealed/mecha/combat/honker/get_stats_part(mob/user) - var/integrity = obj_integrity/max_integrity*100 + var/integrity = atom_integrity/max_integrity*100 var/cell_charge = get_charge() var/datum/gas_mixture/int_tank_air = internal_tank.return_air() var/tank_pressure = internal_tank ? round(int_tank_air.return_pressure(),0.01) : "None" diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm index bb467c0351670..161d39e3aeecd 100644 --- a/code/modules/vehicles/mecha/mecha_defense.dm +++ b/code/modules/vehicles/mecha/mecha_defense.dm @@ -8,7 +8,7 @@ /obj/vehicle/sealed/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) + if(. && atom_integrity > 0) spark_system.start() switch(damage_flag) if(FIRE) @@ -21,7 +21,7 @@ to_chat(occupants, "[icon2html(src, occupants)]Taking damage!") log_message("Took [damage_amount] points of damage. Damage type: [damage_type].", LOG_MECHA) -/obj/vehicle/sealed/mecha/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/vehicle/sealed/mecha/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) . = ..() if(!damage_amount) return 0 @@ -309,12 +309,12 @@ clear_internal_damage(MECHA_INT_TANK_BREACH) to_chat(user, "You repair the damaged gas tank.") return - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.use_tool(src, user, 0, volume=50, amount=1)) return user.visible_message("[user] repairs some damage to [name].", "You repair some damage to [src].") - obj_integrity += min(10, max_integrity-obj_integrity) - if(obj_integrity == max_integrity) + atom_integrity += min(10, max_integrity-atom_integrity) + if(atom_integrity == max_integrity) to_chat(user, "It looks to be fully repaired now.") return to_chat(user, "The [name] is at full integrity!") @@ -337,7 +337,7 @@ . = ..() /obj/vehicle/sealed/mecha/proc/full_repair(charge_cell) - obj_integrity = max_integrity + atom_integrity = max_integrity if(cell && charge_cell) cell.charge = cell.maxcharge if(internal_damage & MECHA_INT_FIRE) @@ -366,7 +366,7 @@ visual_effect_icon = ATTACK_EFFECT_MECHTOXIN ..() -/obj/vehicle/sealed/mecha/obj_destruction() +/obj/vehicle/sealed/mecha/atom_destruction() if(wreckage) var/mob/living/silicon/ai/AI for(var/crew in occupants) diff --git a/code/modules/vehicles/mecha/mecha_topic.dm b/code/modules/vehicles/mecha/mecha_topic.dm index b7bc5104d16d3..595967f93833d 100644 --- a/code/modules/vehicles/mecha/mecha_topic.dm +++ b/code/modules/vehicles/mecha/mecha_topic.dm @@ -53,7 +53,7 @@ ///Returns the status of the mech. /obj/vehicle/sealed/mecha/proc/get_stats_part(mob/user) - var/integrity = obj_integrity/max_integrity*100 + var/integrity = atom_integrity/max_integrity*100 var/cell_charge = get_charge() var/datum/gas_mixture/int_tank_air = 0 var/tank_pressure = 0 diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm index b68c58a21a819..a02a295cd5aad 100644 --- a/code/modules/vehicles/motorized_wheelchair.dm +++ b/code/modules/vehicles/motorized_wheelchair.dm @@ -31,7 +31,7 @@ /obj/vehicle/ridden/wheelchair/motorized/get_cell() return power_cell -/obj/vehicle/ridden/wheelchair/motorized/obj_destruction(damage_flag) +/obj/vehicle/ridden/wheelchair/motorized/atom_destruction(damage_flag) var/turf/T = get_turf(src) for(var/c in contents) var/atom/movable/thing = c diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm index 0dc23070ea4b6..caa76e091fda0 100644 --- a/code/modules/vehicles/secway.dm +++ b/code/modules/vehicles/secway.dm @@ -15,12 +15,12 @@ D.empable = TRUE D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(0, 4), TEXT_WEST = list( 0, 4))) -/obj/vehicle/ridden/secway/obj_break() +/obj/vehicle/ridden/secway/atom_break() START_PROCESSING(SSobj, src) return ..() /obj/vehicle/ridden/secway/process(delta_time) - if(obj_integrity >= integrity_failure * max_integrity) + if(atom_integrity >= integrity_failure * max_integrity) return PROCESS_KILL if(DT_PROB(10, delta_time)) return @@ -30,16 +30,16 @@ /obj/vehicle/ridden/secway/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(W.use_tool(src, user, 0, volume = 50, amount = 1)) user.visible_message("[user] repairs some damage to [name].", "You repair some damage to \the [src].") - obj_integrity += min(10, max_integrity-obj_integrity) - if(obj_integrity == max_integrity) + atom_integrity += min(10, max_integrity-atom_integrity) + if(atom_integrity == max_integrity) to_chat(user, "It looks to be fully repaired now.") return TRUE return ..() -/obj/vehicle/ridden/secway/obj_destruction() +/obj/vehicle/ridden/secway/atom_destruction() explosion(src, -1, 0, 2, 4, flame_range = 3) return ..() diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index abd6ec9dc7787..a8f41f4a2cba5 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -27,7 +27,7 @@ . = ..() AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate)),CALLBACK(src, PROC_REF(can_be_rotated)),null) -/obj/vehicle/ridden/wheelchair/obj_destruction(damage_flag) +/obj/vehicle/ridden/wheelchair/atom_destruction(damage_flag) new /obj/item/stack/rods(drop_location(), 1) new /obj/item/stack/sheet/iron(drop_location(), 1) ..() diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index be0c54b580232..c17ba6039c0a7 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -275,7 +275,7 @@ . += emissive_appearance(icon, light_mask, layer) ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) -/obj/machinery/vending/obj_break(damage_flag) +/obj/machinery/vending/atom_break(damage_flag) . = ..() if(!.) return diff --git a/tools/UpdatePaths/Scripts/11290_atomintegrity.txt b/tools/UpdatePaths/Scripts/11290_atomintegrity.txt new file mode 100644 index 0000000000000..410eb13eae40f --- /dev/null +++ b/tools/UpdatePaths/Scripts/11290_atomintegrity.txt @@ -0,0 +1 @@ +/obj/@SUBTYPES{obj_integrity=@ANY} : /obj/@SUBTYPES{atom_integrity=@OLD:obj_integrity} From 9c3312a42d4659fd1d42dd9e143927da783e6376 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 10:30:09 -0500 Subject: [PATCH 25/69] Automatic changelog generation for PR #11290 [ci skip] --- html/changelogs/AutoChangeLog-pr-11290.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11290.yml diff --git a/html/changelogs/AutoChangeLog-pr-11290.yml b/html/changelogs/AutoChangeLog-pr-11290.yml new file mode 100644 index 0000000000000..e1fc5fde70b89 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11290.yml @@ -0,0 +1,6 @@ +author: rkz, Kylerace, TemporalOroboros +delete-after: true +changes: + - refactor: moves integrity down to the /atom level + - refactor: desnowflakes gas tank items to use integrity + - bugfix: gas tanks now release their contents if destroyed From 8a5d0f16ce5ad7c7b72c3f6659f22e1f06225f59 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 16:03:48 +0000 Subject: [PATCH 26/69] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-11290.yml | 6 ------ 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11290.yml diff --git a/html/changelog.html b/html/changelog.html index eee77003c395e..0271d63a132fd 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -77,6 +77,12 @@

      Therealdoooc213 updated:

    • Removes LRPspeak from hallucinations
    • New hallucination types!
    +

    rkz, Kylerace, TemporalOroboros updated:

    +
      +
    • moves integrity down to the /atom level
      • +
    • desnowflakes gas tank items to use integrity
      • +
    • gas tanks now release their contents if destroyed
      • +

    18 October 2024

    ktlwjec updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 0573f451e3665..20584ffb0efda 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44664,3 +44664,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Therealdoooc213: - rscdel: Removes LRPspeak from hallucinations - rscadd: New hallucination types! + rkz, Kylerace, TemporalOroboros: + - refactor: moves integrity down to the /atom level + - refactor: desnowflakes gas tank items to use integrity + - bugfix: gas tanks now release their contents if destroyed diff --git a/html/changelogs/AutoChangeLog-pr-11290.yml b/html/changelogs/AutoChangeLog-pr-11290.yml deleted file mode 100644 index e1fc5fde70b89..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11290.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: rkz, Kylerace, TemporalOroboros -delete-after: true -changes: - - refactor: moves integrity down to the /atom level - - refactor: desnowflakes gas tank items to use integrity - - bugfix: gas tanks now release their contents if destroyed From 6e8e1cc4e893a2356f019000da085da9a56cd657 Mon Sep 17 00:00:00 2001 From: Rukofamicom Date: Sat, 19 Oct 2024 16:11:33 -0500 Subject: [PATCH 27/69] Update config.txt (#11727) --- config/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.txt b/config/config.txt index 8fa4d5ad22e8c..4eea5837a4a66 100644 --- a/config/config.txt +++ b/config/config.txt @@ -601,10 +601,10 @@ CENTCOM_BAN_DB https://centcom.melonmesa.com/ban/search VOTE_AUTOTRANSFER_ENABLED ## Percentage of votes required to call shuttle before decay is applied, value 0-1. -AUTOTRANSFER_PERCENTAGE 0.75 +AUTOTRANSFER_PERCENTAGE 0.7 ## Time until decay starts to reduce the required percentage of votes to leave (In deciseconds) -AUTOTRANSFER_DECAY_START 36000 +AUTOTRANSFER_DECAY_START 24000 ## How much is subtracted from the percentage above every time the vote ticks (ticks are every five minutes) AUTOTRANSFER_DECAY_AMOUNT 0.025 From 9553345c24a7a09480eab69c4273109db410d263 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 16:21:46 -0500 Subject: [PATCH 28/69] Automatic changelog generation for PR #11727 [ci skip] --- html/changelogs/AutoChangeLog-pr-11727.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11727.yml diff --git a/html/changelogs/AutoChangeLog-pr-11727.yml b/html/changelogs/AutoChangeLog-pr-11727.yml new file mode 100644 index 0000000000000..d95c6d5913ed6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11727.yml @@ -0,0 +1,9 @@ +author: Rukofamicom +delete-after: true +changes: + - config: The percentage of votes required to leave now starts at 70% instead of + 75% + - config: Auto-transfer reminders to vote now happen every 40 minutes, and decay + of the required votes to leave now begins at 40 minutes instead of 60. + - config: These changes mean the maximum round length before a shuttle is forcibly + called is now 3 hours instead of 3.5. From 7a8fe7f4a24f1cdcd05d5d0bfd6eca4e079dd4aa Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 19 Oct 2024 22:04:07 +0000 Subject: [PATCH 29/69] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 7 +++++++ html/changelogs/AutoChangeLog-pr-11727.yml | 9 --------- 3 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11727.yml diff --git a/html/changelog.html b/html/changelog.html index 0271d63a132fd..f916433bf9f00 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -66,6 +66,12 @@

    MarkusLarsson421 updated:

    • Changed Robotic Head from bulky to normal.
    +

    Rukofamicom updated:

    +
      +
    • The percentage of votes required to leave now starts at 70% instead of 75%
      • +
    • Auto-transfer reminders to vote now happen every 40 minutes, and decay of the required votes to leave now begins at 40 minutes instead of 60.
      • +
    • These changes mean the maximum round length before a shuttle is forcibly called is now 3 hours instead of 3.5.
      • +

    Sarchutar updated:

     +

    Dejaku51 updated:

    +
      +
    • camera shake on fire
      • +
    • BSA tgui panel has been upgraded!
      • +
    • removed ability to rapid fire BSA
      • +
    • BSA now requires 20MW to shoot
      • +
    • can hear BSA sounds once again!
      • +
    • fixes charging making it charge the correct way
      • +
    • kW MW GW defines now added
      • +

    MarkusLarsson421 updated:

    • Added anomaly cores to the Cargo bounty.
      • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 4878ad6af93ff..528502dce7dd1 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44698,6 +44698,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. BarteG44: - bugfix: fixed emitter welding - bugfix: fixed cult robes using the wrong hood + Dejaku51: + - rscadd: camera shake on fire + - tweak: BSA tgui panel has been upgraded! + - balance: removed ability to rapid fire BSA + - balance: BSA now requires 20MW to shoot + - bugfix: can hear BSA sounds once again! + - bugfix: fixes charging making it charge the correct way + - code_imp: kW MW GW defines now added MarkusLarsson421: - rscadd: Added anomaly cores to the Cargo bounty. - rscadd: Added cores to be sellable, including ones made from the SM. diff --git a/html/changelogs/AutoChangeLog-pr-11558.yml b/html/changelogs/AutoChangeLog-pr-11558.yml deleted file mode 100644 index 7afd8914210a9..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11558.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: Dejaku51 -delete-after: true -changes: - - rscadd: camera shake on fire - - tweak: BSA tgui panel has been upgraded! - - balance: removed ability to rapid fire BSA - - balance: BSA now requires 20MW to shoot - - bugfix: can hear BSA sounds once again! - - bugfix: fixes charging making it charge the correct way - - code_imp: kW MW GW defines now added From afe96ad4a0be592f240df052177fa7a7ba42812c Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed, 23 Oct 2024 00:13:30 +0000 Subject: [PATCH 65/69] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index ca59c68fcde96..b728ce3a1d654 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -1068,12 +1068,6 @@

      Ivniinvi updated:

      • fixed capitalization of cake in uplink
      - -

      21 August 2024

      -

      HowToLoLu updated:

      -
        -
      • FastDMM2 is usable once again for map editing
        • -
    GoonStation 13 Development Team From d80d3af91af29a71783875dfb509d2bede8b8b52 Mon Sep 17 00:00:00 2001 From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com> Date: Tue, 22 Oct 2024 23:07:01 -0400 Subject: [PATCH 66/69] The revival of Dullahans! + Ventriloquism! (#10093) * https://github.com/tgstation/tgstation/pull/48633 * makes em undead * https://github.com/tgstation/tgstation/pull/63696 * https://github.com/tgstation/tgstation/pull/63143 * https://github.com/tgstation/tgstation/pull/63939 * 515 * add back INVESTIGATE_DEATHS to dulla --- .../dcs/signals/signals_atom/signals_atom.dm | 4 +- .../dcs/signals/signals_mob/signals_mob.dm | 2 + code/__DEFINES/is_helpers.dm | 1 + code/_onclick/click.dm | 4 +- code/game/machinery/recycler.dm | 2 +- code/game/say.dm | 4 +- code/modules/mob/living/brain/brain_item.dm | 5 +- code/modules/mob/living/carbon/human/human.dm | 6 + .../mob/living/carbon/human/species.dm | 16 ++ .../carbon/human/species_types/dullahan.dm | 207 ++++++++++++------ code/modules/mob/living/living.dm | 17 +- code/modules/mob/living/say.dm | 15 +- code/modules/surgery/bodyparts/head.dm | 19 +- 13 files changed, 218 insertions(+), 84 deletions(-) diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm index 2b5b5eae98d90..dd0bed49487cb 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm @@ -120,6 +120,7 @@ ///! from the base of atom/intercept_teleport: (channel, turf/origin, turf/destination) #define COMSIG_ATOM_INTERCEPT_TELEPORT "intercept_teleport" #define COMPONENT_BLOCK_TELEPORT 1 +#define COMSIG_ATOM_HEARER_IN_VIEW "atom_hearer_in_view" //called when an atom is added to the hearers on get_hearers_in_view(): (list/processing_list, list/hearers) ///called when an atom starts orbiting another atom: (atom) #define COMSIG_ATOM_ORBIT_BEGIN "atom_orbit_begin" /// called when an atom stops orbiting another atom: (atom) @@ -144,7 +145,8 @@ ///////////////// #define COMSIG_CLICK "atom_click" //! from base of atom/Click(): (location, control, params, mob/user) -#define COMSIG_CLICK_SHIFT "shift_click" //! from base of atom/ShiftClick(): (/mob) +#define COMSIG_CLICK_SHIFT "shift_click" //from base of atom/ShiftClick(): (/mob) + #define COMPONENT_ALLOW_EXAMINATE 1 //Allows the user to examinate regardless of client.eye. #define COMSIG_CLICK_CTRL "ctrl_click" //! from base of atom/CtrlClickOn(): (/mob) #define COMSIG_CLICK_ALT "alt_click" //! from base of atom/AltClick(): (/mob) #define COMPONENT_INTERCEPT_ALT 1 diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm index 016833787b053..9492d89c06ac6 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm @@ -56,6 +56,8 @@ #define SPEECH_LANGUAGE 5 #define SPEECH_IGNORE_SPAM 6 #define SPEECH_FORCED 7 */ + #define SPEECH_RANGE 8 + #define COMSIG_MOB_EMOTE "mob_emote" // from /mob/living/emote(): () #define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" //from base of mob/swap_hand() #define COMPONENT_BLOCK_SWAP 1 diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 2831abed7a3b2..2ad043144f5bd 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -96,6 +96,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define iscatperson(A) (is_species(A, /datum/species/human/felinid) ) #define isethereal(A) (is_species(A, /datum/species/ethereal)) #define isvampire(A) (is_species(A,/datum/species/vampire)) +#define isdullahan(A) (is_species(A, /datum/species/dullahan)) #define isipc(A) (is_species(A, /datum/species/ipc)) #define isapid(A) (is_species(A, /datum/species/apid)) #define isandroid(A) (is_species(A, /datum/species/android)) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index b9a4877f4e464..027d1f498fc82 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -318,8 +318,8 @@ A.ShiftClick(src) return /atom/proc/ShiftClick(mob/user) - SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user) - if(user.client && user.client.eye == user || user.client.eye == user.loc) + var/flags = SEND_SIGNAL(user, COMSIG_CLICK_SHIFT, src) + if(user.client && (user.client.eye == user || user.client.eye == user.loc || flags & COMPONENT_ALLOW_EXAMINATE)) user.examinate(src) return diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index f267f5d59053d..5317fc5ef6256 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -121,7 +121,7 @@ var/atom/movable/AM = i var/obj/item/bodypart/head/as_head = AM var/obj/item/mmi/as_mmi = AM - var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /mob/living/brain) + var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || isbrain(AM) || istype(AM, /obj/item/dullahan_relay) if(brain_holder) emergency_stop(AM) else if(isliving(AM)) diff --git a/code/game/say.dm b/code/game/say.dm index 2d22f4a42dd86..6046a95bd01f6 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(freqtospan, list( "[FREQ_CTF_BLUE]" = "blueteamradio" )) -/atom/movable/proc/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null, atom/source=src) +/atom/movable/proc/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null, range = 7, atom/source=src) if(!can_speak()) return if(message == "" || !message) @@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(freqtospan, list( spans |= speech_span if(!language) language = get_selected_language() - send_speech(message, 7, source, , spans, message_language=language) + send_speech(message, range, source, , spans, message_language=language) /atom/movable/proc/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) SEND_SIGNAL(src, COMSIG_MOVABLE_HEAR, args) diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 5c6633ac29519..a7f54cd301a41 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -21,8 +21,9 @@ var/suicided = FALSE var/mob/living/brain/brainmob = null var/brain_death = FALSE //if the brainmob was intentionally killed by attacking the brain after removal, or by severe braindamage - var/decoy_override = FALSE //if it's a fake brain with no brainmob assigned. Feedback messages will be faked as if it does have a brainmob. See changelings & dullahans. - //two variables necessary for calculating whether we get a brain trauma or not + /// If it's a fake brain with no brainmob assigned. Feedback messages will be faked as if it does have a brainmob. See changelings & dullahans. + var/decoy_override = FALSE + /// Two variables necessary for calculating whether we get a brain trauma or not var/damage_delta = 0 var/list/datum/brain_trauma/traumas = list() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ca1c84c81f8b2..289e2d2fd1da6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -137,6 +137,12 @@ INVOKE_ASYNC(C, TYPE_PROC_REF(/obj/vehicle/sealed/car, RunOver), src) spreadFire(AM) +/mob/living/carbon/human/reset_perspective(atom/new_eye, force_reset = FALSE) + if(dna?.species?.prevent_perspective_change && !force_reset) // This is in case a species needs to prevent perspective changes in certain cases, like Dullahans preventing perspective changes when they're looking through their head. + update_fullscreen() + return + return ..() + /mob/living/carbon/human/Topic(href, href_list) if(href_list["embedded_object"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY)) var/obj/item/bodypart/L = locate(href_list["embedded_limb"]) in bodyparts diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 906261228a0c9..a937df100d483 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -156,6 +156,9 @@ GLOBAL_LIST_EMPTY(features_by_species) // Species specific bitflags. Used for things like if the race is unable to become a changeling. var/species_bitflags = NONE + /// Do we try to prevent reset_perspective() from working? Useful for Dullahans to stop perspective changes when they're looking through their head. + var/prevent_perspective_change = FALSE + /////////// // PROCS // /////////// @@ -2498,6 +2501,19 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/prepare_human_for_preview(mob/living/carbon/human/human) return +/** + * Owner login + */ + +/** + * A simple proc to be overwritten if something needs to be done when a mob logs in. Does nothing by default. + * + * Arguments: + * * owner - The owner of our species. + */ +/datum/species/proc/on_owner_login(mob/living/carbon/human/owner) + return + /** * Gets a short description for the specices. Should be relatively succinct. * Used in the preference menu. diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index c5370e1f69784..dfb68c3d0aaa0 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -3,9 +3,19 @@ id = SPECIES_DULLAHAN max_bodypart_count = 5 //No head default_color = "FFFFFF" - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS) - inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH, TRAIT_NONECRODISEASE) - mutant_bodyparts = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None", "body_size" = "Normal") + species_traits = list( + EYECOLOR, + HAIR, + FACEHAIR, + LIPS + ) + inherent_traits = list( + TRAIT_NOHUNGER, + TRAIT_NOBREATH, + TRAIT_NONECRODISEASE, + ) + inherent_biotypes = list(MOB_UNDEAD, MOB_HUMANOID) + mutant_bodyparts = list("wings" = "None", "body_size" = "Normal") use_skintones = TRUE mutantbrain = /obj/item/organ/brain/dullahan mutanteyes = /obj/item/organ/eyes/dullahan @@ -15,7 +25,11 @@ skinned_type = /obj/item/stack/sheet/animalhide/human changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN - var/obj/item/dullahan_relay/myhead + /// The dullahan relay that's associated with the owner, used to handle many things such as talking and hearing. + var/obj/item/dullahan_relay/my_head + + /// Did our owner's first client connection get handled yet? Useful for when some proc needs to be called once we're sure that a client has moved into our owner, like for Dullahans. + var/owner_first_client_connection_handled = FALSE /datum/species/dullahan/check_roundstart_eligible() @@ -23,45 +37,85 @@ return TRUE return ..() -/datum/species/dullahan/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) +/datum/species/dullahan/on_species_gain(mob/living/carbon/human/human, datum/species/old_species) . = ..() - H.lose_hearing_sensitivity(TRAIT_GENERIC) - var/obj/item/bodypart/head/head = H.get_bodypart(BODY_ZONE_HEAD) + human.lose_hearing_sensitivity(TRAIT_GENERIC) + var/obj/item/bodypart/head/head = human.get_bodypart(BODY_ZONE_HEAD) + if(head) head.drop_limb() - head.throwforce = 25 - myhead = new /obj/item/dullahan_relay (head, H) - H.put_in_hands(head) - -/datum/species/dullahan/on_species_loss(mob/living/carbon/human/H) - H.become_hearing_sensitive() - H.reset_perspective(H) - if(myhead) - var/obj/item/dullahan_relay/DR = myhead - myhead = null - DR.owner = null - qdel(DR) - H.regenerate_limb(BODY_ZONE_HEAD,FALSE) - ..() - -/datum/species/dullahan/spec_life(mob/living/carbon/human/human) - if(QDELETED(myhead)) - myhead = null + + if(!QDELETED(head)) //drop_limb() deletes the limb if no drop location exists and character setup dummies are located in nullspace. + head.throwforce = 25 + my_head = new /obj/item/dullahan_relay(head, human) + human.put_in_hands(head) + head.show_organs_on_examine = FALSE + head.speech_span = null + + // We want to give the head some boring old eyes just so it doesn't look too jank on the head sprite. + head.eyes = new /obj/item/organ/eyes(head) + head.eyes.eye_color = human.eye_color + human.update_body() + head.update_icon_dropped() + +/datum/species/dullahan/on_species_loss(mob/living/carbon/human/human) + . = ..() + + if(my_head) + var/obj/item/bodypart/head/detached_head = my_head.loc + my_head.owner = null + QDEL_NULL(my_head) + if(detached_head) + qdel(detached_head) + + human.regenerate_limb(BODY_ZONE_HEAD, FALSE) + human.become_hearing_sensitive() + prevent_perspective_change = FALSE + human.reset_perspective(human) + +/datum/species/dullahan/spec_life(mob/living/carbon/human/human, delta_time, times_fired) + if(QDELETED(my_head)) + my_head = null human.investigate_log("has been gibbed by the loss of [human.p_their()] head.", INVESTIGATE_DEATHS) human.gib() - var/obj/item/bodypart/head/head2 = human.get_bodypart(BODY_ZONE_HEAD) - if(head2) - myhead = null - human.gib() + return + + if(my_head.loc.name != human.real_name && istype(my_head.loc, /obj/item/bodypart/head)) + var/obj/item/bodypart/head/detached_head = my_head.loc + detached_head.real_name = human.real_name + detached_head.name = human.real_name + detached_head.brain.name = "[human.name]'s brain" + + var/obj/item/bodypart/head/illegal_head = human.get_bodypart(BODY_ZONE_HEAD) + if(illegal_head) + my_head = null + human.investigate_log("has been gibbed by the loss of [human.p_their()] head.", INVESTIGATE_DEATHS) + human.gib() // Yeah so giving them a head on their body is really not a good idea, so their original head will remain but uh, good luck fixing it after that. -/datum/species/dullahan/proc/update_vision_perspective(mob/living/carbon/human/H) - var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) +/datum/species/dullahan/proc/update_vision_perspective(mob/living/carbon/human/human) + var/obj/item/organ/eyes/eyes = human.getorganslot(ORGAN_SLOT_EYES) if(eyes) - H.update_tint() + human.update_tint() if(eyes.tint) - H.reset_perspective(H) + prevent_perspective_change = FALSE + human.reset_perspective(human, TRUE) else - H.reset_perspective(myhead) + human.reset_perspective(my_head, TRUE) + prevent_perspective_change = TRUE + +/datum/species/dullahan/on_owner_login(mob/living/carbon/human/owner) + var/obj/item/organ/eyes/eyes = owner.getorganslot(ORGAN_SLOT_EYES) + if(owner_first_client_connection_handled) + if(!eyes.tint) + owner.reset_perspective(my_head, TRUE) + prevent_perspective_change = TRUE + return + + // As it's the first time there's a client in our mob, we can finally update its vision to place it in the head instead! + var/datum/action/item_action/organ_action/dullahan/eyes_toggle_perspective_action = locate() in eyes?.actions + + eyes_toggle_perspective_action?.Trigger() + owner_first_client_connection_handled = TRUE /datum/species/dullahan/get_species_description() @@ -108,7 +162,7 @@ /obj/item/organ/brain/dullahan decoy_override = TRUE - organ_flags = 0 + organ_flags = NONE /obj/item/organ/tongue/dullahan zone = "abstract" @@ -116,12 +170,12 @@ /obj/item/organ/tongue/dullahan/handle_speech(datum/source, list/speech_args) if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - if(H.dna.species.id == SPECIES_DULLAHAN) - var/datum/species/dullahan/D = H.dna.species - if(isobj(D.myhead.loc)) - var/obj/O = D.myhead.loc - O.say(speech_args[SPEECH_MESSAGE]) + var/mob/living/carbon/human/human = owner + if(isdullahan(human)) + var/datum/species/dullahan/dullahan_species = human.dna.species + if(isobj(dullahan_species.my_head.loc)) + var/obj/head = dullahan_species.my_head.loc + head.say(speech_args[SPEECH_MESSAGE], spans = speech_args[SPEECH_SPANS], sanitize = FALSE, range = speech_args[SPEECH_RANGE]) speech_args[SPEECH_MESSAGE] = "" /obj/item/organ/ears/dullahan @@ -132,6 +186,7 @@ desc = "An abstraction." actions_types = list(/datum/action/item_action/organ_action/dullahan) zone = "abstract" + tint = INFINITY // to switch the vision perspective to the head on species_gain() without issue. /datum/action/item_action/organ_action/dullahan name = "Toggle Perspective" @@ -139,52 +194,80 @@ /datum/action/item_action/organ_action/dullahan/Trigger() . = ..() - var/obj/item/organ/eyes/dullahan/DE = target - if(DE.tint) - DE.tint = 0 - else - DE.tint = INFINITY + var/obj/item/organ/eyes/dullahan/dullahan_eyes = target + dullahan_eyes.tint = dullahan_eyes.tint ? NONE : INFINITY if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - if(H.dna.species.id == SPECIES_DULLAHAN) - var/datum/species/dullahan/D = H.dna.species - D.update_vision_perspective(H) + var/mob/living/carbon/human/human = owner + if(isdullahan(human)) + var/datum/species/dullahan/dullahan_species = human.dna.species + dullahan_species.update_vision_perspective(human) + /obj/item/dullahan_relay + name = "dullahan relay" + /// The mob (a dullahan) that owns this relay. var/mob/living/owner CREATION_TEST_IGNORE_SUBTYPES(/obj/item/dullahan_relay) -/obj/item/dullahan_relay/Initialize(mapload,new_owner) +/obj/item/dullahan_relay/Initialize(mapload, mob/living/carbon/human/new_owner) . = ..() + if(!new_owner) + return INITIALIZE_HINT_QDEL owner = new_owner START_PROCESSING(SSobj, src) + RegisterSignal(owner, COMSIG_CLICK_SHIFT, PROC_REF(examinate_check)) + RegisterSignal(owner, COMSIG_LIVING_REGENERATE_LIMBS, PROC_REF(unlist_head)) + RegisterSignal(owner, COMSIG_LIVING_REVIVE, PROC_REF(retrieve_head)) become_hearing_sensitive(ROUNDSTART_TRAIT) -/obj/item/dullahan_relay/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) - owner.Hear(arglist(args)) +/obj/item/dullahan_relay/Destroy() + lose_hearing_sensitivity(ROUNDSTART_TRAIT) + owner = null + return ..() /obj/item/dullahan_relay/process() if(!istype(loc, /obj/item/bodypart/head) || QDELETED(owner)) . = PROCESS_KILL qdel(src) +/obj/item/dullahan_relay/proc/examinate_check(mob/user, atom/source) + SIGNAL_HANDLER + if(user.client.eye == src) + return COMPONENT_ALLOW_EXAMINATE + /obj/item/dullahan_relay/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) . = ..() - if(!QDELETED(owner)) - message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mods) - to_chat(owner,message) - else - qdel(src) + if(owner) + owner.Hear(message, speaker, message_language, raw_message, radio_freq, spans, message_mods) +///Adds the owner to the list of hearers in hearers_in_view(), for visible/hearable on top of say messages +/obj/item/dullahan_relay/proc/include_owner(datum/source, list/hearers) + SIGNAL_HANDLER + if(!QDELETED(owner)) + hearers += owner + +///Stops dullahans from gibbing when regenerating limbs +/obj/item/dullahan_relay/proc/unlist_head(datum/source, noheal = FALSE, list/excluded_zones) + SIGNAL_HANDLER + excluded_zones |= BODY_ZONE_HEAD + +///Retrieving the owner's head for better ahealing. +/obj/item/dullahan_relay/proc/retrieve_head(datum/source, full_heal, admin_revive) + SIGNAL_HANDLER + if(admin_revive) + var/obj/item/bodypart/head/head = loc + var/turf/body_turf = get_turf(owner) + if(head && istype(head) && body_turf && !(head in owner.GetAllContents())) + head.forceMove(body_turf) /obj/item/dullahan_relay/Destroy() if(!QDELETED(owner)) - var/mob/living/carbon/human/H = owner - if(H.dna.species.id == SPECIES_DULLAHAN) - var/datum/species/dullahan/D = H.dna.species - D.myhead = null + var/mob/living/carbon/human/human = owner + if(isdullahan(human)) + var/datum/species/dullahan/dullahan_species = human.dna.species + dullahan_species.my_head = null owner.investigate_log("has been gibbed by the destruction of their head/body relay.", INVESTIGATE_DEATHS) owner.gib() owner = null diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 3095e44139230..58f66906a0bb1 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1459,16 +1459,19 @@ result += static_virus return result -/mob/living/reset_perspective(atom/new_eye) - if(!..()) - return - update_sight() +/mob/living/reset_perspective(atom/A) + if(..()) + update_sight() + update_fullscreen() + update_pipe_vision() + +/// Proc used to handle the fullscreen overlay updates, realistically meant for the reset_perspective() proc. +/mob/living/proc/update_fullscreen() if(client.eye && client.eye != src) - var/atom/AT = client.eye - AT.get_remote_view_fullscreens(src) + var/atom/client_eye = client.eye + client_eye.get_remote_view_fullscreens(src) else clear_fullscreen("remote_view", 0) - update_pipe_vision() /mob/living/update_mouse_pointer() ..() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 22bbed72e029a..af0c9c8b07bbe 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -164,11 +164,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(message_mods[RADIO_KEY] == RADIO_KEY_UPLINK) // only uplink needs this message_mods[MODE_UNTREATED_MESSAGE] = message // let's store the original message before treating those message = treat_message(message) // unfortunately we still need this - var/sigreturn = SEND_SIGNAL(src, COMSIG_MOB_SAY, args) - if(sigreturn & COMPONENT_UPPERCASE_SPEECH) - message = uppertext(message) - if(!message) - return spans |= speech_span @@ -181,6 +176,15 @@ GLOBAL_LIST_INIT(department_radio_keys, list( message = "[randomnote] [message] [randomnote]" spans |= SPAN_SINGING + // Leaving this here so that anything that handles speech this way will be able to have spans affecting it and all that. + var/sigreturn = SEND_SIGNAL(src, COMSIG_MOB_SAY, args, message_range) + if (sigreturn & COMPONENT_UPPERCASE_SPEECH) + message = uppertext(message) + if(!message) + if(succumbed) + succumb() + return + //This is before anything that sends say a radio message, and after all important message type modifications, so you can scumb in alien chat or something if(saymode && !saymode.early && !saymode.handle_message(src, message, language)) return @@ -189,6 +193,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( // radios don't pick up whispers very well radio_message = stars(radio_message) spans |= SPAN_ITALICS + var/radio_return = radio(radio_message, message_mods, spans, language)//roughly 27% of living/say()'s total cost if(radio_return & ITALICS) spans |= SPAN_ITALICS diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 21267b0914734..9f91255a3df71 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -22,6 +22,9 @@ var/obj/item/organ/ears/ears var/obj/item/organ/tongue/tongue + /// Do we show the information about missing organs upon being examined? Defaults to TRUE, useful for Dullahan heads. + var/show_organs_on_examine = TRUE + //Limb appearance info: var/real_name = "" //Replacement name //Hair colour and style @@ -66,7 +69,7 @@ /obj/item/bodypart/head/examine(mob/user) . = ..() - if(IS_ORGANIC_LIMB(src)) + if(IS_ORGANIC_LIMB(src) && show_organs_on_examine) if(!brain) . += "The brain has been removed from [src]." else if(brain.suicided || brainmob?.suiciding) @@ -188,7 +191,7 @@ ..() /obj/item/bodypart/head/update_icon_dropped() - var/list/standing = get_limb_icon(1) + var/list/standing = get_limb_icon(TRUE) if(!standing.len) icon_state = initial(icon_state)//no overlays found, we default back to initial icon. return @@ -248,6 +251,18 @@ if(eyes.eye_color) eyes_overlay.color = "#" + eyes.eye_color + +/obj/item/bodypart/head/talk_into(mob/holder, message, channel, spans, datum/language/language, list/message_mods) + var/mob/headholder = holder + if(istype(headholder)) + headholder.log_talk(message, LOG_SAY, tag = "beheaded talk") + + say(message, language, sanitize = FALSE) + return NOPASS + +/obj/item/bodypart/head/GetVoice() + return "The head of [real_name]" + /obj/item/bodypart/head/monkey icon = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_head" From f1d3118aaf56a8710da3e0db26ac76f452e6a63a Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Tue, 22 Oct 2024 22:15:42 -0500 Subject: [PATCH 67/69] Automatic changelog generation for PR #10093 [ci skip] --- html/changelogs/AutoChangeLog-pr-10093.yml | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10093.yml diff --git a/html/changelogs/AutoChangeLog-pr-10093.yml b/html/changelogs/AutoChangeLog-pr-10093.yml new file mode 100644 index 0000000000000..0b0c5a821f78a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10093.yml @@ -0,0 +1,36 @@ +author: rkz, Ghommie, GoldenAlpharex, Sealed101 +delete-after: true +changes: + - tweak: makes Dullahans undead, like the other halloween races. + - rscadd: Added ventriloquism to disembodied heads. + - bugfix: Dullahans won't gib when their head is thrown in a recycler, ahealed or + have their limbs regenerated somehow. + - bugfix: Dullahans' heads can now be picked up. + - bugfix: Fixes dullahans being unable to receive visible/hearable messages (excluding + chat messages) + - refactor: Refactored Dullahans in many areas to fix many, many of their bugs and + glitches and ensure an actually functional experience playing as one, while + also improving as much code as I could along the way. + - bugfix: Dullahans only hear speech through their head (not sounds, sadly, someone + else would have to tell me how to do that because I otherwise really wouldn't + know how to do it in a sane way), they speak through their head, runechat-included. + - bugfix: When you spawn a Dullahan, you're set to look through the Dullahan's eyes + (so from their head), and that doesn't reset when you log off and back in, or + admin-ghost and come back in your body. + - bugfix: When you're looking through your head, your view will no longer be reset + to your body upon entering a locker, which is nice to avoid not being blind + while looking through your body. + - bugfix: Dullahan heads no longer look completely lifeless and without organs. + They have eyes that don't look dead and that even match the player's intended + eye color. + - bugfix: Dullahan can now properly examine things from their head's view. + - bugfix: Dullahan heads now speak with the proper name of their owner, instead + of having a random name attached to it at round-start. + - bugfix: Dullahan heads are also now properly named too. + - bugfix: Dullahans can now properly whisper, sing and do all these funny things + that they were unable to do before. + - bugfix: Dullahans can now succumb in hardcrit by whispering, as intended. This + potentially fixes other species that worked similarly not being able to succumb, + like abductors. + - bugfix: When switching from Dullahans to a different species, your old head will + no longer stay behind. From 7f98bfee30e2dfa6ac9e3fb54729adc53db174b4 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed, 23 Oct 2024 04:04:21 +0000 Subject: [PATCH 68/69] Automatic changelog compile [ci skip] --- html/changelog.html | 21 +++++++++++++ html/changelogs/.all_changelog.yml | 35 +++++++++++++++++++++ html/changelogs/AutoChangeLog-pr-10093.yml | 36 ---------------------- 3 files changed, 56 insertions(+), 36 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10093.yml diff --git a/html/changelog.html b/html/changelog.html index b728ce3a1d654..b1c6142f7ec41 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,27 @@ -->
    +

    23 October 2024

    +

    rkz, Ghommie, GoldenAlpharex, Sealed101 updated:

    +
      +
    • makes Dullahans undead, like the other halloween races.
      • +
    • Added ventriloquism to disembodied heads.
      • +
    • Dullahans won't gib when their head is thrown in a recycler, ahealed or have their limbs regenerated somehow.
      • +
    • Dullahans' heads can now be picked up.
      • +
    • Fixes dullahans being unable to receive visible/hearable messages (excluding chat messages)
      • +
    • Refactored Dullahans in many areas to fix many, many of their bugs and glitches and ensure an actually functional experience playing as one, while also improving as much code as I could along the way.
      • +
    • Dullahans only hear speech through their head (not sounds, sadly, someone else would have to tell me how to do that because I otherwise really wouldn't know how to do it in a sane way), they speak through their head, runechat-included.
      • +
    • When you spawn a Dullahan, you're set to look through the Dullahan's eyes (so from their head), and that doesn't reset when you log off and back in, or admin-ghost and come back in your body.
      • +
    • When you're looking through your head, your view will no longer be reset to your body upon entering a locker, which is nice to avoid not being blind while looking through your body.
      • +
    • Dullahan heads no longer look completely lifeless and without organs. They have eyes that don't look dead and that even match the player's intended eye color.
      • +
    • Dullahan can now properly examine things from their head's view.
      • +
    • Dullahan heads now speak with the proper name of their owner, instead of having a random name attached to it at round-start.
      • +
    • Dullahan heads are also now properly named too.
      • +
    • Dullahans can now properly whisper, sing and do all these funny things that they were unable to do before.
      • +
    • Dullahans can now succumb in hardcrit by whispering, as intended. This potentially fixes other species that worked similarly not being able to succumb, like abductors.
      • +
    • When switching from Dullahans to a different species, your old head will no longer stay behind.
      • +
    +

    22 October 2024

    BarteG44 updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 528502dce7dd1..7299437a8a501 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44732,3 +44732,38 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - code_imp: fixes drinks updatepaths ktlwjec: - spellcheck: Adds descriptions to chav and wacky genes. +2024-10-23: + rkz, Ghommie, GoldenAlpharex, Sealed101: + - tweak: makes Dullahans undead, like the other halloween races. + - rscadd: Added ventriloquism to disembodied heads. + - bugfix: Dullahans won't gib when their head is thrown in a recycler, ahealed or + have their limbs regenerated somehow. + - bugfix: Dullahans' heads can now be picked up. + - bugfix: Fixes dullahans being unable to receive visible/hearable messages (excluding + chat messages) + - refactor: Refactored Dullahans in many areas to fix many, many of their bugs and + glitches and ensure an actually functional experience playing as one, while + also improving as much code as I could along the way. + - bugfix: Dullahans only hear speech through their head (not sounds, sadly, someone + else would have to tell me how to do that because I otherwise really wouldn't + know how to do it in a sane way), they speak through their head, runechat-included. + - bugfix: When you spawn a Dullahan, you're set to look through the Dullahan's eyes + (so from their head), and that doesn't reset when you log off and back in, or + admin-ghost and come back in your body. + - bugfix: When you're looking through your head, your view will no longer be reset + to your body upon entering a locker, which is nice to avoid not being blind + while looking through your body. + - bugfix: Dullahan heads no longer look completely lifeless and without organs. + They have eyes that don't look dead and that even match the player's intended + eye color. + - bugfix: Dullahan can now properly examine things from their head's view. + - bugfix: Dullahan heads now speak with the proper name of their owner, instead + of having a random name attached to it at round-start. + - bugfix: Dullahan heads are also now properly named too. + - bugfix: Dullahans can now properly whisper, sing and do all these funny things + that they were unable to do before. + - bugfix: Dullahans can now succumb in hardcrit by whispering, as intended. This + potentially fixes other species that worked similarly not being able to succumb, + like abductors. + - bugfix: When switching from Dullahans to a different species, your old head will + no longer stay behind. diff --git a/html/changelogs/AutoChangeLog-pr-10093.yml b/html/changelogs/AutoChangeLog-pr-10093.yml deleted file mode 100644 index 0b0c5a821f78a..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-10093.yml +++ /dev/null @@ -1,36 +0,0 @@ -author: rkz, Ghommie, GoldenAlpharex, Sealed101 -delete-after: true -changes: - - tweak: makes Dullahans undead, like the other halloween races. - - rscadd: Added ventriloquism to disembodied heads. - - bugfix: Dullahans won't gib when their head is thrown in a recycler, ahealed or - have their limbs regenerated somehow. - - bugfix: Dullahans' heads can now be picked up. - - bugfix: Fixes dullahans being unable to receive visible/hearable messages (excluding - chat messages) - - refactor: Refactored Dullahans in many areas to fix many, many of their bugs and - glitches and ensure an actually functional experience playing as one, while - also improving as much code as I could along the way. - - bugfix: Dullahans only hear speech through their head (not sounds, sadly, someone - else would have to tell me how to do that because I otherwise really wouldn't - know how to do it in a sane way), they speak through their head, runechat-included. - - bugfix: When you spawn a Dullahan, you're set to look through the Dullahan's eyes - (so from their head), and that doesn't reset when you log off and back in, or - admin-ghost and come back in your body. - - bugfix: When you're looking through your head, your view will no longer be reset - to your body upon entering a locker, which is nice to avoid not being blind - while looking through your body. - - bugfix: Dullahan heads no longer look completely lifeless and without organs. - They have eyes that don't look dead and that even match the player's intended - eye color. - - bugfix: Dullahan can now properly examine things from their head's view. - - bugfix: Dullahan heads now speak with the proper name of their owner, instead - of having a random name attached to it at round-start. - - bugfix: Dullahan heads are also now properly named too. - - bugfix: Dullahans can now properly whisper, sing and do all these funny things - that they were unable to do before. - - bugfix: Dullahans can now succumb in hardcrit by whispering, as intended. This - potentially fixes other species that worked similarly not being able to succumb, - like abductors. - - bugfix: When switching from Dullahans to a different species, your old head will - no longer stay behind. From 6da493c5252455478a1a53797f9f47c48ae815b5 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu, 24 Oct 2024 01:30:49 +0000 Subject: [PATCH 69/69] Automatic changelog compile [ci skip] --- html/changelog.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index b1c6142f7ec41..824064b570813 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -1078,17 +1078,6 @@

      PowerfulBacon updated:

      • Cleans up the code by removing LAssailant from mobs. Attacking something that a slime is feeding on will no longer cause it to become your friend.
      - -

      22 August 2024

      -

      Dejaku51 updated:

      -
        -
      • Zfall and Elevator controller doesn't init anymore
        • -
      • Natural Light Cycle subsystem inits correctly
        • -
      -

      Ivniinvi updated:

      -
        -
      • fixed capitalization of cake in uplink
        • -
    GoonStation 13 Development Team

    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 Date: Fri, 18 Oct 2024 14:51:49 -0500 Subject: [PATCH 07/69] Automatic changelog generation for PR #11701 [ci skip] --- html/changelogs/AutoChangeLog-pr-11701.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11701.yml diff --git a/html/changelogs/AutoChangeLog-pr-11701.yml b/html/changelogs/AutoChangeLog-pr-11701.yml new file mode 100644 index 0000000000000..9837f38fc3888 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11701.yml @@ -0,0 +1,17 @@ +author: rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend +delete-after: true +changes: + - refactor: repaths drinks and reagent containers to a centralized file. Food reagent_containers + no longer exist. + - bugfix: fixed a few outlying food checks that still expected reagent_containers + - bugfix: fixed caltrop bug with plates + - bugfix: hot chocolate no longer spontaneously becomes chocolate milk when put + in a different container + - code_imp: moves hot chocolate, tea, coffee "food" recipes to drink recipes + - tweak: hot chocolate now inherits milk's healing (its made from milk, get it?) + - tweak: caltrop now applies to broken bottles + - tweak: drinking from used glasses can now pass diseases, same as food. Bartenders! + Clean your glasses! + - tweak: adds soda shaking. Shaking/throwing a soda around before opening may make + it erupt when opened. + - rscadd: soda shaking noises From f0a32e0a38136acd98a416c59b4734c086f7a373 Mon Sep 17 00:00:00 2001 From: ktlwjec <122807629+ktlwjec0@users.noreply.github.com> Date: Fri, 18 Oct 2024 20:44:04 +0100 Subject: [PATCH 08/69] broken grilles drop rods (#11688) --- code/game/objects/structures/grille.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 23cdc4cc5c25e..b9326d3200972 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -288,7 +288,7 @@ rods_amount = 1 rods_broken = FALSE var/drop_loc = drop_location() - var/obj/R = new rods_type(drop_loc, rods_broken) + var/obj/R = new rods_type(drop_loc, rods_amount) if(QDELETED(R)) // the rods merged with something on the tile R = locate(rods_type) in drop_loc if(R) From f89719e85c22f6a099790888be92f8700fee9a6a Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:06:13 -0500 Subject: [PATCH 09/69] Automatic changelog generation for PR #11688 [ci skip] --- html/changelogs/AutoChangeLog-pr-11688.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11688.yml diff --git a/html/changelogs/AutoChangeLog-pr-11688.yml b/html/changelogs/AutoChangeLog-pr-11688.yml new file mode 100644 index 0000000000000..a1e2e2d4312e0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11688.yml @@ -0,0 +1,4 @@ +author: ktlwjec +delete-after: true +changes: + - bugfix: Breaking grilles no longer drop invisible rods. From b5dfa88be31270ea1f16cd0a6c6fe50bbdb01fd0 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:03:22 +0000 Subject: [PATCH 10/69] Automatic changelog compile [ci skip] --- html/changelog.html | 19 +++++++++++++++++++ html/changelogs/.all_changelog.yml | 18 ++++++++++++++++++ html/changelogs/AutoChangeLog-pr-11688.yml | 4 ---- html/changelogs/AutoChangeLog-pr-11701.yml | 17 ----------------- 4 files changed, 37 insertions(+), 21 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11688.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11701.yml diff --git a/html/changelog.html b/html/changelog.html index a0b2af2cea53e..4c1b8089ef563 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,25 @@ -->