From 79ab5130248e8610937a7b18d845a8efeeeb219d Mon Sep 17 00:00:00 2001
From: dwasint <82520990+dwasint@users.noreply.github.com>
Date: Mon, 8 Apr 2024 12:51:13 -0400
Subject: [PATCH] [DRAFT] Slime Rancher? In my space station???? (#1442)
* start
* more stuff
* more changes
* more slime stuff
* Update slime.dm
* Update slime.dm
* adds more slime stuff
* start of crossbreeds
* adds the mutation types to all slimes temp for now
* guh
* more stuff
* makes slimes respect eachother eating stuff so they will target other things
* Update feed.dm
* sponge bob me boy why are the slimes stacking
* more slime stuff
* Update _base_slime.dm
* another trait
* start of slime corrals
* slime corrals
* more slime pen stuff
* adds all the crossbreed recipes.
* base slime colors done
* more traits, more fixes, better ui
* minor fixes
* test fixer
* holy shit is this a edmund macmillan reference?
* it fucking auto corrected mcmillen to mcmillan >:(
* overlay fix
* Merge branch 'slimerancher' of https://github.com/dwasint/monkestation2.0 into slimerancher
* Update tgstation.dme
* hard delete fixes
* makes shop work
* changes to mapping id
* metastation mapping changes
* adds the request console
* delta, ice and some meta changes
* fixes
* tram IG
* adds buyable corral pen upgrades
* map fix, slime pen corral buying and upgrade viewing
* sanity checks the liquid groups because splits have a period of time where they can trigger other things which breaks liquids
* adds placeholder apply_water proc until we rework reagents.
* the research
* fuck
* whoops
* fixes
* Update mob_stacker.dm
* Update xenobiology.dm
* tons of fixes
* range increase, removal on death, mutation chance
* more changes
* guh
* Update vacuum_pack.dm
* Update vacuum_pack.dm
* Update ooze_compressor.dm
* Update slime_extracts.dm
* potential fixes
* more fixes
* wasn't getting latch bug anymore
* no split no ooze, traits pass down, random color mutation syringe
* fixes
* Update tramstation.dmm
* Update feed.dm
* repaths extracts, phasing fix, crossbreed cost increase, phasing issue fix
* Update ooze_compressor.dm
* Update slime_extracts.dm
* fixes compressor not being in the plumber, fixes crossbreeds being unmakable
* fixes slime mutations not working all the time, makes corrals load slimes at roundstart
* soda slime
* jps pathing
* adds ooze counter to the pen controller
* forgot to tick beer slimes
* Update ooze_compressor.dm
* Update cargo_driver.dm
* Update rat_organs.dm
* Update rat_organs.dm
* Update liquid_groups.dm
* prevents slime_stacks from feeding as it breaks mob buckling, adds the legendary rainbow slime
* Update _base_mutation.dm
* fixes
* fixes
* Update colors.dm
* makes them unbuckle in death
* should fix crossbreeds not properly respecting full reagents
* Update traitor.dm
* Update changeling.dm
* Update corral_corner.dm
* Update colors.dm
* changes shit
* fixes
* Update liquid_controller.dm
* Update liquid_turf.dm
* Update liquid_turf.dm
* maybe fixes it?
* Update _base_slime.dm
* guh
* start of emotional speech
* Update _base_slime.dm
* friendship tracker
* slime friendship throw, also fix for ooze compressor
* adds vac_tagging to gain friendship from feedings
* pet commands
* fixes runtime
* Update emotion_buffer.dm
* old slimes have died woah
* Update _base_slime.dm
* box xenobiology
* Update BoxStation.dmm
* snaps xeno shit from kilo
* map fixes
* Update nonhuman_corpses.dm
* more mapping fixes
* Update hilbertresearchfacility.dmm
* bam
* Update tgstation.dme
* whoops
* fixes
* Update mutation_syringe.dm
* fixes
* fixes
* Update BoxStation.dmm
* Revert "Update BoxStation.dmm"
This reverts commit ac5e68436fababaf5250dab157ef416751dbed52.
* Revert "Merge branch 'master' into slimerancher"
This reverts commit de0a3674e5c19e6abe667f1e9380b570d7bd0b25, reversing
changes made to c903670e54f286d20bc2a9993cef7a13291fe729.
* Reapply "Merge branch 'master' into slimerancher"
This reverts commit 8a32f48344018ae43e2a621f8fde782a2dc46a16.
* Reapply "Update BoxStation.dmm"
This reverts commit 7ae79339dc0fe2b917f702260646326ec5d61ee1.
* redoes this manually
* fixes pyros dying and buckling bug
* potential fix
* more additions
* Update liquid_status_effect.dm
* what the fuck is wrong with the slow downs
* slime grinder
* prevents slimes from crushing roaches
---
.../SpaceRuins/anomaly_research.dmm | 1 -
.../SpaceRuins/hilbertresearchfacility.dmm | 21 +-
.../map_files/Basketball/lusty_xenomorphs.dmm | 20 +-
_maps/map_files/BoxStation/BoxStation.dmm | 1234 ++---
.../map_files/Deltastation/DeltaStation2.dmm | 1110 ++---
.../map_files/IceBoxStation/IceBoxStation.dmm | 1296 ++---
_maps/map_files/KiloStation/KiloStation.dmm | 18 +-
_maps/map_files/MetaStation/MetaStation.dmm | 4253 +++++++++--------
_maps/map_files/NorthStar/north_star.dmm | 20 +-
_maps/map_files/generic/CentCom.dmm | 5 +-
_maps/map_files/tramstation/tramstation.dmm | 1217 ++---
_maps/templates/lazy_templates/nukie_base.dmm | 5 +-
.../signals/signals_mob/signals_mob_living.dm | 2 +
code/__DEFINES/is_helpers.dm | 2 +-
.../~monkestation/dcs/signals/signals_mob.dm | 25 +
code/__DEFINES/~monkestation/slimes.dm | 91 +
code/__HELPERS/mobs.dm | 2 +-
code/__HELPERS/paths/path.dm | 5 +
code/_globalvars/phobias.dm | 4 +-
code/_onclick/other_mobs.dm | 24 -
.../configuration/entries/game_options.dm | 3 +-
code/controllers/subsystem/research.dm | 28 +
code/datums/ai/_ai_controller.dm | 2 +-
.../basic_ai_behaviors/basic_attacking.dm | 10 +-
.../run_away_from_target.dm | 1 +
code/datums/ai/movement/_ai_movement.dm | 16 +-
code/datums/components/plumbing/_plumbing.dm | 22 +-
code/datums/components/squashable.dm | 2 +-
code/datums/elements/basic_eating.dm | 2 +
code/game/atoms_movable.dm | 16 +-
code/game/machinery/computer/accounting.dm | 2 +
.../dna_infuser/organ_sets/rat_organs.dm | 18 +-
.../telecomms/computers/logbrowser.dm | 2 +-
code/game/objects/buckling.dm | 16 +-
.../anomalies/anomalies_pyroclastic.dm | 12 +-
.../circuitboards/computer_circuitboards.dm | 5 -
.../machines/machine_circuitboards.dm | 31 +-
.../objects/items/devices/chameleonproj.dm | 2 -
.../items/devices/scanners/slime_scanner.dm | 53 -
code/game/objects/items/rcd/RPLD.dm | 5 +
.../items/stacks/sheets/sheet_types.dm | 1 +
code/game/objects/obj_defense.dm | 6 -
code/game/objects/structures/ladders.dm | 11 -
code/game/turfs/open/_open.dm | 2 +-
.../abductor/equipment/glands/slime.dm | 5 +-
.../antagonists/revolution/revolution.dm | 4 +-
code/modules/awaymissions/signpost.dm | 3 -
.../modules/awaymissions/super_secret_room.dm | 3 -
code/modules/events/creep_awakening.dm | 1 +
.../experisci/experiment/experiments.dm | 2 -
.../machinery/monkeyrecycler.dm | 103 -
.../food_and_drinks/machinery/processor.dm | 55 -
.../food_and_drinks/machinery/smartfridge.dm | 4 +-
.../recipes/processor_recipes.dm | 5 -
.../ruins/spaceruin_code/hilbertshotel.dm | 3 -
.../modules/mob/living/basic/basic_defense.dm | 8 +-
.../mob/living/carbon/alien/alien_defense.dm | 9 -
.../mob/living/carbon/carbon_defense.dm | 22 -
.../mob/living/carbon/human/human_defense.dm | 25 -
.../mob/living/carbon/human/human_defines.dm | 2 +-
.../modules/mob/living/carbon/status_procs.dm | 1 +
code/modules/mob/living/living.dm | 2 +-
code/modules/mob/living/living_defense.dm | 23 -
.../mob/living/silicon/ai/ai_defense.dm | 3 -
.../mob/living/silicon/robot/robot_defense.dm | 18 -
.../living/simple_animal/animal_defense.dm | 7 -
.../hostile/mining_mobs/curse_blob.dm | 1 -
.../mob/living/simple_animal/slime/death.dm | 31 -
.../mob/living/simple_animal/slime/emote.dm | 56 -
.../mob/living/simple_animal/slime/life.dm | 615 ---
.../mob/living/simple_animal/slime/powers.dm | 241 -
.../mob/living/simple_animal/slime/slime.dm | 580 ---
.../living/simple_animal/slime/slime_say.dm | 8 -
.../living/simple_animal/slime/subtypes.dm | 79 -
code/modules/mob/living/ventcrawling.dm | 7 -
code/modules/mob/mob.dm | 2 +-
code/modules/mob/transform_procs.dm | 7 +-
.../mob_spawn/corpses/nonhuman_corpses.dm | 8 +-
code/modules/power/cell.dm | 2 +-
code/modules/reagents/chemistry/reagents.dm | 2 +
.../chemistry/reagents/food_reagents.dm | 2 +-
.../chemistry/reagents/other_reagents.dm | 4 +-
.../reagents/pyrotechnic_reagents.dm | 2 +-
.../chemistry/recipes/slime_extracts.dm | 14 +-
.../designs/autolathe/medsci_designs.dm | 11 -
.../research/designs/comp_board_designs.dm | 10 -
.../research/designs/machine_designs.dm | 10 -
code/modules/research/techweb/all_nodes.dm | 10 +-
.../xenobiology/crossbreeding/__corecross.dm | 2 +
.../xenobiology/crossbreeding/_mobs.dm | 10 +-
.../xenobiology/crossbreeding/_potions.dm | 4 +-
.../crossbreeding/_status_effects.dm | 6 +-
.../xenobiology/crossbreeding/burning.dm | 11 +-
.../xenobiology/crossbreeding/charged.dm | 4 +-
.../xenobiology/crossbreeding/chilling.dm | 4 +-
.../xenobiology/crossbreeding/industrial.dm | 2 +-
.../xenobiology/crossbreeding/regenerative.dm | 6 +-
.../vatgrowing/samples/cell_lines/common.dm | 2 +-
.../research/xenobiology/xenobio_camera.dm | 453 --
.../research/xenobiology/xenobiology.dm | 135 +-
code/modules/surgery/core_removal.dm | 61 -
.../surgery/organs/augments_internal.dm | 2 +
code/modules/unit_tests/_unit_tests.dm | 1 -
code/modules/unit_tests/slime_mood.dm | 12 -
code/modules/unit_tests/strange_reagent.dm | 2 +-
config/game_options.txt | 2 +-
.../code/controllers/subsystem/job.dm | 2 +-
.../code/modules/aesthetics/mobs/slime.dm | 9 +-
.../code/modules/cargo/crates/science.dm | 7 +-
.../code/modules/liquids/liquid_controller.dm | 6 +
.../code/modules/liquids/liquid_effect.dm | 12 +-
.../code/modules/liquids/liquid_groups.dm | 60 +-
.../modules/liquids/liquid_status_effect.dm | 3 +-
.../code/modules/liquids/liquid_turf.dm | 4 +
.../ocean_content/fluff/cargo_driver.dm | 5 +-
.../code/modules/pollution/pollutant_datum.dm | 6 +-
.../research/xenobiology/xenobio_camera.dm | 15 -
.../slimecore/animations/slime_effects.dm | 38 +
.../modules/slimecore/assets/xenobiology.dm | 5 +
.../components/basic_scared_of_item.dm | 40 +
.../slimecore/components/emotion_buffer.dm | 136 +
.../components/friendship_tracker.dm | 56 +
.../components/generic_mob_hunger.dm | 94 +
.../slimecore/components/latch_feeding.dm | 123 +
.../slimecore/components/liquid_secretion.dm | 50 +
.../slimecore/components/mob_stacker.dm | 84 +
.../components/pollution_scrubber.dm | 28 +
.../slimecore/components/vac_tagged.dm | 16 +
.../modules/slimecore/corral/corral_data.dm | 78 +
.../corral/machines/corral_corner.dm | 189 +
.../corral/upgrades/_base_upgrade.dm | 14 +
.../corral/upgrades/human_docility_upgrade.dm | 16 +
.../corral/upgrades/obliteration_upgrade.dm | 14 +
.../slimecore/icons/backpack_lefthand.dmi | Bin 0 -> 653 bytes
.../slimecore/icons/backpack_righthand.dmi | Bin 0 -> 634 bytes
.../modules/slimecore/icons/equipment.dmi | Bin 0 -> 5347 bytes
.../code/modules/slimecore/icons/filters.dmi | Bin 0 -> 87675 bytes
.../modules/slimecore/icons/machinery.dmi | Bin 0 -> 13814 bytes
.../slimecore/icons/mister_lefthand.dmi | Bin 0 -> 1140 bytes
.../slimecore/icons/mister_righthand.dmi | Bin 0 -> 1108 bytes
.../modules/slimecore/icons/slime_grinder.dmi | Bin 0 -> 701 bytes
.../icons/slimecrossing_plort_version.dmi | Bin 0 -> 21622 bytes
.../code/modules/slimecore/icons/slimes.dmi | Bin 0 -> 81239 bytes
.../modules/slimecore/icons/stack_objects.dmi | Bin 0 -> 1898 bytes
.../modules/slimecore/icons/xenofauna.dmi | Bin 0 -> 62414 bytes
.../modules/slimecore/items/crossbreeds.dm | 2 +
.../slimecore/items/mutation_syringe.dm | 82 +
.../modules/slimecore/items/vacuum_pack.dm | 589 +++
.../slimecore/machines/biomass_recycler.dm | 181 +
.../slimecore/machines/extract_requestor.dm | 180 +
.../ooze_compressor/ooze_compressor.dm | 214 +
.../ooze_compressor_plumbing.dm | 31 +
.../ooze_compressor/recipes/_base_recipe.dm | 6 +
.../ooze_compressor/recipes/burning.dm | 154 +
.../ooze_compressor/recipes/charged.dm | 155 +
.../ooze_compressor/recipes/chilling.dm | 155 +
.../ooze_compressor/recipes/colors.dm | 87 +
.../ooze_compressor/recipes/consuming.dm | 155 +
.../ooze_compressor/recipes/industrial.dm | 155 +
.../ooze_compressor/recipes/prismatic.dm | 155 +
.../ooze_compressor/recipes/recurring.dm | 155 +
.../ooze_compressor/recipes/regenerative.dm | 155 +
.../ooze_compressor/recipes/reproductive.dm | 155 +
.../ooze_compressor/recipes/selfsustaining.dm | 155 +
.../ooze_compressor/recipes/stabilized.dm | 155 +
.../machines/ooze_compressor/shitcode.dm | 42 +
.../modules/slimecore/machines/ooze_sucker.dm | 130 +
.../slimecore/machines/slime_grinder.dm | 73 +
.../slimecore/machines/slime_market.dm | 137 +
.../machines/slime_market_computer.dm | 169 +
.../machines/slime_pen_controller.dm | 188 +
.../machines/slime_store/_base_item.dm | 5 +
.../machines/slime_store/mutators.dm | 53 +
.../machines/slime_store/vac_upgrades.dm | 5 +
.../modules/slimecore/mobs/_base_slime.dm | 467 ++
.../ai_controller/behaviours/clean_target.dm | 42 +
.../mobs/ai_controller/behaviours/feed.dm | 22 +
.../behaviours/find_target_without_trait.dm | 82 +
.../behaviours/flee_from_item.dm | 76 +
.../ai_controller/behaviours/slime_stacker.dm | 62 +
.../mobs/ai_controller/controller.dm | 21 +
.../idle_behavior/slime_playful.dm | 22 +
.../subtrees/basic_melee_tree.dm | 7 +
.../ai_controller/subtrees/cleaning_tree.dm | 17 +
.../subtrees/find_target_slime.dm | 27 +
.../ai_controller/subtrees/flee_with_item.dm | 9 +
.../modules/slimecore/mobs/feeding_flora.dm | 80 +
.../slimecore/mobs/pet_commands/latch_feed.dm | 2 +
.../mobs/pet_commands/stop_feeding.dm | 13 +
monkestation/code/modules/slimecore/readme.md | 36 +
.../slimecore/reagents/_base_reagent.dm | 12 +
.../modules/slimecore/reagents/base_colors.dm | 116 +
.../modules/slimecore/research_and_recipes.dm | 102 +
.../slime_accessories.dm/_base_accessory.dm | 12 +
.../slime_color_mutations/_base_color.dm | 25 +
.../slimecore/slime_color_mutations/colors.dm | 238 +
.../mutations/_base_mutation.dm | 59 +
.../slime_color_mutations/mutations/colors.dm | 93 +
.../slimecore/slime_traits/_base_trait.dm | 57 +
.../slimecore/slime_traits/beer_slime.dm | 17 +
.../modules/slimecore/slime_traits/cleaner.dm | 67 +
.../slimecore/slime_traits/docility.dm | 11 +
.../slimecore/slime_traits/endisnigh.dm | 18 +
.../slimecore/slime_traits/never_ooze.dm | 11 +
.../slimecore/slime_traits/never_split.dm | 12 +
.../slimecore/slime_traits/polluter.dm | 28 +
.../slimecore/slime_traits/radioactive.dm | 13 +
.../slimecore/slime_traits/slime_cat.dm | 20 +
.../slimecore/slime_traits/soda_slime.dm | 32 +
.../converted_events/solo/changeling.dm | 1 +
.../converted_events/solo/ghosts/wizard.dm | 4 +-
.../converted_events/solo/traitor.dm | 4 +-
.../disease/symtoms/restricted/stage1.dm | 2 +-
.../components/ouputs/factory_output.dm | 32 +-
.../components/ouputs/injector_output.dm | 10 +-
sound/misc/woohoo.ogg | Bin 0 -> 13944 bytes
tgstation.dme | 93 +-
.../interfaces/Fabrication/MaterialIcon.tsx | 2 +-
.../tgui/interfaces/SlimePenController.js | 272 ++
.../packages/tgui/interfaces/XenobioMarket.js | 160 +
220 files changed, 11592 insertions(+), 8256 deletions(-)
create mode 100644 code/__DEFINES/~monkestation/dcs/signals/signals_mob.dm
create mode 100644 code/__DEFINES/~monkestation/slimes.dm
delete mode 100644 code/game/objects/items/devices/scanners/slime_scanner.dm
delete mode 100644 code/modules/food_and_drinks/machinery/monkeyrecycler.dm
delete mode 100644 code/modules/mob/living/simple_animal/slime/death.dm
delete mode 100644 code/modules/mob/living/simple_animal/slime/emote.dm
delete mode 100644 code/modules/mob/living/simple_animal/slime/life.dm
delete mode 100644 code/modules/mob/living/simple_animal/slime/powers.dm
delete mode 100644 code/modules/mob/living/simple_animal/slime/slime.dm
delete mode 100644 code/modules/mob/living/simple_animal/slime/slime_say.dm
delete mode 100644 code/modules/mob/living/simple_animal/slime/subtypes.dm
delete mode 100644 code/modules/research/xenobiology/xenobio_camera.dm
delete mode 100644 code/modules/surgery/core_removal.dm
delete mode 100644 code/modules/unit_tests/slime_mood.dm
delete mode 100644 monkestation/code/modules/research/xenobiology/xenobio_camera.dm
create mode 100644 monkestation/code/modules/slimecore/animations/slime_effects.dm
create mode 100644 monkestation/code/modules/slimecore/assets/xenobiology.dm
create mode 100644 monkestation/code/modules/slimecore/components/basic_scared_of_item.dm
create mode 100644 monkestation/code/modules/slimecore/components/emotion_buffer.dm
create mode 100644 monkestation/code/modules/slimecore/components/friendship_tracker.dm
create mode 100644 monkestation/code/modules/slimecore/components/generic_mob_hunger.dm
create mode 100644 monkestation/code/modules/slimecore/components/latch_feeding.dm
create mode 100644 monkestation/code/modules/slimecore/components/liquid_secretion.dm
create mode 100644 monkestation/code/modules/slimecore/components/mob_stacker.dm
create mode 100644 monkestation/code/modules/slimecore/components/pollution_scrubber.dm
create mode 100644 monkestation/code/modules/slimecore/components/vac_tagged.dm
create mode 100644 monkestation/code/modules/slimecore/corral/corral_data.dm
create mode 100644 monkestation/code/modules/slimecore/corral/machines/corral_corner.dm
create mode 100644 monkestation/code/modules/slimecore/corral/upgrades/_base_upgrade.dm
create mode 100644 monkestation/code/modules/slimecore/corral/upgrades/human_docility_upgrade.dm
create mode 100644 monkestation/code/modules/slimecore/corral/upgrades/obliteration_upgrade.dm
create mode 100644 monkestation/code/modules/slimecore/icons/backpack_lefthand.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/backpack_righthand.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/equipment.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/filters.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/machinery.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/mister_lefthand.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/mister_righthand.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/slime_grinder.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/slimecrossing_plort_version.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/slimes.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/stack_objects.dmi
create mode 100644 monkestation/code/modules/slimecore/icons/xenofauna.dmi
create mode 100644 monkestation/code/modules/slimecore/items/crossbreeds.dm
create mode 100644 monkestation/code/modules/slimecore/items/mutation_syringe.dm
create mode 100644 monkestation/code/modules/slimecore/items/vacuum_pack.dm
create mode 100644 monkestation/code/modules/slimecore/machines/biomass_recycler.dm
create mode 100644 monkestation/code/modules/slimecore/machines/extract_requestor.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/ooze_compressor.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/ooze_compressor_plumbing.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/_base_recipe.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/burning.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/charged.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/chilling.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/colors.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/consuming.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/industrial.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/prismatic.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/recurring.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/regenerative.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/reproductive.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/selfsustaining.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/stabilized.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_compressor/shitcode.dm
create mode 100644 monkestation/code/modules/slimecore/machines/ooze_sucker.dm
create mode 100644 monkestation/code/modules/slimecore/machines/slime_grinder.dm
create mode 100644 monkestation/code/modules/slimecore/machines/slime_market.dm
create mode 100644 monkestation/code/modules/slimecore/machines/slime_market_computer.dm
create mode 100644 monkestation/code/modules/slimecore/machines/slime_pen_controller.dm
create mode 100644 monkestation/code/modules/slimecore/machines/slime_store/_base_item.dm
create mode 100644 monkestation/code/modules/slimecore/machines/slime_store/mutators.dm
create mode 100644 monkestation/code/modules/slimecore/machines/slime_store/vac_upgrades.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/_base_slime.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/behaviours/clean_target.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/behaviours/feed.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/behaviours/find_target_without_trait.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/behaviours/flee_from_item.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/behaviours/slime_stacker.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/controller.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/idle_behavior/slime_playful.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/subtrees/basic_melee_tree.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/subtrees/cleaning_tree.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/subtrees/find_target_slime.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/ai_controller/subtrees/flee_with_item.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/feeding_flora.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/pet_commands/latch_feed.dm
create mode 100644 monkestation/code/modules/slimecore/mobs/pet_commands/stop_feeding.dm
create mode 100644 monkestation/code/modules/slimecore/readme.md
create mode 100644 monkestation/code/modules/slimecore/reagents/_base_reagent.dm
create mode 100644 monkestation/code/modules/slimecore/reagents/base_colors.dm
create mode 100644 monkestation/code/modules/slimecore/research_and_recipes.dm
create mode 100644 monkestation/code/modules/slimecore/slime_accessories.dm/_base_accessory.dm
create mode 100644 monkestation/code/modules/slimecore/slime_color_mutations/_base_color.dm
create mode 100644 monkestation/code/modules/slimecore/slime_color_mutations/colors.dm
create mode 100644 monkestation/code/modules/slimecore/slime_color_mutations/mutations/_base_mutation.dm
create mode 100644 monkestation/code/modules/slimecore/slime_color_mutations/mutations/colors.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/_base_trait.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/beer_slime.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/cleaner.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/docility.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/endisnigh.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/never_ooze.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/never_split.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/polluter.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/radioactive.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/slime_cat.dm
create mode 100644 monkestation/code/modules/slimecore/slime_traits/soda_slime.dm
create mode 100644 sound/misc/woohoo.ogg
create mode 100644 tgui/packages/tgui/interfaces/SlimePenController.js
create mode 100644 tgui/packages/tgui/interfaces/XenobioMarket.js
diff --git a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
index 0d97c9d3c7a6..584b3f145de0 100644
--- a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
@@ -1138,7 +1138,6 @@
/obj/effect/turf_decal/siding/purple{
dir = 9
},
-/obj/machinery/monkey_recycler,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/misc/anomaly_research)
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
index 3cbe3ca2ddc3..fb1cc9c069e9 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -375,9 +375,8 @@
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"jC" = (
-/mob/living/simple_animal/slime{
- colour = "bluespace";
- rabid = 1
+/mob/living/basic/slime{
+ current_color = /datum/slime_color/bluespace
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/mineral/titanium/tiled/purple,
@@ -903,9 +902,8 @@
/turf/open/floor/mineral/titanium/tiled/white,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"wY" = (
-/mob/living/simple_animal/slime{
- colour = "bluespace";
- rabid = 1
+/mob/living/basic/slime{
+ current_color = /datum/slime_color/bluespace
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
@@ -1610,7 +1608,6 @@
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"JW" = (
/obj/machinery/light/broken/directional/north,
-/obj/machinery/monkey_recycler,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"Kd" = (
@@ -2192,9 +2189,8 @@
dir = 10
},
/obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/slime{
- colour = "bluespace";
- rabid = 1
+/mob/living/basic/slime{
+ current_color = /datum/slime_color/bluespace
},
/turf/open/floor/mineral/titanium/tiled/purple,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
@@ -2330,9 +2326,8 @@
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"Ze" = (
-/mob/living/simple_animal/slime{
- colour = "bluespace";
- rabid = 1
+/mob/living/basic/slime{
+ current_color = /datum/slime_color/bluespace
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/mineral/plastitanium,
diff --git a/_maps/map_files/Basketball/lusty_xenomorphs.dmm b/_maps/map_files/Basketball/lusty_xenomorphs.dmm
index 6aa3dae075e7..0be3c0688e97 100644
--- a/_maps/map_files/Basketball/lusty_xenomorphs.dmm
+++ b/_maps/map_files/Basketball/lusty_xenomorphs.dmm
@@ -218,7 +218,7 @@
/turf/open/floor/engine,
/area/centcom/basketball)
"pu" = (
-/mob/living/simple_animal/slime/random,
+/mob/living/basic/slime/random,
/turf/open/floor/engine,
/area/centcom/basketball)
"qU" = (
@@ -529,18 +529,6 @@
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/iron/white,
/area/centcom/basketball)
-"Se" = (
-/obj/machinery/computer/camera_advanced/xenobio,
-/turf/open/floor/iron/white,
-/area/centcom/basketball)
-"Tc" = (
-/obj/machinery/monkey_recycler,
-/turf/open/floor/iron/white,
-/area/centcom/basketball)
-"Uq" = (
-/obj/machinery/processor/slime,
-/turf/open/floor/iron/white,
-/area/centcom/basketball)
"Uv" = (
/obj/effect/decal/cleanable/xenoblood/xgibs/torso,
/turf/open/floor/engine,
@@ -820,7 +808,7 @@ Hu
(9,1,1) = {"
Hu
Lu
-Tc
+JM
ly
AI
LS
@@ -901,7 +889,7 @@ Hu
(12,1,1) = {"
Hu
Lu
-Se
+JM
OB
Vr
Vr
@@ -982,7 +970,7 @@ Hu
(15,1,1) = {"
Hu
Lu
-Uq
+JM
ly
rU
LS
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 94e420487727..c157be159a4e 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -81,13 +81,15 @@
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"abS" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio7";
- name = "Xenobio Pen 7 Blast Door"
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology - Secure Cell Interior";
+ name = "xenobiology camera";
+ network = list("ss13","xeno","rd")
},
-/turf/open/floor/plating/reinforced,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"abT" = (
/obj/machinery/computer/records/security,
@@ -900,25 +902,21 @@
/area/station/maintenance/port/fore)
"arJ" = (
/obj/effect/turf_decal/stripes/line{
- dir = 6
+ dir = 8
},
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio5";
- name = "Xenobio Pen 5 Blast Door";
- req_access = list("xenobiology")
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
-/turf/open/floor/iron/large,
+/obj/machinery/duct,
+/turf/open/floor/carpet/neon/simple/green,
/area/station/science/xenobiology)
"arL" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Science - Xenobiology, Pen 8";
- network = list("ss13","rd","xeno");
- name = "science camera";
- dir = 10
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/obj/machinery/light/neon_lining{
+ dir = 8
},
-/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"arN" = (
@@ -1597,7 +1595,6 @@
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/science/xenobiology/hallway)
"aEh" = (
@@ -2234,19 +2231,6 @@
/obj/structure/filingcabinet/security,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/engineering)
-"aQd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio1";
- name = "Xenobio Pen 1 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"aQt" = (
/obj/structure/cable,
/obj/machinery/power/smes,
@@ -3350,7 +3334,12 @@
/turf/open/floor/iron/freezer,
/area/station/service/kitchen/coldroom)
"bii" = (
-/obj/machinery/processor/slime,
+/obj/machinery/biomass_recycler,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"bir" = (
@@ -3913,21 +3902,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
-"brC" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio10";
- name = "Xenobio Pen 10 Blast Door"
- },
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 10"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"brU" = (
/obj/machinery/computer/telecomms/server{
dir = 4;
@@ -5474,19 +5448,6 @@
/obj/machinery/washing_machine,
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms/laundry)
-"bQH" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio4";
- name = "Xenobio Pen 4 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"bQL" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 1
@@ -6920,7 +6881,6 @@
"cot" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/science/xenobiology/hallway)
"cou" = (
@@ -7069,21 +7029,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"csD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
- name = "Xenobio Pen 2 Blast Door"
- },
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 2"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"csE" = (
/obj/effect/turf_decal/trimline/neutral/filled/warning{
dir = 4
@@ -8290,17 +8235,11 @@
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
"cOo" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/machinery/corral_corner{
+ mapping_id = "6"
},
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio7";
- name = "Xenobio Pen 7 Blast Door"
- },
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 7"
+/obj/machinery/slime_pen_controller{
+ mapping_id = "6"
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -9086,13 +9025,13 @@
/area/station/ai_monitored/security/armory)
"cZL" = (
/obj/machinery/newscaster/directional/south,
-/obj/structure/table/glass,
/obj/machinery/reagentgrinder{
pixel_y = 5
},
/obj/item/stack/sheet/mineral/plasma{
amount = 5
},
+/obj/structure/table/reinforced/plasmarglass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"cZU" = (
@@ -9334,16 +9273,10 @@
/turf/open/floor/wood,
/area/station/service/library/lounge)
"deQ" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/light/neon_lining{
dir = 8
},
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 2";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"deW" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -9823,12 +9756,11 @@
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
"dnc" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/structure/disposaloutlet{
- dir = 4
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "6";
+ dir = 2
},
+/obj/machinery/light/floor/has_bulb,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"dnd" = (
@@ -9977,10 +9909,7 @@
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/effect/mapping_helpers/apc/cell_5k,
-/obj/structure/table/glass,
-/obj/machinery/reagentgrinder{
- pixel_y = 8
- },
+/obj/machinery/plumbing/ooze_compressor,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"doW" = (
@@ -10323,13 +10252,13 @@
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"dwq" = (
-/obj/structure/table/glass,
/obj/machinery/camera/autoname/directional/north,
/obj/structure/sign/warning/biohazard/directional/north,
/obj/item/wirecutters,
/obj/item/screwdriver,
/obj/item/storage/box/lights/mixed,
/obj/item/toy/plush/slimeplushie,
+/obj/structure/table/reinforced/plasmarglass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"dws" = (
@@ -14963,18 +14892,6 @@
/obj/structure/sign/warning/secure_area/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"fcs" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
- name = "Xenobio Pen 2 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating/reinforced,
-/area/station/science/xenobiology)
"fcR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -15595,7 +15512,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"fnK" = (
/obj/structure/disposalpipe/segment{
@@ -16335,18 +16253,6 @@
/obj/machinery/duct,
/turf/open/floor/wood/large,
/area/station/security/prison/safe)
-"fDu" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal/bin,
-/obj/structure/sign/warning/electric_shock/directional/west,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"fDB" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/item/kirbyplants/random,
@@ -16467,15 +16373,9 @@
/turf/open/floor/iron/kitchen,
/area/station/security/prison/mess)
"fFr" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 3";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
+/obj/structure/cable,
+/obj/machinery/duct,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"fFP" = (
/obj/machinery/firealarm/directional/west,
@@ -16811,15 +16711,6 @@
dir = 9
},
/area/station/service/hydroponics)
-"fLw" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio6";
- name = "Xenobio Pen 6 Blast Door"
- },
-/turf/open/floor/plating/reinforced,
-/area/station/science/xenobiology)
"fLA" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -17558,12 +17449,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
-"fYf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"fYg" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -18278,16 +18163,8 @@
/turf/open/floor/iron/dark/textured,
/area/station/security/warden)
"gmo" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio10";
- name = "Xenobio Pen 10 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating/reinforced,
+/mob/living/basic/slime,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"gmC" = (
/obj/machinery/airalarm/directional/west,
@@ -18460,7 +18337,13 @@
name = "Containment Blast Doors";
req_access = list("xenobiology")
},
-/obj/machinery/computer/camera_advanced/xenobio,
+/obj/structure/table/reinforced/plasmarglass,
+/obj/item/vacuum_pack,
+/obj/item/vacuum_pack,
+/obj/item/vacuum_pack,
+/obj/item/disk/vacuum_upgrade/biomass,
+/obj/item/disk/vacuum_upgrade/biomass,
+/obj/item/disk/vacuum_upgrade/biomass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"gpq" = (
@@ -19913,13 +19796,12 @@
/turf/open/floor/iron/dark,
/area/station/commons/fitness)
"gLB" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Science - Xenobiology, Pen 7";
- network = list("ss13","rd","xeno");
- name = "science camera";
- dir = 6
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/obj/machinery/light/neon_lining{
+ dir = 4
},
-/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"gLF" = (
@@ -20511,7 +20393,11 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"gUf" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -20779,18 +20665,6 @@
/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
/turf/open/floor/iron/dark/textured,
/area/station/service/chapel/office)
-"gZg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 9"
- },
-/obj/structure/cable,
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"gZw" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -21725,7 +21599,7 @@
/area/station/security/evidence)
"hqM" = (
/obj/machinery/airalarm/directional/south,
-/obj/item/kirbyplants/random,
+/obj/machinery/plumbing/ooze_compressor,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"hqN" = (
@@ -21768,18 +21642,6 @@
},
/turf/open/floor/iron/dark/telecomms,
/area/station/science/server)
-"hrA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/obj/structure/sign/warning/electric_shock/directional/east,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"hrH" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
@@ -22056,15 +21918,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/security/prison/workout)
-"hvv" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio8";
- name = "Xenobio Pen 8 Blast Door"
- },
-/turf/open/floor/plating/reinforced,
-/area/station/science/xenobiology)
"hvz" = (
/obj/structure/closet/emcloset/anchored,
/turf/open/floor/iron/dark/smooth_large,
@@ -23694,17 +23547,6 @@
},
/turf/open/floor/iron/dark/side,
/area/station/commons/locker)
-"hZI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 4"
- },
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"hZS" = (
/obj/effect/turf_decal/delivery/red,
/obj/structure/cable,
@@ -25144,16 +24986,10 @@
/turf/open/floor/iron/dark,
/area/station/hallway/primary/port)
"iwr" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio7";
- name = "Xenobio Pen 7 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating/reinforced,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"iwL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25162,16 +24998,13 @@
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"iwO" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio3";
- name = "Xenobio Pen 3 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/slime_pen_controller{
+ mapping_id = "4"
},
-/turf/open/floor/plating/reinforced,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"iwZ" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -25898,17 +25731,8 @@
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"iJI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio4";
- name = "Xenobio Pen 4 Blast Door"
- },
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 4";
- req_access = list("xenobiology")
+/obj/machinery/corral_corner{
+ mapping_id = "1"
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -26401,17 +26225,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"iRM" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"iRQ" = (
/obj/effect/turf_decal/box,
/obj/effect/turf_decal/stripes/corner,
@@ -26520,7 +26333,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"iUB" = (
/turf/closed/wall/r_wall,
@@ -27256,14 +27072,6 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"jje" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Science - Xenobiology, Pen 4";
- network = list("ss13","rd","xeno");
- name = "science camera"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"jjk" = (
/obj/machinery/camera/autoname/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -28545,17 +28353,13 @@
/turf/open/floor/iron/dark,
/area/station/security/prison)
"jGx" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio9";
- name = "Xenobio Pen 9 Blast Door";
- req_access = list("xenobiology")
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "4";
+ dir = 1;
+ pixel_y = 0
},
-/turf/open/floor/iron/large,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"jGA" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -28931,17 +28735,13 @@
/area/station/ai_monitored/turret_protected/aisat/atmos)
"jLQ" = (
/obj/effect/turf_decal/stripes/line{
- dir = 10
+ dir = 8
},
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/firealarm/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio10";
- name = "Xenobio Pen 10 Blast Door";
- req_access = list("xenobiology")
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
-/turf/open/floor/iron/large,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/carpet/neon/simple/green,
/area/station/science/xenobiology)
"jLR" = (
/obj/effect/turf_decal/trimline/brown/filled/warning{
@@ -29477,19 +29277,10 @@
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"jWq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio9";
- name = "Xenobio Pen 9 Blast Door"
- },
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 9";
- req_access = list("xenobiology")
+/obj/machinery/light/neon_lining{
+ dir = 4
},
-/turf/open/floor/engine,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"jWy" = (
/turf/closed/wall/r_wall,
@@ -29582,16 +29373,8 @@
/turf/open/floor/plating,
/area/station/maintenance/department/science)
"jXV" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 1"
- },
-/obj/structure/cable,
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
+/obj/effect/landmark/start/scientist,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"jYc" = (
/obj/machinery/light/small/broken/directional/west,
@@ -30367,18 +30150,6 @@
"kmq" = (
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
-"kmM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio6";
- name = "Xenobio Pen 6 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating/reinforced,
-/area/station/science/xenobiology)
"kmO" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
@@ -30457,7 +30228,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
-/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
"knX" = (
@@ -31360,12 +31130,11 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
"kEN" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/structure/disposaloutlet{
- dir = 8
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "5";
+ dir = 2
},
+/obj/machinery/light/floor/has_bulb,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"kEX" = (
@@ -31721,14 +31490,12 @@
/area/station/maintenance/starboard/aft)
"kLj" = (
/obj/effect/turf_decal/stripes/line{
- dir = 4
+ dir = 8
},
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 8"
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
+/turf/open/floor/carpet/neon/simple/green,
/area/station/science/xenobiology)
"kLr" = (
/turf/closed/wall/r_wall,
@@ -32021,13 +31788,13 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"kPJ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio1";
- name = "Xenobio Pen 1 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "1"
},
-/turf/open/floor/plating/reinforced,
+/obj/machinery/slime_pen_controller{
+ mapping_id = "1"
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"kPL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32106,16 +31873,13 @@
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"kQP" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio4";
- name = "Xenobio Pen 4 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "3"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/slime_pen_controller{
+ mapping_id = "3"
},
-/turf/open/floor/plating/reinforced,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"kQR" = (
/obj/effect/turf_decal/bot,
@@ -32391,18 +32155,6 @@
/obj/item/hfr_box/core,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
-"kVf" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 10";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"kVi" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -32431,16 +32183,11 @@
/turf/open/floor/plating,
/area/station/maintenance/department/security/brig)
"kVq" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio1";
- name = "Xenobio Pen 1 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/duct,
+/obj/machinery/light/neon_lining{
+ dir = 8
},
-/turf/open/floor/plating/reinforced,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"kVD" = (
/obj/structure/closet/crate,
@@ -33399,13 +33146,11 @@
/turf/open/floor/carpet,
/area/station/hallway/secondary/entry)
"lmK" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/structure/disposaloutlet{
- dir = 8
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "1";
+ dir = 1
},
+/obj/machinery/light/floor/has_bulb,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"lmX" = (
@@ -35281,21 +35026,6 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
-"lUf" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio5";
- name = "Xenobio Pen 5 Blast Door"
- },
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 5";
- req_access = list("xenobiology")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"lUr" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -36030,7 +35760,12 @@
/turf/open/floor/iron/white,
/area/station/maintenance/department/science)
"mhS" = (
-/obj/machinery/light/small/directional/east,
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"mih" = (
@@ -36087,19 +35822,6 @@
/obj/machinery/camera/autoname/directional/west,
/turf/open/floor/iron/dark/smooth_large,
/area/station/engineering/main)
-"miO" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio7";
- name = "Xenobio Pen 7 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"miX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/bin,
@@ -36777,18 +36499,6 @@
},
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/engineering/transit_tube)
-"mtj" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio5";
- name = "Xenobio Pen 5 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating/reinforced,
-/area/station/science/xenobiology)
"mtH" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{
dir = 5
@@ -36909,9 +36619,6 @@
/obj/structure/flora/tree/jungle/style_random,
/turf/open/floor/grass,
/area/station/hallway/secondary/exit/departure_lounge)
-"mvz" = (
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"mvA" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/tile/purple/fourcorners,
@@ -38488,17 +38195,13 @@
/area/station/maintenance/department/medical)
"nax" = (
/obj/effect/turf_decal/stripes/line{
- dir = 9
+ dir = 8
},
-/obj/machinery/firealarm/directional/south,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio2";
- name = "Xenobio Pen 2 Blast Door";
- req_access = list("xenobiology")
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
-/turf/open/floor/iron/large,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/carpet/neon/simple/green,
/area/station/science/xenobiology)
"naB" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -40579,12 +40282,9 @@
/turf/open/floor/iron,
/area/station/service/hydroponics)
"nJb" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Science - Xenobiology, Pen 1";
- network = list("ss13","rd","xeno");
- name = "science camera"
- },
-/turf/open/floor/engine,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"nJc" = (
/obj/effect/mapping_helpers/broken_floor,
@@ -40898,13 +40598,12 @@
/area/station/maintenance/department/science)
"nNV" = (
/obj/structure/sign/xenobio_guide/directional/north,
-/obj/structure/table/glass,
-/obj/item/slime_scanner,
/obj/item/clothing/gloves/latex,
/obj/item/clothing/glasses/science,
/obj/item/experi_scanner{
pixel_x = 4
},
+/obj/structure/table/reinforced/plasmarglass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"nOj" = (
@@ -41576,11 +41275,11 @@
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
"oak" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Science - Xenobiology, Pen 10";
- network = list("ss13","rd","xeno");
- name = "science camera";
- dir = 6
+/obj/machinery/corral_corner{
+ mapping_id = "6"
+ },
+/obj/machinery/light/neon_lining{
+ dir = 4
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -41599,19 +41298,6 @@
/obj/machinery/cassette/mailbox,
/turf/open/floor/wood,
/area/station/service/library/lounge)
-"oaA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio8";
- name = "Xenobio Pen 8 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"oaC" = (
/obj/effect/turf_decal/tile/orange/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42017,7 +41703,12 @@
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/ai)
"ohk" = (
-/obj/machinery/light/small/directional/west,
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"ohm" = (
@@ -44749,9 +44440,20 @@
/turf/open/floor/iron/dark,
/area/station/security/processing)
"peN" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobiomain";
+ name = "Containment Blast Door"
+ },
/obj/machinery/duct,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/textured,
/area/station/science/xenobiology)
"peO" = (
/obj/machinery/firealarm/directional/south,
@@ -45780,11 +45482,11 @@
/turf/open/floor/iron/dark/textured,
/area/station/hallway/secondary/exit/departure_lounge)
"pwn" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Science - Xenobiology, Pen 9";
- network = list("ss13","rd","xeno");
- name = "science camera";
- dir = 10
+/obj/machinery/corral_corner{
+ mapping_id = "5"
+ },
+/obj/machinery/light/neon_lining{
+ dir = 8
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -46098,16 +45800,10 @@
/turf/open/floor/carpet/purple,
/area/station/security/prison/safe)
"pBX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio8";
- name = "Xenobio Pen 8 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/corral_corner{
+ mapping_id = "3"
},
-/turf/open/floor/plating/reinforced,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"pCb" = (
/obj/effect/spawner/random/trash/graffiti,
@@ -49413,13 +49109,10 @@
/turf/open/floor/iron/dark/side,
/area/station/commons/dorms)
"qNL" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio10";
- name = "Xenobio Pen 10 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "6"
},
-/turf/open/floor/plating/reinforced,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"qNM" = (
/obj/effect/turf_decal/stripes/line,
@@ -50865,7 +50558,13 @@
/turf/open/floor/iron/textured,
/area/station/maintenance/starboard/aft)
"rnm" = (
-/obj/machinery/monkey_recycler,
+/obj/machinery/light/directional/north,
+/obj/machinery/button/door/directional/north{
+ id = "xenobiomain";
+ name = "Containment Blast Doors";
+ req_access = list("xenobiology")
+ },
+/obj/machinery/computer/slime_market,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"rnp" = (
@@ -51000,17 +50699,11 @@
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"rpt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/corral_corner{
+ mapping_id = "5"
},
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio8";
- name = "Xenobio Pen 8 Blast Door"
- },
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 8";
- req_access = list("xenobiology")
+/obj/machinery/slime_pen_controller{
+ mapping_id = "5"
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -51067,17 +50760,8 @@
/area/station/ai_monitored/turret_protected/aisat/atmos)
"rpP" = (
/obj/machinery/camera/autoname/directional/north,
-/obj/structure/table/glass,
-/obj/item/paper_bin{
- pixel_y = 4
- },
-/obj/item/folder/white{
- pixel_y = 4
- },
-/obj/item/pen{
- pixel_y = 4
- },
/obj/structure/sign/warning/biohazard/directional/north,
+/obj/machinery/slime_market_pad,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"rpT" = (
@@ -52152,13 +51836,9 @@
/turf/open/floor/plating,
/area/station/security/prison/garden)
"rHD" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Science - Xenobiology, Pen 6";
- network = list("ss13","rd","xeno");
- name = "science camera";
- dir = 6
+/obj/machinery/light/neon_lining{
+ dir = 4
},
-/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"rHG" = (
@@ -52236,6 +51916,9 @@
network = list("ss13","rd","xeno");
name = "science camera"
},
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"rIR" = (
@@ -52283,7 +51966,6 @@
/area/station/maintenance/starboard/aft)
"rJM" = (
/obj/machinery/firealarm/directional/north,
-/obj/structure/table/glass,
/obj/item/stack/sheet/mineral/plasma{
pixel_x = -6;
pixel_y = 6
@@ -52305,6 +51987,7 @@
/obj/item/reagent_containers/dropper{
pixel_y = -4
},
+/obj/structure/table/reinforced/plasmarglass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"rKd" = (
@@ -52943,19 +52626,6 @@
/obj/effect/spawner/random/structure/chair_maintenance,
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"rWh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio3";
- name = "Xenobio Pen 3 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"rWp" = (
/obj/structure/chair,
/obj/effect/landmark/start/shaft_miner,
@@ -53601,14 +53271,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/evidence)
-"siS" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Science - Xenobiology, Pen 2";
- network = list("ss13","rd","xeno");
- name = "science camera"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"sjk" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/closet/emcloset,
@@ -53930,7 +53592,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/science/xenobiology/hallway)
"soB" = (
@@ -54373,7 +54034,6 @@
},
/area/station/command/gateway)
"sxx" = (
-/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
"sxJ" = (
@@ -55981,21 +55641,6 @@
},
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
-"taz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio1";
- name = "Xenobio Pen 1 Blast Door"
- },
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 1";
- req_access = list("xenobiology")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"taA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -56343,7 +55988,11 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"tgq" = (
/obj/machinery/door/firedoor/border_only{
@@ -56902,18 +56551,6 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"trf" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal/bin,
-/obj/structure/sign/warning/electric_shock/directional/west,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"trg" = (
/obj/machinery/light/small/directional/north,
/obj/structure/dresser,
@@ -58395,15 +58032,15 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"tSd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/camera/directional/east{
+ c_tag = "Xeniobiology - Xenobiology Computers";
+ name = "xenobiology camera";
+ network = list("ss13","xeno","rd")
},
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 7";
- req_access = list("xenobiology")
+/obj/machinery/light/neon_lining{
+ dir = 4
},
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"tSx" = (
/obj/structure/table,
@@ -58549,13 +58186,8 @@
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"tVD" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio4";
- name = "Xenobio Pen 4 Blast Door"
- },
-/turf/open/floor/plating/reinforced,
+/obj/machinery/duct,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"tVM" = (
/obj/effect/turf_decal/stripes/line{
@@ -58671,17 +58303,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
-"tXO" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal/bin,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"tXP" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -59206,21 +58827,6 @@
/obj/effect/landmark/navigate_destination/eva,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/command/storage/eva)
-"ugI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio6";
- name = "Xenobio Pen 6 Blast Door"
- },
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 6"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"ugN" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -60357,18 +59963,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
-"uyX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/obj/structure/sign/warning/electric_shock/directional/east,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"uze" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -60942,13 +60536,13 @@
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
"uKL" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
- name = "Xenobio Pen 2 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "2"
},
-/turf/open/floor/plating/reinforced,
+/obj/machinery/slime_pen_controller{
+ mapping_id = "2"
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"uKO" = (
/obj/effect/decal/cleanable/dirt,
@@ -61389,12 +60983,12 @@
/turf/open/floor/iron/dark/textured,
/area/station/command/gateway)
"uRW" = (
-/obj/structure/chair/comfy/black{
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "3";
dir = 1
},
-/obj/effect/landmark/start/scientist,
-/obj/machinery/duct,
-/turf/open/floor/iron/white,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"uSp" = (
/obj/effect/landmark/generic_maintenance_landmark,
@@ -61926,13 +61520,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 5"
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/obj/structure/cable,
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
+/turf/open/floor/carpet/neon/simple/green,
/area/station/science/xenobiology)
"vaO" = (
/obj/structure/table/wood,
@@ -62015,12 +61606,11 @@
/turf/open/floor/iron/dark,
/area/station/security/office)
"vbB" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Science - Xenobiology, Pen 3";
- network = list("ss13","rd","xeno");
- name = "science camera"
+/obj/machinery/duct,
+/obj/machinery/light/neon_lining{
+ dir = 4
},
-/turf/open/floor/engine,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"vbD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62710,7 +62300,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"vmA" = (
/obj/structure/reagent_dispensers/fueltank,
@@ -62722,10 +62315,6 @@
/obj/item/toy/plush/slimeplushie,
/turf/open/floor/wood,
/area/station/maintenance/starboard/fore)
-"vmU" = (
-/obj/machinery/duct,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"vmV" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
@@ -63038,13 +62627,11 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"vse" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/structure/disposaloutlet{
- dir = 4
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "2";
+ dir = 1
},
+/obj/machinery/light/floor/has_bulb,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"vsk" = (
@@ -64172,19 +63759,6 @@
/obj/effect/landmark/start/cook,
/turf/open/floor/iron/kitchen,
/area/station/service/kitchen)
-"vOh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xenobio6";
- name = "Xenobio Pen 6 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"vOj" = (
/obj/effect/turf_decal/box,
/obj/machinery/portable_atmospherics/pump,
@@ -64688,18 +64262,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
-"vVI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/window/right/directional/west{
- name = "Containment Pen 6";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/large,
-/area/station/science/xenobiology)
"vVN" = (
/obj/effect/turf_decal/tile/green/half/contrasted,
/obj/machinery/newscaster/directional/north,
@@ -65195,7 +64757,6 @@
"wgd" = (
/obj/machinery/light/directional/south,
/obj/item/radio/intercom/directional/south,
-/obj/structure/table/glass,
/obj/structure/microscope{
pixel_x = -1;
pixel_y = 2
@@ -65208,6 +64769,7 @@
pixel_x = 14;
pixel_y = 4
},
+/obj/structure/table/reinforced/plasmarglass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"wgn" = (
@@ -65243,27 +64805,9 @@
/obj/item/extinguisher,
/turf/open/floor/iron/white,
/area/station/science/xenobiology/hallway)
-"wgN" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio5";
- name = "Xenobio Pen 5 Blast Door"
- },
-/turf/open/floor/plating/reinforced,
-/area/station/science/xenobiology)
"wgR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio3";
- name = "Xenobio Pen 3 Blast Door"
- },
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Pen 3"
+/obj/machinery/corral_corner{
+ mapping_id = "2"
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -65830,13 +65374,13 @@
receive_ore_updates = 1;
supplies_requestable = 1
},
-/obj/structure/table/glass,
/obj/item/book/manual/wiki/cytology{
pixel_x = -4;
pixel_y = 4
},
/obj/item/book/manual/wiki/plumbing,
/obj/item/storage/box/petridish,
+/obj/structure/table/reinforced/plasmarglass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"wrx" = (
@@ -66472,15 +66016,6 @@
/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron/dark,
/area/station/security/execution)
-"wDL" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio3";
- name = "Xenobio Pen 3 Blast Door"
- },
-/turf/open/floor/plating/reinforced,
-/area/station/science/xenobiology)
"wDM" = (
/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
@@ -66509,11 +66044,9 @@
/obj/item/storage/box/syringes{
pixel_y = 5
},
-/obj/item/storage/box/monkeycubes{
- pixel_x = 2;
- pixel_y = -2
+/obj/machinery/reagentgrinder{
+ pixel_y = 8
},
-/obj/item/storage/box/monkeycubes,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"wEs" = (
@@ -66879,10 +66412,6 @@
dir = 6
},
/area/station/commons/dorms)
-"wKd" = (
-/mob/living/simple_animal/slime,
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"wKg" = (
/obj/effect/spawner/random/structure/table_or_rack,
/obj/effect/spawner/random/maintenance/two,
@@ -67290,18 +66819,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"wQh" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio9";
- name = "Xenobio Pen 9 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating/reinforced,
-/area/station/science/xenobiology)
"wQk" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -67371,11 +66888,6 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"wRH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/machinery/duct,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science/xenobiology)
"wRJ" = (
/obj/effect/turf_decal/box,
/obj/machinery/holopad,
@@ -67398,7 +66910,9 @@
/turf/closed/wall,
/area/station/maintenance/starboard/fore)
"wSl" = (
-/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"wSn" = (
@@ -68775,7 +68289,6 @@
/area/station/tcommsat/server)
"xsC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"xsR" = (
@@ -69104,7 +68617,6 @@
/area/station/engineering/storage/tech)
"xxX" = (
/obj/machinery/light/small/directional/east,
-/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
"xyc" = (
@@ -70158,7 +69670,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"xRO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -71235,13 +70748,10 @@
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
"yiC" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio9";
- name = "Xenobio Pen 9 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "5"
},
-/turf/open/floor/plating/reinforced,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"yiI" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
@@ -112704,7 +112214,7 @@ hOU
hOU
hOU
xxX
-wRH
+gXk
cDv
oMK
oMK
@@ -113203,20 +112713,20 @@ tdv
aaN
cDv
pwn
-ohk
-dYt
+wSl
+abS
+wSl
+pwn
arL
-ohk
-dYt
wSl
-ohk
-rIN
wSl
+rIN
+arL
ohk
-jje
+wSl
+abS
wSl
ohk
-nJb
wtF
xsC
xsC
@@ -113460,23 +112970,23 @@ ajt
mCg
cDv
dYt
-mvz
dYt
-wSl
-mvz
+gmo
+dYt
+dYt
+dYt
+dYt
+dYt
dYt
-wSl
-mvz
dYt
-wSl
-wKd
dYt
-wSl
-mvz
+dYt
+gmo
+dYt
dYt
wtF
dwq
-vmU
+bIc
bIc
dzj
bIc
@@ -113719,21 +113229,21 @@ cDv
dYt
dYt
kEN
-wSl
-dYt
-kEN
-wSl
+tVD
+tVD
+tVD
+tVD
+uRW
dYt
-kEN
-lmK
dYt
dYt
+tVD
lmK
dYt
dYt
wtF
gpi
-uRW
+wPA
rph
xTL
lNG
@@ -113974,23 +113484,23 @@ sfh
gzR
wtF
yiC
-jWq
-wQh
-hvv
+dYt
+dYt
+dYt
rpt
pBX
-wgN
-lUf
-mtj
+tVD
+dYt
+dYt
kQP
iJI
tVD
-kVq
-taz
+dYt
+dYt
kPJ
wtF
nNV
-peN
+rph
rph
dzj
bIc
@@ -114230,26 +113740,26 @@ ntI
sfh
jKn
wtF
-jGx
-gZg
-trf
-oaA
kLj
-trf
+kLj
+kLj
+kLj
+kLj
+kLj
arJ
vaG
-tXO
-fDu
-hZI
-bQH
-fDu
-jXV
-aQd
+kLj
+kLj
+kLj
+arJ
+kLj
+kLj
+kLj
wtF
rJM
-peN
+rph
bIc
-dzj
+fFr
doR
sEO
sEO
@@ -114487,26 +113997,26 @@ qpO
sfh
eTt
gOv
-bIc
-dzj
-bIc
+deQ
+deQ
+deQ
vmu
-bIc
-bIc
-bIc
-dzj
-bIc
-bIc
-bIc
+deQ
+deQ
+kVq
+deQ
+deQ
+deQ
+deQ
tgl
-bIc
-dzj
-bIc
+deQ
+deQ
+deQ
gOv
bIc
-fYf
+gAj
eTt
-dzj
+fFr
cTs
sEO
gTp
@@ -114759,12 +114269,12 @@ xRJ
xRJ
fnI
xRJ
-bXQ
-xRJ
+peN
+qjq
qjq
rYV
hyd
-hyd
+nJb
vhh
sos
cot
@@ -115001,26 +114511,26 @@ iqb
feY
lNG
gOv
-bIc
-dzj
-bIc
+jWq
+jWq
+jWq
iUz
-bIc
-bIc
-bIc
-dzj
-bIc
-bIc
-bIc
+jWq
+jWq
+vbB
+jWq
+jWq
+jWq
+jWq
gTL
-bIc
-dzj
-bIc
+jWq
+jWq
+jWq
gOv
bIc
gAj
lNG
-dzj
+fFr
lns
sEO
wgM
@@ -115259,25 +114769,25 @@ mIP
jZt
wtF
jLQ
-kVf
-uyX
-miO
-tSd
-uyX
-iRM
-vVI
-vOh
-hrA
-fFr
-rWh
-hrA
-deQ
+kLj
+kLj
+kLj
+kLj
+kLj
+arJ
+vaG
+kLj
+kLj
+kLj
+arJ
+kLj
+kLj
nax
wtF
-rnm
-ifN
bIc
-dzj
+ifN
+jXV
+fFr
hqM
sEO
sEO
@@ -115516,19 +115026,19 @@ xTL
bHS
wtF
qNL
-brC
-gmo
-abS
+dYt
+dYt
+dYt
cOo
iwr
-kmM
-ugI
-fLw
+tVD
+dYt
+dYt
iwO
wgR
-wDL
-fcs
-csD
+tVD
+dYt
+dYt
uKL
wtF
wDY
@@ -115775,21 +115285,21 @@ cDv
dYt
dYt
dnc
-wSl
-dYt
-dnc
-vse
-dYt
+tVD
+tVD
+tVD
+tVD
+jGx
dYt
-vse
dYt
dYt
+tVD
vse
dYt
dYt
wtF
-gpi
-wPA
+rnm
+bIc
ifN
qds
eTt
@@ -116030,19 +115540,19 @@ iIy
uio
cDv
dYt
-mvz
dYt
-wSl
-mvz
+gmo
+dYt
+dYt
+dYt
dYt
-wSl
-wKd
dYt
-wSl
-wKd
dYt
-wSl
-mvz
+dYt
+dYt
+dYt
+gmo
+dYt
dYt
wtF
rpP
@@ -116287,20 +115797,20 @@ dmt
rGH
cDv
oak
-mhS
-dYt
+rHD
+tSd
+rHD
+oak
gLB
-mhS
-dYt
rHD
+tSd
+rHD
+gLB
mhS
-dYt
-wSl
-mhS
-vbB
-wSl
+rHD
+tSd
+rHD
mhS
-siS
wtF
bIc
bIc
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index a74120117135..ad46d78631c0 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -235,8 +235,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"acG" = (
/obj/structure/table/reinforced,
@@ -2627,6 +2631,13 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"aDe" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"aDg" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate{
@@ -2644,14 +2655,13 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"aDR" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/button/door{
- id = "xeno4";
- name = "Containment Control";
- req_access = list("xenobiology")
+/obj/machinery/corral_corner{
+ mapping_id = "1"
},
-/turf/open/floor/iron,
+/obj/machinery/slime_pen_controller{
+ mapping_id = "1"
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"aDZ" = (
/obj/machinery/door/firedoor,
@@ -4872,21 +4882,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
-"bgH" = (
-/obj/machinery/door/window/brigdoor{
- dir = 1;
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xeno2";
- name = "Creature Cell #2"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"bgK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line,
@@ -5474,17 +5469,6 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron,
/area/station/command/gateway)
-"bnd" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/button/door{
- id = "xeno3";
- name = "Containment Control";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"bnt" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -7228,21 +7212,6 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"bIh" = (
-/obj/machinery/door/window/brigdoor{
- dir = 1;
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno4";
- name = "Creature Cell #4"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"bIk" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -8662,18 +8631,6 @@
},
/turf/open/floor/carpet/blue,
/area/station/commons/dorms)
-"bXL" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"bXX" = (
/obj/structure/bookcase/random/fiction,
/obj/effect/turf_decal/siding/wood{
@@ -10378,18 +10335,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
-"csY" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 1
- },
-/obj/machinery/camera/directional/south{
- c_tag = "Xenobiology - Cell 8";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
- },
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"ctw" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=engi1";
@@ -10414,11 +10359,6 @@
/obj/effect/turf_decal/trimline/purple,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"ctW" = (
-/obj/structure/cable,
-/mob/living/simple_animal/slime,
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"cug" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -11435,15 +11375,6 @@
/obj/effect/landmark/navigate_destination/incinerator,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"cGA" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno6";
- name = "Creature Cell #6"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"cGJ" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -12721,6 +12652,10 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"cYh" = (
@@ -12961,15 +12896,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
-"dbo" = (
-/obj/effect/landmark/event_spawn,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/iron/white/textured,
-/area/station/science/xenobiology)
"dbw" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -13155,9 +13081,8 @@
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
"ddW" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners,
-/turf/open/floor/iron/dark,
+/obj/machinery/camera/directional/west,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"dea" = (
/obj/structure/table,
@@ -14363,15 +14288,13 @@
/turf/open/floor/iron,
/area/station/science/circuits)
"duq" = (
-/obj/structure/disposaloutlet{
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "1";
dir = 1
},
-/obj/structure/disposalpipe/trunk,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/machinery/light/floor/has_bulb,
+/mob/living/basic/slime,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"dux" = (
/obj/structure/table,
@@ -14711,11 +14634,8 @@
/area/station/security/brig)
"dxU" = (
/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/iron/white/textured,
+/obj/machinery/duct,
+/turf/open/floor/glass/reinforced,
/area/station/science/xenobiology)
"dxV" = (
/obj/effect/decal/cleanable/dirt,
@@ -15654,18 +15574,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"dLh" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 8
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Xenobiology - Cell 3";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
- },
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"dLq" = (
/obj/machinery/porta_turret/ai,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -16842,11 +16750,13 @@
/area/station/service/kitchen)
"eaO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"eaQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -18207,10 +18117,12 @@
/turf/open/floor/iron,
/area/station/cargo/sorting)
"esm" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners,
-/turf/open/floor/iron/dark,
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "4"
+ },
+/obj/machinery/light/floor/has_bulb,
+/mob/living/basic/slime,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"eso" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning,
@@ -18513,6 +18425,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
+"evj" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"evp" = (
/obj/machinery/computer/records/medical{
dir = 8
@@ -22622,6 +22541,8 @@
},
/obj/item/storage/box/petridish,
/obj/effect/turf_decal/siding/purple,
+/obj/item/vacuum_pack,
+/obj/item/vacuum_pack,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"fva" = (
@@ -22974,6 +22895,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"fzv" = (
@@ -23673,6 +23597,8 @@
name = "xenobiology camera";
network = list("ss13","xeno","rd")
},
+/obj/item/disk/vacuum_upgrade/biomass,
+/obj/item/disk/vacuum_upgrade/biomass,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"fIY" = (
@@ -23906,9 +23832,7 @@
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
"fMl" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"fMn" = (
/obj/effect/turf_decal/tile/neutral{
@@ -24030,22 +23954,11 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"fNY" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno3";
- name = "Creature Cell #3"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"fOp" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 4
+/obj/machinery/corral_corner{
+ mapping_id = "3"
},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"fOw" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -24937,6 +24850,13 @@
/obj/structure/sink/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"fZo" = (
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/obj/structure/cable,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"fZp" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/blue/filled/warning{
@@ -25060,21 +24980,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"gbj" = (
-/obj/machinery/door/window/brigdoor{
- dir = 1;
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno3";
- name = "Creature Cell #3"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"gbo" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/table/wood,
@@ -25620,15 +25525,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
-"ghQ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno1";
- name = "Creature Cell #1"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"ghU" = (
/obj/structure/rack,
/obj/item/book/manual/wiki/engineering_hacking{
@@ -26883,6 +26779,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"gvX" = (
+/obj/machinery/duct,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"gwd" = (
/obj/machinery/washing_machine,
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
@@ -27473,16 +27373,6 @@
/obj/structure/displaycase_chassis,
/turf/open/floor/wood/large,
/area/station/service/library/abandoned)
-"gDU" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno7";
- name = "Creature Cell #7"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"gDV" = (
/turf/closed/wall,
/area/station/service/library/lounge)
@@ -27538,16 +27428,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"gED" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno1";
- name = "Creature Cell #1"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"gEF" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -29118,15 +28998,6 @@
},
/turf/open/space/basic,
/area/space)
-"gZx" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno8";
- name = "Creature Cell #8"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"gZz" = (
/obj/structure/table/wood,
/obj/item/folder/red,
@@ -31489,14 +31360,6 @@
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/turf/open/floor/iron/freezer,
/area/station/service/kitchen/coldroom)
-"hFS" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/white/textured,
-/area/station/science/xenobiology)
"hFZ" = (
/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/syringe/antiviral,
@@ -32015,7 +31878,6 @@
name = "xenobiology camera";
network = list("ss13","xeno","rd")
},
-/obj/structure/chair/office/light,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron,
@@ -34532,6 +34394,13 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/storage)
+"irh" = (
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/obj/structure/cable,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"irl" = (
/turf/closed/wall/r_wall,
/area/station/service/lawoffice)
@@ -36070,6 +35939,10 @@
"iLr" = (
/turf/closed/wall,
/area/station/service/theater/abandoned)
+"iLv" = (
+/obj/structure/cable,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"iLB" = (
/obj/structure/sign/directions/evac{
pixel_y = -8
@@ -36838,21 +36711,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/quartermaster)
-"iWX" = (
-/obj/machinery/door/window/brigdoor{
- dir = 1;
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xeno1";
- name = "Creature Cell #1"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"iXc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -38880,16 +38738,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"juv" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno4";
- name = "Creature Cell #4"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"juC" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -40269,17 +40117,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay)
-"jKZ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xeno7";
- name = "Containment Control";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"jLa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/green{
@@ -40466,15 +40303,13 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"jNn" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xeno8";
- name = "Containment Control";
- req_access = list("xenobiology")
+/obj/machinery/corral_corner{
+ mapping_id = "3"
},
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/machinery/slime_pen_controller{
+ mapping_id = "3"
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"jNx" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -43728,15 +43563,6 @@
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"kBO" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno2";
- name = "Creature Cell #2"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"kBR" = (
/obj/machinery/door/window{
dir = 8;
@@ -45041,14 +44867,6 @@
"kSu" = (
/turf/closed/wall,
/area/station/command/teleporter)
-"kSA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"kSB" = (
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/light/small/directional/west,
@@ -45298,13 +45116,6 @@
/obj/structure/sign/poster/contraband/random/directional/south,
/turf/open/floor/plating,
/area/station/service/kitchen/abandoned)
-"kWi" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"kWv" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -45499,16 +45310,6 @@
"kYn" = (
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den/gaming)
-"kYq" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno5";
- name = "Creature Cell #5"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"kYu" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
@@ -45665,6 +45466,14 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
+"laX" = (
+/obj/machinery/camera/directional/east{
+ c_tag = "Xeniobiology - Xenobiology Computers";
+ name = "xenobiology camera";
+ network = list("ss13","xeno","rd")
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"lbi" = (
/obj/structure/lattice/catwalk,
/obj/structure/transit_tube/curved/flipped{
@@ -45843,9 +45652,11 @@
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain)
"lcK" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"lcO" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -49656,13 +49467,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/safe)
-"lYw" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"lYJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -49837,13 +49641,10 @@
/turf/open/floor/iron,
/area/station/medical/pathology)
"mca" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
+/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"mck" = (
/obj/structure/chair/office,
@@ -51353,6 +51154,7 @@
dir = 8
},
/obj/effect/landmark/start/hangover,
+/obj/machinery/slime_extract_requestor,
/turf/open/floor/iron/white,
/area/station/science/lobby)
"muW" = (
@@ -53514,8 +53316,8 @@
/turf/open/floor/grass,
/area/station/medical/psychology)
"mVe" = (
-/obj/machinery/processor/slime,
/obj/effect/turf_decal/bot_red,
+/obj/machinery/plumbing/ooze_compressor,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"mVi" = (
@@ -53620,16 +53422,6 @@
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/station/engineering/supermatter)
-"mWy" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno2";
- name = "Creature Cell #2"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"mWB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -53832,16 +53624,6 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/maintenance/port)
-"mZd" = (
-/obj/machinery/door/window/brigdoor{
- dir = 1;
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"mZj" = (
/obj/machinery/atmospherics/components/trinary/mixer{
color = "#FFFF00";
@@ -54015,17 +53797,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/warden)
-"nbo" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/button/door{
- id = "xeno2";
- name = "Containment Control";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"nbv" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
@@ -54138,15 +53909,6 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/dark/textured_large,
/area/station/engineering/atmos/storage/gas)
-"ncJ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno4";
- name = "Creature Cell #4"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"ncQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -54292,18 +54054,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
-"nfT" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 1
- },
-/obj/machinery/camera/directional/south{
- c_tag = "Xenobiology - Cell 6";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
- },
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"nfX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -54595,20 +54345,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"nkj" = (
-/obj/machinery/door/window/brigdoor{
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno6";
- name = "Creature Cell #6"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"nkn" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
@@ -55461,11 +55197,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison)
-"nwV" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/sign/warning/secure_area/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"nwW" = (
/obj/structure/sign/nanotrasen{
pixel_x = -32
@@ -55756,12 +55487,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"nzt" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"nzw" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/bot,
@@ -56915,25 +56640,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
-"nNR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno5";
- name = "Creature Cell #5"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
-"nNT" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno6";
- name = "Creature Cell #6"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"nNU" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/firealarm/directional/south,
@@ -57792,13 +57498,10 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"nYS" = (
-/obj/machinery/door/window/brigdoor{
- name = "Creature Pen";
- req_access = list("research")
+/obj/machinery/corral_corner{
+ mapping_id = "1"
},
-/obj/structure/cable,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"nYV" = (
/obj/effect/turf_decal/tile/yellow{
@@ -58896,6 +58599,13 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"omu" = (
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/obj/structure/cable,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"omv" = (
/obj/structure/table,
/obj/item/flashlight/lamp,
@@ -59612,17 +59322,6 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/port)
-"oyp" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xeno6";
- name = "Containment Control";
- req_access = list("xenobiology")
- },
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"oyy" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
@@ -61017,6 +60716,14 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/medical/medsci)
+"oQS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"oRk" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -62084,6 +61791,13 @@
/obj/structure/closet/l3closet/virology,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"pff" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"pfh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62617,15 +62331,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/main)
-"pla" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno7";
- name = "Creature Cell #7"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"plh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -62722,18 +62427,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"pmw" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 8
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Xenobiology - Cell 1";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
- },
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"pmz" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -63714,6 +63407,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"pAi" = (
+/obj/structure/cable,
+/obj/machinery/duct,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"pAs" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -63842,16 +63541,6 @@
/obj/machinery/atm,
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"pBB" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno3";
- name = "Creature Cell #3"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"pBH" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -63966,14 +63655,12 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"pDf" = (
-/obj/machinery/computer/camera_advanced/xenobio{
- dir = 1
- },
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
/obj/structure/sign/xenobio_guide/directional/south,
+/obj/machinery/slime_market_pad,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"pDi" = (
@@ -64013,6 +63700,10 @@
/area/station/engineering/atmos)
"pDM" = (
/obj/structure/cable,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"pDS" = (
@@ -65176,12 +64867,13 @@
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
"pQz" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 4
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "2";
+ dir = 1
},
-/turf/open/floor/iron/dark,
+/obj/machinery/light/floor/has_bulb,
+/mob/living/basic/slime,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"pQN" = (
/obj/machinery/duct,
@@ -65247,13 +64939,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
-"pRz" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"pRG" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/obj/effect/spawner/random/engineering/tracking_beacon,
@@ -65814,17 +65499,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den/gaming)
-"pWL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"pWO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -67377,16 +67051,6 @@
/obj/structure/chair/stool/bar/directional/south,
/turf/open/floor/carpet/green,
/area/station/commons/lounge)
-"qrU" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/white/textured_large,
-/area/station/science/xenobiology)
"qrY" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -69702,6 +69366,12 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
+"qUa" = (
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"qUi" = (
/obj/structure/disposalpipe/sorting/mail{
name = "Engineering Junction"
@@ -70571,18 +70241,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
-"rhi" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"rhw" = (
/obj/structure/chair/office/light{
dir = 8
@@ -73244,11 +72902,13 @@
/turf/open/floor/plating,
/area/station/science/research)
"rOY" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "4"
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"rPc" = (
/obj/effect/turf_decal/stripes/line{
@@ -73741,20 +73401,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"rUl" = (
-/obj/machinery/door/window/brigdoor{
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno8";
- name = "Creature Cell #8"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"rUn" = (
/obj/structure/sign/departments/science/directional/west,
/obj/effect/turf_decal/tile/purple{
@@ -74676,10 +74322,6 @@
},
/turf/open/floor/engine/vacuum,
/area/station/engineering/atmos)
-"shO" = (
-/obj/structure/cable,
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"shP" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
@@ -75726,13 +75368,6 @@
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"svD" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"svI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -76192,16 +75827,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
/turf/open/floor/plating,
/area/station/engineering/atmos/mix)
-"sBt" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno8";
- name = "Creature Cell #8"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"sBE" = (
/obj/machinery/door/firedoor/heavy,
/obj/effect/turf_decal/stripes/line{
@@ -78256,12 +77881,12 @@
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
"sZi" = (
-/obj/machinery/smartfridge/extract/preloaded,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
/obj/machinery/light/directional/south,
+/obj/machinery/computer/slime_market,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"sZn" = (
@@ -78347,8 +77972,8 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"taL" = (
/obj/structure/table/wood,
@@ -78500,6 +78125,13 @@
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
+"tcQ" = (
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/obj/structure/cable,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"tcT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -79343,6 +78975,11 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
+"tpS" = (
+/obj/structure/cable,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"tpZ" = (
/turf/closed/wall,
/area/station/maintenance/starboard/fore)
@@ -80488,9 +80125,6 @@
/turf/open/floor/iron/large,
/area/station/science/research)
"tDG" = (
-/obj/machinery/computer/camera_advanced/xenobio{
- dir = 1
- },
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
@@ -80507,6 +80141,7 @@
pixel_x = -6;
req_access = list("science")
},
+/obj/machinery/smartfridge/extract/preloaded,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"tDK" = (
@@ -81099,10 +80734,7 @@
/area/station/medical/medbay)
"tLp" = (
/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/glass/reinforced,
/area/station/science/xenobiology)
"tLx" = (
/obj/structure/cable,
@@ -83592,16 +83224,6 @@
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"uoY" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/end{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/iron/white/textured_large,
-/area/station/science/xenobiology)
"upe" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/stripes/line{
@@ -83742,18 +83364,6 @@
"urt" = (
/turf/closed/wall/r_wall,
/area/station/science/circuits)
-"urx" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"urH" = (
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
@@ -84326,11 +83936,6 @@
/obj/machinery/vending/dinnerware,
/turf/open/floor/iron/dark,
/area/station/service/kitchen)
-"uyy" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/sign/warning/secure_area/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"uyB" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/obj/effect/turf_decal/stripes/line{
@@ -84776,15 +84381,6 @@
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/station/service/chapel/funeral)
-"uDQ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"uDR" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
@@ -85886,6 +85482,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"uSs" = (
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"uSL" = (
/obj/effect/turf_decal/box/white{
color = "#9FED58"
@@ -90180,13 +89784,13 @@
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
"vVD" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
+/obj/machinery/corral_corner{
+ mapping_id = "2"
},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/machinery/slime_pen_controller{
+ mapping_id = "2"
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"vVH" = (
/obj/effect/turf_decal/tile/yellow{
@@ -91889,17 +91493,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"wox" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- id = "xeno5";
- name = "Containment Control";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"woB" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/delivery,
@@ -92241,8 +91834,13 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"wsd" = (
-/obj/machinery/monkey_recycler,
/obj/effect/turf_decal/bot_red,
+/obj/machinery/biomass_recycler,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"wse" = (
@@ -92354,6 +91952,12 @@
},
/turf/open/floor/iron/dark,
/area/station/service/theater)
+"wts" = (
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"wtv" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
@@ -92780,6 +92384,14 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"wxz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"wxF" = (
/obj/structure/chair/office,
/obj/structure/sign/poster/random/directional/north,
@@ -93501,17 +93113,6 @@
},
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
-"wFX" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/button/door{
- id = "xeno1";
- name = "Containment Control";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"wGa" = (
/obj/structure/disposalpipe/junction{
dir = 8
@@ -96174,15 +95775,12 @@
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"xsN" = (
-/obj/structure/disposaloutlet,
-/obj/structure/disposalpipe/trunk{
- dir = 1
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "3"
},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 8
- },
-/turf/open/floor/iron/dark,
+/obj/machinery/light/floor/has_bulb,
+/mob/living/basic/slime,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"xsP" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -96689,13 +96287,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"xzo" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"xzq" = (
/obj/structure/table/reinforced,
/obj/item/computer_disk/ordnance{
@@ -97100,7 +96691,6 @@
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
"xDz" = (
-/obj/structure/chair/office/light,
/obj/structure/sign/warning/secure_area/directional/west,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 8
@@ -99058,20 +98648,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"ycY" = (
-/obj/machinery/door/window/brigdoor{
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno5";
- name = "Creature Cell #5"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"ydb" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/red{
@@ -99345,20 +98921,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"ygV" = (
-/obj/machinery/door/window/brigdoor{
- name = "Creature Pen";
- req_access = list("research")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xeno7";
- name = "Creature Cell #7"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"ygW" = (
/obj/machinery/vending/hydroseeds,
/obj/effect/turf_decal/bot,
@@ -120991,18 +120553,18 @@ qZb
dhB
gwK
pTC
-nzt
-nwV
-lYw
-ncJ
+nYS
+fMl
+ddW
+fMl
aDR
-jKx
-rTW
+oQS
+tpS
taA
jNn
-gZx
+fMl
ddW
-nwV
+fMl
fOp
mAt
ifk
@@ -121248,19 +120810,19 @@ uTb
hHK
kGj
mQO
+iLv
fMl
-shO
fMl
-bIh
-nYS
-rhi
+fMl
+fMl
+oQS
tLp
-pWL
-mZd
-rUl
+taA
+fMl
fMl
-ctW
fMl
+fMl
+iLv
oVW
oUe
jET
@@ -121505,19 +121067,19 @@ qZb
feF
gcr
pTC
-kWi
-sfN
+iLv
+gvX
duq
-juv
-vVD
-eaO
-uoY
-acD
-rOY
-sBt
+fMl
+fMl
+oQS
+tLp
+taA
+fMl
+fMl
xsN
-sfN
-csY
+gvX
+iLv
mAt
aAx
nxt
@@ -121762,19 +121324,19 @@ pTC
hhS
iQF
pTC
-svD
-lcK
-pQz
-fNY
-bnd
-eaO
-hFS
-acD
-jKZ
-pla
-esm
-lcK
-mca
+iLv
+gvX
+fMl
+fMl
+fMl
+oQS
+tLp
+taA
+fMl
+fMl
+fMl
+gvX
+iLv
mAt
xIw
pVk
@@ -122019,19 +121581,19 @@ pTC
hWk
gcr
mQO
+tcQ
+gvX
fMl
-shO
fMl
-gbj
nYS
-uDQ
-dxU
-kSA
-mZd
-ygV
+oQS
+tLp
+taA
+fOp
fMl
-shO
fMl
+gvX
+fZo
oVW
wFP
pKd
@@ -122276,19 +121838,19 @@ pTC
ezY
iQF
pTC
-dLh
-sfN
-duq
-pBB
-vVD
+evj
+uSs
+uSs
+uSs
+uSs
eaO
dxU
acD
-rOY
-gDU
-xsN
-sfN
-pRz
+uSs
+uSs
+uSs
+uSs
+evj
mAt
udV
qYr
@@ -122533,19 +122095,19 @@ pTC
elH
iQF
pTC
-svD
+pff
lcK
-pQz
-kBO
-nbo
-eaO
+mca
+mca
+mca
+wxz
dxU
-acD
-oyp
-cGA
-esm
-lcK
+aDe
+mca
mca
+mca
+lcK
+pff
mAt
ilU
qYr
@@ -122790,19 +122352,19 @@ pTC
eDZ
rrU
mQO
+irh
+gvX
fMl
-shO
fMl
-bgH
-nYS
-uDQ
+wts
+oQS
dxU
-kSA
-mZd
-nkj
+taA
+qUa
fMl
-ctW
fMl
+gvX
+omu
oVW
fmi
qYr
@@ -123047,19 +122609,19 @@ pTC
woj
qcM
pTC
-kWi
-sfN
-duq
-mWy
-vVD
-eaO
-dbo
-acD
-rOY
-nNT
-xsN
-sfN
-nfT
+iLv
+gvX
+fMl
+fMl
+fMl
+oQS
+dxU
+taA
+fMl
+fMl
+fMl
+gvX
+iLv
mAt
kzt
xQq
@@ -123304,19 +122866,19 @@ pTC
woj
rrU
pTC
-svD
-lcK
+iLv
+gvX
pQz
-ghQ
-wFX
-eaO
-qrU
-acD
-wox
-nNR
+fMl
+fMl
+oQS
+dxU
+taA
+fMl
+fMl
esm
-lcK
-mca
+gvX
+iLv
mAt
cZl
mPF
@@ -123561,19 +123123,19 @@ pTC
eDZ
rwI
mQO
+iLv
fMl
-ctW
fMl
-iWX
-nYS
-bXL
-xzo
-urx
-mZd
-ycY
fMl
-shO
fMl
+oQS
+dxU
+taA
+fMl
+fMl
+fMl
+fMl
+iLv
oVW
oTD
dOO
@@ -123818,19 +123380,19 @@ pTC
aMM
fwJ
pTC
-pmw
-uyy
-duq
-gED
+wts
+fMl
+laX
+fMl
vVD
-jKx
-rTW
+oQS
+pAi
taA
rOY
-kYq
-xsN
-uyy
-pRz
+fMl
+laX
+fMl
+qUa
mAt
iIn
srI
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index af37b013b6a6..654803b415a7 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -176,13 +176,6 @@
/obj/effect/turf_decal/tile/green,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
-"aey" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Pens - Starboard Fore";
- network = list("ss13","rd","xeno")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"aez" = (
/obj/structure/table,
/obj/item/clothing/mask/gas,
@@ -1048,17 +1041,6 @@
/obj/item/storage/crayons,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"asb" = (
-/obj/structure/sink/directional/west,
-/obj/structure/cable,
-/obj/machinery/button/door/directional/east{
- id = "xenobio10";
- layer = 4;
- name = "Xenobio Pen 10 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"asg" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance/two,
@@ -1138,6 +1120,14 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"atw" = (
+/obj/machinery/camera/directional/east{
+ c_tag = "Xeniobiology - Xenobiology Computers";
+ name = "xenobiology camera";
+ network = list("ss13","xeno","rd")
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"aty" = (
/obj/structure/urinal/directional/north,
/obj/effect/landmark/start/hangover,
@@ -1429,13 +1419,6 @@
},
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/captain)
-"axD" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"axF" = (
/obj/effect/spawner/random/structure/billboard/nanotrasen,
/turf/open/lava/plasma/ice_moon,
@@ -1881,15 +1864,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/open/floor/iron,
/area/mine/laborcamp)
-"aHz" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio4";
- name = "Xenobio Pen 4 Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"aHC" = (
/obj/machinery/light/directional/south,
/obj/machinery/power/apc/auto_name/directional/south,
@@ -1990,6 +1964,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"aIV" = (
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "1"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"aJh" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
@@ -2123,15 +2106,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"aLA" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio7";
- name = "Xenobio Pen 7 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"aLJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -2686,6 +2660,10 @@
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/plating,
/area/station/maintenance/starboard/upper)
+"aUq" = (
+/mob/living/basic/slime,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"aUr" = (
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2907,7 +2885,6 @@
/area/station/ai_monitored/turret_protected/aisat/hallway)
"aXY" = (
/obj/structure/rack,
-/obj/item/circuitboard/machine/monkey_recycler,
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
@@ -3674,19 +3651,6 @@
/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/medical)
-"bjn" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 11";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio11";
- name = "Xenobio Pen 11 Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"bjp" = (
/turf/open/floor/iron/dark/textured_edge{
dir = 4
@@ -3907,19 +3871,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/aft)
-"bnh" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 7";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio7";
- name = "Xenobio Pen 7 Blast Door"
- },
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"bnl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5433,17 +5384,6 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"bKI" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"bKN" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Control"
@@ -5659,6 +5599,11 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
+"bOq" = (
+/obj/structure/railing,
+/obj/machinery/slime_extract_requestor,
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"bOu" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -6064,17 +6009,11 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bUK" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio5";
- name = "Xenobio Pen 5 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "5"
},
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 5";
- req_access = list("xenobiology")
+/obj/machinery/slime_pen_controller{
+ mapping_id = "5"
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -7185,14 +7124,7 @@
/turf/open/floor/iron,
/area/station/science/ordnance/testlab)
"clW" = (
-/obj/structure/cable,
-/obj/machinery/button/door/directional/west{
- id = "xenobio1";
- layer = 4;
- name = "Xenobio Pen 1 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"cma" = (
/obj/structure/closet/firecloset,
@@ -7910,9 +7842,13 @@
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
"cyh" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/obj/machinery/light/floor/has_bulb,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"cyo" = (
/obj/machinery/stasis{
@@ -8821,8 +8757,10 @@
/turf/open/floor/iron/dark/side,
/area/station/security/processing)
"cKA" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- pixel_y = 2
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology - Secure Cell Interior";
+ name = "xenobiology camera";
+ network = list("ss13","xeno","rd")
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -9060,18 +8998,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
-"cNI" = (
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio7";
- name = "Xenobio Pen 7 Blast Door"
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"cNQ" = (
/obj/structure/closet/wardrobe/grey,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -9627,20 +9553,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"cXX" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 11";
- req_access = list("xenobiology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"cXZ" = (
/obj/structure/table/wood,
/obj/machinery/computer/security/wooden_tv,
@@ -10567,15 +10479,8 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"dmj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/machinery/button/door/directional/east{
- id = "xenobio11";
- layer = 4;
- name = "Xenobio Pen 11 Blast DOors";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"dms" = (
/obj/structure/closet/crate,
@@ -10710,15 +10615,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"doK" = (
-/obj/machinery/button/door/directional/east{
- id = "xenobio8";
- layer = 4;
- name = "Xenobio Pen 8 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"doT" = (
/obj/item/hand_labeler,
/obj/item/assembly/timer,
@@ -11932,19 +11828,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/garden)
-"dIS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio3";
- name = "Xenobio Pen 3 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/structure/sign/warning/electric_shock,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"dIZ" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -11954,13 +11837,13 @@
/turf/open/floor/iron/dark,
/area/station/medical/pathology)
"dJx" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio3";
- name = "Xenobio Pen 3 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "3"
},
-/turf/open/floor/plating,
+/obj/machinery/slime_pen_controller{
+ mapping_id = "3"
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"dJy" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
@@ -12070,12 +11953,10 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"dLr" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/disposaloutlet{
- dir = 4
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "4";
+ dir = 1;
+ pixel_y = 0
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -12299,16 +12180,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningdock)
-"dPy" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Kill Chamber";
- network = list("ss13","rd","xeno")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/turf/open/floor/iron/freezer,
-/area/station/science/xenobiology)
"dPP" = (
/obj/structure/closet/toolcloset,
/turf/open/floor/plating,
@@ -12353,20 +12224,6 @@
/obj/structure/sign/departments/rndserver/directional/south,
/turf/open/floor/iron/white,
/area/station/science/research)
-"dQZ" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 9";
- req_access = list("xenobiology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"dRc" = (
/obj/structure/table,
/obj/machinery/firealarm/directional/west,
@@ -14874,7 +14731,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/turf/open/floor/iron/freezer,
+/turf/closed/wall/r_wall,
/area/station/science/xenobiology)
"eGW" = (
/obj/effect/turf_decal/tile/red{
@@ -15796,21 +15653,6 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron,
/area/station/command/heads_quarters/hop)
-"eWh" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 2";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
- name = "Xenobio Pen 2 Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"eWi" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/landmark/event_spawn,
@@ -16298,10 +16140,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"ffz" = (
-/obj/machinery/processor/slime,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"ffQ" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 10
@@ -16535,19 +16373,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/grimy,
/area/station/maintenance/aft/greater)
-"fjt" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 9";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio9";
- name = "Xenobio Pen 9 Blast Door"
- },
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"fjw" = (
/obj/machinery/smartfridge,
/turf/closed/wall,
@@ -16692,9 +16517,11 @@
/turf/open/lava/plasma/ice_moon,
/area/icemoon/underground/explored)
"fma" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
+/obj/machinery/light/floor/has_bulb,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"fmc" = (
/turf/closed/wall,
@@ -17274,10 +17101,6 @@
"fwB" = (
/turf/closed/mineral/snowmountain/coldroom,
/area/station/service/kitchen/coldroom)
-"fwC" = (
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"fwD" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 6
@@ -18318,13 +18141,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"fPv" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/turf/open/floor/iron/freezer,
-/area/station/science/xenobiology)
"fPx" = (
/obj/docking_port/stationary/random/icemoon{
dir = 8;
@@ -19220,6 +19036,13 @@
/obj/item/food/piedough,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"gdf" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "6";
+ dir = 2
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"gdg" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/components/unary/passive_vent{
@@ -19459,15 +19282,6 @@
/obj/effect/turf_decal/trimline/yellow/line,
/turf/open/floor/iron/dark/side,
/area/station/security/prison/workout)
-"giP" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/structure/disposaloutlet{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"giQ" = (
/obj/item/radio/intercom/directional/north,
/obj/structure/cable,
@@ -20167,6 +19981,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
+/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"guS" = (
@@ -20499,21 +20314,6 @@
/obj/structure/sign/warning/cold_temp/directional/west,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
-"gBb" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 3";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio3";
- name = "Xenobio Pen 3 Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"gBc" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -20612,14 +20412,9 @@
/turf/open/floor/iron,
/area/station/command/heads_quarters/hop)
"gCo" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/directional/north{
- pixel_y = 2
- },
-/obj/structure/disposaloutlet{
- dir = 8
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "1";
+ dir = 1
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -21155,10 +20950,6 @@
"gKQ" = (
/turf/closed/wall,
/area/station/security/courtroom)
-"gLj" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"gLk" = (
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron,
@@ -21289,6 +21080,12 @@
/obj/item/reagent_containers/dropper,
/turf/open/floor/iron/cafeteria,
/area/station/science/lab)
+"gND" = (
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"gNH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -22997,18 +22794,6 @@
/obj/structure/girder,
/turf/closed/wall,
/area/station/maintenance/starboard/aft)
-"htp" = (
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
- name = "Xenobio Pen 2 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"hty" = (
/obj/item/stack/rods,
/turf/open/misc/asteroid/snow/icemoon,
@@ -23629,18 +23414,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"hEW" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"hEZ" = (
/obj/structure/ladder,
/turf/open/floor/plating,
@@ -23840,19 +23613,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"hJi" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 6";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio6";
- name = "Xenobio Pen 6 Blast Door"
- },
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"hJx" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -24135,13 +23895,6 @@
/obj/effect/turf_decal/tile/brown/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/break_room)
-"hOU" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Pens - Port Fore";
- network = list("ss13","rd","xeno")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"hOX" = (
/obj/machinery/camera/directional/west{
c_tag = "Atmospherics - North West"
@@ -24648,7 +24401,9 @@
},
/area/station/security/prison/rec)
"hWu" = (
-/obj/machinery/light/directional/east,
+/obj/machinery/corral_corner{
+ mapping_id = "6"
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"hWP" = (
@@ -24758,6 +24513,13 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/grimy,
/area/station/commons/vacant_room/office)
+"hZT" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "5";
+ dir = 2
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"iag" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -24767,15 +24529,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
-"iar" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio10";
- name = "Xenobio Pen 10 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"iav" = (
/obj/structure/closet/secure_closet/labor_camp_security,
/obj/effect/turf_decal/tile/red/half/contrasted,
@@ -24965,6 +24718,12 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"ibX" = (
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"ica" = (
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
@@ -25328,15 +25087,6 @@
},
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
-"ihN" = (
-/obj/machinery/button/door/directional/west{
- id = "xenobio4";
- layer = 4;
- name = "Xenobio Pen 4 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"iig" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -26361,20 +26111,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
-"izA" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 8";
- req_access = list("xenobiology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"izC" = (
/turf/closed/wall,
/area/station/service/bar/atrium)
@@ -26640,18 +26376,6 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters)
-"iDG" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 3";
- req_access = list("xenobiology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"iDQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
@@ -26702,20 +26426,11 @@
/turf/open/floor/plating/icemoon,
/area/station/security/execution/education)
"iER" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
+/obj/machinery/light/floor/has_bulb,
/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/cable,
-/obj/machinery/camera/directional/south{
- c_tag = "Xenobiology Pens Hall - Aft";
- network = list("ss13","rd","xeno_pens")
+ dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"iFc" = (
/obj/effect/turf_decal/tile/red/half{
@@ -27776,7 +27491,9 @@
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
"iVT" = (
-/obj/machinery/computer/camera_advanced/xenobio,
+/obj/structure/table/glass,
+/obj/item/disk/vacuum_upgrade/biomass,
+/obj/item/vacuum_pack,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"iVU" = (
@@ -29489,18 +29206,6 @@
/obj/structure/flora/grass/both/style_random,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
-"jAF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 5";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"jAO" = (
/obj/effect/turf_decal/siding/yellow{
dir = 8
@@ -30075,12 +29780,6 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"jKI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/iron/freezer,
-/area/station/science/xenobiology)
"jKJ" = (
/obj/effect/mapping_helpers/airlock/unres{
dir = 1
@@ -30670,10 +30369,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/central/greater)
-"jSW" = (
-/mob/living/simple_animal/slime,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"jTf" = (
/obj/structure/fence{
dir = 1
@@ -31064,16 +30759,6 @@
},
/turf/open/floor/iron,
/area/mine/laborcamp)
-"kaW" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/button/door/directional/east{
- id = "xenobio9";
- layer = 4;
- name = "Xenobio Pen 9 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"kaX" = (
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/white/side{
@@ -33151,6 +32836,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/lobby)
+"kGV" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "2";
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"kHb" = (
/obj/structure/closet/secure_closet/personal{
anchored = 1
@@ -34670,15 +34362,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"lfs" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/structure/disposaloutlet{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"lfF" = (
/obj/structure/sign/warning/cold_temp/directional/west,
/obj/structure/sign/warning/gas_mask/directional/east,
@@ -36010,20 +35693,6 @@
},
/turf/open/floor/iron/dark/textured_edge,
/area/station/security/prison)
-"lBZ" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 7";
- req_access = list("xenobiology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"lCb" = (
/obj/effect/landmark/start/assistant,
/obj/structure/cable,
@@ -36337,6 +36006,13 @@
/obj/item/storage/toolbox/emergency,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"lGB" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"lGK" = (
/obj/machinery/vending/cigarette,
/obj/machinery/button/door{
@@ -36567,19 +36243,6 @@
},
/turf/open/floor/wood,
/area/station/service/lawoffice)
-"lMu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio5";
- name = "Xenobio Pen 5 Blast Door"
- },
-/obj/structure/sign/warning/electric_shock,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"lMC" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -36610,16 +36273,6 @@
},
/turf/open/floor/iron/dark/textured_edge,
/area/station/security/prison)
-"lNo" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/button/door/directional/east{
- id = "xenobio6";
- layer = 4;
- name = "Xenobio Pen 6 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"lNy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37294,12 +36947,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/office)
-"lZX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron/freezer,
-/area/station/science/xenobiology)
"mae" = (
/obj/structure/statue/snow/snowman,
/turf/open/misc/asteroid/snow/icemoon,
@@ -37310,15 +36957,15 @@
/turf/open/floor/iron,
/area/station/commons/dorms)
"maO" = (
-/obj/machinery/disposal/bin,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/machinery/light/floor/has_bulb,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
},
-/obj/structure/disposalpipe/trunk{
+/obj/effect/turf_decal/stripes/corner{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"maQ" = (
/obj/machinery/door/airlock/external{
@@ -38251,6 +37898,13 @@
dir = 4
},
/area/station/security/brig/entrance)
+"mqK" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "3";
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"mqO" = (
/obj/machinery/power/port_gen/pacman,
/turf/open/floor/plating,
@@ -38669,6 +38323,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
+"myS" = (
+/obj/machinery/duct,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"myZ" = (
/obj/structure/lattice/catwalk,
/turf/open/openspace/icemoon/keep_below,
@@ -39876,6 +39534,10 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/work)
+"mVO" = (
+/obj/machinery/duct,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"mVY" = (
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -41045,18 +40707,6 @@
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
-"nmj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio4";
- name = "Xenobio Pen 4 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"nmk" = (
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/engine,
@@ -43922,18 +43572,10 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"odd" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 6";
- req_access = list("xenobiology")
- },
/obj/effect/turf_decal/stripes/line{
- dir = 8
+ dir = 4
},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"odi" = (
/obj/item/toy/snowball{
@@ -44249,19 +43891,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"oir" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio10";
- name = "Xenobio Pen 10 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/electric_shock,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"oiy" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat/service)
@@ -44633,11 +44262,6 @@
/obj/effect/mapping_helpers/iannewyear,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hop)
-"ooo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/processor/slime,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"oop" = (
/obj/machinery/door/airlock/external{
name = "External Access"
@@ -45086,7 +44710,7 @@
"ouP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/plumbing/ooze_compressor,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"ouX" = (
@@ -45287,6 +44911,14 @@
/obj/structure/table,
/turf/open/floor/wood,
/area/station/command/meeting_room)
+"oyt" = (
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"oyy" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 1
@@ -46359,15 +45991,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
-"oQo" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio5";
- name = "Xenobio Pen 5 Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"oQp" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -46785,15 +46408,6 @@
"oXq" = (
/turf/open/floor/iron/white,
/area/station/medical/cryo)
-"oXr" = (
-/obj/machinery/door/airlock/research/glass{
- name = "Kill Chamber";
- normalspeed = 0
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/turf/open/floor/iron/freezer,
-/area/station/science/xenobiology)
"oXs" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 9
@@ -47787,6 +47401,7 @@
"ppp" = (
/obj/structure/railing,
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/computer/slime_market,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"ppq" = (
@@ -47955,15 +47570,6 @@
/obj/machinery/telecomms/server/presets/security,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
-"prH" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio11";
- name = "Xenobio Pen 11 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"psb" = (
/turf/closed/wall/ice,
/area/icemoon/underground/explored)
@@ -50186,18 +49792,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/mine/laborcamp)
-"qbq" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio11";
- name = "Xenobio Pen 11 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"qbA" = (
/obj/structure/cable,
/obj/machinery/airalarm/directional/east,
@@ -51809,9 +51403,9 @@
"qEv" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/computer/camera_advanced/xenobio{
- dir = 1
- },
+/obj/structure/table/glass,
+/obj/item/disk/vacuum_upgrade/biomass,
+/obj/item/vacuum_pack,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"qEz" = (
@@ -53493,19 +53087,6 @@
/obj/item/flashlight/flare/candle,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"reT" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 8";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio8";
- name = "Xenobio Pen 8 Blast Door"
- },
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"rfh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -53796,15 +53377,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"rjT" = (
-/obj/machinery/button/door/directional/west{
- id = "xenobio3";
- layer = 4;
- name = "Xenobio Pen 3 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"rkc" = (
/obj/effect/turf_decal/siding/yellow,
/obj/effect/turf_decal/siding/yellow{
@@ -54037,18 +53609,6 @@
/obj/effect/spawner/random/trash/janitor_supplies,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
-"roA" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 4";
- req_access = list("xenobiology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"roH" = (
/obj/structure/chair/pew/right,
/turf/open/floor/wood,
@@ -54214,14 +53774,6 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"rsC" = (
-/obj/machinery/light/directional/west,
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Pens - Port Mid";
- network = list("ss13","rd","xeno")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"rsL" = (
/obj/structure/cable,
/turf/open/floor/circuit,
@@ -54519,17 +54071,13 @@
/turf/open/floor/iron/white/smooth_large,
/area/station/service/kitchen/diner)
"rxM" = (
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio8";
- name = "Xenobio Pen 8 Blast Door"
+/obj/machinery/corral_corner{
+ mapping_id = "4"
},
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/slime_pen_controller{
+ mapping_id = "4"
},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/electric_shock,
-/turf/open/floor/plating,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"rxW" = (
/turf/closed/mineral/random/snow,
@@ -55292,16 +54840,10 @@
/turf/open/floor/plating,
/area/station/engineering/main)
"rJe" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 1";
- req_access = list("xenobiology")
- },
/obj/effect/turf_decal/stripes/line{
- dir = 4
+ dir = 8
},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"rJv" = (
/obj/machinery/bluespace_beacon,
@@ -56083,13 +55625,8 @@
/turf/open/floor/iron/smooth,
/area/mine/mechbay)
"rXD" = (
-/obj/machinery/button/door/directional/east{
- id = "xenobio7";
- layer = 4;
- name = "Xenobio Pen 7 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/glass/reinforced,
/area/station/science/xenobiology)
"rXN" = (
/obj/machinery/door/firedoor,
@@ -56543,6 +56080,7 @@
"sfv" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"sfy" = (
@@ -56891,15 +56429,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"slp" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio9";
- name = "Xenobio Pen 9 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"slv" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/green/corner{
@@ -59689,16 +59218,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
-"tiQ" = (
-/obj/structure/sink/directional/east,
-/obj/machinery/button/door/directional/west{
- id = "xenobio2";
- layer = 4;
- name = "Xenobio Pen 2 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"tiV" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -59847,7 +59366,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/turf/open/floor/iron/freezer,
+/turf/closed/wall/r_wall,
/area/station/science/xenobiology)
"tkS" = (
/obj/item/radio/intercom/directional/east,
@@ -60233,10 +59752,6 @@
/obj/structure/disposalpipe/junction/flip,
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
-"tsa" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/turf/open/floor/iron/freezer,
-/area/station/science/xenobiology)
"tsh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61691,19 +61206,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"tOf" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio1";
- name = "Xenobio Pen 1 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/sign/warning/electric_shock,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"tOi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62035,15 +61537,6 @@
/obj/effect/spawner/random/trash/soap,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
-"tWd" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio6";
- name = "Xenobio Pen 6 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"tWp" = (
/obj/machinery/door/firedoor,
/obj/structure/cable,
@@ -62468,21 +61961,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
-"ucl" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 4";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio4";
- name = "Xenobio Pen 4 Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"ucn" = (
/obj/item/toy/snowball{
pixel_x = 9;
@@ -65478,17 +64956,6 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
-"vdr" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"vds" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -65649,11 +65116,16 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/underground/explored)
"vfq" = (
-/obj/machinery/monkey_recycler,
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/machinery/biomass_recycler,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"vfI" = (
@@ -67447,12 +66919,10 @@
/turf/open/floor/iron/dark,
/area/station/science/ordnance/office)
"vIk" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/components/unary/passive_vent,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/turf/open/floor/iron/freezer,
+/turf/closed/wall/r_wall,
/area/station/science/xenobiology)
"vIm" = (
/obj/structure/closet/emcloset,
@@ -67770,21 +67240,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"vPD" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 1";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio1";
- name = "Xenobio Pen 1 Blast Door"
- },
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"vPE" = (
/obj/structure/table,
/obj/item/clothing/gloves/latex,
@@ -68705,18 +68160,6 @@
},
/turf/open/floor/glass,
/area/station/service/library)
-"wgr" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio9";
- name = "Xenobio Pen 9 Blast Door"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"wgs" = (
/obj/structure/cable,
/mob/living/basic/sloth/paperwork,
@@ -69203,9 +68646,8 @@
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"wnB" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Pens - Starboard Aft";
- network = list("ss13","rd","xeno")
+/obj/machinery/corral_corner{
+ mapping_id = "2"
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -69363,12 +68805,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/office)
-"wpv" = (
-/obj/structure/sign/warning/cold_temp,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"wpx" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/newscaster/directional/west,
@@ -69672,7 +69108,9 @@
/turf/open/floor/iron,
/area/station/engineering/lobby)
"wva" = (
-/obj/machinery/light/directional/west,
+/obj/machinery/corral_corner{
+ mapping_id = "5"
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"wvb" = (
@@ -69954,14 +69392,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
-"wyU" = (
-/obj/machinery/light/directional/west,
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Pens - Port Aft";
- network = list("ss13","rd","xeno")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"wzc" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -70456,17 +69886,13 @@
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"wGN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/corral_corner{
+ mapping_id = "2"
},
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio6";
- name = "Xenobio Pen 6 Blast Door"
+/obj/machinery/slime_pen_controller{
+ mapping_id = "2"
},
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/electric_shock,
-/turf/open/floor/plating,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"wGO" = (
/obj/machinery/light/directional/south,
@@ -70498,13 +69924,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/pathology)
-"wHb" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/freezer,
-/area/station/science/xenobiology)
"wHc" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/rd)
@@ -71355,10 +70774,8 @@
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"wUz" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Pens - Starboard Mid";
- network = list("ss13","rd","xeno")
+/obj/machinery/corral_corner{
+ mapping_id = "4"
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -71582,20 +70999,6 @@
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
-"wXX" = (
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen 10";
- req_access = list("xenobiology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"wYb" = (
/obj/structure/table,
/obj/effect/turf_decal/stripes/red/line{
@@ -71702,19 +71105,6 @@
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"wZv" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/machinery/camera{
- c_tag = "Xenobiology Pens Hall - Fore";
- dir = 9;
- network = list("ss13","rd","xeno")
- },
-/obj/structure/sign/xenobio_guide/directional/north,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"wZL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/yellow{
@@ -72034,6 +71424,12 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"xfz" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/slime_market_pad,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"xfB" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
/turf/open/floor/iron,
@@ -72217,18 +71613,6 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
-"xhv" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 2";
- req_access = list("xenobiology")
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"xhw" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -72737,16 +72121,12 @@
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
"xqu" = (
-/obj/machinery/door/window/left/directional/north{
- dir = 4;
- name = "Containment Pen 10";
- req_access = list("xenobiology")
+/obj/machinery/corral_corner{
+ mapping_id = "6"
},
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio10";
- name = "Xenobio Pen 10 Blast Door"
+/obj/machinery/slime_pen_controller{
+ mapping_id = "6"
},
-/obj/structure/cable,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"xqy" = (
@@ -72873,6 +72253,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal)
+"xsU" = (
+/obj/machinery/light/floor/has_bulb,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"xtc" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
@@ -72955,15 +72343,6 @@
"xuo" = (
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
-"xur" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio8";
- name = "Xenobio Pen 8 Blast Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"xuA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured,
@@ -73226,6 +72605,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/structure/cable,
+/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"xyx" = (
@@ -73486,15 +72866,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/security/courtroom)
-"xCh" = (
-/obj/machinery/button/door/directional/west{
- id = "xenobio5";
- layer = 4;
- name = "Xenobio Pen 5 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"xCj" = (
/obj/structure/sign/departments/holy,
/turf/closed/wall,
@@ -75405,15 +74776,6 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"yjA" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
- name = "Xenobio Pen 2 Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"yjK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/generic,
@@ -183661,27 +183023,27 @@ abe
abe
biI
abe
+abe
eOS
-qLY
eGN
-lZX
-dPy
-qLY
-hOU
wva
abe
cKA
abe
+wva
+xsU
+ibX
abe
cKA
-rsC
abe
-cKA
abe
+ibX
+xsU
+gND
abe
cKA
-wyU
abe
+gND
rnQ
nPI
wzg
@@ -183918,25 +183280,25 @@ abe
cku
uUn
xNa
+abe
eOS
-qLY
vIk
-tsa
-wHb
-qLY
abe
-jSW
abe
-cKA
-jSW
+aUq
+abe
+abe
+lGB
abe
-cKA
abe
abe
-cKA
abe
abe
-cKA
+abe
+lGB
+abe
+abe
+aUq
abe
abe
rnQ
@@ -184175,24 +183537,24 @@ abe
abe
bOT
abe
+abe
eLb
-qLY
tkP
-fPv
-jKI
-qLY
-giP
abe
abe
-gCo
-abe
-abe
-gCo
-abe
+hZT
+myS
+myS
+oyt
+myS
+myS
+mqK
abe
-gCo
abe
abe
+oyt
+myS
+myS
gCo
abe
abe
@@ -184435,24 +183797,24 @@ abe
ctF
qLY
qLY
-oXr
-wpv
-qLY
-lMu
+wva
+abe
+abe
+abe
bUK
-oQo
-nmj
-ucl
-aHz
-dIS
-gBb
+oyt
+ibX
+abe
+abe
+abe
+abe
dJx
-htp
-eWh
-yjA
-tOf
-vPD
-lqU
+oyt
+gND
+abe
+abe
+abe
+aIV
mDg
nPI
alM
@@ -184692,23 +184054,23 @@ cZT
cZT
pXj
qLY
-wZv
-axD
-qLY
-hEW
-jAF
-fma
-vdr
-roA
-fma
-vdr
-iDG
fma
+rJe
+rJe
+rJe
+rJe
maO
-xhv
-fma
+rJe
+rJe
+rJe
+rJe
+rJe
+rJe
maO
rJe
+rJe
+rJe
+rJe
fma
ffe
nPI
@@ -184946,26 +184308,26 @@ pMF
mqe
hRC
euM
-pMF
+mVO
sfv
xyn
dmj
-wPd
-fwC
-asb
-pMF
-xCh
-kaW
-pMF
-ihN
-doK
-pMF
-rjT
rXD
-pMF
-tiQ
-lNo
-pMF
+rXD
+rXD
+rXD
+rXD
+rXD
+rXD
+rXD
+rXD
+rXD
+rXD
+rXD
+fvk
+fvk
+fvk
+fvk
clW
rkl
nPI
@@ -185206,23 +184568,23 @@ niy
gtF
ouP
gLS
+iER
+odd
+odd
+odd
+odd
cyh
-cXX
-bKI
-cyh
-wXX
-bKI
-cyh
-dQZ
-bKI
-cyh
-izA
-bKI
-cyh
-lBZ
-bKI
+odd
+odd
+odd
+odd
+odd
+odd
cyh
odd
+odd
+odd
+odd
iER
ffe
nPI
@@ -185463,23 +184825,23 @@ qWS
wPd
ygE
qLY
-prH
-bjn
-qbq
-iar
+hWu
+abe
+abe
+abe
xqu
-oir
-slp
-fjt
-wgr
-xur
-reT
+oyt
+wUz
+abe
+abe
+abe
+abe
rxM
-aLA
-bnh
-cNI
-tWd
-hJi
+oyt
+wnB
+abe
+abe
+abe
wGN
mDg
pQG
@@ -185722,22 +185084,22 @@ iQM
qLY
abe
abe
+gdf
+myS
+myS
+oyt
+myS
+myS
dLr
abe
abe
-dLr
-abe
-abe
-dLr
-abe
-abe
-dLr
-abe
abe
-dLr
+oyt
+myS
+myS
+kGV
abe
abe
-lfs
pjr
nPI
nPI
@@ -185979,21 +185341,21 @@ qLY
qLY
abe
abe
-gLj
+aUq
+abe
abe
-jSW
-gLj
+lGB
abe
abe
-gLj
abe
abe
-gLj
abe
abe
-gLj
+lGB
abe
abe
+aUq
+abe
abe
pjr
tRd
@@ -186234,23 +185596,23 @@ xwd
qLY
vgf
qLY
+hWu
abe
+atw
abe
-gLj
-aey
hWu
-gLj
+xsU
+wUz
abe
+atw
abe
-gLj
abe
-hWu
wUz
+xsU
+wnB
abe
+atw
abe
-gLj
-abe
-hWu
wnB
pjr
tRd
@@ -250242,7 +249604,7 @@ xJj
lvh
iVT
ogl
-ffz
+xJj
bzB
diL
vTJ
@@ -250746,7 +250108,7 @@ ehd
ehd
ehd
wmX
-ooo
+lva
rtn
qEv
vDu
@@ -251769,7 +251131,7 @@ jbU
kHN
kra
qhL
-ppp
+xfz
xJG
ily
ily
@@ -254315,7 +253677,7 @@ eha
aJQ
aJQ
lso
-lZi
+bOq
qaE
mBQ
eag
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 620765d9e8dc..63d1b8f7a7eb 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -15126,9 +15126,6 @@
"fjh" = (
/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/computer/camera_advanced/xenobio{
- dir = 8
- },
/obj/machinery/button/door/directional/north{
id = "xeno3";
name = "Creature Cell 3 Toggle";
@@ -26868,7 +26865,6 @@
"iKn" = (
/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced/spawner/directional/north,
-/obj/machinery/processor/slime,
/obj/machinery/button/door/directional/south{
id = "xeno4";
name = "Creature Cell 4 Toggle";
@@ -50051,9 +50047,6 @@
/turf/open/floor/iron,
/area/station/security/brig)
"qEj" = (
-/obj/machinery/computer/camera_advanced/xenobio{
- dir = 4
- },
/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/machinery/light/directional/north,
@@ -64153,10 +64146,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"vhx" = (
-/mob/living/simple_animal/slime,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"vhK" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -68244,7 +68233,6 @@
"wqR" = (
/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/monkey_recycler,
/obj/item/radio/intercom/directional/north,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -110474,13 +110462,13 @@ wpw
ieb
xcf
wpw
-vhx
+qmW
nQx
qmW
uXM
qmW
nQx
-vhx
+qmW
lZi
qdM
nmu
@@ -113048,7 +113036,7 @@ qmW
nQx
qmW
wpw
-vhx
+qmW
nQx
qmW
lDu
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 69de29167952..741217d5d372 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -664,13 +664,13 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"amV" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"amY" = (
/obj/effect/turf_decal/tile/yellow{
@@ -805,6 +805,15 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/white,
/area/station/science/xenobiology/hallway)
+"apT" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/aft)
"apZ" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -1375,12 +1384,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"azS" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/starboard/fore)
"aAb" = (
/obj/structure/table/wood,
/obj/item/lipstick{
@@ -1588,10 +1591,8 @@
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/restrooms)
"aDQ" = (
-/obj/structure/chair/comfy/black{
- dir = 4
- },
/obj/effect/turf_decal/trimline/purple/filled/line,
+/obj/machinery/chem_heater/withbuffer,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"aDR" = (
@@ -1915,12 +1916,6 @@
/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
-"aJE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
"aJI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -1955,13 +1950,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
-"aJQ" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
- dir = 4;
- name = "killroom vent"
- },
-/turf/open/floor/circuit/telecomms,
-/area/station/science/xenobiology)
"aJS" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai_upload)
@@ -2613,11 +2601,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"aUT" = (
-/obj/effect/landmark/generic_maintenance_landmark,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"aVd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2652,6 +2635,15 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
+"aVx" = (
+/obj/machinery/corral_corner{
+ mapping_id = "5"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "5"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"aVX" = (
/obj/machinery/door/airlock/hatch{
name = "Telecomms Server Room"
@@ -2858,6 +2850,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison)
+"aYt" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id = "XenoPens";
+ name = "Xenobiology Lockdown"
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"aYw" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three";
@@ -2987,6 +2988,13 @@
/obj/effect/landmark/start/scientist,
/turf/open/floor/iron/white,
/area/station/science/circuits)
+"bae" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"bau" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -3058,13 +3066,6 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"bbL" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"bbO" = (
/obj/structure/window/reinforced/spawner/directional/north{
layer = 2.9
@@ -3682,17 +3683,6 @@
/obj/structure/transit_tube/diagonal,
/turf/open/space,
/area/space/nearstation)
-"bnp" = (
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/structure/cable,
-/obj/structure/chair/stool/directional/south,
-/obj/machinery/camera/directional/west{
- c_tag = "Solar Maintenance - Aft Starboard"
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"bnr" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/structure/chair/sofa/corp/right{
@@ -3824,12 +3814,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
-"bnQ" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"bnU" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/chair/office/light,
@@ -3990,6 +3974,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/light/floor/has_bulb,
/turf/open/floor/iron/white,
/area/station/science/cytology)
"bqX" = (
@@ -4146,6 +4131,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"btB" = (
+/obj/machinery/power/terminal,
+/obj/machinery/light/small/directional/east,
+/obj/item/radio/intercom/directional/east,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"btH" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/beaker{
@@ -4322,11 +4314,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"bxg" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"bxj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/camera/directional/west{
@@ -4403,16 +4390,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"byP" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"byR" = (
/obj/structure/sign/warning/secure_area/directional/north,
/obj/effect/turf_decal/tile/blue{
@@ -5197,8 +5174,8 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
-/obj/machinery/smartfridge/extract/preloaded,
/obj/effect/turf_decal/bot_white,
+/obj/machinery/slime_market_pad,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"bQY" = (
@@ -5210,6 +5187,16 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"bRc" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"bRG" = (
/obj/machinery/shower/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -5273,13 +5260,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"bSu" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"bSA" = (
/obj/machinery/door/window/right/directional/south{
name = "First Aid Supplies";
@@ -5607,14 +5587,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"caf" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"can" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/cable,
@@ -5654,6 +5626,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"cbn" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "Xenolab";
+ name = "Test Chamber Blast Door"
+ },
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"cbz" = (
/turf/closed/wall,
/area/station/cargo/storage)
@@ -5738,8 +5719,8 @@
/area/station/hallway/secondary/command)
"ces" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
-/obj/machinery/processor/slime,
/obj/effect/turf_decal/bot_white,
+/obj/machinery/plumbing/ooze_compressor,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"cez" = (
@@ -5807,11 +5788,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"cgd" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"cgi" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark/side{
@@ -5974,6 +5950,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"cjT" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "2";
+ dir = 1
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"cke" = (
/obj/structure/showcase/machinery/tv{
dir = 1;
@@ -6134,6 +6118,28 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"cnF" = (
+/obj/structure/cable,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/stack/sheet/glass/fifty,
+/obj/structure/closet/crate/engineering/electrical,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"cnK" = (
/turf/closed/wall,
/area/station/engineering/main)
@@ -6187,15 +6193,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"cpl" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"cpn" = (
/obj/structure/table,
/obj/machinery/newscaster/directional/north,
@@ -6331,6 +6328,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/bar)
+"cqQ" = (
+/obj/machinery/corral_corner{
+ mapping_id = "6"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "6"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"crg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
@@ -6462,6 +6468,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"ctN" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/aft)
"ctO" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -6704,6 +6721,32 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"cxi" = (
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/stack/sheet/glass/fifty,
+/obj/structure/closet/crate/engineering/electrical,
+/obj/item/stack/cable_coil,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/camera/directional/north{
+ c_tag = "Solar Maintenance - Aft Port"
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"cxj" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
@@ -7080,6 +7123,12 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/commons/storage/primary)
+"cFw" = (
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"cFU" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -7103,6 +7152,15 @@
},
/turf/open/floor/iron,
/area/station/service/bar)
+"cFW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"cGj" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -7183,6 +7241,10 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"cHV" = (
+/obj/machinery/camera/directional/east,
+/turf/closed/wall/r_wall,
+/area/station/science/xenobiology)
"cId" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -7817,6 +7879,11 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"cVQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"cWr" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7946,17 +8013,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port)
-"cZs" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/trash/garbage{
- spawn_scatter_radius = 1
- },
-/obj/structure/sign/poster/contraband/random/directional/east,
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/lesser)
"cZu" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -8010,14 +8066,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
-"dac" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"das" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -8200,15 +8248,20 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"ddK" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
+"ddN" = (
+/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/turf/open/floor/plating,
-/area/station/maintenance/department/science/xenobiology)
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"ddO" = (
/obj/effect/turf_decal/trimline/green/filled/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8372,10 +8425,8 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"dgD" = (
/turf/closed/wall,
@@ -8503,15 +8554,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"diq" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/south{
- dir = 8;
- name = "Maximum Security Test Chamber";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"diC" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance"
@@ -8824,10 +8866,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/wood,
/area/station/commons/dorms)
-"dqw" = (
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"dqx" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
@@ -9054,14 +9092,6 @@
"duI" = (
/turf/closed/wall,
/area/station/command/bridge)
-"duN" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/structure/fans/tiny,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"dvk" = (
/obj/structure/table,
/obj/machinery/light/directional/west,
@@ -9104,6 +9134,16 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
+"dvT" = (
+/obj/structure/sign/warning/vacuum/external/directional/south,
+/obj/machinery/power/solar_control{
+ dir = 4;
+ id = "aftport";
+ name = "Port Quarter Solar Control"
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"dvV" = (
/obj/machinery/nuclearbomb/beer{
pixel_x = 2;
@@ -9159,8 +9199,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"dxe" = (
/obj/effect/landmark/event_spawn,
@@ -9308,6 +9349,9 @@
/obj/machinery/power/port_gen/pacman/pre_loaded,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"dAJ" = (
+/turf/closed/wall,
+/area/space)
"dBV" = (
/obj/docking_port/stationary/escape_pod{
dir = 4
@@ -9544,6 +9588,10 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/turf/open/floor/engine,
/area/station/science/explab)
+"dGk" = (
+/obj/effect/spawner/random/vending/snackvend,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"dGq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/stairs/left{
@@ -9731,17 +9779,6 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"dKh" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"dKl" = (
/obj/structure/sign/warning/pods,
/turf/closed/wall/r_wall,
@@ -9933,6 +9970,12 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"dMA" = (
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"dMH" = (
/obj/machinery/light/small/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -10040,6 +10083,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white/corner,
/area/station/hallway/secondary/entry)
+"dPw" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
"dPy" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -10101,8 +10148,18 @@
pixel_y = 1;
req_access = list("xenobiology")
},
+/obj/machinery/slime_pen_controller{
+ mapping_id = "pen2"
+ },
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"dQb" = (
+/obj/effect/landmark/generic_maintenance_landmark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"dQA" = (
/obj/machinery/computer/rdservercontrol{
dir = 4
@@ -10188,6 +10245,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"dRR" = (
+/obj/structure/sign/warning/vacuum/external/directional/east,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"dRY" = (
/obj/structure/chair/office,
/obj/effect/landmark/start/hangover,
@@ -10304,13 +10367,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"dUk" = (
-/obj/machinery/power/terminal,
-/obj/machinery/light/small/directional/east,
-/obj/item/radio/intercom/directional/east,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"dUB" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10380,6 +10436,15 @@
/obj/effect/spawner/random/aimodule/harmless,
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai_upload)
+"dWA" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/power/terminal{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/structure/chair/stool/directional/west,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"dWF" = (
/obj/machinery/light/directional/north,
/obj/machinery/camera/directional/north{
@@ -11029,17 +11094,6 @@
/obj/machinery/atmospherics/components/unary/bluespace_sender,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"eha" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"ehg" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -11331,6 +11385,15 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"elT" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"elV" = (
/obj/machinery/airalarm/directional/north,
/obj/item/clothing/under/misc/assistantformal,
@@ -11377,6 +11440,14 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"eml" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "1";
+ dir = 1
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"emv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -11870,16 +11941,6 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
-"evD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"evE" = (
/obj/effect/turf_decal/siding/purple{
dir = 10
@@ -11976,13 +12037,6 @@
},
/turf/open/floor/iron,
/area/station/security/warden)
-"ewF" = (
-/obj/machinery/power/terminal,
-/obj/machinery/light/small/directional/east,
-/obj/item/radio/intercom/directional/east,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"ewR" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering{
@@ -12022,11 +12076,6 @@
/obj/item/pen,
/turf/open/floor/wood,
/area/station/service/lawoffice)
-"exu" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"exC" = (
/obj/effect/turf_decal/plaque{
icon_state = "L3"
@@ -12408,13 +12457,6 @@
/obj/effect/spawner/random/vending/colavend,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"eHN" = (
-/obj/effect/landmark/event_spawn,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/lesser)
"eHR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -12425,14 +12467,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"eIc" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"eIw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -12487,11 +12521,9 @@
/turf/open/floor/plating,
/area/station/science/research)
"eJI" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/box,
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/iron,
+/obj/structure/chair/sofa/corp/right,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"eJM" = (
/obj/machinery/camera/directional/east{
@@ -12756,6 +12788,10 @@
name = "Containment Pen #6";
req_access = list("xenobiology")
},
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "pen2";
+ dir = 8
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"eOQ" = (
@@ -12953,19 +12989,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"eSC" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio7";
- layer = 3.3;
- name = "Xenobio Pen 7 Blast Doors";
- pixel_y = 4;
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"eSR" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -12982,6 +13005,10 @@
/obj/machinery/light/no_nightlight/directional/south,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"eTk" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"eTn" = (
/obj/structure/chair{
dir = 4
@@ -13384,14 +13411,6 @@
/obj/effect/spawner/random/decoration/showcase,
/turf/open/floor/carpet,
/area/station/command/corporate_showroom)
-"faD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"fbf" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -13479,7 +13498,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/machinery/light/directional/west,
+/obj/machinery/duct,
+/obj/machinery/camera/directional/west,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"fee" = (
/obj/structure/lattice/catwalk,
@@ -14011,6 +14033,15 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"flp" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id = "XenoPens";
+ name = "Xenobiology Lockdown"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"flu" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -14114,6 +14145,13 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
+"fmR" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "3"
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"fmS" = (
/obj/structure/sign/directions/security{
dir = 1;
@@ -14165,12 +14203,6 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/storage)
-"foV" = (
-/obj/structure/sign/warning/vacuum/external/directional/east,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"fpj" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -14268,12 +14300,10 @@
/area/station/science/xenobiology/hallway)
"frt" = (
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/computer/camera_advanced/xenobio{
- dir = 8
- },
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/effect/turf_decal/bot,
/obj/machinery/light/small/directional/south,
+/obj/machinery/chem_master,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"fru" = (
@@ -14368,16 +14398,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"fuF" = (
-/obj/machinery/door/airlock/engineering{
- name = "Port Quarter Solar Access"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/effect/landmark/navigate_destination/common/portquartersolar,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"fvE" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/medical/central)
@@ -14959,17 +14979,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
-"fHe" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
+"fHs" = (
+/obj/machinery/light/floor/has_bulb,
+/obj/structure/chair/sofa/corp,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"fHC" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -15039,6 +15053,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hop)
+"fJq" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"fJs" = (
/obj/structure/chair/stool/directional/west,
/obj/effect/mapping_helpers/broken_floor,
@@ -15225,14 +15246,6 @@
/obj/effect/turf_decal/tile/purple/opposingcorners,
/turf/open/floor/iron/white,
/area/station/science/circuits)
-"fMF" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"fMN" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/disposalpipe/segment{
@@ -15395,16 +15408,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"fPB" = (
-/obj/machinery/door/airlock/engineering{
- name = "Starboard Quarter Solar Access"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/effect/landmark/navigate_destination/common/starboardquartersolar,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"fPD" = (
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
@@ -15534,6 +15537,13 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"fRZ" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch/directional/south,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"fSd" = (
/obj/structure/chair/stool/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -15609,15 +15619,6 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"fUq" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"fUr" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -15631,9 +15632,15 @@
},
/obj/effect/turf_decal/bot_white,
/obj/structure/cable,
-/obj/machinery/smartfridge/organ,
+/obj/machinery/computer/slime_market,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"fUH" = (
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"fUM" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/libraryscanner,
@@ -16010,6 +16017,15 @@
},
/turf/open/floor/iron/white,
/area/station/medical/storage)
+"gbm" = (
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"gbq" = (
/obj/machinery/vending/wardrobe/chef_wardrobe,
/obj/effect/turf_decal/trimline/brown/warning{
@@ -16201,12 +16217,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
-"gfc" = (
-/obj/structure/sign/warning/vacuum/external/directional/east,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"gfh" = (
/obj/structure/sign/poster/random/directional/east,
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
@@ -16258,6 +16268,20 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"gga" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/airlock/hatch{
+ name = "Xenobiology Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science/xenobiology)
"ggi" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -16377,14 +16401,6 @@
},
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
-"git" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"giz" = (
/obj/machinery/conveyor/inverted{
dir = 10;
@@ -16451,6 +16467,10 @@
name = "Containment Pen #5";
req_access = list("xenobiology")
},
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "pen3";
+ dir = 8
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"gjF" = (
@@ -16633,6 +16653,12 @@
/obj/machinery/light_switch/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
+"gmB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"gmG" = (
/obj/structure/table,
/obj/item/plate,
@@ -16714,6 +16740,14 @@
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"gnL" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"gnS" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -16947,6 +16981,15 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
+"grI" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/fore)
"grZ" = (
/obj/structure/chair,
/obj/machinery/camera/directional/north{
@@ -17127,8 +17170,14 @@
/turf/closed/wall,
/area/station/commons/storage/primary)
"gva" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id = "XenoPens";
+ name = "Xenobiology Lockdown"
+ },
+/obj/machinery/duct,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"gvg" = (
/obj/structure/table/reinforced,
@@ -17288,6 +17337,7 @@
id = "xenobio8";
name = "Xenobio Pen 8 Blast Door"
},
+/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"gyK" = (
@@ -17452,14 +17502,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"gCE" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "starboardquarter";
- name = "Starboard Quarter Solar Array"
- },
-/turf/open/floor/iron/solarpanel/airless,
-/area/station/solars/starboard/aft)
"gCS" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/showcase/cyborg/old{
@@ -17606,6 +17648,13 @@
},
/turf/open/space/basic,
/area/space)
+"gFd" = (
+/obj/machinery/power/terminal,
+/obj/machinery/light/small/directional/east,
+/obj/item/radio/intercom/directional/east,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"gFi" = (
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
@@ -17841,17 +17890,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"gKD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Lab - Central East";
- network = list("ss13","rd","xeno")
- },
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"gKK" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
@@ -18244,6 +18282,11 @@
/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"gRY" = (
+/obj/machinery/light/floor/has_bulb,
+/obj/machinery/plumbing/ooze_compressor,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"gSn" = (
/obj/item/wrench,
/turf/open/floor/iron,
@@ -18277,7 +18320,6 @@
/turf/open/floor/circuit/telecomms/server,
/area/station/science/server)
"gSM" = (
-/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line,
@@ -18286,6 +18328,7 @@
id = "XenoPens";
name = "Xenobiology Lockdown"
},
+/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"gTh" = (
@@ -18362,12 +18405,14 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"gTS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
},
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science/xenobiology)
+/obj/machinery/shower/directional/north,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"gTU" = (
/obj/effect/turf_decal/siding/purple/corner{
dir = 4
@@ -18534,6 +18579,12 @@
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"gWH" = (
+/obj/effect/spawner/random/maintenance,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/lesser)
"gWL" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
@@ -18611,20 +18662,16 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/station/solars/port/aft)
-"gXs" = (
-/obj/machinery/power/solar_control{
- id = "forestarboard";
- name = "Starboard Bow Solar Control"
- },
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"gXu" = (
/turf/open/floor/plating,
/area/station/engineering/main)
"gXw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/floor/circuit/telecomms,
+/obj/machinery/light/floor/has_bulb,
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "5";
+ dir = 1
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"gXz" = (
/obj/machinery/duct,
@@ -19027,6 +19074,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"heo" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"hep" = (
/obj/effect/landmark/blobstart,
/obj/effect/mapping_helpers/burnt_floor,
@@ -19239,14 +19296,6 @@
},
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
-"hja" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/chem_master,
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"hjo" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
@@ -19542,11 +19591,6 @@
},
/turf/open/floor/plating,
/area/station/engineering/main)
-"hoc" = (
-/obj/effect/landmark/generic_maintenance_landmark,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"hod" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -19609,6 +19653,12 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms)
+"hoV" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"hoY" = (
/obj/structure/chair/office{
dir = 4
@@ -19744,6 +19794,14 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/service/bar)
+"hsp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/fore)
"hsF" = (
/obj/machinery/door/airlock{
id_tag = "AuxToilet3";
@@ -20319,11 +20377,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"hCw" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"hCK" = (
/obj/effect/decal/cleanable/oil/slippery,
/obj/effect/turf_decal/siding/purple{
@@ -20815,6 +20868,7 @@
id = "xenobio1";
name = "Xenobio Pen 1 Blast Door"
},
+/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"hMy" = (
@@ -21065,6 +21119,14 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"hRU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"hRW" = (
/obj/machinery/light/directional/east,
/obj/machinery/airalarm/directional/east,
@@ -21241,6 +21303,10 @@
name = "Containment Pen #8";
req_access = list("xenobiology")
},
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "pen1";
+ dir = 4
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"hVE" = (
@@ -21627,6 +21693,7 @@
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
},
+/obj/machinery/slime_extract_requestor,
/turf/open/floor/iron/white,
/area/station/science/lobby)
"ibz" = (
@@ -21714,17 +21781,10 @@
/turf/open/floor/plating,
/area/station/commons/fitness/recreation)
"idA" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/structure/sign/warning/electric_shock,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"idF" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"ied" = (
/obj/structure/table,
/obj/item/paper/fluff/holodeck/disclaimer,
@@ -21890,6 +21950,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"igH" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/box,
+/obj/machinery/camera/directional/south,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"igP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/siding/wood{
@@ -22273,6 +22343,10 @@
name = "Containment Pen #3";
req_access = list("xenobiology")
},
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "pen5";
+ dir = 8
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"imU" = (
@@ -22586,15 +22660,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/grass,
/area/station/security/prison/garden)
-"irp" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"irL" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
@@ -22899,6 +22964,14 @@
/obj/structure/closet/crate,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"ivK" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/fore)
"ivM" = (
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/photocopier,
@@ -22957,8 +23030,10 @@
/area/station/science/robotics/lab)
"iwO" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"iwX" = (
/obj/structure/cable,
@@ -23044,6 +23119,9 @@
pixel_y = 4;
req_access = list("xenobiology")
},
+/obj/machinery/slime_pen_controller{
+ mapping_id = "pen3"
+ },
/turf/open/floor/iron,
/area/station/science/xenobiology)
"ixT" = (
@@ -23355,6 +23433,12 @@
/obj/structure/cable,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"iCZ" = (
+/obj/machinery/corral_corner{
+ mapping_id = "6"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"iDh" = (
/obj/machinery/computer/communications{
dir = 8
@@ -23716,6 +23800,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/command)
+"iJm" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/fore)
"iJt" = (
/obj/structure/extinguisher_cabinet/directional/east,
/obj/machinery/camera/directional/east{
@@ -23773,16 +23868,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"iJJ" = (
-/obj/machinery/door/airlock/engineering{
- name = "Starboard Bow Solar Access"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/effect/landmark/navigate_destination/common/starboardbowsolar,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"iJK" = (
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/tile/neutral{
@@ -24017,13 +24102,6 @@
/mob/living/basic/lizard/wags_his_tail,
/turf/open/floor/plating,
/area/station/service/janitor)
-"iMR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"iMS" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line,
@@ -24149,8 +24227,8 @@
/turf/open/floor/carpet,
/area/station/security/detectives_office)
"iOZ" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"iPb" = (
@@ -24523,6 +24601,16 @@
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
+"iTV" = (
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/obj/machinery/camera/directional/north,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"iTX" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{
@@ -24553,6 +24641,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload_foyer)
+"iUk" = (
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"iUm" = (
/turf/closed/wall,
/area/station/hallway/secondary/exit/departure_lounge)
@@ -24617,12 +24711,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/commons/dorms)
-"iVn" = (
-/obj/structure/cable,
-/obj/machinery/light_switch/directional/north,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"iVs" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -24667,10 +24755,6 @@
/obj/effect/landmark/start/hangover/closet,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
-"iWc" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"iWj" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -24885,6 +24969,15 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"jau" = (
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "1"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"jay" = (
/obj/structure/chair{
dir = 4
@@ -24931,18 +25024,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/research)
-"jbk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/camera{
- c_tag = "Xenobiology Lab - Central South";
- dir = 9;
- network = list("ss13","rd","xeno")
- },
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"jbq" = (
/turf/closed/wall/r_wall,
/area/station/hallway/primary/aft)
@@ -25022,6 +25103,13 @@
/obj/structure/window/fulltile,
/turf/open/floor/grass,
/area/station/hallway/secondary/exit/departure_lounge)
+"jdj" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"jdn" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/structure/disposalpipe/segment{
@@ -25177,6 +25265,13 @@
"jfG" = (
/turf/closed/wall,
/area/station/maintenance/disposal)
+"jfJ" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"jfN" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -25339,6 +25434,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
+"jhX" = (
+/obj/machinery/corral_corner{
+ mapping_id = "5"
+ },
+/obj/machinery/corral_corner{
+ mapping_id = "6"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"jhY" = (
/obj/machinery/firealarm/directional/east,
/obj/structure/bed/dogbed,
@@ -25378,12 +25482,14 @@
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"jjj" = (
-/obj/structure/chair/comfy/black{
- dir = 4
- },
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
+/obj/item/disk/vacuum_upgrade/biomass,
+/obj/item/vacuum_pack,
+/obj/item/vacuum_pack,
+/obj/item/disk/vacuum_upgrade/biomass,
+/obj/structure/table/glass,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"jjm" = (
@@ -25615,6 +25721,11 @@
/obj/structure/bookcase,
/turf/open/floor/wood,
/area/station/command/bridge)
+"jnv" = (
+/obj/effect/landmark/generic_maintenance_landmark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"jnA" = (
/obj/machinery/newscaster/directional/west,
/obj/structure/easel,
@@ -26163,14 +26274,6 @@
},
/turf/open/floor/iron,
/area/station/science/research)
-"jvX" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/shower/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"jwg" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
@@ -26288,13 +26391,14 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/obj/structure/sign/xenobio_guide/directional/west,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"jxS" = (
/obj/effect/decal/cleanable/dirt,
@@ -26392,7 +26496,11 @@
"jzw" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"jzC" = (
/obj/machinery/door/window/right/directional/north{
@@ -26525,12 +26633,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plating,
/area/station/maintenance/disposal)
-"jCO" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"jDb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/blobstart,
@@ -26895,6 +26997,14 @@
},
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
+"jKa" = (
+/obj/effect/turf_decal/tile/purple/fourcorners,
+/obj/machinery/door/airlock/maintenance{
+ name = "Research Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/lab)
"jKq" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Two";
@@ -27190,6 +27300,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"jOI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"jON" = (
/obj/effect/turf_decal/tile/purple,
/obj/structure/disposalpipe/segment{
@@ -27383,15 +27502,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/commons/lounge)
-"jSj" = (
-/obj/machinery/door/airlock/research{
- glass = 1;
- name = "Slime Euthanization Chamber";
- opacity = 0
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"jSm" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
@@ -27526,12 +27636,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"jUK" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/fans/tiny,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"jUP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -27672,6 +27776,11 @@
},
/turf/open/floor/wood,
/area/station/service/cafeteria)
+"jXe" = (
+/obj/structure/lattice,
+/obj/item/wirecutters,
+/turf/open/space/basic,
+/area/space/nearstation)
"jXq" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable,
@@ -27918,13 +28027,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/evidence)
-"kbn" = (
-/obj/structure/chair/stool/directional/north,
-/obj/machinery/camera/directional/west{
- c_tag = "Solar Maintenance - Fore Starboard"
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"kbo" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28209,6 +28311,13 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/checkpoint/engineering)
+"khw" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "4"
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"khA" = (
/turf/closed/wall,
/area/station/commons/storage/art)
@@ -28365,6 +28474,17 @@
/obj/item/clothing/glasses/hud/health,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"kkT" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"kkU" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/camera/directional/west{
@@ -28471,6 +28591,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
+/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"klL" = (
@@ -28680,14 +28801,6 @@
/obj/structure/sign/warning/vacuum/external/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"kqj" = (
-/obj/effect/landmark/generic_maintenance_landmark,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"kqm" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/blue/filled/warning{
@@ -28883,6 +28996,12 @@
/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"ktG" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"ktK" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{
dir = 10
@@ -29012,14 +29131,8 @@
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
"kvT" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/trimline/purple/filled/line,
-/obj/effect/turf_decal/bot_white,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/turf/open/floor/iron,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"kvV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -29127,12 +29240,16 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"kyh" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
+"kxW" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/trash/garbage{
+ spawn_scatter_radius = 1
+ },
+/obj/structure/sign/poster/contraband/random/directional/east,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/lesser)
"kyl" = (
/obj/item/radio/intercom/directional/south,
/obj/machinery/light/directional/south,
@@ -29330,6 +29447,10 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/command/teleporter)
+"kCw" = (
+/obj/machinery/duct,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"kCC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
@@ -29546,14 +29667,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"kHt" = (
-/obj/machinery/camera{
- c_tag = "Xenobiology Lab - Pen #2";
- dir = 9;
- network = list("ss13","rd","xeno")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"kHM" = (
/obj/effect/turf_decal/siding/thinplating_new/dark,
/obj/effect/turf_decal/trimline/brown/line,
@@ -29653,6 +29766,14 @@
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron/white,
/area/station/security/prison)
+"kKG" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"kKT" = (
/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 7;
@@ -29851,6 +29972,16 @@
/obj/effect/turf_decal/trimline/yellow/filled/end,
/turf/open/floor/iron/textured,
/area/station/medical/medbay/central)
+"kNV" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Port Quarter Solar Access"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/landmark/navigate_destination/common/portquartersolar,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/aft)
"kOf" = (
/obj/machinery/telecomms/broadcaster/preset_right,
/turf/open/floor/circuit/telecomms/mainframe,
@@ -29927,6 +30058,15 @@
"kOR" = (
/turf/closed/wall,
/area/station/hallway/primary/aft)
+"kOV" = (
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"kOX" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -30842,6 +30982,11 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
+"lek" = (
+/obj/machinery/power/smes,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"lfc" = (
/obj/machinery/newscaster/directional/north,
/obj/effect/turf_decal/stripes/corner{
@@ -31002,15 +31147,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"lhX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/lesser)
"lia" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -31293,6 +31429,14 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
+"lmK" = (
+/obj/effect/landmark/generic_maintenance_landmark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"lmL" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -31730,6 +31874,13 @@
},
/turf/open/floor/iron/dark,
/area/station/security/lockers)
+"ltg" = (
+/obj/structure/chair/stool/directional/north,
+/obj/machinery/camera/directional/west{
+ c_tag = "Solar Maintenance - Fore Starboard"
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"ltm" = (
/obj/machinery/atmospherics/components/tank/oxygen{
dir = 4
@@ -31855,6 +32006,14 @@
},
/turf/open/floor/iron,
/area/station/security/range)
+"lvs" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/unres,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/lesser)
"lvu" = (
/obj/machinery/door/window/left/directional/west{
dir = 4;
@@ -32065,6 +32224,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"lzJ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"lzL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32144,13 +32310,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
-"lBt" = (
-/obj/structure/cable,
-/obj/machinery/light_switch/directional/south,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"lBv" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/iron/dark,
@@ -32270,6 +32429,12 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/break_room)
+"lFe" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"lFo" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -32311,11 +32476,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"lGN" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/starboard/fore)
"lGR" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -32409,6 +32569,18 @@
"lJa" = (
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
+"lJg" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"lJh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32749,13 +32921,21 @@
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
"lOY" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
+/obj/structure/table/glass,
+/obj/machinery/reagentgrinder{
+ pixel_x = -1;
+ pixel_y = 8
},
-/obj/machinery/portable_atmospherics/canister,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/box,
-/turf/open/floor/iron,
+/obj/machinery/button/door{
+ id = "XenoPens";
+ layer = 3.3;
+ name = "Xenobiology Lockdown";
+ pixel_y = 0;
+ req_access = list("xenobiology");
+ pixel_x = -24
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"lOZ" = (
/obj/machinery/power/port_gen/pacman/pre_loaded,
@@ -32960,15 +33140,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"lTi" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/directional/south{
- c_tag = "Xenobiology Lab - Central North";
- network = list("ss13","rd","xeno")
- },
-/obj/machinery/status_display/ai/directional/south,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"lTj" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -33050,16 +33221,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white/side,
/area/station/medical/treatment_center)
-"lTY" = (
-/obj/machinery/door/airlock/engineering{
- name = "Port Bow Solar Access"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/effect/landmark/navigate_destination/common/portbowsolar,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"lTZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/vehicle/sealed/mecha/working/ripley/cargo,
@@ -33126,16 +33287,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"lUM" = (
-/obj/structure/sign/warning/vacuum/external/directional/south,
-/obj/machinery/power/solar_control{
- dir = 4;
- id = "aftport";
- name = "Port Quarter Solar Control"
- },
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"lUP" = (
/obj/machinery/button/crematorium{
id = "crematoriumChapel";
@@ -33417,6 +33568,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/bar)
+"lYY" = (
+/obj/machinery/duct,
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "3"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"lZk" = (
/obj/machinery/power/turbine/inlet_compressor{
dir = 4
@@ -33582,14 +33743,14 @@
/turf/open/floor/iron/vaporwave,
/area/station/service/library)
"mdo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/hatch{
- name = "Xenobiology Maintenance"
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science/xenobiology)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"mdp" = (
/obj/structure/sign/warning/yes_smoking,
/turf/closed/wall,
@@ -33641,6 +33802,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hos)
+"meQ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"mfh" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -34007,6 +34175,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"mmF" = (
+/obj/machinery/light/small/directional/east,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/stack/sheet/glass/fifty,
+/obj/structure/closet/crate/engineering/electrical,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"mmR" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -34261,6 +34451,15 @@
/obj/item/lighter,
/turf/open/floor/carpet,
/area/station/command/bridge)
+"mrJ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"mrL" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair,
@@ -34291,11 +34490,6 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
-"msR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"msT" = (
/obj/structure/table,
/obj/item/food/mint,
@@ -34848,6 +35042,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/break_room)
+"mBj" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white,
+/area/station/science/cytology)
"mBw" = (
/obj/machinery/power/emitter,
/obj/machinery/light/small/directional/south,
@@ -34906,14 +35104,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
-"mCj" = (
-/obj/machinery/camera{
- c_tag = "Xenobiology Lab - Pen #7";
- dir = 5;
- network = list("ss13","rd","xeno")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"mCn" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/two,
@@ -35258,6 +35448,16 @@
"mHT" = (
/turf/closed/wall,
/area/station/engineering/atmos)
+"mIg" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Port Bow Solar Access"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/landmark/navigate_destination/common/portbowsolar,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/fore)
"mIi" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=9.2-Escape-2";
@@ -35345,6 +35545,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"mJQ" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/duct,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"mJT" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/obj/structure/table/reinforced,
@@ -35498,10 +35703,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"mMl" = (
/obj/structure/cable,
@@ -35530,12 +35735,14 @@
/turf/open/floor/iron,
/area/station/commons/dorms)
"mMK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"mMM" = (
/obj/structure/table/reinforced,
@@ -35843,12 +36050,6 @@
},
/turf/closed/wall,
/area/station/science/lobby)
-"mSU" = (
-/obj/machinery/power/smes,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"mTg" = (
/obj/structure/cable,
/obj/machinery/door/airlock/hatch{
@@ -36005,13 +36206,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"mVR" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/light_switch/directional/south,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"mVW" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -36452,7 +36646,6 @@
/turf/open/floor/iron,
/area/station/engineering/main)
"ncF" = (
-/obj/structure/window/reinforced/spawner/directional/north,
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line{
@@ -36862,6 +37055,9 @@
pixel_y = 4;
req_access = list("xenobiology")
},
+/obj/machinery/slime_pen_controller{
+ mapping_id = "pen5"
+ },
/turf/open/floor/iron,
/area/station/science/xenobiology)
"nkD" = (
@@ -36969,6 +37165,10 @@
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
+"nmy" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"nmH" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -37188,6 +37388,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"nqk" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science/xenobiology)
"nqo" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -37431,6 +37638,14 @@
},
/turf/open/floor/engine,
/area/station/science/explab)
+"ntM" = (
+/obj/machinery/power/solar_control{
+ id = "foreport";
+ name = "Port Bow Solar Control"
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"ntP" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Control"
@@ -37857,6 +38072,10 @@
/area/station/engineering/atmospherics_engine)
"nBa" = (
/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
+ },
/turf/open/floor/iron/solarpanel/airless,
/area/station/solars/starboard/aft)
"nBf" = (
@@ -38035,6 +38254,13 @@
/obj/item/clothing/glasses/science,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"nEe" = (
+/obj/structure/cable,
+/obj/machinery/light_switch/directional/south,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"nEf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -38348,14 +38574,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"nLX" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/trash/garbage{
- spawn_scatter_radius = 1
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/starboard/fore)
"nLZ" = (
/obj/item/toy/beach_ball/branded,
/turf/open/space/basic,
@@ -38496,6 +38714,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"nOh" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"nOi" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38645,13 +38870,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"nQl" = (
-/obj/effect/landmark/generic_maintenance_landmark,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"nQw" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -38723,6 +38941,27 @@
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"nRz" = (
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/stack/sheet/glass/fifty,
+/obj/structure/closet/crate/engineering/electrical,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"nRR" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/east,
@@ -38749,14 +38988,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"nSC" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/chem_heater/withbuffer,
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"nTd" = (
/obj/structure/rack,
/obj/effect/spawner/random/food_or_drink/seed,
@@ -38992,14 +39223,13 @@
/turf/open/space/basic,
/area/space/nearstation)
"nYL" = (
-/obj/machinery/door/airlock/hatch{
- name = "Xenobiology Maintenance"
- },
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science/xenobiology)
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"nYO" = (
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/pestspray{
@@ -39174,6 +39404,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"obi" = (
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "4"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"obk" = (
/obj/item/target/alien,
/turf/open/floor/plating,
@@ -39364,6 +39603,11 @@
"oew" = (
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"oeO" = (
+/obj/effect/landmark/generic_maintenance_landmark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"oeQ" = (
/obj/structure/table,
/obj/item/paper_bin/construction,
@@ -39486,6 +39730,15 @@
/obj/effect/turf_decal/tile/bar,
/turf/open/floor/iron,
/area/station/commons/lounge)
+"ogF" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"ogJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -39559,6 +39812,7 @@
id = "xenobio6";
name = "Xenobio Pen 6 Blast Door"
},
+/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"ohE" = (
@@ -40187,10 +40441,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/security/prison/work)
-"otR" = (
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"ouc" = (
/obj/structure/closet/crate,
/obj/structure/cable,
@@ -40513,6 +40763,16 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"ozs" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Starboard Bow Solar Access"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/landmark/navigate_destination/common/starboardbowsolar,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/fore)
"ozB" = (
/obj/item/cigbutt,
/obj/structure/table/reinforced,
@@ -40839,6 +41099,12 @@
dir = 8
},
/area/station/engineering/atmos)
+"oFv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science/xenobiology)
"oFz" = (
/turf/closed/wall,
/area/station/science/explab)
@@ -41653,6 +41919,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/light/floor/has_bulb,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"oWb" = (
@@ -41733,6 +42000,23 @@
/obj/item/clothing/glasses/sunglasses,
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"oXJ" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/structure/closet/crate/engineering/electrical,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/stack/cable_coil,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"oXL" = (
/obj/machinery/disposal/bin,
/obj/structure/cable,
@@ -42166,8 +42450,8 @@
/area/station/science/robotics/lab)
"pfP" = (
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"pfR" = (
/obj/machinery/portable_atmospherics/canister/air,
@@ -42204,15 +42488,13 @@
/obj/effect/spawner/random/entertainment/lighter,
/turf/open/floor/wood,
/area/station/commons/dorms)
-"pgM" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+"pgJ" = (
+/obj/structure/chair/stool/directional/north,
+/obj/machinery/camera/directional/west{
+ c_tag = "Solar Maintenance - Fore Port"
},
-/obj/structure/cable,
-/obj/structure/sink/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"pgP" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/stasis,
@@ -42261,6 +42543,10 @@
pixel_x = 10;
pixel_y = -1
},
+/obj/machinery/slime_pen_controller{
+ mapping_id = "pen1";
+ dir = 2
+ },
/turf/open/floor/iron,
/area/station/science/xenobiology)
"phN" = (
@@ -42294,15 +42580,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
-"phT" = (
-/obj/structure/cable,
-/obj/machinery/power/solar_control{
- dir = 1;
- id = "starboardsolar";
- name = "Starboard Quarter Solar Control"
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"pic" = (
/obj/structure/table,
/obj/machinery/recharger,
@@ -42495,6 +42772,11 @@
"pma" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/solars/port/fore)
+"pms" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"pmZ" = (
/obj/machinery/light_switch/directional/west{
pixel_y = 26
@@ -42636,6 +42918,7 @@
/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
dir = 8
},
+/obj/machinery/smartfridge/petri/preloaded,
/turf/open/floor/iron/white,
/area/station/science/cytology)
"ppD" = (
@@ -42746,13 +43029,6 @@
/obj/structure/closet/l3closet,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
-"pro" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"prv" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42804,12 +43080,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white/side,
/area/station/science/lobby)
-"psc" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"psl" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
@@ -42894,6 +43164,10 @@
name = "Containment Pen #1";
req_access = list("xenobiology")
},
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "pen7";
+ dir = 4
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"psV" = (
@@ -42920,11 +43194,6 @@
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"ptn" = (
-/obj/machinery/power/smes,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"ptH" = (
/obj/effect/turf_decal/siding/purple{
dir = 4
@@ -43083,18 +43352,23 @@
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"pwy" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"pwM" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/commons/dorms)
"pwZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"pxj" = (
/obj/machinery/door/airlock/research/glass{
@@ -43400,20 +43674,6 @@
/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/iron/grimy,
/area/station/tcommsat/computer)
-"pDl" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- icon_state = "right";
- name = "Containment Pen #7";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio7";
- name = "Xenobio Pen 7 Blast Door"
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"pDs" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -43780,10 +44040,10 @@
/turf/open/floor/iron/dark/textured_half,
/area/station/bitrunning/den)
"pJf" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"pJi" = (
/obj/machinery/firealarm/directional/south,
@@ -43811,12 +44071,12 @@
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
"pJA" = (
-/obj/structure/closet/secure_closet/cytology,
/obj/structure/extinguisher_cabinet/directional/west,
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 8
},
+/obj/machinery/smartfridge/organ,
/turf/open/floor/iron/white,
/area/station/science/cytology)
"pJE" = (
@@ -44070,13 +44330,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
-"pOo" = (
-/obj/effect/spawner/random/maintenance,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/lesser)
"pOv" = (
/obj/effect/turf_decal/siding/purple{
dir = 1
@@ -44094,6 +44347,12 @@
},
/turf/open/floor/circuit/green/off,
/area/station/science/research)
+"pOF" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/aft)
"pOK" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -44163,7 +44422,10 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"pQu" = (
/obj/machinery/door/window/right/directional/east{
@@ -44425,6 +44687,11 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/grimy,
/area/station/security/interrogation)
+"pUX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"pVi" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_switch/directional/north,
@@ -44462,20 +44729,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/brig)
-"pVR" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/table,
-/obj/item/storage/box/gloves{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/storage/box/masks{
- pixel_x = 4;
- pixel_y = 4
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"pVZ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -44567,17 +44820,6 @@
/obj/machinery/status_display/evac/directional/south,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"pXo" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
- dir = 8;
- initialize_directions = 4;
- name = "euthanization chamber freezer"
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"pXA" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -44613,6 +44855,10 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
+"pYh" = (
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"pYn" = (
/obj/structure/sign/plaques/kiddie/library{
pixel_y = -32
@@ -44646,13 +44892,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/lobby)
-"pZi" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
- dir = 1;
- name = "killroom vent"
- },
-/turf/open/floor/circuit/telecomms,
-/area/station/science/xenobiology)
"pZn" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -44664,6 +44903,14 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison)
+"pZG" = (
+/obj/machinery/power/solar_control{
+ id = "forestarboard";
+ name = "Starboard Bow Solar Control"
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"pZI" = (
/obj/effect/landmark/navigate_destination/library,
/turf/open/floor/carpet,
@@ -44679,6 +44926,7 @@
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/closet/secure_closet/cytology,
/turf/open/floor/holofloor/dark,
/area/station/science/cytology)
"qag" = (
@@ -44765,14 +45013,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
-"qbO" = (
-/obj/machinery/power/solar_control{
- id = "foreport";
- name = "Port Bow Solar Control"
- },
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"qbZ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -44926,16 +45166,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"qfl" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
"qfp" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -45191,14 +45421,6 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"qiD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"qjf" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -45329,12 +45551,6 @@
/obj/effect/landmark/start/hangover/closet,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
-"qll" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"qlG" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -45609,6 +45825,12 @@
/obj/effect/spawner/random/engineering/flashlight,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"qqq" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"qrg" = (
/obj/machinery/light_switch/directional/north,
/turf/open/floor/circuit/green{
@@ -45887,6 +46109,10 @@
name = "Containment Pen #4";
req_access = list("xenobiology")
},
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "pen4";
+ dir = 8
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"qvY" = (
@@ -45931,6 +46157,11 @@
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"qwM" = (
+/obj/machinery/power/smes,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"qwR" = (
/obj/structure/sign/directions/evac{
pixel_y = 1
@@ -46145,6 +46376,16 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space)
+"qAr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/hatch{
+ name = "Xenobiology Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science/xenobiology)
"qAA" = (
/obj/machinery/newscaster/directional/east,
/obj/machinery/computer/security/mining{
@@ -46379,11 +46620,6 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/general,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"qFc" = (
-/obj/machinery/power/smes,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"qFj" = (
/obj/structure/table,
/obj/effect/turf_decal/delivery,
@@ -46535,15 +46771,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"qIc" = (
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/obj/machinery/door/airlock/maintenance{
- name = "Research Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
"qIl" = (
/turf/closed/wall,
/area/station/hallway/secondary/command)
@@ -46593,6 +46820,14 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"qID" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/duct,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"qIK" = (
/obj/effect/spawner/structure/window,
/obj/machinery/door/poddoor/preopen{
@@ -47565,6 +47800,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"qZV" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/aft)
"rab" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -47799,6 +48045,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
+"rff" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/fore)
"rft" = (
/turf/closed/wall/r_wall,
/area/station/security/prison/mess)
@@ -48233,6 +48486,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"roL" = (
+/obj/effect/landmark/event_spawn,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/lesser)
"rps" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -48354,6 +48613,7 @@
id = "xenobio4";
name = "Xenobio Pen 4 Blast Door"
},
+/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"rrT" = (
@@ -48472,6 +48732,12 @@
dir = 1
},
/area/station/science/lobby)
+"rtO" = (
+/obj/structure/cable,
+/obj/machinery/light_switch/directional/north,
+/obj/machinery/power/apc/auto_name/directional/east,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"rtP" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
@@ -48677,6 +48943,7 @@
id = "xenobio3";
name = "Xenobio Pen 3 Blast Door"
},
+/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"rwE" = (
@@ -48877,11 +49144,6 @@
/obj/item/multitool,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"rzz" = (
-/obj/structure/sign/warning/cold_temp,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"rzB" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -49512,18 +49774,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"rKg" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 6
- },
-/obj/item/pen{
- pixel_x = -2;
- pixel_y = 5
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"rKh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49677,11 +49927,11 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"rMu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/space_heater,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science/xenobiology)
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"rMz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/green{
@@ -49718,6 +49968,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"rNf" = (
+/obj/structure/cable,
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
"rNs" = (
/obj/machinery/light/small/directional/east,
/obj/effect/turf_decal/tile/blue{
@@ -49981,6 +50236,17 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"rRB" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/fore)
"rRR" = (
/obj/structure/sign/warning/vacuum/external/directional/south,
/obj/machinery/light/small/directional/north,
@@ -50188,6 +50454,17 @@
},
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain/private)
+"rUT" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/structure/chair/stool/directional/south,
+/obj/machinery/camera/directional/west{
+ c_tag = "Solar Maintenance - Aft Starboard"
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"rUU" = (
/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -50388,6 +50665,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"rYq" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
+"rYy" = (
+/obj/machinery/power/smes,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"rYA" = (
/obj/machinery/porta_turret/ai,
/obj/machinery/flasher/directional/north{
@@ -50923,6 +51210,14 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/button/door{
+ id = "XenoPens";
+ layer = 3.3;
+ name = "Xenobiology Lockdown";
+ pixel_y = 0;
+ req_access = list("xenobiology");
+ pixel_x = 24
+ },
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"sgB" = (
@@ -50987,10 +51282,11 @@
/turf/open/floor/engine,
/area/station/science/xenobiology)
"sie" = (
-/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"siz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -51244,7 +51540,7 @@
dir = 1
},
/obj/effect/turf_decal/bot_white,
-/obj/machinery/smartfridge/petri/preloaded,
+/obj/machinery/smartfridge/extract/preloaded,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"soa" = (
@@ -51288,13 +51584,6 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
-"spk" = (
-/obj/structure/chair/stool/directional/north,
-/obj/machinery/camera/directional/west{
- c_tag = "Solar Maintenance - Fore Port"
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"spH" = (
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/tile/neutral{
@@ -51498,6 +51787,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
+"ssE" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"ssI" = (
/obj/machinery/power/emitter,
/turf/open/floor/plating,
@@ -51948,6 +52244,11 @@
/obj/item/pillow/random,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"sBd" = (
+/obj/structure/lattice,
+/obj/item/stack/cable_coil,
+/turf/open/space/basic,
+/area/space/nearstation)
"sBL" = (
/obj/structure/chair/stool/directional/west,
/obj/effect/mapping_helpers/broken_floor,
@@ -52027,6 +52328,7 @@
id = "xenobio5";
name = "Xenobio Pen 5 Blast Door"
},
+/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"sCz" = (
@@ -52832,13 +53134,6 @@
/obj/structure/disposalpipe/trunk,
/turf/open/floor/wood,
/area/station/cargo/quartermaster)
-"sRI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"sRJ" = (
/obj/structure/extinguisher_cabinet/directional/east,
/obj/item/kirbyplants{
@@ -53763,15 +54058,6 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/science/robotics/lab)
-"tgm" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"tgo" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -53850,17 +54136,11 @@
/area/station/cargo/storage)
"thT" = (
/obj/structure/cable,
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Central West";
- network = list("ss13","rd","xeno")
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/button/door/directional/east{
- id = "XenoPens";
- name = "Xenobiology Shutters";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"thY" = (
/obj/effect/spawner/random/structure/grille,
@@ -54339,14 +54619,6 @@
/obj/effect/spawner/random/clothing/costume,
/turf/open/floor/plating,
/area/station/maintenance/port)
-"tqw" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"tqx" = (
/obj/machinery/door/window/left/directional/south{
dir = 1;
@@ -54423,19 +54695,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
-"trL" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio2";
- layer = 3.3;
- name = "Xenobio Pen 2 Blast Doors";
- pixel_y = 1;
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"trM" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -55110,12 +55369,9 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"tGS" = (
-/obj/structure/cable,
-/obj/machinery/door/window/left/directional/north{
- dir = 2;
- name = "Containment Pen #2";
- req_access = list("xenobiology")
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"tGX" = (
@@ -55175,10 +55431,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"tIe" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"tIk" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
@@ -55497,13 +55749,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
-"tMI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"tMJ" = (
/obj/structure/toilet/greyscale{
dir = 4
@@ -55693,6 +55938,15 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"tQJ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/machinery/door/poddoor/preopen{
+ id = "Xenolab";
+ name = "Test Chamber Blast Door"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"tRb" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable,
@@ -56100,15 +56354,6 @@
},
/turf/open/floor/plating,
/area/station/command/heads_quarters/rd)
-"tYR" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/power/terminal{
- dir = 4
- },
-/obj/structure/cable,
-/obj/structure/chair/stool/directional/west,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"tYS" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Two";
@@ -56932,6 +57177,10 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
+"unx" = (
+/obj/structure/cable,
+/turf/closed/wall/r_wall,
+/area/station/maintenance/department/science/xenobiology)
"unL" = (
/turf/closed/wall,
/area/station/maintenance/starboard/greater)
@@ -57586,12 +57835,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/brig)
-"uyg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
"uyi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -57685,6 +57928,14 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"uAC" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/aft)
"uAE" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -57709,6 +57960,12 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port)
+"uAV" = (
+/obj/machinery/corral_corner{
+ mapping_id = "5"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"uBg" = (
/obj/structure/window/spawner/directional/south,
/obj/machinery/computer/atmos_control/carbon_tank{
@@ -57956,15 +58213,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/station/security/checkpoint/customs)
-"uFn" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/unres,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/lesser)
"uFq" = (
/obj/machinery/door/window/left/directional/south{
dir = 8;
@@ -58200,6 +58448,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
+"uIi" = (
+/obj/structure/cable,
+/obj/machinery/power/solar_control{
+ dir = 1;
+ id = "starboardsolar";
+ name = "Starboard Quarter Solar Control"
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/starboard/aft)
"uIs" = (
/turf/closed/wall,
/area/station/service/kitchen)
@@ -58278,11 +58535,6 @@
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron,
/area/station/commons/locker)
-"uJL" = (
-/obj/machinery/power/smes,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"uKa" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 6
@@ -58340,21 +58592,6 @@
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/iron/white,
/area/station/security/medical)
-"uKW" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/north{
- base_state = "right";
- dir = 2;
- icon_state = "right";
- name = "Containment Pen #2";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
- name = "Xenobio Pen 2 Blast Door"
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"uLa" = (
/obj/effect/spawner/random/structure/table_or_rack,
/obj/effect/spawner/random/maintenance/two,
@@ -58475,19 +58712,10 @@
/area/station/medical/psychology)
"uNs" = (
/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 8;
- id = "XenoPens";
- name = "Xenobiology Lockdown"
- },
-/turf/open/floor/iron,
+/turf/closed/wall/r_wall,
/area/station/science/xenobiology)
"uND" = (
/obj/effect/decal/cleanable/dirt,
@@ -58596,15 +58824,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"uQu" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/sign/xenobio_guide/directional/north,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"uQF" = (
/obj/structure/lattice,
/obj/item/stack/rods,
@@ -58634,6 +58853,15 @@
},
/turf/open/floor/iron/dark,
/area/station/security/evidence)
+"uRa" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/fore)
"uRh" = (
/obj/structure/window/spawner/directional/south,
/obj/machinery/airalarm/directional/east,
@@ -58837,6 +59065,11 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/engineering/atmos)
+"uVk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"uVm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59021,11 +59254,7 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"uYP" = (
-/obj/structure/cable,
-/obj/machinery/door/window/left/directional/north{
- name = "Containment Pen #7";
- req_access = list("xenobiology")
- },
+/obj/machinery/duct,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"uYT" = (
@@ -59196,6 +59425,11 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
+"vdE" = (
+/obj/structure/lattice,
+/obj/item/stack/rods,
+/turf/open/space/basic,
+/area/space)
"vdJ" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/random,
@@ -59726,6 +59960,17 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"vlZ" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/aft)
"vmm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -60186,6 +60431,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"vul" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"vun" = (
/turf/closed/wall,
/area/station/medical/storage)
@@ -60227,13 +60480,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"vvD" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Euthanasia Chamber";
- network = list("ss13","rd","xeno")
- },
-/turf/open/floor/circuit/telecomms,
-/area/station/science/xenobiology)
"vvH" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -60275,7 +60521,7 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"vxa" = (
-/mob/living/simple_animal/slime,
+/mob/living/basic/slime,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"vxi" = (
@@ -60429,13 +60675,13 @@
/turf/open/floor/iron,
/area/station/commons/dorms)
"vAa" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"vAc" = (
/obj/structure/sign/poster/official/cleanliness{
@@ -60618,18 +60864,6 @@
/obj/item/storage/backpack/duffelbag/med/surgery,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"vDV" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/table/glass,
-/obj/machinery/reagentgrinder{
- pixel_x = -1;
- pixel_y = 8
- },
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"vEd" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/processor{
@@ -60933,15 +61167,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"vJl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"vJt" = (
/obj/structure/cable,
/obj/machinery/firealarm/directional/west,
@@ -61558,7 +61783,10 @@
/area/station/hallway/primary/central)
"vVx" = (
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"vVy" = (
/obj/structure/disposalpipe/segment,
@@ -61730,14 +61958,16 @@
/area/station/medical/treatment_center)
"vXi" = (
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/computer/camera_advanced/xenobio{
- dir = 8
- },
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
/obj/effect/turf_decal/bot,
/obj/machinery/light/small/directional/north,
+/obj/structure/table/glass,
+/obj/machinery/reagentgrinder{
+ pixel_x = -1;
+ pixel_y = 8
+ },
/turf/open/floor/iron,
/area/station/science/xenobiology)
"vXt" = (
@@ -61780,6 +62010,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"vYc" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"vYg" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
@@ -61917,6 +62155,13 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"was" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"waB" = (
/obj/machinery/door/airlock/external/glass{
name = "Supply Door Airlock"
@@ -62120,6 +62365,10 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"weG" = (
+/obj/structure/chair/sofa/corp/left,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"weJ" = (
/obj/machinery/door/airlock{
name = "Central Emergency Storage"
@@ -62421,6 +62670,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"wjT" = (
+/obj/machinery/power/smes,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/aft)
"wjV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62560,6 +62815,16 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"wmJ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"wmL" = (
/turf/closed/wall/r_wall,
/area/station/science/xenobiology/hallway)
@@ -63042,9 +63307,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"wwc" = (
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/aft)
"wwj" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -63381,13 +63643,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
-"wCH" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"wCL" = (
/obj/structure/chair/stool/directional/south,
/obj/effect/turf_decal/siding/wood{
@@ -63448,6 +63703,16 @@
/obj/structure/cable,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
+"wEu" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"wEz" = (
/obj/item/stack/sheet/cardboard,
/obj/effect/spawner/random/trash/janitor_supplies,
@@ -63745,6 +64010,9 @@
pixel_y = 1;
req_access = list("xenobiology")
},
+/obj/machinery/slime_pen_controller{
+ mapping_id = "pen7"
+ },
/turf/open/floor/iron,
/area/station/science/xenobiology)
"wKX" = (
@@ -64082,14 +64350,6 @@
/obj/structure/sign/poster/contraband/random/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
-"wPY" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"wPZ" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{
dir = 1
@@ -64226,17 +64486,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
-"wSc" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"wSe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -64890,6 +65139,17 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"xea" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"xej" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -64904,11 +65164,14 @@
/turf/open/floor/plating,
/area/station/maintenance/central)
"xen" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science/xenobiology)
+/obj/structure/cable,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"xew" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65002,10 +65265,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"xfK" = (
-/obj/machinery/drone_dispenser/preloaded,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science/central)
"xga" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -65176,6 +65435,14 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"xiC" = (
+/obj/machinery/light/floor/has_bulb,
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "6";
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"xiL" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/science/xenobiology)
@@ -65888,14 +66155,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
/area/station/cargo/storage)
-"xvy" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/structure/fans/tiny,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"xvI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66191,6 +66450,16 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/construction/storage_wing)
+"xBw" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Starboard Quarter Solar Access"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/landmark/navigate_destination/common/starboardquartersolar,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/aft)
"xBx" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -66620,6 +66889,14 @@
/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"xJa" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/lesser)
"xJi" = (
/obj/machinery/flasher/portable,
/obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -66728,15 +67005,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"xMr" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/fore)
"xMx" = (
/obj/structure/chair/office,
/turf/open/floor/iron,
@@ -66786,6 +67054,14 @@
/obj/structure/cable,
/turf/open/floor/grass,
/area/station/medical/pathology)
+"xNm" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/duct,
+/obj/structure/sign/xenobio_guide/directional/east,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"xNo" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -67058,22 +67334,11 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"xRk" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"xRB" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"xRH" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable,
-/turf/open/space/basic,
-/area/station/solars/starboard/aft)
"xRZ" = (
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
@@ -67154,17 +67419,6 @@
},
/turf/closed/wall/r_wall,
/area/station/hallway/primary/fore)
-"xUC" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/starboard/fore)
"xUE" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -67228,8 +67482,28 @@
dir = 1
},
/area/station/engineering/atmos/pumproom)
+"xVr" = (
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/obj/machinery/camera{
+ c_tag = "Xenobiology Lab - Pen #7";
+ dir = 5;
+ network = list("ss13","rd","xeno")
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"xVu" = (
-/turf/closed/wall,
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "2"
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"xVA" = (
/obj/machinery/atmospherics/components/binary/pump{
@@ -67301,6 +67575,10 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
+"xWJ" = (
+/obj/machinery/drone_dispenser,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science/central)
"xWQ" = (
/obj/machinery/status_display/door_timer{
id = "Cell 2";
@@ -67459,6 +67737,12 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"xZy" = (
+/obj/structure/sign/warning/vacuum/external/directional/east,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/solars/port/fore)
"xZB" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -67490,7 +67774,12 @@
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/effect/turf_decal/bot_white,
/obj/structure/cable,
-/obj/machinery/monkey_recycler,
+/obj/machinery/biomass_recycler,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"yaj" = (
@@ -67659,13 +67948,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tcomms)
-"ycA" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/camera/directional/north{
- c_tag = "Solar Maintenance - Aft Port"
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/solars/port/aft)
"ycM" = (
/turf/closed/wall/r_wall,
/area/station/security/warden)
@@ -67775,6 +68057,18 @@
/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
/turf/open/floor/plating,
/area/station/service/hydroponics)
+"yeL" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id = "XenoPens";
+ name = "Xenobiology Lockdown"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"yeS" = (
/obj/item/retractor,
/obj/item/hemostat{
@@ -67879,6 +68173,9 @@
req_access = list("xenobiology");
sync_doors = 4
},
+/obj/machinery/slime_pen_controller{
+ mapping_id = "pen4"
+ },
/turf/open/floor/iron,
/area/station/science/xenobiology)
"ygR" = (
@@ -67940,6 +68237,14 @@
/obj/structure/marker_beacon/purple,
/turf/open/space/basic,
/area/space/nearstation)
+"yig" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/box,
+/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/camera/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"yih" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/shower/directional/west,
@@ -78221,11 +78526,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+rrt
+rrt
+rrt
+rrt
+rrt
aaa
aaa
aaa
@@ -78479,9 +78784,9 @@ aaa
aaa
aaa
rrt
-rrt
-rrt
-rrt
+aaa
+aaa
+aaa
rrt
aaa
aaa
@@ -78726,27 +79031,27 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
rrt
-aaa
-aaa
-aaa
+rrt
+rrt
+rrt
+rrt
+rrt
+rrt
+rrt
+rrt
rrt
aaa
+kuK
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+rrt
+aUn
+aUn
+aUn
+aUn
+aUn
+aUn
+aUn
aaa
aaa
aaa
@@ -78984,28 +79289,28 @@ aaa
aaa
aaa
rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
aaa
-kuK
+lMJ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+dPw
+aaa
+aIw
+aaa
+lMJ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
aaa
aaa
aaa
@@ -79240,35 +79545,35 @@ aaa
aaa
aaa
aaa
+rrt
aaa
+lMJ
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+xuK
+xuK
+xuK
+aYN
lMJ
-aaa
aIw
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+lMJ
+aYN
+xuK
+xuK
+xuK
+lMJ
+lMJ
+lMJ
+lMJ
+lMJ
+rrt
+rrt
+rrt
+rrt
+rrt
+rrt
+rrt
blx
aaa
blx
@@ -79503,17 +79808,17 @@ lMJ
aaa
aaa
aaa
-xuK
-xuK
-xuK
+eqf
+eqf
+eqf
aYN
-lMJ
-aIw
-lMJ
+aaa
+raz
+aaa
+aYN
+aYN
+eqf
aYN
-xuK
-xuK
-xuK
aaa
aaa
aaa
@@ -79760,29 +80065,29 @@ lMJ
lMJ
lMJ
lMJ
-eqf
+xuK
+xuK
+xuK
aYN
eqf
-aYN
-aaa
raz
-aaa
-aYN
-aYN
eqf
aYN
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+xuK
+xuK
+xuK
+dJN
+lMJ
+rNf
+rNf
+lMJ
+lMJ
+jXe
+lMJ
+lMJ
+dJN
+dJN
+dJN
dJN
aaa
lMJ
@@ -80017,17 +80322,17 @@ lMJ
aaa
aaa
aaa
-xuK
-xuK
-xuK
eqf
eqf
+eqf
+bOr
+aaa
raz
+aaa
+aYN
+aYN
eqf
aYN
-xuK
-xuK
-xuK
aaa
aaa
aaa
@@ -80274,17 +80579,17 @@ lMJ
aaa
aaa
aaa
-eqf
-aYN
-aYN
-bOr
-aaa
-raz
-aaa
-aYN
+xuK
+xuK
+xuK
aYN
-eqf
+lMJ
+fzl
+vdE
aYN
+xuK
+xuK
+xuK
aaa
aaa
aaa
@@ -80531,17 +80836,17 @@ lMJ
aaa
aaa
aaa
-xuK
-xuK
-xuK
-aYN
+aaa
+aaa
+aaa
lMJ
-fzl
-uQF
-aYN
-xuK
-xuK
-xuK
+aaa
+aIw
+aaa
+sBd
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -82337,7 +82642,7 @@ lMJ
aaa
fzl
aaa
-lMJ
+uQF
aaa
aaa
aaa
@@ -82594,7 +82899,7 @@ aYN
aaa
riK
aaa
-aYN
+bOr
xuK
xuK
xuK
@@ -82844,8 +83149,8 @@ aaa
aaa
aaa
aaa
-aYN
-aYN
+eqf
+eqf
eqf
aYN
aaa
@@ -83358,8 +83663,8 @@ aaa
aaa
aaa
aaa
-aYN
-aYN
+eqf
+eqf
eqf
aYN
aaa
@@ -83620,7 +83925,7 @@ xuK
xuK
aYN
aaa
-aIw
+raz
aaa
aYN
xuK
@@ -84136,7 +84441,7 @@ aYN
aaa
riK
aaa
-aYN
+bOr
xuK
xuK
xuK
@@ -84386,8 +84691,8 @@ lMJ
aaa
aaa
aaa
-aYN
-aYN
+eqf
+eqf
eqf
aYN
aaa
@@ -84901,7 +85206,7 @@ aaa
aaa
aaa
eqf
-aYN
+eqf
eqf
aYN
aaa
@@ -85535,7 +85840,7 @@ aaa
aaa
aaa
sGL
-fHe
+qZV
sGL
aaa
aaa
@@ -85792,7 +86097,7 @@ aaa
aaa
aaa
sGL
-eIc
+uAC
sGL
aaa
aaa
@@ -86049,7 +86354,7 @@ tSw
tSw
gAf
sGL
-wSc
+ctN
sGL
sGL
lMJ
@@ -86305,9 +86610,9 @@ qEf
gXF
gmS
bhS
-ycA
-pro
-lUM
+cxi
+jfJ
+dvT
ecz
aaa
aaa
@@ -86561,10 +86866,10 @@ drm
drm
tSw
mnN
-fuF
-wPY
-nQl
-tYR
+kNV
+gnL
+dQb
+dWA
ecz
aaa
aaa
@@ -86712,9 +87017,9 @@ aaa
tOm
tOm
tOm
-qbO
-spk
-mVR
+ntM
+pgJ
+fRZ
hZQ
ybi
twr
@@ -86819,9 +87124,9 @@ tSw
tSw
vUM
bhS
-iVn
-dqw
-mSU
+rtO
+cnF
+wjT
ecz
aaa
aaa
@@ -86966,13 +87271,13 @@ aaa
raz
raz
raz
-xMr
-xvy
-eha
-bbL
-hoc
-qll
-lTY
+grI
+hsp
+iJm
+lzJ
+oeO
+ktG
+mIg
qMD
vMd
fUr
@@ -87226,9 +87531,9 @@ aaa
tOm
tOm
tOm
-gfc
-ewF
-uJL
+xZy
+btB
+qwM
srk
qGP
sHu
@@ -96312,7 +96617,7 @@ lPx
wOS
orv
dPY
-xfK
+xWJ
kQe
cId
rQl
@@ -99379,7 +99684,7 @@ rHE
dbd
aBJ
jXK
-aJE
+sQB
gLU
uDO
oOB
@@ -99636,7 +99941,7 @@ wXF
wXF
wXF
dlG
-uyg
+ipM
rsD
qos
cQr
@@ -99884,16 +100189,16 @@ aKb
aKb
wpx
htd
-qfl
-uFn
-lhX
-cZs
-pOo
-eHN
+mrJ
+lvs
+xJa
+kxW
+gWH
+roL
mxI
eBw
gbS
-uyg
+ipM
dYT
tCT
bpA
@@ -100150,7 +100455,7 @@ tUn
hKV
wXF
jLm
-aJE
+sQB
lqL
psT
wqj
@@ -100407,7 +100712,7 @@ tUn
hKV
wIo
jBi
-aJE
+sQB
gIi
iPe
mJG
@@ -100664,7 +100969,7 @@ tUn
hKV
wXF
mvR
-qIc
+jKa
mvR
mvR
mvR
@@ -104815,15 +105120,15 @@ aaa
aaa
aaa
aaa
-gCE
+nBa
aaa
aaa
aaa
-gCE
+nBa
aaa
aaa
aaa
-gCE
+nBa
aaa
aaa
aaa
@@ -105071,17 +105376,17 @@ aaa
aaa
aaa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
+nBa
cKn
-gCE
+nBa
aaa
aaa
aaa
@@ -105328,17 +105633,17 @@ aaa
aaa
aaa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
aaa
aaa
@@ -105585,17 +105890,17 @@ aaa
aaa
aaa
aaa
-gCE
+nBa
cKn
-gCE
+nBa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
aaa
aaa
@@ -105833,9 +106138,9 @@ fwP
imU
fPD
oWc
-qFc
-bnp
-phT
+rYy
+rUT
+uIi
gDT
gDT
gDT
@@ -105843,7 +106148,7 @@ aaa
aaa
aaa
aaa
-xRH
+cKn
aaa
aaa
aaa
@@ -105851,7 +106156,7 @@ cKn
aaa
aaa
aaa
-xRH
+cKn
aaa
aaa
lMJ
@@ -106089,25 +106394,25 @@ egs
ftK
ixV
pTu
-fPB
-git
-kqj
-cgd
-fUq
-jUK
-dKh
+xBw
+hRU
+lmK
+pms
+apT
+pOF
+vlZ
+rxH
+rxH
+rxH
+rxH
rxH
rxH
rxH
rxH
-uYi
rxH
-uYi
rxH
rxH
rxH
-uYi
-uYi
uYi
rxH
rxH
@@ -106271,11 +106576,11 @@ qXB
fwG
ldO
oQb
-lGN
-azS
-lGN
-nLX
-lGN
+psZ
+mSB
+psZ
+edC
+psZ
psZ
qXB
ttA
@@ -106347,9 +106652,9 @@ bLd
ixd
bLd
oWk
-bxg
-otR
-wwc
+oXJ
+mmF
+nRz
gDT
gDT
gDT
@@ -106361,11 +106666,11 @@ cKn
aaa
aaa
aaa
-xRH
+cKn
aaa
aaa
aaa
-xRH
+cKn
aaa
aaa
lMJ
@@ -106613,17 +106918,17 @@ aaa
aaa
aaa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
aaa
aaa
@@ -106870,17 +107175,17 @@ aaa
aaa
aaa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
+nBa
cKn
-gCE
+nBa
aaa
aaa
aaa
@@ -107127,17 +107432,17 @@ aaa
aaa
aaa
aaa
-gCE
-xRH
-gCE
+nBa
+cKn
+nBa
aaa
-gCE
-xRH
+nBa
+cKn
nBa
aaa
-gCE
+nBa
cKn
-gCE
+nBa
aaa
aaa
aaa
@@ -107385,15 +107690,15 @@ aaa
aaa
aaa
aaa
-gCE
+nBa
aaa
aaa
aaa
-gCE
+nBa
aaa
aaa
aaa
-gCE
+nBa
aaa
aaa
aaa
@@ -109926,18 +110231,20 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
lMJ
lMJ
lMJ
oMA
lSw
+oMA
+oMA
wmL
gUS
qBo
gUS
wmL
+oMA
+oMA
lSw
oMA
aox
@@ -109963,8 +110270,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
lKu
aaa
aaa
@@ -110182,8 +110487,6 @@ lMJ
lMJ
lMJ
lMJ
-lMJ
-lMJ
lFq
oMA
oMA
@@ -110192,7 +110495,11 @@ oMA
eYu
agN
bXs
+hzL
+hzL
tLc
+hjw
+hjw
juH
pJA
hLJ
@@ -110276,8 +110583,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(165,1,1) = {"
aaa
@@ -110438,8 +110743,6 @@ aaa
aaa
lMJ
aaa
-lMJ
-aaa
aaa
uaR
oue
@@ -110449,8 +110752,12 @@ qad
xfm
nHG
hjw
+hjw
+hjw
bqJ
hzL
+hzL
+hzL
wNO
tml
mez
@@ -110533,8 +110840,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(166,1,1) = {"
aaa
@@ -110695,8 +111000,6 @@ aaa
aaa
dxK
aaa
-dxK
-aaa
aaa
oMA
sKf
@@ -110706,7 +111009,11 @@ vhZ
tsy
sRa
ppC
+hjw
+hjw
twu
+mBj
+mBj
mKD
hxY
nae
@@ -110790,8 +111097,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(167,1,1) = {"
aaa
@@ -110952,8 +111257,6 @@ aaa
aaa
lMJ
aaa
-lMJ
-aaa
aaa
uaR
jHX
@@ -110963,7 +111266,11 @@ toR
syV
jsi
eoZ
+hjw
+hjw
jjm
+hjw
+hjw
nui
wWV
vsp
@@ -110986,8 +111293,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
lKu
aaa
aaa
@@ -111210,8 +111515,6 @@ lMJ
lMJ
lMJ
lMJ
-lMJ
-lMJ
jlU
jlU
jlU
@@ -111220,9 +111523,13 @@ jlU
jlU
snZ
lVB
+ycv
+ycv
bsE
-uHD
kvT
+kvT
+uHD
+xea
jlU
jlU
jlU
@@ -111304,8 +111611,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(169,1,1) = {"
aaa
@@ -111466,8 +111771,6 @@ aaa
aaa
aaa
aaa
-lMJ
-aaa
aaa
aaa
cXP
@@ -111477,7 +111780,11 @@ plp
gog
fUx
pst
+pYh
+pYh
fkk
+pYh
+pYh
vuK
yag
hFz
@@ -111561,8 +111868,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(170,1,1) = {"
aaa
@@ -111721,25 +112026,27 @@ eoU
aaf
aaa
aaa
-aaa
-aaa
lMJ
aaa
aaa
aaa
cXP
mtu
-vxa
+mtu
mtu
jfS
bQQ
lVB
+ycv
+ycv
oWa
-iWc
+ycv
+ycv
+mJQ
ces
elm
mtu
-vxa
+mtu
mtu
cXP
aaa
@@ -111751,8 +112058,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
lKu
aaa
aaa
@@ -111977,8 +112282,6 @@ sUo
eoU
aaf
aaa
-aaa
-aaa
rrt
rrt
lMJ
@@ -111991,7 +112294,11 @@ ycd
gog
jjj
jNo
+min
+jOI
sgk
+min
+min
klK
aDQ
hFz
@@ -112075,8 +112382,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(172,1,1) = {"
aaa
@@ -112162,9 +112467,9 @@ aav
sxo
sxo
sxo
-gXs
-kbn
-lBt
+pZG
+ltg
+nEe
tCS
dOY
psZ
@@ -112234,28 +112539,30 @@ eoU
eoU
aaf
aaa
-aaa
-aaa
rrt
aaa
aaa
bPB
kWc
-xiL
+jlU
gTK
hMv
wKT
vGq
vXi
ncF
+flp
+yeL
uNs
+flp
+flp
gSM
frt
vGq
qko
gyI
phI
-xiL
+jlU
kvO
bPB
aaa
@@ -112332,8 +112639,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(173,1,1) = {"
aaa
@@ -112416,13 +112721,13 @@ jhd
rQw
rQw
jhd
-cpl
-duN
-xUC
-sRI
-aUT
-xRk
-iJJ
+uRa
+ivK
+rRB
+rff
+jnv
+pwy
+ozs
etA
psZ
tCS
@@ -112489,31 +112794,33 @@ aaf
aaf
aaf
aaf
-aaf
-aaa
rrt
aox
aox
aox
hbK
hbK
+oFv
+jlU
rMu
-xiL
-jCO
-fdZ
-mMK
+nOh
mLW
-mMK
+lJg
+mLW
+mLW
+cFW
mMK
jxH
-tMI
+pwZ
pwZ
dxc
+bRc
fdZ
-fdZ
-jvX
-xiL
+nOh
+nOh
gTS
+jlU
+nqk
hbK
hbK
lMJ
@@ -112589,8 +112896,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(174,1,1) = {"
aaa
@@ -112676,9 +112981,9 @@ aav
sxo
sxo
sxo
-foV
-dUk
-ptn
+dRR
+gFd
+lek
buk
cNi
wrn
@@ -112746,31 +113051,33 @@ eoU
eoU
eoU
eoU
-lMJ
-aaa
rrt
lAu
lAu
lMJ
wrc
oyj
+qAr
+uVk
xen
mdo
vAa
-vJl
+iwO
amV
vVx
-kyh
+iwO
iwO
pQj
-jzw
+thT
thT
jzw
sie
-pgM
-qiD
+nYL
+nYL
nYL
ddK
+hoV
+gga
hAN
wrc
aaa
@@ -112818,38 +113125,36 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-"}
-(175,1,1) = {"
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+"}
+(175,1,1) = {"
aaa
aaa
aaa
@@ -113004,29 +113309,31 @@ jRg
jRg
eoU
lMJ
-aaa
-lMJ
lMJ
lMJ
lMJ
wrc
oyj
xiL
-xiL
+fUH
+mtu
+mtu
idA
-xVu
+lYY
dgz
-tIe
-xVu
-hja
-vDV
-nSC
-xVu
+eTk
+uAV
+mtu
+mtu
+mtu
+aVx
pJf
pfP
xVu
-idA
-xiL
+mtu
+mtu
+mtu
+iUk
xiL
lmn
wrc
@@ -113103,8 +113410,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(176,1,1) = {"
aaa
@@ -113260,8 +113565,6 @@ pnE
wit
lPa
eoU
-lMJ
-aaa
rrt
lAu
lAu
@@ -113269,21 +113572,25 @@ lMJ
hbK
uhs
xiL
-kHt
-iOZ
-idF
-faD
-lTi
-xVu
-cXP
-cXP
-cXP
-xVu
-jbk
-iWc
-pVR
-hCw
-mCj
+mtu
+mtu
+mtu
+idA
+mtu
+dgz
+eTk
+mtu
+mtu
+mtu
+mtu
+mtu
+pJf
+pfP
+mtu
+mtu
+mtu
+mtu
+mtu
xiL
lmn
hbK
@@ -113360,8 +113667,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
"}
(177,1,1) = {"
aaa
@@ -113519,34 +113824,34 @@ jRg
eoU
lMJ
aaa
-rrt
-aox
-aox
-aox
+aaa
+aaa
wrc
oyj
xiL
eSr
+vxa
+fmR
tGS
-uKW
-faD
-iWc
-cXP
-aJQ
+uYP
+dgz
+pfP
+uYP
+uYP
gXw
-pZi
-cXP
-lVB
-iWc
-pDl
+mtu
+mtu
+pJf
+pfP
+uYP
uYP
+cjT
+vxa
ljF
xiL
lmn
wrc
-lMJ
-lMJ
-mxQ
+aaa
aaa
aaa
aaa
@@ -113776,34 +114081,34 @@ eoU
eoU
lMJ
aaa
-rrt
-lAu
-lAu
-lMJ
-hbK
+aaa
+aaa
+wrc
oyj
xiL
mtu
+mtu
+mtu
iOZ
-trL
-faD
-iWc
-cXP
-gXw
-gXw
-vvD
-cXP
-lVB
-iWc
-eSC
-hCw
+mtu
+dgz
+eTk
+mtu
+mtu
+mtu
+mtu
+mtu
+pJf
+pfP
+mtu
+mtu
+mtu
+mtu
mtu
xiL
lmn
-hbK
-aaa
+wrc
aaa
-lMJ
aaa
aaa
aaa
@@ -114033,34 +114338,34 @@ wJw
eoU
lMJ
aaa
-lMJ
-lMJ
-lMJ
-lMJ
-wrc
+aaa
+aaa
+hbK
oyj
xiL
-xiL
-idA
-xVu
-uQu
-iWc
-xVu
-pXo
-jSj
-rzz
-xVu
-lVB
-exu
-xVu
-idA
-xiL
+iTV
+mtu
+mtu
+iOZ
+gbm
+dgz
+rYq
+jhX
+mtu
+mtu
+mtu
+jhX
+meQ
+pfP
+kOV
+mtu
+mtu
+mtu
+xVr
xiL
lmn
-wrc
-aaa
+hbK
aaa
-mxQ
aaa
aaa
aaa
@@ -114288,37 +114593,37 @@ cGV
hDe
xEg
eoU
-lMJ
-aaa
rrt
-lAu
-lAu
-lMJ
+aaa
+aaa
+aaa
wrc
oyj
-oyj
xiL
-nEb
-bSu
-caf
-tgm
-gKD
-fdZ
-fdZ
-fdZ
-iMR
-bnQ
-psc
-wCH
-rKg
+mtu
+mtu
+mtu
+iOZ
+mtu
+dgz
+eTk
+mtu
+mtu
+mtu
+mtu
+mtu
+pJf
+pfP
+mtu
+mtu
+mtu
+mtu
+mtu
xiL
lmn
-lmn
wrc
aaa
aaa
-mxQ
-aaa
aaa
aaa
aaa
@@ -114545,33 +114850,35 @@ wEf
ojv
wJw
eoU
-lMJ
-aaa
rrt
aox
aox
aox
-hbK
-hbK
+wrc
oyj
xiL
-nkq
-rwx
-byP
-dac
-evD
+eSr
+vxa
+khw
+lFe
+uYP
+dgz
+pfP
+uYP
+uYP
+xiC
+mtu
+mtu
pJf
-ycv
-tIe
-min
-min
-tqw
-ohD
-dQa
+pfP
+uYP
+uYP
+eml
+vxa
+ljF
xiL
lmn
-hbK
-hbK
+wrc
lMJ
lMJ
mxQ
@@ -114611,44 +114918,42 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-"}
-(182,1,1) = {"
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+"}
+(182,1,1) = {"
aaa
aaa
aaa
@@ -114803,31 +115108,34 @@ eoU
eoU
eoU
lMJ
-aaa
-aaa
-aaa
-rrt
-aaa
-aaa
-wrc
+lAu
+lAu
+lMJ
+hbK
oyj
xiL
-jgq
-imw
-aft
-ygF
-rrL
-fMF
-min
-irp
-sCv
-ixR
-shY
-eOP
-jgq
+mtu
+mtu
+mtu
+idA
+mtu
+dgz
+eTk
+mtu
+mtu
+mtu
+mtu
+mtu
+pJf
+pfP
+mtu
+mtu
+mtu
+mtu
+mtu
xiL
lmn
-wrc
+hbK
aaa
aaa
lMJ
@@ -114901,9 +115209,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
"}
(183,1,1) = {"
aaa
@@ -115059,38 +115364,38 @@ yfx
ets
ets
eoU
-lMJ
-aaa
-aaa
-aaa
rrt
-aaa
-aaa
+lMJ
+lMJ
+lMJ
wrc
oyj
xiL
+cFw
mtu
mtu
-vHm
-shY
-qvQ
-aft
-diq
-shY
-gjv
-aft
-xCA
+idA
+obi
+dgz
+eTk
+iCZ
+mtu
+mtu
+mtu
+cqQ
+pJf
+pfP
+jau
mtu
mtu
+mtu
+dMA
xiL
lmn
wrc
aaa
aaa
-rrt
-aaa
-aaa
-aaa
+mxQ
aaa
aaa
aaa
@@ -115316,38 +115621,38 @@ oiI
rvx
dzY
eoU
-lMJ
-aaa
-aaa
-aaa
rrt
-rrt
-rrt
-hbK
+lAu
+lAu
+lMJ
+wrc
oyj
xiL
-rTi
-iXS
-vHm
-xCA
-mtu
-vHm
-gva
-xCA
-vxa
-vHm
-xCA
-iXS
-lWM
xiL
+nEb
+bae
+elT
+heo
+ddN
+fJq
+gmB
+gmB
+gmB
+gmB
+gmB
+was
+ssE
+nOh
+vYc
+wmJ
+ogF
+xiL
+unx
lmn
-hbK
-lMJ
-lMJ
-rrt
-aaa
+wrc
aaa
aaa
+mxQ
aaa
aaa
aaa
@@ -115573,38 +115878,38 @@ aLr
aJe
ets
eoU
-lMJ
-aaa
-aaa
-aaa
-aaa
-aaa
aaa
+aox
+aox
+aox
hbK
oyj
+oyj
xiL
-xiL
-xiL
-xiL
-weD
-mtu
-vHm
-gva
-xCA
-mtu
-fVV
-xiL
-xiL
-xiL
+nkq
+rwx
+wEu
+vul
+kkT
+jdj
+xNm
+jdj
+jdj
+jdj
+jdj
+qID
+jdj
+qqq
+kKG
+ohD
+dQa
xiL
lmn
+lmn
hbK
-aaa
-aaa
-aaa
-aaa
-lKu
-aaa
+lMJ
+lMJ
+mxQ
aaa
aaa
aaa
@@ -115830,37 +116135,37 @@ eoU
eoU
eoU
eoU
-lMJ
-aaa
-aaa
-aaa
aaa
aaa
+rrt
aaa
+dAJ
hbK
oyj
-oyj
-goW
-msN
xiL
+jgq
+imw
+aft
+ygF
+rrL
+cHV
jlU
-gEu
-lKd
+aYt
gva
-iZJ
-rDd
+aYt
+jlU
jlU
+sCv
+ixR
+shY
+eOP
+jgq
xiL
-qxr
lmn
-lmn
-hAN
hbK
+dAJ
aaa
-aaa
-aaa
-aaa
-aaa
+lMJ
aaa
aaa
aaa
@@ -116087,34 +116392,37 @@ xWn
kwZ
kwZ
eoU
-lMJ
-aaa
-aaa
aaa
aaa
+rrt
aaa
aaa
-hbK
-rDf
-rDf
-rDf
-uhs
-fjd
-jlU
+wrc
+oyj
+xiL
+mtu
+mtu
+vHm
+shY
+qvQ
+aft
eJI
-sZN
-msR
-xkv
+ycv
+kCw
+ycv
lOY
-jlU
-iOJ
+shY
+gjv
+aft
+xCA
+mtu
+mtu
+xiL
lmn
-rDf
-rDf
-utD
-hbK
+wrc
aaa
aaa
+rrt
aaa
aaa
aaa
@@ -116186,11 +116494,8 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-"}
-(188,1,1) = {"
+"}
+(188,1,1) = {"
aaa
aaa
aaa
@@ -116344,37 +116649,37 @@ iiL
kwZ
aWa
eoU
-lMJ
-nYJ
-lMJ
+aaa
+aaa
rrt
rrt
rrt
-lMJ
-hbK
-hbK
-wMz
-rDf
-eUe
-eSb
-nnc
-hdy
-nnc
-rvK
-nnc
-hdy
-aWp
-eSb
-udp
-wHd
-uLa
hbK
+oyj
+xiL
+rTi
+iXS
+vHm
+xCA
+mtu
+vHm
+fHs
+ycv
+kCw
+kCw
+gRY
+xCA
+mtu
+vHm
+xCA
+iXS
+lWM
+xiL
+lmn
hbK
-aaa
-aaa
-aaa
-aaa
-aaa
+lMJ
+lMJ
+rrt
aaa
aaa
aaa
@@ -116601,39 +116906,39 @@ tDR
aNB
kwZ
eoU
-lMJ
aaa
aaa
-lMJ
aaa
aaa
aaa
-lMJ
-hbK
-hbK
hbK
-mgS
-hbK
-jlU
-mtu
-mtu
-gyK
+oyj
+xiL
+xiL
+xiL
+xiL
+weD
mtu
+vHm
+weG
+ycv
+ycv
+ycv
+dGk
+xCA
mtu
-jlU
-hbK
-mTg
-hbK
-hbK
+fVV
+xiL
+xiL
+xiL
+xiL
+lmn
hbK
-lMJ
-aaa
-aaa
-aaa
aaa
aaa
aaa
aaa
+lKu
aaa
aaa
aaa
@@ -116858,29 +117163,33 @@ eoU
eoU
eoU
eoU
-lMJ
-aaa
aaa
-lMJ
aaa
aaa
aaa
-lMJ
aaa
hbK
-tmU
-fGy
-wyo
+oyj
+oyj
+goW
+msN
+xiL
jlU
-dLm
-mtu
-gyK
-mtu
-mtu
+gEu
+lKd
+ycv
+ycv
+ycv
+ycv
+ycv
+iZJ
+rDd
jlU
-qgn
-mCV
-wyo
+xiL
+qxr
+lmn
+lmn
+hAN
hbK
aaa
aaa
@@ -116956,10 +117265,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
"}
(191,1,1) = {"
aaa
@@ -117116,28 +117421,32 @@ lMJ
lMJ
lMJ
lMJ
-lMJ
-rrt
-nYJ
-rrt
-rrt
-rrt
-lMJ
-lMJ
+aaa
+aaa
+aaa
+aaa
hbK
-pWT
rDf
-uLa
+rDf
+rDf
+uhs
+fjd
jlU
-eSr
-mtu
-jQz
-nJr
-ljF
+yig
+sZN
+pUX
+nmy
+cVQ
+nmy
+pUX
+xkv
+igH
jlU
-lUS
-pHt
+iOJ
+lmn
rDf
+rDf
+utD
hbK
aaa
aaa
@@ -117213,10 +117522,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
"}
(192,1,1) = {"
aaa
@@ -117373,33 +117678,33 @@ aaa
aaa
lMJ
aaa
-aaa
-aaa
-lMJ
-aaa
-aaa
-aaa
+rrt
+rrt
+rrt
lMJ
-aaa
-bPB
hbK
-wrc
-wrc
-jlU
-mtu
-mtu
-mtu
-mtu
-mtu
-jlU
-wrc
-wrc
hbK
-bPB
-lMJ
-aaa
-aaa
-aaa
+wMz
+rDf
+eUe
+eSb
+nnc
+hdy
+cbn
+tQJ
+tQJ
+rvK
+tQJ
+tQJ
+nnc
+hdy
+aWp
+eSb
+udp
+wHd
+uLa
+hbK
+hbK
aaa
aaa
aaa
@@ -117630,25 +117935,32 @@ aaa
aaa
nYJ
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
lMJ
aaa
aaa
aaa
-aaa
lMJ
+hbK
+hbK
+hbK
+mgS
+hbK
jlU
+mtu
+mtu
+mtu
+mtu
+gyK
+mtu
+mtu
+mtu
+mtu
jlU
-bPu
-asL
-kcu
-jlU
-jlU
+hbK
+mTg
+hbK
+hbK
+hbK
lMJ
aaa
aaa
@@ -117724,13 +118036,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
"}
(194,1,1) = {"
aaa
@@ -117886,32 +118191,32 @@ rrt
rrt
rrt
rrt
-lMJ
-lMJ
-rrt
-rrt
-lAu
-rrt
-rrt
-rrt
-rrt
-rrt
rrt
lMJ
-lMJ
-lMJ
-jlU
-jlU
-jlU
-jlU
-jlU
-lMJ
-aaa
-aaa
aaa
aaa
aaa
+lMJ
aaa
+hbK
+tmU
+fGy
+wyo
+jlU
+dLm
+mtu
+mtu
+mtu
+gyK
+mtu
+mtu
+mtu
+mtu
+jlU
+qgn
+mCV
+wyo
+hbK
aaa
aaa
aaa
@@ -118144,31 +118449,31 @@ aaa
aaa
lMJ
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-lMJ
-lMJ
-lMJ
+nYJ
+rrt
+rrt
+rrt
lMJ
lMJ
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+hbK
+pWT
+rDf
+uLa
+jlU
+eSr
+mtu
+mtu
+mtu
+jQz
+mtu
+mtu
+nJr
+ljF
+jlU
+lUS
+pHt
+rDf
+hbK
aaa
aaa
aaa
@@ -118401,23 +118706,31 @@ aaa
aaa
lMJ
aaa
+lMJ
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-lKu
-aaa
-aaa
-lMJ
-aaa
lMJ
aaa
+bPB
+hbK
+wrc
+wrc
+jlU
+mtu
+mtu
+mtu
+mtu
+mtu
+mtu
+mtu
+mtu
+mtu
+jlU
+wrc
+wrc
+hbK
+bPB
lMJ
aaa
aaa
@@ -118494,14 +118807,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
"}
(197,1,1) = {"
aaa
@@ -118658,28 +118963,28 @@ rrt
rrt
rrt
rrt
+lMJ
aaa
aaa
aaa
+lMJ
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-rrt
lMJ
-aaa
-lMJ
-aaa
+jlU
+jlU
+bPu
+mtu
+mtu
+asL
+mtu
+mtu
+kcu
+jlU
+jlU
lMJ
-rrt
-aaa
-aaa
-aaa
aaa
aaa
aaa
@@ -118915,27 +119220,27 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-dxK
-aaa
+rrt
+lAu
+rrt
+rrt
+rrt
+rrt
+rrt
+rrt
+lMJ
+lMJ
+lMJ
+jlU
+jlU
+jlU
+jlU
+jlU
+jlU
+jlU
+jlU
+jlU
lMJ
-aaa
-dxK
-aaa
-aaa
-aaa
aaa
aaa
aaa
@@ -119183,15 +119488,15 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+lMJ
lMJ
aaa
aaa
+lMJ
aaa
aaa
+lMJ
+lMJ
aaa
aaa
aaa
@@ -119437,18 +119742,18 @@ aaa
aaa
aaa
aaa
+lKu
aaa
aaa
+lMJ
aaa
aaa
aaa
-aaa
-aaa
-yib
-aaa
+lMJ
aaa
aaa
aaa
+lMJ
aaa
aaa
aaa
@@ -119696,17 +120001,17 @@ aaa
aaa
aaa
aaa
+rrt
+lMJ
aaa
aaa
aaa
+lMJ
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+lMJ
+rrt
aaa
aaa
aaa
@@ -119954,15 +120259,15 @@ aaa
aaa
aaa
aaa
+dxK
aaa
aaa
aaa
+lMJ
aaa
aaa
aaa
-aaa
-aaa
-aaa
+dxK
aaa
aaa
aaa
@@ -120215,7 +120520,7 @@ aaa
aaa
aaa
aaa
-aaa
+lMJ
aaa
aaa
aaa
@@ -120472,7 +120777,7 @@ aaa
aaa
aaa
aaa
-aaa
+yib
aaa
aaa
aaa
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index bd13c17ff159..056d85d90db0 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -13122,11 +13122,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/lobby)
-"drB" = (
-/obj/machinery/processor/slime,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard)
"drD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment{
@@ -28195,7 +28190,7 @@
/turf/open/floor/iron/cafeteria,
/area/station/commons/locker)
"hBX" = (
-/mob/living/simple_animal/slime,
+/mob/living/basic/slime,
/turf/open/floor/grass,
/area/station/science/xenobiology)
"hBY" = (
@@ -51144,9 +51139,6 @@
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port/aft)
"nyc" = (
-/obj/machinery/computer/camera_advanced/xenobio{
- dir = 4
- },
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"nyd" = (
@@ -53900,7 +53892,7 @@
/turf/open/floor/iron/dark,
/area/station/hallway/floor1/fore)
"oiH" = (
-/mob/living/simple_animal/slime,
+/mob/living/basic/slime,
/turf/open/floor/grass,
/area/station/maintenance/floor3/starboard)
"oiJ" = (
@@ -58698,7 +58690,7 @@
/turf/open/floor/iron/white,
/area/station/science/circuits)
"pBw" = (
-/mob/living/simple_animal/slime,
+/mob/living/basic/slime,
/obj/machinery/camera/directional/south{
c_tag = "Xenobiology - Slime Pens"
},
@@ -72640,7 +72632,6 @@
/turf/open/floor/iron,
/area/station/hallway/floor4/fore)
"tuA" = (
-/obj/machinery/monkey_recycler,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/circuit,
@@ -80706,7 +80697,7 @@
/area/station/science/xenobiology/hallway)
"vHn" = (
/obj/machinery/light/cold/no_nightlight/directional/east,
-/mob/living/simple_animal/slime,
+/mob/living/basic/slime,
/turf/open/floor/grass,
/area/station/science/xenobiology)
"vHq" = (
@@ -82841,7 +82832,6 @@
/turf/open/floor/iron,
/area/station/security/prison)
"wlb" = (
-/obj/machinery/processor/slime,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/circuit,
@@ -250465,7 +250455,7 @@ fNq
iKT
xNf
mpy
-drB
+iKT
iHm
rGl
vIh
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index bc8c8c3ac4c6..e5b29c800e85 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -11295,7 +11295,6 @@
/obj/effect/turf_decal/stripes/end{
dir = 4
},
-/obj/machinery/processor/slime,
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
"FD" = (
@@ -13990,7 +13989,6 @@
/turf/open/floor/engine/cult,
/area/centcom/wizard_station)
"MT" = (
-/obj/machinery/computer/camera_advanced/xenobio,
/obj/structure/noticeboard/directional/east,
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
@@ -14835,7 +14833,6 @@
/obj/effect/turf_decal/stripes/end{
dir = 8
},
-/obj/machinery/monkey_recycler,
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
"Pv" = (
@@ -17344,7 +17341,7 @@
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/medical)
"Ww" = (
-/mob/living/simple_animal/slime,
+/mob/living/basic/slime,
/turf/open/floor/circuit/red/off,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
"Wx" = (
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 2a033325c5ca..50c02b52bfe5 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -1525,7 +1525,11 @@
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"aeu" = (
/obj/effect/landmark/start/shaft_miner,
@@ -2243,20 +2247,6 @@
/obj/structure/chair/stool/bar/directional/east,
/turf/open/floor/wood/large,
/area/station/service/barber)
-"ahk" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
-"ahl" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez4";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"ahm" = (
/turf/open/openspace/airless/planetary,
/area/station/asteroid)
@@ -2276,11 +2266,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/turf/open/floor/plating/airless,
/area/station/asteroid)
-"ahp" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"ahr" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/spawner/random/structure/girder,
@@ -3325,7 +3310,12 @@
"aqB" = (
/obj/effect/turf_decal/trimline/purple/filled/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/obj/machinery/light/floor/has_bulb,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"aqM" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -4085,10 +4075,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"ayN" = (
-/obj/machinery/light/directional/north,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"ayQ" = (
/obj/machinery/atmospherics/pipe/multiz/scrubbers/hidden/layer2{
dir = 1
@@ -5369,7 +5355,7 @@
/turf/open/floor/engine/cult,
/area/station/service/library)
"aJT" = (
-/mob/living/simple_animal/slime,
+/mob/living/basic/slime,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"aJV" = (
@@ -6139,18 +6125,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
-"aPz" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/table,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/machinery/button/door{
- id = "containdeez5";
- name = "Cell Containment Toggle Button"
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"aPB" = (
/obj/machinery/firealarm/directional/east{
pixel_y = 6
@@ -7296,8 +7270,10 @@
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"bgH" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"bgN" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner,
@@ -7815,22 +7791,6 @@
},
/turf/open/floor/plating,
/area/station/medical/pharmacy)
-"bql" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/south{
- name = "Containment Pen #4";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/north{
- name = "Containment Pen #4";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez4";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"bqu" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -8094,6 +8054,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hos)
+"bvm" = (
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"bvq" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -8133,7 +8099,7 @@
dir = 4
},
/obj/machinery/disposal/bin,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"bvM" = (
/obj/machinery/computer/mech_bay_power_console,
@@ -10650,15 +10616,11 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
"cim" = (
-/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/duct,
/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/machinery/disposal/bin,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"ciA" = (
/obj/machinery/door/airlock/external{
@@ -10848,6 +10810,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
+"cml" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "4"
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"cmo" = (
/obj/effect/turf_decal/siding/thinplating/end,
/turf/open/floor/iron/dark,
@@ -11248,14 +11217,6 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
-"cue" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"cut" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/south,
@@ -11560,7 +11521,7 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"cyW" = (
/obj/effect/turf_decal/siding/wood{
@@ -11578,15 +11539,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/medical)
-"cyY" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez4";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"cyZ" = (
/obj/machinery/atmospherics/miner/nitrogen,
/turf/open/floor/engine/n2,
@@ -12168,25 +12120,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
-"cJP" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/north{
- name = "Containment Pen #7";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/south{
- name = "Containment Pen #7";
- req_access = list("xenobiology")
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez7";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"cJR" = (
/obj/machinery/rnd/server,
/turf/open/floor/circuit/telecomms/server,
@@ -12662,25 +12595,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/glass/reinforced,
/area/station/ai_monitored/turret_protected/aisat/hallway)
-"cSj" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/machinery/door/window/left/directional/east{
- name = "Containment Pen #1";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/west{
- name = "Containment Pen #1";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez1";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"cSp" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 8
@@ -12864,7 +12778,9 @@
},
/obj/machinery/light/directional/east,
/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/iron/white,
+/obj/item/disk/vacuum_upgrade/biomass,
+/obj/item/disk/vacuum_upgrade/biomass,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"cWj" = (
/obj/structure/railing{
@@ -13098,7 +13014,9 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron/white,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"cZH" = (
/obj/effect/turf_decal/trimline/purple/filled/corner,
@@ -13318,12 +13236,11 @@
/turf/open/space/openspace,
/area/station/solars/starboard/fore)
"deh" = (
+/obj/structure/sink/directional/west,
/obj/effect/turf_decal/stripes/line{
- dir = 1
+ dir = 4
},
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/sink/directional/west,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"del" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -13907,12 +13824,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
-"dne" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"dnh" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -14295,6 +14206,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"dtN" = (
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"dtS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sink/kitchen/directional/west,
@@ -15439,7 +15355,7 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"dOx" = (
/obj/structure/window/reinforced/spawner/directional/west,
@@ -15700,7 +15616,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"dQR" = (
/obj/machinery/power/terminal{
@@ -16179,6 +16095,14 @@
},
/turf/open/floor/noslip,
/area/station/hallway/primary/tram/center)
+"dZn" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "3";
+ dir = 1
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"dZu" = (
/obj/machinery/mecha_part_fabricator,
/obj/effect/turf_decal/delivery,
@@ -17735,13 +17659,8 @@
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock/oresilo)
"exH" = (
-/obj/structure/table,
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/button/door{
- id = "containdeez4";
- name = "Cell Containment Toggle Button"
- },
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"exJ" = (
/obj/structure/cable,
@@ -18060,6 +17979,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"eCA" = (
+/obj/machinery/corral_corner{
+ mapping_id = "1"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "1"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"eCE" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -18096,6 +18024,15 @@
/obj/structure/table,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"eDO" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"eDV" = (
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/obj/effect/decal/cleanable/dirt,
@@ -18254,8 +18191,9 @@
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"eGt" = (
+/obj/machinery/duct,
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"eHj" = (
/obj/machinery/vending/tool,
@@ -18689,15 +18627,6 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/crew_quarters/dorms)
-"eQm" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/structure/chair/comfy/black{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"eQn" = (
/obj/machinery/door/airlock/command/glass{
name = "Secure External Operations"
@@ -19880,6 +19809,12 @@
/obj/structure/grille,
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
+"fkf" = (
+/obj/machinery/corral_corner{
+ mapping_id = "4"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"fkg" = (
/obj/machinery/biogenerator,
/obj/effect/turf_decal/tile/green/fourcorners,
@@ -20142,9 +20077,9 @@
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
"fof" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/structure/sign/warning/cold_temp/directional/south,
-/turf/open/floor/circuit/telecomms,
+/obj/machinery/computer/slime_market,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"fog" = (
/obj/machinery/vending/cigarette,
@@ -20295,15 +20230,6 @@
},
/turf/open/openspace,
/area/station/hallway/primary/tram/center)
-"fqM" = (
-/obj/structure/disposaloutlet{
- dir = 8
- },
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"fqZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
@@ -20902,10 +20828,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark/textured,
/area/station/engineering/main)
-"fAm" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"fAA" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -21793,22 +21715,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/processing)
-"fPv" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/north{
- name = "Containment Pen #1";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/south{
- name = "Containment Pen #1";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez1";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"fPx" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood/poker,
@@ -21839,22 +21745,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering)
-"fQo" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/north{
- name = "Containment Pen #5";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/south{
- name = "Containment Pen #5";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez5";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"fQK" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -23849,7 +23739,8 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"gDr" = (
/obj/effect/turf_decal/stripes/corner{
@@ -24233,7 +24124,10 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"gKb" = (
/obj/effect/turf_decal/stripes/end{
@@ -24523,11 +24417,13 @@
/turf/open/floor/catwalk_floor,
/area/station/maintenance/central/lesser)
"gNr" = (
-/obj/machinery/processor/slime,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/structure/table/glass,
+/obj/item/vacuum_pack,
+/obj/item/vacuum_pack,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"gNu" = (
/obj/effect/decal/cleanable/dirt,
@@ -24674,18 +24570,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance)
-"gPD" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/table,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/button/door{
- id = "containdeez7";
- name = "Cell Containment Toggle Button"
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"gPM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
@@ -25314,15 +25198,6 @@
/obj/machinery/light/warm/directional/south,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"hcn" = (
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"hcv" = (
/obj/effect/spawner/random/entertainment/arcade{
dir = 1
@@ -25347,12 +25222,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/r_wall,
/area/ruin/powered/clownplanet)
-"hdA" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"hdB" = (
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
@@ -25596,13 +25465,12 @@
/turf/open/misc/asteroid,
/area/station/maintenance/department/cargo)
"hik" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
/obj/structure/sink/directional/east,
/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"hin" = (
/turf/closed/wall/rock,
@@ -26317,10 +26185,6 @@
pixel_x = 10;
pixel_y = 20
},
-/mob/living/simple_animal/slime/pet{
- colour = "orange";
- name = "Happy Accident"
- },
/turf/open/floor/plastic,
/area/station/engineering/break_room)
"huz" = (
@@ -26828,14 +26692,6 @@
/obj/structure/cable/layer1,
/turf/open/floor/plating/airless,
/area/station/solars/starboard/fore)
-"hDT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/obj/effect/turf_decal/trimline/purple/filled/corner,
-/obj/effect/turf_decal/trimline/purple/filled/corner{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"hEb" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -27483,15 +27339,6 @@
/obj/effect/landmark/start/lawyer,
/turf/open/floor/wood,
/area/station/service/lawoffice)
-"hPB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"hPI" = (
/obj/machinery/holopad,
/obj/structure/cable,
@@ -27987,7 +27834,7 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"hYK" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -28817,15 +28664,6 @@
/obj/machinery/atm,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"inn" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/structure/chair/comfy/black{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"int" = (
/obj/effect/landmark/event_spawn,
/obj/structure/disposalpipe/segment,
@@ -29898,10 +29736,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"iEF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/floor/circuit/telecomms,
-/area/station/science/xenobiology)
"iEO" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -31400,15 +31234,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
-"jcm" = (
-/obj/structure/disposaloutlet{
- dir = 8
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"jcq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/stool/directional/east,
@@ -31743,6 +31568,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"jhk" = (
+/obj/effect/turf_decal/trimline/purple/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"jhs" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
@@ -31897,13 +31732,6 @@
/obj/structure/cable,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai)
-"jkd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"jkq" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
@@ -32556,9 +32384,7 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 5
},
-/obj/item/kirbyplants{
- icon_state = "plant-10"
- },
+/obj/machinery/slime_extract_requestor,
/turf/open/floor/iron/white,
/area/station/science/lobby)
"jur" = (
@@ -33102,25 +32928,6 @@
/obj/structure/disposalpipe/trunk,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
-"jDF" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/east{
- name = "Containment Pen #5";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/west{
- name = "Containment Pen #5";
- req_access = list("xenobiology")
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez5";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"jDN" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album/chapel,
@@ -33358,7 +33165,7 @@
id = "containdeez2";
name = "Cell Containment Toggle Button"
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"jHi" = (
/obj/machinery/vending/wardrobe/viro_wardrobe,
@@ -34729,19 +34536,7 @@
/turf/open/floor/carpet,
/area/station/security/detectives_office)
"keT" = (
-/obj/machinery/door/airlock/research{
- glass = 1;
- name = "Slime Euthanization Chamber";
- opacity = 0
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 8
- },
+/obj/machinery/plumbing/ooze_compressor,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"kfl" = (
@@ -35054,12 +34849,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
-"kkx" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"kkK" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 6
@@ -35075,7 +34864,7 @@
c_tag = "Science - Xenobiology North";
network = list("ss13","rd")
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"kkP" = (
/obj/structure/bookcase/random/religion,
@@ -36713,7 +36502,8 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"kMl" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -37060,12 +36850,6 @@
/turf/open/floor/iron/showroomfloor,
/area/station/security/warden)
"kQM" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
/obj/machinery/disposal/bin,
/obj/structure/sign/warning/deathsposal/directional/west,
/obj/structure/disposalpipe/trunk{
@@ -37075,7 +36859,10 @@
c_tag = "Science - Xenobiology West";
network = list("ss13","rd")
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"kQX" = (
/obj/machinery/computer/security{
@@ -37212,6 +36999,10 @@
},
/turf/open/floor/wood,
/area/station/command/meeting_room)
+"kTh" = (
+/obj/machinery/duct,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"kTi" = (
/obj/machinery/duct,
/obj/structure/cable,
@@ -38191,25 +37982,6 @@
/obj/effect/turf_decal/trimline/white/warning,
/turf/open/floor/iron,
/area/station/maintenance/tram/mid)
-"lhS" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/north{
- name = "Containment Pen #3";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/south{
- name = "Containment Pen #3";
- req_access = list("xenobiology")
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez3";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"lhT" = (
/obj/structure/cable/multilayer/connected,
/obj/effect/decal/cleanable/dirt,
@@ -39167,11 +38939,16 @@
/turf/open/floor/iron/white,
/area/station/science/lower)
"lym" = (
-/obj/machinery/monkey_recycler,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/machinery/biomass_recycler,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/obj/item/stack/biomass,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"lyq" = (
/obj/effect/decal/cleanable/dirt,
@@ -39216,7 +38993,11 @@
/area/station/science/ordnance/storage)
"lyQ" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
-/turf/open/floor/iron/white,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/duct,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"lyR" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -40656,6 +40437,10 @@
},
/turf/open/floor/glass/reinforced,
/area/station/ai_monitored/turret_protected/aisat/hallway)
+"lYq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"lYr" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -41472,9 +41257,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"mln" = (
-/turf/open/floor/circuit/telecomms,
-/area/station/science/xenobiology)
"mlu" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -42038,22 +41820,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"muf" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/east{
- name = "Containment Pen #3";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/west{
- name = "Containment Pen #3";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez3";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"mur" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42413,12 +42179,10 @@
/turf/open/floor/iron/smooth,
/area/station/maintenance/starboard/greater)
"mBm" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez1";
- name = "Xenobiology Containment Blast Door"
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
},
-/turf/open/floor/plating,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"mBq" = (
/turf/closed/wall/r_wall,
@@ -43017,11 +42781,12 @@
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"mLE" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"mLM" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -43244,7 +43009,7 @@
id = "containdeez6";
name = "Cell Containment Toggle Button"
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"mPm" = (
/obj/effect/decal/cleanable/dirt,
@@ -43506,19 +43271,11 @@
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
"mTR" = (
+/obj/machinery/light/floor/has_bulb,
/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/extinguisher{
- pixel_x = 4;
- pixel_y = 3
+ dir = 6
},
-/obj/item/extinguisher,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"mUd" = (
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{
@@ -43895,12 +43652,10 @@
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai_upload)
"nbI" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez7";
- name = "Xenobiology Containment Blast Door"
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
},
-/turf/open/floor/plating,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"nbK" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
@@ -44338,7 +44093,8 @@
/area/station/security/brig)
"njf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"njl" = (
/obj/machinery/duct,
@@ -45730,7 +45486,10 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"nEF" = (
/obj/structure/table/glass,
@@ -46062,8 +45821,9 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
},
-/obj/machinery/smartfridge/extract/preloaded,
-/turf/open/floor/iron/white,
+/obj/machinery/light/floor/has_bulb,
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"nLK" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -47325,6 +47085,12 @@
/obj/structure/table,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"ohh" = (
+/obj/machinery/corral_corner{
+ mapping_id = "6"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"oho" = (
/obj/structure/bookcase,
/turf/open/floor/wood,
@@ -48570,17 +48336,6 @@
/obj/effect/spawner/random/trash/food_packaging,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/central)
-"oCY" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"oDd" = (
/obj/effect/turf_decal/siding/white{
dir = 1
@@ -49055,6 +48810,11 @@
"oNd" = (
/turf/open/floor/mineral/titanium/blue,
/area/station/maintenance/starboard/central)
+"oNg" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"oNp" = (
/obj/structure/sink{
pixel_y = 15
@@ -49811,6 +49571,9 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"pbt" = (
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"pby" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -49974,18 +49737,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/prison/safe)
-"pet" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/table,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/button/door{
- id = "containdeez1";
- name = "Cell Containment Toggle Button"
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"peO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/showroomfloor,
@@ -50294,6 +50045,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
+"pkQ" = (
+/obj/machinery/corral_corner{
+ mapping_id = "3"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "3"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"pkU" = (
/obj/effect/turf_decal/trimline/green/corner{
dir = 1
@@ -50590,7 +50350,7 @@
dir = 4
},
/obj/machinery/light/directional/east,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"ppr" = (
/obj/machinery/computer/security{
@@ -51693,11 +51453,8 @@
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
"pEa" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
- dir = 8;
- name = "killroom vent"
- },
-/turf/open/floor/circuit/telecomms,
+/obj/machinery/slime_market_pad,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"pEe" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -52714,6 +52471,15 @@
/obj/effect/turf_decal/siding/thinplating/corner,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"pUb" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "1";
+ dir = 1
+ },
+/obj/machinery/light/floor/has_bulb,
+/mob/living/basic/slime,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"pUj" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 10
@@ -52987,12 +52753,11 @@
/turf/open/floor/iron/dark/textured_large,
/area/station/bitrunning/den)
"pYZ" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"pZd" = (
/obj/machinery/door/airlock/maintenance_hatch{
@@ -53734,7 +53499,12 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/obj/machinery/light/floor/has_bulb,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"qlk" = (
/obj/machinery/atmospherics/components/unary/cryo_cell{
@@ -54327,15 +54097,6 @@
/obj/effect/spawner/random/engineering/flashlight,
/turf/open/floor/iron/smooth,
/area/station/maintenance/starboard/lesser)
-"qvF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"qvK" = (
/obj/structure/chair/office/light,
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -54520,6 +54281,14 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"qyA" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "6";
+ dir = 2
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"qyI" = (
/obj/effect/landmark/tram/tramstation/east,
/turf/open/floor/noslip/tram_plate,
@@ -54793,7 +54562,7 @@
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"qCX" = (
/obj/effect/turf_decal/stripes/line{
@@ -55503,12 +55272,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"qNF" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"qNI" = (
/turf/closed/wall,
/area/station/medical/medbay/central)
@@ -56140,13 +55903,13 @@
/turf/open/floor/iron,
/area/station/maintenance/tram/mid)
"qXs" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+/obj/machinery/corral_corner{
+ mapping_id = "6"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
+/obj/machinery/slime_pen_controller{
+ mapping_id = "6"
},
-/turf/open/floor/iron/white,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"qXI" = (
/obj/effect/turf_decal/trimline/dark_red/warning{
@@ -56190,6 +55953,10 @@
/obj/item/stack/sheet/glass/fifty,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"qYk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"qYx" = (
/obj/machinery/door/airlock{
id_tag = "Toilet5";
@@ -56493,7 +56260,6 @@
/turf/open/floor/catwalk_floor,
/area/station/command/gateway)
"rbU" = (
-/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -56502,7 +56268,10 @@
c_tag = "Science - Xenobiology East";
network = list("ss13","rd")
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"rbZ" = (
/obj/effect/mine/sound,
@@ -56609,7 +56378,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"rem" = (
/obj/machinery/button/door/directional/west{
@@ -57318,16 +57087,11 @@
/turf/open/floor/iron,
/area/station/engineering/main)
"roQ" = (
+/obj/machinery/light/floor/has_bulb,
/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/machinery/camera/directional/south{
- c_tag = "Science - Xenobiology South";
- network = list("ss13","rd")
+ dir = 10
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"roR" = (
/turf/closed/wall,
@@ -59068,12 +58832,6 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
-"rTt" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"rTz" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -59561,7 +59319,11 @@
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"scZ" = (
/obj/structure/flora/bush/flowers_yw/style_random,
@@ -60054,6 +59816,13 @@
},
/turf/open/misc/asteroid,
/area/station/security/prison/workout)
+"slz" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/turf_decal/sand/plating,
+/turf/closed/wall/r_wall,
+/area/station/asteroid)
"slA" = (
/obj/effect/turf_decal/sand/plating,
/obj/machinery/door/airlock/grunge{
@@ -60105,14 +59874,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison/workout)
-"sml" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez3";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"smA" = (
/obj/structure/chair/stool/directional/north,
/obj/structure/cable,
@@ -60833,6 +60594,15 @@
"syv" = (
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/science)
+"syx" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"syE" = (
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/obj/effect/turf_decal/stripes/line{
@@ -62926,13 +62696,6 @@
/obj/machinery/bci_implanter,
/turf/open/floor/iron,
/area/station/science/lower)
-"tfL" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"tfQ" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -63126,7 +62889,7 @@
dir = 8
},
/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"tiz" = (
/obj/structure/disposalpipe/sorting/mail{
@@ -63184,11 +62947,8 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"tjz" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
- dir = 4;
- name = "killroom vent"
- },
-/turf/open/floor/circuit/telecomms,
+/obj/machinery/smartfridge/extract/preloaded,
+/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"tjA" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -63212,10 +62972,10 @@
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
"tjP" = (
-/obj/effect/turf_decal/stripes/corner{
+/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"tjS" = (
/obj/machinery/conveyor{
@@ -63337,10 +63097,6 @@
/turf/open/floor/plating,
/area/station/asteroid)
"tlt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/computer/camera_advanced/xenobio,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
@@ -63350,7 +63106,7 @@
receive_ore_updates = 1;
supplies_requestable = 1
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"tlw" = (
/obj/effect/decal/cleanable/dirt,
@@ -64131,12 +63887,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/security/brig)
-"txM" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"txS" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -64188,11 +63938,8 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"tzq" = (
-/obj/structure/disposaloutlet{
- dir = 4
- },
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/machinery/corral_corner{
+ mapping_id = "1"
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -66369,7 +66116,7 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"uld" = (
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -66556,7 +66303,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"uov" = (
/turf/closed/wall/r_wall,
@@ -67030,18 +66777,6 @@
"uvv" = (
/turf/closed/wall/rock/porous,
/area/station/science/xenobiology)
-"uvy" = (
-/obj/structure/window/reinforced/spawner,
-/obj/structure/table,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/button/door{
- id = "containdeez3";
- name = "Cell Containment Toggle Button"
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"uvD" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/soap,
@@ -67250,13 +66985,13 @@
/turf/open/floor/iron,
/area/station/commons/dorms)
"uyb" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/machinery/corral_corner{
+ mapping_id = "4"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
+/obj/machinery/slime_pen_controller{
+ mapping_id = "4"
},
-/turf/open/floor/iron/white,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"uyd" = (
/obj/structure/table,
@@ -67410,14 +67145,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
-"uAF" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez5";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
"uAK" = (
/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/floor/iron/dark,
@@ -67789,15 +67516,6 @@
},
/turf/open/openspace,
/area/station/hallway/primary/tram/center)
-"uGU" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
- dir = 8;
- initialize_directions = 4;
- name = "euthanization chamber freezer"
- },
-/obj/effect/turf_decal/trimline/purple/filled/line,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"uGW" = (
/turf/closed/wall,
/area/station/cargo/miningdock)
@@ -68176,22 +67894,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"uLX" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/east{
- name = "Containment Pen #7";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/window/left/directional/west{
- name = "Containment Pen #7";
- req_access = list("xenobiology")
- },
-/obj/machinery/door/poddoor/preopen{
- id = "containdeez7";
- name = "Xenobiology Containment Blast Door"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"uMg" = (
/obj/structure/table,
/obj/item/radio/intercom,
@@ -69868,7 +69570,7 @@
dir = 8
},
/obj/machinery/disposal/bin,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"vmB" = (
/obj/effect/turf_decal/tile/neutral{
@@ -70672,6 +70374,12 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"vxy" = (
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"vxD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/white{
@@ -71307,12 +71015,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
-"vHi" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"vHl" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 8
@@ -71878,6 +71580,15 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"vRp" = (
+/obj/machinery/corral_corner{
+ mapping_id = "2"
+ },
+/obj/machinery/slime_pen_controller{
+ mapping_id = "2"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"vRq" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 1
@@ -72801,7 +72512,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"whi" = (
/obj/effect/turf_decal/siding/wood{
@@ -72927,17 +72638,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
/area/station/service/chapel/monastery)
-"wjK" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"wjP" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -73514,13 +73214,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/cargo)
-"wsT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"wts" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -73834,13 +73527,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
-"wxE" = (
-/obj/structure/disposaloutlet{
- dir = 4
- },
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"wxJ" = (
/obj/machinery/suit_storage_unit/engine,
/obj/effect/turf_decal/bot{
@@ -74208,12 +73894,6 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
-"wCv" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"wCT" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -74339,15 +74019,11 @@
/turf/open/floor/iron/dark/corner,
/area/station/science/robotics/mechbay)
"wET" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/computer/camera_advanced/xenobio,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"wEV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -74709,6 +74385,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"wKI" = (
+/obj/effect/turf_decal/trimline/purple/filled/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/stone,
+/area/station/science/xenobiology)
"wLl" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 4
@@ -75173,7 +74859,11 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 5
},
-/turf/open/floor/iron/white,
+/obj/machinery/light/floor/has_bulb,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"wUv" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -75605,7 +75295,7 @@
"xcM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"xdw" = (
/obj/machinery/portable_atmospherics/scrubber,
@@ -76236,6 +75926,14 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/lower)
+"xox" = (
+/obj/machinery/plumbing/ooze_sucker{
+ mapping_id = "2";
+ dir = 1
+ },
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"xoM" = (
/obj/structure/chair/stool/bar/directional/east,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -76544,11 +76242,12 @@
/turf/open/floor/iron/dark,
/area/station/science/lower)
"xuI" = (
-/obj/effect/turf_decal/stripes/corner{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/turf/open/floor/stone,
/area/station/science/xenobiology)
"xuL" = (
/obj/effect/decal/cleanable/dirt,
@@ -77716,6 +77415,10 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/smooth,
/area/station/maintenance/tram/left)
+"xQh" = (
+/obj/machinery/duct,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"xQv" = (
/turf/closed/wall/r_wall,
/area/station/construction/mining/aux_base)
@@ -122735,13 +122438,13 @@ qVr
qVr
qVr
qVr
-eiR
+slz
gmN
bfH
bfH
jTC
lIY
-pML
+mwK
qVr
qVr
qVr
@@ -122988,18 +122691,18 @@ oyV
dUT
qHK
qVr
-wxE
-fAm
-hdA
-qVr
+fkf
+bfH
+bfH
+fkf
qVr
fUz
rkI
fFu
jQE
lIY
-qVr
-qVr
+tzq
+bfH
bfH
bfH
tzq
@@ -123245,21 +122948,21 @@ oNT
dUT
gdC
qVr
-ayN
-aJT
-ahk
-hdA
+bfH
+bfH
+bfH
+bfH
mBm
kQM
jHg
-dne
+tjP
vmz
hik
-sml
bfH
bfH
-aJT
-jkd
+bfH
+bfH
+bfH
qVr
aaa
aaa
@@ -123504,19 +123207,19 @@ mfY
qVr
bfH
bfH
-asv
-cSj
+cml
+xQh
cim
-rTt
-whn
-whn
-whn
-tjP
-uvy
-muf
-asv
-kkx
-txM
+kTh
+kTh
+kTh
+kTh
+eGt
+xQh
+xQh
+pUb
+bfH
+dgR
qVr
aaa
aaa
@@ -123759,21 +123462,21 @@ hfP
uKt
uKt
qVr
-qVr
+fkf
+bfH
bfH
-fPv
uyb
xuI
+qYk
+qYk
+qYk
+qYk
njf
-njf
-njf
-njf
-njf
-tfL
-hPB
-lhS
-txM
-qVr
+bfH
+xQh
+bfH
+bfH
+bfH
qVr
aaa
aaa
@@ -124015,26 +123718,26 @@ dUT
vtq
fGZ
vtq
-xHw
+iix
qVr
-mBm
-pet
+syx
+tjP
pYZ
aqB
cVX
gNr
lym
pph
-aet
-whn
-tjP
-oCY
-sml
-qVr
-aaa
-aaa
-aaa
-aaa
+wKI
+eCA
+xQh
+bfH
+bfH
+tzq
+hee
+hee
+hee
+hee
aaa
aaa
vXM
@@ -124275,7 +123978,7 @@ qVr
qVr
qVr
tlt
-inn
+pbt
xcM
lyQ
jiQ
@@ -124287,10 +123990,10 @@ nED
aet
tjP
roQ
-qVr
-qVr
-qVr
-qVr
+pkQ
+bfH
+bfH
+bvm
qVr
aaa
aaa
@@ -124532,21 +124235,21 @@ vud
tml
qVr
qCW
-whn
+pbt
xcM
-lyQ
-asv
-mln
+dtN
+whn
+whn
tjz
asv
xta
oYQ
gCY
-whn
+pbt
exH
-ahl
bfH
bfH
+aJT
bfH
qVr
aaa
@@ -124791,20 +124494,20 @@ uiC
rdU
uon
whd
-hDT
+dtN
keT
-iEF
+whn
fof
aMB
sXX
akC
kMh
-whn
+kTh
eGt
-bql
+xQh
+xQh
+dZn
bfH
-bfH
-dgR
qVr
aaa
aaa
@@ -125046,22 +124749,22 @@ nPB
dGk
qVr
kkL
-whn
+pbt
dQK
-uGU
-asv
-mln
+dtN
+whn
+whn
pEa
asv
oAf
rhn
gCY
-whn
-wCv
-cyY
-fAm
-fAm
-fqM
+pbt
+exH
+bfH
+bfH
+bfH
+bfH
qVr
aaa
aaa
@@ -125303,7 +125006,7 @@ qVr
qVr
qVr
wET
-eQm
+pbt
cyU
cZE
jiQ
@@ -125315,10 +125018,10 @@ gJY
scO
bgH
mTR
-qVr
-qVr
-qVr
-qVr
+bvm
+bfH
+bfH
+bvm
qVr
aaa
aaa
@@ -125559,24 +125262,24 @@ bjQ
igS
uNT
qVr
-nbI
-wjK
-cue
+eDO
+bgH
+bgH
qlf
hYx
ulb
dOq
tix
-scO
-whn
-bgH
-aPz
-uAF
-qVr
-aaa
-aaa
-aaa
-aaa
+jhk
+vRp
+xQh
+bfH
+bfH
+vxy
+hee
+hee
+hee
+hee
aaa
aaa
aaa
@@ -125815,21 +125518,21 @@ hCv
grh
okh
qVr
-qVr
-kkx
-cJP
+ohh
+bfH
+bfH
qXs
mLE
-dGs
-dGs
-dGs
-dGs
-dGs
-ahp
-qvF
-fQo
+lYq
+lYq
+lYq
+lYq
+oNg
+bfH
+xQh
+bfH
+bfH
bfH
-qVr
qVr
aaa
aaa
@@ -126072,21 +125775,21 @@ kVf
sLd
vmk
qVr
-kkx
-txM
-asv
-uLX
-gPD
-qNF
-whn
-whn
-whn
-bgH
-hcn
-jDF
-asv
bfH
bfH
+qyA
+xQh
+cim
+kTh
+kTh
+kTh
+kTh
+eGt
+xQh
+xQh
+xox
+bfH
+dgR
qVr
aaa
aaa
@@ -126329,21 +126032,21 @@ ebs
hFH
tYB
qVr
-wsT
-aJT
+bfH
+bfH
bfH
bfH
nbI
deh
bvL
-vHi
+bgH
mPb
rbU
-uAF
-ahk
-hdA
+bfH
+bfH
+bfH
aJT
-dgR
+bfH
qVr
aaa
aaa
@@ -126586,21 +126289,21 @@ xOs
wdr
nrh
qVr
-jcm
+ohh
bfH
bfH
-qVr
+ohh
qVr
qVr
wdD
tXW
vTx
qVr
-qVr
-qVr
-ahk
-fAm
-fqM
+vxy
+bfH
+bfH
+bfH
+vxy
qVr
aaa
aaa
@@ -126847,13 +126550,13 @@ qVr
qVr
qVr
qVr
-aaa
+hee
qVr
jTC
bfH
bfH
qVr
-aaa
+hee
qVr
qVr
qVr
diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm
index dbc04bc5c266..751488dbff04 100644
--- a/_maps/templates/lazy_templates/nukie_base.dmm
+++ b/_maps/templates/lazy_templates/nukie_base.dmm
@@ -319,7 +319,6 @@
/obj/effect/turf_decal/stripes/end{
dir = 4
},
-/obj/machinery/processor/slime,
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
"ek" = (
@@ -2041,7 +2040,7 @@
/turf/open/space/basic,
/area/space/nearstation)
"zR" = (
-/mob/living/simple_animal/slime,
+/mob/living/basic/slime,
/turf/open/floor/circuit/red/off,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
"zT" = (
@@ -3259,7 +3258,6 @@
/turf/open/floor/iron/smooth,
/area/centcom/syndicate_mothership/control)
"Mv" = (
-/obj/machinery/computer/camera_advanced/xenobio,
/obj/structure/noticeboard/directional/east,
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
@@ -3460,7 +3458,6 @@
/obj/effect/turf_decal/stripes/end{
dir = 8
},
-/obj/machinery/monkey_recycler,
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
"Pc" = (
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
index 2466f770827e..55991a2ded55 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
@@ -105,6 +105,8 @@
///from base of mob/living/Stun() (amount, ignore_canstun)
#define COMSIG_LIVING_STATUS_STUN "living_stun"
+///from mob/living/carbon/enter_stamina_stun()
+#define COMSIG_LIVING_STAMINA_STUN "carbon_stamina_stun"
///from base of mob/living/Knockdown() (amount, ignore_canstun)
#define COMSIG_LIVING_STATUS_KNOCKDOWN "living_knockdown"
///from base of mob/living/Paralyze() (amount, ignore_canstun)
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index a33ccb140e05..af7d22f4a911 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -159,7 +159,7 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
#define ismouse(A) (istype(A, /mob/living/basic/mouse))
-#define isslime(A) (istype(A, /mob/living/simple_animal/slime))
+#define isslime(A) (istype(A, /mob/living/basic/slime))
#define isdrone(A) (istype(A, /mob/living/basic/drone))
diff --git a/code/__DEFINES/~monkestation/dcs/signals/signals_mob.dm b/code/__DEFINES/~monkestation/dcs/signals/signals_mob.dm
new file mode 100644
index 000000000000..2030e073340f
--- /dev/null
+++ b/code/__DEFINES/~monkestation/dcs/signals/signals_mob.dm
@@ -0,0 +1,25 @@
+#define COMSIG_MOB_STOP_HUNGER "stop_hunger_mob"
+#define COMSIG_MOB_START_HUNGER "start_hunger_mob"
+#define COMSIG_MOB_FEED "feed_hunger_mob"
+#define COMSIG_MOB_FED_ON "fed_on_mob"
+#define COMSIG_MOB_RETURN_HUNGER "return_hunger_mob"
+#define COMSIG_MOB_REFUSED_EAT "refused_hunger_mob"
+#define COMSIG_MOB_OVERATE "overate_hunger_mob"
+#define COMSIG_MOB_EAT_NORMAL "normal_eat_hunger_mob"
+#define COMSIG_MOB_STARVING "starving_hunger_mob"
+#define COMSIG_MOB_FULLY_STARVING "full_starve_hunger_mob"
+#define COMSIG_SECRETION_UPDATE "secretion_update"
+#define COMSIG_FEEDING_CHECK "latch_check"
+#define COMSIG_HUNGER_UPDATED "update_hunger_mob"
+#define COMSIG_LIVING_ATE "living_ate_object"
+#define COMSIG_MOB_ADJUST_HUNGER "adjust_hunger_mob"
+
+#define COMSIG_EMOTION_STORE "store_emotion"
+#define EMOTION_BUFFER_SPEAK_FROM_BUFFER "release_emotion"
+#define COMSIG_EMOTION_HEARD "heard_emotion"
+#define EMOTION_BUFFER_UPDATE_OVERLAY_STATES "update_emotion_overlay"
+
+#define COMSIG_ATOM_JOIN_STACK "join_stack"
+#define COMSIG_STACK_MOVE "stack_move"
+#define COMSIG_CHECK_CAN_ADD_NEW_STACK "check_stack_add"
+#define COMSIG_MOBSTACKER_DESTROY "mobstack_destroy_stack"
diff --git a/code/__DEFINES/~monkestation/slimes.dm b/code/__DEFINES/~monkestation/slimes.dm
new file mode 100644
index 000000000000..1ae2801be222
--- /dev/null
+++ b/code/__DEFINES/~monkestation/slimes.dm
@@ -0,0 +1,91 @@
+#define ADULT_SLIME (1<<0)
+#define PASSIVE_SLIME (1<<1)
+#define STORED_SLIME (1<<2)
+#define MUTATING_SLIME (1<<3)
+#define SPLITTING_SLIME (1<<4)
+#define CLEANER_SLIME (1<<5)
+#define OVERWRITES_COLOR (1<<6)
+#define NOEVOLVE_SLIME (1<<7)
+#define NOOOZE_SLIME (1<<8)
+
+#define TRAIT_ON_DEATH (1<<0)
+#define TRAIT_VISUAL (1<<1)
+
+#define TRAIT_MUTATOR_USED "mutator_trait"
+#define TRAIT_IN_STACK "inside_mob_stack"
+#define TRAIT_FEEDING "feeding_trait"
+#define LATCH_TRAIT "latch_trait"
+#define TRAIT_LATCH_FEEDERED "feeder_targetted"
+
+#define BB_BASIC_MOB_SCARED_ITEM "BB_basic_mob_scared_item"
+#define BB_WONT_TARGET_CLIENTS "BB_wont_target_clients"
+
+#define TRAIT_CAREFUL_STEPS "careful_steps"
+#define TRAIT_SLIME_STASIS "slime_stasis"
+#define TRAIT_SLIME_RABID "slime_rabid"
+#define TRAIT_SLIME_DUST_IMMUNE "slime_dust_immune"
+#define COMSIG_ATOM_SUCKED "atom_sucked"
+
+#define TRAIT_OVERFED "overfed_trait"
+#define VACPACK_THROW "vacpack_throw"
+
+///from obj/item/vacuum_nozzle/afterattack(atom/movable/target, mob/user, proximity, params): (obj/item/vacuum_nozzle/nozzle, mob/user)
+#define COMSIG_LIVING_VACUUM_PRESUCK "living_vacuum_presuck"
+ #define COMPONENT_LIVING_VACUUM_CANCEL_SUCK (1<<0)
+
+#define SLIME_VALUE_TIER_1 200
+#define SLIME_VALUE_TIER_2 400
+#define SLIME_VALUE_TIER_3 800
+#define SLIME_VALUE_TIER_4 1600
+#define SLIME_VALUE_TIER_5 3200
+#define SLIME_VALUE_TIER_6 6400
+#define SLIME_VALUE_TIER_7 12800
+
+#define SLIME_SELL_MODIFIER_MIN -0.08
+#define SLIME_SELL_MODIFIER_MAX -0.01
+#define SLIME_SELL_OTHER_MODIFIER_MIN 0.005
+#define SLIME_SELL_OTHER_MODIFIER_MAX 0.01
+#define SLIME_SELL_MAXIMUM_MODIFIER 2
+#define SLIME_SELL_MINIMUM_MODIFIER 0.1
+#define SLIME_RANDOM_MODIFIER_MIN -0.0003
+#define SLIME_RANDOM_MODIFIER_MAX 0.0003
+
+
+#define EMOTION_HAPPY "happy"
+#define EMOTION_SAD "sad"
+#define EMOTION_SCARED "scared"
+#define EMOTION_FUNNY "funny"
+#define EMOTION_ANGER "anger"
+#define EMOTION_SUPRISED "suprised"
+#define EMOTION_HUNGRY "hungry"
+
+///key that holds decals we hunt
+#define BB_CLEANABLE_DECALS "cleanable_decals"
+///key that holds blood we hunt
+#define BB_CLEANABLE_BLOOD "cleanable_blood"
+///key that holds pests we hunt
+#define BB_HUNTABLE_PESTS "huntable_pests"
+///key that holds drawings we hunt
+#define BB_CLEANABLE_DRAWINGS "cleanable_drawings"
+///Key that holds our clean target
+#define BB_CLEAN_TARGET "clean_target"
+///key that holds trash we will burn
+#define BB_HUNTABLE_TRASH "huntable_trash"
+
+
+#define FOOD_CHANGE "food_change"
+#define ENVIRONMENT_CHANGE "enviro_change"
+#define BEHAVIOUR_CHANGE "behaviour_change"
+#define DANGEROUS_CHANGE "dangerous_change"
+#define DOCILE_CHANGE "docile_change"
+
+#define FRIENDSHIP_HATED "hated"
+#define FRIENDSHIP_DISLIKED "disliked"
+#define FRIENDSHIP_STRANGER "stranger"
+#define FRIENDSHIP_NEUTRAL "neutral"
+#define FRIENDSHIP_ACQUAINTANCES "acquaintances"
+#define FRIENDSHIP_FRIEND "friend"
+#define FRIENDSHIP_BESTFRIEND "bestfriend"
+
+#define COMSIG_FRIENDSHIP_CHECK_LEVEL "friendship_check_level"
+#define COMSIG_FRIENDSHIP_CHANGE "friendship_change"
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 6b6dca84f290..07ffc03e49a6 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -638,7 +638,7 @@ GLOBAL_LIST_EMPTY(species_list)
moblist += mob_to_sort
for(var/mob/dead/new_player/mob_to_sort in sortmob)
moblist += mob_to_sort
- for(var/mob/living/simple_animal/slime/mob_to_sort in sortmob)
+ for(var/mob/living/basic/slime/mob_to_sort in sortmob)
moblist += mob_to_sort
for(var/mob/living/simple_animal/mob_to_sort in sortmob)
// We've already added slimes.
diff --git a/code/__HELPERS/paths/path.dm b/code/__HELPERS/paths/path.dm
index 14241ef8e706..3b674fdc7afb 100644
--- a/code/__HELPERS/paths/path.dm
+++ b/code/__HELPERS/paths/path.dm
@@ -297,6 +297,8 @@
var/incapacitated = FALSE
/// Is our mob incorporeal
var/incorporeal_move = FALSE
+ /// is our mob a xenofauna or slime
+ var/xenofauna_or_slime = FALSE
/// If our mob has a rider, what does it look like
var/datum/can_pass_info/rider_info = null
/// If our mob is buckled to something, what's it like
@@ -346,6 +348,9 @@
src.can_ventcrawl = HAS_TRAIT(living_construct, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(living_construct, TRAIT_VENTCRAWLER_NUDE)
src.mob_size = living_construct.mob_size
src.incorporeal_move = living_construct.incorporeal_move
+ if(istype(living_construct, /mob/living/basic/slime) || istype(living_construct, /mob/living/basic/xenofauna))
+ src.xenofauna_or_slime = TRUE
+
if(iscameramob(construct_from))
src.camera_type = construct_from.type
src.is_bot = isbot(construct_from)
diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm
index 132beed9b331..160e3e0a4ca3 100644
--- a/code/_globalvars/phobias.dm
+++ b/code/_globalvars/phobias.dm
@@ -55,7 +55,7 @@ GLOBAL_LIST_INIT(phobia_regexes, list(
GLOBAL_LIST_INIT(phobia_mobs, list(
"aliens" = typecacheof(list(
/mob/living/carbon/alien,
- /mob/living/simple_animal/slime,
+ /mob/living/basic/slime,
)),
"anime" = typecacheof(list(/mob/living/basic/guardian)),
"birds" = typecacheof(list(
@@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(phobia_mobs, list(
)),
"aliens" = typecacheof(list(
/mob/living/carbon/alien,
- /mob/living/simple_animal/slime,
+ /mob/living/basic/slime,
)),
"conspiracies" = typecacheof(list(
/mob/living/simple_animal/bot/secbot,
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index f3a4adab662f..9bd238dd8857 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -217,30 +217,6 @@
return SECONDARY_ATTACK_CALL_NORMAL
-/*
- Slimes
- Nothing happening here
-*/
-/mob/living/simple_animal/slime/resolve_unarmed_attack(atom/attack_target, proximity_flag, list/modifiers)
- if(isturf(attack_target))
- return ..()
- attack_target.attack_slime(src, modifiers)
-
-/mob/living/simple_animal/slime/resolve_right_click_attack(atom/target, list/modifiers)
- if(isturf(target))
- return ..()
- return target.attack_slime_secondary(src, modifiers)
-
-/atom/proc/attack_slime(mob/user, list/modifiers)
- return
-
-/**
- * Called when a slime mob right clicks an atom (that is not a turf).
- * Returns a SECONDARY_ATTACK_* value.
- */
-/atom/proc/attack_slime_secondary(mob/user, list/modifiers)
- return SECONDARY_ATTACK_CALL_NORMAL
-
/*
Drones
*/
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 1686c6a2ca05..626cb8b3d505 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -267,8 +267,7 @@
movedelay_type = /mob/living/silicon/robot
/datum/config_entry/number/outdated_movedelay/alien_delay
movedelay_type = /mob/living/carbon/alien
-/datum/config_entry/number/outdated_movedelay/slime_delay
- movedelay_type = /mob/living/simple_animal/slime
+
/datum/config_entry/number/outdated_movedelay/animal_delay
movedelay_type = /mob/living/simple_animal
/////////////////////////////////////////////////
diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm
index 735dd1cdc57d..ada6b75ea359 100644
--- a/code/controllers/subsystem/research.dm
+++ b/code/controllers/subsystem/research.dm
@@ -64,11 +64,25 @@ SUBSYSTEM_DEF(research)
/obj/item/assembly/signaler/anomaly/dimensional = MAX_CORES_DIMENSIONAL,
)
+ ///our total xenobiology points
+ var/xenobio_points
/// Lookup list for ordnance briefers.
var/list/ordnance_experiments = list()
/// Lookup list for scipaper partners.
var/list/scientific_partners = list()
+ var/list/slime_core_prices = list()
+
+ var/static/list/default_core_prices = list(
+ SLIME_VALUE_TIER_1,
+ SLIME_VALUE_TIER_2,
+ SLIME_VALUE_TIER_3,
+ SLIME_VALUE_TIER_4,
+ SLIME_VALUE_TIER_5,
+ SLIME_VALUE_TIER_6,
+ SLIME_VALUE_TIER_7,
+ )
+
/datum/controller/subsystem/research/Initialize()
point_types = TECHWEB_POINT_TYPE_LIST_ASSOCIATIVE_NAMES
initialize_all_techweb_designs()
@@ -79,6 +93,7 @@ SUBSYSTEM_DEF(research)
autosort_categories()
error_design = new
error_node = new
+ initialize_slime_prices()
return SS_INIT_SUCCESS
/datum/controller/subsystem/research/fire()
@@ -100,6 +115,19 @@ SUBSYSTEM_DEF(research)
techweb_list.last_income = world.time
+ for(var/core_type in slime_core_prices)
+ var/obj/item/slime_extract/core = core_type
+ var/price_mod = rand(SLIME_RANDOM_MODIFIER_MIN * 1000000, SLIME_RANDOM_MODIFIER_MAX * 1000000) / 1000000
+ var/price_limiter = 1 - ((default_core_prices[initial(core.tier)] * SLIME_SELL_MINIMUM_MODIFIER) / slime_core_prices[core_type])
+ slime_core_prices[core_type] = (1 + price_mod * price_limiter) * slime_core_prices[core_type]
+
+/datum/controller/subsystem/research/proc/initialize_slime_prices()
+ for(var/core_type in subtypesof(/obj/item/slime_extract))
+ var/obj/item/slime_extract/core = core_type
+ if(!initial(core.tier))
+ continue
+ slime_core_prices[core_type] = default_core_prices[initial(core.tier)]
+
/datum/controller/subsystem/research/proc/autosort_categories()
for(var/i in techweb_nodes)
var/datum/techweb_node/I = techweb_nodes[i]
diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm
index 0a63e31edc9c..b1b44d50ec78 100644
--- a/code/datums/ai/_ai_controller.dm
+++ b/code/datums/ai/_ai_controller.dm
@@ -34,7 +34,7 @@ multiple modular subtrees with behaviors
///Stored arguments for behaviors given during their initial creation
var/list/behavior_args = list()
///Tracks recent pathing attempts, if we fail too many in a row we fail our current plans.
- var/pathing_attempts
+ var/consecutive_pathing_attempts
///Can the AI remain in control if there is a client?
var/continue_processing_when_client = FALSE
///distance to give up on target
diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm
index 15ddc7b264d7..3ab6343e4d49 100644
--- a/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm
+++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm
@@ -3,6 +3,7 @@
behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
///do we finish this action after hitting once?
var/terminate_after_action = FALSE
+ var/melee_attacks = TRUE
/datum/ai_behavior/basic_melee_attack/setup(datum/ai_controller/controller, target_key, targeting_strategy_key, hiding_location_key)
. = ..()
@@ -36,10 +37,11 @@
controller.set_blackboard_key(hiding_location_key, hiding_target)
- if(hiding_target) //Slap it!
- basic_mob.melee_attack(hiding_target)
- else
- basic_mob.melee_attack(target)
+ if(melee_attacks)
+ if(hiding_target) //Slap it!
+ basic_mob.melee_attack(hiding_target)
+ else
+ basic_mob.melee_attack(target)
if(terminate_after_action)
finish_action(controller, TRUE, target_key)
diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm
index 2e922d62f09a..23b3a69c4d38 100644
--- a/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm
+++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm
@@ -20,6 +20,7 @@
/datum/ai_behavior/run_away_from_target/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hiding_location_key)
. = ..()
if (controller.blackboard[BB_BASIC_MOB_STOP_FLEEING])
+ finish_action(controller, succeeded = FALSE, target_key = target_key, hiding_location_key = hiding_location_key)
return
var/atom/target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key]
if (QDELETED(target) || !can_see(controller.pawn, target, run_distance))
diff --git a/code/datums/ai/movement/_ai_movement.dm b/code/datums/ai/movement/_ai_movement.dm
index 2b734ca24a92..0be133279f7e 100644
--- a/code/datums/ai/movement/_ai_movement.dm
+++ b/code/datums/ai/movement/_ai_movement.dm
@@ -8,22 +8,25 @@
//Override this to setup the moveloop you want to use
/datum/ai_movement/proc/start_moving_towards(datum/ai_controller/controller, atom/current_movement_target, min_distance)
SHOULD_CALL_PARENT(TRUE)
- controller.pathing_attempts = 0
+ controller.consecutive_pathing_attempts = 0
controller.set_blackboard_key(BB_CURRENT_MIN_MOVE_DISTANCE, min_distance)
moving_controllers[controller] = current_movement_target
/datum/ai_movement/proc/stop_moving_towards(datum/ai_controller/controller)
- controller.pathing_attempts = 0
+ controller.consecutive_pathing_attempts = 0
moving_controllers -= controller
// We got deleted as we finished an action
if(!QDELETED(controller.pawn))
SSmove_manager.stop_looping(controller.pawn, SSai_movement)
/datum/ai_movement/proc/increment_pathing_failures(datum/ai_controller/controller)
- controller.pathing_attempts++
- if(controller.pathing_attempts >= max_pathing_attempts)
+ controller.consecutive_pathing_attempts++
+ if(controller.consecutive_pathing_attempts >= max_pathing_attempts)
controller.CancelActions()
+/datum/ai_movement/proc/reset_pathing_failures(datum/ai_controller/controller)
+ controller.consecutive_pathing_attempts = 0
+
///Should the movement be allowed to happen? As of writing this, MOVELOOP_SKIP_STEP is defined as (1<<0) so be careful on using (return TRUE) or (can_move = TRUE; return can_move)
/datum/ai_movement/proc/allowed_to_move(datum/move_loop/source)
var/atom/movable/pawn = source.moving
@@ -58,7 +61,8 @@
//Anything to do post movement
/datum/ai_movement/proc/post_move(datum/move_loop/source, succeeded)
SIGNAL_HANDLER
- if(succeeded != FALSE)
- return
var/datum/ai_controller/controller = source.extra_info
+ if(succeeded != MOVELOOP_FAILURE)
+ reset_pathing_failures(controller)
+ return
increment_pathing_failures(controller)
diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm
index 1236a690c96b..d51f233f0ec8 100644
--- a/code/datums/components/plumbing/_plumbing.dm
+++ b/code/datums/components/plumbing/_plumbing.dm
@@ -96,20 +96,27 @@
process_request(amount = MACHINE_REAGENT_TRANSFER, reagent = null, dir = dir)
///check who can give us what we want, and how many each of them will give us
-/datum/component/plumbing/proc/process_request(amount, reagent, dir)
- var/list/valid_suppliers = list()
+/datum/component/plumbing/proc/process_request(amount = MACHINE_REAGENT_TRANSFER, reagent, dir)
+ //find the duct to take from
var/datum/ductnet/net
if(!ducts.Find(num2text(dir)))
return
net = ducts[num2text(dir)]
+
+ //find all valid suppliers in the duct
+ var/list/valid_suppliers = list()
for(var/datum/component/plumbing/supplier as anything in net.suppliers)
if(supplier.can_give(amount, reagent, net))
valid_suppliers += supplier
- // Need to ask for each in turn very carefully, making sure we get the total volume. This is to avoid a division that would always round down and become 0
- var/targetVolume = reagents.total_volume + amount
var/suppliersLeft = valid_suppliers.len
+ if(!suppliersLeft)
+ return
+
+ //take an equal amount from each supplier
+ var/currentRequest
+ var/target_volume = reagents.total_volume + amount
for(var/datum/component/plumbing/give as anything in valid_suppliers)
- var/currentRequest = (targetVolume - reagents.total_volume) / suppliersLeft
+ currentRequest = (target_volume - reagents.total_volume) / suppliersLeft
give.transfer_to(src, currentRequest, reagent, net)
suppliersLeft--
@@ -117,14 +124,15 @@
/datum/component/plumbing/proc/can_give(amount, reagent, datum/ductnet/net)
if(amount <= 0)
return
-
if(reagent) //only asked for one type of reagent
for(var/datum/reagent/contained_reagent as anything in reagents.reagent_list)
if(contained_reagent.type == reagent)
return TRUE
- else if(reagents.total_volume > 0) //take whatever
+ else if(reagents.total_volume) //take whatever
return TRUE
+ return FALSE
+
///this is where the reagent is actually transferred and is thus the finish point of our process()
/datum/component/plumbing/proc/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net)
if(!reagents || !target || !target.reagents)
diff --git a/code/datums/components/squashable.dm b/code/datums/components/squashable.dm
index a8304320bdbd..0e091fa1b48a 100644
--- a/code/datums/components/squashable.dm
+++ b/code/datums/components/squashable.dm
@@ -49,7 +49,7 @@
if(isliving(crossing_movable))
var/mob/living/crossing_mob = crossing_movable
if(crossing_mob.mob_size > MOB_SIZE_SMALL && !(crossing_mob.movement_type & FLYING))
- if(HAS_TRAIT(crossing_mob, TRAIT_PACIFISM))
+ if(HAS_TRAIT(crossing_mob, TRAIT_PACIFISM) || HAS_TRAIT(crossing_mob, TRAIT_CAREFUL_STEPS))
crossing_mob.visible_message(span_notice("[crossing_mob] carefully steps over [parent_as_living]."), span_notice("You carefully step over [parent_as_living] to avoid hurting it."))
return
if(should_squash)
diff --git a/code/datums/elements/basic_eating.dm b/code/datums/elements/basic_eating.dm
index 3201eeff846f..50c89d4a7ccd 100644
--- a/code/datums/elements/basic_eating.dm
+++ b/code/datums/elements/basic_eating.dm
@@ -77,4 +77,6 @@
playsound(eater.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
else
playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
+ SEND_SIGNAL(eater, COMSIG_LIVING_ATE, target)
+ SEND_SIGNAL(eater, COMSIG_EMOTION_STORE, null, EMOTION_HAPPY, "I ate [target], I really like [target].")
qdel(target)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 29ea9178374b..5c7477e21f88 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -578,14 +578,15 @@
if(!only_pulling && pulledby && moving_diagonally != FIRST_DIAG_STEP && (get_dist(src, pulledby) > 1 || z != pulledby.z)) //separated from our puller and not in the middle of a diagonal move.
pulledby.stop_pulling()
-/atom/movable/proc/set_glide_size(target = 8)
+/atom/movable/proc/set_glide_size(target = 8, recursed = FALSE)
if (HAS_TRAIT(src, TRAIT_NO_GLIDE))
return
SEND_SIGNAL(src, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, target)
glide_size = target
- for(var/mob/buckled_mob as anything in buckled_mobs)
- buckled_mob.set_glide_size(target)
+ if(!recursed)
+ for(var/mob/buckled_mob as anything in buckled_mobs)
+ buckled_mob.set_glide_size(target, TRUE)
/**
* meant for movement with zero side effects. only use for objects that are supposed to move "invisibly" (like camera mobs or ghosts)
@@ -641,8 +642,13 @@
if(SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, entering_loc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
return
else // Else just try to enter the single destination.
- if(!newloc.Enter(src))
- return
+ if(isliving(src))
+ var/mob/living/living = src
+ if(!newloc.Enter(src) && !living.buckled)
+ return
+ else
+ if(!newloc.Enter(src))
+ return
if(SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, newloc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
return
diff --git a/code/game/machinery/computer/accounting.dm b/code/game/machinery/computer/accounting.dm
index c38ea186f620..58f9f48d6df0 100644
--- a/code/game/machinery/computer/accounting.dm
+++ b/code/game/machinery/computer/accounting.dm
@@ -21,6 +21,8 @@
for(var/current_account as anything in SSeconomy.bank_accounts_by_id)
var/datum/bank_account/current_bank_account = SSeconomy.bank_accounts_by_id[current_account]
+ if(!current_bank_account.account_job || !current_bank_account)
+ continue
player_accounts += list(list(
"name" = current_bank_account.account_holder,
"job" = current_bank_account.account_job.title,
diff --git a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
index 3af357213b7b..ff9a96b7f397 100644
--- a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
@@ -105,26 +105,22 @@
/obj/item/organ/internal/heart/rat/on_insert(mob/living/carbon/receiver)
. = ..()
- if(!. || !ishuman(receiver))
+ if(!ishuman(receiver))
return
var/mob/living/carbon/human/human_receiver = receiver
- if(!human_receiver.can_mutate())
- return
- human_receiver.dna.add_mutation(/datum/mutation/human/dwarfism)
+ if(human_receiver.can_mutate())
+ human_receiver.dna.add_mutation(/datum/mutation/human/dwarfism)
//but 1.5 damage
- if(human_receiver.physiology)
- human_receiver.physiology.damage_resistance -= 50
+ human_receiver.physiology?.damage_resistance -= 50
/obj/item/organ/internal/heart/rat/on_remove(mob/living/carbon/heartless, special)
. = ..()
if(!ishuman(heartless))
return
var/mob/living/carbon/human/human_heartless = heartless
- if(!human_heartless.can_mutate())
- return
- human_heartless.dna.remove_mutation(/datum/mutation/human/dwarfism)
- if(human_heartless.physiology)
- human_heartless.physiology.damage_resistance += 50
+ if(human_heartless.can_mutate())
+ human_heartless.dna.remove_mutation(/datum/mutation/human/dwarfism)
+ human_heartless.physiology?.damage_resistance += 50
/// you occasionally squeak, and have some rat related verbal tics
/obj/item/organ/internal/tongue/rat
diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm
index b258a8d6f6ea..6096730c2908 100644
--- a/code/game/machinery/telecomms/computers/logbrowser.dm
+++ b/code/game/machinery/telecomms/computers/logbrowser.dm
@@ -70,7 +70,7 @@
race = "Humanoid"
// NT knows a lot about slimes, but not aliens. Can identify slimes
- else if(ispath(mobtype, /mob/living/simple_animal/slime))
+ else if(ispath(mobtype, /mob/living/basic/slime))
race = "Slime"
// sometimes M gets deleted prematurely for AIs... just check the job
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 2f8cb369f95a..1a06a960f1bf 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -92,6 +92,9 @@
if(!buckled_mobs)
buckled_mobs = list()
+ if(M.buckled)
+ M.buckled.unbuckle_mob(M)
+
if(!is_buckle_possible(M, force, check_loc))
return FALSE
@@ -193,6 +196,11 @@
if(!has_buckled_mobs())
return
for(var/m in buckled_mobs)
+ if(isliving(m))
+ var/mob/living/living = m
+ if(!living.buckled) //this somehow happens?
+ buckled_mobs -= m
+ continue
unbuckle_mob(m, force)
//Handle any extras after buckling
@@ -239,16 +247,16 @@
return FALSE
// Make sure the target isn't already buckled to something.
- if(target.buckled)
- return FALSE
+ //if(target.buckled)
+ //return FALSE
// Make sure this atom can still have more things buckled to it.
if(LAZYLEN(buckled_mobs) >= max_buckled_mobs)
return FALSE
// Stacking buckling leads to lots of jank and issues, better to just nix it entirely
- if(target.has_buckled_mobs())
- return FALSE
+ //if(target.has_buckled_mobs())
+ //return FALSE
// If the buckle requires restraints, make sure the target is actually restrained.
if(buckle_requires_restraints && !HAS_TRAIT(target, TRAIT_RESTRAINED))
diff --git a/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm b/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm
index f03f4fd12faa..2b4f0874ef47 100644
--- a/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm
+++ b/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm
@@ -27,13 +27,11 @@
if(istype(tile))
tile.atmos_spawn_air("o2=500;plasma=500;TEMP=1000") //Make it hot and burny for the new slime
- var/new_colour = pick("red", "orange")
- var/mob/living/simple_animal/slime/pyro = new(tile, new_colour)
- pyro.rabid = TRUE
- pyro.amount_grown = SLIME_EVOLUTION_THRESHOLD
- pyro.Evolve()
- var/datum/action/innate/slime/reproduce/repro_action = new
- repro_action.Grant(pyro)
+ var/new_colour = pick(/datum/slime_color/red, /datum/slime_color/orange)
+ var/mob/living/basic/slime/pyro = new(tile, new_colour)
+ ADD_TRAIT(pyro, TRAIT_SLIME_RABID, "pyro")
+ pyro.maximum_survivable_temperature = INFINITY
+ pyro.apply_temperature_requirements()
var/list/mob/dead/observer/candidates = SSpolling.poll_ghost_candidates_for_mob(
"Do you want to play as a pyroclastic anomaly slime?",
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 8cce4e3b66e2..6190201eac31 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -408,11 +408,6 @@
greyscale_colors = CIRCUIT_COLOR_SCIENCE
build_path = /obj/machinery/computer/teleporter
-/obj/item/circuitboard/computer/xenobiology
- name = "Xenobiology Console"
- greyscale_colors = CIRCUIT_COLOR_SCIENCE
- build_path = /obj/machinery/computer/camera_advanced/xenobio
-
/obj/item/circuitboard/computer/scan_consolenew
name = "DNA Console"
greyscale_colors = CIRCUIT_COLOR_SCIENCE
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index 89f3edfb4c8a..49d821a8cd81 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -962,20 +962,6 @@
/datum/stock_part/micro_laser = 1,
/obj/item/stack/sheet/glass = 1)
-/obj/item/circuitboard/machine/monkey_recycler
- name = "Monkey Recycler"
- greyscale_colors = CIRCUIT_COLOR_SCIENCE
- build_path = /obj/machinery/monkey_recycler
- req_components = list(
- /datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 1)
- needs_anchored = FALSE
-
-/obj/item/circuitboard/machine/processor/slime
- name = "Slime Processor"
- greyscale_colors = CIRCUIT_COLOR_SCIENCE
- build_path = /obj/machinery/processor/slime
-
/obj/item/circuitboard/machine/protolathe/department/science
name = "Departmental Protolathe - Science"
greyscale_colors = CIRCUIT_COLOR_SCIENCE
@@ -1227,14 +1213,9 @@
needs_anchored = FALSE
/obj/item/circuitboard/machine/processor/screwdriver_act(mob/living/user, obj/item/tool)
- if(build_path == /obj/machinery/processor)
- name = "Slime Processor"
- build_path = /obj/machinery/processor/slime
- to_chat(user, span_notice("Name protocols successfully updated."))
- else
- name = "Food Processor"
- build_path = /obj/machinery/processor
- to_chat(user, span_notice("Defaulting name protocols."))
+ name = "Food Processor"
+ build_path = /obj/machinery/processor
+ to_chat(user, span_notice("Defaulting name protocols."))
return TRUE
/obj/item/circuitboard/machine/protolathe/department/service
@@ -1483,8 +1464,8 @@
greyscale_colors = CIRCUIT_COLOR_SCIENCE
build_path = /obj/machinery/artifact_xray
req_components = list(
- /obj/item/stock_parts/capacitor = 1,
- /datum/stock_part/scanning_module = 1,
+ /obj/item/stock_parts/capacitor = 1,
+ /datum/stock_part/scanning_module = 1,
/obj/item/stock_parts/micro_laser = 1)
/obj/item/circuitboard/machine/artifactheater
@@ -1505,7 +1486,7 @@
/datum/stock_part/scanning_module = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 3)
-
+
/obj/item/circuitboard/machine/navbeacon
name = "Bot Navigational Beacon"
greyscale_colors = CIRCUIT_COLOR_SCIENCE
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 534871bdda67..f5ef78a60c98 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -137,8 +137,6 @@
/obj/effect/dummy/chameleon/attack_animal(mob/user, list/modifiers)
master.disrupt()
-/obj/effect/dummy/chameleon/attack_slime(mob/user, list/modifiers)
- master.disrupt()
/obj/effect/dummy/chameleon/attack_alien(mob/user, list/modifiers)
master.disrupt()
diff --git a/code/game/objects/items/devices/scanners/slime_scanner.dm b/code/game/objects/items/devices/scanners/slime_scanner.dm
deleted file mode 100644
index 430796e02ca2..000000000000
--- a/code/game/objects/items/devices/scanners/slime_scanner.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-/obj/item/slime_scanner
- name = "slime scanner"
- desc = "A device that analyzes a slime's internal composition and measures its stats."
- icon = 'icons/obj/device.dmi'
- icon_state = "slime_scanner"
- inhand_icon_state = "analyzer"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- w_class = WEIGHT_CLASS_SMALL
- flags_1 = CONDUCT_1
- throwforce = 0
- throw_speed = 3
- throw_range = 7
- custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.30, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 0.20)
-
-/obj/item/slime_scanner/attack(mob/living/M, mob/living/user)
- if(user.stat || !user.can_read(src) || user.is_blind())
- return
- if (!isslime(M))
- to_chat(user, span_warning("This device can only scan slimes!"))
- return
- var/mob/living/simple_animal/slime/T = M
- slime_scan(T, user)
-
-/proc/slime_scan(mob/living/simple_animal/slime/T, mob/living/user)
- var/to_render = "Slime scan results:\
- \n[span_notice("[T.colour] [T.is_adult ? "adult" : "baby"] slime")]\
- \nNutrition: [T.nutrition]/[T.get_max_nutrition()]"
- if (T.nutrition < T.get_starve_nutrition())
- to_render += "\n[span_warning("Warning: slime is starving!")]"
- else if (T.nutrition < T.get_hunger_nutrition())
- to_render += "\n[span_warning("Warning: slime is hungry")]"
- to_render += "\nElectric change strength: [T.powerlevel]\nHealth: [round(T.health/T.maxHealth,0.01)*100]%"
- if (T.slime_mutation[4] == T.colour)
- to_render += "\nThis slime does not evolve any further."
- else
- if (T.slime_mutation[3] == T.slime_mutation[4])
- if (T.slime_mutation[2] == T.slime_mutation[1])
- to_render += "\nPossible mutation: [T.slime_mutation[3]]\
- \nGenetic destability: [T.mutation_chance/2] % chance of mutation on splitting"
- else
- to_render += "\nPossible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]] (x2)\
- \nGenetic destability: [T.mutation_chance] % chance of mutation on splitting"
- else
- to_render += "\nPossible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]\
- \nGenetic destability: [T.mutation_chance] % chance of mutation on splitting"
- if (T.cores > 1)
- to_render += "\nMultiple cores detected"
- to_render += "\nGrowth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]"
- if(T.effectmod)
- to_render += "\n[span_notice("Core mutation in progress: [T.effectmod]")]\
- \n[span_notice("Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]")]"
- to_chat(user, examine_block(to_render))
diff --git a/code/game/objects/items/rcd/RPLD.dm b/code/game/objects/items/rcd/RPLD.dm
index febf901e0212..6b308ea92e68 100644
--- a/code/game/objects/items/rcd/RPLD.dm
+++ b/code/game/objects/items/rcd/RPLD.dm
@@ -49,6 +49,7 @@
/obj/item/construction/plumbing/proc/set_plumbing_designs()
plumbing_design_types = list(
//category 1 Synthesizers i.e devices which creates , reacts & destroys chemicals
+ /obj/machinery/plumbing/synthesizer = 15,
/obj/machinery/plumbing/reaction_chamber/chem = 15,
/obj/machinery/plumbing/grinder_chemical = 30,
/obj/machinery/plumbing/growing_vat = 20,
@@ -292,12 +293,16 @@
/obj/item/construction/plumbing/research/set_plumbing_designs()
plumbing_design_types = list(
//category 1 synthesizers
+ /obj/machinery/plumbing/synthesizer = 15,
/obj/machinery/plumbing/reaction_chamber = 15,
/obj/machinery/plumbing/grinder_chemical = 30,
/obj/machinery/plumbing/disposer = 10,
/obj/machinery/plumbing/growing_vat = 20,
//category 2 Distributors
+ /obj/machinery/plumbing/ooze_sucker = 5,
+ /obj/machinery/plumbing/slime_grinder = 5,
+ /obj/machinery/plumbing/ooze_compressor = 20,
/obj/machinery/duct = 1,
/obj/machinery/plumbing/input = 5,
/obj/machinery/plumbing/filter = 5,
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index a7fa03f96bcb..370cc5def0de 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -123,6 +123,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("fire alarm frame", /obj/item/wallframe/firealarm, 2, check_density = FALSE, category = CAT_EQUIPMENT), \
new/datum/stack_recipe("extinguisher cabinet frame", /obj/item/wallframe/extinguisher_cabinet, 2, check_density = FALSE, category = CAT_EQUIPMENT), \
new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1, check_density = FALSE, category = CAT_EQUIPMENT), \
+ new/datum/stack_recipe("slime pen management frame", /obj/item/wallframe/slime_pen_controller, 1, check_density = FALSE, category = CAT_EQUIPMENT), \
null, \
new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_DOORS), \
new/datum/stack_recipe("filing cabinet", /obj/structure/filingcabinet, 2, time = 10 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_FURNITURE), \
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 383c9d88af7e..66f7b9b07e90 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -98,12 +98,6 @@
var/amt = max(0, ((force - (move_resist * MOVE_FORCE_CRUSH_RATIO)) / (move_resist * MOVE_FORCE_CRUSH_RATIO)) * 10)
take_damage(amt, BRUTE)
-/obj/attack_slime(mob/living/simple_animal/slime/user, list/modifiers)
- if(!user.is_adult)
- return
- if(attack_generic(user, rand(10, 15), BRUTE, MELEE, 1))
- log_combat(user, src, "attacked")
-
/obj/singularity_act()
SSexplosions.high_mov_atom += src
if(src && !QDELETED(src))
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index 9b7b5590018e..ef6ea9d433e8 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -224,17 +224,6 @@
use(user, going_up = FALSE)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-/obj/structure/ladder/attack_slime(mob/user, list/modifiers)
- use(user)
- return TRUE
-
-/obj/structure/ladder/attack_slime_secondary(mob/user, list/modifiers)
- . = ..()
- if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
- return
- use(user, going_up = FALSE)
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-
/obj/structure/ladder/attackby(obj/item/item, mob/user, params)
use(user)
return TRUE
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 4a8cad5c2684..5210e90425cd 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -213,7 +213,7 @@
/turf/open/proc/water_vapor_gas_act()
MakeSlippery(TURF_WET_WATER, min_wet_time = 100, wet_time_to_add = 50)
- for(var/mob/living/simple_animal/slime/M in src)
+ for(var/mob/living/basic/slime/M in src)
M.apply_water()
wash(CLEAN_WASH)
diff --git a/code/modules/antagonists/abductor/equipment/glands/slime.dm b/code/modules/antagonists/abductor/equipment/glands/slime.dm
index 50e83ee37359..a7764ff214df 100644
--- a/code/modules/antagonists/abductor/equipment/glands/slime.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/slime.dm
@@ -21,6 +21,5 @@
to_chat(owner, span_warning("You feel nauseated!"))
owner.vomit(20)
- var/mob/living/simple_animal/slime/Slime = new(get_turf(owner), "grey")
- Slime.set_friends(list(owner))
- Slime.set_leader(owner)
+ var/mob/living/basic/slime/Slime = new(get_turf(owner))
+ SEND_SIGNAL(Slime, COMSIG_FRIENDSHIP_CHANGE, owner, 110)
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index 3ec2d3c89d15..9d76906c0829 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -556,11 +556,11 @@
if (player_mind in ex_revs + ex_headrevs)
continue
- player_mind.add_antag_datum(/datum/antagonist/enemy_of_the_revolution)
-
if (!istype(player))
continue
+ player_mind.add_antag_datum(/datum/antagonist/enemy_of_the_revolution)
+
if(player_mind.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND)
ADD_TRAIT(player, TRAIT_DEFIB_BLACKLISTED, REF(src))
diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm
index 64aaca7aa995..2492a5d98297 100644
--- a/code/modules/awaymissions/signpost.dm
+++ b/code/modules/awaymissions/signpost.dm
@@ -46,9 +46,6 @@
if (Adjacent(user))
return interact(user)
-/obj/structure/signpost/attack_slime(mob/user, list/modifiers)
- return interact(user)
-
/obj/structure/signpost/attack_animal(mob/user, list/modifiers)
return interact(user)
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index 78d0b78150c6..0dfc36a4bd60 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -105,9 +105,6 @@
/obj/structure/speaking_tile/attack_ai(mob/user)
return interact(user)
-/obj/structure/speaking_tile/attack_slime(mob/user, list/modifiers)
- return interact(user)
-
/obj/structure/speaking_tile/attack_animal(mob/user, list/modifiers)
return interact(user)
diff --git a/code/modules/events/creep_awakening.dm b/code/modules/events/creep_awakening.dm
index 648c2cc9db04..bf5b4eb922d3 100644
--- a/code/modules/events/creep_awakening.dm
+++ b/code/modules/events/creep_awakening.dm
@@ -5,6 +5,7 @@
min_players = 20
category = EVENT_CATEGORY_HEALTH
description = "A random crewmember becomes obsessed with another."
+ weight = 0 // essentially disables it
/datum/round_event/obsessed
fakeable = FALSE
diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm
index e505cac2621f..a946cb780e96 100644
--- a/code/modules/experisci/experiment/experiments.dm
+++ b/code/modules/experisci/experiment/experiments.dm
@@ -218,8 +218,6 @@
required_atoms = list(
/obj/machinery/autolathe = 1,
/obj/machinery/rnd/production/circuit_imprinter/department/science = 1,
- /obj/machinery/monkey_recycler = 1,
- /obj/machinery/processor/slime = 1,
/obj/machinery/processor = 2,
/obj/machinery/reagentgrinder = 2,
/obj/machinery/hydroponics = 2,
diff --git a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm
deleted file mode 100644
index fa5418d30305..000000000000
--- a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm
+++ /dev/null
@@ -1,103 +0,0 @@
-GLOBAL_LIST_EMPTY(monkey_recyclers)
-
-/obj/machinery/monkey_recycler
- name = "monkey recycler"
- desc = "A machine used for recycling dead monkeys into monkey cubes."
- icon = 'icons/obj/kitchen.dmi'
- icon_state = "grinder"
- layer = BELOW_OBJ_LAYER
- density = TRUE
- circuit = /obj/item/circuitboard/machine/monkey_recycler
- var/stored_matter = 0
- var/cube_production = 0.2
- var/list/connected = list() //Keeps track of connected xenobio consoles, for deletion in /Destroy()
-
-/obj/machinery/monkey_recycler/Initialize(mapload)
- . = ..()
- if (mapload)
- GLOB.monkey_recyclers += src
-
-/obj/machinery/monkey_recycler/Destroy()
- GLOB.monkey_recyclers -= src
- for(var/thing in connected)
- var/obj/machinery/computer/camera_advanced/xenobio/console = thing
- console.connected_recycler = null
- connected.Cut()
- return ..()
-
-/obj/machinery/monkey_recycler/RefreshParts() //Ranges from 0.2 to 0.8 per monkey recycled
- . = ..()
- cube_production = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- cube_production += manipulator.tier * 0.1
- for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
- cube_production += matter_bin.tier * 0.1
-
-/obj/machinery/monkey_recycler/examine(mob/user)
- . = ..()
- if(in_range(user, src) || isobserver(user))
- . += span_notice("The status display reads: Producing [cube_production] cubes for every monkey inserted.")
-
-/obj/machinery/monkey_recycler/wrench_act(mob/living/user, obj/item/tool)
- . = ..()
- if(default_unfasten_wrench(user, tool))
- power_change()
- return TOOL_ACT_TOOLTYPE_SUCCESS
-
-/obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params)
- if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O))
- return
-
- if(default_pry_open(O, close_after_pry = TRUE))
- return
-
- if(default_deconstruction_crowbar(O))
- return
-
- if(machine_stat) //NOPOWER etc
- return
- else
- return ..()
-
-/obj/machinery/monkey_recycler/MouseDrop_T(mob/living/target, mob/living/user)
- if(!istype(target))
- return
- if(ismonkey(target))
- stuff_monkey_in(target, user)
-
-/obj/machinery/monkey_recycler/proc/stuff_monkey_in(mob/living/carbon/human/target, mob/living/user)
- if(!istype(target))
- return
- if(target.stat == CONSCIOUS)
- to_chat(user, span_warning("The monkey is struggling far too much to put it in the recycler."))
- return
- if(target.buckled || target.has_buckled_mobs())
- to_chat(user, span_warning("The monkey is attached to something."))
- return
- qdel(target)
- to_chat(user, span_notice("You stuff the monkey into the machine."))
- playsound(src.loc, 'sound/machines/juicer.ogg', 50, TRUE)
- var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
- use_power(active_power_usage)
- stored_matter += cube_production
- addtimer(VARSET_CALLBACK(src, pixel_x, base_pixel_x))
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, span_notice("The machine now has [stored_matter] monkey\s worth of material stored.")))
-
-/obj/machinery/monkey_recycler/interact(mob/user)
- if(stored_matter >= 1)
- to_chat(user, span_notice("The machine hisses loudly as it condenses the ground monkey meat. After a moment, it dispenses a brand new monkey cube."))
- playsound(src.loc, 'sound/machines/hiss.ogg', 50, TRUE)
- for(var/i in 1 to FLOOR(stored_matter, 1))
- new /obj/item/food/monkeycube(src.loc)
- stored_matter--
- to_chat(user, span_notice("The machine's display flashes that it has [stored_matter] monkeys worth of material left."))
- else
- to_chat(user, span_danger("The machine needs at least 1 monkey worth of material to produce a monkey cube. It currently has [stored_matter]."))
-
-/obj/machinery/monkey_recycler/multitool_act(mob/living/user, obj/item/multitool/I)
- . = ..()
- if(istype(I))
- to_chat(user, span_notice("You log [src] in the multitool's buffer."))
- I.buffer = src
- return TRUE
diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm
index a6afe1ad7397..7ff1e07db07d 100644
--- a/code/modules/food_and_drinks/machinery/processor.dm
+++ b/code/modules/food_and_drinks/machinery/processor.dm
@@ -185,59 +185,4 @@
user.forceMove(drop_location())
user.visible_message(span_notice("[user] crawls free of the processor!"))
-/obj/machinery/processor/slime
- name = "slime processor"
- desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."
- circuit = /obj/item/circuitboard/machine/processor/slime
-
-/obj/machinery/processor/slime/adjust_item_drop_location(atom/movable/atom_to_drop)
- var/static/list/slimecores = subtypesof(/obj/item/slime_extract)
- var/i = 0
- if(!(i = slimecores.Find(atom_to_drop.type))) // If the item is not found
- return
- if (i <= 16) // If in the first 12 slots
- atom_to_drop.pixel_x = atom_to_drop.base_pixel_x - 12 + ((i%4)*8)
- atom_to_drop.pixel_y = atom_to_drop.base_pixel_y - 12 + (round(i/4)*8)
- return i
- var/ii = i - 16
- atom_to_drop.pixel_x = atom_to_drop.base_pixel_x - 8 + ((ii%3)*8)
- atom_to_drop.pixel_y = atom_to_drop.base_pixel_y - 8 + (round(ii/3)*8)
- return i
-
-/obj/machinery/processor/slime/process()
- if(processing)
- return
- var/mob/living/simple_animal/slime/picked_slime
- for(var/mob/living/simple_animal/slime/slime in range(1,src))
- if(!CanReach(slime)) //don't take slimes behind glass panes or somesuch; also makes it ignore slimes inside the processor
- continue
- if(slime.stat)
- picked_slime = slime
- break
- if(!picked_slime)
- return
- var/datum/food_processor_process/recipe = PROCESSOR_SELECT_RECIPE(picked_slime)
- if (!recipe)
- return
-
- visible_message(span_notice("[picked_slime] is sucked into [src]."))
- LAZYADD(processor_contents, picked_slime)
- picked_slime.forceMove(src)
-
-/obj/machinery/processor/slime/process_food(datum/food_processor_process/recipe, atom/movable/what)
- var/mob/living/simple_animal/slime/processed_slime = what
- if (!istype(processed_slime))
- return
-
- if(processed_slime.stat != DEAD)
- processed_slime.forceMove(drop_location())
- processed_slime.balloon_alert_to_viewers("crawls free")
- return
- var/core_count = processed_slime.cores
- for(var/i in 1 to (core_count+rating_amount-1))
- var/atom/movable/item = new processed_slime.coretype(drop_location())
- adjust_item_drop_location(item)
- SSblackbox.record_feedback("tally", "slime_core_harvested", 1, processed_slime.colour)
- return ..()
-
#undef PROCESSOR_SELECT_RECIPE
diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm
index 91149a415920..3001a97f8152 100644
--- a/code/modules/food_and_drinks/machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/machinery/smartfridge.dm
@@ -399,12 +399,10 @@
/obj/machinery/smartfridge/extract/accept_check(obj/item/O)
if(istype(O, /obj/item/slime_extract))
return TRUE
- if(istype(O, /obj/item/slime_scanner))
- return TRUE
return FALSE
/obj/machinery/smartfridge/extract/preloaded
- initial_contents = list(/obj/item/slime_scanner = 2)
+ initial_contents = list(/obj/item/slime_extract/grey = 2)
// -------------------------------------
// Cytology Petri Dish Smartfridge
diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm
index 67339575703a..469909030d2c 100644
--- a/code/modules/food_and_drinks/recipes/processor_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm
@@ -128,11 +128,6 @@
input = /obj/item/food/grown/parsnip
output = /obj/item/food/roastparsnip
-/datum/food_processor_process/mob/slime
- input = /mob/living/simple_animal/slime
- output = null
- required_machine = /obj/machinery/processor/slime
-
/datum/food_processor_process/towercap
input = /obj/item/grown/log
output = /obj/item/popsicle_stick
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index e21b73659f4f..25490e6562ad 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
@@ -335,9 +335,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
/turf/closed/indestructible/hoteldoor/attack_larva(mob/user, list/modifiers)
promptExit(user)
-/turf/closed/indestructible/hoteldoor/attack_slime(mob/user, list/modifiers)
- promptExit(user)
-
/turf/closed/indestructible/hoteldoor/attack_robot(mob/user)
if(get_dist(get_turf(src), get_turf(user)) <= 1)
promptExit(user)
diff --git a/code/modules/mob/living/basic/basic_defense.dm b/code/modules/mob/living/basic/basic_defense.dm
index 444780e14885..27ff06b8bd41 100644
--- a/code/modules/mob/living/basic/basic_defense.dm
+++ b/code/modules/mob/living/basic/basic_defense.dm
@@ -28,6 +28,7 @@
span_notice("[user] [response_help_continuous] you."), null, null, user)
to_chat(user, span_notice("You [response_help_simple] [src]."))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+ SEND_SIGNAL(src, COMSIG_EMOTION_STORE, user, EMOTION_HAPPY, "[response_help_continuous] me.")
else
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to hurt [src]!"))
@@ -102,13 +103,6 @@
var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
return attack_threshold_check(damage, user.melee_damage_type)
-/mob/living/basic/attack_slime(mob/living/simple_animal/slime/M, list/modifiers)
- if(..()) //successful slime attack
- var/damage = rand(15, 25)
- if(M.is_adult)
- damage = rand(20, 35)
- return attack_threshold_check(damage)
-
/mob/living/basic/attack_drone(mob/living/basic/drone/attacking_drone)
if(attacking_drone.istate & ISTATE_HARM) //No kicking dogs even as a rogue drone. Use a weapon.
return
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index 3d12474ad1c2..c7c65f4d684c 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -86,15 +86,6 @@ In all, this is a lot like the monkey code. /N
if(STAMINA)
stamina.adjust(-damage)
-/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M, list/modifiers)
- if(..()) //successful slime attack
- var/damage = rand(5, 35)
- if(M.is_adult)
- damage = rand(10, 40)
- adjustBruteLoss(damage)
- log_combat(M, src, "attacked")
- updatehealth()
-
/mob/living/carbon/alien/ex_act(severity, target, origin)
if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
return FALSE
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 360b479d0150..d9b7d8caf4f5 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -239,28 +239,6 @@
try_contact_infect(D, note="Monkey Bite Infected")
return TRUE
-
-/mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M, list/modifiers)
- if(..()) //successful slime attack
- if(M.powerlevel > 0)
- var/stunprob = M.powerlevel * 7 + 10 // 17 at level 1, 80 at level 10
- if(prob(stunprob))
- M.powerlevel -= 3
- if(M.powerlevel < 0)
- M.powerlevel = 0
-
- visible_message(span_danger("The [M.name] shocks [src]!"), \
- span_userdanger("The [M.name] shocks you!"))
-
- do_sparks(5, TRUE, src)
- var/power = M.powerlevel + rand(0,3)
- Paralyze(power * 2 SECONDS)
- set_stutter_if_lower(power * 2 SECONDS)
- if (prob(stunprob) && M.powerlevel >= 8)
- adjustFireLoss(M.powerlevel * rand(6,10))
- updatehealth()
- return 1
-
/mob/living/carbon/proc/dismembering_strike(mob/living/attacker, dam_zone)
if(!attacker.limb_destroyer)
return dam_zone
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 8d477c21b89b..494e4b9dc724 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -340,31 +340,6 @@
var/attack_direction = get_dir(user, src)
apply_damage(damage, user.melee_damage_type, affecting, armor, wound_bonus = user.wound_bonus, bare_wound_bonus = user.bare_wound_bonus, sharpness = user.sharpness, attack_direction = attack_direction)
-
-/mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M, list/modifiers)
- . = ..()
- if(!.) // slime attack failed
- return
- var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
- if(!damage)
- return
- var/wound_mod = -45 // 25^1.4=90, 90-45=45
- if(M.is_adult)
- damage += rand(5, 10)
- wound_mod = -90 // 35^1.4=145, 145-90=55
-
- if(check_shields(M, damage, "the [M.name]"))
- return FALSE
-
- var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
- if(!dam_zone) //Dismemberment successful
- return TRUE
-
- var/obj/item/bodypart/affecting = get_bodypart(get_random_valid_zone(dam_zone))
- var/armor_block = run_armor_check(affecting, MELEE)
- apply_damage(damage, BRUTE, affecting, armor_block, wound_bonus=wound_mod)
-
-
/mob/living/carbon/human/ex_act(severity, target, origin)
if(HAS_TRAIT(src, TRAIT_BOMBIMMUNE))
return
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 80fd5ade9649..56b7aab3de90 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -68,7 +68,7 @@
var/static/list/can_ride_typecache = typecacheof(list(
/mob/living/basic/parrot,
/mob/living/carbon/human,
- /mob/living/simple_animal/slime,
+ /mob/living/basic/slime,
))
var/lastpuke = 0
var/account_id
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index 190885e1b48e..6b5b83e41832 100644
--- a/code/modules/mob/living/carbon/status_procs.dm
+++ b/code/modules/mob/living/carbon/status_procs.dm
@@ -31,6 +31,7 @@
ADD_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA)
ADD_TRAIT(src, TRAIT_FLOORED, STAMINA)
filters += FILTER_STAMINACRIT
+ SEND_SIGNAL(src, COMSIG_LIVING_STAMINA_STUN)
addtimer(CALLBACK(src, PROC_REF(exit_stamina_stun)), STAMINA_STUN_TIME)
stamina.pause(STAMINA_STUN_TIME + 2 SECONDS)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index da3bd02d854c..57b437207346 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1432,7 +1432,7 @@
created_robot.clear_zeroth_law(announce = FALSE)
if(WABBAJACK_SLIME)
- new_mob = new /mob/living/simple_animal/slime/random(loc)
+ new_mob = new /mob/living/basic/slime/random(loc)
if(WABBAJACK_XENO)
var/picked_xeno_type
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 2eac04ffff9b..a6481e93ae01 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -261,29 +261,6 @@
user.set_pull_offsets(src, grab_state)
return TRUE
-
-/mob/living/attack_slime(mob/living/simple_animal/slime/M, list/modifiers)
- if(!SSticker.HasRoundStarted())
- to_chat(M, "You cannot attack people before the game has started.")
- return
-
- if(M.buckled)
- if(M in buckled_mobs)
- M.Feedstop()
- return // can't attack while eating!
-
- if(HAS_TRAIT(src, TRAIT_PACIFISM))
- to_chat(M, span_warning("You don't want to hurt anyone!"))
- return FALSE
-
- if (stat != DEAD)
- log_combat(M, src, "attacked")
- M.do_attack_animation(src)
- visible_message(span_danger("\The [M.name] glomps [src]!"), \
- span_userdanger("\The [M.name] glomps you!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M)
- to_chat(M, span_danger("You glomp [src]!"))
- return TRUE
-
/mob/living/attack_animal(mob/living/simple_animal/user, list/modifiers)
. = ..()
user.face_atom(src)
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index 2a0f6dab294a..ed0a16a5b445 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -17,9 +17,6 @@
return
..()
-/mob/living/silicon/ai/attack_slime(mob/living/simple_animal/slime/user, list/modifiers)
- return //immune to slimes
-
/mob/living/silicon/ai/blob_act(obj/structure/blob/B)
if (stat != DEAD)
adjustBruteLoss(60)
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index e9df047a1864..680fc7885b69 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -205,24 +205,6 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
..()
return
-/mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M, list/modifiers)
- if(..()) //successful slime shock
- flash_act()
- var/stunprob = M.powerlevel * 7 + 10
- if(prob(stunprob) && M.powerlevel >= 8)
- adjustBruteLoss(M.powerlevel * rand(6,10))
-
- var/damage = rand(1, 3)
-
- if(M.is_adult)
- damage = rand(20, 40)
- else
- damage = rand(5, 35)
- damage = round(damage / 2) // borgs receive half damage
- adjustBruteLoss(damage)
-
- return
-
/mob/living/silicon/robot/attack_hand(mob/living/carbon/human/user, list/modifiers)
add_fingerprint(user)
if(!opened)
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index 78322167a80c..a41a726be72d 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -98,13 +98,6 @@
var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
return attack_threshold_check(damage, user.melee_damage_type)
-/mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/user, list/modifiers)
- if(..()) //successful slime attack
- var/damage = rand(15, 25)
- if(user.is_adult)
- damage = rand(20, 35)
- return attack_threshold_check(damage)
-
/mob/living/simple_animal/attack_drone(mob/living/basic/drone/user)
if(user.istate & ISTATE_HARM) //No kicking dogs even as a rogue drone. Use a weapon.
return
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
index c4ab1f1c4172..de95e59dca90 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
@@ -120,7 +120,6 @@ IGNORE_PROC_IF_NOT_TARGET(attack_larva)
IGNORE_PROC_IF_NOT_TARGET(attack_animal)
-IGNORE_PROC_IF_NOT_TARGET(attack_slime)
/mob/living/simple_animal/hostile/asteroid/curseblob/bullet_act(obj/projectile/Proj)
if(Proj.firer != set_target)
diff --git a/code/modules/mob/living/simple_animal/slime/death.dm b/code/modules/mob/living/simple_animal/slime/death.dm
deleted file mode 100644
index f957b9264a5f..000000000000
--- a/code/modules/mob/living/simple_animal/slime/death.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/mob/living/simple_animal/slime/death(gibbed)
- if(stat == DEAD)
- return
- if(!gibbed)
- if(is_adult)
- var/mob/living/simple_animal/slime/M = new(drop_location(), colour)
- M.rabid = TRUE
- M.regenerate_icons()
-
- is_adult = FALSE
- maxHealth = 150
- for(var/datum/action/innate/slime/reproduce/R in actions)
- R.Remove(src)
- var/datum/action/innate/slime/evolve/E = new
- E.Grant(src)
- revive(HEAL_ALL)
- regenerate_icons()
- update_name()
- return
-
- if(buckled)
- Feedstop(silent = TRUE) //releases ourselves from the mob we fed on.
-
- set_stat(DEAD)
- cut_overlays()
-
- return ..(gibbed)
-
-/mob/living/simple_animal/slime/gib()
- death(TRUE)
- qdel(src)
diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm
deleted file mode 100644
index 0b70ca3f0ece..000000000000
--- a/code/modules/mob/living/simple_animal/slime/emote.dm
+++ /dev/null
@@ -1,56 +0,0 @@
-/datum/emote/slime
- mob_type_allowed_typecache = /mob/living/simple_animal/slime
- mob_type_blacklist_typecache = list()
-
-/datum/emote/slime/bounce
- key = "bounce"
- key_third_person = "bounces"
- message = "bounces in place."
-
-/datum/emote/slime/jiggle
- key = "jiggle"
- key_third_person = "jiggles"
- message = "jiggles!"
-
-/datum/emote/slime/light
- key = "light"
- key_third_person = "lights"
- message = "lights up for a bit, then stops."
-
-/datum/emote/slime/vibrate
- key = "vibrate"
- key_third_person = "vibrates"
- message = "vibrates!"
-
-/datum/emote/slime/mood
- key = "moodnone"
- ///Mood key, will set the slime's emote to this.
- var/mood_key
-
-/datum/emote/slime/mood/run_emote(mob/user, params, type_override, intentional)
- . = ..()
- if(!.)
- return
- var/mob/living/simple_animal/slime/slime_user = user
- slime_user.current_mood = mood_key
- slime_user.regenerate_icons()
-
-/datum/emote/slime/mood/smile
- key = "moodsmile"
- mood_key = ":3"
-
-/datum/emote/slime/mood/cat
- key = "moodcat"
- mood_key = ":33"
-
-/datum/emote/slime/mood/pout
- key = "moodpout"
- mood_key = "pout"
-
-/datum/emote/slime/mood/sad
- key = "moodsad"
- mood_key = "sad"
-
-/datum/emote/slime/mood/angry
- key = "moodangry"
- mood_key = "angry"
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
deleted file mode 100644
index 150e0a405ecb..000000000000
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ /dev/null
@@ -1,615 +0,0 @@
-/mob/living/simple_animal/slime/Life(seconds_per_tick = SSMOBS_DT, times_fired)
- if(HAS_TRAIT(src, TRAIT_NO_TRANSFORM))
- return
- . = ..()
- if(!.)
- return
-
- // We get some passive bruteloss healing if we're not dead
- if(stat != DEAD && SPT_PROB(16, seconds_per_tick))
- adjustBruteLoss(-0.5 * seconds_per_tick)
- if(ismob(buckled))
- handle_feeding(seconds_per_tick, times_fired)
- if(stat != CONSCIOUS) // Slimes in stasis don't lose nutrition, don't change mood and don't respond to speech
- return
- handle_nutrition(seconds_per_tick, times_fired)
- if(QDELETED(src)) // Stop if the slime split during handle_nutrition()
- return
- reagents.remove_all(0.5 * REAGENTS_METABOLISM * reagents.reagent_list.len * seconds_per_tick) //Slimes are such snowflakes
- handle_targets(seconds_per_tick, times_fired)
- if(ckey)
- return
- handle_mood(seconds_per_tick, times_fired)
- handle_speech(seconds_per_tick, times_fired)
-
-
-// Unlike most of the simple animals, slimes support UNCONSCIOUS. This is an ugly hack.
-/mob/living/simple_animal/slime/update_stat()
- switch(stat)
- if(UNCONSCIOUS, HARD_CRIT)
- if(health > 0)
- return
- return ..()
-
-
-/mob/living/simple_animal/slime/proc/AIprocess() // the master AI process
-
- if(AIproc || stat || client)
- return
-
- var/hungry = 0
- if (nutrition < get_starve_nutrition())
- hungry = 2
- else if (nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition())
- hungry = 1
-
- AIproc = 1
-
- while(AIproc && stat != DEAD && (attacked || hungry || rabid || buckled))
- if(!(mobility_flags & MOBILITY_MOVE)) //also covers buckling. Not sure why buckled is in the while condition if we're going to immediately break, honestly
- break
-
- if(!Target || client)
- break
-
- if(Target.health <= -70 || Target.stat == DEAD)
- set_target(null)
- AIproc = 0
- break
-
- if(Target)
- if(locate(/mob/living/simple_animal/slime) in Target.buckled_mobs)
- set_target(null)
- AIproc = 0
- break
- if(!AIproc)
- break
-
- if(Target in view(1,src))
- if(!CanFeedon(Target)) //If they're not able to be fed upon, ignore them.
- if(!Atkcool)
- Atkcool = TRUE
- addtimer(VARSET_CALLBACK(src, Atkcool, FALSE), 4.5 SECONDS)
-
- if(Target.Adjacent(src))
- Target.attack_slime(src)
- break
- if((Target.body_position == STANDING_UP) && prob(80))
-
- if(Target.client && Target.health >= 20)
- if(!Atkcool)
- Atkcool = TRUE
- addtimer(VARSET_CALLBACK(src, Atkcool, FALSE), 4.5 SECONDS)
-
- if(Target.Adjacent(src))
- Target.attack_slime(src)
-
- else
- if(!Atkcool && Target.Adjacent(src))
- Feedon(Target)
-
- else
- if(!Atkcool && Target.Adjacent(src))
- Feedon(Target)
-
- else if(Target in view(7, src))
- if(!Target.Adjacent(src))
- // Bug of the month candidate: slimes were attempting to move to target only if it was directly next to them, which caused them to target things, but not approach them
- step_to(src, Target)
- else
- set_target(null)
- AIproc = 0
- break
-
- var/sleeptime = cached_multiplicative_slowdown
- if(sleeptime <= 0)
- sleeptime = 1
-
- sleep(sleeptime + 2) // this is about as fast as a player slime can go
-
- AIproc = 0
-
-/mob/living/simple_animal/slime/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired)
- var/loc_temp = get_temperature(environment)
- var/divisor = 10 /// The divisor controls how fast body temperature changes, lower causes faster changes
-
- var/temp_delta = loc_temp - bodytemperature
- if(abs(temp_delta) > 50) // If the difference is great, reduce the divisor for faster stabilization
- divisor = 5
-
- if(temp_delta < 0) // It is cold here
- if(!on_fire) // Do not reduce body temp when on fire
- adjust_bodytemperature(clamp((temp_delta / divisor) * seconds_per_tick, temp_delta, 0))
- else // This is a hot place
- adjust_bodytemperature(clamp((temp_delta / divisor) * seconds_per_tick, 0, temp_delta))
-
- if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc
- if(bodytemperature <= (T0C - 40)) // stun temperature
- ADD_TRAIT(src, TRAIT_IMMOBILIZED, SLIME_COLD)
- else
- REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, SLIME_COLD)
-
- if(bodytemperature <= (T0C - 50)) // hurt temperature
- if(bodytemperature <= 50) // sqrting negative numbers is bad
- adjustBruteLoss(100 * seconds_per_tick)
- else
- adjustBruteLoss(round(sqrt(bodytemperature)) * seconds_per_tick)
- else
- REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, SLIME_COLD)
-
- if(stat != DEAD)
- var/bz_percentage =0
- if(environment.gases[/datum/gas/bz])
- bz_percentage = environment.gases[/datum/gas/bz][MOLES] / environment.total_moles()
- var/stasis = (bz_percentage >= 0.05 && bodytemperature < (T0C + 100)) || force_stasis
-
- switch(stat)
- if(CONSCIOUS)
- if(stasis)
- to_chat(src, span_danger("Nerve gas in the air has put you in stasis!"))
- set_stat(UNCONSCIOUS)
- powerlevel = 0
- rabid = FALSE
- regenerate_icons()
- if(UNCONSCIOUS, HARD_CRIT)
- if(!stasis)
- to_chat(src, span_notice("You wake up from the stasis."))
- set_stat(CONSCIOUS)
- regenerate_icons()
-
- updatehealth()
-
-/mob/living/simple_animal/slime/proc/handle_feeding(seconds_per_tick, times_fired)
- var/mob/living/prey = buckled
-
- if(stat)
- Feedstop(silent = TRUE)
-
- // monke start: make slimes feed faster on mindless mobs and monkeys
- var/feed_multiplier = 1
- if(QDELETED(prey.mind) && !istype(prey, /mob/living/simple_animal/pet) && !istype(prey, /mob/living/basic/pet)) // pets have an honorary soul in my book
- feed_multiplier += 1
- if(ismonkey(prey))
- feed_multiplier += 0.5
- // monke end
-
- if(prey.stat == DEAD) // our victim died
- if(!client)
- if(!rabid && !attacked)
- var/mob/last_to_hurt = prey.LAssailant?.resolve()
- if(last_to_hurt && last_to_hurt != prey)
- if(SPT_PROB(30, seconds_per_tick))
- add_friendship(last_to_hurt, 1)
- else
- to_chat(src, "This subject does not have a strong enough life energy anymore...")
-
- if(prey.client && ishuman(prey))
- if(SPT_PROB(61, seconds_per_tick))
- rabid = 1 //we go rabid after finishing to feed on a human with a client.
-
- Feedstop()
- return
-
- if(iscarbon(prey))
- prey.adjustCloneLoss(rand(2, 4) * 0.5 * seconds_per_tick * feed_multiplier) // monke edit: make slimes feed faster on mindless mobs and monkeys
- prey.adjustToxLoss(rand(1, 2) * 0.5 * seconds_per_tick * feed_multiplier) // monke edit: make slimes feed faster on mindless mobs and monkeys
-
- if(SPT_PROB(5, seconds_per_tick) && prey.client)
- to_chat(prey, "[pick("You can feel your body becoming weak!", \
- "You feel like you're about to die!", \
- "You feel every part of your body screaming in agony!", \
- "A low, rolling pain passes through your body!", \
- "Your body feels as if it's falling apart!", \
- "You feel extremely weak!", \
- "A sharp, deep pain bathes every inch of your body!")]")
-
- else if(isanimal_or_basicmob(prey))
- var/mob/living/animal_victim = prey
-
- var/totaldamage = 0 //total damage done to this unfortunate animal
- totaldamage += animal_victim.adjustCloneLoss(rand(2, 4) * 0.5 * seconds_per_tick * feed_multiplier) // monke edit: make slimes feed faster on mindless mobs and monkeys
- totaldamage += animal_victim.adjustToxLoss(rand(1, 2) * 0.5 * seconds_per_tick * feed_multiplier) // monke edit: make slimes feed faster on mindless mobs and monkeys
-
- if(totaldamage <= 0) //if we did no(or negative!) damage to it, stop
- Feedstop(0, 0)
- return
-
- else
- Feedstop(0, 0)
- return
-
- add_nutrition((rand(7, 15) * 0.5 * seconds_per_tick * CONFIG_GET(number/damage_multiplier)) * feed_multiplier) // monke edit: make slimes feed faster on mindless mobs and monkeys
-
- //Heal yourself.
- adjustBruteLoss(-1.5 * seconds_per_tick * feed_multiplier) // monke edit: make slimes feed faster on mindless mobs and monkeys
-
-/mob/living/simple_animal/slime/proc/handle_nutrition(seconds_per_tick, times_fired)
-
- if(docile) //God as my witness, I will never go hungry again
- set_nutrition(700) //fuck you for using the base nutrition var
- return
-
- if(SPT_PROB(7.5, seconds_per_tick))
- adjust_nutrition(-0.5 * (1 + is_adult) * seconds_per_tick)
-
- if(nutrition <= 0)
- set_nutrition(0)
- if(SPT_PROB(50, seconds_per_tick))
- adjustBruteLoss(rand(0,5))
-
- else if (nutrition >= get_grow_nutrition() && amount_grown < SLIME_EVOLUTION_THRESHOLD)
- adjust_nutrition(-10 * seconds_per_tick)
- amount_grown++
- update_mob_action_buttons()
-
- if(amount_grown >= SLIME_EVOLUTION_THRESHOLD && !buckled && !Target && !ckey)
- if(is_adult && loc.AllowDrop())
- Reproduce()
- else
- Evolve()
-
-/mob/living/simple_animal/slime/proc/add_nutrition(nutrition_to_add = 0)
- set_nutrition(min((nutrition + nutrition_to_add), get_max_nutrition()))
- if(nutrition >= get_grow_nutrition())
- if(powerlevel<10)
- if(prob(30-powerlevel*2))
- powerlevel++
- else if(nutrition >= get_hunger_nutrition() + 100) //can't get power levels unless you're a bit above hunger level.
- if(powerlevel<5)
- if(prob(25-powerlevel*5))
- powerlevel++
-
-
-
-
-/mob/living/simple_animal/slime/proc/handle_targets(seconds_per_tick, times_fired)
- if(attacked > 50)
- attacked = 50
-
- if(attacked > 0)
- attacked--
-
- if(Discipline > 0)
-
- if(Discipline >= 5 && rabid)
- if(SPT_PROB(37, seconds_per_tick))
- rabid = 0
-
- if(SPT_PROB(5, seconds_per_tick))
- Discipline--
-
- if(!client)
- if(!(mobility_flags & MOBILITY_MOVE))
- return
-
- if(buckled)
- return // if it's eating someone already, continue eating!
-
- if(Target)
- --target_patience
- if (target_patience <= 0 || SStun > world.time || Discipline || attacked || docile) // Tired of chasing or something draws out attention
- target_patience = 0
- set_target(null)
-
- if(AIproc && SStun > world.time)
- return
-
- var/hungry = 0 // determines if the slime is hungry
-
- if (nutrition < get_starve_nutrition())
- hungry = 2
- else if (nutrition < get_grow_nutrition() && SPT_PROB(13, seconds_per_tick) || nutrition < get_hunger_nutrition())
- hungry = 1
-
- if(hungry == 2 && !client) // if a slime is starving, it starts losing its friends
- if(Friends.len > 0 && SPT_PROB(0.5, seconds_per_tick))
- var/mob/nofriend = pick(Friends)
- add_friendship(nofriend, -1)
-
- if(!Target)
- if(will_hunt() && hungry || attacked || rabid) // Only add to the list if we need to
- var/list/targets = list()
-
- for(var/mob/living/L in view(7,src))
-
- if(isslime(L) || L.stat == DEAD) // Ignore other slimes and dead mobs
- continue
-
- if(L in Friends) // No eating friends!
- continue
-
- var/ally = FALSE
- for(var/F in faction)
- if(F == FACTION_NEUTRAL) //slimes are neutral so other mobs not target them, but they can target neutral mobs
- continue
- if(F in L.faction)
- ally = TRUE
- break
- if(ally)
- continue
-
- if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
- targets += L // Possible target found!
-
- if(locate(/mob/living/simple_animal/slime) in L.buckled_mobs) // Only one slime can latch on at a time.
- continue
-
- targets += L // Possible target found!
-
- if(targets.len > 0)
- if(attacked || rabid || hungry == 2)
- set_target(targets[1]) // I am attacked and am fighting back or so hungry I don't even care
- else
- for(var/mob/living/carbon/C in targets)
- if(!Discipline && SPT_PROB(2.5, seconds_per_tick))
- if(ishuman(C) || isalienadult(C))
- set_target(C)
- break
-
- if(islarva(C) || ismonkey(C))
- set_target(C)
- break
-
- if (Target)
- target_patience = rand(5, 7)
- if (is_adult)
- target_patience += 3
-
- if(!Target) // If we have no target, we are wandering or following orders
- if (Leader)
- if(holding_still)
- holding_still = max(holding_still - (0.5 * seconds_per_tick), 0)
- else if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(loc))
- step_to(src, Leader)
-
- else if(hungry)
- if (holding_still)
- holding_still = max(holding_still - (0.5 * hungry * seconds_per_tick), 0)
- else if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(loc) && prob(50))
- step(src, pick(GLOB.cardinals))
-
- else
- if(holding_still)
- holding_still = max(holding_still - (0.5 * seconds_per_tick), 0)
- else if (docile && pulledby)
- holding_still = 10
- else if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(loc) && prob(33))
- step(src, pick(GLOB.cardinals))
- else if(!AIproc)
- INVOKE_ASYNC(src, PROC_REF(AIprocess))
-
-/mob/living/simple_animal/slime/handle_automated_movement()
- return //slime random movement is currently handled in handle_targets()
-
-/mob/living/simple_animal/slime/handle_automated_speech()
- return //slime random speech is currently handled in handle_speech()
-
-/mob/living/simple_animal/slime/proc/handle_mood(seconds_per_tick, times_fired)
- var/newmood = ""
- if (rabid || attacked)
- newmood = "angry"
- else if (docile)
- newmood = ":3"
- else if (Target)
- newmood = "mischievous"
-
- if (!newmood)
- if (Discipline && SPT_PROB(13, seconds_per_tick))
- newmood = "pout"
- else if (SPT_PROB(0.5, seconds_per_tick))
- newmood = pick("sad", ":3", "pout")
-
- if ((current_mood == "sad" || current_mood == ":3" || current_mood == "pout") && !newmood)
- if(SPT_PROB(50, seconds_per_tick))
- newmood = current_mood
-
- if (newmood != current_mood) // This is so we don't redraw them every time
- current_mood = newmood
- regenerate_icons()
-
-/mob/living/simple_animal/slime/proc/handle_speech(seconds_per_tick, times_fired)
- //Speech understanding starts here
- var/to_say
- if (speech_buffer.len > 0)
- var/who = speech_buffer[1] // Who said it?
- var/phrase = speech_buffer[2] // What did they say?
- if ((findtext(phrase, num2text(number)) || findtext(phrase, "slimes"))) // Talking to us
- if (findtext(phrase, "hello") || findtext(phrase, "hi"))
- to_say = pick("Hello...", "Hi...")
- else if (findtext(phrase, "follow"))
- if (Leader)
- if (Leader == who) // Already following him
- to_say = pick("Yes...", "Lead...", "Follow...")
- else if (Friends[who] > Friends[Leader]) // VIVA
- set_leader(who)
- to_say = "Yes... I follow [who]..."
- else
- to_say = "No... I follow [Leader]..."
- else
- if (Friends[who] >= SLIME_FRIENDSHIP_FOLLOW)
- set_leader(who)
- to_say = "I follow..."
- else // Not friendly enough
- to_say = pick("No...", "I no follow...")
- else if (findtext(phrase, "stop"))
- if (buckled) // We are asked to stop feeding
- if (Friends[who] >= SLIME_FRIENDSHIP_STOPEAT)
- Feedstop()
- set_target(null)
- if (Friends[who] < SLIME_FRIENDSHIP_STOPEAT_NOANGRY)
- add_friendship(who, -1)
- to_say = "Grrr..." // I'm angry but I do it
- else
- to_say = "Fine..."
- else if (Target) // We are asked to stop chasing
- if (Friends[who] >= SLIME_FRIENDSHIP_STOPCHASE)
- set_target(null)
- if (Friends[who] < SLIME_FRIENDSHIP_STOPCHASE_NOANGRY)
- add_friendship(who, -1)
- to_say = "Grrr..." // I'm angry but I do it
- else
- to_say = "Fine..."
- else if (Leader) // We are asked to stop following
- if (Leader == who)
- to_say = "Yes... I stay..."
- set_leader(null)
- else
- if (Friends[who] > Friends[Leader])
- set_leader(null)
- to_say = "Yes... I stop..."
- else
- to_say = "No... keep follow..."
- else if (findtext(phrase, "stay"))
- if (Leader)
- if (Leader == who)
- holding_still = Friends[who] * 10
- to_say = "Yes... stay..."
- else if (Friends[who] > Friends[Leader])
- holding_still = (Friends[who] - Friends[Leader]) * 10
- to_say = "Yes... stay..."
- else
- to_say = "No... keep follow..."
- else
- if (Friends[who] >= SLIME_FRIENDSHIP_STAY)
- holding_still = Friends[who] * 10
- to_say = "Yes... stay..."
- else
- to_say = "No... won't stay..."
- else if (findtext(phrase, "attack"))
- if (rabid && prob(20))
- set_target(who)
- AIprocess() //Wake up the slime's Target AI, needed otherwise this doesn't work
- to_say = "ATTACK!?!?"
- else if (Friends[who] >= SLIME_FRIENDSHIP_ATTACK)
- for (var/mob/living/L in view(7,src)-list(src,who))
- if (findtext(phrase, lowertext(L.name)))
- if (isslime(L))
- to_say = "NO... [L] slime friend"
- add_friendship(who, -1) //Don't ask a slime to attack its friend
- else if(!Friends[L] || Friends[L] < 1)
- set_target(L)
- AIprocess()//Wake up the slime's Target AI, needed otherwise this doesn't work
- to_say = "Ok... I attack [Target]"
- else
- to_say = "No... like [L] ..."
- add_friendship(who, -1) //Don't ask a slime to attack its friend
- break
- else
- to_say = "No... no listen"
-
- speech_buffer = list()
-
- //Speech starts here
- if (to_say)
- say (to_say)
- else if(SPT_PROB(0.5, seconds_per_tick))
- emote(pick("bounce","sway","light","vibrate","jiggle"))
- else
- var/t = 10
- var/slimes_near = 0
- var/dead_slimes = 0
- var/friends_near = list()
- for (var/mob/living/L in view(7,src))
- if(isslime(L) && L != src)
- ++slimes_near
- if (L.stat == DEAD)
- ++dead_slimes
- if (L in Friends)
- t += 20
- friends_near += L
- if (nutrition < get_hunger_nutrition())
- t += 10
- if (nutrition < get_starve_nutrition())
- t += 10
- if (SPT_PROB(1, seconds_per_tick) && prob(t))
- var/phrases = list()
- if (Target)
- phrases += "[Target]... look yummy..."
- if (nutrition < get_starve_nutrition())
- phrases += "So... hungry..."
- phrases += "Very... hungry..."
- phrases += "Need... food..."
- phrases += "Must... eat..."
- else if (nutrition < get_hunger_nutrition())
- phrases += "Hungry..."
- phrases += "Where food?"
- phrases += "I want to eat..."
- phrases += "Rawr..."
- phrases += "Blop..."
- phrases += "Blorble..."
- if (rabid || attacked)
- phrases += "Hrr..."
- phrases += "Nhuu..."
- phrases += "Unn..."
- if (current_mood == ":3")
- phrases += "Purr..."
- if (attacked)
- phrases += "Grrr..."
- if (bodytemperature < T0C)
- phrases += "Cold..."
- if (bodytemperature < T0C - 30)
- phrases += "So... cold..."
- phrases += "Very... cold..."
- if (bodytemperature < T0C - 50)
- phrases += "..."
- phrases += "C... c..."
- if (buckled)
- phrases += "Nom..."
- phrases += "Yummy..."
- if (powerlevel > 3)
- phrases += "Bzzz..."
- if (powerlevel > 5)
- phrases += "Zap..."
- if (powerlevel > 8)
- phrases += "Zap... Bzz..."
- if (current_mood == "sad")
- phrases += "Bored..."
- if (slimes_near)
- phrases += "Slime friend..."
- if (slimes_near > 1)
- phrases += "Slime friends..."
- if (dead_slimes)
- phrases += "What happened?"
- if (!slimes_near)
- phrases += "Lonely..."
- for (var/M in friends_near)
- phrases += "[M]... friend..."
- if (nutrition < get_hunger_nutrition())
- phrases += "[M]... feed me..."
- if(!stat)
- say (pick(phrases))
-
-/mob/living/simple_animal/slime/proc/get_max_nutrition() // Can't go above it
- if (is_adult)
- return 1200
- else
- return 1000
-
-/mob/living/simple_animal/slime/proc/get_grow_nutrition() // Above it we grow, below it we can eat
- if (is_adult)
- return 1000
- else
- return 800
-
-/mob/living/simple_animal/slime/proc/get_hunger_nutrition() // Below it we will always eat
- if (is_adult)
- return 600
- else
- return 500
-
-/mob/living/simple_animal/slime/proc/get_starve_nutrition() // Below it we will eat before everything else
- if(is_adult)
- return 300
- else
- return 200
-
-/mob/living/simple_animal/slime/proc/will_hunt(hunger = -1) // Check for being stopped from feeding and chasing
- if (docile)
- return FALSE
- if (hunger == 2 || rabid || attacked)
- return TRUE
- if (Leader)
- return FALSE
- if (holding_still)
- return FALSE
- return TRUE
diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm
deleted file mode 100644
index 131295e4f284..000000000000
--- a/code/modules/mob/living/simple_animal/slime/powers.dm
+++ /dev/null
@@ -1,241 +0,0 @@
-#define SIZE_DOESNT_MATTER -1
-#define BABIES_ONLY 0
-#define ADULTS_ONLY 1
-
-#define NO_GROWTH_NEEDED 0
-#define GROWTH_NEEDED 1
-
-/datum/action/innate/slime
- check_flags = AB_CHECK_CONSCIOUS
- button_icon = 'icons/mob/actions/actions_slime.dmi'
- background_icon_state = "bg_alien"
- overlay_icon_state = "bg_alien_border"
- var/needs_growth = NO_GROWTH_NEEDED
-
-/datum/action/innate/slime/IsAvailable(feedback = FALSE)
- . = ..()
- if(!.)
- return
- var/mob/living/simple_animal/slime/S = owner
- if(needs_growth == GROWTH_NEEDED)
- if(S.amount_grown >= SLIME_EVOLUTION_THRESHOLD)
- return TRUE
- return FALSE
- return TRUE
-
-/mob/living/simple_animal/slime/verb/Feed()
- set category = "Slime"
- set desc = "This will let you feed on any valid creature in the surrounding area. This should also be used to halt the feeding process."
-
- if(stat)
- return FALSE
-
- var/list/choices = list()
- for(var/mob/living/nearby_mob in view(1,src))
- if(nearby_mob != src && Adjacent(nearby_mob))
- choices += nearby_mob
-
- var/choice = tgui_input_list(src, "Who do you wish to feed on?", "Slime Feed", sort_names(choices))
- if(isnull(choice))
- return FALSE
- var/mob/living/victim = choice
- if(CanFeedon(victim))
- Feedon(victim)
- return TRUE
- return FALSE
-
-/datum/action/innate/slime/feed
- name = "Feed"
- button_icon_state = "slimeeat"
-
-
-/datum/action/innate/slime/feed/Activate()
- var/mob/living/simple_animal/slime/S = owner
- S.Feed()
-
-/mob/living/simple_animal/slime/proc/CanFeedon(mob/living/meal, silent = FALSE)
- if(!Adjacent(meal))
- return FALSE
-
- if(buckled)
- Feedstop()
- return FALSE
-
- if(issilicon(meal) || meal.mob_biotypes & MOB_ROBOTIC)
- return FALSE
-
- if(isanimal(meal))
- var/mob/living/simple_animal/simple_meal = meal
- if(simple_meal.damage_coeff[TOX] <= 0 && simple_meal.damage_coeff[CLONE] <= 0) //The creature wouldn't take any damage, it must be too weird even for us.
- if(silent)
- return FALSE
- to_chat(src, "[pick("This subject is incompatible", \
- "This subject does not have life energy", "This subject is empty", \
- "I am not satisified", "I can not feed from this subject", \
- "I do not feel nourished", "This subject is not food")]!")
- return FALSE
- else if(isbasicmob(meal))
- var/mob/living/basic/basic_meal = meal
- if(basic_meal.damage_coeff[TOX] <= 0 && basic_meal.damage_coeff[CLONE] <= 0)
- if (silent)
- return FALSE
- to_chat(src, "[pick("This subject is incompatible", \
- "This subject does not have life energy", "This subject is empty", \
- "I am not satisified", "I can not feed from this subject", \
- "I do not feel nourished", "This subject is not food")]!")
- return FALSE
-
- if(isslime(meal))
- if(silent)
- return FALSE
- to_chat(src, span_warning("I can't latch onto another slime..."))
- return FALSE
-
- if(docile)
- if(silent)
- return FALSE
- to_chat(src, span_notice("I'm not hungry anymore..."))
- return FALSE
-
- if(stat)
- if(silent)
- return FALSE
- to_chat(src, span_warning("I must be conscious to do this..."))
- return FALSE
-
- if(meal.stat == DEAD)
- if(silent)
- return FALSE
- to_chat(src, span_warning("This subject does not have a strong enough life energy..."))
- return FALSE
-
- if(locate(/mob/living/simple_animal/slime) in meal.buckled_mobs)
- if(silent)
- return FALSE
- to_chat(src, span_warning("Another slime is already feeding on this subject..."))
- return FALSE
- return TRUE
-
-/mob/living/simple_animal/slime/proc/Feedon(mob/living/M)
- M.unbuckle_all_mobs(force=1) //Slimes rip other mobs (eg: shoulder parrots) off (Slimes Vs Slimes is already handled in CanFeedon())
- if(M.buckle_mob(src, force=TRUE))
- layer = M.layer+0.01 //appear above the target mob
- M.visible_message(span_danger("[name] latches onto [M]!"), \
- span_userdanger("[name] latches onto [M]!"))
- else
- to_chat(src, span_warning("I have failed to latch onto the subject!"))
-
-/mob/living/simple_animal/slime/proc/Feedstop(silent = FALSE, living=1)
- if(buckled)
- if(!living)
- to_chat(src, "[pick("This subject is incompatible", \
- "This subject does not have life energy", "This subject is empty", \
- "I am not satisified", "I can not feed from this subject", \
- "I do not feel nourished", "This subject is not food")]!")
- if(!silent)
- visible_message(span_warning("[src] lets go of [buckled]!"), \
- span_notice("I stopped feeding."))
- layer = initial(layer)
- buckled.unbuckle_mob(src,force=TRUE)
-
-/mob/living/simple_animal/slime/verb/Evolve()
- set category = "Slime"
- set desc = "This will let you evolve from baby to adult slime."
-
- if(stat)
- to_chat(src, "I must be conscious to do this...")
- return
- if(!is_adult)
- if(amount_grown >= SLIME_EVOLUTION_THRESHOLD)
- is_adult = 1
- maxHealth = 200
- amount_grown = 0
- for(var/datum/action/innate/slime/evolve/E in actions)
- E.Remove(src)
- var/datum/action/innate/slime/reproduce/reproduce_action = new
- reproduce_action.Grant(src)
- regenerate_icons()
- update_name()
- else
- to_chat(src, "I am not ready to evolve yet...")
- else
- to_chat(src, "I have already evolved...")
-
-/datum/action/innate/slime/evolve
- name = "Evolve"
- button_icon_state = "slimegrow"
- needs_growth = GROWTH_NEEDED
-
-/datum/action/innate/slime/evolve/Activate()
- var/mob/living/simple_animal/slime/S = owner
- S.Evolve()
-
-/mob/living/simple_animal/slime/verb/Reproduce()
- set category = "Slime"
- set desc = "This will make you split into four Slimes."
-
- if(stat)
- to_chat(src, "I must be conscious to do this...")
- return
-
- if(is_adult)
- if(amount_grown >= SLIME_EVOLUTION_THRESHOLD)
- if(stat)
- to_chat(src, "I must be conscious to do this...")
- return
-
- var/list/babies = list()
- var/new_nutrition = round(nutrition * 0.9)
- var/new_powerlevel = round(powerlevel / 4)
- var/datum/component/nanites/original_nanites = GetComponent(/datum/component/nanites)
- var/turf/drop_loc = drop_location()
-
- for(var/i in 1 to 4)
- var/child_colour
- if(mutation_chance >= 100)
- child_colour = "rainbow"
- else if(prob(mutation_chance))
- child_colour = slime_mutation[rand(1,4)]
- else
- child_colour = colour
- var/mob/living/simple_animal/slime/M
- M = new(drop_loc, child_colour)
- if(ckey)
- M.set_nutrition(new_nutrition) //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature!
- M.powerlevel = new_powerlevel
- if(i != 1)
- step_away(M,src)
- M.set_friends(Friends)
- babies += M
- M.mutation_chance = clamp(mutation_chance+(rand(5,-5)),0,100)
- SSblackbox.record_feedback("tally", "slime_babies_born", 1, M.colour)
- if(original_nanites)
- M.AddComponent(/datum/component/nanites, original_nanites.nanite_volume*0.25)
- SEND_SIGNAL(M, COMSIG_NANITE_SYNC, original_nanites, TRUE, TRUE) //The trues are to copy activation as well
-
- var/mob/living/simple_animal/slime/new_slime = pick(babies)
- new_slime.set_combat_mode(TRUE)
- if(src.mind)
- src.mind.transfer_to(new_slime)
- else
- new_slime.key = src.key
- qdel(src)
- else
- to_chat(src, "I am not ready to reproduce yet...")
- else
- to_chat(src, "I am not old enough to reproduce yet...")
-
-/datum/action/innate/slime/reproduce
- name = "Reproduce"
- button_icon_state = "slimesplit"
- needs_growth = GROWTH_NEEDED
-
-/datum/action/innate/slime/reproduce/Activate()
- var/mob/living/simple_animal/slime/S = owner
- S.Reproduce()
-
-#undef SIZE_DOESNT_MATTER
-#undef BABIES_ONLY
-#undef ADULTS_ONLY
-#undef NO_GROWTH_NEEDED
-#undef GROWTH_NEEDED
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
deleted file mode 100644
index 01aa8f37e7e3..000000000000
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ /dev/null
@@ -1,580 +0,0 @@
-#define SLIME_CARES_ABOUT(to_check) (to_check && (to_check == Target || to_check == Leader || (to_check in Friends)))
-/mob/living/simple_animal/slime
- name = "grey baby slime (123)"
- icon = 'icons/mob/simple/slimes.dmi'
- icon_state = "grey baby slime"
- pass_flags = PASSTABLE | PASSGRILLE
- gender = NEUTER
- faction = list(FACTION_SLIME, FACTION_NEUTRAL)
-
- harm_intent_damage = 5
- icon_living = "grey baby slime"
- icon_dead = "grey baby slime dead"
- response_help_continuous = "pets"
- response_help_simple = "pet"
- response_disarm_continuous = "shoos"
- response_disarm_simple = "shoo"
- response_harm_continuous = "stomps on"
- response_harm_simple = "stomp on"
- emote_see = list("jiggles", "bounces in place")
- speak_emote = list("blorbles")
- bubble_icon = "slime"
- initial_language_holder = /datum/language_holder/slime
-
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-
- maxHealth = 150
- health = 150
- healable = 0
- melee_damage_lower = 5
- melee_damage_upper = 25
-
- verb_say = "blorbles"
- verb_ask = "inquisitively blorbles"
- verb_exclaim = "loudly blorbles"
- verb_yell = "loudly blorbles"
-
- // canstun and canknockdown don't affect slimes because they ignore stun and knockdown variables
- // for the sake of cleanliness, though, here they are.
- status_flags = CANUNCONSCIOUS|CANPUSH
-
- footstep_type = FOOTSTEP_MOB_SLIME
-
- ///The current mood of the slime, set randomly or through emotes (if sentient).
- var/current_mood
-
- var/AIproc = 0 // determines if the AI loop is activated
- var/Atkcool = 0 // attack cooldown
- var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while
- var/SStun = 0 // stun variable
-
- var/is_adult = 0
- var/docile = 0
-
- var/cores = 1 // the number of /obj/item/slime_extract's the slime has left inside
- var/mutation_chance = 30 // Chance of mutating, should be between 25 and 35
-
- var/powerlevel = 0 // 1-10 controls how much electricity they are generating
- var/amount_grown = 0 // controls how long the slime has been overfed, if 10, grows or reproduces
-
- var/number = 0 // Used to understand when someone is talking to it
-
- var/mob/living/Target = null // AI variable - tells the slime to hunt this down
- var/mob/living/Leader = null // AI variable - tells the slime to follow this person
-
- var/attacked = 0 // Determines if it's been attacked recently. Can be any number, is a cooloff-ish variable
- var/rabid = 0 // If set to 1, the slime will attack and eat anything it comes in contact with
- var/holding_still = 0 // AI variable, cooloff-ish for how long it's going to stay in one place
- var/target_patience = 0 // AI variable, cooloff-ish for how long it's going to follow its target
-
- var/list/Friends = list() // A list of friends; they are not considered targets for feeding; passed down after splitting
-
- var/list/speech_buffer = list() // Last phrase said near it and person who said it
-
- var/mutator_used = FALSE //So you can't shove a dozen mutators into a single slime
- var/force_stasis = FALSE
-
- var/static/regex/slime_name_regex = new("\\w+ (baby|adult) slime \\(\\d+\\)")
- ///////////TIME FOR SUBSPECIES
-
- var/colour = "grey"
- var/coretype = /obj/item/slime_extract/grey
- var/list/slime_mutation[4]
-
- var/static/list/slime_colours = list(
- "adamantine",
- "black",
- "blue",
- "bluespace",
- "cerulean",
- "dark blue",
- "dark purple",
- "gold",
- "green",
- "grey",
- "light pink",
- "metal",
- "oil",
- "orange",
- "pink",
- "purple",
- "pyrite",
- "rainbow",
- "red",
- "sepia",
- "silver",
- "yellow",
- )
-
- ///////////CORE-CROSSING CODE
-
- var/effectmod //What core modification is being used.
- var/applied = 0 //How many extracts of the modtype have been applied.
-
-
-/mob/living/simple_animal/slime/Initialize(mapload, new_colour=colour, new_is_adult=FALSE)
- var/datum/action/innate/slime/feed/F = new
- F.Grant(src)
- ADD_TRAIT(src, TRAIT_CANT_RIDE, INNATE_TRAIT)
-
- is_adult = new_is_adult
-
- if(is_adult)
- var/datum/action/innate/slime/reproduce/R = new
- R.Grant(src)
- health = 200
- maxHealth = 200
- else
- var/datum/action/innate/slime/evolve/E = new
- E.Grant(src)
- create_reagents(100)
- set_colour(new_colour)
- . = ..()
- set_nutrition(700)
- add_cell_sample()
-
- ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
- AddElement(/datum/element/soft_landing)
-
-/mob/living/simple_animal/slime/Destroy()
- for (var/A in actions)
- var/datum/action/AC = A
- AC.Remove(src)
- set_target(null)
- set_leader(null)
- clear_friends()
- return ..()
-
-/mob/living/simple_animal/slime/create_reagents(max_vol, flags)
- . = ..()
- RegisterSignals(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT), PROC_REF(on_reagent_change))
- RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del))
-
-/// Handles removing signal hooks incase someone is crazy enough to reset the reagents datum.
-/mob/living/simple_animal/slime/proc/on_reagents_del(datum/reagents/reagents)
- SIGNAL_HANDLER
- UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_QDELETING))
- return NONE
-
-/mob/living/simple_animal/slime/proc/set_colour(new_colour)
- colour = new_colour
- update_name()
- slime_mutation = mutation_table(colour)
- var/sanitizedcolour = replacetext(colour, " ", "")
- coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
- regenerate_icons()
-
-/mob/living/simple_animal/slime/update_name()
- if(slime_name_regex.Find(name))
- number = rand(1, 1000)
- name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])"
- real_name = name
- return ..()
-
-/mob/living/simple_animal/slime/proc/random_colour()
- set_colour(pick(slime_colours))
-
-/mob/living/simple_animal/slime/regenerate_icons()
- cut_overlays()
- var/icon_text = "[colour] [is_adult ? "adult" : "baby"] slime"
- icon_dead = "[icon_text] dead"
- if(stat != DEAD)
- icon_state = icon_text
- if(current_mood && !stat)
- add_overlay("aslime-[current_mood]")
- else
- icon_state = icon_dead
- ..()
-
-/**
- * Snowflake handling of reagent movespeed modifiers
- *
- * Should be moved to the reagents at some point in the future. As it is I'm in a hurry.
- */
-/mob/living/simple_animal/slime/proc/on_reagent_change(datum/reagents/holder, ...)
- SIGNAL_HANDLER
- remove_movespeed_modifier(/datum/movespeed_modifier/slime_reagentmod)
- var/amount = 0
- if(reagents.has_reagent(/datum/reagent/medicine/morphine)) // morphine slows slimes down
- amount = 2
- if(reagents.has_reagent(/datum/reagent/consumable/frostoil)) // Frostoil also makes them move VEEERRYYYYY slow
- amount = 5
- if(amount)
- add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/slime_reagentmod, multiplicative_slowdown = amount)
- return NONE
-
-/mob/living/simple_animal/slime/updatehealth()
- . = ..()
- var/mod = 0
- if(!HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))
- var/health_deficiency = (maxHealth - health)
- if(health_deficiency >= 45)
- mod += (health_deficiency / 25)
- if(health <= 0)
- mod += 2
- add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/slime_healthmod, multiplicative_slowdown = mod)
-
-/mob/living/simple_animal/slime/adjust_bodytemperature()
- . = ..()
- var/mod = 0
- if(bodytemperature >= 330.23) // 135 F or 57.08 C
- mod = -1 // slimes become supercharged at high temperatures
- else if(bodytemperature < 283.222)
- mod = ((283.222 - bodytemperature) / 10) * 1.75
- if(mod)
- add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/slime_tempmod, multiplicative_slowdown = mod)
-
-/mob/living/simple_animal/slime/ObjBump(obj/O)
- if(!client && powerlevel > 0)
- var/probab = 10
- switch(powerlevel)
- if(1 to 2)
- probab = 20
- if(3 to 4)
- probab = 30
- if(5 to 6)
- probab = 40
- if(7 to 8)
- probab = 60
- if(9)
- probab = 70
- if(10)
- probab = 95
- if(prob(probab))
- if(istype(O, /obj/structure/window) || istype(O, /obj/structure/grille))
- if(nutrition <= get_hunger_nutrition() && !Atkcool)
- if (is_adult || prob(5))
- O.attack_slime(src)
- Atkcool = TRUE
- addtimer(VARSET_CALLBACK(src, Atkcool, FALSE), 4.5 SECONDS)
-
-/mob/living/simple_animal/slime/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
- return 2
-
-/mob/living/simple_animal/slime/get_status_tab_items()
- . = ..()
- if(!docile)
- . += "Nutrition: [nutrition]/[get_max_nutrition()]"
- if(amount_grown >= SLIME_EVOLUTION_THRESHOLD)
- if(is_adult)
- . += "You can reproduce!"
- else
- . += "You can evolve!"
-
- switch(stat)
- if(HARD_CRIT, UNCONSCIOUS)
- . += "You are knocked out by high levels of BZ!"
- else
- . += "Power Level: [powerlevel]"
-
-
-/mob/living/simple_animal/slime/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
- if(!forced)
- amount = -abs(amount)
- return ..() //Heals them
-
-/mob/living/simple_animal/slime/emp_act(severity)
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- powerlevel = 0 // oh no, the power!
-
-/mob/living/simple_animal/slime/MouseDrop(atom/movable/A as mob|obj)
- if(isliving(A) && A != src && usr == src)
- var/mob/living/Food = A
- if(CanFeedon(Food))
- Feedon(Food)
- return ..()
-
-/mob/living/simple_animal/slime/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
- return
-
-/mob/living/simple_animal/slime/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE)
- return
-
-/mob/living/simple_animal/slime/attack_ui(slot, params)
- return
-
-/mob/living/simple_animal/slime/attack_slime(mob/living/simple_animal/slime/M, list/modifiers)
- if(..()) //successful slime attack
- if(M == src)
- return
- if(buckled)
- Feedstop(silent = TRUE)
- visible_message(span_danger("[M] pulls [src] off!"), \
- span_danger("You pull [src] off!"))
- return
- attacked += 5
- if(nutrition >= 100) //steal some nutrition. negval handled in life()
- adjust_nutrition(-(50 + (40 * M.is_adult)))
- M.add_nutrition(50 + (40 * M.is_adult))
- if(health > 0)
- M.adjustBruteLoss(-10 + (-10 * M.is_adult))
- M.updatehealth()
-
-/mob/living/simple_animal/slime/attack_animal(mob/living/simple_animal/user, list/modifiers)
- . = ..()
- if(.)
- attacked += 10
-
-
-/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/human/user, list/modifiers)
- if(..()) //successful monkey bite.
- attacked += 10
-
-/mob/living/simple_animal/slime/attack_larva(mob/living/carbon/alien/larva/L, list/modifiers)
- if(..()) //successful larva bite.
- attacked += 10
-
-/mob/living/simple_animal/slime/attack_hulk(mob/living/carbon/human/user)
- . = ..()
- if(!.)
- return
- discipline_slime(user)
-
-/mob/living/simple_animal/slime/attack_hand(mob/living/carbon/human/user, list/modifiers)
- if(buckled)
- user.do_attack_animation(src, ATTACK_EFFECT_DISARM)
- if(buckled == user)
- if(prob(60))
- user.visible_message(span_warning("[user] attempts to wrestle \the [name] off!"), \
- span_danger("You attempt to wrestle \the [name] off!"))
- playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
-
- else
- user.visible_message(span_warning("[user] manages to wrestle \the [name] off!"), \
- span_notice("You manage to wrestle \the [name] off!"))
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
-
- discipline_slime(user)
-
- else
- if(prob(30))
- buckled.visible_message(span_warning("[user] attempts to wrestle \the [name] off of [buckled]!"), \
- span_warning("[user] attempts to wrestle \the [name] off of you!"))
- playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
-
- else
- buckled.visible_message(span_warning("[user] manages to wrestle \the [name] off of [buckled]!"), \
- span_notice("[user] manage to wrestle \the [name] off of you!"))
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
-
- discipline_slime(user)
- else
- if(stat == DEAD && surgeries.len)
- if(!(user.istate & ISTATE_HARM) || (istate & ISTATE_SECONDARY))
- for(var/datum/surgery/operations as anything in surgeries)
- if(operations.next_step(user, modifiers))
- return TRUE
- if(..()) //successful attack
- attacked += 10
-
-/mob/living/simple_animal/slime/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers)
- if(..()) //if harm or disarm intent.
- attacked += 10
- discipline_slime(user)
-
-
-/mob/living/simple_animal/slime/attackby(obj/item/W, mob/living/user, params)
- if(stat == DEAD && surgeries.len)
- var/list/modifiers = params2list(params)
- if(!(user.istate & ISTATE_HARM) || ((istate & ISTATE_SECONDARY)))
- for(var/datum/surgery/operations as anything in surgeries)
- if(operations.next_step(user, modifiers))
- return TRUE
- if(istype(W, /obj/item/stack/sheet/mineral/plasma) && !stat) //Let's you feed slimes plasma.
- add_friendship(user, 1)
- to_chat(user, span_notice("You feed the slime the plasma. It chirps happily."))
- var/obj/item/stack/sheet/mineral/plasma/S = W
- S.use(1)
- return
- if(W.force > 0)
- attacked += 10
- if(prob(25))
- user.do_attack_animation(src)
- user.changeNext_move(CLICK_CD_MELEE)
- to_chat(user, span_danger("[W] passes right through [src]!"))
- return
- if(Discipline && prob(50)) // wow, buddy, why am I getting attacked??
- Discipline = 0
- if(W.force >= 3)
- var/force_effect = 2 * W.force
- if(is_adult)
- force_effect = round(W.force/2)
- if(prob(10 + force_effect))
- discipline_slime(user)
- if(istype(W, /obj/item/storage/bag/xeno))
- var/obj/item/storage/P = W
- if(!effectmod)
- to_chat(user, span_warning("The slime is not currently being mutated."))
- return
- var/hasOutput = FALSE //Have we outputted text?
- var/hasFound = FALSE //Have we found an extract to be added?
- for(var/obj/item/slime_extract/S in P.contents)
- if(S.effectmod == effectmod)
- P.atom_storage.attempt_remove(S, get_turf(src), silent = TRUE)
- qdel(S)
- applied++
- hasFound = TRUE
- if(applied >= SLIME_EXTRACT_CROSSING_REQUIRED)
- to_chat(user, span_notice("You feed the slime as many of the extracts from the bag as you can, and it mutates!"))
- playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
- spawn_corecross()
- hasOutput = TRUE
- break
- if(!hasOutput)
- if(!hasFound)
- to_chat(user, span_warning("There are no extracts in the bag that this slime will accept!"))
- else
- to_chat(user, span_notice("You feed the slime some extracts from the bag."))
- playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
- return
- ..()
-
-/mob/living/simple_animal/slime/proc/spawn_corecross()
- var/static/list/crossbreeds = subtypesof(/obj/item/slimecross)
- visible_message(span_danger("[src] shudders, its mutated core consuming the rest of its body!"))
- playsound(src, 'sound/magic/smoke.ogg', 50, TRUE)
- var/crosspath
- for(var/X in crossbreeds)
- var/obj/item/slimecross/S = X
- if(initial(S.colour) == colour && initial(S.effect) == effectmod)
- crosspath = S
- break
- if(crosspath)
- new crosspath(loc)
- else
- visible_message(span_warning("The mutated core shudders, and collapses into a puddle, unable to maintain its form."))
- qdel(src)
-
-/mob/living/simple_animal/slime/proc/apply_water()
- adjustBruteLoss(rand(15,20))
- if(!client)
- if(Target) // Like cats
- set_target(null)
- ++Discipline
- return
-
-/mob/living/simple_animal/slime/examine(mob/user)
- . = list("This is [icon2html(src, user)] \a [src]!")
- if (stat == DEAD)
- . += span_deadsay("It is limp and unresponsive.")
- else
- if (stat == UNCONSCIOUS || stat == HARD_CRIT) // Slime stasis
- . += span_deadsay("It appears to be alive but unresponsive.")
- if (getBruteLoss())
- . += ""
- if (getBruteLoss() < 40)
- . += "It has some punctures in its flesh!"
- else
- . += "It has severe punctures and tears in its flesh!"
- . += "\n"
-
- switch(powerlevel)
- if(2 to 3)
- . += "It is flickering gently with a little electrical activity."
-
- if(4 to 5)
- . += "It is glowing gently with moderate levels of electrical activity."
-
- if(6 to 9)
- . += span_warning("It is glowing brightly with high levels of electrical activity.")
-
- if(10)
- . += span_warning("It is radiating with massive levels of electrical activity!")
-
- . += ""
-
-/mob/living/simple_animal/slime/proc/discipline_slime(mob/user)
- if(stat)
- return
-
- if(prob(80) && !client)
- Discipline++
-
- if(!is_adult)
- if(Discipline == 1)
- attacked = 0
-
- set_target(null)
- if(buckled)
- Feedstop(silent = TRUE) //we unbuckle the slime from the mob it latched onto.
-
- SStun = world.time + rand(20,60)
-
- Stun(3)
- if(user)
- step_away(src,user,15)
-
- addtimer(CALLBACK(src, PROC_REF(slime_move), user), 0.3 SECONDS)
-
-
-/mob/living/simple_animal/slime/proc/slime_move(mob/user)
- if(user)
- step_away(src,user,15)
-
-
-/mob/living/simple_animal/slime/pet
- docile = 1
-
-/mob/living/simple_animal/slime/get_mob_buckling_height(mob/seat)
- if(..())
- return 3
-
-/mob/living/simple_animal/slime/random/Initialize(mapload, new_colour, new_is_adult)
- . = ..(mapload, pick(slime_colours), prob(50))
-
-/mob/living/simple_animal/slime/add_cell_sample()
- AddElement(/datum/element/swabable, CELL_LINE_TABLE_SLIME, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
-
-/mob/living/simple_animal/slime/proc/set_target(new_target)
- var/old_target = Target
- Target = new_target
- if(old_target && !SLIME_CARES_ABOUT(old_target))
- UnregisterSignal(old_target, COMSIG_QDELETING)
- if(Target)
- RegisterSignal(Target, COMSIG_QDELETING, PROC_REF(clear_memories_of), override = TRUE)
-
-/mob/living/simple_animal/slime/proc/set_leader(new_leader)
- var/old_leader = Leader
- Leader = new_leader
- if(old_leader && !SLIME_CARES_ABOUT(old_leader))
- UnregisterSignal(old_leader, COMSIG_QDELETING)
- if(Leader)
- RegisterSignal(Leader, COMSIG_QDELETING, PROC_REF(clear_memories_of), override = TRUE)
-
-/mob/living/simple_animal/slime/proc/add_friendship(new_friend, amount = 1)
- if(!Friends[new_friend])
- Friends[new_friend] = 0
- Friends[new_friend] += amount
- if(new_friend)
- RegisterSignal(new_friend, COMSIG_QDELETING, PROC_REF(clear_memories_of), override = TRUE)
-
-/mob/living/simple_animal/slime/proc/set_friendship(new_friend, amount = 1)
- Friends[new_friend] = amount
- if(new_friend)
- RegisterSignal(new_friend, COMSIG_QDELETING, PROC_REF(clear_memories_of), override = TRUE)
-
-/mob/living/simple_animal/slime/proc/remove_friend(friend)
- Friends -= friend
- if(friend && !SLIME_CARES_ABOUT(friend))
- UnregisterSignal(friend, COMSIG_QDELETING)
-
-/mob/living/simple_animal/slime/proc/set_friends(new_buds)
- clear_friends()
- for(var/mob/friend as anything in new_buds)
- set_friendship(friend, new_buds[friend])
-
-/mob/living/simple_animal/slime/proc/clear_friends()
- for(var/mob/friend as anything in Friends)
- remove_friend(friend)
-
-/mob/living/simple_animal/slime/proc/clear_memories_of(datum/source)
- SIGNAL_HANDLER
- if(source == Target)
- set_target(null)
- if(source == Leader)
- set_leader(null)
- remove_friend(source)
-
-#undef SLIME_CARES_ABOUT
diff --git a/code/modules/mob/living/simple_animal/slime/slime_say.dm b/code/modules/mob/living/simple_animal/slime/slime_say.dm
deleted file mode 100644
index 1a2540c447fa..000000000000
--- a/code/modules/mob/living/simple_animal/slime/slime_say.dm
+++ /dev/null
@@ -1,8 +0,0 @@
-/mob/living/simple_animal/slime/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, list/message_mods = list(), message_range)
- . = ..()
- if(speaker == src || radio_freq || stat || !(speaker in Friends))
- return
-
- speech_buffer = list()
- speech_buffer += speaker
- speech_buffer += lowertext(raw_message)
diff --git a/code/modules/mob/living/simple_animal/slime/subtypes.dm b/code/modules/mob/living/simple_animal/slime/subtypes.dm
deleted file mode 100644
index 47d45d71fdcd..000000000000
--- a/code/modules/mob/living/simple_animal/slime/subtypes.dm
+++ /dev/null
@@ -1,79 +0,0 @@
-/mob/living/simple_animal/slime/proc/mutation_table(colour)
- var/list/slime_mutation_colors[4]
- switch(colour)
- //Tier 1
- if("grey")
- slime_mutation_colors[1] = "orange"
- slime_mutation_colors[2] = "metal"
- slime_mutation_colors[3] = "blue"
- slime_mutation_colors[4] = "purple"
- //Tier 2
- if("purple")
- slime_mutation_colors[1] = "dark purple"
- slime_mutation_colors[2] = "dark blue"
- slime_mutation_colors[3] = "green"
- slime_mutation_colors[4] = "green"
- if("metal")
- slime_mutation_colors[1] = "silver"
- slime_mutation_colors[2] = "yellow"
- slime_mutation_colors[3] = "gold"
- slime_mutation_colors[4] = "gold"
- if("orange")
- slime_mutation_colors[1] = "dark purple"
- slime_mutation_colors[2] = "yellow"
- slime_mutation_colors[3] = "red"
- slime_mutation_colors[4] = "red"
- if("blue")
- slime_mutation_colors[1] = "dark blue"
- slime_mutation_colors[2] = "silver"
- slime_mutation_colors[3] = "pink"
- slime_mutation_colors[4] = "pink"
- //Tier 3
- if("dark blue")
- slime_mutation_colors[1] = "purple"
- slime_mutation_colors[2] = "blue"
- slime_mutation_colors[3] = "cerulean"
- slime_mutation_colors[4] = "cerulean"
- if("dark purple")
- slime_mutation_colors[1] = "purple"
- slime_mutation_colors[2] = "orange"
- slime_mutation_colors[3] = "sepia"
- slime_mutation_colors[4] = "sepia"
- if("yellow")
- slime_mutation_colors[1] = "metal"
- slime_mutation_colors[2] = "orange"
- slime_mutation_colors[3] = "bluespace"
- slime_mutation_colors[4] = "bluespace"
- if("silver")
- slime_mutation_colors[1] = "metal"
- slime_mutation_colors[2] = "blue"
- slime_mutation_colors[3] = "pyrite"
- slime_mutation_colors[4] = "pyrite"
- //Tier 4
- if("pink")
- slime_mutation_colors[1] = "pink"
- slime_mutation_colors[2] = "pink"
- slime_mutation_colors[3] = "light pink"
- slime_mutation_colors[4] = "light pink"
- if("red")
- slime_mutation_colors[1] = "red"
- slime_mutation_colors[2] = "red"
- slime_mutation_colors[3] = "oil"
- slime_mutation_colors[4] = "oil"
- if("gold")
- slime_mutation_colors[1] = "gold"
- slime_mutation_colors[2] = "gold"
- slime_mutation_colors[3] = "adamantine"
- slime_mutation_colors[4] = "adamantine"
- if("green")
- slime_mutation_colors[1] = "green"
- slime_mutation_colors[2] = "green"
- slime_mutation_colors[3] = "black"
- slime_mutation_colors[4] = "black"
- // Tier 5
- else
- slime_mutation_colors[1] = colour
- slime_mutation_colors[2] = colour
- slime_mutation_colors[3] = colour
- slime_mutation_colors[4] = colour
- return(slime_mutation_colors)
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
index 5dfdfcc0b78e..d9448372b5ce 100644
--- a/code/modules/mob/living/ventcrawling.dm
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -82,13 +82,6 @@
else
to_chat(src, span_warning("This ventilation duct is not connected to anything!"))
-/mob/living/simple_animal/slime/can_enter_vent(obj/machinery/atmospherics/components/ventcrawl_target, provide_feedback = TRUE)
- if(buckled)
- if(provide_feedback)
- to_chat(src, span_warning("You can't vent crawl while feeding!"))
- return
- return ..()
-
/**
* Moves living mob directly into the vent as a ventcrawler
*
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 22872424a846..cc300dc070fb 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1006,7 +1006,7 @@
* You can buckle on mobs if you're next to them since most are dense
*/
/mob/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE, buckle_mob_flags= NONE)
- if(M.buckled)
+ if(M.buckled && LAZYLEN(buckled_mobs) >= max_buckled_mobs)
return FALSE
return ..(M, force, check_loc, buckle_mob_flags)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index e9e28018f4cd..a94bc9b5803b 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -234,18 +234,17 @@
for(var/t in bodyparts)
qdel(t)
- var/mob/living/simple_animal/slime/new_slime
+ var/mob/living/basic/slime/new_slime
if(reproduce)
var/number = pick(14;2,3,4) //reproduce (has a small chance of producing 3 or 4 offspring)
var/list/babies = list()
for(var/i in 1 to number)
- var/mob/living/simple_animal/slime/M = new/mob/living/simple_animal/slime(loc)
- M.set_nutrition(round(nutrition/number))
+ var/mob/living/basic/slime/M = new/mob/living/basic/slime(loc)
step_away(M,src)
babies += M
new_slime = pick(babies)
else
- new_slime = new /mob/living/simple_animal/slime(loc)
+ new_slime = new /mob/living/basic/slime(loc)
new_slime.set_combat_mode(TRUE)
new_slime.key = key
diff --git a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
index e80273e1accb..eca84f119e07 100644
--- a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
+++ b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
@@ -18,15 +18,15 @@
///dead slimes, with a var for whatever color you want.
/obj/effect/mob_spawn/corpse/slime
- mob_type = /mob/living/simple_animal/slime
+ mob_type = /mob/living/basic/slime
icon = 'icons/mob/simple/slimes.dmi'
icon_state = "grey baby slime" //sets the icon in the map editor
///the color of the slime you're spawning.
- var/slime_species = "grey"
+ var/slime_species = /datum/slime_color/grey
-/obj/effect/mob_spawn/corpse/slime/special(mob/living/simple_animal/slime/spawned_slime)
+/obj/effect/mob_spawn/corpse/slime/special(mob/living/basic/slime/spawned_slime)
. = ..()
- spawned_slime.set_colour(slime_species)
+ spawned_slime.change_color(slime_species)
///dead facehuggers, great for xeno ruins so you can have a cool ruin without spiraling the entire round into xenomorph hell. also, this is a terrible terrible artifact of time
/obj/effect/mob_spawn/corpse/facehugger
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 66d6366cd4c0..fa85c19f05a8 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -433,7 +433,7 @@
name = "EMP-proof slime core"
desc = "A yellow slime core infused with plasma. Its organic nature makes it immune to EMPs."
icon = 'icons/mob/simple/slimes.dmi'
- icon_state = "yellow slime extract"
+ icon_state = "yellow_slime_extract"
custom_materials = null
maxcharge = 5000
charge_light_type = null
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 8da6da798265..c0f4fd62281b 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -125,6 +125,8 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
var/restricted = FALSE
/// do we have a turf exposure (used to prevent liquids doing un-needed processes)
var/turf_exposure = FALSE
+ /// are we slippery?
+ var/slippery = TRUE
/// A list of traits to apply while the reagent is being metabolized.
var/list/metabolized_traits
/// A list of traits to apply while the reagent is in a mob.
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index f5ed3d865af2..7afbfb2c5f21 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -375,7 +375,7 @@
exposed_open_turf.air.temperature = max(exposed_open_turf.air.temperature - ((temperature - TCMB) * (heat_capacity * reac_volume * specific_heat) / (heat_capacity + reac_volume * specific_heat)) / heat_capacity, TCMB) // Exchanges environment temperature with reagent. Reagent is at 2.7K with a heat capacity of 40J per unit.
if(reac_volume < 5)
return
- for(var/mob/living/simple_animal/slime/exposed_slime in exposed_turf)
+ for(var/mob/living/basic/slime/exposed_slime in exposed_turf)
exposed_slime.adjustToxLoss(rand(15,30))
/datum/reagent/consumable/condensedcapsaicin
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index cd100853d4e9..8df7408e8892 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -213,7 +213,7 @@
if(reac_volume >= 5)
exposed_turf.MakeSlippery(TURF_WET_WATER, 10 SECONDS, min(reac_volume*1.5 SECONDS, 60 SECONDS))
- for(var/mob/living/simple_animal/slime/exposed_slime in exposed_turf)
+ for(var/mob/living/basic/slime/exposed_slime in exposed_turf)
exposed_slime.apply_water()
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in exposed_turf)
@@ -1370,7 +1370,7 @@
continue
movable_content.wash(clean_types)
- for(var/mob/living/simple_animal/slime/exposed_slime in exposed_turf)
+ for(var/mob/living/basic/slime/exposed_slime in exposed_turf)
exposed_slime.adjustToxLoss(rand(5,10))
/datum/reagent/space_cleaner/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message=TRUE, touch_protection=0)
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 4e57b4dc2409..796c9cf19e06 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -264,7 +264,7 @@
. = ..()
if(reac_volume < 5)
return
- for(var/mob/living/simple_animal/slime/exposed_slime in exposed_turf)
+ for(var/mob/living/basic/slime/exposed_slime in exposed_turf)
exposed_slime.adjustToxLoss(rand(15,30))
#undef CRYO_SPEED_PREFACTOR
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 3f27ff2497bc..0f99c7c4321f 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -31,7 +31,7 @@
required_container = /obj/item/slime_extract/grey
/datum/chemical_reaction/slime/slimespawn/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
- var/mob/living/simple_animal/slime/S = new(get_turf(holder.my_atom), "grey")
+ var/mob/living/basic/slime/S = new(get_turf(holder.my_atom), /datum/slime_color/grey)
S.visible_message(span_danger("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!"))
..()
@@ -46,7 +46,7 @@
/datum/chemical_reaction/slime/slimemonkey/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
for(var/i in 1 to 3)
- new /obj/item/food/monkeycube(get_turf(holder.my_atom))
+ new /obj/item/stack/biomass(get_turf(holder.my_atom))
..()
//Green
@@ -313,13 +313,13 @@
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_SLIME | REACTION_TAG_DANGEROUS
/datum/chemical_reaction/slime/slimebloodlust/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
- for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null))
- if(slime.docile) //Undoes docility, but doesn't make rabid.
+ for(var/mob/living/basic/slime/slime in viewers(get_turf(holder.my_atom), null))
+ if(slime.has_slime_trait(/datum/slime_trait/docility)) //Undoes docility, but doesn't make rabid.
slime.visible_message(span_danger("[slime] forgets its training, becoming wild once again!"))
- slime.docile = FALSE
+ slime.remove_trait(/datum/slime_trait/docility)
slime.update_name()
continue
- slime.rabid = 1
+ ADD_TRAIT(slime, TRAIT_SLIME_RABID, "bloodlust")
slime.visible_message(span_danger("The [slime] is driven into a frenzy!"))
..()
@@ -527,7 +527,7 @@
S.active = TRUE
addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, detonate)), rand(15,60))
else
- var/mob/living/simple_animal/slime/random/S = new (get_turf(holder.my_atom))
+ var/mob/living/basic/slime/random/S = new (get_turf(holder.my_atom))
S.visible_message(span_danger("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!"))
..()
diff --git a/code/modules/research/designs/autolathe/medsci_designs.dm b/code/modules/research/designs/autolathe/medsci_designs.dm
index e0b03384044b..599babb107f2 100644
--- a/code/modules/research/designs/autolathe/medsci_designs.dm
+++ b/code/modules/research/designs/autolathe/medsci_designs.dm
@@ -36,17 +36,6 @@
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
// Science Designs
-/datum/design/slime_scanner
- name = "Slime Scanner"
- id = "slime_scanner"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2)
- build_path = /obj/item/slime_scanner
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_XENOBIOLOGY,
- )
- departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
/datum/design/petridish
name = "Petri Dish"
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 84c5a3ac80ab..05f0defdf8b7 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -46,16 +46,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
-/datum/design/board/xenobiocamera
- name = "Xenobiology Console Board"
- desc = "Allows for the construction of circuit boards used to build xenobiology camera computers."
- id = "xenobioconsole"
- build_path = /obj/item/circuitboard/computer/xenobiology
- category = list(
- RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_RESEARCH
- )
- departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
-
/datum/design/board/aiupload
name = "AI Upload Board"
desc = "Allows for the construction of circuit boards used to build an AI Upload Console."
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 2959c9af5de0..4c9bfc3a262a 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -522,16 +522,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE
-/datum/design/board/monkey_recycler
- name = "Monkey Recycler Board"
- desc = "The circuit board for a monkey recycler."
- id = "monkey_recycler"
- build_path = /obj/item/circuitboard/machine/monkey_recycler
- category = list(
- RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH
- )
- departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
-
/datum/design/board/seed_extractor
name = "Seed Extractor Board"
desc = "The circuit board for a seed extractor."
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 8b5fc4ff97ed..f689ab713294 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -105,7 +105,6 @@
"shaker",
"shot_glass",
"signaler",
- "slime_scanner",
"solar_panel",
"solar_tracker",
"space_heater",
@@ -474,13 +473,19 @@
"gibber",
"griddle",
"microwave",
- "monkey_recycler",
"oven",
"processor",
"range", // should be in a further node, probably
"reagentgrinder",
"smartfridge",
"stove",
+ "biomass_recycler",
+ "corral_corner",
+ "slime_extract_requestor",
+ "slime_market_pad",
+ "slime_market",
+ "slimevac",
+
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)
discount_experiments = list(/datum/experiment/scanning/random/cytology = 3000) //Big discount to reinforce doing it.
@@ -707,7 +712,6 @@
"beacon",
"bluespace_crystal",
"telesci_gps",
- "xenobioconsole",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
diff --git a/code/modules/research/xenobiology/crossbreeding/__corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm
index b682bed7cdfa..4a8ff0e6ce95 100644
--- a/code/modules/research/xenobiology/crossbreeding/__corecross.dm
+++ b/code/modules/research/xenobiology/crossbreeding/__corecross.dm
@@ -89,6 +89,8 @@ To add a crossbreed:
if("adamantine")
itemcolor = "#008B8B"
add_atom_colour(itemcolor, FIXED_COLOUR_PRIORITY)
+ if(colour == "rainbow")
+ rainbow_effect()
/obj/item/slimecrossbeaker //To be used as a result for extract reactions that make chemicals.
name = "result extract"
diff --git a/code/modules/research/xenobiology/crossbreeding/_mobs.dm b/code/modules/research/xenobiology/crossbreeding/_mobs.dm
index 24e44f0a389b..851d9f7f8d0b 100644
--- a/code/modules/research/xenobiology/crossbreeding/_mobs.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_mobs.dm
@@ -16,7 +16,7 @@ Slimecrossing Mobs
convert_damage = TRUE
convert_damage_type = CLONE
- possible_shapes = list(/mob/living/simple_animal/slime/transformed_slime)
+ possible_shapes = list(/mob/living/basic/slime)
/// If TRUE, we self-delete (remove ourselves) the next time we turn back into a human
var/remove_on_restore = FALSE
@@ -29,14 +29,6 @@ Slimecrossing Mobs
if(remove_on_restore)
qdel(src)
-/// Transformed slime - from Burning Black
-/mob/living/simple_animal/slime/transformed_slime
-
-// Just in case.
-/mob/living/simple_animal/slime/transformed_slime/Reproduce()
- to_chat(src, span_warning("I can't reproduce...")) // Mood
- return
-
//Slime corgi - Chilling Pink
/mob/living/basic/pet/dog/corgi/puppy/slime
name = "\improper slime corgi puppy"
diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm
index 0b5368f53728..1e6205dc8039 100644
--- a/code/modules/research/xenobiology/crossbreeding/_potions.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_potions.dm
@@ -183,7 +183,7 @@ Slimecrossing Potions
icon = 'icons/obj/medical/chemical.dmi'
icon_state = "potsilver"
-/obj/item/slimepotion/slime_reviver/attack(mob/living/simple_animal/slime/revive_target, mob/user)
+/obj/item/slimepotion/slime_reviver/attack(mob/living/basic/slime/revive_target, mob/user)
if(!isslime(revive_target))
to_chat(user, span_warning("The potion only works on slimes!"))
return ..()
@@ -207,7 +207,7 @@ Slimecrossing Potions
icon = 'icons/obj/medical/chemical.dmi'
icon_state = "potcyan"
-/obj/item/slimepotion/slime/chargedstabilizer/attack(mob/living/simple_animal/slime/stabilize_target, mob/user)
+/obj/item/slimepotion/slime/chargedstabilizer/attack(mob/living/basic/slime/stabilize_target, mob/user)
if(!isslime(stabilize_target))
to_chat(user, span_warning("The stabilizer only works on slimes!"))
return ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index a68a6fafae35..a7c6c3baed07 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -470,10 +470,8 @@
colour = "grey"
/datum/status_effect/stabilized/grey/tick()
- for(var/mob/living/simple_animal/slime/S in range(1, get_turf(owner)))
- if(!(owner in S.Friends))
- to_chat(owner, span_notice("[linked_extract] pulses gently as it communicates with [S]."))
- S.set_friendship(owner, 1)
+ for(var/mob/living/basic/slime/S in range(1, get_turf(owner)))
+ SEND_SIGNAL(S, COMSIG_FRIENDSHIP_CHANGE, owner, 1)
return ..()
/datum/status_effect/stabilized/orange
diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm
index 14d2f980eb43..b2d8eaaed28f 100644
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ b/code/modules/research/xenobiology/crossbreeding/burning.dm
@@ -32,11 +32,10 @@ Burning extracts:
effect_desc = "Creates a hungry and speedy slime that will love you forever."
/obj/item/slimecross/burning/grey/do_effect(mob/user)
- var/mob/living/simple_animal/slime/S = new(get_turf(user),"grey")
+ var/mob/living/basic/slime/S = new(get_turf(user))
S.visible_message(span_danger("A baby slime emerges from [src], and it nuzzles [user] before burbling hungrily!"))
- S.set_friendship(user, 20) //Gas, gas, gas
+ SEND_SIGNAL(S, COMSIG_FRIENDSHIP_CHANGE, user, 110)
S.bodytemperature = T0C + 400 //We gonna step on the gas.
- S.set_nutrition(S.get_hunger_nutrition()) //Tonight, we fight!
..()
/obj/item/slimecross/burning/orange
@@ -197,14 +196,16 @@ Burning extracts:
/obj/item/slimecross/burning/red/do_effect(mob/user)
user.visible_message(span_danger("[src] pulses a hazy red aura for a moment, which wraps around [user]!"))
- for(var/mob/living/simple_animal/slime/S in view(7, get_turf(user)))
+ for(var/mob/living/basic/slime/S in view(7, get_turf(user)))
+ /*
if(user in S.Friends)
var/friendliness = S.Friends[user]
S.clear_friends()
S.set_friendship(user, friendliness)
else
S.clear_friends()
- S.rabid = 1
+ */
+ ADD_TRAIT(S, TRAIT_SLIME_RABID, "burning-red")
S.visible_message(span_danger("The [S] is driven into a dangerous frenzy!"))
..()
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index a125cd7276e3..5e14557999cd 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -276,6 +276,6 @@ Charged extracts:
/obj/item/slimecross/charged/rainbow/do_effect(mob/user)
user.visible_message(span_warning("[src] swells and splits into three new slimes!"))
for(var/i in 1 to 3)
- var/mob/living/simple_animal/slime/S = new(get_turf(user))
- S.random_colour()
+ var/mob/living/basic/slime/S = new(get_turf(user))
+ S.start_mutating(TRUE)
return ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index 18f5a2849cab..9c37d0df7b87 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -231,9 +231,9 @@ Chilling extracts:
/obj/item/slimecross/chilling/red/do_effect(mob/user)
var/slimesfound = FALSE
- for(var/mob/living/simple_animal/slime/S in view(get_turf(user), 7))
+ for(var/mob/living/basic/slime/S in view(get_turf(user), 7))
slimesfound = TRUE
- S.docile = TRUE
+ S.add_trait(/datum/slime_trait/docility)
if(slimesfound)
user.visible_message(span_notice("[src] lets out a peaceful ring as it shatters, and nearby slimes seem calm."))
else
diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm
index 710cf90dd71e..425e8026f896 100644
--- a/code/modules/research/xenobiology/crossbreeding/industrial.dm
+++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm
@@ -54,7 +54,7 @@ Industrial extracts:
/obj/item/slimecross/industrial/grey
colour = "grey"
effect_desc = "Produces monkey cubes."
- itempath = /obj/item/food/monkeycube
+ itempath = /obj/item/stack/biomass
itemamount = 5
/obj/item/slimecross/industrial/orange
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index 6460b3a849fe..a0b357d7bdcf 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -197,8 +197,8 @@ Regenerative extracts:
/obj/item/slimecross/regenerative/green/core_effect(mob/living/target, mob/user)
if(isslime(target))
target.visible_message(span_warning("The [target] suddenly changes color!"))
- var/mob/living/simple_animal/slime/S = target
- S.random_colour()
+ var/mob/living/basic/slime/S = target
+ S.start_mutating(TRUE)
if(isjellyperson(target))
target.reagents.add_reagent(/datum/reagent/mutationtoxin/jelly,5)
@@ -237,7 +237,7 @@ Regenerative extracts:
/obj/item/slimecross/regenerative/black/core_effect_before(mob/living/target, mob/user)
var/dummytype = target.type
if(ismegafauna(target)) //Prevents megafauna duping in a lame way
- dummytype = /mob/living/simple_animal/slime
+ dummytype = /mob/living/basic/slime
to_chat(user, span_warning("The milky goo flows over [target], falling into a weak puddle."))
var/mob/living/dummy = new dummytype(target.loc)
to_chat(target, span_notice("The milky goo flows from your skin, forming an imperfect copy of you."))
diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
index cb903c84d625..f22e6109fb35 100644
--- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
+++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
@@ -249,7 +249,7 @@
/datum/reagent/consumable/ice = -2) //Brrr!
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/simple_animal/slime = 1)
+ resulting_atoms = list(/mob/living/basic/slime = 1)
/datum/micro_organism/cell_line/blob_spore //shitty cell line to dilute the pool, feel free to make easier to grow if it doesn't interfer with growing the powerful mobs enough.
desc = "Immature blob spores"
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
deleted file mode 100644
index d3b1b581c019..000000000000
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ /dev/null
@@ -1,453 +0,0 @@
-//Xenobio control console
-/mob/camera/ai_eye/remote/xenobio
- visible_icon = TRUE
- icon = 'icons/mob/silicon/cameramob.dmi'
- icon_state = "generic_camera"
- var/allowed_area = null
-
-/mob/camera/ai_eye/remote/xenobio/Initialize(mapload)
- var/area/A = get_area(loc)
- allowed_area = A.name
- . = ..()
-
-/mob/camera/ai_eye/remote/xenobio/setLoc(turf/destination, force_update = FALSE)
- var/area/new_area = get_area(destination)
- if(new_area && new_area.name == allowed_area || new_area && (new_area.area_flags & XENOBIOLOGY_COMPATIBLE))
- return ..()
- else
- return
-
-/mob/camera/ai_eye/remote/xenobio/can_z_move(direction, turf/start, turf/destination, z_move_flags = NONE, mob/living/rider)
- . = ..()
- if(!.)
- return
- var/area/new_area = get_area(.)
- if(new_area.name != allowed_area && !(new_area.area_flags & XENOBIOLOGY_COMPATIBLE))
- return FALSE
-
-/obj/machinery/computer/camera_advanced/xenobio
- name = "Slime management console"
- desc = "A computer used for remotely handling slimes."
- networks = list("ss13")
- circuit = /obj/item/circuitboard/computer/xenobiology
-
- var/obj/machinery/monkey_recycler/connected_recycler
- var/list/stored_slimes
- var/obj/item/slimepotion/slime/current_potion
- var/max_slimes = 5
- var/monkeys = 0
-
- icon_screen = "slime_comp"
- icon_keyboard = "rd_key"
-
- light_color = LIGHT_COLOR_PINK
-
-/obj/machinery/computer/camera_advanced/xenobio/Initialize(mapload)
- . = ..()
- actions += new /datum/action/innate/slime_place(src)
- actions += new /datum/action/innate/slime_pick_up(src)
- actions += new /datum/action/innate/feed_slime(src)
- actions += new /datum/action/innate/monkey_recycle(src)
- actions += new /datum/action/innate/slime_scan(src)
- actions += new /datum/action/innate/feed_potion(src)
- actions += new /datum/action/innate/hotkey_help(src)
-
- stored_slimes = list()
- for(var/obj/machinery/monkey_recycler/recycler in GLOB.monkey_recyclers)
- if(get_area(recycler.loc) == get_area(loc))
- connected_recycler = recycler
- connected_recycler.connected += src
-
-/obj/machinery/computer/camera_advanced/xenobio/Destroy()
- QDEL_NULL(current_potion)
- for(var/thing in stored_slimes)
- var/mob/living/simple_animal/slime/S = thing
- S.forceMove(drop_location())
- stored_slimes.Cut()
- if(connected_recycler)
- connected_recycler.connected -= src
- connected_recycler = null
- return ..()
-
-/obj/machinery/computer/camera_advanced/xenobio/handle_atom_del(atom/A)
- if(A == current_potion)
- current_potion = null
- if(A in stored_slimes)
- stored_slimes -= A
- return ..()
-
-/obj/machinery/computer/camera_advanced/xenobio/CreateEye()
- eyeobj = new /mob/camera/ai_eye/remote/xenobio(get_turf(src))
- eyeobj.origin = src
- eyeobj.visible_icon = TRUE
- eyeobj.icon = 'icons/mob/silicon/cameramob.dmi'
- eyeobj.icon_state = "generic_camera"
-
-/obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/user)
- ..()
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, PROC_REF(XenoSlimeClickCtrl))
- RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, PROC_REF(XenoTurfClickCtrl))
- RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, PROC_REF(XenoMonkeyClickCtrl))
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, PROC_REF(XenoSlimeClickAlt))
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, PROC_REF(XenoSlimeClickShift))
- RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, PROC_REF(XenoTurfClickShift))
-
- //Checks for recycler on every interact, prevents issues with load order on certain maps.
- if(!connected_recycler)
- for(var/obj/machinery/monkey_recycler/recycler in GLOB.monkey_recyclers)
- if(get_area(recycler.loc) == get_area(loc))
- connected_recycler = recycler
- connected_recycler.connected += src
-
-/obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL)
- UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL)
- UnregisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT)
- UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT)
- ..()
-
-/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/food/monkeycube))
- monkeys++
- to_chat(user, span_notice("You feed [O] to [src]. It now has [monkeys] monkey cubes stored."))
- qdel(O)
- return
- else if(istype(O, /obj/item/storage/bag))
- var/obj/item/storage/P = O
- var/loaded = FALSE
- for(var/obj/G in P.contents)
- if(istype(G, /obj/item/food/monkeycube))
- loaded = TRUE
- monkeys++
- qdel(G)
- if(loaded)
- to_chat(user, span_notice("You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored."))
- return
- else if(istype(O, /obj/item/slimepotion/slime))
- var/replaced = FALSE
- if(user && !user.transferItemToLoc(O, src))
- return
- if(!QDELETED(current_potion))
- current_potion.forceMove(drop_location())
- replaced = TRUE
- current_potion = O
- to_chat(user, span_notice("You load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""]."))
- return
- ..()
-
-/obj/machinery/computer/camera_advanced/xenobio/multitool_act(mob/living/user, obj/item/multitool/I)
- . = ..()
- if (istype(I) && istype(I.buffer,/obj/machinery/monkey_recycler))
- to_chat(user, span_notice("You link [src] with [I.buffer] in [I] buffer."))
- connected_recycler = I.buffer
- connected_recycler.connected += src
- return TRUE
-
-/datum/action/innate/slime_place
- name = "Place Slimes"
- button_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "slime_down"
-
-/datum/action/innate/slime_place/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/simple_animal/slime/S in X.stored_slimes)
- S.forceMove(remote_eye.loc)
- S.visible_message(span_notice("[S] warps in!"))
- X.stored_slimes -= S
- else
- to_chat(owner, span_warning("Target is not near a camera. Cannot proceed."))
-
-/datum/action/innate/slime_pick_up
- name = "Pick up Slime"
- button_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "slime_up"
-
-/datum/action/innate/slime_pick_up/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/simple_animal/slime/S in remote_eye.loc)
- if(X.stored_slimes.len >= X.max_slimes)
- break
- if(!S.ckey)
- if(S.buckled)
- S.Feedstop(silent = TRUE)
- S.visible_message(span_notice("[S] vanishes in a flash of light!"))
- S.forceMove(X)
- X.stored_slimes += S
- else
- to_chat(owner, span_warning("Target is not near a camera. Cannot proceed."))
-
-
-/datum/action/innate/feed_slime
- name = "Feed Slimes"
- button_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "monkey_down"
-
-/datum/action/innate/feed_slime/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- if(X.monkeys >= 1)
- var/mob/living/carbon/human/species/monkey/food = new /mob/living/carbon/human/species/monkey(remote_eye.loc, TRUE, owner)
- if (!QDELETED(food))
- food.LAssailant = WEAKREF(C)
- X.monkeys--
- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
- remote_eye.auto_attach_slime(food) // monke edit: hungry slimes that aren't feeding will now immediately latch onto monkeys placed on top of them
- to_chat(owner, span_notice("[X] now has [X.monkeys] monkeys stored."))
- else
- to_chat(owner, span_warning("[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored."))
- else
- to_chat(owner, span_warning("Target is not near a camera. Cannot proceed."))
-
-
-/datum/action/innate/monkey_recycle
- name = "Recycle Monkeys"
- button_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "monkey_up"
-
-/datum/action/innate/monkey_recycle/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
- var/obj/machinery/monkey_recycler/recycler = X.connected_recycler
-
- if(!recycler)
- to_chat(owner, span_warning("There is no connected monkey recycler. Use a multitool to link one."))
- return
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/carbon/human/M in remote_eye.loc)
- if(!ismonkey(M))
- continue
- if(M.stat)
- M.visible_message(span_notice("[M] vanishes as [M.p_theyre()] reclaimed for recycling!"))
- recycler.use_power(500)
- X.monkeys += recycler.cube_production
- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
- qdel(M)
- to_chat(owner, span_notice("[X] now has [X.monkeys] monkeys available."))
- else
- to_chat(owner, span_warning("Target is not near a camera. Cannot proceed."))
-
-/datum/action/innate/slime_scan
- name = "Scan Slime"
- button_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "slime_scan"
-
-/datum/action/innate/slime_scan/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/simple_animal/slime/S in remote_eye.loc)
- slime_scan(S, C)
- else
- to_chat(owner, span_warning("Target is not near a camera. Cannot proceed."))
-
-/datum/action/innate/feed_potion
- name = "Apply Potion"
- button_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "slime_potion"
-
-/datum/action/innate/feed_potion/Activate()
- if(!target || !isliving(owner))
- return
-
- var/mob/living/C = owner
- var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
-
- if(QDELETED(X.current_potion))
- to_chat(owner, span_warning("No potion loaded."))
- return
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/simple_animal/slime/S in remote_eye.loc)
- X.current_potion.attack(S, C)
- break
- else
- to_chat(owner, span_warning("Target is not near a camera. Cannot proceed."))
-
-/datum/action/innate/hotkey_help
- name = "Hotkey Help"
- button_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "hotkey_help"
-
-/datum/action/innate/hotkey_help/Activate()
- if(!target || !isliving(owner))
- return
- to_chat(owner, "Click shortcuts:")
- to_chat(owner, "Shift-click a slime to pick it up, or the floor to drop all held slimes.")
- to_chat(owner, "Ctrl-click a slime to scan it.")
- to_chat(owner, "Alt-click a slime to feed it a potion.")
- to_chat(owner, "Ctrl-click or a dead monkey to recycle it, or the floor to place a new monkey.")
-
-//
-// Alternate clicks for slime, monkey and open turf if using a xenobio console
-
-
-//Feeds a potion to slime
-/mob/living/simple_animal/slime/AltClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_ALT, src)
- ..()
-
-//Picks up slime
-/mob/living/simple_animal/slime/ShiftClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_SHIFT, src)
- ..()
-
-//Place slimes
-/turf/open/ShiftClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_SHIFT, src)
- ..()
-
-//scans slimes
-/mob/living/simple_animal/slime/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_CTRL, src)
- ..()
-
-//picks up dead monkies
-/mob/living/carbon/human/species/monkey/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_MONKEY_CLICK_CTRL, src)
- ..()
-
-//places monkies
-/turf/open/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_CTRL, src)
- ..()
-
-// Scans slime
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickCtrl(mob/living/user, mob/living/simple_animal/slime/S)
- SIGNAL_HANDLER
- if(!GLOB.cameranet.checkTurfVis(S.loc))
- to_chat(user, span_warning("Target is not near a camera. Cannot proceed."))
- return
- var/mob/living/C = user
- var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
- var/area/mobarea = get_area(S.loc)
- if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE))
- slime_scan(S, C)
-
-//Feeds a potion to slime
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickAlt(mob/living/user, mob/living/simple_animal/slime/S)
- SIGNAL_HANDLER
- if(!GLOB.cameranet.checkTurfVis(S.loc))
- to_chat(user, span_warning("Target is not near a camera. Cannot proceed."))
- return
- var/mob/living/C = user
- var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/mobarea = get_area(S.loc)
- if(QDELETED(X.current_potion))
- to_chat(C, span_warning("No potion loaded."))
- return
- if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE))
- INVOKE_ASYNC(X.current_potion, TYPE_PROC_REF(/obj/item/slimepotion/slime, attack), S, C)
-
-//Picks up slime
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/simple_animal/slime/S)
- SIGNAL_HANDLER
- if(!GLOB.cameranet.checkTurfVis(S.loc))
- to_chat(user, span_warning("Target is not near a camera. Cannot proceed."))
- return
- var/mob/living/C = user
- var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/mobarea = get_area(S.loc)
- if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE))
- if(X.stored_slimes.len >= X.max_slimes)
- to_chat(C, span_warning("Slime storage is full."))
- return
- if(S.ckey)
- to_chat(C, span_warning("The slime wiggled free!"))
- return
- if(S.buckled)
- S.Feedstop(silent = TRUE)
- S.visible_message(span_notice("[S] vanishes in a flash of light!"))
- S.forceMove(X)
- X.stored_slimes += S
-
-//Place slimes
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickShift(mob/living/user, turf/open/T)
- SIGNAL_HANDLER
-
- if(!GLOB.cameranet.checkTurfVis(T))
- to_chat(user, span_warning("Target is not near a camera. Cannot proceed."))
- return
- var/mob/living/C = user
- var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/turfarea = get_area(T)
- if(turfarea.name == E.allowed_area || (turfarea.area_flags & XENOBIOLOGY_COMPATIBLE))
- for(var/mob/living/simple_animal/slime/S in X.stored_slimes)
- S.forceMove(T)
- S.visible_message(span_notice("[S] warps in!"))
- X.stored_slimes -= S
-
-//Place monkey
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickCtrl(mob/living/user, turf/open/T)
- SIGNAL_HANDLER
- if(!GLOB.cameranet.checkTurfVis(T))
- to_chat(user, span_warning("Target is not near a camera. Cannot proceed."))
- return
- var/mob/living/C = user
- var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/turfarea = get_area(T)
- if(turfarea.name == E.allowed_area || (turfarea.area_flags & XENOBIOLOGY_COMPATIBLE))
- if(X.monkeys >= 1)
- var/mob/living/carbon/human/food = new /mob/living/carbon/human/species/monkey(T, TRUE, C)
- if (!QDELETED(food))
- food.LAssailant = WEAKREF(C)
- X.monkeys--
- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
- E.auto_attach_slime(food) // monke edit: hungry slimes that aren't feeding will now immediately latch onto monkeys placed on top of them
- to_chat(C, span_notice("[X] now has [X.monkeys] monkeys stored."))
- else
- to_chat(C, span_warning("[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored."))
-
-//Pick up monkey
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/human/M)
- SIGNAL_HANDLER
- if(!ismonkey(M))
- return
- if(!isturf(M.loc) || !GLOB.cameranet.checkTurfVis(M.loc))
- to_chat(user, span_warning("Target is not near a camera. Cannot proceed."))
- return
- var/mob/living/C = user
- var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/mobarea = get_area(M.loc)
- if(!X.connected_recycler)
- to_chat(C, span_warning("There is no connected monkey recycler. Use a multitool to link one."))
- return
- if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE))
- if(!M.stat)
- return
- M.visible_message(span_notice("[M] vanishes as [p_theyre()] reclaimed for recycling!"))
- X.connected_recycler.use_power(500)
- X.monkeys += connected_recycler.cube_production
- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
- qdel(M)
- to_chat(C, span_notice("[X] now has [X.monkeys] monkeys available."))
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 3e4f35370ef5..f2606e0310aa 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -3,8 +3,8 @@
/obj/item/slime_extract
name = "slime extract"
desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
- icon = 'icons/mob/simple/slimes.dmi'
- icon_state = "grey slime extract"
+ icon = 'monkestation/code/modules/slimecore/icons/slimes.dmi'
+ icon_state = "grey_slime_extract"
force = 0
w_class = WEIGHT_CLASS_TINY
throwforce = 0
@@ -17,6 +17,8 @@
var/list/activate_reagents = list() ///Reagents required for activation
var/recurring = FALSE
+ var/tier = 1
+
/obj/item/slime_extract/examine(mob/user)
. = ..()
if(Uses > 1)
@@ -58,45 +60,16 @@
to_chat(user, span_warning("Nothing happened... This slime extract cannot be activated this way."))
return FALSE
-/**
-* Core-crossing: Feeding adult slimes extracts to obtain a much more powerful, single extract.
-*
-* By using a valid core on a living adult slime, then feeding it nine more of the same type, you can mutate it into more useful items. Not every slime type has an implemented core cross.
-*/
-/obj/item/slime_extract/attack(mob/living/simple_animal/slime/M, mob/user)
- if(!isslime(M))
- return ..()
- if(M.stat)
- to_chat(user, span_warning("The slime is dead!"))
- return
- if(!M.is_adult)
- to_chat(user, span_warning("The slime must be an adult to cross its core!"))
- return
- if(M.effectmod && M.effectmod != effectmod)
- to_chat(user, span_warning("The slime is already being crossed with a different extract!"))
- return
-
- if(!M.effectmod)
- M.effectmod = effectmod
-
- M.applied++
- qdel(src)
- to_chat(user, span_notice("You feed the slime [src], [M.applied == 1 ? "starting to mutate its core." : "further mutating its core."]"))
- playsound(M, 'sound/effects/attackblob.ogg', 50, TRUE)
-
- if(M.applied >= SLIME_EXTRACT_CROSSING_REQUIRED)
- M.spawn_corecross()
-
/obj/item/slime_extract/grey
name = "grey slime extract"
- icon_state = "grey slime extract"
+ icon_state = "grey_slime_extract"
effectmod = "reproductive"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
/obj/item/slime_extract/grey/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
- var/obj/item/food/monkeycube/M = new
+ var/obj/item/stack/biomass/M = new
if(!user.put_in_active_hand(M))
M.forceMove(user.drop_location())
playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
@@ -105,7 +78,7 @@
if(SLIME_ACTIVATE_MAJOR)
to_chat(user, span_notice("Your [name] starts pulsing..."))
if(do_after(user, 40, target = user))
- var/mob/living/simple_animal/slime/S = new(get_turf(user), "grey")
+ var/mob/living/basic/slime/S = new(get_turf(user))
playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
to_chat(user, span_notice("You spit out [S]."))
return 350
@@ -114,9 +87,10 @@
/obj/item/slime_extract/gold
name = "gold slime extract"
- icon_state = "gold slime extract"
+ icon_state = "gold_slime_extract"
effectmod = "symbiont"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
+ tier = 4
@@ -145,9 +119,10 @@
/obj/item/slime_extract/silver
name = "silver slime extract"
- icon_state = "silver slime extract"
+ icon_state = "silver_slime_extract"
effectmod = "consuming"
activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
+ tier = 2
@@ -173,7 +148,7 @@
/obj/item/slime_extract/metal
name = "metal slime extract"
- icon_state = "metal slime extract"
+ icon_state = "metal_slime_extract"
effectmod = "industrial"
activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -197,7 +172,7 @@
/obj/item/slime_extract/purple
name = "purple slime extract"
- icon_state = "purple slime extract"
+ icon_state = "purple_slime_extract"
effectmod = "regenerative"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
@@ -216,9 +191,10 @@
/obj/item/slime_extract/darkpurple
name = "dark purple slime extract"
- icon_state = "dark purple slime extract"
+ icon_state = "dark_purple_slime_extract"
effectmod = "self-sustaining"
activate_reagents = list(/datum/reagent/toxin/plasma)
+ tier = 2
/obj/item/slime_extract/darkpurple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -239,7 +215,7 @@
/obj/item/slime_extract/orange
name = "orange slime extract"
- icon_state = "orange slime extract"
+ icon_state = "orange_slime_extract"
effectmod = "burning"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -259,9 +235,10 @@
/obj/item/slime_extract/yellow
name = "yellow slime extract"
- icon_state = "yellow slime extract"
+ icon_state = "yellow_slime_extract"
effectmod = "charged"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
+ tier = 2
/obj/item/slime_extract/yellow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -282,9 +259,10 @@
/obj/item/slime_extract/red
name = "red slime extract"
- icon_state = "red slime extract"
+ icon_state = "red_slime_extract"
effectmod = "sanguine"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
+ tier = 3
/obj/item/slime_extract/red/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -295,14 +273,14 @@
if(SLIME_ACTIVATE_MAJOR)
user.visible_message(span_warning("[user]'s skin flashes red for a moment..."), span_warning("Your skin flashes red as you emit rage-inducing pheromones..."))
- for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(user), null))
- slime.rabid = TRUE
+ for(var/mob/living/basic/slime/slime in viewers(get_turf(user), null))
+ ADD_TRAIT(slime, TRAIT_SLIME_RABID, "red-extract")
slime.visible_message(span_danger("The [slime] is driven into a frenzy!"))
return 600
/obj/item/slime_extract/blue
name = "blue slime extract"
- icon_state = "blue slime extract"
+ icon_state = "blue_slime_extract"
effectmod = "stabilized"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -322,9 +300,10 @@
/obj/item/slime_extract/darkblue
name = "dark blue slime extract"
- icon_state = "dark blue slime extract"
+ icon_state = "dark_blue_slime_extract"
effectmod = "chilling"
activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
+ tier = 2
/obj/item/slime_extract/darkblue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -345,9 +324,10 @@
/obj/item/slime_extract/pink
name = "pink slime extract"
- icon_state = "pink slime extract"
+ icon_state = "pink_slime_extract"
effectmod = "gentle"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
+ tier = 4
/obj/item/slime_extract/pink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -373,9 +353,10 @@
/obj/item/slime_extract/green
name = "green slime extract"
- icon_state = "green slime extract"
+ icon_state = "green_slime_extract"
effectmod = "mutative"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/uranium/radium)
+ tier = 4
/obj/item/slime_extract/green/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -397,9 +378,10 @@
/obj/item/slime_extract/lightpink
name = "light pink slime extract"
- icon_state = "light pink slime extract"
+ icon_state = "light_pink_slime_extract"
effectmod = "loyal"
activate_reagents = list(/datum/reagent/toxin/plasma)
+ tier = 5
/obj/item/slime_extract/lightpink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -421,9 +403,10 @@
/obj/item/slime_extract/black
name = "black slime extract"
- icon_state = "black slime extract"
+ icon_state = "black_slime_extract"
effectmod = "transformative"
activate_reagents = list(/datum/reagent/toxin/plasma)
+ tier = 5
/obj/item/slime_extract/black/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -441,9 +424,10 @@
/obj/item/slime_extract/oil
name = "oil slime extract"
- icon_state = "oil slime extract"
+ icon_state = "oil_slime_extract"
effectmod = "detonating"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
+ tier = 5
/obj/item/slime_extract/oil/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -465,9 +449,10 @@
/obj/item/slime_extract/adamantine
name = "adamantine slime extract"
- icon_state = "adamantine slime extract"
+ icon_state = "adamantine_slime_extract"
effectmod = "crystalline"
activate_reagents = list(/datum/reagent/toxin/plasma)
+ tier = 5
/obj/item/slime_extract/adamantine/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -494,13 +479,14 @@
/obj/item/slime_extract/bluespace
name = "bluespace slime extract"
- icon_state = "bluespace slime extract"
+ icon_state = "bluespace_slime_extract"
effectmod = "warping"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
var/teleport_ready = FALSE
var/teleport_x = 0
var/teleport_y = 0
var/teleport_z = 0
+ tier = 6
/obj/item/slime_extract/bluespace/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -530,9 +516,10 @@
/obj/item/slime_extract/pyrite
name = "pyrite slime extract"
- icon_state = "pyrite slime extract"
+ icon_state = "pyrite_slime_extract"
effectmod = "prismatic"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
+ tier = 3
/obj/item/slime_extract/pyrite/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -557,9 +544,10 @@
/obj/item/slime_extract/cerulean
name = "cerulean slime extract"
- icon_state = "cerulean slime extract"
+ icon_state = "cerulean_slime_extract"
effectmod = "recurring"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
+ tier = 3
/obj/item/slime_extract/cerulean/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -577,9 +565,10 @@
/obj/item/slime_extract/sepia
name = "sepia slime extract"
- icon_state = "sepia slime extract"
+ icon_state = "sepia_slime_extract"
effectmod = "lengthened"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
+ tier = 3
/obj/item/slime_extract/sepia/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -599,9 +588,10 @@
/obj/item/slime_extract/rainbow
name = "rainbow slime extract"
- icon_state = "rainbow slime extract"
+ icon_state = "rainbow_slime_extract"
effectmod = "hyperchromatic"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,"lesser plasma",/datum/reagent/toxin/slimejelly,"holy water and uranium") //Curse this snowflake reagent list.
+ tier = 6
/obj/item/slime_extract/rainbow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -653,21 +643,20 @@
icon = 'icons/obj/medical/chemical.dmi'
icon_state = "potsilver"
-/obj/item/slimepotion/slime/docility/attack(mob/living/simple_animal/slime/M, mob/user)
+/obj/item/slimepotion/slime/docility/attack(mob/living/basic/slime/M, mob/user)
if(!isslime(M))
to_chat(user, span_warning("The potion only works on slimes!"))
return ..()
if(M.stat)
to_chat(user, span_warning("The slime is dead!"))
return
- if(M.rabid) //Stops being rabid, but doesn't become truly docile.
+ if(HAS_TRAIT(M, TRAIT_SLIME_RABID)) //Stops being rabid, but doesn't become truly docile.
to_chat(M, span_warning("You absorb the potion, and your rabid hunger finally settles to a normal desire to feed."))
to_chat(user, span_notice("You feed the slime the potion, calming its rabid rage."))
- M.rabid = FALSE
+ REMOVE_TRAIT(M, TRAIT_SLIME_RABID, null)
qdel(src)
return
- M.docile = 1
- M.set_nutrition(700)
+ M.add_trait(/datum/slime_trait/docility)
to_chat(M, span_warning("You absorb the potion and feel your intense desire to feed melt away."))
to_chat(user, span_notice("You feed the slime the potion, removing its hunger and calming it."))
var/newname = sanitize_name(tgui_input_text(user, "Would you like to give the slime a name?", "Name your new pet", "Pet Slime", MAX_NAME_LEN))
@@ -799,22 +788,18 @@
icon = 'icons/obj/medical/chemical.dmi'
icon_state = "potred"
-/obj/item/slimepotion/slime/steroid/attack(mob/living/simple_animal/slime/M, mob/user)
+/obj/item/slimepotion/slime/steroid/attack(mob/living/basic/slime/M, mob/user)
if(!isslime(M))//If target is not a slime.
to_chat(user, span_warning("The steroid only works on baby slimes!"))
return ..()
- if(M.is_adult) //Can't steroidify adults
- to_chat(user, span_warning("Only baby slimes can use the steroid!"))
- return
if(M.stat)
to_chat(user, span_warning("The slime is dead!"))
return
- if(M.cores >= 5)
- to_chat(user, span_warning("The slime already has the maximum amount of extract!"))
+ if(M.ooze_production >= 50)
+ to_chat(user, span_warning("The slime is already producing too much ooze!"))
return
-
- to_chat(user, span_notice("You feed the slime the steroid. It will now produce one more extract."))
- M.cores++
+ to_chat(user, span_notice("You feed the slime the steroid. It will now produce more ooze."))
+ M.ooze_production++
qdel(src)
/obj/item/slimepotion/enhancer
@@ -829,7 +814,7 @@
icon = 'icons/obj/medical/chemical.dmi'
icon_state = "potcyan"
-/obj/item/slimepotion/slime/stabilizer/attack(mob/living/simple_animal/slime/M, mob/user)
+/obj/item/slimepotion/slime/stabilizer/attack(mob/living/basic/slime/M, mob/user)
if(!isslime(M))
to_chat(user, span_warning("The stabilizer only works on slimes!"))
return ..()
@@ -850,14 +835,14 @@
icon = 'icons/obj/medical/chemical.dmi'
icon_state = "potgreen"
-/obj/item/slimepotion/slime/mutator/attack(mob/living/simple_animal/slime/M, mob/user)
+/obj/item/slimepotion/slime/mutator/attack(mob/living/basic/slime/M, mob/user)
if(!isslime(M))
to_chat(user, span_warning("The mutator only works on slimes!"))
return ..()
if(M.stat)
to_chat(user, span_warning("The slime is dead!"))
return
- if(M.mutator_used)
+ if(HAS_TRAIT(M, TRAIT_MUTATOR_USED))
to_chat(user, span_warning("This slime has already consumed a mutator, any more would be far too unstable!"))
return
if(M.mutation_chance == 100)
@@ -866,7 +851,7 @@
to_chat(user, span_notice("You feed the slime the mutator. It is now more likely to mutate."))
M.mutation_chance = clamp(M.mutation_chance+12,0,100)
- M.mutator_used = TRUE
+ ADD_TRAIT(M, TRAIT_MUTATOR_USED, "slime-mutator")
qdel(src)
/obj/item/slimepotion/speed
diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm
deleted file mode 100644
index 4ada9e7b59a3..000000000000
--- a/code/modules/surgery/core_removal.dm
+++ /dev/null
@@ -1,61 +0,0 @@
-/datum/surgery/core_removal
- name = "Core removal"
- target_mobtypes = list(/mob/living/simple_animal/slime)
- surgery_flags = SURGERY_IGNORE_CLOTHES
- possible_locs = list(
- BODY_ZONE_R_ARM,
- BODY_ZONE_L_ARM,
- BODY_ZONE_R_LEG,
- BODY_ZONE_L_LEG,
- BODY_ZONE_CHEST,
- BODY_ZONE_HEAD,
- )
- steps = list(
- /datum/surgery_step/incise,
- /datum/surgery_step/extract_core,
- )
-
-/datum/surgery/core_removal/can_start(mob/user, mob/living/target)
- if(target.stat == DEAD)
- return TRUE
- return FALSE
-
-//extract brain
-/datum/surgery_step/extract_core
- name = "extract core (hemostat/crowbar)"
- implements = list(
- TOOL_HEMOSTAT = 100,
- TOOL_CROWBAR = 100)
- time = 16
-
-/datum/surgery_step/extract_core/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(
- user,
- target,
- span_notice("You begin to extract a core from [target]..."),
- span_notice("[user] begins to extract a core from [target]."),
- span_notice("[user] begins to extract a core from [target]."),
- )
-
-/datum/surgery_step/extract_core/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
- var/mob/living/simple_animal/slime/target_slime = target
- if(target_slime.cores > 0)
- target_slime.cores--
- display_results(
- user,
- target,
- span_notice("You successfully extract a core from [target]. [target_slime.cores] core\s remaining."),
- span_notice("[user] successfully extracts a core from [target]!"),
- span_notice("[user] successfully extracts a core from [target]!"),
- )
-
- new target_slime.coretype(target_slime.loc)
-
- if(target_slime.cores <= 0)
- target_slime.icon_state = "[target_slime.colour] baby slime dead-nocore"
- return ..()
- else
- return FALSE
- else
- to_chat(user, span_warning("There aren't any cores left in [target]!"))
- return ..()
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 0ae0cbc962a0..902e32bf4364 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -105,6 +105,7 @@
slot = ORGAN_SLOT_BRAIN_ANTISTUN
var/static/list/signalCache = list(
+ COMSIG_LIVING_STAMINA_STUN,
COMSIG_LIVING_STATUS_STUN,
COMSIG_LIVING_STATUS_KNOCKDOWN,
COMSIG_LIVING_STATUS_IMMOBILIZE,
@@ -128,6 +129,7 @@
/obj/item/organ/internal/cyberimp/brain/anti_stun/proc/clear_stuns()
if(owner || !(organ_flags & ORGAN_FAILING))
+ owner.exit_stamina_stun()
owner.SetStun(0)
owner.SetKnockdown(0)
owner.SetImmobilized(0)
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 0e5ed05bf2b3..e8bda6fd8e89 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -191,7 +191,6 @@
#include "security_officer_distribution.dm"
#include "serving_tray.dm"
#include "siunit.dm"
-#include "slime_mood.dm"
#include "slips.dm"
#include "spawn_humans.dm"
#include "spawn_mobs.dm"
diff --git a/code/modules/unit_tests/slime_mood.dm b/code/modules/unit_tests/slime_mood.dm
deleted file mode 100644
index a0d3edb95c17..000000000000
--- a/code/modules/unit_tests/slime_mood.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-///Unit test that tests all types of moods for slimes, to make sure they all have proper icons, excluding moods that intentionally don't have an icon.
-/datum/unit_test/slime_mood
-
-/datum/unit_test/slime_mood/Run()
- var/mob/living/simple_animal/slime/emoting_slime = allocate(/mob/living/simple_animal/slime)
-
- for(var/key in GLOB.emote_list)
- for(var/datum/emote/slime/mood/slime_mood in GLOB.emote_list[key])
- var/list/states = icon_states(emoting_slime.icon)
- if(!slime_mood.mood_key)
- continue
- TEST_ASSERT(("aslime-[slime_mood.mood_key]" in states), "[slime_mood] is set to give [emoting_slime] the [slime_mood.mood_key] emote, but the icon state can't be found in [emoting_slime.icon].")
diff --git a/code/modules/unit_tests/strange_reagent.dm b/code/modules/unit_tests/strange_reagent.dm
index 345be4befe97..e754282eb121 100644
--- a/code/modules/unit_tests/strange_reagent.dm
+++ b/code/modules/unit_tests/strange_reagent.dm
@@ -18,7 +18,7 @@
types_to_check -= /mob/living/simple_animal/pet/gondola/gondolapod // need a pod, which we don't have
types_to_check -= typesof(/mob/living/simple_animal/hostile/megafauna) // no
types_to_check -= typesof(/mob/living/basic/mouse) // qdel themselves on death; why dont they use DEL_ON_DEATH you might ask. I-unno
- types_to_check -= typesof(/mob/living/simple_animal/slime) // if they roll the 50% chance to spawn as an adult, they can just at random split and qdel themselves
+ types_to_check -= typesof(/mob/living/basic/slime) // if they roll the 50% chance to spawn as an adult, they can just at random split and qdel themselves
for(var/mob/living/type as anything in types_to_check)
var/mob/living/target = allocate_new_target(type)
diff --git a/config/game_options.txt b/config/game_options.txt
index b336b336d268..9553ef352df5 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -48,7 +48,7 @@ WALK_DELAY 4
##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/human 0
##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0
##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0
-##MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal/slime 0
+##MULTIPLICATIVE_MOVESPEED /mob/living/basic/slime 0
MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 0
MULTIPLICATIVE_MOVESPEED /mob/living/basic 0
diff --git a/monkestation/code/controllers/subsystem/job.dm b/monkestation/code/controllers/subsystem/job.dm
index 1642474d8f56..a9e30e36976b 100644
--- a/monkestation/code/controllers/subsystem/job.dm
+++ b/monkestation/code/controllers/subsystem/job.dm
@@ -26,7 +26,7 @@
/// Handle antags as well as assigning people to their jobs
/datum/controller/subsystem/job/proc/handle_final_setup()
var/sanity = 0
- var/max_sane_loops = length(subtypesof(/datum/round_event_control/antagonist/solo) - typesof(/datum/round_event_control/antagonist/solo/ghost)) //not exact, but its close enough
+ var/max_sane_loops = length(subtypesof(/datum/round_event_control/antagonist/solo) - typesof(/datum/round_event_control/antagonist/solo/from_ghosts)) //not exact, but its close enough
pick_desired_roundstart()
while(!handle_roundstart_antags() && !sanity >= max_sane_loops)
sanity++
diff --git a/monkestation/code/modules/aesthetics/mobs/slime.dm b/monkestation/code/modules/aesthetics/mobs/slime.dm
index abde54b2ca69..d660145fb9ba 100644
--- a/monkestation/code/modules/aesthetics/mobs/slime.dm
+++ b/monkestation/code/modules/aesthetics/mobs/slime.dm
@@ -1,11 +1,8 @@
-/mob/living/simple_animal/slime
- icon = 'monkestation/icons/mob/slimes.dmi'
-
/obj/item/stock_parts/cell/emproof/slime
- icon = 'monkestation/icons/mob/slimes.dmi'
+ icon = 'monkestation/code/modules/slimecore/icons/slimes.dmi'
/obj/item/slime_extract
- icon = 'monkestation/icons/mob/slimes.dmi'
+ icon = 'monkestation/code/modules/slimecore/icons/slimes.dmi'
/obj/item/stock_parts/cell/emproof/slime/hypercharged
- icon = 'monkestation/icons/mob/slimes.dmi'
+ icon = 'monkestation/code/modules/slimecore/icons/slimes.dmi'
diff --git a/monkestation/code/modules/cargo/crates/science.dm b/monkestation/code/modules/cargo/crates/science.dm
index 3d9705b86d1e..0ae3dddbc5c6 100644
--- a/monkestation/code/modules/cargo/crates/science.dm
+++ b/monkestation/code/modules/cargo/crates/science.dm
@@ -5,8 +5,9 @@
access = ACCESS_XENOBIOLOGY
contains = list(/obj/item/slime_extract/grey = 2,
/obj/item/reagent_containers/syringe/plasma,
- /obj/item/circuitboard/computer/xenobiology,
- /obj/item/circuitboard/machine/monkey_recycler,
- /obj/item/circuitboard/machine/processor/slime)
+ /obj/item/circuitboard/computer/slime_market,
+ /obj/item/circuitboard/machine/slime_market_pad,
+ /obj/item/circuitboard/machine/biomass_recycler,
+ /obj/item/vacuum_pack)
crate_name = "xenobiology starter crate"
crate_type = /obj/structure/closet/crate/secure/science
diff --git a/monkestation/code/modules/liquids/liquid_controller.dm b/monkestation/code/modules/liquids/liquid_controller.dm
index acdb58359679..6fdd85e5ff61 100644
--- a/monkestation/code/modules/liquids/liquid_controller.dm
+++ b/monkestation/code/modules/liquids/liquid_controller.dm
@@ -46,6 +46,9 @@ SUBSYSTEM_DEF(liquids)
if(length(arrayed_groups))
for(var/g in arrayed_groups)
var/datum/liquid_group/LG = g
+ if(!LG)
+ arrayed_groups -= g
+ continue
while(!MC_TICK_CHECK && length(LG.splitting_array)) // three at a time until we either finish or over-run, this should be done before anything else
LG.work_on_split_queue()
LG.cleanse_members()
@@ -87,6 +90,9 @@ SUBSYSTEM_DEF(liquids)
temperature_queue -= temperature_turf
if(!temperature_turf.liquids)
continue
+ if(!temperature_turf.liquids.liquid_group)
+ qdel(temperature_turf.liquids)
+ continue
temperature_turf.liquids.liquid_group.act_on_queue(temperature_turf)
run_type = SSLIQUIDS_RUN_TYPE_EVAPORATION
diff --git a/monkestation/code/modules/liquids/liquid_effect.dm b/monkestation/code/modules/liquids/liquid_effect.dm
index 201d95fae7b3..9e1e8324791f 100644
--- a/monkestation/code/modules/liquids/liquid_effect.dm
+++ b/monkestation/code/modules/liquids/liquid_effect.dm
@@ -122,6 +122,9 @@
/obj/effect/abstract/liquid_turf/proc/movable_entered(datum/source, atom/movable/AM)
SIGNAL_HANDLER
+ if(!liquid_group)
+ qdel(src)
+ return
var/turf/T = source
if(isobserver(AM))
@@ -143,8 +146,9 @@
liquid_group.expose_atom(stepped_human, 1, TOUCH)
else if (isliving(AM))
var/mob/living/L = AM
- if(prob(7) && !(L.movement_type & FLYING) && L.body_position == STANDING_UP)
- L.slip(30, T, NO_SLIP_WHEN_WALKING, 0, TRUE)
+ if(liquid_group.slippery)
+ if(prob(7) && !(L.movement_type & FLYING) && L.body_position == STANDING_UP)
+ L.slip(30, T, NO_SLIP_WHEN_WALKING, 0, TRUE)
if(fire_state)
AM.fire_act((T20C+50) + (50*fire_state), 125)
@@ -244,6 +248,10 @@
/obj/effect/abstract/liquid_turf/proc/examine_turf(turf/source, mob/examiner, list/examine_list)
SIGNAL_HANDLER
+ if(!liquid_group)
+ qdel(src)
+ return
+
// This should always have reagents if this effect object exists, but as a sanity check...
if(!length(liquid_group.reagents.reagent_list))
return
diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm
index b9193919dbb2..6f74b9f62fa5 100644
--- a/monkestation/code/modules/liquids/liquid_groups.dm
+++ b/monkestation/code/modules/liquids/liquid_groups.dm
@@ -66,6 +66,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
var/exposure = FALSE
///array generated by bulk splitting
var/list/splitting_array = list()
+ ///are we slippery
+ var/slippery = TRUE
///NEW/DESTROY
/datum/liquid_group/New(height, obj/effect/abstract/liquid_turf/created_liquid)
@@ -76,8 +78,10 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
add_to_group(created_liquid.my_turf)
cached_edge_turfs[created_liquid.my_turf] = list(NORTH, SOUTH, EAST, WEST)
SSliquids.active_groups |= src
+ RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, PROC_REF(removed_reagent))
/datum/liquid_group/Destroy()
+ UnregisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT)
SSliquids.active_groups -= src
if(src in SSliquids.arrayed_groups)
@@ -86,10 +90,16 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
for(var/t in members)
var/turf/T = t
T.liquids.liquid_group = null
- members = null
+ members = list()
burning_members = null
return ..()
+/datum/liquid_group/proc/removed_reagent(datum/reagents/source, datum/reagent/modified)
+ for(var/turf/member as anything in members)
+ if(!member.liquids)
+ continue
+ modified.remove_from_member(member.liquids)
+
///GROUP CONTROLLING
/datum/liquid_group/proc/add_to_group(turf/T)
if(!T)
@@ -104,6 +114,9 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
members[T] = TRUE
T.liquids.liquid_group = src
+ for(var/datum/reagent/reagent as anything in reagents.reagent_list)
+ reagent.add_to_member(T.liquids)
+
reagents.maximum_volume += 1000 /// each turf will hold 1000 units plus the base amount spread across the group
if(group_color)
T.liquids.color = group_color
@@ -121,6 +134,9 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
if(T.liquids)
T.liquids.liquid_group = null
+ for(var/datum/reagent/reagent as anything in reagents.reagent_list)
+ reagent.remove_from_member(T.liquids)
+
if(!members.len)
qdel(src)
return
@@ -145,7 +161,11 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
add_reagents(reagent_list = created_reagent_list, chem_temp = otherg.group_temperature)
cached_edge_turfs |= otherg.cached_edge_turfs
- for(var/turf/liquid_turf in otherg.members)
+ for(var/turf/liquid_turf as anything in members)
+ for(var/datum/reagent/reagent as anything in reagents.reagent_list)
+ reagent.add_to_member(liquid_turf.liquids)
+
+ for(var/turf/liquid_turf as anything in otherg.members)
otherg.remove_from_group(liquid_turf)
add_to_group(liquid_turf)
@@ -219,6 +239,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
for(var/turf/listed_turf as anything in members)
if(isclosedturf(listed_turf))
remove_from_group(listed_turf)
+ qdel(listed_turf.liquids)
/datum/liquid_group/proc/process_member(turf/member)
if(isspaceturf(member))
@@ -237,6 +258,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
turf_reagents = new(100000)
exposure = FALSE
+ slippery = FALSE
for(var/reagent_type in reagents.reagent_list)
var/datum/reagent/pulled_reagent = reagent_type
var/amount = pulled_reagent.volume / members.len
@@ -247,6 +269,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
turf_reagents.add_reagent(pulled_reagent.type, amount)
if(pulled_reagent.turf_exposure && amount > 10)
exposure = TRUE
+ if(pulled_reagent.slippery)
+ slippery = TRUE
/datum/liquid_group/proc/process_turf_disperse()
@@ -367,10 +391,34 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
handle_visual_changes()
+/datum/liquid_group/proc/transfer_specific_reagents(datum/reagents/secondary_reagent, amount, list/reagents_to_check, obj/effect/abstract/liquid_turf/remover, merge = FALSE)
+ if(!length(reagents_to_check))
+ return
+ var/total_hits = 0
+ var/total_volume = 0
+ for(var/datum/reagent/reagent_type in reagents.reagent_list)
+ if(!(reagent_type.type in reagents_to_check))
+ continue
+ total_hits++
+ total_volume += reagent_type.volume
+ if(!total_hits)
+ return
+
+ var/precent = (amount / total_volume)
+ for(var/datum/reagent/reagent_type in reagents.reagent_list)
+ if(!(reagent_type.type in reagents_to_check))
+ continue
+ secondary_reagent.add_reagent(reagent_type.type, reagent_type.volume * precent, no_react = TRUE)
+ remove_specific(amount = reagent_type.volume * precent, reagent_type = reagent_type.type)
+
+ process_removal()
+ handle_visual_changes()
+
+
/datum/liquid_group/proc/process_removal(amount)
total_reagent_volume = reagents.total_volume
- if(total_reagent_volume)
+ if(total_reagent_volume && length(members)) //Otherwise we are probably just sending the last of things
reagents_per_turf = total_reagent_volume / length(members)
else
reagents_per_turf = 0
@@ -743,7 +791,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
var/list/temp = return_connected_liquids(cardinal.liquids)
if(isnull(temp) || !length(temp))
continue
- connected_array += list(temp)
+ connected_array += list(list(temp))
if(!length(connected_array))
return
@@ -775,6 +823,9 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
for(var/list/liquid_list as anything in connected_liquids)
var/datum/liquid_group/new_group = new(1)
+ if(!members)
+ members = list()
+ trans_to_seperate_group(new_group.reagents, amount_to_transfer)
for(var/turf/connected_liquid in liquid_list)
new_group.check_edges(connected_liquid)
@@ -784,7 +835,6 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
remove_from_group(connected_liquid, TRUE)
new_group.add_to_group(connected_liquid)
- trans_to_seperate_group(new_group.reagents, amount_to_transfer)
new_group.total_reagent_volume = new_group.reagents.total_volume
new_group.reagents_per_turf = new_group.total_reagent_volume / length(new_group.members)
diff --git a/monkestation/code/modules/liquids/liquid_status_effect.dm b/monkestation/code/modules/liquids/liquid_status_effect.dm
index f431e586f58e..2311372f9d18 100644
--- a/monkestation/code/modules/liquids/liquid_status_effect.dm
+++ b/monkestation/code/modules/liquids/liquid_status_effect.dm
@@ -29,10 +29,11 @@
return ..()
/datum/status_effect/water_affected/on_remove()
- owner.remove_movespeed_modifier("water_slow")
+ owner.remove_movespeed_modifier("liquid_slowdown")
/datum/movespeed_modifier/liquids
+ id = "liquid_slowdown"
variable = TRUE
blacklisted_movetypes = FLOATING
diff --git a/monkestation/code/modules/liquids/liquid_turf.dm b/monkestation/code/modules/liquids/liquid_turf.dm
index 2087a5ac0a93..226d9afd6ecd 100644
--- a/monkestation/code/modules/liquids/liquid_turf.dm
+++ b/monkestation/code/modules/liquids/liquid_turf.dm
@@ -37,6 +37,10 @@
//More efficient than add_liquid for multiples
/turf/proc/add_liquid_list(reagent_list, no_react = FALSE, chem_temp)
+ if(liquids && !liquids.liquid_group)
+ qdel(liquids)
+ return
+
if(!liquids)
liquids = new(src)
liquids.liquid_group.add_reagents(liquids, reagent_list, chem_temp)
diff --git a/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm b/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm
index 829ea9762e86..b3f32178b408 100644
--- a/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm
+++ b/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm
@@ -4,7 +4,7 @@
name = "Cargo Driver"
id = MASSDRIVER_CARGO
-/obj/machinery/mass_driver/drive(amount)
+/obj/machinery/mass_driver/cargo_driver/drive(amount)
if(machine_stat & (BROKEN|NOPOWER))
return
use_power(active_power_usage)
@@ -24,7 +24,8 @@
break
use_power(active_power_usage)
O.throw_at(target, get_dist(src, target) + 4, power)
- addtimer(CALLBACK(O, TYPE_PROC_REF(/atom/movable, attempt_map_sell)), 4 SECONDS / power)
+ if(length(SSmapping.levels_by_trait(ZTRAIT_OSHAN)))
+ addtimer(CALLBACK(O, TYPE_PROC_REF(/atom/movable, attempt_map_sell)), 4 SECONDS / power)
flick("mass_driver1", src)
/atom/movable/proc/attempt_map_sell()
diff --git a/monkestation/code/modules/pollution/pollutant_datum.dm b/monkestation/code/modules/pollution/pollutant_datum.dm
index 5fc09f0247ba..fe4c09bde95c 100644
--- a/monkestation/code/modules/pollution/pollutant_datum.dm
+++ b/monkestation/code/modules/pollution/pollutant_datum.dm
@@ -18,14 +18,14 @@
/// Scent of the smell
var/scent
-///When a pollutant touches an unprotected carbon mob
-/datum/pollutant/proc/touch_act(mob/living/carbon/victim, amount)
+///When a pollutant touches an unprotected mob
+/datum/pollutant/proc/touch_act(mob/living/victim, amount)
return
///When a carbon mob breathes in the pollutant
/datum/pollutant/proc/breathe_act(mob/living/carbon/victim, amount)
return
-///When a carbon mob smells scents this is called
+///When a carbon mob smells scents this is called
/datum/pollutant/proc/on_smell(mob/living/carbon/victim, amount)
return
diff --git a/monkestation/code/modules/research/xenobiology/xenobio_camera.dm b/monkestation/code/modules/research/xenobiology/xenobio_camera.dm
deleted file mode 100644
index bb2302d029f4..000000000000
--- a/monkestation/code/modules/research/xenobiology/xenobio_camera.dm
+++ /dev/null
@@ -1,15 +0,0 @@
-/mob/camera/ai_eye/remote/xenobio/proc/auto_attach_slime(mob/living/carbon/human/food)
- var/mob/living/simple_animal/slime/glutton
- for(var/mob/living/simple_animal/slime/slime in range(1, loc))
- if(slime.ckey || slime.amount_grown >= SLIME_EVOLUTION_THRESHOLD)
- continue
- var/mob/living/slime_eating = slime.buckled
- if(!isliving(slime_eating) || slime_eating.stat < DEAD)
- continue
- if(glutton?.is_adult && !slime.is_adult)
- // adult slimes can react faster than baby slimes
- continue
- if(QDELETED(glutton) || (!glutton.is_adult && slime.is_adult) || (slime.amount_grown > glutton.amount_grown))
- glutton = slime
- if(!QDELETED(glutton))
- addtimer(CALLBACK(glutton, TYPE_PROC_REF(/mob/living/simple_animal/slime, Feedon), food), rand(0.1 SECONDS, 0.9 SECONDS))
diff --git a/monkestation/code/modules/slimecore/animations/slime_effects.dm b/monkestation/code/modules/slimecore/animations/slime_effects.dm
new file mode 100644
index 000000000000..ae59551d2625
--- /dev/null
+++ b/monkestation/code/modules/slimecore/animations/slime_effects.dm
@@ -0,0 +1,38 @@
+/obj/effect/abstract/blank
+ name = ""
+ alpha = 150
+ anchored = TRUE
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ icon ='monkestation/code/modules/slimecore/icons/filters.dmi'
+ icon_state = "diag"
+ vis_flags = VIS_INHERIT_PLANE | VIS_INHERIT_LAYER
+ blend_mode = BLEND_INSET_OVERLAY
+
+/atom/movable/proc/rainbow_effect() // this just animates between the primary colors of a rainbow
+ var/obj/effect/abstract/blank/rainbow_effect = new
+
+ appearance_flags &= ~KEEP_APART
+ appearance_flags |= KEEP_TOGETHER
+ vis_contents += rainbow_effect
+
+/atom/movable/proc/remove_rainbow_effect()
+ var/obj/effect/abstract/blank/rainbow_effect = locate() in vis_contents
+ qdel(rainbow_effect)
+
+/image/proc/rainbow_effect() // this just animates between the primary colors of a rainbow
+ var/obj/effect/abstract/blank/rainbow_effect = new
+
+ appearance_flags &= ~KEEP_APART
+ appearance_flags |= KEEP_TOGETHER
+ vis_contents += rainbow_effect
+
+/atom/proc/ungulate()
+ var/matrix/ungulate_matrix = matrix(transform)
+ ungulate_matrix.Scale(1, 0.9)
+ var/matrix/base_matrix = matrix(transform)
+ var/base_pixel_y = pixel_y
+
+ animate(src, transform = ungulate_matrix, time = 0.1 SECONDS, easing = EASE_OUT, loop = -1)
+ animate(pixel_y = -1, time = 0.1 SECONDS, easing = EASE_OUT)
+ animate(transform = base_matrix, time = 0.1 SECONDS, easing = EASE_IN)
+ animate(pixel_y = base_pixel_y, time = 0.1 SECONDS, easing = EASE_IN)
diff --git a/monkestation/code/modules/slimecore/assets/xenobiology.dm b/monkestation/code/modules/slimecore/assets/xenobiology.dm
new file mode 100644
index 000000000000..b8677ba2e83f
--- /dev/null
+++ b/monkestation/code/modules/slimecore/assets/xenobiology.dm
@@ -0,0 +1,5 @@
+/datum/asset/spritesheet/xenobio_market
+ name = "xenobio_market"
+
+/datum/asset/spritesheet/xenobio_market/create_spritesheets()
+ InsertAll("", 'monkestation/code/modules/slimecore/icons/slimes.dmi')
diff --git a/monkestation/code/modules/slimecore/components/basic_scared_of_item.dm b/monkestation/code/modules/slimecore/components/basic_scared_of_item.dm
new file mode 100644
index 000000000000..3b3aa14886bb
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/basic_scared_of_item.dm
@@ -0,0 +1,40 @@
+/datum/component/scared_of_item // this runs independantly of ai_controller so we aren't wasting ai process time on this as its a passive check.
+ var/range
+ var/was_scared = FALSE
+ var/mob/last_scared_by
+
+/datum/component/scared_of_item/Initialize(item_path, range)
+ src.range = range
+
+ START_PROCESSING(SSobj, src)
+
+/datum/component/scared_of_item/process(seconds_per_tick)
+ var/mob/living/basic/basic_mob = parent
+
+ if(isliving(parent))
+ var/mob/living/living = parent
+ if(living.stat == DEAD)
+ return
+
+ var/broke = FALSE
+ for(var/mob/living/carbon/human/human in oview(range, basic_mob))
+ for(var/obj/item/item as anything in human.held_items)
+ if(!item)
+ continue
+ if(item.type != basic_mob.ai_controller.blackboard[BB_BASIC_MOB_SCARED_ITEM])
+ continue
+ basic_mob.ai_controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, FALSE)
+
+ if(!was_scared)
+ SEND_SIGNAL(basic_mob, COMSIG_EMOTION_STORE, human, EMOTION_SCARED, "chased me with an extinguisher.")
+ last_scared_by = human
+ was_scared = TRUE
+ broke = TRUE
+ break
+ if(broke)
+ return
+ basic_mob.ai_controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, TRUE)
+ if(was_scared)
+ SEND_SIGNAL(basic_mob, COMSIG_EMOTION_STORE, last_scared_by, EMOTION_HAPPY, "stopped chasing me with an extinguisher.", 0)
+ was_scared = FALSE
+ last_scared_by = null
diff --git a/monkestation/code/modules/slimecore/components/emotion_buffer.dm b/monkestation/code/modules/slimecore/components/emotion_buffer.dm
new file mode 100644
index 000000000000..ce715b741706
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/emotion_buffer.dm
@@ -0,0 +1,136 @@
+//This is really just a storage cell for mood messages, also handles some basic responding to emotional events for mobs
+/datum/component/emotion_buffer
+ var/mob/living/host
+
+ ///our current emotion
+ var/current_emotion = EMOTION_HAPPY
+
+ ///the buffer of emotional things with there emotion stored like EMOTION_HAPPY = List("Was fed by x")
+ var/emotional_buffer = list(
+ EMOTION_HAPPY = list(),
+ EMOTION_SAD = list(),
+ EMOTION_ANGER = list(),
+ EMOTION_FUNNY = list(),
+ EMOTION_SCARED = list(),
+ EMOTION_SUPRISED = list(),
+ EMOTION_HUNGRY = list(),
+ )
+
+ var/emotional_responses = list(
+ EMOTION_HAPPY = list(),
+ EMOTION_SAD = list(),
+ EMOTION_ANGER = list(),
+ EMOTION_FUNNY = list(),
+ EMOTION_SCARED = list(),
+ EMOTION_SUPRISED = list(),
+ EMOTION_HUNGRY = list(),
+ )
+
+ var/emotional_heard = list(
+ EMOTION_HAPPY = list(),
+ EMOTION_SAD = list(),
+ EMOTION_ANGER = list(),
+ EMOTION_FUNNY = list(),
+ EMOTION_SCARED = list(),
+ EMOTION_SUPRISED = list(),
+ EMOTION_HUNGRY = list(),
+ )
+
+ ///these are sent as emotion = icon_state, where the icon is stored inside the sources icon file
+ var/list/emotional_overlays = list()
+
+/datum/component/emotion_buffer/Initialize(list/emotional_overlay_states)
+ . = ..()
+ host = parent
+ if(!length(emotional_overlay_states))
+ emotional_overlays = list()
+ emotional_overlays = emotional_overlay_states
+
+/datum/component/emotion_buffer/RegisterWithParent()
+ . = ..()
+ if(length(emotional_overlays))
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(emotion_overlay))
+ RegisterSignal(parent, EMOTION_BUFFER_UPDATE_OVERLAY_STATES, PROC_REF(replace_overlays))
+
+ RegisterSignal(parent, COMSIG_EMOTION_STORE, PROC_REF(register_emotional_data))
+ RegisterSignal(parent, EMOTION_BUFFER_SPEAK_FROM_BUFFER, PROC_REF(speak_from_buffer))
+ RegisterSignal(parent, COMSIG_EMOTION_HEARD, PROC_REF(store_heard))
+ RegisterSignal(parent, COMSIG_MOVABLE_HEAR, PROC_REF(hear_speech))
+
+/datum/component/emotion_buffer/Destroy(force, silent)
+ . = ..()
+ host = null
+
+/datum/component/emotion_buffer/UnregisterFromParent()
+ . = ..()
+ UnregisterSignal(parent, COMSIG_EMOTION_STORE)
+ UnregisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS)
+ UnregisterSignal(parent, EMOTION_BUFFER_UPDATE_OVERLAY_STATES)
+ UnregisterSignal(parent, EMOTION_BUFFER_SPEAK_FROM_BUFFER)
+ UnregisterSignal(parent, COMSIG_EMOTION_HEARD)
+ UnregisterSignal(parent, COMSIG_MOVABLE_HEAR)
+
+
+/datum/component/emotion_buffer/proc/register_emotional_data(datum/source, atom/from, emotion, emotional_text, intensity = 1)
+ if(!emotional_buffer[emotion])
+ return
+
+ if((emotion in list(EMOTION_ANGER, EMOTION_SAD, EMOTION_SCARED)) && intensity)
+ intensity *= -1
+
+
+ if(from)
+ emotional_buffer[emotion] += list("[from] [emotional_text]" = FALSE)
+ if(intensity)
+ SEND_SIGNAL(parent, COMSIG_FRIENDSHIP_CHANGE, from, intensity)
+ else
+ emotional_buffer[emotion] += list("[emotional_text]" = FALSE)
+
+ current_emotion = emotion
+
+/datum/component/emotion_buffer/proc/emotion_overlay(mob/living/source, list/overlays)
+ if(!emotional_overlays[current_emotion])
+ return
+ if(source.health <= 0)
+ return
+ overlays += mutable_appearance(source.icon, emotional_overlays[current_emotion], source.layer, source)
+
+/datum/component/emotion_buffer/proc/replace_overlays(mob/living/source, list/new_icon_states)
+ emotional_overlays = list()
+ emotional_overlays += new_icon_states
+
+/datum/component/emotion_buffer/proc/speak_from_buffer(mob/living/source)
+ if(prob(100))
+ var/spoken_emotion = current_emotion
+ if(prob(25))
+ var/list/viable_emotions = list()
+ for(var/emotion in emotional_buffer)
+ if(!length(emotional_buffer[emotion]))
+ continue
+ viable_emotions |= emotion
+ if(!length(viable_emotions))
+ return
+ spoken_emotion = pick(viable_emotions)
+ var/list/speakable_phrases = list()
+ for(var/phrase in emotional_buffer[spoken_emotion])
+ if(emotional_buffer[spoken_emotion][phrase])
+ continue
+ speakable_phrases |= phrase
+
+ if(!length(speakable_phrases))
+ return
+ var/choice = pick(speakable_phrases)
+ if(!choice)
+ return
+ emotional_buffer[spoken_emotion][choice] = TRUE
+ source.say(choice)
+
+ for(var/mob/living/mob in range(5, source))
+ if(mob == source)
+ continue
+ SEND_SIGNAL(mob, COMSIG_EMOTION_HEARD, spoken_emotion, choice, source)
+
+/datum/component/emotion_buffer/proc/store_heard(mob/living/source, emotion, phrase, mob/living/speaker)
+ emotional_heard[emotion] += list("[speaker] said [phrase]" = FALSE)
+
+/datum/component/emotion_buffer/proc/hear_speech()
diff --git a/monkestation/code/modules/slimecore/components/friendship_tracker.dm b/monkestation/code/modules/slimecore/components/friendship_tracker.dm
new file mode 100644
index 000000000000..0c3305b33349
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/friendship_tracker.dm
@@ -0,0 +1,56 @@
+/datum/component/friendship_container
+ ///our friendship thresholds from lowest to highest
+ var/list/friendship_levels = list()
+ ///our current friends stored as a weakref = amount
+ var/list/weakrefed_friends = list()
+ ///list of friendship levels that we send BEFRIEND signals on, if someone drops below these levels its over
+ var/befriend_level
+ ///list of all befriended refs
+ var/list/befriended_refs = list()
+
+/datum/component/friendship_container/Initialize(friendship_levels = list(), befriend_level)
+ . = ..()
+ if(!length(friendship_levels))
+ return FALSE
+
+ src.friendship_levels = friendship_levels
+ src.befriend_level = befriend_level
+
+
+/datum/component/friendship_container/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_FRIENDSHIP_CHECK_LEVEL, PROC_REF(check_friendship_level))
+ RegisterSignal(parent, COMSIG_FRIENDSHIP_CHANGE, PROC_REF(change_friendship))
+
+/datum/component/friendship_container/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_FRIENDSHIP_CHECK_LEVEL)
+ UnregisterSignal(parent, COMSIG_FRIENDSHIP_CHANGE)
+
+/datum/component/friendship_container/proc/change_friendship(mob/living/source, atom/target, amount)
+ for(var/datum/weakref/ref as anything in weakrefed_friends)
+ if(ref.resolve() == target)
+
+ ///handles registering pet commands and other things that use BEFRIEND
+ if(amount < 0)
+ if((friendship_levels[befriend_level] > weakrefed_friends[ref]) && (ref in befriended_refs))
+ SEND_SIGNAL(parent, COMSIG_LIVING_UNFRIENDED, ref.resolve())
+ befriended_refs -= ref
+ source.ai_controller?.remove_thing_from_blackboard_key(BB_FRIENDS_LIST, target)
+
+ else if((friendship_levels[befriend_level] <= weakrefed_friends[ref]) && !(ref in befriended_refs))
+ SEND_SIGNAL(parent, COMSIG_LIVING_BEFRIENDED, ref.resolve())
+ befriended_refs += ref
+ source.ai_controller?.insert_blackboard_key_lazylist(BB_FRIENDS_LIST, target)
+
+ weakrefed_friends[ref] += amount
+ return TRUE
+ weakrefed_friends += list(WEAKREF(target) = amount)
+ return TRUE
+
+///Returns {TRUE} if friendship is above a certain threshold else returns {FALSE}
+/datum/component/friendship_container/proc/check_friendship_level(mob/living/source, atom/target, friendship_level)
+ for(var/datum/weakref/ref as anything in weakrefed_friends)
+ if(ref.resolve() == target)
+ if(friendship_levels[friendship_level] <= weakrefed_friends[ref])
+ return TRUE
+ return FALSE
+ return FALSE
diff --git a/monkestation/code/modules/slimecore/components/generic_mob_hunger.dm b/monkestation/code/modules/slimecore/components/generic_mob_hunger.dm
new file mode 100644
index 000000000000..a8aefc5df81c
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/generic_mob_hunger.dm
@@ -0,0 +1,94 @@
+/datum/component/generic_mob_hunger
+ var/current_hunger
+ var/max_hunger
+ ///this is the rate at which our hunger passively drains
+ var/hunger_drain
+ var/hunger_paused = FALSE
+ var/feed_pause_time
+ var/feed_pause_end
+
+/datum/component/generic_mob_hunger/Initialize(max_hunger = 250, hunger_drain = 0.1, feed_pause_time = 1 MINUTE, starting_hunger)
+ . = ..()
+ src.hunger_drain = hunger_drain
+ src.max_hunger = max_hunger
+ src.feed_pause_time = feed_pause_time
+ if(!starting_hunger)
+ src.current_hunger = max_hunger
+ else
+ src.current_hunger = starting_hunger
+
+ START_PROCESSING(SSobj, src)
+
+/datum/component/generic_mob_hunger/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_MOB_STOP_HUNGER, PROC_REF(stop_hunger))
+ RegisterSignal(parent, COMSIG_MOB_START_HUNGER, PROC_REF(start_hunger))
+ RegisterSignal(parent, COMSIG_MOB_FEED, PROC_REF(on_feed))
+ RegisterSignal(parent, COMSIG_MOB_RETURN_HUNGER, PROC_REF(return_hunger))
+ RegisterSignal(parent, COMSIG_MOB_ADJUST_HUNGER, PROC_REF(adjust_hunger))
+
+/datum/component/generic_mob_hunger/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_MOB_STOP_HUNGER)
+ UnregisterSignal(parent, COMSIG_MOB_START_HUNGER)
+ UnregisterSignal(parent, COMSIG_MOB_FEED)
+ UnregisterSignal(parent, COMSIG_MOB_RETURN_HUNGER)
+ UnregisterSignal(parent, COMSIG_MOB_ADJUST_HUNGER)
+
+/datum/component/generic_mob_hunger/proc/stop_hunger()
+ hunger_paused = TRUE
+
+/datum/component/generic_mob_hunger/proc/start_hunger()
+ hunger_paused = FALSE
+
+/datum/component/generic_mob_hunger/proc/on_feed(datum/source, atom/target, feed_amount)
+ SIGNAL_HANDLER
+ if(current_hunger > max_hunger)
+ SEND_SIGNAL(parent, COMSIG_MOB_REFUSED_EAT)
+ return
+
+ SEND_SIGNAL(parent, COMSIG_HUNGER_UPDATED, current_hunger + feed_amount, max_hunger)
+ if(current_hunger + feed_amount > max_hunger)
+ var/temp = (current_hunger + feed_amount) / max_hunger
+ SEND_SIGNAL(parent, COMSIG_MOB_OVERATE, temp)
+ ADD_TRAIT(parent, TRAIT_OVERFED, "hunger_trait")
+ addtimer(CALLBACK(src, PROC_REF(remove_hunger_trait), TRAIT_OVERFED), 5 MINUTES, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE)
+ current_hunger += feed_amount
+ if(feed_pause_time)
+ feed_pause_end = world.time + feed_pause_time
+ return
+
+ current_hunger += feed_amount
+ SEND_SIGNAL(parent, COMSIG_MOB_EAT_NORMAL, current_hunger)
+ if(feed_pause_time)
+ feed_pause_end = world.time + feed_pause_time
+
+/datum/component/generic_mob_hunger/proc/return_hunger()
+ SIGNAL_HANDLER
+ return current_hunger / max_hunger
+
+/datum/component/generic_mob_hunger/process(seconds_per_tick)
+ if(hunger_paused || !hunger_drain || (feed_pause_end > world.time))
+ return
+
+ if(isliving(parent))
+ var/mob/living/living = parent
+ if(living.stat == DEAD)
+ return
+
+ if(current_hunger >= hunger_drain)
+ current_hunger -= hunger_drain
+ SEND_SIGNAL(parent, COMSIG_HUNGER_UPDATED, current_hunger, max_hunger)
+
+ var/hunger_precent = current_hunger / max_hunger
+
+ if(hunger_precent <= 0.25)
+ SEND_SIGNAL(parent, COMSIG_MOB_STARVING, hunger_precent)
+ else
+ current_hunger = 0
+ SEND_SIGNAL(parent, COMSIG_HUNGER_UPDATED, current_hunger, max_hunger)
+ SEND_SIGNAL(parent, COMSIG_MOB_FULLY_STARVING)
+
+/datum/component/generic_mob_hunger/proc/adjust_hunger(datum/source, amount)
+ current_hunger += amount
+
+/datum/component/generic_mob_hunger/proc/remove_hunger_trait(trait)
+ REMOVE_TRAIT(parent, trait, "hunger_trait")
diff --git a/monkestation/code/modules/slimecore/components/latch_feeding.dm b/monkestation/code/modules/slimecore/components/latch_feeding.dm
new file mode 100644
index 000000000000..5780c4b45efb
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/latch_feeding.dm
@@ -0,0 +1,123 @@
+/datum/component/latch_feeding
+ var/damage_type
+ var/damage_amount
+
+ ///this is the target we are sucking
+ var/atom/movable/target
+ ///this is the amount of hunger we are sending per feed process
+ var/hunger_restore
+ ///do we stop at crit?
+ var/stops_at_crit
+ ///did we just unlatch?
+ var/unlatching = FALSE
+ ///our callback
+ var/datum/callback/check_and_replace
+
+/datum/component/latch_feeding/Initialize(atom/movable/target, damage_type, damage_amount, hunger_restore, stops_at_crit, datum/callback/callback, checks_loc = TRUE)
+ . = ..()
+ src.target = target
+ if(!target)
+ return COMPONENT_INCOMPATIBLE
+
+ src.damage_type = damage_type
+ src.damage_amount = damage_amount
+ src.hunger_restore = hunger_restore
+ src.stops_at_crit = stops_at_crit
+ src.check_and_replace = callback
+
+ if(!latch_target(loc_check = checks_loc))
+ return COMPONENT_INCOMPATIBLE
+
+ ADD_TRAIT(parent, TRAIT_FEEDING, LATCH_TRAIT)
+
+ START_PROCESSING(SSobj, src)
+
+/datum/component/latch_feeding/Destroy(force, silent)
+ REMOVE_TRAIT(parent, TRAIT_FEEDING, LATCH_TRAIT)
+ . = ..()
+ target = null
+ qdel(check_and_replace)
+
+/datum/component/latch_feeding/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_LIVING_SET_BUCKLED, PROC_REF(check_buckled))
+ RegisterSignal(parent, COMSIG_MOB_OVERATE, PROC_REF(stop_feeding))
+
+/datum/component/latch_feeding/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_LIVING_SET_BUCKLED)
+ UnregisterSignal(parent, COMSIG_MOB_OVERATE)
+
+/datum/component/latch_feeding/proc/latch_target(init = FALSE, loc_check = TRUE)
+ var/mob/basic_mob = parent
+ var/mob/living/living_target = target
+ SEND_SIGNAL(basic_mob, COMSIG_MOBSTACKER_DESTROY)
+ basic_mob.unbuckle_all_mobs()
+ if((living_target.stat >= SOFT_CRIT) && stops_at_crit && living_target.client)
+ if(init)
+ return FALSE
+ else
+ qdel(src)
+ return FALSE
+
+ target.unbuckle_all_mobs(force = TRUE)
+ if(target.buckle_mob(basic_mob, TRUE, loc_check))
+ basic_mob.layer = target.layer + 0.1
+ target.visible_message(span_danger("[basic_mob] latches onto [target]!"), \
+ span_userdanger("[basic_mob] latches onto [target]!"))
+ ADD_TRAIT(target, TRAIT_LATCH_FEEDERED, "latch_feeding")
+ return TRUE
+ else
+ to_chat(basic_mob, span_notice("You failed to latch onto [target]."))
+ if(init)
+ return FALSE
+ else
+ qdel(src)
+
+/datum/component/latch_feeding/proc/unlatch_target(living = TRUE, silent = FALSE)
+ var/mob/basic_mob = parent
+ if(!target)
+ return
+ if(basic_mob.buckled)
+ if(!living)
+ to_chat(basic_mob, "[pick("This subject is incompatible", \
+ "This subject does not have life energy", "This subject is empty", \
+ "I am not satisified", "I can not feed from this subject", \
+ "I do not feel nourished", "This subject is not food")]!")
+ if(!silent)
+ basic_mob.visible_message(span_warning("[basic_mob] lets go of [basic_mob.buckled]!"), \
+ span_notice("I stopped feeding."))
+
+ REMOVE_TRAIT(target, TRAIT_LATCH_FEEDERED, "latch_feeding")
+ basic_mob.layer = initial(basic_mob.layer)
+ if(basic_mob.buckled)
+ basic_mob.buckled.unbuckle_mob(basic_mob, force=TRUE)
+
+/datum/component/latch_feeding/proc/check_buckled(mob/living/source, atom/movable/new_buckled)
+ if(!new_buckled && !unlatching)
+ unlatching = TRUE
+ unlatch_target()
+ qdel(src)
+ return
+
+/datum/component/latch_feeding/proc/stop_feeding()
+ unlatch_target()
+ qdel(src)
+
+/datum/component/latch_feeding/process(seconds_per_tick)
+ if(!target)
+ qdel(src)
+ return
+
+ var/mob/living/living_target = target
+ if((living_target.stat >= SOFT_CRIT) && stops_at_crit && living_target.client)
+ stop_feeding()
+ return
+
+ if(!check_and_replace || (check_and_replace && !check_and_replace.Invoke()))
+ if(iscarbon(living_target))
+ living_target.apply_damage(damage_amount, damage_type, spread_damage = TRUE)
+ else
+ living_target.apply_damage(damage_amount, BRUTE, spread_damage = TRUE)
+
+ if(parent) // ??? I was getting runtimes for no parent but IDK how
+ SEND_SIGNAL(parent, COMSIG_MOB_FEED, target, hunger_restore)
+ SEND_SIGNAL(target, COMSIG_MOB_FED_ON, parent, hunger_restore)
diff --git a/monkestation/code/modules/slimecore/components/liquid_secretion.dm b/monkestation/code/modules/slimecore/components/liquid_secretion.dm
new file mode 100644
index 000000000000..5dce38e9a8b8
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/liquid_secretion.dm
@@ -0,0 +1,50 @@
+/datum/component/liquid_secretion
+ ///the reagent we secrete
+ var/reagent_id
+ ///the interval of secretion
+ var/secretion_interval
+ ///amount of reagents to spawn
+ var/amount
+ ///Callback interaction called when the turf has some liquids on it
+ var/datum/callback/pre_secrete_callback
+ var/next_secrete = 0
+
+
+
+/datum/component/liquid_secretion/Initialize(reagent_id = /datum/reagent/water, amount = 10, secretion_interval = 1 SECONDS, pre_secrete_callback)
+ . = ..()
+
+ src.reagent_id = reagent_id
+ src.secretion_interval = secretion_interval
+ src.amount = amount
+ src.pre_secrete_callback = CALLBACK(parent, pre_secrete_callback)
+
+ START_PROCESSING(SSobj, src)
+
+/datum/component/liquid_secretion/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_SECRETION_UPDATE, PROC_REF(update_information)) //The only signal allowing item -> turf interaction
+
+/datum/component/liquid_secretion/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_SECRETION_UPDATE)
+
+/datum/component/liquid_secretion/proc/update_information(datum/source, reagent_id, amount, secretion_interval)
+ if(reagent_id)
+ src.reagent_id = reagent_id
+ if(amount)
+ src.amount = amount
+ if(secretion_interval)
+ src.secretion_interval = secretion_interval
+
+
+/datum/component/liquid_secretion/process(seconds_per_tick)
+ if(!parent || (next_secrete > world.time))
+ return
+ next_secrete = world.time + secretion_interval
+ if(pre_secrete_callback && !pre_secrete_callback.Invoke(parent))
+ return
+
+ var/turf/parent_turf = get_turf(parent)
+ var/list/reagent_list = list()
+ reagent_list |= reagent_id
+ reagent_list[reagent_id] = amount
+ parent_turf.add_liquid_list(reagent_list, FALSE, T20C)
diff --git a/monkestation/code/modules/slimecore/components/mob_stacker.dm b/monkestation/code/modules/slimecore/components/mob_stacker.dm
new file mode 100644
index 000000000000..4bc78677349a
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/mob_stacker.dm
@@ -0,0 +1,84 @@
+/datum/component/mob_stacker
+ var/list/stacked_mobs = list()
+ ///until we get a better pixel proc this is a constant offset
+ var/constant_offset = 0
+ ///this is our top most atoms
+ var/mob/living/current_head
+ ///this is our brain the main dude
+ var/mob/living/main_dude
+
+ ///are we breaking apart
+ var/breaking = FALSE
+
+ var/max_size = 1
+
+
+/datum/component/mob_stacker/Initialize(...)
+ . = ..()
+ main_dude = parent
+ current_head = parent
+ max_size = rand(1, 7)
+ main_dude.max_buckled_mobs = max_size
+ addtimer(CALLBACK(src, PROC_REF(destroy_self)), rand(30 SECONDS, 120 SECONDS))
+
+/datum/component/mob_stacker/RegisterWithParent()
+ . = ..()
+ RegisterSignal(parent, COMSIG_CHECK_CAN_ADD_NEW_STACK, PROC_REF(can_add))
+ RegisterSignal(parent, COMSIG_ATOM_JOIN_STACK, PROC_REF(try_join_stack))
+ RegisterSignal(parent, COMSIG_LIVING_SET_BUCKLED, PROC_REF(check_collapse))
+ RegisterSignal(parent, COMSIG_MOBSTACKER_DESTROY, PROC_REF(destroy_self))
+
+/datum/component/mob_stacker/Destroy(force, silent)
+ . = ..()
+ UnregisterSignal(main_dude, COMSIG_ATOM_JOIN_STACK)
+ UnregisterSignal(main_dude, COMSIG_LIVING_SET_BUCKLED)
+ UnregisterSignal(main_dude, COMSIG_CHECK_CAN_ADD_NEW_STACK)
+ if(main_dude.buckled)
+ main_dude.buckled.unbuckle_mob(main_dude, force=TRUE)
+ main_dude = null
+ current_head = null
+ for(var/mob/living/dude as anything in stacked_mobs)
+ if(isbasicmob(dude))
+ var/mob/living/basic/basic = dude
+ basic.ai_controller?.set_ai_status(AI_STATUS_ON)
+ REMOVE_TRAIT(dude, TRAIT_IN_STACK, "mob_stack")
+ UnregisterSignal(dude, COMSIG_ATOM_JOIN_STACK)
+ UnregisterSignal(dude, COMSIG_LIVING_SET_BUCKLED)
+ if(dude.buckled)
+ dude.buckled.unbuckle_mob(dude, force=TRUE)
+ stacked_mobs -= dude
+
+
+/datum/component/mob_stacker/proc/try_join_stack(datum/source, mob/living/joiner)
+ SIGNAL_HANDLER
+ if(joiner in stacked_mobs)
+ return
+
+ if(main_dude.buckle_mob(joiner, force = TRUE))
+ ADD_TRAIT(joiner, TRAIT_IN_STACK, "mob_stack")
+ if(isbasicmob(joiner))
+ var/mob/living/basic/basic = joiner
+ basic.ai_controller?.set_ai_status(AI_STATUS_OFF)
+ current_head = joiner
+ stacked_mobs += joiner
+ RegisterSignal(joiner, COMSIG_ATOM_JOIN_STACK, PROC_REF(try_join_stack))
+ RegisterSignal(joiner, COMSIG_LIVING_SET_BUCKLED, PROC_REF(check_collapse))
+ joiner.pixel_y += constant_offset
+ constant_offset += joiner.get_mob_buckling_height(current_head)
+
+/datum/component/mob_stacker/proc/check_collapse(mob/living/source, atom/movable/new_buckled)
+ if(new_buckled != main_dude && !breaking)
+ breaking = TRUE
+ qdel(src)
+
+/datum/component/mob_stacker/proc/can_add(datum/source)
+ SIGNAL_HANDLER
+ //this isn't a 1 line return because I like to debug
+ var/value = length(stacked_mobs)
+ if(value < max_size)
+ return TRUE
+ else
+ return FALSE
+
+/datum/component/mob_stacker/proc/destroy_self()
+ qdel(src)
diff --git a/monkestation/code/modules/slimecore/components/pollution_scrubber.dm b/monkestation/code/modules/slimecore/components/pollution_scrubber.dm
new file mode 100644
index 000000000000..108dfb2bd7a9
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/pollution_scrubber.dm
@@ -0,0 +1,28 @@
+/datum/component/pollution_scrubber
+ ///the amount we try to scrub each process
+ var/scrubbing_amount
+ ///the lifetime if set it will delete itself after this point
+ var/lifetime
+
+/datum/component/pollution_scrubber/Initialize(scrubbing_amount, lifetime)
+ . = ..()
+ src.scrubbing_amount = scrubbing_amount
+ src.lifetime = lifetime
+
+ if(lifetime)
+ addtimer(CALLBACK(src, PROC_REF(kill_component)), lifetime)
+ START_PROCESSING(SSobj, src)
+
+
+/datum/component/pollution_scrubber/proc/kill_component()
+ qdel(src)
+
+/datum/component/pollution_scrubber/process(seconds_per_tick)
+ if(isliving(parent))
+ var/mob/living/living = parent
+ if(living.stat == DEAD)
+ return
+
+ var/turf/open/turf = get_turf(parent)
+ if(turf.pollution)
+ turf.pollution.scrub_amount(scrubbing_amount)
diff --git a/monkestation/code/modules/slimecore/components/vac_tagged.dm b/monkestation/code/modules/slimecore/components/vac_tagged.dm
new file mode 100644
index 000000000000..317e3889cfa8
--- /dev/null
+++ b/monkestation/code/modules/slimecore/components/vac_tagged.dm
@@ -0,0 +1,16 @@
+/datum/component/vac_tagged
+ var/datum/weakref/creator
+
+/datum/component/vac_tagged/Initialize(mob/creator_mob)
+ . = ..()
+ if(!creator_mob)
+ return COMPONENT_INCOMPATIBLE
+
+ creator = WEAKREF(creator_mob)
+
+/datum/component/vac_tagged/RegisterWithParent()
+ . = ..()
+ RegisterSignal(parent, COMSIG_MOB_FED_ON, PROC_REF(on_fed_on))
+
+/datum/component/vac_tagged/proc/on_fed_on(mob/living/source, mob/living/feeder, hunger_restored)
+ SEND_SIGNAL(feeder, COMSIG_FRIENDSHIP_CHANGE, creator.resolve(), (hunger_restored * 0.1))
diff --git a/monkestation/code/modules/slimecore/corral/corral_data.dm b/monkestation/code/modules/slimecore/corral/corral_data.dm
new file mode 100644
index 000000000000..9d85e492f8bf
--- /dev/null
+++ b/monkestation/code/modules/slimecore/corral/corral_data.dm
@@ -0,0 +1,78 @@
+//this is just a doc comment but currently the max interior size is 9x9 so 11x11 if you include the corral walls
+/datum/corral_data
+ ///list of all managed slimes
+ var/list/managed_slimes = list()
+ ///the installed corral upgrades
+ var/list/corral_upgrades = list()
+
+ ///the turfs inside the corral
+ var/list/corral_turfs = list()
+ ///our corral corners
+ var/list/corral_corners = list()
+ ///the corral connecter effects
+ var/list/corral_connectors = list()
+
+/datum/corral_data/proc/setup_pen()
+ for(var/turf/turf as anything in corral_turfs)
+ RegisterSignal(turf, COMSIG_ATOM_ENTERED, PROC_REF(check_entered))
+ RegisterSignal(turf, COMSIG_ATOM_EXITED, PROC_REF(check_exited))
+
+ for(var/mob/living/basic/slime/slime as anything in turf.contents)
+ if(!istype(slime))
+ continue
+ managed_slimes |= slime
+
+/datum/corral_data/Destroy(force, ...)
+ QDEL_LIST(corral_connectors)
+ corral_turfs = null
+
+ for(var/obj/machinery/corral_corner/corner as anything in corral_corners)
+ corner.connected_data = null
+ corral_corners -= corner
+ corral_corners = null
+ for(var/mob/living/basic/slime/slime as anything in managed_slimes)
+ UnregisterSignal(slime, COMSIG_ATOM_SUCKED)
+ UnregisterSignal(slime, COMSIG_LIVING_DEATH)
+ managed_slimes = null
+
+ . = ..()
+
+/datum/corral_data/proc/check_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+ if(!istype(arrived, /mob/living/basic/slime))
+ return
+
+ if(isliving(arrived))
+ var/mob/living/living = arrived
+ if(living.stat == DEAD)
+ return
+
+ if(arrived in managed_slimes)
+ return
+
+ RegisterSignal(arrived, COMSIG_ATOM_SUCKED, PROC_REF(remove_cause_sucked))
+ RegisterSignal(arrived, COMSIG_LIVING_DEATH, PROC_REF(remove_cause_sucked))
+ managed_slimes |= arrived
+ for(var/datum/corral_upgrade/upgrade as anything in corral_upgrades)
+ upgrade.on_slime_entered(arrived, src)
+
+/datum/corral_data/proc/check_exited(turf/source, atom/movable/gone, direction)
+ if(!istype(gone, /mob/living/basic/slime))
+ return
+
+ var/turf/turf = get_step(source, direction)
+ if(turf in corral_turfs)
+ return
+
+ UnregisterSignal(gone, COMSIG_ATOM_SUCKED)
+ UnregisterSignal(gone, COMSIG_LIVING_DEATH)
+ managed_slimes -= gone
+ for(var/datum/corral_upgrade/upgrade as anything in corral_upgrades)
+ upgrade.on_slime_exited(gone)
+
+/datum/corral_data/proc/remove_cause_sucked(atom/movable/gone)
+
+ UnregisterSignal(gone, COMSIG_ATOM_SUCKED)
+ UnregisterSignal(gone, COMSIG_LIVING_DEATH)
+ managed_slimes -= gone
+ for(var/datum/corral_upgrade/upgrade as anything in corral_upgrades)
+ upgrade.on_slime_exited(gone)
diff --git a/monkestation/code/modules/slimecore/corral/machines/corral_corner.dm b/monkestation/code/modules/slimecore/corral/machines/corral_corner.dm
new file mode 100644
index 000000000000..7c095c3cc339
--- /dev/null
+++ b/monkestation/code/modules/slimecore/corral/machines/corral_corner.dm
@@ -0,0 +1,189 @@
+/obj/item/corral_linker
+ name = "corral linker"
+ desc = "A useful tool to help link corrals"
+
+ icon = 'monkestation/code/modules/slimecore/icons/machinery.dmi'
+ icon_state = "corral_linker"
+
+ var/obj/machinery/corral_corner/host
+ var/list/corral_corners = list()
+
+/obj/item/corral_linker/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ . = ..()
+ if(target == host)
+ if(host.submit_corners(corral_corners))
+ qdel(src)
+ return AFTERATTACK_PROCESSED_ITEM
+
+ if(length(corral_corners) == 4)
+ say("Buffer full!")
+ return
+
+ if(istype(target, /obj/machinery/corral_corner))
+ if(target in corral_corners)
+ corral_corners -= target
+ say("Removed corner from buffer!")
+ return
+ corral_corners += target
+ say("Added corner to buffer!")
+ return
+
+/obj/machinery/corral_corner
+ name = "corral fencepost"
+ desc = "One of the corners of a corral"
+
+ icon = 'monkestation/code/modules/slimecore/icons/machinery.dmi'
+ icon_state = "corral_corner"
+ circuit = /obj/item/circuitboard/machine/corral_corner
+
+ density = TRUE
+ var/max_range = 9
+ var/datum/corral_data/connected_data
+ var/mapping_id
+
+/obj/machinery/corral_corner/Initialize(mapload)
+ . = ..()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/corral_corner/LateInitialize()
+ . = ..()
+ locate_machinery()
+
+/obj/machinery/corral_corner/locate_machinery(multitool_connection)
+ if(!mapping_id || connected_data)
+ return
+ var/list/found_corners = list()
+ for(var/obj/machinery/corral_corner/main in GLOB.machines)
+ if(main.mapping_id != mapping_id)
+ continue
+ found_corners += main
+ submit_corners(found_corners)
+
+ if(connected_data)
+ for(var/obj/machinery/slime_pen_controller/controller in GLOB.machines)
+ if(controller.mapping_id == mapping_id)
+ controller.linked_data = connected_data
+
+/obj/machinery/corral_corner/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+ if(connected_data)
+ return
+ start_linking_procedure()
+
+/obj/machinery/corral_corner/multitool_act(mob/living/user, obj/item/tool)
+ if(!multitool_check_buffer(user, tool))
+ return
+ var/obj/item/multitool/multitool = tool
+ multitool.buffer = src
+ to_chat(user, span_notice("You save the data in the [multitool.name]'s buffer."))
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/corral_corner/proc/start_linking_procedure()
+ var/obj/item/corral_linker/new_linker = new(loc)
+ new_linker.host = src
+ new_linker.corral_corners += src
+
+/obj/machinery/corral_corner/proc/submit_corners(list/given_corners)
+ if(length(given_corners) != 4)
+ return
+ var/list/steps_and_direction = list()
+
+ var/list/corners = given_corners
+
+ var/list/corners_left = list()
+ corners_left += corners
+
+ var/turf/current_turf = loc
+ var/turf/last_found_corner_turf = loc
+ var/found = FALSE
+ for(var/num in 1 to 4)
+ found = FALSE
+ for(var/direction in GLOB.cardinals)
+ if(found)
+ break
+ current_turf = last_found_corner_turf
+ var/steps = 0
+ for(var/step in 1 to max_range)
+ current_turf = get_step(current_turf, direction)
+
+ if(current_turf.density)
+ break
+ steps++
+
+ for(var/obj/machinery/corral_corner/found_corner as anything in current_turf.contents)
+ if(!istype(found_corner))
+ continue
+
+ if(!found_corner)
+ continue
+
+ if((found_corner == src) && length(steps_and_direction) < 3)
+ continue
+
+ if(!(found_corner in corners_left))
+ continue
+
+ steps--
+
+ corners_left -= found_corner
+ last_found_corner_turf = current_turf
+ found = TRUE
+ steps_and_direction += list("[direction]" = steps)
+ break
+
+ build_data(steps_and_direction, corners)
+ return TRUE
+
+/obj/machinery/corral_corner/proc/build_data(list/steps, list/corners)
+ var/turf/current_turf = loc
+ var/list/effects = list()
+ for(var/step_dir in steps)
+ for(var/lengths in 1 to steps[step_dir])
+ current_turf = get_step(current_turf, text2num(step_dir))
+
+ var/obj/effect/corral_fence/new_fence = new(current_turf)
+ new_fence.dir = text2num(step_dir)
+ effects += new_fence
+ current_turf = get_step(current_turf, text2num(step_dir))
+
+ var/datum/corral_data/new_data = new
+
+ new_data.corral_connectors += effects
+ new_data.corral_corners += corners
+
+ var/turf/last_turf
+ for(var/obj/machinery/corral_corner/adder as anything in corners)
+ if((adder.x < x && adder.y < y) || (adder.x > x && adder.y > y) || (adder.x > x && adder.y < y) || (adder.x < x && adder.y > y))
+ last_turf = get_turf(adder)
+ if(adder.connected_data)
+ continue
+ adder.connected_data = new_data
+
+ var/list/block_turfs = block(get_turf(src), last_turf)
+ new_data.corral_turfs += block_turfs
+ new_data.setup_pen()
+
+/obj/effect/corral_fence
+ name = "corral fence"
+ desc = "A holographic fence designed to prevent slimes from leaving."
+ anchored = TRUE
+ can_be_unanchored = FALSE
+
+ icon = 'monkestation/code/modules/slimecore/icons/machinery.dmi'
+ icon_state = "corral_fence"
+ can_atmos_pass = ATMOS_PASS_NO
+ can_astar_pass = CANASTARPASS_ALWAYS_PROC
+
+/obj/effect/corral_fence/CanPass(atom/movable/mover, border_dir)
+ . = ..()
+ if(mover.pulledby)
+ return TRUE
+ if((istype(mover, /mob/living/basic/slime) || ismonkey(mover) || istype(mover, /mob/living/basic/xenofauna)) && !HAS_TRAIT(mover, VACPACK_THROW))
+ return FALSE
+ return TRUE
+
+
+/obj/effect/corral_fence/CanAStarPass(to_dir, datum/can_pass_info/pass_info)
+ if(pass_info.xenofauna_or_slime)
+ return FALSE
+ return TRUE //anything expect slimes can astar pass
diff --git a/monkestation/code/modules/slimecore/corral/upgrades/_base_upgrade.dm b/monkestation/code/modules/slimecore/corral/upgrades/_base_upgrade.dm
new file mode 100644
index 000000000000..41181294be14
--- /dev/null
+++ b/monkestation/code/modules/slimecore/corral/upgrades/_base_upgrade.dm
@@ -0,0 +1,14 @@
+/datum/corral_upgrade
+ var/name = "Generic Corral Upgrade"
+ var/desc = "Generic Corral Upgrade Description"
+ ///the amount of xenobiology points this pen upgrade costs
+ var/cost = 0
+
+/datum/corral_upgrade/proc/on_add(datum/corral_data/parent)
+ return
+
+/datum/corral_upgrade/proc/on_slime_entered(mob/living/basic/slime/slime)
+ return
+
+/datum/corral_upgrade/proc/on_slime_exited(mob/living/basic/slime/slime)
+ return
diff --git a/monkestation/code/modules/slimecore/corral/upgrades/human_docility_upgrade.dm b/monkestation/code/modules/slimecore/corral/upgrades/human_docility_upgrade.dm
new file mode 100644
index 000000000000..6fa2e8f1c1c2
--- /dev/null
+++ b/monkestation/code/modules/slimecore/corral/upgrades/human_docility_upgrade.dm
@@ -0,0 +1,16 @@
+/datum/corral_upgrade/human_docility_upgrade
+ name = "Human Docility Upgrade"
+ desc = "Makes the non rabid slimes docile to people with souls."
+ cost = 2500
+
+/datum/corral_upgrade/human_docility_upgrade/on_add(datum/corral_data/parent)
+ for(var/mob/living/basic/slime/slime as anything in parent.managed_slimes)
+ slime.ai_controller.set_blackboard_key(BB_WONT_TARGET_CLIENTS, TRUE)
+
+/datum/corral_upgrade/human_docility_upgrade/on_slime_entered(mob/living/basic/slime/slime)
+ slime.ai_controller.set_blackboard_key(BB_WONT_TARGET_CLIENTS, TRUE)
+
+/datum/corral_upgrade/human_docility_upgrade/on_slime_exited(mob/living/basic/slime/slime)
+ if(slime.has_slime_trait(/datum/slime_trait/docility))
+ return
+ slime.ai_controller.set_blackboard_key(BB_WONT_TARGET_CLIENTS, FALSE)
diff --git a/monkestation/code/modules/slimecore/corral/upgrades/obliteration_upgrade.dm b/monkestation/code/modules/slimecore/corral/upgrades/obliteration_upgrade.dm
new file mode 100644
index 000000000000..830ce0fc93a2
--- /dev/null
+++ b/monkestation/code/modules/slimecore/corral/upgrades/obliteration_upgrade.dm
@@ -0,0 +1,14 @@
+/datum/corral_upgrade/obliteration_upgrade
+ name = "Slime Obilteration Upgrade"
+ desc = "Just obliterates slimes that enter the cage."
+ cost = 5000
+
+
+/datum/corral_upgrade/obliteration_upgrade/on_add(datum/corral_data/parent)
+ for(var/mob/living/basic/slime/slime as anything in parent.managed_slimes)
+ parent.managed_slimes -= slime
+ qdel(slime)
+
+/datum/corral_upgrade/obliteration_upgrade/on_slime_entered(mob/living/basic/slime/slime, datum/corral_data/parent)
+ parent.managed_slimes -= slime
+ qdel(slime)
diff --git a/monkestation/code/modules/slimecore/icons/backpack_lefthand.dmi b/monkestation/code/modules/slimecore/icons/backpack_lefthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..0a611a1418ae1a7ccfd1bcda7c024c0255b3a4ce
GIT binary patch
literal 653
zcmV;80&@L{P)P)t-s0000)
zHY_9{9%wUcW=k@>Y`%j+vU^Q=5u_R_4oX5r?tiL`aKsMurfJlBPk*u
zBaA96MnOm{DJ@n|Sa2XAvMn$WtW0$P0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS
zoZ^zil2jm5sVp(Mv@|!qATc>xiHkEOv#1!Pm5Vd2C^0t`#5TmLHomwrFC{Y>D1l3t
zvVyCh3)o2jO%5&am8#y|0004KNklGxO&e{Zc@POdZ*mK$e$>Pdq@!Lc
zs51r{h{E9gM_x+NQ}`8i*DN^8<8P7+ru~)cehFeFdA_D
z>X$Ii#YHTLqX7^ck>HRCU^L)_^IyOnc!>Zh|Omhz55AsU5&*a7SfFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33t
zGfE(w;*!LYR3KBSEHSyXG&jB=F*#d_i!&v&s2HS`i!-e#F*g;&HpHqnzPK_kB{LZ)
zflHUNf~%hk*hv6Q4lVGNs@~lI00B}-L_t(&f$f*ej)O1^MFRy~2u~9p|No`q&bE%R
zOII^KQZ^C2M}buG4Z(37$8j7Rh5pgf9`XpG(hI8E98!d)ZnXITPu3uXlu$h@&w4q5NRm|+s+v}==0Mx?s(AB3RXPcw+9f$_if!0Exmv}fh;&pg7bZQ
zlmzttli?d|{0XAaaPWmLpZ*7#YuZS|JzZ06zT-HK<2a6`1bl$41bo0%3CPq6Jr^Zl
zzJ0ul5|D7cD-cUS!d*FCXOT<5f!gt15(p(A-51Cu;Jh!8O8~iV3*-_o|Idc-12Z}j
UQX=Tm4gdfE07*qoM6N<$g3yu?RsaA1
literal 0
HcmV?d00001
diff --git a/monkestation/code/modules/slimecore/icons/equipment.dmi b/monkestation/code/modules/slimecore/icons/equipment.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a28f8c167fc59987ce9ac8e51f9e5a0f001c57b7
GIT binary patch
literal 5347
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