From ba5224fbcbb525e91ad3449838915b8e57cc17f4 Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
<94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Sun, 22 Feb 2026 16:33:43 -0700
Subject: [PATCH] [MIRROR] Staticpath [MDB ignore] (#12445)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
archive/maps/cynosure/cynosure-1.dmm | 186 ++---
archive/maps/cynosure/cynosure-2.dmm | 194 ++---
archive/maps/cynosure/cynosure-3.dmm | 4 +-
archive/maps/cynosure/cynosure_jobs.dm | 8 +-
archive/maps/cynosure/submaps/10x9/Shop.dmm | 4 +-
.../cynosure/submaps/10x9/TreasureHoard.dmm | 2 +-
.../maps/cynosure/submaps/16x11/LaserTag.dmm | 4 +-
.../maps/cynosure/submaps/16x11/Nightclub.dmm | 8 +-
.../maps/cynosure/submaps/16x11/OldDorms.dmm | 2 +-
.../cynosure/submaps/5x7/MedicalBreakRoom.dmm | 2 +-
.../submaps/5x7/MedicalWasteStorage.dmm | 2 +-
.../submaps/5x7/SurgeryTrainingRoom.dmm | 2 +-
.../maps/cynosure/submaps/7x7/FightClub.dmm | 236 +++++-
.../cynosure/submaps/7x7/JanitorCloset.dmm | 4 +-
.../maps/cynosure/submaps/7x7/PartyRoom.dmm | 6 +-
.../maps/cynosure/submaps/8x5/HiddenBar.dmm | 4 +-
.../cynosure/submaps/8x5/SquattersDen.dmm | 2 +-
.../maps/cynosure/submaps/8x9/MeetingRoom.dmm | 6 +-
.../maps/cynosure/submaps/8x9/MouseHouse.dmm | 331 +++++++--
.../maps/cynosure/submaps/8x9/ReptileRoom.dmm | 322 +++++++-
.../maps/cynosure/submaps/8x9/RitualRoom.dmm | 2 +-
.../cynosure/submaps/9x10/ShootingRange.dmm | 2 +-
.../maps/cynosure/submaps/9x10/Theater.dmm | 6 +-
.../maps/cynosure/submaps/9x8/GamesRoom.dmm | 4 +-
archive/maps/cynosure/submaps/9x8/HotTub.dmm | 2 +-
.../maps/cynosure/submaps/9x8/ServerRoom.dmm | 4 +-
archive/maps/northern_star/job/outfits.dm | 2 +-
.../maps/northern_star/northern_star_jobs.dm | 4 +-
archive/maps/northern_star/polaris-2.dmm | 2 +-
archive/maps/old_yw/yw/job/outfits.dm | 30 +-
archive/maps/old_yw/yw/job/outfits_yw.dm | 6 +-
archive/maps/southern_cross/job/outfits.dm | 12 +-
.../southern_cross/southern_cross_jobs.dm | 12 +-
.../structures/closets/engineering.dm | 2 +-
.../structures/closets/medical.dm | 2 +-
.../southern_cross/structures/closets/misc.dm | 2 +-
.../structures/closets/research.dm | 2 +-
.../structures/closets/security.dm | 2 +-
archive/maps/submaps/depreciated_vr/talon.dm | 12 +-
code/ZAS/Airflow.dm | 24 +-
code/ZAS/Connection.dm | 28 +-
code/ZAS/ConnectionGroup.dm | 70 +-
code/ZAS/ConnectionManager.dm | 22 +-
code/ZAS/Diagnostic.dm | 2 +-
code/ZAS/Fire.dm | 28 +-
code/ZAS/Phoron.dm | 20 +-
code/ZAS/README.md | 21 +-
code/ZAS/Turf.dm | 6 +-
code/ZAS/Variable Settings.dm | 30 +-
code/ZAS/Zone.dm | 50 +-
code/__defines/dcs/signals/signals_global.dm | 2 +-
code/__defines/dcs/signals/signals_reagent.dm | 2 +-
code/__defines/misc.dm | 2 +-
code/_global_vars/misc.dm | 2 +-
code/_helpers/_global_objects.dm | 2 +
code/_helpers/global_lists.dm | 6 +-
code/_macros.dm | 4 +-
code/_onclick/hud/spell_screen_objects.dm | 8 +-
code/controllers/subsystems/air.dm | 46 +-
code/controllers/subsystems/airflow.dm | 6 +-
code/controllers/subsystems/chemistry.dm | 12 +-
code/controllers/subsystems/internal_wiki.dm | 38 +-
code/controllers/subsystems/plants.dm | 6 +-
code/datums/hierarchy.dm | 18 +-
code/datums/mind.dm | 2 +-
code/datums/observation/destroyed.dm | 2 +-
code/datums/observation/equipped.dm | 8 +-
code/datums/observation/moved.dm | 6 +-
code/datums/observation/power_change.dm | 4 +-
code/datums/observation/shuttle_added.dm | 4 +-
code/datums/observation/stat_set.dm | 4 +-
code/datums/observation/turf_enterexit.dm | 8 +-
code/datums/observation/unequipped.dm | 8 +-
code/datums/outfits/costumes/costume.dm | 2 +-
code/datums/outfits/costumes/halloween.dm | 32 +-
code/datums/outfits/horror_killers.dm | 10 +-
code/datums/outfits/jobs/YW.dm | 2 +-
code/datums/outfits/jobs/cargo.dm | 12 +-
code/datums/outfits/jobs/civilian.dm | 38 +-
code/datums/outfits/jobs/civilian_vr.dm | 52 +-
code/datums/outfits/jobs/command.dm | 10 +-
code/datums/outfits/jobs/command_vr.dm | 4 +-
code/datums/outfits/jobs/engineering.dm | 12 +-
code/datums/outfits/jobs/job.dm | 6 +-
code/datums/outfits/jobs/medical.dm | 30 +-
code/datums/outfits/jobs/medical_vr.dm | 2 +-
code/datums/outfits/jobs/misc.dm | 12 +-
code/datums/outfits/jobs/science.dm | 12 +-
code/datums/outfits/jobs/science_vr.dm | 4 +-
code/datums/outfits/jobs/security.dm | 14 +-
code/datums/outfits/jobs/security_yw.dm | 2 +-
code/datums/outfits/jobs/special_vr.dm | 12 +-
code/datums/outfits/military/fleet.dm | 8 +-
code/datums/outfits/military/marines.dm | 8 +-
code/datums/outfits/military/military.dm | 4 +-
code/datums/outfits/military/sifguard.dm | 8 +-
code/datums/outfits/misc.dm | 18 +-
code/datums/outfits/nanotrasen.dm | 10 +-
code/datums/outfits/outfit.dm | 20 +-
code/datums/outfits/outfit_vr.dm | 28 +-
code/datums/outfits/pirates.dm | 10 +-
code/datums/outfits/spec_op.dm | 16 +-
code/datums/outfits/tournament.dm | 16 +-
code/datums/outfits/wizardry.dm | 10 +-
code/datums/repositories/crew.dm | 2 +-
code/datums/repositories/decls.dm | 38 +-
code/datums/repositories/repository.dm | 2 +-
code/datums/repositories/unique.dm | 8 +-
code/defines/gases.dm | 14 +-
code/defines/procs/AStar.dm | 38 +-
code/game/antagonist/outsider/wizard.dm | 2 +-
code/game/gamemodes/cult/construct_spells.dm | 80 +-
code/game/jobs/job/assistant.dm | 26 +-
code/game/jobs/job/captain.dm | 6 +-
code/game/jobs/job/cargo.dm | 8 +-
code/game/jobs/job/civilian.dm | 60 +-
code/game/jobs/job/civilian_chaplain.dm | 2 +-
code/game/jobs/job/engineering.dm | 8 +-
code/game/jobs/job/exploration.dm | 8 +-
code/game/jobs/job/job.dm | 4 +-
code/game/jobs/job/medical.dm | 32 +-
code/game/jobs/job/offduty.dm | 14 +-
code/game/jobs/job/science.dm | 10 +-
code/game/jobs/job/security.dm | 10 +-
code/game/jobs/job/silicon.dm | 4 +-
code/game/jobs/job/special.dm | 10 +-
code/game/machinery/doors/door.dm | 2 +-
.../objects/effects/decals/posters/bs12.dm | 116 +--
.../effects/decals/posters/polarisposters.dm | 106 +--
.../decals/posters/polarisposters_vr.dm | 2 +-
.../objects/effects/decals/posters/posters.dm | 20 +-
.../effects/decals/posters/postersubtypes.dm | 6 +-
.../effects/decals/posters/tgposters.dm | 20 +-
.../effects/decals/posters/tgposters_ch.dm | 2 +-
.../effects/decals/posters/voreposters_vr.dm | 192 ++---
code/game/objects/mail.dm | 2 +-
.../structures/crates_lockers/__closets.dm | 2 +-
.../_closets_appearance_definitions.dm | 486 ++++++------
.../_closets_appearance_definitions_yw.dm | 10 +-
.../crates_lockers/closets/crittercrate.dm | 2 +-
.../crates_lockers/closets/fitness.dm | 18 +-
.../crates_lockers/closets/gimmick.dm | 14 +-
.../crates_lockers/closets/job_closets.dm | 10 +-
.../crates_lockers/closets/l3closet.dm | 14 +-
.../crates_lockers/closets/malfunction.dm | 2 +-
.../crates_lockers/closets/misc_vr.dm | 12 +-
.../crates_lockers/closets/secure/bar.dm | 2 +-
.../crates_lockers/closets/secure/cargo.dm | 8 +-
.../closets/secure/engineering.dm | 10 +-
.../closets/secure/hydroponics.dm | 4 +-
.../crates_lockers/closets/secure/medical.dm | 16 +-
.../crates_lockers/closets/secure/personal.dm | 4 +-
.../closets/secure/scientist.dm | 8 +-
.../closets/secure/secure_closets.dm | 2 +-
.../crates_lockers/closets/secure/security.dm | 22 +-
.../closets/secure/security_vr.dm | 10 +-
.../crates_lockers/closets/syndicate.dm | 2 +-
.../crates_lockers/closets/utility_closets.dm | 18 +-
.../closets/utility_closets_yw.dm | 4 +-
.../crates_lockers/closets/walllocker.dm | 46 +-
.../crates_lockers/closets/wardrobe.dm | 56 +-
.../crates_lockers/closets/wardrobe_vr.dm | 4 +-
.../structures/crates_lockers/crates.dm | 148 ++--
.../structures/crates_lockers/crates_vr.dm | 4 +-
code/game/objects/unit_testing.dm | 2 +-
code/game/turfs/flooring/floor_yw.dm | 6 +-
code/game/turfs/flooring/flooring.dm | 242 +++---
code/game/turfs/flooring/flooring_ch.dm | 2 +-
code/game/turfs/flooring/flooring_premade.dm | 212 +++---
code/game/turfs/flooring/flooring_vr.dm | 36 +-
code/game/turfs/flooring/gas_cracks.dm | 2 +-
code/game/turfs/flooring/seasonal.dm | 4 +-
code/game/turfs/glamour_turfs.dm | 4 +-
code/game/turfs/simulated/floor.dm | 4 +-
code/game/turfs/simulated/floor_attackby.dm | 4 +-
code/game/turfs/simulated/floor_icon.dm | 2 +-
code/game/turfs/simulated/floor_types.dm | 22 +-
code/game/turfs/simulated/floor_types_eris.dm | 278 +++----
code/game/turfs/simulated/lava.dm | 4 +-
code/game/turfs/simulated/outdoors/dirt.dm | 2 +-
code/game/turfs/simulated/outdoors/grass.dm | 8 +-
.../turfs/simulated/outdoors/ironsand_vr.dm | 4 +-
.../game/turfs/simulated/outdoors/outdoors.dm | 28 +-
.../turfs/simulated/outdoors/outdoors_ch.dm | 2 +-
code/game/turfs/simulated/outdoors/snow.dm | 2 +-
code/game/turfs/unsimulated/beach.dm | 12 +-
code/global_init.dm | 26 -
code/modules/Phorochemistry/phoronics_tile.dm | 2 +-
code/modules/admin/admin_verbs.dm | 6 +-
code/modules/admin/topic.dm | 6 +-
code/modules/admin/verbs/debug.dm | 4 +-
code/modules/admin/verbs/diagnostics.dm | 2 +-
code/modules/admin/verbs/grief_fixers.dm | 2 +-
code/modules/admin/verbs/mapping.dm | 14 +-
code/modules/blob2/core_chunk.dm | 10 +-
code/modules/emotes/definitions/_mob.dm | 48 +-
code/modules/emotes/definitions/audible.dm | 130 ++--
.../emotes/definitions/audible_belch.dm | 4 +-
.../emotes/definitions/audible_cough.dm | 4 +-
.../emotes/definitions/audible_furry_ch.dm | 2 +-
.../emotes/definitions/audible_furry_vr.dm | 98 +--
.../emotes/definitions/audible_pain.dm | 8 +-
.../emotes/definitions/audible_scream.dm | 8 +-
.../emotes/definitions/audible_scream_ch.dm | 4 +-
.../emotes/definitions/audible_scream_vr.dm | 4 +-
.../emotes/definitions/audible_slap.dm | 6 +-
.../emotes/definitions/audible_snap.dm | 8 +-
.../emotes/definitions/audible_sneeze.dm | 4 +-
.../emotes/definitions/audible_whistle.dm | 8 +-
code/modules/emotes/definitions/belly_rub.dm | 6 +-
code/modules/emotes/definitions/exertion.dm | 14 +-
code/modules/emotes/definitions/helpers_vr.dm | 16 +-
code/modules/emotes/definitions/human.dm | 38 +-
code/modules/emotes/definitions/slimes.dm | 16 +-
code/modules/emotes/definitions/synthetics.dm | 32 +-
code/modules/emotes/definitions/visible.dm | 144 ++--
.../emotes/definitions/visible_animated.dm | 24 +-
.../emotes/definitions/visible_vomit.dm | 4 +-
code/modules/emotes/definitions/visible_vr.dm | 4 +-
code/modules/emotes/emote_define.dm | 32 +-
code/modules/emotes/emote_mob.dm | 4 +-
code/modules/events/supply_demand_vr.dm | 4 +-
code/modules/food/recipe_dump.dm | 4 +-
code/modules/holodeck/HolodeckObjects.dm | 18 +-
code/modules/hydroponics/seed_gene_mut.dm | 50 +-
.../integrated_electronics/_defines.dm | 6 +-
code/modules/looking_glass/lg_turfs.dm | 4 +-
code/modules/mining/abandonedcrates.dm | 2 +-
.../mining/machinery/machine_processing.dm | 8 +-
code/modules/mining/mine_turfs.dm | 2 +-
code/modules/mining/mineral_effect.dm | 4 +-
code/modules/mining/ore_datum.dm | 46 +-
code/modules/mob/living/bot/floorbot.dm | 2 +-
code/modules/mob/living/bot/medbot.dm | 2 +-
code/modules/mob/living/bot/secbot.dm | 2 +-
.../mob/living/carbon/alien/diona/diona.dm | 46 +-
code/modules/mob/living/carbon/alien/emote.dm | 52 +-
code/modules/mob/living/carbon/brain/emote.dm | 18 +-
code/modules/mob/living/carbon/human/emote.dm | 696 +++++++++---------
code/modules/mob/living/carbon/human/life.dm | 6 +-
.../carbon/human/species/outsider/vox.dm | 2 +-
.../carbon/human/species/station/custom.dm | 40 +-
.../human/species/station/prometheans.dm | 12 +-
.../human/species/station/prommie_blob.dm | 18 +-
.../carbon/human/species/station/station.dm | 54 +-
code/modules/mob/living/silicon/emote.dm | 28 +-
.../mob/living/silicon/robot/drone/swarm.dm | 26 +-
.../silicon/robot/drone/swarm_abilities.dm | 16 +-
.../modules/mob/living/silicon/robot/emote.dm | 64 +-
.../mob/living/simple_mob/simple_mob.dm | 4 +-
.../subtypes/animal/alien animals/stardog.dm | 4 +-
.../simple_mob/subtypes/animal/animal.dm | 4 +-
.../simple_mob/subtypes/animal/borer/borer.dm | 4 +-
.../subtypes/animal/farm animals/chicken.dm | 4 +-
.../subtypes/animal/farm animals/cow.dm | 4 +-
.../animal/giant_spider/_giant_spider.dm | 4 +-
.../subtypes/animal/passive/crab.dm | 4 +-
.../subtypes/animal/passive/fish.dm | 4 +-
.../subtypes/animal/passive/misc.dm | 8 +-
.../subtypes/animal/passive/penguin.dm | 4 +-
.../subtypes/animal/passive/possum.dm | 8 +-
.../simple_mob/subtypes/animal/pets/bird.dm | 4 +-
.../simple_mob/subtypes/animal/pets/cat.dm | 52 +-
.../simple_mob/subtypes/animal/pets/dog.dm | 4 +-
.../simple_mob/subtypes/animal/sif/duck.dm | 2 +-
.../subtypes/animal/sif/frostfly.dm | 4 +-
.../subtypes/animal/sif/glitterfly.dm | 4 +-
.../subtypes/animal/sif/grafadreka.dm | 10 +-
.../simple_mob/subtypes/animal/sif/hare.dm | 4 +-
.../subtypes/animal/sif/hooligan_crab.dm | 2 +-
.../simple_mob/subtypes/animal/sif/kururak.dm | 4 +-
.../simple_mob/subtypes/animal/sif/leech.dm | 4 +-
.../simple_mob/subtypes/animal/sif/moth.dm | 4 +-
.../simple_mob/subtypes/animal/sif/pillbug.dm | 4 +-
.../simple_mob/subtypes/animal/sif/savik.dm | 4 +-
.../simple_mob/subtypes/animal/sif/shantak.dm | 4 +-
.../simple_mob/subtypes/animal/space/bats.dm | 2 +-
.../simple_mob/subtypes/animal/space/carp.dm | 2 +-
.../simple_mob/subtypes/animal/space/gnat.dm | 6 +-
.../simple_mob/subtypes/animal/space/goose.dm | 4 +-
.../simple_mob/subtypes/animal/space/ray.dm | 2 +-
.../simple_mob/subtypes/animal/space/shark.dm | 2 +-
.../simple_mob/subtypes/animal/space/worm.dm | 2 +-
.../living/simple_mob/subtypes/blob/blob.dm | 4 +-
.../living/simple_mob/subtypes/blob/spore.dm | 4 +-
.../simple_mob/subtypes/humanoid/clown.dm | 4 +-
.../simple_mob/subtypes/humanoid/humanoid.dm | 4 +-
.../mechanical/drones/combat_drone.dm | 4 +-
.../mechanical/drones/mining_drone.dm | 4 +-
.../simple_mob/subtypes/mechanical/golem.dm | 4 +-
.../subtypes/mechanical/hivebot/hivebot.dm | 4 +-
.../mechanical/hivebot/ranged_damage.dm | 4 +-
.../subtypes/mechanical/hivebot/support.dm | 4 +-
.../subtypes/mechanical/hivebot/tank.dm | 4 +-
.../subtypes/mechanical/mecha/hoverpod.dm | 4 +-
.../subtypes/mechanical/mecha/mecha.dm | 4 +-
.../subtypes/mechanical/viscerator.dm | 4 +-
.../subtypes/mechanical/ward/ward.dm | 4 +-
.../subtypes/occult/constructs/artificer.dm | 22 +-
.../subtypes/occult/constructs/bishop.dm | 12 +-
.../subtypes/occult/constructs/cardinal.dm | 12 +-
.../subtypes/occult/constructs/deacon.dm | 10 +-
.../subtypes/occult/constructs/harvester.dm | 12 +-
.../subtypes/occult/constructs/juggernaut.dm | 16 +-
.../subtypes/occult/constructs/priest.dm | 8 +-
.../subtypes/occult/constructs/shade.dm | 4 +-
.../subtypes/occult/constructs/wraith.dm | 8 +-
.../simple_mob/subtypes/occult/creature.dm | 4 +-
.../simple_mob/subtypes/occult/faithless.dm | 4 +-
.../simple_mob/subtypes/plant/tomato.dm | 4 +-
.../living/simple_mob/subtypes/plant/tree.dm | 4 +-
.../living/simple_mob/subtypes/slime/slime.dm | 32 +-
.../subtypes/vore/corrupt_hounds.dm | 18 +-
.../subtypes/vore/shadekin/types.dm | 10 +-
code/modules/mob/mob_defines.dm | 2 +-
code/modules/organs/internal/brain.dm | 6 +-
code/modules/overmap/events/event_handler.dm | 26 +-
.../overmap/ships/engines/gas_thruster.dm | 4 +-
.../overmap/ships/engines/ion_thruster.dm | 2 +-
code/modules/power/cells/esoteric_cells.dm | 2 +-
code/modules/power/fusion/core/core_field.dm | 4 +-
code/modules/power/fusion/fusion_reactions.dm | 30 +-
.../projectiles/guns/energy/special.dm | 2 +-
code/modules/projectiles/projectile.dm | 2 +-
code/modules/projectiles/projectile/change.dm | 2 +-
.../modules/projectiles/projectile/special.dm | 2 +-
code/modules/reagents/Chemistry-Logging.dm | 2 +-
code/modules/reagents/holder/distilling.dm | 4 +-
code/modules/reagents/holder/holder.dm | 4 +-
code/modules/reagents/reactions/_reactions.dm | 14 +-
.../reactions/distilling/crystalizing.dm | 4 +-
.../reactions/distilling/distilling.dm | 48 +-
.../reactions/distilling/gas_condensing.dm | 14 +-
.../reactions/distilling/heavy_industrial.dm | 28 +-
.../reactions/distilling/hot_drinks.dm | 32 +-
.../reactions/distilling/hydroponics.dm | 8 +-
.../reagents/reactions/fusion/fusion.dm | 2 +-
.../reagents/reactions/instant/drinks.dm | 356 ++++-----
.../reagents/reactions/instant/drinks_vr.dm | 70 +-
.../reagents/reactions/instant/food.dm | 58 +-
.../reagents/reactions/instant/food_ch.dm | 6 +-
.../reagents/reactions/instant/food_vr.dm | 2 +-
.../reagents/reactions/instant/instant.dm | 454 ++++++------
.../reagents/reactions/instant/instant_ch.dm | 40 +-
.../reagents/reactions/instant/instant_vr.dm | 54 +-
.../reagents/reactions/instant/virology.dm | 68 +-
.../reagents/reagent_containers/spray.dm | 2 +-
code/modules/scripting/AST/AST Nodes.dm | 44 +-
code/modules/scripting/AST/Blocks.dm | 8 +-
.../AST/Operators/Binary Operators.dm | 40 +-
.../AST/Operators/Unary Operators.dm | 12 +-
code/modules/scripting/AST/Statements.dm | 56 +-
code/modules/scripting/Errors.dm | 76 +-
code/modules/scripting/IDE.dm | 8 +-
.../scripting/Implementations/Telecomms.dm | 14 +-
.../scripting/Interpreter/Evaluation.dm | 148 ++--
.../scripting/Interpreter/Interaction.dm | 32 +-
.../scripting/Interpreter/Interpreter.dm | 108 +--
code/modules/scripting/Interpreter/Scope.dm | 8 +-
code/modules/scripting/Options.dm | 66 +-
code/modules/scripting/Parser/Expressions.dm | 128 ++--
code/modules/scripting/Parser/Keywords.dm | 80 +-
code/modules/scripting/Parser/Parser.dm | 88 +--
code/modules/scripting/Scanner/Scanner.dm | 46 +-
code/modules/scripting/Scanner/Tokens.dm | 20 +-
code/modules/scripting/stack.dm | 14 +-
code/modules/spells/aoe_turf/aoe_turf.dm | 4 +-
code/modules/spells/aoe_turf/blink.dm | 4 +-
code/modules/spells/aoe_turf/charge.dm | 14 +-
.../spells/aoe_turf/conjure/conjure.dm | 6 +-
.../spells/aoe_turf/conjure/forcewall.dm | 4 +-
code/modules/spells/aoe_turf/disable_tech.dm | 4 +-
code/modules/spells/aoe_turf/knock.dm | 8 +-
code/modules/spells/aoe_turf/smoke.dm | 2 +-
code/modules/spells/aoe_turf/summons.dm | 6 +-
code/modules/spells/general/area_teleport.dm | 12 +-
code/modules/spells/general/rune_write.dm | 6 +-
code/modules/spells/no_clothes.dm | 2 +-
code/modules/spells/spell_code.dm | 40 +-
code/modules/spells/spell_projectile.dm | 2 +-
code/modules/spells/spellbook.dm | 56 +-
code/modules/spells/spells.dm | 4 +-
code/modules/spells/targeted/equip/equip.dm | 6 +-
.../spells/targeted/equip/horsemask.dm | 8 +-
.../modules/spells/targeted/ethereal_jaunt.dm | 10 +-
code/modules/spells/targeted/genetic.dm | 8 +-
code/modules/spells/targeted/mind_transfer.dm | 10 +-
.../spells/targeted/projectile/dumbfire.dm | 4 +-
.../spells/targeted/projectile/fireball.dm | 4 +-
.../targeted/projectile/magic_missile.dm | 4 +-
.../spells/targeted/projectile/projectile.dm | 8 +-
code/modules/spells/targeted/subjugate.dm | 2 +-
code/modules/spells/targeted/targeted.dm | 8 +-
code/modules/tgui/modules/crew_monitor.dm | 2 +-
code/modules/unit_tests/decl_tests.dm | 4 +-
code/modules/unit_tests/map_tests.dm | 10 +-
code/modules/unit_tests/poster_tests.dm | 6 +-
code/modules/unit_tests/reagent_tests.dm | 26 +-
code/modules/vore/smoleworld/smoleworld_vr.dm | 4 +-
code/modules/xenobio/items/extracts.dm | 148 ++--
code/modules/xenobio/items/extracts_vr.dm | 314 ++++----
code/modules/xgm/xgm_gas_data.dm | 6 +-
.../unit_tests/integrated_circuits/prefabs.dm | 8 +-
maps/offmap_vr/om_ships/aro2.dmm | 2 +-
maps/offmap_vr/talon/talon_v2.dm | 12 +-
.../pois_vr/debris_field/mining_drones.dmm | 2 +-
maps/tether/tether_jobs.dm | 32 +-
modular_chomp/code/ZAS/Fire.dm | 2 +-
.../code/datums/outfits/jobs/command.dm | 2 +-
.../code/datums/outfits/jobs/noncrew.dm | 10 +-
.../code/datums/outfits/jobs/security.dm | 2 +-
modular_chomp/code/game/jobs/job/captain.dm | 2 +-
.../code/game/jobs/job/entertainer_alts.dm | 4 +-
modular_chomp/code/game/jobs/job/noncrew.dm | 6 +-
.../objects/items/devices/radio/headset.dm | 4 +-
.../turfs/simulated/outdoors/desert_planet.dm | 34 +-
.../turfs/simulated/outdoors/lava_land.dm | 8 +-
.../game/turfs/simulated/outdoors/valley.dm | 12 +-
.../modules/emotes/definitions/audiable.dm | 32 +-
.../emotes/definitions/audible_pain.dm | 8 +-
.../modules/mob/living/simple_mob/catslug.dm | 2 +-
.../simple_mob/subtypes/slimess/xenobio.dm | 130 ++--
.../reactions/distilling/distilling.dm | 14 +-
.../reactions/distilling/hot_drinks.dm | 10 +-
.../reagents/reactions/instant/drinks.dm | 90 +--
.../reagents/reactions/instant/instant.dm | 38 +-
modular_chomp/code/modules/spells/spells.dm | 8 +-
modular_chomp/maps/common/common_outfits.dm | 12 +-
modular_chomp/maps/common/common_turfs.dm | 8 +-
.../maps/common_submaps/gateway/snowfield.dmm | 26 +-
.../overmap/planets/thor/thor.dm | 4 +-
.../structures/closets/engineering.dm | 2 +-
.../structures/closets/medical.dm | 2 +-
.../southern_cross/structures/closets/misc.dm | 2 +-
.../structures/closets/research.dm | 2 +-
.../structures/closets/security.dm | 2 +-
vorestation.dme | 1 -
437 files changed, 5869 insertions(+), 5220 deletions(-)
delete mode 100644 code/global_init.dm
diff --git a/archive/maps/cynosure/cynosure-1.dmm b/archive/maps/cynosure/cynosure-1.dmm
index 896bdca4e2..4b19d1d220 100644
--- a/archive/maps/cynosure/cynosure-1.dmm
+++ b/archive/maps/cynosure/cynosure-1.dmm
@@ -467,7 +467,7 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/hallway/bmt)
@@ -710,7 +710,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/engineering/hallway/bmt)
@@ -733,7 +733,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/medical/hallway/bmt)
@@ -1153,7 +1153,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -1190,7 +1190,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/maintenance/medical/west)
@@ -1439,7 +1439,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -1464,7 +1464,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/maintenance/medical/west)
@@ -1591,7 +1591,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -1603,7 +1603,7 @@
/obj/structure/ore_box,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -1796,7 +1796,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -1910,7 +1910,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/exp_prep)
@@ -2334,7 +2334,7 @@
/obj/item/tool/crowbar,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -2420,7 +2420,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/entrance)
@@ -2779,7 +2779,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -2978,7 +2978,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/engineering/reactor_room)
@@ -3060,7 +3060,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -3424,7 +3424,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -3530,7 +3530,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -3815,7 +3815,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology)
@@ -4022,7 +4022,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -4135,7 +4135,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -4167,7 +4167,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -4339,7 +4339,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -4565,7 +4565,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/medical/hallway/bmt)
@@ -4815,7 +4815,7 @@
/obj/effect/zone_divider,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -4937,7 +4937,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -5883,7 +5883,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -6116,7 +6116,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -6316,7 +6316,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main)
@@ -6444,7 +6444,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/medical/hallway/bmt)
@@ -6542,7 +6542,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -6909,7 +6909,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/entrance)
@@ -7265,7 +7265,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -7861,7 +7861,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main)
@@ -7931,7 +7931,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -7955,7 +7955,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -8861,7 +8861,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/engineering/hallway/bmt)
@@ -9247,7 +9247,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/medical/hallway/bmt)
@@ -9307,7 +9307,7 @@
/obj/effect/zone_divider,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -9318,7 +9318,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -9390,7 +9390,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -9646,7 +9646,7 @@
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/hallway/primary/bmt/south)
@@ -9973,7 +9973,7 @@
/obj/machinery/mining/brace,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -10243,7 +10243,7 @@
/obj/machinery/light/spot,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -10294,7 +10294,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -10344,7 +10344,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -10370,7 +10370,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -11397,7 +11397,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -11773,7 +11773,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -12038,7 +12038,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -12251,7 +12251,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -12294,7 +12294,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/hallway/primary/bmt/south)
@@ -12438,7 +12438,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/hallway/primary/bmt/south)
@@ -12640,7 +12640,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -12802,7 +12802,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/engineering/hallway/bmt)
@@ -13059,7 +13059,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -13326,7 +13326,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -13366,7 +13366,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -13406,7 +13406,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology)
@@ -13481,7 +13481,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -13564,7 +13564,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -13847,7 +13847,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -14269,7 +14269,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/engineering/reactor_room)
@@ -14486,7 +14486,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/engineering/reactor_room)
@@ -14603,7 +14603,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -14716,7 +14716,7 @@
/obj/effect/wingrille_spawn/reinforced,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -14792,7 +14792,7 @@
"HP" = (
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -15965,7 +15965,7 @@
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/longtermstorage)
@@ -16015,7 +16015,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -16475,7 +16475,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main)
@@ -16521,7 +16521,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -16563,7 +16563,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -16763,7 +16763,7 @@
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/longtermstorage)
@@ -16777,7 +16777,7 @@
/obj/effect/zone_divider,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -17187,7 +17187,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -17278,7 +17278,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -17611,7 +17611,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -17677,7 +17677,7 @@
"Os" = (
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/test_area)
@@ -17992,7 +17992,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/engineering/hallway/bmt)
@@ -18985,7 +18985,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/entrance)
@@ -19249,7 +19249,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -19873,7 +19873,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology/exp_prep)
@@ -20661,7 +20661,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology)
@@ -20948,7 +20948,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -21016,7 +21016,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
@@ -21301,7 +21301,7 @@
/obj/machinery/mining/drill,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -21522,7 +21522,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/hallway/primary/bmt/south)
@@ -22104,7 +22104,7 @@
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -22163,7 +22163,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/hallway/bmt)
@@ -22302,7 +22302,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/mining_main/exterior)
@@ -22464,7 +22464,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/outpost/research/xenoarcheology)
@@ -22481,7 +22481,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/station/rnd/hallway/bmt)
@@ -22764,7 +22764,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor;
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor;
outdoors = 0
},
/area/surface/cave/explored/normal)
diff --git a/archive/maps/cynosure/cynosure-2.dmm b/archive/maps/cynosure/cynosure-2.dmm
index faa8de3a55..5b174afacb 100644
--- a/archive/maps/cynosure/cynosure-2.dmm
+++ b/archive/maps/cynosure/cynosure-2.dmm
@@ -237,7 +237,7 @@
/obj/machinery/power/solar,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/station/solar/northeastsolar)
"ajl" = (
@@ -331,7 +331,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"amF" = (
@@ -413,7 +413,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/hallway/primary/groundfloor/south)
"apd" = (
@@ -773,7 +773,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"axV" = (
@@ -1579,7 +1579,7 @@
/obj/effect/floor_decal/industrial/warning/dust/corner,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"aQi" = (
@@ -2832,7 +2832,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"bsn" = (
@@ -2851,7 +2851,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/hallway/primary/groundfloor/south)
"bsq" = (
@@ -4216,7 +4216,7 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outpost/research/xenoarcheology/surface)
"cai" = (
@@ -4364,7 +4364,7 @@
/obj/effect/floor_decal/industrial/danger,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"cen" = (
@@ -4434,7 +4434,7 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/station/arrivals/cynosure)
"chf" = (
@@ -4622,7 +4622,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"cmZ" = (
@@ -4945,7 +4945,7 @@
"cxc" = (
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"cxl" = (
@@ -5172,7 +5172,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"cFz" = (
@@ -5360,7 +5360,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outpost/research/xenoarcheology/surface)
"cJA" = (
@@ -6342,7 +6342,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty;
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/outside/plains/station)
@@ -7072,7 +7072,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"dtt" = (
@@ -7146,7 +7146,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/station/arrivals/cynosure)
"dvT" = (
@@ -7542,7 +7542,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/hallway/primary/groundfloor/north)
"dGb" = (
@@ -7717,7 +7717,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty;
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/outside/plains/station)
@@ -7748,7 +7748,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/station/arrivals/cynosure)
"dML" = (
@@ -9791,7 +9791,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"eJC" = (
@@ -9937,7 +9937,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"eNq" = (
@@ -10210,7 +10210,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"eSr" = (
@@ -10690,7 +10690,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"fcm" = (
@@ -10870,7 +10870,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outpost/research/xenoarcheology/surface)
"fin" = (
@@ -10966,7 +10966,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"fja" = (
@@ -11082,7 +11082,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"flZ" = (
@@ -11308,7 +11308,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"fqU" = (
@@ -15506,7 +15506,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/station/arrivals/cynosure)
"hwa" = (
@@ -16733,7 +16733,7 @@
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty;
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/outside/plains/station)
@@ -16782,7 +16782,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"iex" = (
@@ -16971,7 +16971,7 @@
/obj/effect/floor_decal/industrial/danger,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"ils" = (
@@ -17405,7 +17405,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"iwy" = (
@@ -17447,7 +17447,7 @@
/obj/effect/floor_decal/industrial/warning/dust/corner,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/arrivals/cynosure)
"ixa" = (
@@ -17541,7 +17541,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"iBd" = (
@@ -17641,7 +17641,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"iFl" = (
@@ -17675,7 +17675,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"iFX" = (
@@ -18612,7 +18612,7 @@
/obj/machinery/power/solar,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/station/solar/westsolar)
"jfk" = (
@@ -18853,7 +18853,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outpost/research/xenoarcheology/surface)
"jlB" = (
@@ -18871,7 +18871,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"jlF" = (
@@ -19036,7 +19036,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/station/arrivals/cynosure)
"jrG" = (
@@ -19208,7 +19208,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"jvp" = (
@@ -19653,7 +19653,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/maintenance/east/gnd)
"jFP" = (
@@ -19766,7 +19766,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/garage)
"jJq" = (
@@ -19912,7 +19912,7 @@
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/hallway/primary/groundfloor/south)
"jNy" = (
@@ -20208,7 +20208,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"jRD" = (
@@ -20394,7 +20394,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/space)
"jUQ" = (
@@ -20481,7 +20481,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"jWt" = (
@@ -20953,7 +20953,7 @@
/obj/machinery/power/solar,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/station/solar/westsolar)
"kgK" = (
@@ -20996,7 +20996,7 @@
"kgZ" = (
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"khd" = (
@@ -21165,7 +21165,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"kko" = (
@@ -21289,7 +21289,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outpost/research/xenoarcheology/surface)
"knh" = (
@@ -22104,7 +22104,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"kHo" = (
@@ -22178,7 +22178,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/garage)
"kIW" = (
@@ -23826,7 +23826,7 @@
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"lAd" = (
@@ -24423,7 +24423,7 @@
/obj/structure/ladder,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"lPl" = (
@@ -24689,7 +24689,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"lVq" = (
@@ -27067,7 +27067,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"mUb" = (
@@ -29798,7 +29798,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"oki" = (
@@ -29890,7 +29890,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/maintenance/east/gnd)
"ons" = (
@@ -29948,7 +29948,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"ooa" = (
@@ -30348,7 +30348,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"oum" = (
@@ -30457,7 +30457,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/hallway/primary/groundfloor/north)
"owp" = (
@@ -30747,7 +30747,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/maintenance/east/gnd)
"oCZ" = (
@@ -31093,7 +31093,7 @@
/obj/effect/zone_divider,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"oNb" = (
@@ -32621,7 +32621,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"pqY" = (
@@ -32744,7 +32744,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"pts" = (
@@ -32891,7 +32891,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty;
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/outside/plains/station)
@@ -32956,7 +32956,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty;
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/outside/plains/station)
@@ -34576,7 +34576,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/maintenance/east/gnd)
"qnU" = (
@@ -35101,7 +35101,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"qxG" = (
@@ -35652,7 +35652,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/arrivals/cynosure)
"qIj" = (
@@ -35789,7 +35789,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"qLe" = (
@@ -35845,7 +35845,7 @@
/obj/effect/zone_divider,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"qOg" = (
@@ -36775,7 +36775,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"rlb" = (
@@ -36978,7 +36978,7 @@
/obj/effect/zone_divider,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/station/solar/westsolar)
"roq" = (
@@ -37624,7 +37624,7 @@
/obj/effect/floor_decal/industrial/danger/corner,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"rGF" = (
@@ -38343,7 +38343,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/garage)
"rYh" = (
@@ -38376,7 +38376,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty;
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/outside/plains/station)
@@ -38938,7 +38938,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outpost/research/xenoarcheology/surface)
"sqN" = (
@@ -39107,7 +39107,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/station/solar/westsolar)
"svE" = (
@@ -39735,7 +39735,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outside/plains/station)
"sJl" = (
@@ -39994,7 +39994,7 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/hallway/primary/groundfloor/north)
"sQa" = (
@@ -40749,7 +40749,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"tlJ" = (
@@ -40905,7 +40905,7 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/arrivals/cynosure)
"tof" = (
@@ -41745,7 +41745,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outpost/research/xenoarcheology/surface)
"tIM" = (
@@ -43181,7 +43181,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/garage)
"utE" = (
@@ -43297,7 +43297,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/arrivals/cynosure)
"uwn" = (
@@ -45443,7 +45443,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/hallway/primary/groundfloor/north)
"vwm" = (
@@ -45741,7 +45741,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"vDZ" = (
@@ -45852,7 +45852,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/outpost/research/xenoarcheology/surface)
"vGx" = (
@@ -46691,7 +46691,7 @@
/obj/effect/zone_divider,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/station/solar/northeastsolar)
"wdw" = (
@@ -46860,7 +46860,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"wiA" = (
@@ -48167,7 +48167,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "asteroidfloor";
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
},
/area/surface/station/hallway/primary/groundfloor/south)
"wQu" = (
@@ -48793,7 +48793,7 @@
/obj/machinery/power/solar,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/station/solar/northeastsolar)
"xej" = (
@@ -49794,7 +49794,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"xFu" = (
@@ -50368,7 +50368,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
},
/area/surface/outside/plains/station)
"xSt" = (
diff --git a/archive/maps/cynosure/cynosure-3.dmm b/archive/maps/cynosure/cynosure-3.dmm
index 218fe28e9c..f55c4a2f15 100644
--- a/archive/maps/cynosure/cynosure-3.dmm
+++ b/archive/maps/cynosure/cynosure-3.dmm
@@ -19877,7 +19877,7 @@
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty;
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/station/hallway/primary/secondfloor/east)
@@ -32723,7 +32723,7 @@
},
/turf/simulated/floor/tiled/steel/sif/planetuse{
icon_state = "steel_dirty";
- initial_flooring = /decl/flooring/tiling/steel_dirty;
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty;
outdoors = 0
},
/area/surface/station/hallway/primary/secondfloor/east)
diff --git a/archive/maps/cynosure/cynosure_jobs.dm b/archive/maps/cynosure/cynosure_jobs.dm
index c519a59258..e85c0a52cf 100644
--- a/archive/maps/cynosure/cynosure_jobs.dm
+++ b/archive/maps/cynosure/cynosure_jobs.dm
@@ -26,11 +26,11 @@
access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
minimal_access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
- outfit_type = /decl/hierarchy/outfit/job/explorer2
+ outfit_type = /datum/decl/hierarchy/outfit/job/explorer2
job_description = "An Explorer searches for interesting things on the surface of Sif, and returns them to the station."
alt_titles = list(
- JOB_PILOT = /decl/hierarchy/outfit/job/pilot)
+ JOB_PILOT = /datum/decl/hierarchy/outfit/job/pilot)
/datum/job/rd
access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
@@ -46,6 +46,6 @@
/*
alt_titles = list(
- JOB_ALT_EXPLORERE_TECHNICIAN = /decl/hierarchy/outfit/job/explorer2/technician,
- JOB_ALT_EXPLORER_MEDIC = /decl/hierarchy/outfit/job/explorer2/medic)
+ JOB_ALT_EXPLORERE_TECHNICIAN = /datum/decl/hierarchy/outfit/job/explorer2/technician,
+ JOB_ALT_EXPLORER_MEDIC = /datum/decl/hierarchy/outfit/job/explorer2/medic)
*/
diff --git a/archive/maps/cynosure/submaps/10x9/Shop.dmm b/archive/maps/cynosure/submaps/10x9/Shop.dmm
index 85c93f276d..7bf466df4d 100644
--- a/archive/maps/cynosure/submaps/10x9/Shop.dmm
+++ b/archive/maps/cynosure/submaps/10x9/Shop.dmm
@@ -236,7 +236,7 @@
/obj/random/maintenance/cargo,
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/vore_75
+ poster_decl = /datum/decl/poster/vore_75
},
/turf/simulated/floor/tiled/steel_dirty,
/area/template_noop)
@@ -347,7 +347,7 @@
/obj/structure/sign/poster/nanotrasen{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/pol_12
+ poster_decl = /datum/decl/poster/pol_12
},
/turf/simulated/floor/tiled,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/10x9/TreasureHoard.dmm b/archive/maps/cynosure/submaps/10x9/TreasureHoard.dmm
index 9fbc1fa24b..1e39590426 100644
--- a/archive/maps/cynosure/submaps/10x9/TreasureHoard.dmm
+++ b/archive/maps/cynosure/submaps/10x9/TreasureHoard.dmm
@@ -362,7 +362,7 @@
/obj/effect/floor_decal/corner/brown/border,
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/bay_35
+ poster_decl = /datum/decl/poster/bay_35
},
/turf/simulated/floor/tiled/steel_dirty,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/16x11/LaserTag.dmm b/archive/maps/cynosure/submaps/16x11/LaserTag.dmm
index 2f1b35a1aa..7335c65ba3 100644
--- a/archive/maps/cynosure/submaps/16x11/LaserTag.dmm
+++ b/archive/maps/cynosure/submaps/16x11/LaserTag.dmm
@@ -133,7 +133,7 @@
/obj/structure/sign/poster/nanotrasen{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/nanotrasen/bay_21
+ poster_decl = /datum/decl/poster/nanotrasen/bay_21
},
/turf/simulated/floor/tiled/steel_dirty,
/area/template_noop)
@@ -276,7 +276,7 @@
},
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/vore_29
+ poster_decl = /datum/decl/poster/vore_29
},
/turf/simulated/floor/tiled/steel_dirty,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/16x11/Nightclub.dmm b/archive/maps/cynosure/submaps/16x11/Nightclub.dmm
index a8ab144072..ce1ae6b69f 100644
--- a/archive/maps/cynosure/submaps/16x11/Nightclub.dmm
+++ b/archive/maps/cynosure/submaps/16x11/Nightclub.dmm
@@ -16,7 +16,7 @@
"bB" = (
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/pol_13
+ poster_decl = /datum/decl/poster/pol_13
},
/obj/structure/table,
/turf/simulated/floor/tiled/dark,
@@ -92,7 +92,7 @@
/obj/structure/sign/poster/custom{
dir = 4;
pixel_x = 32;
- poster_decl = /decl/poster/nanotrasen/bay_52
+ poster_decl = /datum/decl/poster/nanotrasen/bay_52
},
/turf/simulated/floor/tiled/dark,
/area/template_noop)
@@ -419,7 +419,7 @@
/obj/structure/sign/poster/nanotrasen{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/bay_44
+ poster_decl = /datum/decl/poster/bay_44
},
/obj/machinery/reagentgrinder,
/turf/simulated/floor/lino,
@@ -490,7 +490,7 @@
/obj/structure/table/glass,
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/bay_27
+ poster_decl = /datum/decl/poster/bay_27
},
/obj/random/drinkbottle,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
diff --git a/archive/maps/cynosure/submaps/16x11/OldDorms.dmm b/archive/maps/cynosure/submaps/16x11/OldDorms.dmm
index a2d6cdad49..c66b360ba0 100644
--- a/archive/maps/cynosure/submaps/16x11/OldDorms.dmm
+++ b/archive/maps/cynosure/submaps/16x11/OldDorms.dmm
@@ -131,7 +131,7 @@
/obj/structure/sign/poster{
dir = 4;
pixel_x = 32;
- poster_decl = /decl/poster/bay_29
+ poster_decl = /datum/decl/poster/bay_29
},
/obj/item/frame/apc,
/obj/item/frame/light,
diff --git a/archive/maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm b/archive/maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm
index 6995e32051..ead403011b 100644
--- a/archive/maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm
+++ b/archive/maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm
@@ -84,7 +84,7 @@
/obj/structure/sign/poster/custom{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/nanotrasen/bay_25
+ poster_decl = /datum/decl/poster/nanotrasen/bay_25
},
/turf/simulated/floor/carpet/tealcarpet,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm b/archive/maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm
index a437d8e5be..62ad9b14cf 100644
--- a/archive/maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm
+++ b/archive/maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm
@@ -138,7 +138,7 @@
/obj/structure/sign/poster/custom{
dir = 8;
pixel_x = -32;
- poster_decl = /decl/poster/bay_39
+ poster_decl = /datum/decl/poster/bay_39
},
/turf/simulated/floor/tiled/old_tile/white,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/5x7/SurgeryTrainingRoom.dmm b/archive/maps/cynosure/submaps/5x7/SurgeryTrainingRoom.dmm
index fb4f1919e2..334125b35e 100644
--- a/archive/maps/cynosure/submaps/5x7/SurgeryTrainingRoom.dmm
+++ b/archive/maps/cynosure/submaps/5x7/SurgeryTrainingRoom.dmm
@@ -87,7 +87,7 @@
},
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/pol_4
+ poster_decl = /datum/decl/poster/pol_4
},
/obj/structure/sink/generic{
dir = 8;
diff --git a/archive/maps/cynosure/submaps/7x7/FightClub.dmm b/archive/maps/cynosure/submaps/7x7/FightClub.dmm
index 9d07c73d50..1738f88ffa 100644
--- a/archive/maps/cynosure/submaps/7x7/FightClub.dmm
+++ b/archive/maps/cynosure/submaps/7x7/FightClub.dmm
@@ -1,32 +1,210 @@
-"a" = (/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_14},/turf/template_noop,/area/template_noop)
-"i" = (/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/obj/item/cell/high/empty,/turf/simulated/floor/plating,/area/template_noop)
-"m" = (/obj/structure/railing,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/template_noop)
-"o" = (/turf/simulated/wall{can_open = 1},/area/template_noop)
-"u" = (/obj/structure/railing{dir = 4},/turf/simulated/floor/plating,/area/template_noop)
-"y" = (/obj/structure/railing{dir = 1},/turf/simulated/floor/plating,/area/template_noop)
-"z" = (/obj/structure/railing{dir = 8},/obj/structure/railing,/turf/simulated/floor/plating,/area/template_noop)
-"C" = (/turf/simulated/wall/r_wall,/area/template_noop)
-"D" = (/obj/structure/railing{dir = 4},/obj/structure/railing,/turf/simulated/floor/plating,/area/template_noop)
-"F" = (/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_11},/turf/simulated/floor/plating,/area/template_noop)
-"G" = (/obj/random/trash,/turf/simulated/floor/plating,/area/template_noop)
-"I" = (/obj/random/crate,/obj/random/contraband,/obj/random/contraband,/obj/random/maintenance/engineering,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/template_noop)
-"J" = (/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_16},/turf/simulated/floor/plating,/area/template_noop)
-"L" = (/obj/random/crate,/obj/random/plushie,/obj/random/maintenance/clean,/obj/random/medical,/obj/random/medical/lite,/obj/random/medical/lite,/turf/simulated/floor/plating,/area/template_noop)
-"N" = (/turf/simulated/floor/plating,/area/template_noop)
-"O" = (/turf/simulated/wall,/area/template_noop)
-"P" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/template_noop)
-"Q" = (/obj/item/clothing/gloves/boxing/yellow,/obj/item/clothing/gloves/boxing/green,/obj/item/clothing/gloves/boxing/blue,/obj/item/clothing/gloves/boxing,/obj/structure/table/rack,/turf/simulated/floor/plating,/area/template_noop)
-"W" = (/obj/structure/railing{dir = 4},/obj/structure/railing{dir = 1},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/template_noop)
-"X" = (/obj/random/mouseremains,/turf/simulated/floor/plating,/area/template_noop)
-"Y" = (/obj/structure/railing{dir = 8},/obj/structure/railing{dir = 1},/turf/simulated/floor/plating,/area/template_noop)
-"Z" = (/obj/structure/railing{dir = 8},/turf/simulated/floor/plating,/area/template_noop)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/sign/poster/custom{
+ dir = 1;
+ pixel_y = 32;
+ poster_decl = /datum/decl/poster/pol_14
+ },
+/turf/template_noop,
+/area/template_noop)
+"i" = (
+/obj/machinery/power/apc{
+ coverlocked = 0;
+ locked = 0;
+ name = "south bump";
+ operating = 0;
+ pixel_y = -24
+ },
+/obj/item/cell/high/empty,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"m" = (
+/obj/structure/railing,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"o" = (
+/turf/simulated/wall{
+ can_open = 1
+ },
+/area/template_noop)
+"u" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/template_noop)
+"y" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/template_noop)
+"z" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"C" = (
+/turf/simulated/wall/r_wall,
+/area/template_noop)
+"D" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"F" = (
+/obj/structure/sign/poster{
+ dir = 1;
+ pixel_y = 32;
+ poster_decl = /datum/decl/poster/pol_11
+ },
+/turf/simulated/floor/plating,
+/area/template_noop)
+"G" = (
+/obj/random/trash,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"I" = (
+/obj/random/crate,
+/obj/random/contraband,
+/obj/random/contraband,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/security,
+/obj/random/maintenance/security,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"J" = (
+/obj/structure/sign/poster{
+ dir = 1;
+ pixel_y = 32;
+ poster_decl = /datum/decl/poster/pol_16
+ },
+/turf/simulated/floor/plating,
+/area/template_noop)
+"L" = (
+/obj/random/crate,
+/obj/random/plushie,
+/obj/random/maintenance/clean,
+/obj/random/medical,
+/obj/random/medical/lite,
+/obj/random/medical/lite,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"N" = (
+/turf/simulated/floor/plating,
+/area/template_noop)
+"O" = (
+/turf/simulated/wall,
+/area/template_noop)
+"P" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/template_noop)
+"Q" = (
+/obj/item/clothing/gloves/boxing/yellow,
+/obj/item/clothing/gloves/boxing/green,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"W" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"X" = (
+/obj/random/mouseremains,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"Y" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/template_noop)
+"Z" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/template_noop)
(1,1,1) = {"
-OCCCCCC
-OGJPFNO
-ONYyWNO
-oNZNuNX
-ONzmDNO
-OOLIQiO
-aOOOOOO
+O
+O
+O
+o
+O
+O
+a
+"}
+(2,1,1) = {"
+C
+G
+N
+N
+N
+O
+O
+"}
+(3,1,1) = {"
+C
+J
+Y
+Z
+z
+L
+O
+"}
+(4,1,1) = {"
+C
+P
+y
+N
+m
+I
+O
+"}
+(5,1,1) = {"
+C
+F
+W
+u
+D
+Q
+O
+"}
+(6,1,1) = {"
+C
+N
+N
+N
+N
+i
+O
+"}
+(7,1,1) = {"
+C
+O
+O
+X
+O
+O
+O
"}
diff --git a/archive/maps/cynosure/submaps/7x7/JanitorCloset.dmm b/archive/maps/cynosure/submaps/7x7/JanitorCloset.dmm
index 7583158433..ab0c706c74 100644
--- a/archive/maps/cynosure/submaps/7x7/JanitorCloset.dmm
+++ b/archive/maps/cynosure/submaps/7x7/JanitorCloset.dmm
@@ -3,7 +3,7 @@
/obj/structure/sign/poster/custom{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/nanotrasen/pol_6
+ poster_decl = /datum/decl/poster/nanotrasen/pol_6
},
/turf/template_noop,
/area/template_noop)
@@ -249,7 +249,7 @@
/obj/structure/sign/poster/nanotrasen{
dir = 8;
pixel_x = -32;
- poster_decl = /decl/poster/nanotrasen/pol_7
+ poster_decl = /datum/decl/poster/nanotrasen/pol_7
},
/obj/machinery/power/apc{
name = "south bump";
diff --git a/archive/maps/cynosure/submaps/7x7/PartyRoom.dmm b/archive/maps/cynosure/submaps/7x7/PartyRoom.dmm
index 6095cbd429..c75f237617 100644
--- a/archive/maps/cynosure/submaps/7x7/PartyRoom.dmm
+++ b/archive/maps/cynosure/submaps/7x7/PartyRoom.dmm
@@ -3,7 +3,7 @@
/obj/structure/sign/poster/custom{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/bay_2
+ poster_decl = /datum/decl/poster/bay_2
},
/turf/template_noop,
/area/template_noop)
@@ -43,7 +43,7 @@
/obj/structure/cable,
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/nanotrasen/nt_8
+ poster_decl = /datum/decl/poster/nanotrasen/nt_8
},
/turf/simulated/floor/carpet/purcarpet,
/area/template_noop)
@@ -130,7 +130,7 @@
/obj/structure/sign/poster/custom{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/nt_5
+ poster_decl = /datum/decl/poster/nt_5
},
/turf/simulated/floor/carpet/purcarpet,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/8x5/HiddenBar.dmm b/archive/maps/cynosure/submaps/8x5/HiddenBar.dmm
index 4aced624f0..405b1b7dcd 100644
--- a/archive/maps/cynosure/submaps/8x5/HiddenBar.dmm
+++ b/archive/maps/cynosure/submaps/8x5/HiddenBar.dmm
@@ -32,7 +32,7 @@
/obj/random/drinkbottle,
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/bay_37
+ poster_decl = /datum/decl/poster/bay_37
},
/turf/simulated/floor/wood,
/area/template_noop)
@@ -51,7 +51,7 @@
/obj/structure/sign/poster{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/bay_36
+ poster_decl = /datum/decl/poster/bay_36
},
/turf/simulated/floor/wood,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/8x5/SquattersDen.dmm b/archive/maps/cynosure/submaps/8x5/SquattersDen.dmm
index 6e0740d5c6..58423ec324 100644
--- a/archive/maps/cynosure/submaps/8x5/SquattersDen.dmm
+++ b/archive/maps/cynosure/submaps/8x5/SquattersDen.dmm
@@ -18,7 +18,7 @@
/obj/structure/sign/poster/custom{
dir = 8;
pixel_x = -32;
- poster_decl = /decl/poster/vore_69
+ poster_decl = /datum/decl/poster/vore_69
},
/turf/simulated/floor/plating,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/8x9/MeetingRoom.dmm b/archive/maps/cynosure/submaps/8x9/MeetingRoom.dmm
index 8010f1f254..d16ff6d486 100644
--- a/archive/maps/cynosure/submaps/8x9/MeetingRoom.dmm
+++ b/archive/maps/cynosure/submaps/8x9/MeetingRoom.dmm
@@ -27,7 +27,7 @@
/obj/machinery/light/flamp,
/obj/structure/sign/poster{
pixel_y = -32;
- poster_decl = /decl/poster/pol_9
+ poster_decl = /datum/decl/poster/pol_9
},
/turf/simulated/floor/wood,
/area/template_noop)
@@ -79,7 +79,7 @@
/obj/structure/sign/poster{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/nanotrasen/pol_10
+ poster_decl = /datum/decl/poster/nanotrasen/pol_10
},
/turf/simulated/floor/carpet,
/area/template_noop)
@@ -100,7 +100,7 @@
/obj/structure/sign/poster/custom{
dir = 8;
pixel_x = -32;
- poster_decl = /decl/poster/vore_43
+ poster_decl = /datum/decl/poster/vore_43
},
/turf/simulated/floor/wood/broken,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/8x9/MouseHouse.dmm b/archive/maps/cynosure/submaps/8x9/MouseHouse.dmm
index dff70ce473..1fe55e4101 100644
--- a/archive/maps/cynosure/submaps/8x9/MouseHouse.dmm
+++ b/archive/maps/cynosure/submaps/8x9/MouseHouse.dmm
@@ -1,45 +1,292 @@
-"a" = (/turf/simulated/wall,/area/template_noop)
-"b" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"c" = (/turf/simulated/wall{can_open = 1},/area/template_noop)
-"e" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/random/plushie,/turf/simulated/floor/wood,/area/template_noop)
-"f" = (/obj/structure/dogbed,/obj/effect/decal/remains/mouse,/obj/item/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"k" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/powercell,/turf/simulated/floor/wood,/area/template_noop)
-"l" = (/obj/random/plushielarge,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"m" = (/turf/template_noop,/area/template_noop)
-"n" = (/obj/structure/dogbed,/obj/machinery/light/small{dir = 1},/obj/item/reagent_containers/glass/rag,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"o" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance,/obj/random/drinksoft,/obj/random/snack,/turf/simulated/floor/wood,/area/template_noop)
-"p" = (/obj/machinery/door/window/westright,/turf/simulated/floor/wood,/area/template_noop)
-"t" = (/obj/item/trash/cookiesnack,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"u" = (/obj/structure/flora/pottedplant/overgrown,/turf/simulated/floor/wood,/area/template_noop)
-"v" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"w" = (/obj/machinery/door/window/northleft,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/wood/broken,/area/template_noop)
-"y" = (/turf/simulated/floor/wood/broken,/area/template_noop)
-"z" = (/obj/machinery/papershredder,/turf/simulated/floor/wood,/area/template_noop)
-"B" = (/obj/structure/dogbed,/obj/random/plushie,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"F" = (/obj/item/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/obj/structure/sink/generic{dir = 4; pixel_x = -12; pixel_y = -4},/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"G" = (/obj/item/trash/semki,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"H" = (/obj/structure/sign/poster{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_49},/turf/simulated/floor/wood,/area/template_noop)
-"J" = (/obj/item/beach_ball,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"K" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood,/area/template_noop)
-"L" = (/obj/item/trash/candy,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"M" = (/obj/structure/window/basic{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/template_noop)
-"O" = (/obj/machinery/light/small,/turf/simulated/floor/wood,/area/template_noop)
-"R" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/vore_91},/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"S" = (/obj/item/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/flashlight/lamp/green,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop)
-"V" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"W" = (/obj/structure/loot_pile/maint/trash,/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/template_noop)
-"X" = (/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
-"Z" = (/turf/simulated/floor/wood,/area/template_noop)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/wall,
+/area/template_noop)
+"b" = (
+/obj/effect/decal/remains/mouse,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"c" = (
+/turf/simulated/wall{
+ can_open = 1
+ },
+/area/template_noop)
+"e" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/structure/table/standard,
+/obj/structure/bedsheetbin,
+/obj/random/plushie,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"f" = (
+/obj/structure/dogbed,
+/obj/effect/decal/remains/mouse,
+/obj/item/shreddedp,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"k" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/structure/table/standard,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/obj/random/powercell,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"l" = (
+/obj/random/plushielarge,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"m" = (
+/turf/template_noop,
+/area/template_noop)
+"n" = (
+/obj/structure/dogbed,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/item/reagent_containers/glass/rag,
+/mob/living/simple_mob/animal/passive/mouse,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"o" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/structure/table/standard,
+/obj/random/maintenance,
+/obj/random/drinksoft,
+/obj/random/snack,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"p" = (
+/obj/machinery/door/window/westright,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"t" = (
+/obj/item/trash/cookiesnack,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"u" = (
+/obj/structure/flora/pottedplant/overgrown,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"v" = (
+/obj/structure/disposalpipe/trunk,
+/obj/structure/disposaloutlet{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"w" = (
+/obj/machinery/door/window/northleft,
+/obj/structure/window/basic{
+ dir = 8
+ },
+/turf/simulated/floor/wood/broken,
+/area/template_noop)
+"y" = (
+/turf/simulated/floor/wood/broken,
+/area/template_noop)
+"z" = (
+/obj/machinery/papershredder,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"B" = (
+/obj/structure/dogbed,
+/obj/random/plushie,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"F" = (
+/obj/item/reagent_containers/food/snacks/wishsoup{
+ pixel_y = -6
+ },
+/obj/structure/sink/generic{
+ dir = 4;
+ pixel_x = -12;
+ pixel_y = -4
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"G" = (
+/obj/item/trash/semki,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"H" = (
+/obj/structure/sign/poster{
+ dir = 8;
+ pixel_x = -32;
+ poster_decl = /datum/decl/poster/bay_49
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"J" = (
+/obj/item/beach_ball,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"K" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"L" = (
+/obj/item/trash/candy,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"M" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"O" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"R" = (
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/passive/mouse,
+/obj/structure/sign/poster{
+ dir = 1;
+ pixel_y = 32;
+ poster_decl = /datum/decl/poster/vore_91
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"S" = (
+/obj/item/shreddedp,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"T" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/structure/table/standard,
+/obj/item/flashlight/lamp/green,
+/obj/item/paper_bin{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"V" = (
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/passive/mouse,
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"W" = (
+/obj/structure/loot_pile/maint/trash,
+/obj/machinery/power/apc{
+ coverlocked = 0;
+ locked = 0;
+ name = "south bump";
+ operating = 0;
+ pixel_y = -24
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"X" = (
+/turf/simulated/floor/carpet/bcarpet,
+/area/template_noop)
+"Z" = (
+/turf/simulated/floor/wood,
+/area/template_noop)
(1,1,1) = {"
-aaaaaaaa
-aVBnRfVa
-aGXXXXXa
-aFSXXlXa
-avbLJSta
-aMTkoewa
-aHKyKZpa
-azWZOuaa
-aaacaaam
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+V
+G
+F
+v
+M
+H
+z
+a
+"}
+(3,1,1) = {"
+a
+B
+X
+S
+b
+T
+K
+W
+a
+"}
+(4,1,1) = {"
+a
+n
+X
+X
+L
+k
+y
+Z
+c
+"}
+(5,1,1) = {"
+a
+R
+X
+X
+J
+o
+K
+O
+a
+"}
+(6,1,1) = {"
+a
+f
+X
+l
+S
+e
+Z
+u
+a
+"}
+(7,1,1) = {"
+a
+V
+X
+X
+t
+w
+p
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+m
"}
diff --git a/archive/maps/cynosure/submaps/8x9/ReptileRoom.dmm b/archive/maps/cynosure/submaps/8x9/ReptileRoom.dmm
index e699815432..34fea4a60e 100644
--- a/archive/maps/cynosure/submaps/8x9/ReptileRoom.dmm
+++ b/archive/maps/cynosure/submaps/8x9/ReptileRoom.dmm
@@ -1,42 +1,286 @@
-"a" = (/turf/simulated/wall,/area/template_noop)
-"c" = (/turf/simulated/wall{can_open = 1},/area/template_noop)
-"h" = (/obj/effect/decal/remains/lizard,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"k" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/powercell,/turf/simulated/floor/wood,/area/template_noop)
-"m" = (/turf/template_noop,/area/template_noop)
-"n" = (/obj/structure/dogbed,/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/vore_45},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"o" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance,/obj/random/drinksoft,/obj/random/snack,/turf/simulated/floor/wood,/area/template_noop)
-"p" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"u" = (/obj/structure/flora/pottedplant/overgrown,/turf/simulated/floor/wood,/area/template_noop)
-"v" = (/obj/machinery/door/window/westright,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/template_noop)
-"w" = (/obj/structure/sign/poster{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_19},/turf/simulated/floor/wood/broken,/area/template_noop)
-"x" = (/obj/machinery/light/small{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"z" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/wood,/area/template_noop)
-"B" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard,/obj/item/trash/unajerky,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"E" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/random/plushie,/turf/simulated/floor/wood,/area/template_noop)
-"G" = (/obj/machinery/light/small{dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"I" = (/obj/item/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/obj/structure/sink/generic{dir = 4; pixel_x = -12; pixel_y = -4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"L" = (/obj/item/trash/sosjerky,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"M" = (/obj/structure/window/basic{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/template_noop)
-"N" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood,/area/template_noop)
-"O" = (/obj/machinery/light/small,/obj/item/stack/emptysandbag,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/template_noop)
-"P" = (/obj/machinery/door/window/northleft,/obj/structure/window/basic{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/template_noop)
-"R" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/flashlight/lamp/green,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop)
-"U" = (/obj/item/toy/plushie/lizard,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"V" = (/obj/machinery/space_heater,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"W" = (/obj/item/stack/sandbags,/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/template_noop)
-"X" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"Y" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard,/obj/machinery/light/small{dir = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"Z" = (/turf/simulated/floor/wood,/area/template_noop)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/wall,
+/area/template_noop)
+"c" = (
+/turf/simulated/wall{
+ can_open = 1
+ },
+/area/template_noop)
+"h" = (
+/obj/effect/decal/remains/lizard,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"k" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/structure/table/standard,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/obj/random/powercell,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"m" = (
+/turf/template_noop,
+/area/template_noop)
+"n" = (
+/obj/structure/dogbed,
+/obj/structure/sign/poster{
+ dir = 1;
+ pixel_y = 32;
+ poster_decl = /datum/decl/poster/vore_45
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"o" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/structure/table/standard,
+/obj/random/maintenance,
+/obj/random/drinksoft,
+/obj/random/snack,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"p" = (
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/passive/lizard/large,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"u" = (
+/obj/structure/flora/pottedplant/overgrown,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"v" = (
+/obj/machinery/door/window/westright,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"w" = (
+/obj/structure/sign/poster{
+ dir = 8;
+ pixel_x = -32;
+ poster_decl = /datum/decl/poster/bay_19
+ },
+/turf/simulated/floor/wood/broken,
+/area/template_noop)
+"x" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"z" = (
+/obj/structure/loot_pile/maint/trash,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"B" = (
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/passive/lizard,
+/obj/item/trash/unajerky,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"E" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/structure/table/standard,
+/obj/structure/bedsheetbin,
+/obj/random/plushie,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"G" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"I" = (
+/obj/item/reagent_containers/food/snacks/wishsoup{
+ pixel_y = -6
+ },
+/obj/structure/sink/generic{
+ dir = 4;
+ pixel_x = -12;
+ pixel_y = -4
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"L" = (
+/obj/item/trash/sosjerky,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"M" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"N" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"O" = (
+/obj/machinery/light/small,
+/obj/item/stack/emptysandbag,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/wood/broken,
+/area/template_noop)
+"P" = (
+/obj/machinery/door/window/northleft,
+/obj/structure/window/basic{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/wood,
+/area/template_noop)
+"R" = (
+/obj/structure/disposalpipe/trunk,
+/obj/structure/disposaloutlet{
+ dir = 4
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"T" = (
+/obj/structure/window/basic{
+ dir = 1
+ },
+/obj/structure/table/standard,
+/obj/item/flashlight/lamp/green,
+/obj/item/paper_bin{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"U" = (
+/obj/item/toy/plushie/lizard,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"V" = (
+/obj/machinery/space_heater,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"W" = (
+/obj/item/stack/sandbags,
+/obj/machinery/power/apc{
+ coverlocked = 0;
+ locked = 0;
+ name = "south bump";
+ operating = 0;
+ pixel_y = -24
+ },
+/turf/simulated/floor/wood,
+/area/template_noop)
+"X" = (
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"Y" = (
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/passive/lizard,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/template_noop)
+"Z" = (
+/turf/simulated/floor/wood,
+/area/template_noop)
(1,1,1) = {"
-aaaaaaaa
-aVBnYpVa
-aGXXXLXa
-aIXUXXxa
-aRXXXhXa
-aMTkoEPa
-awNZNZva
-azWZOuaa
-aaacaaam
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+V
+G
+I
+R
+M
+w
+z
+a
+"}
+(3,1,1) = {"
+a
+B
+X
+X
+X
+T
+N
+W
+a
+"}
+(4,1,1) = {"
+a
+n
+X
+U
+X
+k
+Z
+Z
+c
+"}
+(5,1,1) = {"
+a
+Y
+X
+X
+X
+o
+N
+O
+a
+"}
+(6,1,1) = {"
+a
+p
+L
+X
+h
+E
+Z
+u
+a
+"}
+(7,1,1) = {"
+a
+V
+X
+x
+X
+P
+v
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+m
"}
diff --git a/archive/maps/cynosure/submaps/8x9/RitualRoom.dmm b/archive/maps/cynosure/submaps/8x9/RitualRoom.dmm
index d88445a93d..b354722a3d 100644
--- a/archive/maps/cynosure/submaps/8x9/RitualRoom.dmm
+++ b/archive/maps/cynosure/submaps/8x9/RitualRoom.dmm
@@ -34,7 +34,7 @@
/obj/structure/sign/poster/custom{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/vore_100
+ poster_decl = /datum/decl/poster/vore_100
},
/turf/simulated/floor/tiled/dark,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/9x10/ShootingRange.dmm b/archive/maps/cynosure/submaps/9x10/ShootingRange.dmm
index 746398ec74..be8ff4040c 100644
--- a/archive/maps/cynosure/submaps/9x10/ShootingRange.dmm
+++ b/archive/maps/cynosure/submaps/9x10/ShootingRange.dmm
@@ -103,7 +103,7 @@
},
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/vore_37
+ poster_decl = /datum/decl/poster/vore_37
},
/turf/simulated/floor/tiled/techmaint,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/9x10/Theater.dmm b/archive/maps/cynosure/submaps/9x10/Theater.dmm
index 76caff29c3..a3dcffd9e2 100644
--- a/archive/maps/cynosure/submaps/9x10/Theater.dmm
+++ b/archive/maps/cynosure/submaps/9x10/Theater.dmm
@@ -18,7 +18,7 @@
},
/obj/structure/sign/poster{
pixel_y = -32;
- poster_decl = /decl/poster/bay_28
+ poster_decl = /datum/decl/poster/bay_28
},
/turf/simulated/floor/plating,
/area/template_noop)
@@ -86,7 +86,7 @@
/obj/item/stack/tile/carpet,
/obj/structure/sign/poster{
pixel_y = -32;
- poster_decl = /decl/poster/vore_96
+ poster_decl = /datum/decl/poster/vore_96
},
/turf/simulated/floor/wood,
/area/template_noop)
@@ -105,7 +105,7 @@
/obj/item/frame/apc,
/obj/structure/sign/poster{
pixel_y = -32;
- poster_decl = /decl/poster/bay_6
+ poster_decl = /datum/decl/poster/bay_6
},
/turf/simulated/floor/plating,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/9x8/GamesRoom.dmm b/archive/maps/cynosure/submaps/9x8/GamesRoom.dmm
index 1e6c74f1ef..98d8b68890 100644
--- a/archive/maps/cynosure/submaps/9x8/GamesRoom.dmm
+++ b/archive/maps/cynosure/submaps/9x8/GamesRoom.dmm
@@ -85,7 +85,7 @@
/obj/structure/sign/poster/custom{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/pol_15
+ poster_decl = /datum/decl/poster/pol_15
},
/turf/simulated/floor/wood,
/area/template_noop)
@@ -113,7 +113,7 @@
"A" = (
/obj/structure/sign/poster{
pixel_y = -32;
- poster_decl = /decl/poster/bay_13
+ poster_decl = /datum/decl/poster/bay_13
},
/turf/simulated/floor/plating,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/9x8/HotTub.dmm b/archive/maps/cynosure/submaps/9x8/HotTub.dmm
index f0258663a8..b221ff5354 100644
--- a/archive/maps/cynosure/submaps/9x8/HotTub.dmm
+++ b/archive/maps/cynosure/submaps/9x8/HotTub.dmm
@@ -96,7 +96,7 @@
/obj/structure/sign/poster/custom{
dir = 1;
pixel_y = 32;
- poster_decl = /decl/poster/bay_11
+ poster_decl = /datum/decl/poster/bay_11
},
/turf/simulated/floor/tiled/techfloor,
/area/template_noop)
diff --git a/archive/maps/cynosure/submaps/9x8/ServerRoom.dmm b/archive/maps/cynosure/submaps/9x8/ServerRoom.dmm
index 904161b416..c83fb19bbf 100644
--- a/archive/maps/cynosure/submaps/9x8/ServerRoom.dmm
+++ b/archive/maps/cynosure/submaps/9x8/ServerRoom.dmm
@@ -137,7 +137,7 @@
/obj/random/maintenance,
/obj/structure/sign/poster/custom{
pixel_y = -32;
- poster_decl = /decl/poster/bay_38
+ poster_decl = /datum/decl/poster/bay_38
},
/obj/structure/table/steel,
/turf/simulated/floor/tiled/techfloor/grid,
@@ -164,7 +164,7 @@
/obj/structure/sign/poster{
dir = 8;
pixel_x = -32;
- poster_decl = /decl/poster/bay_3
+ poster_decl = /datum/decl/poster/bay_3
},
/obj/item/radio/intercom{
dir = 1;
diff --git a/archive/maps/northern_star/job/outfits.dm b/archive/maps/northern_star/job/outfits.dm
index 0aed969893..00a60f4f45 100644
--- a/archive/maps/northern_star/job/outfits.dm
+++ b/archive/maps/northern_star/job/outfits.dm
@@ -1,6 +1,6 @@
//Job Outfits
-/decl/hierarchy/outfit/job/assistant/resident
+/datum/decl/hierarchy/outfit/job/assistant/resident
name = OUTFIT_JOB_NAME(JOB_ALT_RESIDENT)
id_pda_assignment = JOB_ALT_RESIDENT
uniform = /obj/item/clothing/under/color/white
diff --git a/archive/maps/northern_star/northern_star_jobs.dm b/archive/maps/northern_star/northern_star_jobs.dm
index e3852a90b6..245adfea10 100644
--- a/archive/maps/northern_star/northern_star_jobs.dm
+++ b/archive/maps/northern_star/northern_star_jobs.dm
@@ -4,6 +4,6 @@
JOB_ALT_TECHNICAL_ASSISTANT,
JOB_ALT_MEDICAL_INTERN,
JOB_ALT_RESEARCH_ASSISTANT,
- JOB_ALT_VISITOR = /decl/hierarchy/outfit/job/assistant/visitor,
- JOB_ALT_RESIDENT = /decl/hierarchy/outfit/job/assistant/resident
+ JOB_ALT_VISITOR = /datum/decl/hierarchy/outfit/job/assistant/visitor,
+ JOB_ALT_RESIDENT = /datum/decl/hierarchy/outfit/job/assistant/resident
)
diff --git a/archive/maps/northern_star/polaris-2.dmm b/archive/maps/northern_star/polaris-2.dmm
index aab08b7982..ec7b8127a6 100644
--- a/archive/maps/northern_star/polaris-2.dmm
+++ b/archive/maps/northern_star/polaris-2.dmm
@@ -8859,7 +8859,7 @@
/area/centcom/command)
"tn" = (
/obj/structure/sign/poster{
- poster_type = "/decl/poster/bay_50";
+ poster_type = "/datum/decl/poster/bay_50";
pixel_x = -32
},
/turf/simulated/shuttle/floor/darkred,
diff --git a/archive/maps/old_yw/yw/job/outfits.dm b/archive/maps/old_yw/yw/job/outfits.dm
index a1438285bf..d10f373688 100644
--- a/archive/maps/old_yw/yw/job/outfits.dm
+++ b/archive/maps/old_yw/yw/job/outfits.dm
@@ -4,7 +4,7 @@
SOUTHERN CROSS OUTFITS
Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead goes in lockers. Keep this in mind if editing.
*/
-/decl/hierarchy/outfit/job/explorer2
+/datum/decl/hierarchy/outfit/job/explorer2
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
@@ -20,24 +20,24 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/explorer
headset_earbud = /obj/item/radio/headset/explorer
-/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
permit.set_name(H.real_name)
-/decl/hierarchy/outfit/job/explorer2/technician
+/datum/decl/hierarchy/outfit/job/explorer2/technician
name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORERE_TECHNICIAN)
belt = /obj/item/storage/belt/utility/full
pda_slot = slot_l_store
id_pda_assignment = JOB_ALT_EXPLORERE_TECHNICIAN
-/decl/hierarchy/outfit/job/explorer2/medic
+/datum/decl/hierarchy/outfit/job/explorer2/medic
name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORER_MEDIC)
l_hand = /obj/item/storage/firstaid/regular
pda_slot = slot_l_store
id_pda_assignment = JOB_ALT_EXPLORER_MEDIC
-/decl/hierarchy/outfit/job/pilot
+/datum/decl/hierarchy/outfit/job/pilot
name = OUTFIT_JOB_NAME(JOB_PILOT)
shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/rank/pilot1
@@ -54,7 +54,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot
-/decl/hierarchy/outfit/job/medical/sar
+/datum/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME(JOB_FIELD_MEDIC) //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
@@ -70,7 +70,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/sar
headset_earbud = /obj/item/radio/headset/sar
-/decl/hierarchy/outfit/job/explorer2
+/datum/decl/hierarchy/outfit/job/explorer2
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
@@ -86,24 +86,24 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
-/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
permit.set_name(H.real_name)
-/decl/hierarchy/outfit/job/explorer2/technician
+/datum/decl/hierarchy/outfit/job/explorer2/technician
name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORERE_TECHNICIAN)
belt = /obj/item/storage/belt/utility/full
pda_slot = slot_l_store
id_pda_assignment = JOB_ALT_EXPLORERE_TECHNICIAN
-/decl/hierarchy/outfit/job/explorer2/medic
+/datum/decl/hierarchy/outfit/job/explorer2/medic
name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORER_MEDIC)
l_hand = /obj/item/storage/firstaid/regular
pda_slot = slot_l_store
id_pda_assignment = JOB_ALT_EXPLORER_MEDIC
-/decl/hierarchy/outfit/job/pilot
+/datum/decl/hierarchy/outfit/job/pilot
name = OUTFIT_JOB_NAME(JOB_PILOT)
shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/rank/pilot1
@@ -121,7 +121,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot
-/decl/hierarchy/outfit/job/medical/sar
+/datum/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME(JOB_FIELD_MEDIC) //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
@@ -139,7 +139,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_earbud = /obj/item/radio/headset/sar
-/decl/hierarchy/outfit/job/pathfinder
+/datum/decl/hierarchy/outfit/job/pathfinder
name = OUTFIT_JOB_NAME(JOB_PATHFINDER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
@@ -155,11 +155,11 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/explorer
headset_earbud = /obj/item/radio/headset/explorer
-/decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
permit.set_name(H.real_name)
-/decl/hierarchy/outfit/job/assistant/explorer
+/datum/decl/hierarchy/outfit/job/assistant/explorer
id_type = /obj/item/card/id/explorer
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
diff --git a/archive/maps/old_yw/yw/job/outfits_yw.dm b/archive/maps/old_yw/yw/job/outfits_yw.dm
index 317fead449..6e53909796 100644
--- a/archive/maps/old_yw/yw/job/outfits_yw.dm
+++ b/archive/maps/old_yw/yw/job/outfits_yw.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/job/pathfinder
+/datum/decl/hierarchy/outfit/job/pathfinder
name = OUTFIT_JOB_NAME("Pathfinder")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
@@ -14,11 +14,11 @@
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
-/decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
permit.set_name(H.real_name)
-/decl/hierarchy/outfit/job/assistant/explorer
+/datum/decl/hierarchy/outfit/job/assistant/explorer
id_type = /obj/item/card/id/explorer
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
diff --git a/archive/maps/southern_cross/job/outfits.dm b/archive/maps/southern_cross/job/outfits.dm
index e9903f57d9..d0e73f3493 100644
--- a/archive/maps/southern_cross/job/outfits.dm
+++ b/archive/maps/southern_cross/job/outfits.dm
@@ -6,7 +6,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
*/
-/decl/hierarchy/outfit/job/explorer2
+/datum/decl/hierarchy/outfit/job/explorer2
name = OUTFIT_JOB_NAME("Explorer")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
@@ -22,24 +22,24 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/explorer
headset_earbud = /obj/item/radio/headset/explorer
-/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
permit.set_name(H.real_name)
-/decl/hierarchy/outfit/job/explorer2/technician
+/datum/decl/hierarchy/outfit/job/explorer2/technician
name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORERE_TECHNICIAN)
belt = /obj/item/storage/belt/utility/full
pda_slot = slot_l_store
id_pda_assignment = JOB_ALT_EXPLORERE_TECHNICIAN
-/decl/hierarchy/outfit/job/explorer2/medic
+/datum/decl/hierarchy/outfit/job/explorer2/medic
name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORER_MEDIC)
l_hand = /obj/item/storage/firstaid/regular
pda_slot = slot_l_store
id_pda_assignment = JOB_ALT_EXPLORER_MEDIC
-/decl/hierarchy/outfit/job/pilot
+/datum/decl/hierarchy/outfit/job/pilot
name = OUTFIT_JOB_NAME(JOB_PILOT)
shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/rank/pilot1/no_webbing
@@ -58,7 +58,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/pilot
-/decl/hierarchy/outfit/job/medical/sar
+/datum/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
diff --git a/archive/maps/southern_cross/southern_cross_jobs.dm b/archive/maps/southern_cross/southern_cross_jobs.dm
index c72aa06f4d..6f5455a4c8 100644
--- a/archive/maps/southern_cross/southern_cross_jobs.dm
+++ b/archive/maps/southern_cross/southern_cross_jobs.dm
@@ -36,7 +36,7 @@
minimum_character_age = 25
ideal_character_age = 50 // Because 70 is a tad on the old side
- outfit_type = /decl/hierarchy/outfit/job/captain
+ outfit_type = /datum/decl/hierarchy/outfit/job/captain
alt_titles = list("Site Manager", "Overseer")
/datum/job/captain/get_access()
@@ -62,7 +62,7 @@
access = list(ACCESS_PILOT, ACCESS_CARGO, ACCESS_MINING, ACCESS_MINING_STATION)
minimal_access = list(ACCESS_PILOT, ACCESS_CARGO, ACCESS_MINING, ACCESS_MINING_STATION)
- outfit_type = /decl/hierarchy/outfit/job/pilot
+ outfit_type = /datum/decl/hierarchy/outfit/job/pilot
job_description = "A Pilot flies one of the shuttles between the Southern Cross and the outpost on Sif."
/datum/job/explorer
@@ -80,13 +80,13 @@
minimal_access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
banned_job_species = list(SPECIES_ZADDAT)
- outfit_type = /decl/hierarchy/outfit/job/explorer2
+ outfit_type = /datum/decl/hierarchy/outfit/job/explorer2
job_description = "An Explorer searches for interesting things on the surface of Sif, and returns them to the station."
/*
alt_titles = list(
- JOB_ALT_EXPLORERE_TECHNICIAN = /decl/hierarchy/outfit/job/explorer2/technician,
- JOB_ALT_EXPLORER_MEDIC = /decl/hierarchy/outfit/job/explorer2/medic)
+ JOB_ALT_EXPLORERE_TECHNICIAN = /datum/decl/hierarchy/outfit/job/explorer2/technician,
+ JOB_ALT_EXPLORER_MEDIC = /datum/decl/hierarchy/outfit/job/explorer2/medic)
*/
/datum/job/sar
@@ -104,5 +104,5 @@
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_EXPLORER)
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
- outfit_type = /decl/hierarchy/outfit/job/medical/sar
+ outfit_type = /datum/decl/hierarchy/outfit/job/medical/sar
job_description = "A Search and Rescue operative recovers individuals who are injured or dead on the surface of Sif."
diff --git a/archive/maps/southern_cross/structures/closets/engineering.dm b/archive/maps/southern_cross/structures/closets/engineering.dm
index 766e1ad5c2..78504dcac4 100644
--- a/archive/maps/southern_cross/structures/closets/engineering.dm
+++ b/archive/maps/southern_cross/structures/closets/engineering.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/engineering_chief_wardrobe
name = "chief engineer's wardrobe"
req_access = list(ACCESS_CE)
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
/obj/item/clothing/under/rank/chief_engineer,
diff --git a/archive/maps/southern_cross/structures/closets/medical.dm b/archive/maps/southern_cross/structures/closets/medical.dm
index 284fdafdeb..65085c223d 100644
--- a/archive/maps/southern_cross/structures/closets/medical.dm
+++ b/archive/maps/southern_cross/structures/closets/medical.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/CMO_wardrobe
name = "chief medical officer's locker"
req_access = list(ACCESS_CMO)
- closet_appearance = /decl/closet_appearance/secure_closet/cmo
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/cmo
starts_with = list(
/obj/item/clothing/under/rank/chief_medical_officer,
diff --git a/archive/maps/southern_cross/structures/closets/misc.dm b/archive/maps/southern_cross/structures/closets/misc.dm
index 9ee443a73e..80ff861303 100644
--- a/archive/maps/southern_cross/structures/closets/misc.dm
+++ b/archive/maps/southern_cross/structures/closets/misc.dm
@@ -77,7 +77,7 @@
name = "search and rescue locker"
desc = "Supplies for a wilderness first responder."
req_access = list(ACCESS_MEDICAL_EQUIP)
- closet_appearance = /decl/closet_appearance/secure_closet/medical
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/medical
starts_with = list(
/obj/item/storage/backpack/dufflebag/emt,
diff --git a/archive/maps/southern_cross/structures/closets/research.dm b/archive/maps/southern_cross/structures/closets/research.dm
index 9e53887578..2f5df6c4c8 100644
--- a/archive/maps/southern_cross/structures/closets/research.dm
+++ b/archive/maps/southern_cross/structures/closets/research.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/RD_wardrobe
name = "research director's locker"
req_access = list(ACCESS_RD)
- closet_appearance = /decl/closet_appearance/secure_closet/science/rd
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/science/rd
starts_with = list(
/obj/item/clothing/under/rank/research_director,
diff --git a/archive/maps/southern_cross/structures/closets/security.dm b/archive/maps/southern_cross/structures/closets/security.dm
index 6af5d416fd..9d8a50b883 100644
--- a/archive/maps/southern_cross/structures/closets/security.dm
+++ b/archive/maps/southern_cross/structures/closets/security.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/hos_wardrobe
name = "head of security's locker"
req_access = list(ACCESS_HOS)
- closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/security/hos
starts_with = list(
/obj/item/clothing/under/rank/head_of_security/jensen,
diff --git a/archive/maps/submaps/depreciated_vr/talon.dm b/archive/maps/submaps/depreciated_vr/talon.dm
index d338167548..d8c95b70fa 100644
--- a/archive/maps/submaps/depreciated_vr/talon.dm
+++ b/archive/maps/submaps/depreciated_vr/talon.dm
@@ -262,7 +262,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_captain
name = "talon captain's locker"
req_access = list(ACCESS_TALON)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/captain
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/captain
starts_with = list(
/obj/item/storage/backpack/dufflebag/captain,
@@ -280,7 +280,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_guard
name = "talon guard's locker"
req_access = list(ACCESS_TALON)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/guard
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/guard
starts_with = list(
/obj/item/clothing/suit/armor/pcarrier/light,
@@ -307,7 +307,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_doctor
name = "talon doctor's locker"
req_access = list(ACCESS_TALON)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/doctor
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/doctor
starts_with = list(
/obj/item/clothing/under/rank/medical,
@@ -327,7 +327,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_engineer
name = "talon engineer's locker"
req_access = list(ACCESS_TALON)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/engineer
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/engineer
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
@@ -349,7 +349,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_pilot
name = "talon pilot's locker"
req_access = list(ACCESS_TALON)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/pilot
starts_with = list(
/obj/item/material/knife/tacknife/survival,
@@ -376,7 +376,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_miner
name = "talon miner's locker"
req_access = list(ACCESS_TALON)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/miner
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/miner
starts_with = list(
/obj/item/radio/headset/talon,
diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm
index 44bf580cc5..4daadb666c 100644
--- a/code/ZAS/Airflow.dm
+++ b/code/ZAS/Airflow.dm
@@ -6,7 +6,7 @@ Contains helper procs for airflow, handled in /connection_group.
/mob/proc/airflow_stun()
if(stat == 2)
return 0
- if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown) return 0
+ if(last_airflow_stun > world.time - GLOB.vsc.airflow_stun_cooldown) return 0
if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
to_chat(src, span_notice("You stay upright as the air rushes past you."))
@@ -33,12 +33,12 @@ Contains helper procs for airflow, handled in /connection_group.
if(anchored && !ismob(src)) return 0
- if(!isobj(src) && n < vsc.airflow_dense_pressure) return 0
+ if(!isobj(src) && n < GLOB.vsc.airflow_dense_pressure) return 0
return 1
/mob/check_airflow_movable(n)
- if(n < vsc.airflow_heavy_pressure)
+ if(n < GLOB.vsc.airflow_heavy_pressure)
return 0
return 1
@@ -53,16 +53,16 @@ Contains helper procs for airflow, handled in /connection_group.
if (!(. = ..()))
return 0
if(isnull(w_class))
- if(n < vsc.airflow_dense_pressure) return 0 //most non-item objs don't have a w_class yet
+ if(n < GLOB.vsc.airflow_dense_pressure) return 0 //most non-item objs don't have a w_class yet
switch(w_class)
if(ITEMSIZE_TINY,ITEMSIZE_SMALL)
- if(n < vsc.airflow_lightest_pressure) return 0
+ if(n < GLOB.vsc.airflow_lightest_pressure) return 0
if(ITEMSIZE_NORMAL)
- if(n < vsc.airflow_light_pressure) return 0
+ if(n < GLOB.vsc.airflow_light_pressure) return 0
if(ITEMSIZE_LARGE,ITEMSIZE_HUGE)
- if(n < vsc.airflow_medium_pressure) return 0
+ if(n < GLOB.vsc.airflow_medium_pressure) return 0
else
- if(n < vsc.airflow_dense_pressure) return 0
+ if(n < GLOB.vsc.airflow_dense_pressure) return 0
/atom/movable/var/tmp/turf/airflow_dest
/atom/movable/var/tmp/airflow_speed = 0
@@ -123,7 +123,7 @@ Contains helper procs for airflow, handled in /connection_group.
if (prob(33))
loc:add_blood(src)
bloody_body(src)
- var/b_loss = airflow_speed * vsc.airflow_damage
+ var/b_loss = airflow_speed * GLOB.vsc.airflow_damage
var/blocked = run_armor_check(BP_HEAD,"melee")
apply_damage(b_loss/3, BRUTE, BP_HEAD, blocked, 0)
@@ -135,13 +135,13 @@ Contains helper procs for airflow, handled in /connection_group.
apply_damage(b_loss/3, BRUTE, BP_GROIN, blocked, 0)
if(airflow_speed > 10)
- Paralyse(round(airflow_speed * vsc.airflow_stun))
+ Paralyse(round(airflow_speed * GLOB.vsc.airflow_stun))
Stun(paralysis + 3)
else
- Stun(round(airflow_speed * vsc.airflow_stun/2))
+ Stun(round(airflow_speed * GLOB.vsc.airflow_stun/2))
. = ..()
-/zone/proc/movables()
+/datum/zone/proc/movables()
. = list()
for(var/turf/T in contents)
for(var/atom/movable/A in T)
diff --git a/code/ZAS/Connection.dm b/code/ZAS/Connection.dm
index 688eb12992..3d35b4b273 100644
--- a/code/ZAS/Connection.dm
+++ b/code/ZAS/Connection.dm
@@ -49,16 +49,16 @@ Class Procs:
*/
-/connection/var/turf/simulated/A
-/connection/var/turf/simulated/B
-/connection/var/zone/zoneA
-/connection/var/zone/zoneB
+/datum/connection/var/turf/simulated/A
+/datum/connection/var/turf/simulated/B
+/datum/connection/var/datum/zone/zoneA
+/datum/connection/var/datum/zone/zoneB
-/connection/var/connection_edge/edge
+/datum/connection/var/datum/connection_edge/edge
-/connection/var/state = 0
+/datum/connection/var/state = 0
-/connection/New(turf/simulated/A, turf/simulated/B)
+/datum/connection/New(turf/simulated/A, turf/simulated/B)
#ifdef ZASDBG
ASSERT(HAS_VALID_ZONE(A))
//ASSERT(HAS_VALID_ZONE(B))
@@ -75,33 +75,33 @@ Class Procs:
edge = SSair.get_edge(A.zone,B.zone)
edge.add_connection(src)
-/connection/proc/mark_direct()
+/datum/connection/proc/mark_direct()
if(!direct())
state |= CONNECTION_DIRECT
edge.direct++
//to_world("Marked direct.")
-/connection/proc/mark_indirect()
+/datum/connection/proc/mark_indirect()
if(direct())
state &= ~CONNECTION_DIRECT
edge.direct--
//to_world("Marked indirect.")
-/connection/proc/mark_space()
+/datum/connection/proc/mark_space()
state |= CONNECTION_SPACE
-/connection/proc/direct()
+/datum/connection/proc/direct()
return (state & CONNECTION_DIRECT)
-/connection/proc/valid()
+/datum/connection/proc/valid()
return !(state & CONNECTION_INVALID)
-/connection/proc/erase()
+/datum/connection/proc/erase()
edge.remove_connection(src)
state |= CONNECTION_INVALID
//to_world("Connection Erased: [state]")
-/connection/proc/update()
+/datum/connection/proc/update()
//to_world("Updated, \...")
if(!istype(A,/turf/simulated))
//to_world("Invalid A.")
diff --git a/code/ZAS/ConnectionGroup.dm b/code/ZAS/ConnectionGroup.dm
index f021f2e1db..39bf3a401b 100644
--- a/code/ZAS/ConnectionGroup.dm
+++ b/code/ZAS/ConnectionGroup.dm
@@ -4,7 +4,7 @@ Overview:
These are what handle gas transfers between zones and into space.
They are found in a zone's edges list and in SSair.edges.
Each edge updates every air tick due to their role in gas transfer.
- They come in two flavors, /connection_edge/zone and /connection_edge/unsimulated.
+ They come in two flavors, /datum/connection_edge/zone and /datum/connection_edge/unsimulated.
As the type names might suggest, they handle inter-zone and spacelike connections respectively.
Class Vars:
@@ -53,52 +53,52 @@ Class Procs:
get_connected_zone(zone/from)
Helper proc that allows getting the other zone of an edge given one of them.
- Only on /connection_edge/zone, otherwise use A.
+ Only on /datum/connection_edge/zone, otherwise use A.
*/
-/connection_edge
- var/zone/A
+/datum/connection_edge
+ var/datum/zone/A
var/list/connecting_turfs = list()
var/direct = 0
var/sleeping = 1
var/coefficient = 0
-/connection_edge/New()
+/datum/connection_edge/New()
CRASH("Cannot make connection edge without specifications.")
-/connection_edge/proc/add_connection(connection/c)
+/datum/connection_edge/proc/add_connection(datum/connection/c)
coefficient++
if(c.direct()) direct++
//to_world("Connection added: [type] Coefficient: [coefficient]")
-/connection_edge/proc/remove_connection(connection/c)
+/datum/connection_edge/proc/remove_connection(datum/connection/c)
//to_world("Connection removed: [type] Coefficient: [coefficient-1]")
coefficient--
if(coefficient <= 0)
erase()
if(c.direct()) direct--
-/connection_edge/proc/contains_zone(zone/Z)
+/datum/connection_edge/proc/contains_zone(datum/zone/Z)
-/connection_edge/proc/erase()
+/datum/connection_edge/proc/erase()
SSair.remove_edge(src)
//to_world("[type] Erased.")
-/connection_edge/proc/tick()
+/datum/connection_edge/proc/tick()
-/connection_edge/proc/recheck()
+/datum/connection_edge/proc/recheck()
-/connection_edge/proc/flow(list/movable, differential, repelled)
+/datum/connection_edge/proc/flow(list/movable, differential, repelled)
for(var/i = 1; i <= movable.len; i++)
var/atom/movable/M = movable[i]
//If they're already being tossed, don't do it again.
- if(M.last_airflow > world.time - vsc.airflow_delay) continue
+ if(M.last_airflow > world.time - GLOB.vsc.airflow_delay) continue
if(M.airflow_speed) continue
//Check for knocking people over
- if(ismob(M) && differential > vsc.airflow_stun_pressure)
+ if(ismob(M) && differential > GLOB.vsc.airflow_stun_pressure)
var/mob/target = M
if(SEND_SIGNAL(target, COMSIG_CHECK_FOR_GODMODE) & COMSIG_GODMODE_CANCEL)
continue
@@ -118,10 +118,10 @@ Class Procs:
-/connection_edge/zone
- var/zone/B
+/datum/connection_edge/zone
+ var/datum/zone/B
-/connection_edge/zone/New(zone/A, zone/B)
+/datum/connection_edge/zone/New(datum/zone/A, datum/zone/B)
src.A = A
src.B = B
@@ -130,23 +130,23 @@ Class Procs:
//id = edge_id(A,B)
//to_world("New edge between [A] and [B]")
-/connection_edge/zone/add_connection(connection/c)
+/datum/connection_edge/zone/add_connection(datum/connection/c)
. = ..()
connecting_turfs.Add(c.A)
-/connection_edge/zone/remove_connection(connection/c)
+/datum/connection_edge/zone/remove_connection(datum/connection/c)
connecting_turfs.Remove(c.A)
. = ..()
-/connection_edge/zone/contains_zone(zone/Z)
+/datum/connection_edge/zone/contains_zone(datum/zone/Z)
return A == Z || B == Z
-/connection_edge/zone/erase()
+/datum/connection_edge/zone/erase()
A.edges.Remove(src)
B.edges.Remove(src)
. = ..()
-/connection_edge/zone/tick()
+/datum/connection_edge/zone/tick()
if(A.invalid || B.invalid)
erase()
return
@@ -154,7 +154,7 @@ Class Procs:
var/equiv = A.air.share_ratio(B.air, coefficient)
var/differential = A.air.return_pressure() - B.air.return_pressure()
- if(abs(differential) >= vsc.airflow_lightest_pressure)
+ if(abs(differential) >= GLOB.vsc.airflow_lightest_pressure)
var/list/attracted
var/list/repelled
if(differential > 0)
@@ -179,23 +179,23 @@ Class Procs:
SSair.mark_zone_update(A)
SSair.mark_zone_update(B)
-/connection_edge/zone/recheck()
+/datum/connection_edge/zone/recheck()
// Edges with only one side being vacuum need processing no matter how close.
if(!A.air.compare(B.air, vacuum_exception = 1))
SSair.mark_edge_active(src)
//Helper proc to get connections for a zone.
-/connection_edge/zone/proc/get_connected_zone(zone/from)
+/datum/connection_edge/zone/proc/get_connected_zone(datum/zone/from)
if(A == from) return B
else return A
-/connection_edge/unsimulated
+/datum/connection_edge/unsimulated
var/turf/B
-/connection_edge/unsimulated
+/datum/connection_edge/unsimulated
var/datum/gas_mixture/air
-/connection_edge/unsimulated/New(zone/A, turf/B)
+/datum/connection_edge/unsimulated/New(datum/zone/A, turf/B)
src.A = A
src.B = B
A.edges.Add(src)
@@ -203,24 +203,24 @@ Class Procs:
//id = 52*A.id
//to_world("New edge from [A] to [B].")
-/connection_edge/unsimulated/add_connection(connection/c)
+/datum/connection_edge/unsimulated/add_connection(datum/connection/c)
. = ..()
connecting_turfs.Add(c.B)
air.group_multiplier = coefficient
-/connection_edge/unsimulated/remove_connection(connection/c)
+/datum/connection_edge/unsimulated/remove_connection(datum/connection/c)
connecting_turfs.Remove(c.B)
air.group_multiplier = coefficient
. = ..()
-/connection_edge/unsimulated/erase()
+/datum/connection_edge/unsimulated/erase()
A.edges.Remove(src)
. = ..()
-/connection_edge/unsimulated/contains_zone(zone/Z)
+/datum/connection_edge/unsimulated/contains_zone(datum/zone/Z)
return A == Z
-/connection_edge/unsimulated/tick()
+/datum/connection_edge/unsimulated/tick()
if(A.invalid)
erase()
return
@@ -228,7 +228,7 @@ Class Procs:
var/equiv = A.air.share_space(air)
var/differential = A.air.return_pressure() - air.return_pressure()
- if(abs(differential) >= vsc.airflow_lightest_pressure)
+ if(abs(differential) >= GLOB.vsc.airflow_lightest_pressure)
var/list/attracted = A.movables()
flow(attracted, abs(differential), differential < 0)
@@ -238,7 +238,7 @@ Class Procs:
SSair.mark_zone_update(A)
-/connection_edge/unsimulated/recheck()
+/datum/connection_edge/unsimulated/recheck()
// Edges with only one side being vacuum need processing no matter how close.
// Note: This handles the glaring flaw of a room holding pressure while exposed to space, but
// does not specially handle the less common case of a simulated room exposed to an unsimulated pressurized turf.
diff --git a/code/ZAS/ConnectionManager.dm b/code/ZAS/ConnectionManager.dm
index dc0f5293b9..0a9413b1c3 100644
--- a/code/ZAS/ConnectionManager.dm
+++ b/code/ZAS/ConnectionManager.dm
@@ -34,19 +34,19 @@ Macros:
// macro-ized to cut down on proc calls
#define check(c) (c && c.valid())
-/turf/var/tmp/connection_manager/connections
+/turf/var/tmp/datum/connection_manager/connections
-/connection_manager/var/connection/N
-/connection_manager/var/connection/S
-/connection_manager/var/connection/E
-/connection_manager/var/connection/W
+/datum/connection_manager/var/datum/connection/N
+/datum/connection_manager/var/datum/connection/S
+/datum/connection_manager/var/datum/connection/E
+/datum/connection_manager/var/datum/connection/W
#ifdef MULTIZAS
-/connection_manager/var/connection/U
-/connection_manager/var/connection/D
+/datum/connection_manager/var/datum/connection/U
+/datum/connection_manager/var/datum/connection/D
#endif
-/connection_manager/proc/get(d)
+/datum/connection_manager/proc/get(d)
switch(d)
if(NORTH)
if(check(N)) return N
@@ -70,7 +70,7 @@ Macros:
else return null
#endif
-/connection_manager/proc/place(connection/c, d)
+/datum/connection_manager/proc/place(datum/connection/c, d)
switch(d)
if(NORTH) N = c
if(SOUTH) S = c
@@ -82,7 +82,7 @@ Macros:
if(DOWN) D = c
#endif
-/connection_manager/proc/update_all()
+/datum/connection_manager/proc/update_all()
if(check(N)) N.update()
if(check(S)) S.update()
if(check(E)) E.update()
@@ -92,7 +92,7 @@ Macros:
if(check(D)) D.update()
#endif
-/connection_manager/proc/erase_all()
+/datum/connection_manager/proc/erase_all()
if(check(N)) N.erase()
if(check(S)) S.erase()
if(check(E)) E.erase()
diff --git a/code/ZAS/Diagnostic.dm b/code/ZAS/Diagnostic.dm
index 0d51ad1981..9b32bb1313 100644
--- a/code/ZAS/Diagnostic.dm
+++ b/code/ZAS/Diagnostic.dm
@@ -97,4 +97,4 @@
/client/proc/ZASSettings()
set category = "Debug.Dangerous"
- vsc.SetDefault(mob)
+ GLOB.vsc.SetDefault(mob)
diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm
index de79b4ceb9..3298d0b977 100644
--- a/code/ZAS/Fire.dm
+++ b/code/ZAS/Fire.dm
@@ -34,8 +34,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
create_fire(exposed_temperature)
return igniting
-/zone/proc/process_fire()
- var/datum/gas_mixture/burn_gas = air.remove_ratio(vsc.fire_consuption_rate, fire_tiles.len)
+/datum/zone/proc/process_fire()
+ var/datum/gas_mixture/burn_gas = air.remove_ratio(GLOB.vsc.fire_consuption_rate, fire_tiles.len)
var/firelevel = burn_gas.zburn(src, fire_tiles, force_burn = 1, no_check = 1)
@@ -65,7 +65,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
if(!fire_tiles.len)
SSair.active_fire_zones.Remove(src)
-/zone/proc/remove_liquidfuel(var/used_liquid_fuel, var/remove_fire=0)
+/datum/zone/proc/remove_liquidfuel(var/used_liquid_fuel, var/remove_fire=0)
if(!fuel_objs.len)
return
@@ -182,7 +182,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
continue
//Spread the fire.
- if(prob( 50 + 50 * (firelevel/vsc.fire_firelevel_multiplier) ) && my_tile.CanPass(src, enemy_tile) && enemy_tile.CanPass(src, my_tile))
+ if(prob( 50 + 50 * (firelevel/GLOB.vsc.fire_firelevel_multiplier) ) && my_tile.CanPass(src, enemy_tile) && enemy_tile.CanPass(src, my_tile))
enemy_tile.create_fire(firelevel)
else
@@ -208,7 +208,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
SSair.active_hotspots.Add(src)
/obj/fire/proc/fire_color(var/env_temperature)
- var/temperature = max(4000*sqrt(firelevel/vsc.fire_firelevel_multiplier), env_temperature)
+ var/temperature = max(4000*sqrt(firelevel/GLOB.vsc.fire_firelevel_multiplier), env_temperature)
return heat2color(temperature)
/obj/fire/Destroy()
@@ -232,7 +232,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
fire_protection = world.time
//Returns the firelevel
-/datum/gas_mixture/proc/zburn(zone/zone, force_burn, no_check = 0)
+/datum/gas_mixture/proc/zburn(datum/zone/zone, force_burn, no_check = 0)
. = 0
if((temperature > PHORON_MINIMUM_BURN_TEMPERATURE || force_burn) && (no_check ||check_recombustability(zone? zone.fuel_objs : null)))
@@ -276,12 +276,12 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
var/reaction_limit = min(total_oxidizers*(FIRE_REACTION_FUEL_AMOUNT/FIRE_REACTION_OXIDIZER_AMOUNT), total_fuel) //stoichiometric limit
//vapour fuels are extremely volatile! The reaction progress is a percentage of the total fuel (similar to old zburn).)
- var/gas_firelevel = calculate_firelevel(gas_fuel, total_oxidizers, reaction_limit, volume*group_multiplier) / vsc.fire_firelevel_multiplier
+ var/gas_firelevel = calculate_firelevel(gas_fuel, total_oxidizers, reaction_limit, volume*group_multiplier) / GLOB.vsc.fire_firelevel_multiplier
var/min_burn = 0.30*volume*group_multiplier/CELL_VOLUME //in moles - so that fires with very small gas concentrations burn out fast
var/gas_reaction_progress = min(max(min_burn, gas_firelevel*gas_fuel)*FIRE_GAS_BURNRATE_MULT, gas_fuel)
//liquid fuels are not as volatile, and the reaction progress depends on the size of the area that is burning. Limit the burn rate to a certain amount per area.
- var/liquid_firelevel = calculate_firelevel(liquid_fuel, total_oxidizers, reaction_limit, 0) / vsc.fire_firelevel_multiplier
+ var/liquid_firelevel = calculate_firelevel(liquid_fuel, total_oxidizers, reaction_limit, 0) / GLOB.vsc.fire_firelevel_multiplier
var/liquid_reaction_progress = min((liquid_firelevel*0.2 + 0.05)*fuel_area*FIRE_LIQUID_BURNRATE_MULT, liquid_fuel)
var/firelevel = (gas_fuel*gas_firelevel + liquid_fuel*liquid_firelevel)/total_fuel
@@ -322,7 +322,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//calculate the energy produced by the reaction and then set the new temperature of the mix
if(heat_capacity() > 0)
- temperature = min((starting_energy + vsc.fire_fuel_energy_release * (used_gas_fuel + used_liquid_fuel)) / heat_capacity(), MAX_ATMOS_TEMPERATURE)
+ temperature = min((starting_energy + GLOB.vsc.fire_fuel_energy_release * (used_gas_fuel + used_liquid_fuel)) / heat_capacity(), MAX_ATMOS_TEMPERATURE)
update_values()
#ifdef FIREDBG
@@ -354,7 +354,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
/datum/gas_mixture/proc/check_combustability(obj/effect/decal/cleanable/liquid_fuel/liquid=null)
. = 0
for(var/g in gas)
- if(GLOB.gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * vsc.fire_consuption_rate) >= 0.1)
+ if(GLOB.gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * GLOB.vsc.fire_consuption_rate) >= 0.1)
. = 1
break
@@ -366,7 +366,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
. = 0
for(var/g in gas)
- if(GLOB.gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * vsc.fire_consuption_rate) >= 0.005)
+ if(GLOB.gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * GLOB.vsc.fire_consuption_rate) >= 0.005)
. = 1
break
@@ -395,13 +395,13 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
#endif
//toss everything together -- should produce a value between 0 and fire_firelevel_multiplier
- firelevel = vsc.fire_firelevel_multiplier * mix_multiplier * damping_multiplier
+ firelevel = GLOB.vsc.fire_firelevel_multiplier * mix_multiplier * damping_multiplier
return max( 0, firelevel)
/mob/living/proc/FireBurn(var/firelevel, var/last_temperature, var/pressure)
- var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
+ var/mx = 5 * firelevel/GLOB.vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
apply_damage(2.5*mx, BURN)
@@ -433,7 +433,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
if(C.body_parts_covered & ARMS)
arms_exposure = 0
//minimize this for low-pressure enviroments
- var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
+ var/mx = 5 * firelevel / GLOB.vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
//Always check these damage procs first if fire damage isn't working. They're probably what's wrong.
diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm
index 3cd40edb4d..8e174dd37f 100644
--- a/code/ZAS/Phoron.dm
+++ b/code/ZAS/Phoron.dm
@@ -1,6 +1,6 @@
GLOBAL_DATUM_INIT(contamination_overlay, /image, 'icons/effects/contamination.dmi')
-/pl_control
+/datum/pl_control
var/PHORON_DMG = 3
var/PHORON_DMG_NAME = "Phoron Damage Amount"
var/PHORON_DMG_DESC = "Self Descriptive"
@@ -87,7 +87,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, 'icons/effects/contamination.dm
//Handles all the bad things phoron can do.
//Contamination
- if(vsc.plc.CLOTH_CONTAMINATION)
+ if(GLOB.vsc.plc.CLOTH_CONTAMINATION)
contaminate()
//Anything else requires them to not be dead.
@@ -95,7 +95,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, 'icons/effects/contamination.dm
return
//Burn skin if exposed.
- if(vsc.plc.SKIN_BURNS && (species.breath_type != GAS_PHORON))
+ if(GLOB.vsc.plc.SKIN_BURNS && (species.breath_type != GAS_PHORON))
if(!pl_head_protected() || !pl_suit_protected())
burn_skin(0.75)
if(prob(20))
@@ -103,7 +103,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, 'icons/effects/contamination.dm
updatehealth()
//Burn eyes if exposed.
- if(vsc.plc.EYE_BURNS && species.breath_type && (species.breath_type != GAS_PHORON)) //VOREStation Edit: those who don't breathe
+ if(GLOB.vsc.plc.EYE_BURNS && species.breath_type && (species.breath_type != GAS_PHORON)) //VOREStation Edit: those who don't breathe
var/burn_eyes = 1
//Check for protective glasses
@@ -127,8 +127,8 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, 'icons/effects/contamination.dm
burn_eyes()
//Genetic Corruption
- if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != GAS_PHORON))
- if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
+ if(GLOB.vsc.plc.GENETIC_CORRUPTION && (species.breath_type != GAS_PHORON))
+ if(rand(1,10000) < GLOB.vsc.plc.GENETIC_CORRUPTION)
randmutb(src)
to_chat(src, span_danger("High levels of toxins cause you to spontaneously mutate!"))
domutcheck(src,null)
@@ -148,7 +148,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, 'icons/effects/contamination.dm
/mob/living/carbon/human/proc/pl_head_protected()
//Checks if the head is adequately sealed. //This is just odd. TODO: Make this respect the body_parts_covered stuff like thermal gear does.
if(head)
- if(vsc.plc.PHORONGUARD_ONLY)
+ if(GLOB.vsc.plc.PHORONGUARD_ONLY)
if(head.flags & PHORONGUARD)
return 1
else if(head.body_parts_covered & EYES)
@@ -161,11 +161,11 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, 'icons/effects/contamination.dm
for(var/obj/item/protection in list(wear_suit, gloves, shoes)) //This is why it's odd. If I'm in a full suit, but my shoes and gloves aren't phoron proof, damage.
if(!protection)
continue
- if(vsc.plc.PHORONGUARD_ONLY && !(protection.flags & PHORONGUARD))
+ if(GLOB.vsc.plc.PHORONGUARD_ONLY && !(protection.flags & PHORONGUARD))
return 0
coverage |= protection.body_parts_covered
- if(vsc.plc.PHORONGUARD_ONLY)
+ if(GLOB.vsc.plc.PHORONGUARD_ONLY)
return 1
return BIT_TEST_ALL(coverage, CHEST|LEGS|FEET|ARMS|HANDS)
@@ -183,7 +183,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, 'icons/effects/contamination.dm
/turf/Entered(obj/item/I)
. = ..()
//Items that are in phoron, but not on a mob, can still be contaminated.
- if(istype(I) && vsc.plc.CLOTH_CONTAMINATION && I.can_contaminate())
+ if(istype(I) && GLOB.vsc.plc.CLOTH_CONTAMINATION && I.can_contaminate())
var/datum/gas_mixture/env = return_air(1)
if(!env)
return
diff --git a/code/ZAS/README.md b/code/ZAS/README.md
index a3452cc66d..a2eaed47fb 100644
--- a/code/ZAS/README.md
+++ b/code/ZAS/README.md
@@ -5,20 +5,21 @@ When something happens, i.e. a door opening or a wall being taken down,
zones equalize and eventually merge. Making an airtight area closes the connection again.
## Control Flow:
+
Every air tick:
- Marked turfs are updated with update_air_properties(), followed by post_update_air_properties().
- Edges, including those generated by connections in the previous step, are processed. This is where gas is exchanged.
- Fire is processed.
- Marked zones have their air archived.
+Marked turfs are updated with update_air_properties(), followed by post_update_air_properties().
+Edges, including those generated by connections in the previous step, are processed. This is where gas is exchanged.
+Fire is processed.
+Marked zones have their air archived.
## Important Functions:
SSair.mark_for_update(turf)
- When stuff happens, call this. It works on everything. You basically don't need to worry about any other
- functions besides CanPass().
+When stuff happens, call this. It works on everything. You basically don't need to worry about any other
+functions besides CanPass().
Notes for people who used ZAS before:
- There is no connected_zones anymore.
- To get the zones that are connected to a zone, use this loop:
- for(var/connection_edge/zone/edge in zone.edges)
- var/zone/connected_zone = edge.get_connected_zone(zone)
+There is no connected_zones anymore.
+To get the zones that are connected to a zone, use this loop:
+for(var/connection_edge/zone/edge in zone.edges)
+var/datum/zone/connected_zone = edge.get_connected_zone(zone)
diff --git a/code/ZAS/Turf.dm b/code/ZAS/Turf.dm
index 67901ec270..22c3781bf3 100644
--- a/code/ZAS/Turf.dm
+++ b/code/ZAS/Turf.dm
@@ -1,4 +1,4 @@
-/turf/simulated/var/zone/zone
+/turf/simulated/var/datum/zone/zone
/turf/simulated/var/open_directions
/turf/var/needs_air_update = 0
@@ -146,7 +146,7 @@
//dbg(blocked)
#endif
if(zone)
- var/zone/z = zone
+ var/datum/zone/z = zone
if(can_safely_remove_from_zone()) //Helps normal airlocks avoid rebuilding zones all the time
c_copy_air() // CHOMPAdd
@@ -255,7 +255,7 @@
postponed.Add(unsim)
if(!TURF_HAS_VALID_ZONE(src)) //Still no zone, make a new one. CHOMPEdit
- var/zone/newzone = new/zone()
+ var/datum/zone/newzone = new/datum/zone()
newzone.add(src)
#ifdef ZASDBG
diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm
index 7c46e4572b..be4189676d 100644
--- a/code/ZAS/Variable Settings.dm
+++ b/code/ZAS/Variable Settings.dm
@@ -1,6 +1,6 @@
-var/global/vs_control/vsc = new
+GLOBAL_DATUM_INIT(vsc, /datum/vs_control, new)
-/vs_control
+/datum/vs_control
var/fire_consuption_rate = 0.25
var/fire_consuption_rate_NAME = "Fire - Air Consumption Ratio"
var/fire_consuption_rate_DESC = "Ratio of air removed and combusted per tick."
@@ -75,11 +75,11 @@ var/global/vs_control/vsc = new
var/connection_temperature_delta_DESC = "The smallest temperature difference which will cause heat to travel through doors."
-/vs_control/var/list/settings = list()
-/vs_control/var/list/bitflags = list("1","2","4","8","16","32","64","128","256","512","1024")
-/vs_control/var/pl_control/plc = new()
+/datum/vs_control/var/list/settings = list()
+/datum/vs_control/var/list/bitflags = list("1","2","4","8","16","32","64","128","256","512","1024")
+/datum/vs_control/var/datum/pl_control/plc = new()
-/vs_control/New()
+/datum/vs_control/New()
. = ..()
settings = vars.Copy()
@@ -95,7 +95,7 @@ var/global/vs_control/vsc = new
settings -= "bitflags"
settings -= "plc"
-/vs_control/proc/ChangeSettingsDialog(mob/user,list/L)
+/datum/vs_control/proc/ChangeSettingsDialog(mob/user,list/L)
var/dat = ""
for(var/ch in L)
if(findtextEx(ch,"_RANDOM") || findtextEx(ch,"_DESC") || findtextEx(ch,"_METHOD") || findtextEx(ch,"_NAME")) continue
@@ -116,11 +116,11 @@ var/global/vs_control/vsc = new
popup.set_content(dat)
popup.open()
-/vs_control/Topic(href,href_list)
+/datum/vs_control/Topic(href,href_list)
if("changevar" in href_list)
ChangeSetting(usr,href_list["changevar"])
-/vs_control/proc/ChangeSetting(mob/user,ch)
+/datum/vs_control/proc/ChangeSetting(mob/user,ch)
var/vw
var/how = "Text"
var/display_description = ch
@@ -176,7 +176,7 @@ var/global/vs_control/vsc = new
else
ChangeSettingsDialog(user,settings)
-/vs_control/proc/RandomizeWithProbability()
+/datum/vs_control/proc/RandomizeWithProbability()
for(var/V in settings)
var/newvalue
if("[V]_RANDOM" in vars)
@@ -188,11 +188,11 @@ var/global/vs_control/vsc = new
newvalue = vars[V]
V = newvalue
-/vs_control/proc/ChangePhoron()
+/datum/vs_control/proc/ChangePhoron()
for(var/V in plc.settings)
plc.Randomize(V)
-/vs_control/proc/SetDefault(var/mob/user)
+/datum/vs_control/proc/SetDefault(var/mob/user)
var/list/setting_choices = list("Phoron - Standard", "Phoron - Low Hazard", "Phoron - High Hazard", "Phoron - Oh Shit!",\
"ZAS - Normal", "ZAS - Forgiving", "ZAS - Dangerous", "ZAS - Hellish", "ZAS/Phoron - Initial")
var/def = tgui_input_list(user, "Which of these presets should be used?", "Setting Choice", setting_choices)
@@ -325,9 +325,9 @@ var/global/vs_control/vsc = new
to_chat(world, span_world(span_blue("[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"")))
-/pl_control/var/list/settings = list()
+/datum/pl_control/var/list/settings = list()
-/pl_control/New()
+/datum/pl_control/New()
. = ..()
settings = vars.Copy()
@@ -341,7 +341,7 @@ var/global/vs_control/vsc = new
settings -= "settings"
-/pl_control/proc/Randomize(V)
+/datum/pl_control/proc/Randomize(V)
var/newvalue
if("[V]_RANDOM" in vars)
if(isnum(vars["[V]_RANDOM"]))
diff --git a/code/ZAS/Zone.dm b/code/ZAS/Zone.dm
index ef7c62812e..cff058dff9 100644
--- a/code/ZAS/Zone.dm
+++ b/code/ZAS/Zone.dm
@@ -40,28 +40,28 @@ Class Procs:
*/
-/zone/var/name
-/zone/var/invalid = 0
-/zone/var/list/contents = list()
-/zone/var/list/fire_tiles = list()
-/zone/var/list/fuel_objs = list()
+/datum/zone
+ var/name
+ var/invalid = 0
+ var/list/contents = list()
+ var/list/fire_tiles = list()
+ var/list/fuel_objs = list()
-/zone/var/needs_update = 0
+ var/needs_update = 0
-/zone/var/list/edges = list()
+ var/list/edges = list()
-/zone/var/datum/gas_mixture/air = new
+ var/datum/gas_mixture/air = new
+ var/list/graphic_add = list()
+ var/list/graphic_remove = list()
-/zone/var/list/graphic_add = list()
-/zone/var/list/graphic_remove = list()
-
-/zone/New()
+/datum/zone/New()
SSair.add_zone(src)
air.temperature = TCMB
air.group_multiplier = 1
air.volume = CELL_VOLUME
-/zone/proc/add(turf/simulated/T)
+/datum/zone/proc/add(turf/simulated/T)
#ifdef ZASDBG
ASSERT(!invalid)
ASSERT(istype(T))
@@ -80,7 +80,7 @@ Class Procs:
if(air.graphic)
T.update_graphic(air.graphic)
-/zone/proc/remove(turf/simulated/T)
+/datum/zone/proc/remove(turf/simulated/T)
#ifdef ZASDBG
ASSERT(!invalid)
ASSERT(istype(T))
@@ -100,7 +100,7 @@ Class Procs:
else
c_invalidate()
-/zone/proc/c_merge(zone/into)
+/datum/zone/proc/c_merge(datum/zone/into)
#ifdef ZASDBG
ASSERT(!invalid)
ASSERT(istype(into))
@@ -118,13 +118,13 @@ Class Procs:
#endif
//rebuild the old zone's edges so that they will be possessed by the new zone
- for(var/connection_edge/E in edges)
+ for(var/datum/connection_edge/E in edges)
if(E.contains_zone(into))
continue //don't need to rebuild this edge
for(var/turf/T in E.connecting_turfs)
SSair.mark_for_update(T)
-/zone/proc/c_invalidate()
+/datum/zone/proc/c_invalidate()
invalid = 1
SSair.remove_zone(src)
#ifdef ZASDBG
@@ -132,7 +132,7 @@ Class Procs:
T.dbg(invalid_zone)
#endif
-/zone/proc/rebuild()
+/datum/zone/proc/rebuild()
if(invalid) return //Short circuit for explosions where rebuild is called many times over.
c_invalidate()
var/list/air_graphic = air.graphic // Cache for sanic speed
@@ -143,7 +143,7 @@ Class Procs:
T.needs_air_update = 0 //Reset the marker so that it will be added to the list.
SSair.mark_for_update(T)
-/zone/proc/add_tile_air(datum/gas_mixture/tile_air)
+/datum/zone/proc/add_tile_air(datum/gas_mixture/tile_air)
//air.volume += CELL_VOLUME
air.group_multiplier = 1
air.multiply(contents.len)
@@ -151,11 +151,11 @@ Class Procs:
air.divide(contents.len+1)
air.group_multiplier = contents.len+1
-/zone/proc/tick()
+/datum/zone/proc/tick()
if(air.temperature >= PHORON_FLASHPOINT && !(src in SSair.active_fire_zones) && air.check_combustability() && contents.len)
var/turf/T = pick(contents)
if(istype(T))
- T.create_fire(vsc.fire_firelevel_multiplier)
+ T.create_fire(GLOB.vsc.fire_firelevel_multiplier)
if(air.check_tile_graphic(graphic_add, graphic_remove))
for(var/turf/simulated/T in contents)
@@ -163,11 +163,11 @@ Class Procs:
graphic_add.len = 0
graphic_remove.len = 0
- for(var/connection_edge/E in edges)
+ for(var/datum/connection_edge/E in edges)
if(E.sleeping)
E.recheck()
-/zone/proc/dbg_data(mob/M)
+/datum/zone/proc/dbg_data(mob/M)
to_chat(M,name)
for(var/g in air.gas)
to_chat(M, "[GLOB.gas_data.name[g]]: [air.gas[g]]")
@@ -181,8 +181,8 @@ Class Procs:
var/zone_edges = 0
var/space_edges = 0
var/space_coefficient = 0
- for(var/connection_edge/E in edges)
- if(E.type == /connection_edge/zone) zone_edges++
+ for(var/datum/connection_edge/E in edges)
+ if(E.type == /datum/connection_edge/zone) zone_edges++
else
space_edges++
space_coefficient += E.coefficient
diff --git a/code/__defines/dcs/signals/signals_global.dm b/code/__defines/dcs/signals/signals_global.dm
index e7944ee88c..bd812d66a6 100644
--- a/code/__defines/dcs/signals/signals_global.dm
+++ b/code/__defines/dcs/signals/signals_global.dm
@@ -137,7 +137,7 @@
/// payment account status changed /obj/machinery/account_database/tgui_act() : (datum/money_account/account)
#define COMSIG_GLOB_PAYMENT_ACCOUNT_REVOKE "!payment_account_revoke_payroll"
-// base /decl/emote/proc/do_emote() : (mob/user, extra_params)
+// base /datum/decl/emote/proc/do_emote() : (mob/user, extra_params)
#define COMSIG_GLOB_EMOTE_PERFORMED "!emote_performed"
// base /proc/say_dead_direct() : (message)
#define COMSIG_GLOB_DEAD_SAY "!dead_say"
diff --git a/code/__defines/dcs/signals/signals_reagent.dm b/code/__defines/dcs/signals/signals_reagent.dm
index 65dba024e6..b3f22ca946 100644
--- a/code/__defines/dcs/signals/signals_reagent.dm
+++ b/code/__defines/dcs/signals/signals_reagent.dm
@@ -47,5 +47,5 @@
//Non TG signals:
#define COMSIG_REAGENTS_CRAFTING_PING "reagents_crafting_ping"
-///from base of /datum/reagents/proc/handle_reactions(): (list/decl/chemical_reaction)
+///from base of /datum/reagents/proc/handle_reactions(): (list/datum/decl/chemical_reaction)
#define COMSIG_REAGENTS_HOLDER_REACTED "reagents_holder_reacted"
diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
index 5f48578eb0..8923b2391b 100644
--- a/code/__defines/misc.dm
+++ b/code/__defines/misc.dm
@@ -485,7 +485,7 @@ GLOBAL_LIST_INIT(all_volume_channels, list(
#define APPEARANCECHANGER_CHANGED_F_HAIRCOLOR "Facial Hair Color"
#define APPEARANCECHANGER_CHANGED_EYES "Eye Color"
-#define GET_DECL(D) (ispath(D, /decl) ? (decls_repository.fetched_decls[D] || decls_repository.get_decl(D)) : null)
+#define GET_DECL(D) (ispath(D, /datum/decl) ? (GLOB.decls_repository.fetched_decls[D] || GLOB.decls_repository.get_decl(D)) : null)
#define LOADOUT_WHITELIST_OFF 0
#define LOADOUT_WHITELIST_LAX 1
diff --git a/code/_global_vars/misc.dm b/code/_global_vars/misc.dm
index e767e04d97..0fb5c5dffc 100644
--- a/code/_global_vars/misc.dm
+++ b/code/_global_vars/misc.dm
@@ -2,7 +2,7 @@ GLOBAL_LIST_EMPTY(error_last_seen)
GLOBAL_LIST_EMPTY(error_cooldown)
//GLOBAL_DATUM_INIT(all_observable_events, /datum/all_observable_events, new) // This is a datum. It is not a list.
-//GLOBAL_DATUM_INIT(destroyed_event, /decl/observ/destroyed, new())
+//GLOBAL_DATUM_INIT(destroyed_event, /datum/decl/observ/destroyed, new())
GLOBAL_VAR_INIT(timezoneOffset, 0) // The difference betwen midnight (of the host computer) and 0 world.ticks.
diff --git a/code/_helpers/_global_objects.dm b/code/_helpers/_global_objects.dm
index 365268d4e0..6672b2c9e0 100644
--- a/code/_helpers/_global_objects.dm
+++ b/code/_helpers/_global_objects.dm
@@ -16,3 +16,5 @@ GLOBAL_DATUM_INIT(camera_alarm, /datum/alarm_handler/camera, new)
GLOBAL_DATUM_INIT(fire_alarm, /datum/alarm_handler/fire, new)
GLOBAL_DATUM_INIT(motion_alarm, /datum/alarm_handler/motion, new)
GLOBAL_DATUM_INIT(power_alarm, /datum/alarm_handler/power, new)
+
+GLOBAL_DATUM_INIT(decls_repository, /datum/repository/decls, new)
diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm
index e566ba6309..82318e0db2 100644
--- a/code/_helpers/global_lists.dm
+++ b/code/_helpers/global_lists.dm
@@ -251,9 +251,9 @@ GLOBAL_LIST_EMPTY(mannequins)
GLOB.suit_cycler_emagged += new SCC()
//Ores
- paths = subtypesof(/ore)
+ paths = subtypesof(/datum/ore)
for(var/oretype in paths)
- var/ore/OD = new oretype()
+ var/datum/ore/OD = new oretype()
GLOB.ore_data[OD.name] = OD
paths = subtypesof(/datum/alloy)
@@ -261,7 +261,7 @@ GLOBAL_LIST_EMPTY(mannequins)
GLOB.alloy_data += new alloytype()
//Closet appearances
- GLOB.closet_appearances = decls_repository.get_decls_of_type(/decl/closet_appearance)
+ GLOB.closet_appearances = GLOB.decls_repository.get_decls_of_type(/datum/decl/closet_appearance)
paths = subtypesof(/datum/sprite_accessory/ears)
for(var/path in paths)
diff --git a/code/_macros.dm b/code/_macros.dm
index ccde7c963d..42682d5c8f 100644
--- a/code/_macros.dm
+++ b/code/_macros.dm
@@ -17,9 +17,9 @@
#define CanInteract(user, state) (CanUseTopic(user, state) == STATUS_INTERACTIVE)
-#define sequential_id(key) uniqueness_repository.Generate(/datum/uniqueness_generator/id_sequential, key)
+#define sequential_id(key) GLOB.uniqueness_repository.Generate(/datum/uniqueness_generator/id_sequential, key)
-#define random_id(key,min_id,max_id) uniqueness_repository.Generate(/datum/uniqueness_generator/id_random, key, min_id, max_id)
+#define random_id(key,min_id,max_id) GLOB.uniqueness_repository.Generate(/datum/uniqueness_generator/id_random, key, min_id, max_id)
#define WORLD_ICON_SIZE 32 //Needed for the R-UST port
diff --git a/code/_onclick/hud/spell_screen_objects.dm b/code/_onclick/hud/spell_screen_objects.dm
index d1b9eb7170..c1229860be 100644
--- a/code/_onclick/hud/spell_screen_objects.dm
+++ b/code/_onclick/hud/spell_screen_objects.dm
@@ -74,7 +74,7 @@
spell_holder.client.screen += S
S.handle_icon_updates = 1
-/atom/movable/screen/movable/spell_master/proc/add_spell(var/spell/spell)
+/atom/movable/screen/movable/spell_master/proc/add_spell(datum/spell/spell)
if(!spell) return
if(spell.connected_button) //we have one already, for some reason
@@ -108,7 +108,7 @@
if(spell_holder.client)
toggle_open(2) //forces the icons to refresh on screen
-/atom/movable/screen/movable/spell_master/proc/remove_spell(var/spell/spell)
+/atom/movable/screen/movable/spell_master/proc/remove_spell(datum/spell/spell)
qdel(spell.connected_button)
spell.connected_button = null
@@ -118,7 +118,7 @@
else
qdel(src)
-/atom/movable/screen/movable/spell_master/proc/silence_spells(var/amount)
+/atom/movable/screen/movable/spell_master/proc/silence_spells(amount)
for(var/atom/movable/screen/spell/spell in spell_objects)
spell.spell.silenced = amount
spell.update_charge(1)
@@ -155,7 +155,7 @@
var/spell_base = "wiz"
var/last_charge = 0 //not a time, but the last remembered charge value
- var/spell/spell = null
+ var/datum/spell/spell = null
var/handle_icon_updates = 0
var/atom/movable/screen/movable/spell_master/spellmaster
diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm
index cdcd623e40..397bba0a83 100644
--- a/code/controllers/subsystems/air.dm
+++ b/code/controllers/subsystems/air.dm
@@ -128,7 +128,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
// Maps should not have active edges on boot. If we've got some, log it so it can get fixed.
if(length(active_edges))
var/list/edge_log = list()
- for(var/connection_edge/E in active_edges)
+ for(var/datum/connection_edge/E in active_edges)
var/a_temp = E.A.air.temperature
var/a_moles = E.A.air.total_moles
@@ -143,8 +143,8 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
var/b_gas = ""
// Two zones mixing
- if(istype(E, /connection_edge/zone))
- var/connection_edge/zone/Z = E
+ if(istype(E, /datum/connection_edge/zone))
+ var/datum/connection_edge/zone/Z = E
b_temp = Z.B.air.temperature
b_moles = Z.B.air.total_moles
b_vol = Z.B.air.volume
@@ -152,8 +152,8 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
b_gas += "[gas]=[Z.B.air.gas[gas]]"
// Zone and unsimulated turfs mixing
- if(istype(E, /connection_edge/unsimulated))
- var/connection_edge/unsimulated/U = E
+ if(istype(E, /datum/connection_edge/unsimulated))
+ var/datum/connection_edge/unsimulated/U = E
b_temp = U.B.temperature
b_moles = "Unsim"
b_vol = "Unsim"
@@ -260,7 +260,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
//cache for sanic speed (lists are references anyways)
var/list/currentrun = src.currentrun
while(length(currentrun))
- var/connection_edge/edge = currentrun[length(currentrun)]
+ var/datum/connection_edge/edge = currentrun[length(currentrun)]
currentrun.len--
if(edge) // TODO - Do we need to check this? Old one didn't, but old one was single-threaded.
edge.tick()
@@ -273,7 +273,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
//cache for sanic speed (lists are references anyways)
var/list/currentrun = src.currentrun
while(length(currentrun))
- var/zone/Z = currentrun[length(currentrun)]
+ var/datum/zone/Z = currentrun[length(currentrun)]
currentrun.len--
if(Z) // TODO - Do we need to check this? Old one didn't, but old one was single-threaded.
Z.process_fire()
@@ -308,7 +308,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
//cache for sanic speed (lists are references anyways)
var/list/currentrun = src.currentrun
while(length(currentrun))
- var/zone/zone = currentrun[length(currentrun)]
+ var/datum/zone/zone = currentrun[length(currentrun)]
currentrun.len--
if(zone) // TODO - Do we need to check this? Old one didn't, but old one was single-threaded.
zone.tick()
@@ -358,7 +358,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
stoplag()
// Invalidate all zones
- for(var/zone/zone in zones)
+ for(var/datum/zone/zone in zones)
zone.c_invalidate()
// Reset all the lists
@@ -377,12 +377,12 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
next_fire = world.time + wait
can_fire = TRUE // Unpause
-/datum/controller/subsystem/air/proc/add_zone(zone/z)
+/datum/controller/subsystem/air/proc/add_zone(datum/zone/z)
zones.Add(z)
z.name = "Zone [next_id++]"
mark_zone_update(z)
-/datum/controller/subsystem/air/proc/remove_zone(zone/z)
+/datum/controller/subsystem/air/proc/remove_zone(datum/zone/z)
zones.Remove(z)
zones_to_update.Remove(z)
@@ -396,7 +396,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
return BLOCKED
return ablock | B.c_airblock(A)
-/datum/controller/subsystem/air/proc/merge(zone/A, zone/B)
+/datum/controller/subsystem/air/proc/merge(datum/zone/A, datum/zone/B)
#ifdef ZASDBG
ASSERT(istype(A))
ASSERT(istype(B))
@@ -449,7 +449,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
return
- var/connection/c = new /connection(A,B)
+ var/datum/connection/c = new /datum/connection(A,B)
A.connections.place(c, a_to_b)
B.connections.place(c, b_to_a)
@@ -468,7 +468,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
#endif
T.needs_air_update = 1
-/datum/controller/subsystem/air/proc/mark_zone_update(zone/Z)
+/datum/controller/subsystem/air/proc/mark_zone_update(datum/zone/Z)
#ifdef ZASDBG
ASSERT(istype(Z))
#endif
@@ -477,7 +477,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
zones_to_update.Add(Z)
Z.needs_update = 1
-/datum/controller/subsystem/air/proc/mark_edge_sleeping(connection_edge/E)
+/datum/controller/subsystem/air/proc/mark_edge_sleeping(datum/connection_edge/E)
#ifdef ZASDBG
ASSERT(istype(E))
#endif
@@ -486,7 +486,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
active_edges.Remove(E)
E.sleeping = 1
-/datum/controller/subsystem/air/proc/mark_edge_active(connection_edge/E)
+/datum/controller/subsystem/air/proc/mark_edge_active(datum/connection_edge/E)
#ifdef ZASDBG
ASSERT(istype(E))
#endif
@@ -495,23 +495,23 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
active_edges.Add(E)
E.sleeping = 0
-/datum/controller/subsystem/air/proc/equivalent_pressure(zone/A, zone/B)
+/datum/controller/subsystem/air/proc/equivalent_pressure(datum/zone/A, datum/zone/B)
return A.air.compare(B.air)
-/datum/controller/subsystem/air/proc/get_edge(zone/A, zone/B)
+/datum/controller/subsystem/air/proc/get_edge(datum/zone/A, datum/zone/B)
if(istype(B))
- for(var/connection_edge/zone/edge in A.edges)
+ for(var/datum/connection_edge/zone/edge in A.edges)
if(edge.contains_zone(B))
return edge
- var/connection_edge/edge = new /connection_edge/zone(A,B)
+ var/datum/connection_edge/edge = new /datum/connection_edge/zone(A,B)
edges.Add(edge)
edge.recheck()
return edge
else
- for(var/connection_edge/unsimulated/edge in A.edges)
+ for(var/datum/connection_edge/unsimulated/edge in A.edges)
if(has_same_air(edge.B,B))
return edge
- var/connection_edge/edge = new /connection_edge/unsimulated(A,B)
+ var/datum/connection_edge/edge = new /datum/connection_edge/unsimulated(A,B)
edges.Add(edge)
edge.recheck()
return edge
@@ -533,7 +533,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
return FALSE
return TRUE
-/datum/controller/subsystem/air/proc/remove_edge(connection_edge/E)
+/datum/controller/subsystem/air/proc/remove_edge(datum/connection_edge/E)
edges.Remove(E)
if(!E.sleeping)
active_edges.Remove(E)
diff --git a/code/controllers/subsystems/airflow.dm b/code/controllers/subsystems/airflow.dm
index ec674bcb6f..8efbaa5d7b 100644
--- a/code/controllers/subsystems/airflow.dm
+++ b/code/controllers/subsystems/airflow.dm
@@ -54,7 +54,7 @@ SUBSYSTEM_DEF(airflow)
target.airflow_process_delay = 0
target.airflow_speed = min(target.airflow_speed, 15)
- target.airflow_speed -= vsc.airflow_speed_decay
+ target.airflow_speed -= GLOB.vsc.airflow_speed_decay
if (!target.airflow_skip_speedcheck)
if (target.airflow_speed > 7)
if (target.airflow_time++ >= target.airflow_speed - 7)
@@ -98,7 +98,7 @@ SUBSYSTEM_DEF(airflow)
step_towards(target, target.airflow_dest)
var/mob/M = target
if (ismob(target) && M.client)
- M.setMoveCooldown(vsc.airflow_mob_slowdown)
+ M.setMoveCooldown(GLOB.vsc.airflow_mob_slowdown)
if (MC_TICK_CHECK)
return
@@ -113,7 +113,7 @@ SUBSYSTEM_DEF(airflow)
var/tmp/airflow_skip_speedcheck
/atom/movable/proc/prepare_airflow(n)
- if (!airflow_dest || airflow_speed < 0 || last_airflow > world.time - vsc.airflow_delay)
+ if (!airflow_dest || airflow_speed < 0 || last_airflow > world.time - GLOB.vsc.airflow_delay)
return FALSE
if (airflow_speed)
airflow_speed = n / max(get_dist(src, airflow_dest), 1)
diff --git a/code/controllers/subsystems/chemistry.dm b/code/controllers/subsystems/chemistry.dm
index 5f963d6b51..7abcc0818b 100644
--- a/code/controllers/subsystems/chemistry.dm
+++ b/code/controllers/subsystems/chemistry.dm
@@ -27,17 +27,17 @@ SUBSYSTEM_DEF(chemistry)
msg = "C: [length(chemical_reagents)] | R: [length(chemical_reactions)]"
return ..()
-//Chemical Reactions - Initialises all /decl/chemical_reaction into a list
+//Chemical Reactions - Initialises all /datum/decl/chemical_reaction into a list
// It is filtered into multiple lists within a list.
// For example:
// chemical_reactions_by_reagent[REAGENT_ID_PHORON] is a list of all reactions relating to phoron
// Note that entries in the list are NOT duplicated. So if a reaction pertains to
// more than one chemical it will still only appear in only one of the sublists.
/datum/controller/subsystem/chemistry/proc/initialize_chemical_reactions()
- var/list/paths = decls_repository.get_decls_of_subtype(/decl/chemical_reaction)
+ var/list/paths = GLOB.decls_repository.get_decls_of_subtype(/datum/decl/chemical_reaction)
for(var/path in paths)
- var/decl/chemical_reaction/D = paths[path]
+ var/datum/decl/chemical_reaction/D = paths[path]
chemical_reactions += D
var/list/scan_list = list()
@@ -50,13 +50,13 @@ SUBSYSTEM_DEF(chemistry)
var/reagent_id = scan_list[i]
var/list/add_to = instant_reactions_by_reagent // Default to instant reactions list, if something's gone wrong
-// if(istype(D, /decl/chemical_reaction/fusion)) // TODO: fusion reactions as chemical reactions
+// if(istype(D, /datum/decl/chemical_reaction/fusion)) // TODO: fusion reactions as chemical reactions
// add_to = fusion_reactions_by_reagent
- if(istype(D, /decl/chemical_reaction/distilling))
+ if(istype(D, /datum/decl/chemical_reaction/distilling))
add_to = distilled_reactions_by_reagent
if(D.result)
- if(istype(D, /decl/chemical_reaction/distilling))
+ if(istype(D, /datum/decl/chemical_reaction/distilling))
LAZYINITLIST(distilled_reactions_by_product[D.result])
distilled_reactions_by_product[D.result] |= D // for reverse lookup
else
diff --git a/code/controllers/subsystems/internal_wiki.dm b/code/controllers/subsystems/internal_wiki.dm
index 9d6d88aee2..180dd1b69c 100644
--- a/code/controllers/subsystems/internal_wiki.dm
+++ b/code/controllers/subsystems/internal_wiki.dm
@@ -243,17 +243,17 @@ SUBSYSTEM_DEF(internal_wiki)
data["instant_reactions"] = null
if(reaction_list != null && length(reaction_list) > 0)
var/list/display_reactions = list()
- for(var/decl/chemical_reaction/CR in reaction_list)
+ for(var/datum/decl/chemical_reaction/CR in reaction_list)
if(CR.wiki_flag & WIKI_SPOILER)
continue
display_reactions.Add(CR)
var/reactions = list()
- for(var/decl/chemical_reaction/CR in display_reactions)
+ for(var/datum/decl/chemical_reaction/CR in display_reactions)
var/list/assemble_reaction = list()
var/list/reqs = list()
for(var/RQ in CR.required_reagents)
- var/decl/chemical_reaction/r_RQ = SSchemistry.chemical_reagents[RQ]
+ var/datum/decl/chemical_reaction/r_RQ = SSchemistry.chemical_reagents[RQ]
if(!r_RQ)
log_runtime(EXCEPTION("Invalid reagent id: [RQ]"))
continue
@@ -261,7 +261,7 @@ SUBSYSTEM_DEF(internal_wiki)
assemble_reaction["required"] = reqs
var/list/inhib = list()
for(var/IH in CR.inhibitors)
- var/decl/chemical_reaction/r_IH = SSchemistry.chemical_reagents[IH]
+ var/datum/decl/chemical_reaction/r_IH = SSchemistry.chemical_reagents[IH]
if(!r_IH)
log_runtime(EXCEPTION("Invalid reagent id: [IH]"))
continue
@@ -269,15 +269,15 @@ SUBSYSTEM_DEF(internal_wiki)
assemble_reaction["inhibitor"] = inhib
var/list/catal = list()
for(var/CL in CR.catalysts)
- var/decl/chemical_reaction/r_CL = SSchemistry.chemical_reagents[CL]
+ var/datum/decl/chemical_reaction/r_CL = SSchemistry.chemical_reagents[CL]
if(!r_CL)
log_runtime(EXCEPTION("Invalid reagent id: [CL]"))
continue
catal.Add("[r_CL.name]")
assemble_reaction["catalysts"] = catal
assemble_reaction["is_slime"] = null
- if(istype(CR,/decl/chemical_reaction/instant/slime))
- var/decl/chemical_reaction/instant/slime/CRS = CR
+ if(istype(CR, /datum/decl/chemical_reaction/instant/slime))
+ var/datum/decl/chemical_reaction/instant/slime/CRS = CR
var/obj/item/slime_extract/slime_path = CRS.required
assemble_reaction["is_slime"] = initial(slime_path.name)
reactions += list(assemble_reaction)
@@ -287,13 +287,13 @@ SUBSYSTEM_DEF(internal_wiki)
data["distilled_reactions"] = null
if(distilled_list != null && length(distilled_list) > 0)
var/list/display_reactions = list()
- for(var/decl/chemical_reaction/distilling/CR in distilled_list)
+ for(var/datum/decl/chemical_reaction/distilling/CR in distilled_list)
if(CR.wiki_flag & WIKI_SPOILER)
continue
display_reactions.Add(CR)
var/reactions = list()
- for(var/decl/chemical_reaction/distilling/CR in display_reactions)
+ for(var/datum/decl/chemical_reaction/distilling/CR in display_reactions)
var/list/assemble_reaction = list()
assemble_reaction["temp_min"] = CR.temp_range[1]
assemble_reaction["temp_max"] = CR.temp_range[2]
@@ -303,7 +303,7 @@ SUBSYSTEM_DEF(internal_wiki)
assemble_reaction["rejects_xgm_gas"] = CR.rejects_xgm_gas ? GLOB.gas_data.name[CR.rejects_xgm_gas] : null
var/list/reqs = list()
for(var/RQ in CR.required_reagents)
- var/decl/chemical_reaction/r_RQ = SSchemistry.chemical_reagents[RQ]
+ var/datum/decl/chemical_reaction/r_RQ = SSchemistry.chemical_reagents[RQ]
if(!r_RQ)
log_runtime(EXCEPTION("Invalid reagent id: [RQ]"))
continue
@@ -311,7 +311,7 @@ SUBSYSTEM_DEF(internal_wiki)
assemble_reaction["required"] = reqs
var/list/inhib = list()
for(var/IH in CR.inhibitors)
- var/decl/chemical_reaction/r_IH = SSchemistry.chemical_reagents[IH]
+ var/datum/decl/chemical_reaction/r_IH = SSchemistry.chemical_reagents[IH]
if(!r_IH)
log_runtime(EXCEPTION("Invalid reagent id: [IH]"))
continue
@@ -319,7 +319,7 @@ SUBSYSTEM_DEF(internal_wiki)
assemble_reaction["inhibitor"] = inhib
var/list/catal = list()
for(var/CL in CR.catalysts)
- var/decl/chemical_reaction/r_CL = SSchemistry.chemical_reagents[CL]
+ var/datum/decl/chemical_reaction/r_CL = SSchemistry.chemical_reagents[CL]
if(!r_CL)
log_runtime(EXCEPTION("Invalid reagent id: [CL]"))
continue
@@ -368,7 +368,7 @@ SUBSYSTEM_DEF(internal_wiki)
display_reactions = list()
for(var/O in GLOB.ore_data)
- var/ore/OR = GLOB.ore_data[O]
+ var/datum/ore/OR = GLOB.ore_data[O]
if(OR.reagent == R.id)
display_reactions.Add(OR.name)
data["fluid"] = null
@@ -379,10 +379,10 @@ SUBSYSTEM_DEF(internal_wiki)
// We need to do this instead of using distilled_reactions_by_reagent, because SSchem was built around unique logic that only uses the first reagent key found.
// So if we collected them all, chemistry as players know it will explode. So we recheck all reagent datums directly instead and see if we're used by them.
- var/list/paths = decls_repository.get_decls_of_subtype(/decl/chemical_reaction)
+ var/list/paths = GLOB.decls_repository.get_decls_of_subtype(/datum/decl/chemical_reaction)
for(var/path in paths)
- var/decl/chemical_reaction/D = paths[path]
- if(istype(D,/decl/chemical_reaction/instant/slime))
+ var/datum/decl/chemical_reaction/D = paths[path]
+ if(istype(D, /datum/decl/chemical_reaction/instant/slime))
continue
if(!D.result)
continue
@@ -463,7 +463,7 @@ SUBSYSTEM_DEF(internal_wiki)
PRIVATE_PROC(TRUE)
// assemble ore wiki
for(var/N in GLOB.ore_data)
- var/ore/OR = GLOB.ore_data[N]
+ var/datum/ore/OR = GLOB.ore_data[N]
if(OR.wiki_flag & WIKI_SPOILER)
spoiler_entries.Add(OR.type)
continue
@@ -607,7 +607,7 @@ SUBSYSTEM_DEF(internal_wiki)
)
qdel(R)
// basically condiments, tofu, cheese, soysauce, etc
- for(var/decl/chemical_reaction/instant/CR in SSchemistry.chemical_reactions)
+ for(var/datum/decl/chemical_reaction/instant/CR in SSchemistry.chemical_reactions)
if(!allow_reagent(CR.result))
continue
if(CR.wiki_flag & WIKI_SPOILER)
@@ -785,7 +785,7 @@ SUBSYSTEM_DEF(internal_wiki)
// ORES
////////////////////////////////////////////
-/datum/internal_wiki/page/ore/assemble(var/ore/O)
+/datum/internal_wiki/page/ore/assemble(var/datum/ore/O)
title = O.display_name
data["title"] = title
var/obj/item/ore/ore_path = O.ore
diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm
index bec11f8d16..28fc3335d9 100644
--- a/code/controllers/subsystems/plants.dm
+++ b/code/controllers/subsystems/plants.dm
@@ -77,7 +77,7 @@ SUBSYSTEM_DEF(plants)
S.update_seed()
//Might as well mask the gene types while we're at it.
- var/list/gene_datums = decls_repository.get_decls_of_subtype(/decl/plantgene)
+ var/list/gene_datums = GLOB.decls_repository.get_decls_of_subtype(/datum/decl/plantgene)
var/list/used_masks = list()
var/list/plant_traits = ALL_GENES
while(plant_traits && length(plant_traits))
@@ -87,10 +87,10 @@ SUBSYSTEM_DEF(plants)
while(gene_mask in used_masks)
gene_mask = "[uppertext(num2hex(rand(0,255), 2))]"
- var/decl/plantgene/G
+ var/datum/decl/plantgene/G
for(var/D in gene_datums)
- var/decl/plantgene/P = gene_datums[D]
+ var/datum/decl/plantgene/P = gene_datums[D]
if(gene_tag == P.gene_tag)
G = P
gene_datums -= D
diff --git a/code/datums/hierarchy.dm b/code/datums/hierarchy.dm
index 32f0ab3587..eeba12b7a0 100644
--- a/code/datums/hierarchy.dm
+++ b/code/datums/hierarchy.dm
@@ -1,10 +1,10 @@
-/decl/hierarchy
+/datum/decl/hierarchy
var/name = "Hierarchy"
var/hierarchy_type
- var/decl/hierarchy/parent
- var/list/decl/hierarchy/children
+ var/datum/decl/hierarchy/parent
+ var/list/datum/decl/hierarchy/children
-/decl/hierarchy/New(var/full_init = TRUE)
+/datum/decl/hierarchy/New(var/full_init = TRUE)
children = list()
if(!full_init)
return
@@ -15,16 +15,16 @@
all_subtypes[subtype] = new subtype(FALSE)
for(var/subtype in (all_subtypes - type))
- var/decl/hierarchy/subtype_instance = all_subtypes[subtype]
- var/decl/hierarchy/subtype_parent = all_subtypes[subtype_instance.parent_type]
+ var/datum/decl/hierarchy/subtype_instance = all_subtypes[subtype]
+ var/datum/decl/hierarchy/subtype_parent = all_subtypes[subtype_instance.parent_type]
subtype_instance.parent = subtype_parent
dd_insertObjectList(subtype_parent.children, subtype_instance)
-/decl/hierarchy/proc/is_category()
+/datum/decl/hierarchy/proc/is_category()
return hierarchy_type == type || children.len
-/decl/hierarchy/proc/is_hidden_category()
+/datum/decl/hierarchy/proc/is_hidden_category()
return hierarchy_type == type
-/decl/hierarchy/dd_SortValue()
+/datum/decl/hierarchy/dd_SortValue()
return name
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index b8437e8822..31a22d5306 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -96,7 +96,7 @@
new_character.make_changeling()
if(learned_spells)
- for(var/spell/spell_to_add in learned_spells)
+ for(var/datum/spell/spell_to_add in learned_spells)
new_character.add_spell(spell_to_add)
if(active || force)
diff --git a/code/datums/observation/destroyed.dm b/code/datums/observation/destroyed.dm
index a1c645e9f6..3d62266f71 100644
--- a/code/datums/observation/destroyed.dm
+++ b/code/datums/observation/destroyed.dm
@@ -6,7 +6,7 @@
// Arguments that the called proc should expect:
// /datum/destroyed_instance: The instance that was destroyed.
/*
-/decl/observ/destroyed
+/datum/decl/observ/destroyed
name = "Destroyed"
*/
//Deprecated in favor of Comsigs
diff --git a/code/datums/observation/equipped.dm b/code/datums/observation/equipped.dm
index a64d1e76df..b5a9fc5a95 100644
--- a/code/datums/observation/equipped.dm
+++ b/code/datums/observation/equipped.dm
@@ -8,9 +8,9 @@
// /obj/item/item: The equipped item.
// slot: The slot equipped to.
/*
-GLOBAL_DATUM_INIT(mob_equipped_event, /decl/observ/mob_equipped, new)
+GLOBAL_DATUM_INIT(mob_equipped_event, /datum/decl/observ/mob_equipped, new)
-/decl/observ/mob_equipped
+/datum/decl/observ/mob_equipped
name = "Mob Equipped"
expected_type = /mob
@@ -23,9 +23,9 @@ GLOBAL_DATUM_INIT(mob_equipped_event, /decl/observ/mob_equipped, new)
// /obj/item/item: The equipped item.
// /mob/equipper: The mob that equipped the item.
// slot: The slot equipped to.
-GLOBAL_DATUM_INIT(item_equipped_event, /decl/observ/item_equipped, new)
+GLOBAL_DATUM_INIT(item_equipped_event, /datum/decl/observ/item_equipped, new)
-/decl/observ/item_equipped
+/datum/decl/observ/item_equipped
name = "Item Equipped"
expected_type = /obj/item
*/
diff --git a/code/datums/observation/moved.dm b/code/datums/observation/moved.dm
index d7670b09dc..8c5261befa 100644
--- a/code/datums/observation/moved.dm
+++ b/code/datums/observation/moved.dm
@@ -9,14 +9,14 @@
// /atom/new_loc: The loc after the move.
/*
-GLOBAL_DATUM_INIT(moved_event, /decl/observ/moved, new)
+GLOBAL_DATUM_INIT(moved_event, /datum/decl/observ/moved, new)
-/decl/observ/moved
+/datum/decl/observ/moved
name = "Moved"
expected_type = /atom/movable
-/decl/observ/moved/register(var/atom/movable/mover, var/datum/listener, var/proc_call)
+/datum/decl/observ/moved/register(var/atom/movable/mover, var/datum/listener, var/proc_call)
. = ..()
// Listen to the parent if possible.
diff --git a/code/datums/observation/power_change.dm b/code/datums/observation/power_change.dm
index 2a5ef3b579..c0b7825fac 100644
--- a/code/datums/observation/power_change.dm
+++ b/code/datums/observation/power_change.dm
@@ -6,9 +6,9 @@
// Arguments that the called proc should expect:
// /area: The area experiencing the power change
/*
-GLOBAL_DATUM_INIT(apc_event, /decl/observ/area_power_change, new)
+GLOBAL_DATUM_INIT(apc_event, /datum/decl/observ/area_power_change, new)
-/decl/observ/area_power_change
+/datum/decl/observ/area_power_change
name = "Area Power Change"
expected_type = /area
diff --git a/code/datums/observation/shuttle_added.dm b/code/datums/observation/shuttle_added.dm
index 2dd865a543..5cdbbd9836 100644
--- a/code/datums/observation/shuttle_added.dm
+++ b/code/datums/observation/shuttle_added.dm
@@ -6,9 +6,9 @@
// Arguments that the called proc should expect:
// /datum/shuttle/shuttle: the new shuttle
/*
-GLOBAL_DATUM_INIT(shuttle_added, /decl/observ/shuttle_added, new)
+GLOBAL_DATUM_INIT(shuttle_added, /datum/decl/observ/shuttle_added, new)
-/decl/observ/shuttle_added
+/datum/decl/observ/shuttle_added
name = "Shuttle Added"
expected_type = /datum/shuttle
*/
diff --git a/code/datums/observation/stat_set.dm b/code/datums/observation/stat_set.dm
index 08db60a380..b00b15623d 100644
--- a/code/datums/observation/stat_set.dm
+++ b/code/datums/observation/stat_set.dm
@@ -8,9 +8,9 @@
// /old_stat: Status before the change.
// /new_stat: Status after the change.
/*
-stat_set_event, /decl/observ/stat_set, new)
+stat_set_event, /datum/decl/observ/stat_set, new)
-/decl/observ/stat_set
+/datum/decl/observ/stat_set
name = "Stat Set"
expected_type = /mob/living
*/
diff --git a/code/datums/observation/turf_enterexit.dm b/code/datums/observation/turf_enterexit.dm
index 5a6667cb5c..b1df31a7ce 100644
--- a/code/datums/observation/turf_enterexit.dm
+++ b/code/datums/observation/turf_enterexit.dm
@@ -9,14 +9,14 @@
// /atom/old_loc / /atom/new_loc: The previous/new loc of the mover
/*
-GLOBAL_DATUM_INIT(turf_entered_event, /decl/observ/turf_entered, new)
-GLOBAL_DATUM_INIT(turf_exited_event, /decl/observ/turf_exited, new)
+GLOBAL_DATUM_INIT(turf_entered_event, /datum/decl/observ/turf_entered, new)
+GLOBAL_DATUM_INIT(turf_exited_event, /datum/decl/observ/turf_exited, new)
-/decl/observ/turf_entered
+/datum/decl/observ/turf_entered
name = "Turf Entered"
expected_type = /turf
-/decl/observ/turf_exited
+/datum/decl/observ/turf_exited
name = "Turf Exited"
expected_type = /turf
diff --git a/code/datums/observation/unequipped.dm b/code/datums/observation/unequipped.dm
index 5b0dd0fe83..0471c298f9 100644
--- a/code/datums/observation/unequipped.dm
+++ b/code/datums/observation/unequipped.dm
@@ -7,9 +7,9 @@
// /mob/equipped: The mob that unequipped/dropped the item.
// /obj/item/item: The unequipped item.
/*
-GLOBAL_DATUM_INIT(mob_unequipped_event, /decl/observ/mob_unequipped, new)
+GLOBAL_DATUM_INIT(mob_unequipped_event, /datum/decl/observ/mob_unequipped, new)
-/decl/observ/mob_unequipped
+/datum/decl/observ/mob_unequipped
name = "Mob Unequipped"
expected_type = /mob
@@ -22,9 +22,9 @@ GLOBAL_DATUM_INIT(mob_unequipped_event, /decl/observ/mob_unequipped, new)
// /obj/item/item: The unequipped item.
// /mob/equipped: The mob that unequipped/dropped the item.
-GLOBAL_DATUM_INIT(item_unequipped_event, /decl/observ/item_unequipped, new)
+GLOBAL_DATUM_INIT(item_unequipped_event, /datum/decl/observ/item_unequipped, new)
-/decl/observ/item_unequipped
+/datum/decl/observ/item_unequipped
name = "Item Unequipped"
expected_type = /obj/item
*/
diff --git a/code/datums/outfits/costumes/costume.dm b/code/datums/outfits/costumes/costume.dm
index 22388f8e49..7463c9c90d 100644
--- a/code/datums/outfits/costumes/costume.dm
+++ b/code/datums/outfits/costumes/costume.dm
@@ -1,2 +1,2 @@
-/decl/hierarchy/outfit/costume
+/datum/decl/hierarchy/outfit/costume
undress = 0
diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm
index d8ad20d0f6..7198633c11 100644
--- a/code/datums/outfits/costumes/halloween.dm
+++ b/code/datums/outfits/costumes/halloween.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/costume/masked_killer
+/datum/decl/hierarchy/outfit/costume/masked_killer
name = OUTFIT_COSTUME("Masked Killer")
uniform = /obj/item/clothing/under/overalls
shoes = /obj/item/clothing/shoes/white
@@ -8,12 +8,12 @@
suit = /obj/item/clothing/suit/storage/apron
r_hand = /obj/item/material/twohanded/fireaxe/foam
-/decl/hierarchy/outfit/costume/masked_killer/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/costume/masked_killer/post_equip(var/mob/living/carbon/human/H)
var/victim = get_mannequin(H.ckey)
for(var/obj/item/carried_item in H.get_equipped_items(TRUE))
carried_item.add_blood(victim) //Oh yes, there will be blood.. just not blood from the killer because that's odd. //If I knew how to make fake blood, I would
-/decl/hierarchy/outfit/costume/professional
+/datum/decl/hierarchy/outfit/costume/professional
name = OUTFIT_COSTUME("Professional")
uniform = /obj/item/clothing/under/suit_jacket{ starting_accessories=list(/obj/item/clothing/accessory/wcoat) }
shoes = /obj/item/clothing/shoes/black
@@ -21,7 +21,7 @@
glasses = /obj/item/clothing/glasses/fakesunglasses
l_pocket = /obj/item/toy/sword
-/decl/hierarchy/outfit/costume/professional/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/costume/professional/post_equip(var/mob/living/carbon/human/H)
var/obj/item/storage/briefcase/new_briefcase = new(H)
for(var/obj/item/briefcase_item in new_briefcase)
qdel(briefcase_item)
@@ -30,7 +30,7 @@
new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat
H.equip_to_slot_or_del(new_briefcase, slot_l_hand)
-/decl/hierarchy/outfit/costume/horrorcop
+/datum/decl/hierarchy/outfit/costume/horrorcop
name = OUTFIT_COSTUME("Slasher Movie Cop")
uniform = /obj/item/clothing/under/corp/pcrc{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) }
shoes = /obj/item/clothing/shoes/black
@@ -40,7 +40,7 @@
head = /obj/item/clothing/head/beret
r_hand = /obj/item/gun/projectile/revolver/capgun
-/decl/hierarchy/outfit/costume/horrorcop/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/costume/horrorcop/post_equip(var/mob/living/carbon/human/H)
var/obj/item/clothing/under/U = H.w_uniform
if(LAZYLEN(U.accessories))
for(var/obj/item/clothing/accessory/A in U.accessories)
@@ -48,7 +48,7 @@
var/obj/item/clothing/accessory/holster/O = A
O.holster_verb()
-/decl/hierarchy/outfit/costume/cowboy
+/datum/decl/hierarchy/outfit/costume/cowboy
name = OUTFIT_COSTUME("Cowboy")
uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) }
shoes = /obj/item/clothing/shoes/boots/cowboy
@@ -57,7 +57,7 @@
suit = /obj/item/clothing/accessory/poncho
r_hand = /obj/item/gun/projectile/revolver/capgun
-/decl/hierarchy/outfit/costume/cowboy/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/costume/cowboy/post_equip(var/mob/living/carbon/human/H)
var/obj/item/clothing/under/U = H.w_uniform
if(LAZYLEN(U.accessories))
for(var/obj/item/clothing/accessory/A in U.accessories)
@@ -65,7 +65,7 @@
var/obj/item/clothing/accessory/holster/O = A
O.holster_verb()
-/decl/hierarchy/outfit/costume/lumberjack
+/datum/decl/hierarchy/outfit/costume/lumberjack
name = OUTFIT_COSTUME("Lumberjack")
uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/sweater/blackneck) }
shoes = /obj/item/clothing/shoes/boots/workboots
@@ -74,7 +74,7 @@
suit = /obj/item/clothing/suit/storage/flannel/red
r_hand = /obj/item/material/twohanded/fireaxe/foam
-/decl/hierarchy/outfit/costume/firefighter
+/datum/decl/hierarchy/outfit/costume/firefighter
name = OUTFIT_COSTUME("Firefighter")
uniform = /obj/item/clothing/under/pants
shoes = /obj/item/clothing/shoes/boots/workboots
@@ -82,21 +82,21 @@
gloves = /obj/item/clothing/gloves/black
suit = /obj/item/clothing/suit/fire/firefighter
-/decl/hierarchy/outfit/costume/highlander
+/datum/decl/hierarchy/outfit/costume/highlander
name = OUTFIT_COSTUME("Highlander")
uniform = /obj/item/clothing/under/kilt
shoes = /obj/item/clothing/shoes/boots/jackboots
head = /obj/item/clothing/head/beret
r_hand = /obj/item/material/sword/foam
-/decl/hierarchy/outfit/costume/vampire
+/datum/decl/hierarchy/outfit/costume/vampire
name = OUTFIT_COSTUME("Vampire")
uniform = /obj/item/clothing/under/suit_jacket/really_black
shoes = /obj/item/clothing/shoes/dress
gloves = /obj/item/clothing/gloves/white
r_hand = /obj/item/bedsheet/red
-/decl/hierarchy/outfit/costume/vampire_hunter
+/datum/decl/hierarchy/outfit/costume/vampire_hunter
name = OUTFIT_COSTUME("Vampire Hunter")
uniform = /obj/item/clothing/under/pants/tan
suit = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
@@ -105,7 +105,7 @@
l_pocket = /obj/item/gun/projectile/revolver/toy/crossbow/halloween
r_pocket = /obj/item/flashlight/color/red
-/decl/hierarchy/outfit/costume/pirate
+/datum/decl/hierarchy/outfit/costume/pirate
name = OUTFIT_COSTUME("Pirate")
uniform = /obj/item/clothing/under/pirate
shoes = /obj/item/clothing/shoes/brown
@@ -113,7 +113,7 @@
suit = /obj/item/clothing/suit/pirate
glasses = /obj/item/clothing/glasses/eyepatch
-/decl/hierarchy/outfit/costume/whiteout
+/datum/decl/hierarchy/outfit/costume/whiteout
name = OUTFIT_COSTUME("Snow Ghost")
uniform = /obj/item/clothing/under/color/white{ starting_accessories=list(/obj/item/clothing/accessory/scarf/white) }
shoes = /obj/item/clothing/shoes/white
@@ -121,7 +121,7 @@
gloves = /obj/item/clothing/gloves/white
mask = /obj/item/clothing/mask/surgical
-/decl/hierarchy/outfit/costume/marine
+/datum/decl/hierarchy/outfit/costume/marine
name = OUTFIT_COSTUME("Ruin Marine")
uniform = /obj/item/clothing/under/color/grey
shoes = /obj/item/clothing/shoes/brown
diff --git a/code/datums/outfits/horror_killers.dm b/code/datums/outfits/horror_killers.dm
index 6f38c18df0..4e0bde4808 100644
--- a/code/datums/outfits/horror_killers.dm
+++ b/code/datums/outfits/horror_killers.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/tunnel_clown
+/datum/decl/hierarchy/outfit/tunnel_clown
name = "Tunnel Clown"
uniform = /obj/item/clothing/under/rank/clown
shoes = /obj/item/clothing/shoes/clown_shoes
@@ -18,7 +18,7 @@
headset_alt = /obj/item/radio/headset/alt
headset_earbud = /obj/item/radio/headset/earbud
-/decl/hierarchy/outfit/masked_killer
+/datum/decl/hierarchy/outfit/masked_killer
name = "Masked Killer"
uniform = /obj/item/clothing/under/overalls
shoes = /obj/item/clothing/shoes/white
@@ -35,12 +35,12 @@
headset_alt = /obj/item/radio/headset/alt
headset_earbud = /obj/item/radio/headset/earbud
-/decl/hierarchy/outfit/masked_killer/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/masked_killer/post_equip(var/mob/living/carbon/human/H)
var/victim = get_mannequin(H.ckey)
for(var/obj/item/carried_item in H.get_equipped_items(TRUE))
carried_item.add_blood(victim) //Oh yes, there will be blood.. just not blood from the killer because that's odd
-/decl/hierarchy/outfit/professional
+/datum/decl/hierarchy/outfit/professional
name = "Professional"
uniform = /obj/item/clothing/under/suit_jacket{ starting_accessories=list(/obj/item/clothing/accessory/wcoat) }
shoes = /obj/item/clothing/shoes/black
@@ -58,7 +58,7 @@
headset_alt = /obj/item/radio/headset/alt
headset_earbud = /obj/item/radio/headset/earbud
-/decl/hierarchy/outfit/professional/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/professional/post_equip(var/mob/living/carbon/human/H)
var/obj/item/storage/secure/briefcase/sec_briefcase = new(H)
for(var/obj/item/briefcase_item in sec_briefcase)
qdel(briefcase_item)
diff --git a/code/datums/outfits/jobs/YW.dm b/code/datums/outfits/jobs/YW.dm
index 4aa0b522b4..c4503beac3 100644
--- a/code/datums/outfits/jobs/YW.dm
+++ b/code/datums/outfits/jobs/YW.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/job/blueshield
+/datum/decl/hierarchy/outfit/job/blueshield
name = OUTFIT_JOB_NAME(JOB_BLUESHIELD_GUARD)
uniform = /obj/item/clothing/under/yw/blueshield
shoes = /obj/item/clothing/shoes/laceup
diff --git a/code/datums/outfits/jobs/cargo.dm b/code/datums/outfits/jobs/cargo.dm
index 8dc1d6052b..a8a1a80d5f 100644
--- a/code/datums/outfits/jobs/cargo.dm
+++ b/code/datums/outfits/jobs/cargo.dm
@@ -1,11 +1,11 @@
-/decl/hierarchy/outfit/job/cargo
- hierarchy_type = /decl/hierarchy/outfit/job/cargo
+/datum/decl/hierarchy/outfit/job/cargo
+ hierarchy_type = /datum/decl/hierarchy/outfit/job/cargo
headset = /obj/item/radio/headset/cargo
headset_alt = /obj/item/radio/headset/alt/cargo
headset_earbud = /obj/item/radio/headset/earbud/cargo
-/decl/hierarchy/outfit/job/cargo/qm
+/datum/decl/hierarchy/outfit/job/cargo/qm
name = OUTFIT_JOB_NAME("Cargo")
uniform = /obj/item/clothing/under/rank/cargo
shoes = /obj/item/clothing/shoes/brown
@@ -18,13 +18,13 @@
headset_alt = /obj/item/radio/headset/alt/qm
headset_earbud = /obj/item/radio/headset/earbud/qm
-/decl/hierarchy/outfit/job/cargo/cargo_tech
+/datum/decl/hierarchy/outfit/job/cargo/cargo_tech
name = OUTFIT_JOB_NAME("Cargo technician")
uniform = /obj/item/clothing/under/rank/cargotech
id_type = /obj/item/card/id/cargo
pda_type = /obj/item/pda/cargo
-/decl/hierarchy/outfit/job/cargo/mining
+/datum/decl/hierarchy/outfit/job/cargo/mining
name = OUTFIT_JOB_NAME("Shaft miner")
uniform = /obj/item/clothing/under/rank/miner
backpack = /obj/item/storage/backpack/industrial
@@ -38,7 +38,7 @@
headset_alt = /obj/item/radio/headset/miner
headset_earbud = /obj/item/radio/headset/miner
-/decl/hierarchy/outfit/job/cargo/cargo_tech/mailman
+/datum/decl/hierarchy/outfit/job/cargo/cargo_tech/mailman
name = OUTFIT_JOB_NAME(JOB_ALT_MAILMAN)
uniform = /obj/item/clothing/under/rank/mailman2
head = /obj/item/clothing/head/mailman2
diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm
index 829e6f9c64..5ba6ced93b 100644
--- a/code/datums/outfits/jobs/civilian.dm
+++ b/code/datums/outfits/jobs/civilian.dm
@@ -1,49 +1,49 @@
-/decl/hierarchy/outfit/job/assistant
+/datum/decl/hierarchy/outfit/job/assistant
name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant
id_type = /obj/item/card/id/generic //VOREStation Edit
-/decl/hierarchy/outfit/job/assistant/visitor
+/datum/decl/hierarchy/outfit/job/assistant/visitor
name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR)
id_pda_assignment = JOB_ALT_VISITOR
uniform = /obj/item/clothing/under/assistantformal
//VOREStation Add - Interns
-/decl/hierarchy/outfit/job/assistant/intern
+/datum/decl/hierarchy/outfit/job/assistant/intern
name = OUTFIT_JOB_NAME(JOB_INTERN)
id_type = /obj/item/card/id/civilian
//VOREStation Add End - Interns
-/decl/hierarchy/outfit/job/assistant/resident
+/datum/decl/hierarchy/outfit/job/assistant/resident
name = OUTFIT_JOB_NAME(JOB_ALT_RESIDENT)
id_pda_assignment = JOB_ALT_RESIDENT
uniform = /obj/item/clothing/under/color/white
-/decl/hierarchy/outfit/job/service
- hierarchy_type = /decl/hierarchy/outfit/job/service
+/datum/decl/hierarchy/outfit/job/service
+ hierarchy_type = /datum/decl/hierarchy/outfit/job/service
headset = /obj/item/radio/headset/service
headset_alt = /obj/item/radio/headset/alt/service
headset_earbud = /obj/item/radio/headset/earbud/service
-/decl/hierarchy/outfit/job/service/bartender
+/datum/decl/hierarchy/outfit/job/service/bartender
name = OUTFIT_JOB_NAME(JOB_BARTENDER)
uniform = /obj/item/clothing/under/rank/bartender
id_type = /obj/item/card/id/civilian/service/bartender //VOREStation Edit
pda_type = /obj/item/pda/bar
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1)
-/decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H)
..()
if(H.back)
for(var/obj/item/clothing/accessory/permit/gun/bar/permit in H.back.contents)
permit.set_name(H.real_name)
-/decl/hierarchy/outfit/job/service/bartender/barista
+/datum/decl/hierarchy/outfit/job/service/bartender/barista
name = OUTFIT_JOB_NAME(JOB_ALT_BARISTA)
id_pda_assignment = JOB_ALT_BARISTA
backpack_contents = null
-/decl/hierarchy/outfit/job/service/chef
+/datum/decl/hierarchy/outfit/job/service/chef
name = OUTFIT_JOB_NAME(JOB_CHEF)
uniform = /obj/item/clothing/under/rank/chef
suit = /obj/item/clothing/suit/chef
@@ -51,19 +51,19 @@
id_type = /obj/item/card/id/civilian/service/chef //VOREStation Edit
pda_type = /obj/item/pda/chef
-/decl/hierarchy/outfit/job/service/chef/cook
+/datum/decl/hierarchy/outfit/job/service/chef/cook
name = OUTFIT_JOB_NAME(JOB_ALT_COOK)
id_pda_assignment = JOB_ALT_COOK
// Rykka adds Server Outfit
-/decl/hierarchy/outfit/job/service/server
+/datum/decl/hierarchy/outfit/job/service/server
name = OUTFIT_JOB_NAME(JOB_ALT_SERVER)
uniform = /obj/item/clothing/under/waiter
// End Outfit addition
-/decl/hierarchy/outfit/job/service/gardener
+/datum/decl/hierarchy/outfit/job/service/gardener
name = OUTFIT_JOB_NAME(JOB_ALT_GARDENER)
uniform = /obj/item/clothing/under/rank/hydroponics
suit = /obj/item/clothing/suit/storage/apron
@@ -76,23 +76,23 @@
id_type = /obj/item/card/id/civilian/service/botanist //VOREStation Edit
pda_type = /obj/item/pda/botanist
-/decl/hierarchy/outfit/job/service/janitor
+/datum/decl/hierarchy/outfit/job/service/janitor
name = OUTFIT_JOB_NAME(JOB_JANITOR)
uniform = /obj/item/clothing/under/rank/janitor
id_type = /obj/item/card/id/civilian/service/janitor //VOREStation Edit
pda_type = /obj/item/pda/janitor
-/decl/hierarchy/outfit/job/librarian
+/datum/decl/hierarchy/outfit/job/librarian
name = OUTFIT_JOB_NAME(JOB_LIBRARIAN)
uniform = /obj/item/clothing/under/suit_jacket/red
l_hand = /obj/item/barcodescanner
id_type = /obj/item/card/id/civilian
pda_type = /obj/item/pda/librarian
-/decl/hierarchy/outfit/job/librarian/journalist
+/datum/decl/hierarchy/outfit/job/librarian/journalist
id_type = /obj/item/card/id/civilian/journalist
-/decl/hierarchy/outfit/job/internal_affairs_agent
+/datum/decl/hierarchy/outfit/job/internal_affairs_agent
name = OUTFIT_JOB_NAME("Internal affairs agent")
uniform = /obj/item/clothing/under/rank/internalaffairs
suit = /obj/item/clothing/suit/storage/toggle/internalaffairs
@@ -106,14 +106,14 @@
headset_alt = /obj/item/radio/headset/alt/ia
headset_earbud = /obj/item/radio/headset/earbud/ia
-/decl/hierarchy/outfit/job/chaplain
+/datum/decl/hierarchy/outfit/job/chaplain
name = OUTFIT_JOB_NAME(JOB_CHAPLAIN)
uniform = /obj/item/clothing/under/rank/chaplain
l_hand = /obj/item/storage/bible
id_type = /obj/item/card/id/civilian/chaplain
pda_type = /obj/item/pda/chaplain
-/decl/hierarchy/outfit/job/explorer
+/datum/decl/hierarchy/outfit/job/explorer
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
diff --git a/code/datums/outfits/jobs/civilian_vr.dm b/code/datums/outfits/jobs/civilian_vr.dm
index c9e5cabc3c..ccc604dbac 100644
--- a/code/datums/outfits/jobs/civilian_vr.dm
+++ b/code/datums/outfits/jobs/civilian_vr.dm
@@ -1,97 +1,97 @@
-/decl/hierarchy/outfit/job/assistant/worker
+/datum/decl/hierarchy/outfit/job/assistant/worker
id_type = /obj/item/card/id/civilian/service
-/decl/hierarchy/outfit/job/assistant/cargo
+/datum/decl/hierarchy/outfit/job/assistant/cargo
id_type = /obj/item/card/id/cargo
-/decl/hierarchy/outfit/job/assistant/engineer
+/datum/decl/hierarchy/outfit/job/assistant/engineer
id_type = /obj/item/card/id/engineering
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
-/decl/hierarchy/outfit/job/assistant/medic
+/datum/decl/hierarchy/outfit/job/assistant/medic
id_type = /obj/item/card/id/medical
-/decl/hierarchy/outfit/job/assistant/scientist
+/datum/decl/hierarchy/outfit/job/assistant/scientist
id_type = /obj/item/card/id/science
-/decl/hierarchy/outfit/job/assistant/officer
+/datum/decl/hierarchy/outfit/job/assistant/officer
id_type = /obj/item/card/id/security
-/decl/hierarchy/outfit/job/assistant/entertainer
+/datum/decl/hierarchy/outfit/job/assistant/entertainer
id_type = /obj/item/card/id/civilian/entertainer
-/decl/hierarchy/outfit/job/assistant/entrepreneur
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur
id_type = /obj/item/card/id/civilian/entrepreneur
l_hand = /obj/item/ticket_printer/train
uniform = /obj/item/clothing/under/tropical/pink
-/decl/hierarchy/outfit/job/assistant/entrepreneur/lawyer
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/lawyer
uniform = /obj/item/clothing/under/lawyer/red
r_hand = /obj/item/clipboard
l_pocket = /obj/item/pen/fountain3
-/decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye
l_hand = /obj/item/storage/box/private_investigator
suit = /obj/item/clothing/suit/storage/trench
head = /obj/item/clothing/head/fedora/brown
-/decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard
glasses = /obj/item/clothing/glasses/sunglasses
l_pocket = /obj/item/reagent_containers/spray/pepper
suit = /obj/item/clothing/accessory/sweater/blackneck
-/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician
suit = /obj/item/clothing/suit/storage/toggle/labcoat
l_pocket = /obj/item/clothing/accessory/stethoscope
r_pocket = /obj/item/healthanalyzer
-/decl/hierarchy/outfit/job/assistant/entrepreneur/dentist
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/dentist
l_hand = /obj/item/storage/box/dentist
suit = /obj/item/clothing/suit/storage/toggle/labcoat
-/decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor
l_hand = /obj/item/storage/box/fitness_trainer
-/decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher
uniform = /obj/item/clothing/under/pants/yogapants
l_hand = /obj/item/storage/box/yoga_teacher
-/decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse
r_hand = /obj/item/roller/massage
-/decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson
r_hand = /obj/item/storage/toolbox/brass
-/decl/hierarchy/outfit/job/assistant/entrepreneur/streamer
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/streamer
l_pocket = /obj/item/tvcamera/streamer
-/decl/hierarchy/outfit/job/assistant/entrepreneur/influencer
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/influencer
l_pocket = /obj/item/camera/selfie
-/decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator
l_hand = /obj/item/storage/box/paranormal_investigator
-/decl/hierarchy/outfit/job/assistant/entrepreneur/stylist
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/stylist
l_hand = /obj/item/storage/box/stylist
-/decl/hierarchy/outfit/job/assistant/entrepreneur/fisher
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/fisher
r_hand = /obj/item/material/fishing_rod/modern
l_pocket = /obj/item/material/fishing_net
head = /obj/item/clothing/head/fishing
r_pocket = /obj/item/storage/box/wormcan
-/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
uniform = /obj/item/clothing/under/lawyer/blue
r_hand = /obj/item/clipboard
l_pocket = /obj/item/pen/fountain3
-/decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller
l_hand = /obj/item/storage/box/fortune_teller
-/decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer
l_hand = /obj/item/storage/box/spirit_healer
-/decl/hierarchy/outfit/job/assistant/entrepreneur/educator
+/datum/decl/hierarchy/outfit/job/assistant/entrepreneur/educator
uniform = /obj/item/clothing/under/suit_jacket/charcoal
r_hand = /obj/item/clipboard
l_pocket = /obj/item/pen/fountain2
diff --git a/code/datums/outfits/jobs/command.dm b/code/datums/outfits/jobs/command.dm
index 150edd35ce..d42e13f6ef 100644
--- a/code/datums/outfits/jobs/command.dm
+++ b/code/datums/outfits/jobs/command.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/job/captain
+/datum/decl/hierarchy/outfit/job/captain
name = OUTFIT_JOB_NAME(JOB_ALT_CAPTAIN) // Keep Captain for now, not JOB_SITE_MANAGER
glasses = /obj/item/clothing/glasses/sunglasses
uniform = /obj/item/clothing/under/rank/captain
@@ -14,7 +14,7 @@
headset_alt = /obj/item/radio/headset/alt/heads/captain
headset_earbud = /obj/item/radio/headset/earbud/heads/captain
-/decl/hierarchy/outfit/job/captain/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/captain/post_equip(var/mob/living/carbon/human/H)
..()
if(H.age>49)
// Since we can have something other than the default uniform at this
@@ -27,7 +27,7 @@
else
qdel(medal)
-/decl/hierarchy/outfit/job/hop
+/datum/decl/hierarchy/outfit/job/hop
name = OUTFIT_JOB_NAME(JOB_HEAD_OF_PERSONNEL)
uniform = /obj/item/clothing/under/rank/head_of_personnel
shoes = /obj/item/clothing/shoes/brown
@@ -38,7 +38,7 @@
headset_alt = /obj/item/radio/headset/alt/heads/hop
headset_earbud = /obj/item/radio/headset/earbud/heads/hop
-/decl/hierarchy/outfit/job/secretary
+/datum/decl/hierarchy/outfit/job/secretary
name = OUTFIT_JOB_NAME(JOB_COMMAND_SECRETARY)
shoes = /obj/item/clothing/shoes/brown
id_type = /obj/item/card/id/silver/secretary
@@ -49,7 +49,7 @@
headset_alt = /obj/item/radio/headset/alt/headset_com
headset_earbud = /obj/item/radio/headset/earbud/headset_com
-/decl/hierarchy/outfit/job/secretary/pre_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/secretary/pre_equip(mob/living/carbon/human/H)
..()
if(H.gender == FEMALE)
uniform = /obj/item/clothing/under/suit_jacket/female/skirt
diff --git a/code/datums/outfits/jobs/command_vr.dm b/code/datums/outfits/jobs/command_vr.dm
index 7d19d7b7ab..a64b1acdd9 100644
--- a/code/datums/outfits/jobs/command_vr.dm
+++ b/code/datums/outfits/jobs/command_vr.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/job/hop
+/datum/decl/hierarchy/outfit/job/hop
id_type = /obj/item/card/id/silver/hop
-/decl/hierarchy/outfit/job/secretary
+/datum/decl/hierarchy/outfit/job/secretary
id_type = /obj/item/card/id/silver/secretary
diff --git a/code/datums/outfits/jobs/engineering.dm b/code/datums/outfits/jobs/engineering.dm
index 7c9c163cf9..0ab72ca51c 100644
--- a/code/datums/outfits/jobs/engineering.dm
+++ b/code/datums/outfits/jobs/engineering.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/job/engineering
- hierarchy_type = /decl/hierarchy/outfit/job/engineering
+/datum/decl/hierarchy/outfit/job/engineering
+ hierarchy_type = /datum/decl/hierarchy/outfit/job/engineering
belt = /obj/item/storage/belt/utility/full/multitool
shoes = /obj/item/clothing/shoes/boots/workboots
r_pocket = /obj/item/t_scanner
@@ -13,7 +13,7 @@
headset_alt = /obj/item/radio/headset/alt/headset_eng
headset_earbud = /obj/item/radio/headset/earbud/headset_eng
-/decl/hierarchy/outfit/job/engineering/chief_engineer
+/datum/decl/hierarchy/outfit/job/engineering/chief_engineer
name = OUTFIT_JOB_NAME(JOB_CHIEF_ENGINEER)
head = /obj/item/clothing/head/hardhat/white
uniform = /obj/item/clothing/under/rank/chief_engineer
@@ -26,21 +26,21 @@
headset_alt = /obj/item/radio/headset/alt/heads/ce
headset_earbud = /obj/item/radio/headset/earbud/heads/ce
-/decl/hierarchy/outfit/job/engineering/engineer
+/datum/decl/hierarchy/outfit/job/engineering/engineer
name = OUTFIT_JOB_NAME(JOB_ENGINEER)
head = /obj/item/clothing/head/hardhat
uniform = /obj/item/clothing/under/rank/engineer
id_type = /obj/item/card/id/engineering
pda_type = /obj/item/pda/engineering
-/decl/hierarchy/outfit/job/engineering/atmos
+/datum/decl/hierarchy/outfit/job/engineering/atmos
name = OUTFIT_JOB_NAME(JOB_ATMOSPHERIC_TECHNICIAN)
uniform = /obj/item/clothing/under/rank/atmospheric_technician
belt = /obj/item/storage/belt/utility/atmostech
id_type = /obj/item/card/id/engineering/atmos
pda_type = /obj/item/pda/atmos
-/decl/hierarchy/outfit/job/engineering/chems
+/datum/decl/hierarchy/outfit/job/engineering/chems
name = OUTFIT_JOB_NAME(JOB_ALT_CHEMENGINEER)
head = /obj/item/clothing/head/hardhat
uniform = /obj/item/clothing/under/rank/engineer
diff --git a/code/datums/outfits/jobs/job.dm b/code/datums/outfits/jobs/job.dm
index 96695519e5..571c2ec828 100644
--- a/code/datums/outfits/jobs/job.dm
+++ b/code/datums/outfits/jobs/job.dm
@@ -1,6 +1,6 @@
-/decl/hierarchy/outfit/job
+/datum/decl/hierarchy/outfit/job
name = "Standard Gear"
- hierarchy_type = /decl/hierarchy/outfit/job
+ hierarchy_type = /datum/decl/hierarchy/outfit/job
uniform = /obj/item/clothing/under/color/grey
shoes = /obj/item/clothing/shoes/black
@@ -16,7 +16,7 @@
headset_alt = /obj/item/radio/headset/alt
headset_earbud = /obj/item/radio/headset/earbud
-/decl/hierarchy/outfit/job/equip_id(mob/living/carbon/human/H, rank, assignment)
+/datum/decl/hierarchy/outfit/job/equip_id(mob/living/carbon/human/H, rank, assignment)
var/obj/item/card/id/C = ..()
if(!C)
return
diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm
index 8eb56d993a..4acc6d6538 100644
--- a/code/datums/outfits/jobs/medical.dm
+++ b/code/datums/outfits/jobs/medical.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/job/medical
- hierarchy_type = /decl/hierarchy/outfit/job/medical
+/datum/decl/hierarchy/outfit/job/medical
+ hierarchy_type = /datum/decl/hierarchy/outfit/job/medical
shoes = /obj/item/clothing/shoes/white
pda_type = /obj/item/pda/medical
pda_slot = slot_l_store
@@ -12,7 +12,7 @@
headset_alt = /obj/item/radio/headset/alt/headset_med
headset_earbud = /obj/item/radio/headset/earbud/headset_med
-/decl/hierarchy/outfit/job/medical/cmo
+/datum/decl/hierarchy/outfit/job/medical/cmo
name = OUTFIT_JOB_NAME(JOB_CHIEF_MEDICAL_OFFICER)
uniform = /obj/item/clothing/under/rank/chief_medical_officer
suit = /obj/item/clothing/suit/storage/toggle/labcoat/cmo
@@ -26,7 +26,7 @@
headset_alt = /obj/item/radio/headset/alt/heads/cmo
headset_earbud = /obj/item/radio/headset/earbud/heads/cmo
-/decl/hierarchy/outfit/job/medical/doctor
+/datum/decl/hierarchy/outfit/job/medical/doctor
name = OUTFIT_JOB_NAME(JOB_MEDICAL_DOCTOR)
uniform = /obj/item/clothing/under/rank/medical
suit = /obj/item/clothing/suit/storage/toggle/labcoat
@@ -34,16 +34,16 @@
r_pocket = /obj/item/flashlight/pen
id_type = /obj/item/card/id/medical
-/decl/hierarchy/outfit/job/medical/doctor/emergency_physician
+/datum/decl/hierarchy/outfit/job/medical/doctor/emergency_physician
name = OUTFIT_JOB_NAME(JOB_ALT_EMERGENCY_PHYSICIAN)
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket
-/decl/hierarchy/outfit/job/medical/doctor/surgeon
+/datum/decl/hierarchy/outfit/job/medical/doctor/surgeon
name = OUTFIT_JOB_NAME(JOB_ALT_SURGEON)
uniform = /obj/item/clothing/under/rank/medical/scrubs
head = /obj/item/clothing/head/surgery/blue
-/decl/hierarchy/outfit/job/medical/doctor/virologist
+/datum/decl/hierarchy/outfit/job/medical/doctor/virologist
name = OUTFIT_JOB_NAME(JOB_ALT_VIROLOGIST)
uniform = /obj/item/clothing/under/rank/virologist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/virologist
@@ -52,11 +52,11 @@
satchel_one = /obj/item/storage/backpack/satchel/vir
belt = /obj/item/extrapolator
-/decl/hierarchy/outfit/job/medical/doctor/nurse
+/datum/decl/hierarchy/outfit/job/medical/doctor/nurse
name = OUTFIT_JOB_NAME(JOB_ALT_NURSE)
suit = null
-/decl/hierarchy/outfit/job/medical/doctor/nurse/pre_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/medical/doctor/nurse/pre_equip(mob/living/carbon/human/H)
if(H.gender == FEMALE)
if(prob(50))
uniform = /obj/item/clothing/under/rank/nursesuit
@@ -67,7 +67,7 @@
uniform = /obj/item/clothing/under/rank/medical/scrubs/purple
..()
-/decl/hierarchy/outfit/job/medical/chemist
+/datum/decl/hierarchy/outfit/job/medical/chemist
name = OUTFIT_JOB_NAME(JOB_CHEMIST)
uniform = /obj/item/clothing/under/rank/chemist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/chemist
@@ -77,7 +77,7 @@
id_type = /obj/item/card/id/medical/chemist
pda_type = /obj/item/pda/chemist
-/decl/hierarchy/outfit/job/medical/geneticist
+/datum/decl/hierarchy/outfit/job/medical/geneticist
name = OUTFIT_JOB_NAME(JOB_GENETICIST)
uniform = /obj/item/clothing/under/rank/geneticist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/genetics
@@ -94,18 +94,18 @@
headset_earbud = /obj/item/radio/headset/headset_medsci
// CHOMPAdd End
-/decl/hierarchy/outfit/job/medical/psychiatrist
+/datum/decl/hierarchy/outfit/job/medical/psychiatrist
name = OUTFIT_JOB_NAME(JOB_PSYCHIATRIST)
uniform = /obj/item/clothing/under/rank/psych
suit = /obj/item/clothing/suit/storage/toggle/labcoat
shoes = /obj/item/clothing/shoes/laceup
id_type = /obj/item/card/id/medical/psych
-/decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
+/datum/decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
name = OUTFIT_JOB_NAME(JOB_ALT_PSYCHOLOGIST)
uniform = /obj/item/clothing/under/rank/psych/turtleneck
-/decl/hierarchy/outfit/job/medical/paramedic
+/datum/decl/hierarchy/outfit/job/medical/paramedic
name = OUTFIT_JOB_NAME(JOB_PARAMEDIC)
uniform = /obj/item/clothing/under/rank/medical/paramedic
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket
@@ -116,7 +116,7 @@
id_type = /obj/item/card/id/medical/emt
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
-/decl/hierarchy/outfit/job/medical/paramedic/emt
+/datum/decl/hierarchy/outfit/job/medical/paramedic/emt
name = OUTFIT_JOB_NAME(JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN)
uniform = /obj/item/clothing/under/rank/medical/paramedic_alt
suit = /obj/item/clothing/suit/storage/toggle/labcoat/emt
diff --git a/code/datums/outfits/jobs/medical_vr.dm b/code/datums/outfits/jobs/medical_vr.dm
index faf77d3f9b..07d72c1a35 100644
--- a/code/datums/outfits/jobs/medical_vr.dm
+++ b/code/datums/outfits/jobs/medical_vr.dm
@@ -1,2 +1,2 @@
-/decl/hierarchy/outfit/job/medical/doctor/virologist
+/datum/decl/hierarchy/outfit/job/medical/doctor/virologist
id_type = /obj/item/card/id/medical/virologist
diff --git a/code/datums/outfits/jobs/misc.dm b/code/datums/outfits/jobs/misc.dm
index 0365d0723a..bb0b9e9fa4 100644
--- a/code/datums/outfits/jobs/misc.dm
+++ b/code/datums/outfits/jobs/misc.dm
@@ -1,12 +1,12 @@
-/decl/hierarchy/outfit/job/silicon
+/datum/decl/hierarchy/outfit/job/silicon
head = /obj/item/clothing/head/cardborg
- hierarchy_type = /decl/hierarchy/outfit/job/silicon
+ hierarchy_type = /datum/decl/hierarchy/outfit/job/silicon
-/decl/hierarchy/outfit/job/silicon/ai
+/datum/decl/hierarchy/outfit/job/silicon/ai
name = OUTFIT_JOB_NAME(JOB_AI)
suit = /obj/item/clothing/suit/straight_jacket
-/decl/hierarchy/outfit/job/silicon/cyborg
+/datum/decl/hierarchy/outfit/job/silicon/cyborg
name = OUTFIT_JOB_NAME(JOB_CYBORG)
suit = /obj/item/clothing/suit/cardborg
@@ -25,9 +25,9 @@
assignable = FALSE
account_allowed = 0
offmap_spawn = TRUE
- outfit_type = /decl/hierarchy/outfit/noncrew/vr_avatar
+ outfit_type = /datum/decl/hierarchy/outfit/noncrew/vr_avatar
-/decl/hierarchy/outfit/noncrew/vr_avatar
+/datum/decl/hierarchy/outfit/noncrew/vr_avatar
pda_slot = null
id_slot = null
r_pocket = null
diff --git a/code/datums/outfits/jobs/science.dm b/code/datums/outfits/jobs/science.dm
index 2e90fdc1ad..9552e84bdb 100644
--- a/code/datums/outfits/jobs/science.dm
+++ b/code/datums/outfits/jobs/science.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/job/science
- hierarchy_type = /decl/hierarchy/outfit/job/science
+/datum/decl/hierarchy/outfit/job/science
+ hierarchy_type = /datum/decl/hierarchy/outfit/job/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat
shoes = /obj/item/clothing/shoes/white
pda_type = /obj/item/pda/science
@@ -13,7 +13,7 @@
headset_alt = /obj/item/radio/headset/alt/headset_sci
headset_earbud = /obj/item/radio/headset/earbud/headset_sci
-/decl/hierarchy/outfit/job/science/rd
+/datum/decl/hierarchy/outfit/job/science/rd
name = OUTFIT_JOB_NAME("Research Director")
uniform = /obj/item/clothing/under/rank/research_director
shoes = /obj/item/clothing/shoes/brown
@@ -26,20 +26,20 @@
headset_earbud = /obj/item/radio/headset/earbud/heads/rd
l_pocket = /obj/item/experi_scanner
-/decl/hierarchy/outfit/job/science/scientist
+/datum/decl/hierarchy/outfit/job/science/scientist
name = OUTFIT_JOB_NAME(JOB_SCIENTIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/card/id/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
l_pocket = /obj/item/experi_scanner
-/decl/hierarchy/outfit/job/science/xenobiologist
+/datum/decl/hierarchy/outfit/job/science/xenobiologist
name = OUTFIT_JOB_NAME(JOB_XENOBIOLOGIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/card/id/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
-/decl/hierarchy/outfit/job/science/roboticist
+/datum/decl/hierarchy/outfit/job/science/roboticist
name = OUTFIT_JOB_NAME(JOB_ROBOTICIST)
uniform = /obj/item/clothing/under/rank/roboticist
shoes = /obj/item/clothing/shoes/black
diff --git a/code/datums/outfits/jobs/science_vr.dm b/code/datums/outfits/jobs/science_vr.dm
index 74242d7b1d..7d54f4df59 100644
--- a/code/datums/outfits/jobs/science_vr.dm
+++ b/code/datums/outfits/jobs/science_vr.dm
@@ -1,7 +1,7 @@
-/decl/hierarchy/outfit/job/science/xenobiologist
+/datum/decl/hierarchy/outfit/job/science/xenobiologist
id_type = /obj/item/card/id/science/xenobiologist
-/decl/hierarchy/outfit/job/science/xenobotanist
+/datum/decl/hierarchy/outfit/job/science/xenobotanist
name = OUTFIT_JOB_NAME(JOB_XENOBOTANIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/card/id/science/xenobotanist
diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm
index ea5cebdc34..14bdfa05a7 100644
--- a/code/datums/outfits/jobs/security.dm
+++ b/code/datums/outfits/jobs/security.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/job/security
- hierarchy_type = /decl/hierarchy/outfit/job/security
+/datum/decl/hierarchy/outfit/job/security
+ hierarchy_type = /datum/decl/hierarchy/outfit/job/security
glasses = /obj/item/clothing/glasses/sunglasses/sechud
gloves = /obj/item/clothing/gloves/black
shoes = /obj/item/clothing/shoes/boots/jackboots
@@ -14,7 +14,7 @@
headset_alt = /obj/item/radio/headset/alt/headset_sec
headset_earbud = /obj/item/radio/headset/earbud/headset_sec
-/decl/hierarchy/outfit/job/security/hos
+/datum/decl/hierarchy/outfit/job/security/hos
name = OUTFIT_JOB_NAME(JOB_HEAD_OF_SECURITY)
uniform = /obj/item/clothing/under/rank/head_of_security
id_type = /obj/item/card/id/security/head
@@ -24,14 +24,14 @@
headset_alt = /obj/item/radio/headset/alt/heads/hos
headset_earbud = /obj/item/radio/headset/earbud/heads/hos
-/decl/hierarchy/outfit/job/security/warden
+/datum/decl/hierarchy/outfit/job/security/warden
name = OUTFIT_JOB_NAME(JOB_WARDEN)
uniform = /obj/item/clothing/under/rank/warden
l_pocket = /obj/item/flash
id_type = /obj/item/card/id/security/warden
pda_type = /obj/item/pda/warden
-/decl/hierarchy/outfit/job/security/detective
+/datum/decl/hierarchy/outfit/job/security/detective
name = OUTFIT_JOB_NAME(JOB_DETECTIVE)
head = /obj/item/clothing/head/det
uniform = /obj/item/clothing/under/det
@@ -47,14 +47,14 @@
gloves = /obj/item/clothing/gloves/forensic //CHOMP Addition
//VOREStation Edit - More cyberpunky
-/decl/hierarchy/outfit/job/security/detective/forensic
+/datum/decl/hierarchy/outfit/job/security/detective/forensic
name = OUTFIT_JOB_NAME("Forensic technician")
head = null
suit = /obj/item/clothing/suit/storage/det_trench/alt2
uniform = /obj/item/clothing/under/det
//VOREStation Edit End
-/decl/hierarchy/outfit/job/security/officer
+/datum/decl/hierarchy/outfit/job/security/officer
name = OUTFIT_JOB_NAME(JOB_SECURITY_OFFICER)
uniform = /obj/item/clothing/under/rank/security
l_pocket = /obj/item/flash
diff --git a/code/datums/outfits/jobs/security_yw.dm b/code/datums/outfits/jobs/security_yw.dm
index 53cd6f0206..a106cef64f 100644
--- a/code/datums/outfits/jobs/security_yw.dm
+++ b/code/datums/outfits/jobs/security_yw.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/job/security/pilot
+/datum/decl/hierarchy/outfit/job/security/pilot
name = OUTFIT_JOB_NAME(JOB_SECURITY_PILOT)
uniform = /obj/item/clothing/under/rank/khi/sec/pilot
id_type = /obj/item/card/id/security
diff --git a/code/datums/outfits/jobs/special_vr.dm b/code/datums/outfits/jobs/special_vr.dm
index 910fd5a275..a4c105a6a4 100644
--- a/code/datums/outfits/jobs/special_vr.dm
+++ b/code/datums/outfits/jobs/special_vr.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/job/centcom_officer
+/datum/decl/hierarchy/outfit/job/centcom_officer
name = OUTFIT_JOB_NAME("CentCom Officer")
uniform = /obj/item/clothing/under/rank/centcom
gloves = /obj/item/clothing/gloves/white
@@ -13,7 +13,7 @@
headset_alt = /obj/item/radio/headset/centcom
headset_earbud = /obj/item/radio/headset/centcom
-/decl/hierarchy/outfit/job/emergency_responder
+/datum/decl/hierarchy/outfit/job/emergency_responder
name = OUTFIT_JOB_NAME("Emergency Responder")
uniform = /obj/item/clothing/under/ert
shoes = /obj/item/clothing/shoes/boots/swat
@@ -28,11 +28,11 @@
headset_alt = /obj/item/radio/headset/ert
headset_earbud = /obj/item/radio/headset/ert
-/decl/hierarchy/outfit/job/emergency_responder/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/emergency_responder/post_equip(var/mob/living/carbon/human/H)
..()
GLOB.ert.add_antagonist(H.mind)
-/decl/hierarchy/outfit/job/clown
+/datum/decl/hierarchy/outfit/job/clown
name = OUTFIT_JOB_NAME(JOB_CLOWN)
uniform = /obj/item/clothing/under/rank/clown
back = /obj/item/storage/backpack/clown
@@ -43,7 +43,7 @@
pda_type = /obj/item/pda/clown
flags = NONE
-/decl/hierarchy/outfit/job/mime
+/datum/decl/hierarchy/outfit/job/mime
name = OUTFIT_JOB_NAME(JOB_MIME)
uniform = /obj/item/clothing/under/mime
shoes = /obj/item/clothing/shoes/mime
@@ -53,7 +53,7 @@
id_type = /obj/item/card/id/civilian/mime
pda_type = /obj/item/pda/mime
-/decl/hierarchy/outfit/job/mime/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/mime/post_equip(var/mob/living/carbon/human/H)
..()
if(H.backbag == 1)
H.equip_to_slot_or_del(new /obj/item/pen/crayon/mime(H), slot_l_hand)
diff --git a/code/datums/outfits/military/fleet.dm b/code/datums/outfits/military/fleet.dm
index 891e8d4c42..f266d8ef86 100644
--- a/code/datums/outfits/military/fleet.dm
+++ b/code/datums/outfits/military/fleet.dm
@@ -1,19 +1,19 @@
-/decl/hierarchy/outfit/military/fleet/pt
+/datum/decl/hierarchy/outfit/military/fleet/pt
name = OUTFIT_MILITARY("Fleet PT")
uniform = /obj/item/clothing/under/solgov/pt/fleet
shoes = /obj/item/clothing/shoes/black
-/decl/hierarchy/outfit/military/fleet/utility
+/datum/decl/hierarchy/outfit/military/fleet/utility
name = OUTFIT_MILITARY("Fleet Utility")
uniform = /obj/item/clothing/under/solgov/utility/fleet
shoes = /obj/item/clothing/shoes/boots/duty
-/decl/hierarchy/outfit/military/fleet/service
+/datum/decl/hierarchy/outfit/military/fleet/service
name = OUTFIT_MILITARY("Fleet Service")
uniform = /obj/item/clothing/under/solgov/service/fleet
shoes = /obj/item/clothing/shoes/dress/white
-/decl/hierarchy/outfit/military/fleet/dress
+/datum/decl/hierarchy/outfit/military/fleet/dress
name = OUTFIT_MILITARY("Fleet Dress")
uniform = /obj/item/clothing/under/solgov/service/fleet
shoes = /obj/item/clothing/shoes/dress/white
diff --git a/code/datums/outfits/military/marines.dm b/code/datums/outfits/military/marines.dm
index eb07c1027d..45a1121783 100644
--- a/code/datums/outfits/military/marines.dm
+++ b/code/datums/outfits/military/marines.dm
@@ -1,20 +1,20 @@
-/decl/hierarchy/outfit/military/marine/pt
+/datum/decl/hierarchy/outfit/military/marine/pt
name = OUTFIT_MILITARY("Marine PT")
uniform = /obj/item/clothing/under/solgov/pt/army
shoes = /obj/item/clothing/shoes/black
-/decl/hierarchy/outfit/military/marine/utility
+/datum/decl/hierarchy/outfit/military/marine/utility
name = OUTFIT_MILITARY("Marine Utility")
uniform = /obj/item/clothing/under/solgov/utility/army
shoes = /obj/item/clothing/shoes/boots/jungle
-/decl/hierarchy/outfit/military/marine/service
+/datum/decl/hierarchy/outfit/military/marine/service
name = OUTFIT_MILITARY("Marine Service")
uniform = /obj/item/clothing/under/solgov/service/army
shoes = /obj/item/clothing/shoes/dress
suit = /obj/item/clothing/suit/storage/solgov/service/army
-/decl/hierarchy/outfit/military/marine/dress
+/datum/decl/hierarchy/outfit/military/marine/dress
name = OUTFIT_MILITARY("Marine Dress")
uniform = /obj/item/clothing/under/solgov/mildress/army
shoes = /obj/item/clothing/shoes/dress/white
diff --git a/code/datums/outfits/military/military.dm b/code/datums/outfits/military/military.dm
index b529bbc061..c3c5aba5f0 100644
--- a/code/datums/outfits/military/military.dm
+++ b/code/datums/outfits/military/military.dm
@@ -1,6 +1,6 @@
-/decl/hierarchy/outfit/military
+/datum/decl/hierarchy/outfit/military
name = "Military Uniform"
- hierarchy_type = /decl/hierarchy/outfit/military
+ hierarchy_type = /datum/decl/hierarchy/outfit/military
headset = /obj/item/radio/headset
headset_alt = /obj/item/radio/headset
diff --git a/code/datums/outfits/military/sifguard.dm b/code/datums/outfits/military/sifguard.dm
index 4814aa3b01..44f8a23c79 100644
--- a/code/datums/outfits/military/sifguard.dm
+++ b/code/datums/outfits/military/sifguard.dm
@@ -1,20 +1,20 @@
-/decl/hierarchy/outfit/military/sifguard/pt
+/datum/decl/hierarchy/outfit/military/sifguard/pt
name = OUTFIT_MILITARY("SifGuard PT")
uniform = /obj/item/clothing/under/solgov/pt/sifguard
shoes = /obj/item/clothing/shoes/black
-/decl/hierarchy/outfit/military/sifguard/utility
+/datum/decl/hierarchy/outfit/military/sifguard/utility
name = OUTFIT_MILITARY("SifGuard Utility")
uniform = /obj/item/clothing/under/solgov/utility/sifguard
shoes = /obj/item/clothing/shoes/boots/tactical
-/decl/hierarchy/outfit/military/sifguard/service
+/datum/decl/hierarchy/outfit/military/sifguard/service
name = OUTFIT_MILITARY("SifGuard Service")
uniform = /obj/item/clothing/under/solgov/utility/sifguard
shoes = /obj/item/clothing/shoes/boots/tactical
suit = /obj/item/clothing/suit/storage/solgov/service/sifguard
-/decl/hierarchy/outfit/military/sifguard/dress //The suit was changed due to missing sprites
+/datum/decl/hierarchy/outfit/military/sifguard/dress //The suit was changed due to missing sprites
name = OUTFIT_MILITARY("SifGuard Dress")
uniform = /obj/item/clothing/under/solgov/service/sifguard
shoes = /obj/item/clothing/shoes/dress
diff --git a/code/datums/outfits/misc.dm b/code/datums/outfits/misc.dm
index 8f74e25541..ad80dde02c 100644
--- a/code/datums/outfits/misc.dm
+++ b/code/datums/outfits/misc.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/standard_space_gear
+/datum/decl/hierarchy/outfit/standard_space_gear
name = "Standard space gear"
shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/helmet/space
@@ -8,7 +8,7 @@
mask = /obj/item/clothing/mask/breath
flags = OUTFIT_HAS_JETPACK
-/decl/hierarchy/outfit/emergency_space_gear
+/datum/decl/hierarchy/outfit/emergency_space_gear
name = "Emergency space gear"
shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/helmet/space/emergency
@@ -17,7 +17,7 @@
back = /obj/item/tank/oxygen
mask = /obj/item/clothing/mask/breath
-/decl/hierarchy/outfit/soviet_soldier
+/datum/decl/hierarchy/outfit/soviet_soldier
name = "Soviet soldier"
uniform = /obj/item/clothing/under/soviet
shoes = /obj/item/clothing/shoes/boots/combat
@@ -26,7 +26,7 @@
back = /obj/item/storage/backpack/satchel
belt = /obj/item/gun/projectile/revolver/mateba
-/decl/hierarchy/outfit/soviet_soldier/admiral
+/datum/decl/hierarchy/outfit/soviet_soldier/admiral
name = "Soviet admiral"
head = /obj/item/clothing/head/hgpiratecap
glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch
@@ -40,7 +40,7 @@
headset_alt = /obj/item/radio/headset/heads/captain
headset_earbud = /obj/item/radio/headset/heads/captain
-/decl/hierarchy/outfit/merchant
+/datum/decl/hierarchy/outfit/merchant
name = "Merchant"
shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/color/grey
@@ -54,18 +54,18 @@
headset_alt = /obj/item/radio/headset
headset_earbud = /obj/item/radio/headset
-/decl/hierarchy/outfit/merchant/vox
+/datum/decl/hierarchy/outfit/merchant/vox
name = "Merchant - Vox"
shoes = /obj/item/clothing/shoes/boots/jackboots/toeless
uniform = /obj/item/clothing/under/vox/vox_robes
suit = /obj/item/clothing/suit/armor/vox_scrap
-/decl/hierarchy/outfit/zaddat
+/datum/decl/hierarchy/outfit/zaddat
name = "Zaddat Suit"
suit = /obj/item/clothing/suit/space/void/zaddat/
mask = /obj/item/clothing/mask/gas/zaddat
-/decl/hierarchy/outfit/maint_lurker
+/datum/decl/hierarchy/outfit/maint_lurker
name = "Maintenance Lurker Outfit"
id_slot = slot_wear_id
id_type = /obj/item/card/id/civilian/lurker
@@ -87,7 +87,7 @@
backpack_contents = list(/obj/item/spacecash/c200 = 1)
-/decl/hierarchy/outfit/maint_lurker/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/maint_lurker/post_equip(var/mob/living/carbon/human/H)
..()
if(H.backbag == 1)
H.equip_to_slot_or_del(new /obj/item/spacecash/c200(H), slot_l_hand)
diff --git a/code/datums/outfits/nanotrasen.dm b/code/datums/outfits/nanotrasen.dm
index 3fde80dd0b..1a29d2d0cf 100644
--- a/code/datums/outfits/nanotrasen.dm
+++ b/code/datums/outfits/nanotrasen.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/nanotrasen
- hierarchy_type = /decl/hierarchy/outfit/nanotrasen
+/datum/decl/hierarchy/outfit/nanotrasen
+ hierarchy_type = /datum/decl/hierarchy/outfit/nanotrasen
uniform = /obj/item/clothing/under/rank/centcom
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/white
@@ -14,12 +14,12 @@
headset_alt = /obj/item/radio/headset/heads/hop
headset_earbud = /obj/item/radio/headset/heads/hop
-/decl/hierarchy/outfit/nanotrasen/representative
+/datum/decl/hierarchy/outfit/nanotrasen/representative
name = "Nanotrasen representative"
belt = /obj/item/clipboard
id_pda_assignment = "NanoTrasen Navy Representative"
-/decl/hierarchy/outfit/nanotrasen/officer
+/datum/decl/hierarchy/outfit/nanotrasen/officer
name = "Nanotrasen officer"
head = /obj/item/clothing/head/beret/centcom/officer
belt = /obj/item/gun/energy
@@ -29,7 +29,7 @@
headset_alt = /obj/item/radio/headset/heads/captain
headset_earbud = /obj/item/radio/headset/heads/captain
-/decl/hierarchy/outfit/nanotrasen/captain
+/datum/decl/hierarchy/outfit/nanotrasen/captain
name = "Nanotrasen captain"
uniform = /obj/item/clothing/under/rank/centcom_captain
head = /obj/item/clothing/head/beret/centcom/captain
diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 89129b6e5a..bee1d8cb7b 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -17,9 +17,9 @@ var/list/outfits_decls_by_type_
return
outfits_decls_ = list()
outfits_decls_by_type_ = list()
- outfits_decls_root_ = new/decl/hierarchy/outfit()
+ outfits_decls_root_ = new /datum/decl/hierarchy/outfit()
-/decl/hierarchy/outfit
+/datum/decl/hierarchy/outfit
name = "Naked"
var/uniform = null
@@ -67,7 +67,7 @@ var/list/outfits_decls_by_type_
var/undress = 1 //Does the outfit undress the mob upon equp?
-/decl/hierarchy/outfit/New()
+/datum/decl/hierarchy/outfit/New()
..()
if(is_hidden_category())
@@ -75,7 +75,7 @@ var/list/outfits_decls_by_type_
outfits_decls_by_type_[type] = src
dd_insertObjectList(outfits_decls_, src)
-/decl/hierarchy/outfit/proc/pre_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/proc/pre_equip(mob/living/carbon/human/H)
switch(H.headset)
if(1) l_ear = headset
if(2) l_ear = headset_alt
@@ -90,7 +90,7 @@ var/list/outfits_decls_by_type_
if(7) back = satchel_three
else back = null
-/decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H)
if(flags & OUTFIT_HAS_JETPACK)
var/obj/item/tank/jetpack/J = locate(/obj/item/tank/jetpack) in H
if(!J)
@@ -98,7 +98,7 @@ var/list/outfits_decls_by_type_
J.toggle()
J.toggle_valve()
-/decl/hierarchy/outfit/proc/equip(mob/living/carbon/human/H, var/rank, var/assignment)
+/datum/decl/hierarchy/outfit/proc/equip(mob/living/carbon/human/H, var/rank, var/assignment)
equip_base(H)
rank = rank || id_pda_assignment
@@ -120,7 +120,7 @@ var/list/outfits_decls_by_type_
H.set_id_info(W)
return 1
-/decl/hierarchy/outfit/proc/equip_base(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/proc/equip_base(mob/living/carbon/human/H)
pre_equip(H)
//Start with uniform,suit,backpack for additional slots
@@ -172,7 +172,7 @@ var/list/outfits_decls_by_type_
if(H.species)
H.species.equip_survival_gear(H, flags&OUTFIT_EXTENDED_SURVIVAL, flags&OUTFIT_COMPREHENSIVE_SURVIVAL)
-/decl/hierarchy/outfit/proc/equip_id(mob/living/carbon/human/H, rank, assignment)
+/datum/decl/hierarchy/outfit/proc/equip_id(mob/living/carbon/human/H, rank, assignment)
if(!id_slot || !id_type)
return
var/obj/item/card/id/W = new id_type(H)
@@ -185,7 +185,7 @@ var/list/outfits_decls_by_type_
if(H.equip_to_slot_or_del(W, id_slot))
return W
-/decl/hierarchy/outfit/proc/equip_pda(mob/living/carbon/human/H, rank, assignment)
+/datum/decl/hierarchy/outfit/proc/equip_pda(mob/living/carbon/human/H, rank, assignment)
if(!pda_slot || !pda_type)
return
var/obj/item/pda/pda = new pda_type(H)
@@ -198,5 +198,5 @@ var/list/outfits_decls_by_type_
pda.ttone = H.client.prefs.ringtone
return pda
-/decl/hierarchy/outfit/dd_SortValue()
+/datum/decl/hierarchy/outfit/dd_SortValue()
return name
diff --git a/code/datums/outfits/outfit_vr.dm b/code/datums/outfits/outfit_vr.dm
index 1b26b44617..e9e7b87d8c 100644
--- a/code/datums/outfits/outfit_vr.dm
+++ b/code/datums/outfits/outfit_vr.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/USDF/Marine
+/datum/decl/hierarchy/outfit/USDF/Marine
name = "USDF marine"
uniform = /obj/item/clothing/under/solgov/utility/army/urban
shoes = /obj/item/clothing/shoes/boots/jackboots
@@ -9,7 +9,7 @@
r_hand = /obj/item/ammo_magazine/m95
back = /obj/item/gun/projectile/automatic/battlerifle
backpack_contents = list(/obj/item/storage/box = 1)
- hierarchy_type = /decl/hierarchy/outfit/wizard
+ hierarchy_type = /datum/decl/hierarchy/outfit/wizard
head = /obj/item/clothing/head/helmet/combat/USDF
suit = /obj/item/clothing/suit/armor/combat/USDF
belt = /obj/item/storage/belt/security/tactical
@@ -18,7 +18,7 @@
headset_alt = /obj/item/radio/headset/centcom
headset_earbud = /obj/item/radio/headset/centcom
-/decl/hierarchy/outfit/USDF/Marine/equip_id(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/USDF/Marine/equip_id(mob/living/carbon/human/H)
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s military ID Card"
C.icon_state = "lifetime"
@@ -28,7 +28,7 @@
C.registered_name = H.real_name
return C
-/decl/hierarchy/outfit/USDF/Officer
+/datum/decl/hierarchy/outfit/USDF/Officer
name = "USDF officer"
head = /obj/item/clothing/head/dress/army/command
shoes = /obj/item/clothing/shoes/boots/jackboots
@@ -44,7 +44,7 @@
headset_alt = /obj/item/radio/headset/centcom
headset_earbud = /obj/item/radio/headset/centcom
-/decl/hierarchy/outfit/USDF/Officer/equip_id(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/USDF/Officer/equip_id(mob/living/carbon/human/H)
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s military ID Card"
C.icon_state = "lifetime"
@@ -54,7 +54,7 @@
C.registered_name = H.real_name
return C
-/decl/hierarchy/outfit/solcom/representative
+/datum/decl/hierarchy/outfit/solcom/representative
name = "SolGov Representative" //YW EDIT: SolGov
shoes = /obj/item/clothing/shoes/laceup
uniform = /obj/item/clothing/under/suit_jacket/navy
@@ -68,7 +68,7 @@
headset_alt = /obj/item/radio/headset/centcom
headset_earbud = /obj/item/radio/headset/centcom
-/decl/hierarchy/outfit/solcom/representative/equip_id(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/solcom/representative/equip_id(mob/living/carbon/human/H)
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s SolGov ID Card" //YW EDIT: SolGov
C.icon_state = "lifetime"
@@ -78,7 +78,7 @@
C.registered_name = H.real_name
return C
-/decl/hierarchy/outfit/imperial/soldier
+/datum/decl/hierarchy/outfit/imperial/soldier
name = "Imperial soldier"
head = /obj/item/clothing/head/helmet/combat/imperial
shoes =/obj/item/clothing/shoes/leg_guard/combat/imperial
@@ -98,7 +98,7 @@
headset_alt = /obj/item/radio/headset/syndicate
headset_earbud = /obj/item/radio/headset/syndicate
-/decl/hierarchy/outfit/imperial/officer
+/datum/decl/hierarchy/outfit/imperial/officer
name = "Imperial officer"
head = /obj/item/clothing/head/helmet/combat/imperial/centurion
shoes = /obj/item/clothing/shoes/leg_guard/combat/imperial
@@ -123,7 +123,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
*/
-/decl/hierarchy/outfit/job/explorer2
+/datum/decl/hierarchy/outfit/job/explorer2
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
@@ -141,7 +141,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/explorer
headset_earbud = /obj/item/radio/headset/explorer
-/decl/hierarchy/outfit/job/pilot
+/datum/decl/hierarchy/outfit/job/pilot
name = OUTFIT_JOB_NAME(JOB_PILOT)
shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/rank/pilot1/no_webbing
@@ -160,7 +160,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot
-/decl/hierarchy/outfit/job/medical/sar
+/datum/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME(JOB_FIELD_MEDIC)
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
@@ -180,7 +180,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/sar
headset_earbud = /obj/item/radio/headset/sar
-/decl/hierarchy/outfit/job/pathfinder
+/datum/decl/hierarchy/outfit/job/pathfinder
name = OUTFIT_JOB_NAME(JOB_PATHFINDER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
@@ -198,6 +198,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/pathfinder
headset_earbud = /obj/item/radio/headset/pathfinder
-/decl/hierarchy/outfit/job/assistant/explorer
+/datum/decl/hierarchy/outfit/job/assistant/explorer
id_type = /obj/item/card/id/exploration
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
diff --git a/code/datums/outfits/pirates.dm b/code/datums/outfits/pirates.dm
index 563214dca0..f70acdf46d 100644
--- a/code/datums/outfits/pirates.dm
+++ b/code/datums/outfits/pirates.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/pirate
- hierarchy_type = /decl/hierarchy/outfit/pirate
+/datum/decl/hierarchy/outfit/pirate
+ hierarchy_type = /datum/decl/hierarchy/outfit/pirate
name = "Pirate"
uniform = /obj/item/clothing/under/pirate
shoes = /obj/item/clothing/shoes/brown
@@ -7,9 +7,9 @@
glasses = /obj/item/clothing/glasses/eyepatch
l_hand = /obj/item/melee/energy/sword/pirate
-/decl/hierarchy/outfit/pirate/norm
+/datum/decl/hierarchy/outfit/pirate/norm
-/decl/hierarchy/outfit/pirate/space
+/datum/decl/hierarchy/outfit/pirate/space
name = "Pirate - Space"
head = /obj/item/clothing/head/helmet/space
suit = /obj/item/clothing/suit/pirate
@@ -17,7 +17,7 @@
flags = OUTFIT_HAS_JETPACK
//CHOMPAdd
-/decl/hierarchy/outfit/pirate/vox
+/datum/decl/hierarchy/outfit/pirate/vox
name = "Vox Raider"
uniform = /obj/item/clothing/under/color/black
suit = /obj/item/clothing/suit/armor/vox_scrap
diff --git a/code/datums/outfits/spec_op.dm b/code/datums/outfits/spec_op.dm
index 8e7cb78e47..dd646b052c 100644
--- a/code/datums/outfits/spec_op.dm
+++ b/code/datums/outfits/spec_op.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/spec_op_officer
+/datum/decl/hierarchy/outfit/spec_op_officer
name = "Special ops - Officer"
uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/swat/officer
@@ -19,7 +19,7 @@
headset_alt = /obj/item/radio/headset/ert
headset_earbud = /obj/item/radio/headset/ert
-/decl/hierarchy/outfit/spec_op_officer/space
+/datum/decl/hierarchy/outfit/spec_op_officer/space
name = "Special ops - Officer in space"
suit = /obj/item/clothing/suit/armor/swat //obj/item/clothing/suit/space/void/swat
back = /obj/item/tank/jetpack/oxygen
@@ -27,7 +27,7 @@
flags = OUTFIT_HAS_JETPACK
-/decl/hierarchy/outfit/ert
+/datum/decl/hierarchy/outfit/ert
name = "Spec ops - Emergency response team"
uniform = /obj/item/clothing/under/ert
shoes = /obj/item/clothing/shoes/boots/swat
@@ -43,21 +43,21 @@
headset_alt = /obj/item/radio/headset/ert
headset_earbud = /obj/item/radio/headset/ert
-/decl/hierarchy/outfit/death_command
+/datum/decl/hierarchy/outfit/death_command
name = "Spec ops - Death commando"
-/decl/hierarchy/outfit/death_command/equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/death_command/equip(var/mob/living/carbon/human/H)
GLOB.deathsquad.equip(H)
return 1
-/decl/hierarchy/outfit/syndicate_command
+/datum/decl/hierarchy/outfit/syndicate_command
name = "Spec ops - Syndicate commando"
-/decl/hierarchy/outfit/syndicate_command/equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/syndicate_command/equip(var/mob/living/carbon/human/H)
GLOB.commandos.equip(H)
return 1
-/decl/hierarchy/outfit/mercenary
+/datum/decl/hierarchy/outfit/mercenary
name = "Spec ops - Mercenary"
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/boots/combat
diff --git a/code/datums/outfits/tournament.dm b/code/datums/outfits/tournament.dm
index d90665b82b..f137ba6738 100644
--- a/code/datums/outfits/tournament.dm
+++ b/code/datums/outfits/tournament.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/tournament_gear
- hierarchy_type = /decl/hierarchy/outfit/tournament_gear
+/datum/decl/hierarchy/outfit/tournament_gear
+ hierarchy_type = /datum/decl/hierarchy/outfit/tournament_gear
head = /obj/item/clothing/head/helmet/thunderdome
suit = /obj/item/clothing/suit/armor/vest
l_hand = /obj/item/material/knife
@@ -7,15 +7,15 @@
r_pocket = /obj/item/grenade/smokebomb
shoes = /obj/item/clothing/shoes/black
-/decl/hierarchy/outfit/tournament_gear/red
+/datum/decl/hierarchy/outfit/tournament_gear/red
name = "Tournament - Red"
uniform = /obj/item/clothing/under/color/red
-/decl/hierarchy/outfit/tournament_gear/green
+/datum/decl/hierarchy/outfit/tournament_gear/green
name = "Tournament gear - Green"
uniform = /obj/item/clothing/under/color/green
-/decl/hierarchy/outfit/tournament_gear/gangster
+/datum/decl/hierarchy/outfit/tournament_gear/gangster
name = "Tournament gear - Gangster"
head = /obj/item/clothing/head/det
uniform = /obj/item/clothing/under/det
@@ -24,7 +24,7 @@
r_hand = /obj/item/gun/projectile/revolver
l_pocket = /obj/item/ammo_magazine/s357
-/decl/hierarchy/outfit/tournament_gear/chef
+/datum/decl/hierarchy/outfit/tournament_gear/chef
name = "Tournament gear - Chef"
head = /obj/item/clothing/head/chefhat
uniform = /obj/item/clothing/under/rank/chef
@@ -33,7 +33,7 @@
l_pocket = /obj/item/material/knife/tacknife
r_pocket = /obj/item/material/knife/tacknife
-/decl/hierarchy/outfit/tournament_gear/janitor
+/datum/decl/hierarchy/outfit/tournament_gear/janitor
name = "Tournament gear - Janitor"
uniform = /obj/item/clothing/under/rank/janitor
back = /obj/item/storage/backpack
@@ -43,7 +43,7 @@
r_pocket = /obj/item/grenade/chem_grenade/cleaner
backpack_contents = list(/obj/item/stack/tile/floor = 6)
-/decl/hierarchy/outfit/tournament_gear/janitor/post_equip(var/mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/tournament_gear/janitor/post_equip(var/mob/living/carbon/human/H)
var/obj/item/reagent_containers/glass/bucket/bucket = locate(/obj/item/reagent_containers/glass/bucket) in H
if(bucket)
bucket.reagents.add_reagent(REAGENT_ID_WATER, 70)
diff --git a/code/datums/outfits/wizardry.dm b/code/datums/outfits/wizardry.dm
index 0cb82f75f2..a2a94085b0 100644
--- a/code/datums/outfits/wizardry.dm
+++ b/code/datums/outfits/wizardry.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/wizard
+/datum/decl/hierarchy/outfit/wizard
uniform = /obj/item/clothing/under/color/lightpurple
shoes = /obj/item/clothing/shoes/sandal
r_pocket = /obj/item/teleportation_scroll
@@ -6,23 +6,23 @@
r_hand = /obj/item/spellbook
back = /obj/item/storage/backpack
backpack_contents = list(/obj/item/storage/box = 1)
- hierarchy_type = /decl/hierarchy/outfit/wizard
+ hierarchy_type = /datum/decl/hierarchy/outfit/wizard
headset = /obj/item/radio/headset
headset_alt = /obj/item/radio/headset
headset_earbud = /obj/item/radio/headset
-/decl/hierarchy/outfit/wizard/blue
+/datum/decl/hierarchy/outfit/wizard/blue
name = "Wizard - Blue"
head = /obj/item/clothing/head/wizard
suit = /obj/item/clothing/suit/wizrobe
-/decl/hierarchy/outfit/wizard/red
+/datum/decl/hierarchy/outfit/wizard/red
name = "Wizard - Red"
head = /obj/item/clothing/head/wizard/red
suit = /obj/item/clothing/suit/wizrobe/red
-/decl/hierarchy/outfit/wizard/marisa
+/datum/decl/hierarchy/outfit/wizard/marisa
name = "Wizard - Marisa"
head = /obj/item/clothing/head/wizard/marisa
suit = /obj/item/clothing/suit/wizrobe/marisa
diff --git a/code/datums/repositories/crew.dm b/code/datums/repositories/crew.dm
index 5b26b0f007..27bfa9cadc 100644
--- a/code/datums/repositories/crew.dm
+++ b/code/datums/repositories/crew.dm
@@ -1,4 +1,4 @@
-var/global/datum/repository/crew/crew_repository = new()
+GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new)
/datum/repository/crew
var/list/cache_data
diff --git a/code/datums/repositories/decls.dm b/code/datums/repositories/decls.dm
index 93bb25cf36..e9da078f06 100644
--- a/code/datums/repositories/decls.dm
+++ b/code/datums/repositories/decls.dm
@@ -1,71 +1,69 @@
-// /decl is a subtype used for singletons that should never have more than one instance
-// in existence at a time. If you want to use a /decl you should use a pattern like:
-// var/decl/somedecl/mydecl = GET_DECL(/decl/somedecl)
+// /datum/decl is a subtype used for singletons that should never have more than one instance
+// in existence at a time. If you want to use a /datum/decl you should use a pattern like:
+// var/datum/decl/somedecl/mydecl = GET_DECL(/datum/decl/somedecl)
-// /decls are created the first time they are fetched from decls_repository and will
+// /datum/decls are created the first time they are fetched from decls_repository and will
// automatically call Initialize() and such when created in this way.
// decls_repository.get_decls_of_type() and decls_repository.get_decls_of_subtype()
// can be used similarly to typesof() and subtypesof(), returning assoc instance lists.
-// The /decl commandments:
-// I. Thou shalt not create a /decl with new().
-// II. Thou shalt not del() or qdel() a /decl.
+// The /datum/decl commandments:
+// I. Thou shalt not create a /datum/decl with new().
+// II. Thou shalt not del() or qdel() a /datum/decl.
// III. Thou shalt not write a decl that relies on arguments supplied to New().
-// IV. Thou shalt not call Initialize() on a /decl.
+// IV. Thou shalt not call Initialize() on a /datum/decl.
-var/repository/decls/decls_repository // Initialiozed in /datum/global_init/New()
-
-/repository/decls
+/datum/repository/decls
var/list/fetched_decls
var/list/fetched_decl_types
var/list/fetched_decl_subtypes
-/repository/decls/New()
+/datum/repository/decls/New()
..()
fetched_decls = list()
fetched_decl_types = list()
fetched_decl_subtypes = list()
-/repository/decls/proc/get_decl(var/decl_type)
+/datum/repository/decls/proc/get_decl(var/decl_type)
ASSERT(ispath(decl_type))
. = fetched_decls[decl_type]
if(!.)
. = new decl_type()
fetched_decls[decl_type] = .
- var/decl/decl = .
+ var/datum/decl/decl = .
if(istype(decl))
decl.Initialize()
-/repository/decls/proc/get_decls(var/list/decl_types)
+/datum/repository/decls/proc/get_decls(var/list/decl_types)
. = list()
for(var/decl_type in decl_types)
.[decl_type] = get_decl(decl_type)
-/repository/decls/proc/get_decls_unassociated(var/list/decl_types)
+/datum/repository/decls/proc/get_decls_unassociated(var/list/decl_types)
. = list()
for(var/decl_type in decl_types)
. += get_decl(decl_type)
-/repository/decls/proc/get_decls_of_type(var/decl_prototype)
+/datum/repository/decls/proc/get_decls_of_type(var/decl_prototype)
. = fetched_decl_types[decl_prototype]
if(!.)
. = get_decls(typesof(decl_prototype))
fetched_decl_types[decl_prototype] = .
-/repository/decls/proc/get_decls_of_subtype(var/decl_prototype)
+/datum/repository/decls/proc/get_decls_of_subtype(var/decl_prototype)
. = fetched_decl_subtypes[decl_prototype]
if(!.)
. = get_decls(subtypesof(decl_prototype))
fetched_decl_subtypes[decl_prototype] = .
-/decl/proc/Initialize(mapload)
+/datum/decl/proc/Initialize()
SHOULD_CALL_PARENT(TRUE)
SHOULD_NOT_SLEEP(TRUE)
return
-/decl/Destroy()
+/datum/decl/Destroy()
SHOULD_CALL_PARENT(FALSE)
stack_trace("Prevented attempt to delete a decl instance: [log_info_line(src)]")
return QDEL_HINT_LETMELIVE // Prevents decl destruction
diff --git a/code/datums/repositories/repository.dm b/code/datums/repositories/repository.dm
index 18b2876332..9d3d1479b9 100644
--- a/code/datums/repositories/repository.dm
+++ b/code/datums/repositories/repository.dm
@@ -1,4 +1,4 @@
-/repository/New()
+/datum/repository/New()
return
/datum/cache_entry
diff --git a/code/datums/repositories/unique.dm b/code/datums/repositories/unique.dm
index bd7b58cb8b..e2254f7cc3 100644
--- a/code/datums/repositories/unique.dm
+++ b/code/datums/repositories/unique.dm
@@ -1,13 +1,13 @@
-var/repository/unique/uniqueness_repository = new()
+GLOBAL_DATUM_INIT(uniqueness_repository, /datum/repository/unique, new)
-/repository/unique
+/datum/repository/unique
var/list/generators
-/repository/unique/New()
+/datum/repository/unique/New()
..()
generators = list()
-/repository/unique/proc/Generate()
+/datum/repository/unique/proc/Generate()
var/generator_type = args[1]
var/datum/uniqueness_generator/generator = generators[generator_type]
if(!generator)
diff --git a/code/defines/gases.dm b/code/defines/gases.dm
index d27a0dba8f..f5ab33aaa7 100644
--- a/code/defines/gases.dm
+++ b/code/defines/gases.dm
@@ -1,4 +1,4 @@
-/decl/xgm_gas/oxygen
+/datum/decl/xgm_gas/oxygen
id = GAS_O2
name = GASNAME_O2
specific_heat = 20 // J/(mol*K)
@@ -6,19 +6,19 @@
flags = XGM_GAS_OXIDIZER
-/decl/xgm_gas/nitrogen
+/datum/decl/xgm_gas/nitrogen
id = GAS_N2
name = GASNAME_N2
specific_heat = 20 // J/(mol*K)
molar_mass = 0.028 // kg/mol
-/decl/xgm_gas/carbon_dioxide
+/datum/decl/xgm_gas/carbon_dioxide
id = GAS_CO2
name = GASNAME_CO2
specific_heat = 30 // J/(mol*K)
molar_mass = 0.044 // kg/mol
-/decl/xgm_gas/phoron
+/datum/decl/xgm_gas/phoron
id = GAS_PHORON
name = GASNAME_PHORON
@@ -35,7 +35,7 @@
overlay_limit = 0.7
flags = XGM_GAS_FUEL | XGM_GAS_CONTAMINANT | XGM_GAS_FUSION_FUEL //R-UST port, adding XGM_GAS_FUSION_FUEL flag.
-/decl/xgm_gas/volatile_fuel
+/datum/decl/xgm_gas/volatile_fuel
id = GAS_VOLATILE_FUEL
name = GASNAME_VOLATILE_FUEL
specific_heat = 253 // J/(mol*K) C8H18 gasoline. Isobaric, but good enough.
@@ -43,7 +43,7 @@
flags = XGM_GAS_FUEL
-/decl/xgm_gas/nitrous_oxide
+/datum/decl/xgm_gas/nitrous_oxide
id = GAS_N2O
name = GASNAME_N2O
specific_heat = 40 // J/(mol*K)
@@ -53,7 +53,7 @@
overlay_limit = 1
flags = XGM_GAS_OXIDIZER
-/decl/xgm_gas/methane
+/datum/decl/xgm_gas/methane
id = GAS_CH4
name = GASNAME_CH4
specific_heat = 34 // J/(mol*K)
diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm
index de99cb0d68..23dd49879e 100644
--- a/code/defines/procs/AStar.dm
+++ b/code/defines/procs/AStar.dm
@@ -37,18 +37,18 @@ length to avoid portals or something i guess?? Not that they're counted right no
// Also added 'exclude' turf to avoid travelling over; defaults to null
-/PriorityQueue
+/datum/PriorityQueue
var/list/queue
var/comparison_function
-/PriorityQueue/New(compare)
+/datum/PriorityQueue/New(compare)
queue = list()
comparison_function = compare
-/PriorityQueue/proc/IsEmpty()
+/datum/PriorityQueue/proc/IsEmpty()
return !queue.len
-/PriorityQueue/proc/Enqueue(var/data)
+/datum/PriorityQueue/proc/Enqueue(var/data)
queue.Add(data)
var/index = queue.len
@@ -57,12 +57,12 @@ length to avoid portals or something i guess?? Not that they're counted right no
queue.Swap(index, index / 2)
index /= 2
-/PriorityQueue/proc/Dequeue()
+/datum/PriorityQueue/proc/Dequeue()
if(!queue.len)
return 0
return Remove(1)
-/PriorityQueue/proc/Remove(var/index)
+/datum/PriorityQueue/proc/Remove(var/index)
if(index > queue.len)
return 0
@@ -73,7 +73,7 @@ length to avoid portals or something i guess?? Not that they're counted right no
FixQueue(index)
return thing
-/PriorityQueue/proc/FixQueue(var/index)
+/datum/PriorityQueue/proc/FixQueue(var/index)
var/child = 2 * index
var/item = queue[index]
@@ -88,20 +88,20 @@ length to avoid portals or something i guess?? Not that they're counted right no
child = 2 * index
queue[index] = item
-/PriorityQueue/proc/List()
+/datum/PriorityQueue/proc/List()
return queue.Copy()
-/PriorityQueue/proc/Length()
+/datum/PriorityQueue/proc/Length()
return queue.len
-/PriorityQueue/proc/RemoveItem(data)
+/datum/PriorityQueue/proc/RemoveItem(data)
var/index = queue.Find(data)
if(index)
return Remove(index)
-/PathNode
+/datum/PathNode
var/datum/position
- var/PathNode/previous_node
+ var/datum/PathNode/previous_node
var/best_estimated_cost
var/estimated_cost
@@ -109,7 +109,7 @@ length to avoid portals or something i guess?? Not that they're counted right no
var/cost
var/nodes_traversed
-/PathNode/New(_position, _previous_node, _known_cost, _cost, _nodes_traversed)
+/datum/PathNode/New(_position, _previous_node, _known_cost, _cost, _nodes_traversed)
position = _position
previous_node = _previous_node
@@ -120,11 +120,11 @@ length to avoid portals or something i guess?? Not that they're counted right no
best_estimated_cost = estimated_cost
nodes_traversed = _nodes_traversed
-/proc/PathWeightCompare(PathNode/a, PathNode/b)
+/proc/PathWeightCompare(datum/PathNode/a, datum/PathNode/b)
return a.estimated_cost - b.estimated_cost
/proc/AStar(var/start, var/end, var/adjacent, var/dist, var/max_nodes, var/max_node_depth = 30, var/min_target_dist = 0, var/min_node_dist, var/id, var/datum/exclude)
- var/PriorityQueue/open = new /PriorityQueue(/proc/PathWeightCompare)
+ var/datum/PriorityQueue/open = new /datum/PriorityQueue(/proc/PathWeightCompare)
var/list/closed = list()
var/list/path
var/list/path_node_by_position = list()
@@ -132,10 +132,10 @@ length to avoid portals or something i guess?? Not that they're counted right no
if(!start)
return 0
- open.Enqueue(new /PathNode(start, null, 0, call(start, dist)(end), 0))
+ open.Enqueue(new /datum/PathNode(start, null, 0, call(start, dist)(end), 0))
while(!open.IsEmpty() && !path)
- var/PathNode/current = open.Dequeue()
+ var/datum/PathNode/current = open.Dequeue()
closed.Add(current.position)
if(current.position == end || call(current.position, dist)(end) <= min_target_dist)
@@ -164,14 +164,14 @@ length to avoid portals or something i guess?? Not that they're counted right no
//handle removal of sub-par positions
if(datum in path_node_by_position)
- var/PathNode/target = path_node_by_position[datum]
+ var/datum/PathNode/target = path_node_by_position[datum]
if(target.best_estimated_cost)
if(best_estimated_cost + call(datum, dist)(end) < target.best_estimated_cost)
open.RemoveItem(target)
else
continue
- var/PathNode/next_node = new (datum, current, best_estimated_cost, call(datum, dist)(end), current.nodes_traversed + 1)
+ var/datum/PathNode/next_node = new (datum, current, best_estimated_cost, call(datum, dist)(end), current.nodes_traversed + 1)
path_node_by_position[datum] = next_node
open.Enqueue(next_node)
diff --git a/code/game/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm
index cfb16527f5..fa9499e3d1 100644
--- a/code/game/antagonist/outsider/wizard.dm
+++ b/code/game/antagonist/outsider/wizard.dm
@@ -108,7 +108,7 @@ GLOBAL_DATUM(wizards, /datum/antagonist/wizard)
//To batch-remove wizard spells. Linked to mind.dm.
/mob/proc/spellremove()
- for(var/spell/spell_to_remove in src.spell_list)
+ for(var/datum/spell/spell_to_remove in src.spell_list)
remove_spell(spell_to_remove)
/obj/item/clothing
diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm
index 8f04558a04..39903a8ee4 100644
--- a/code/game/gamemodes/cult/construct_spells.dm
+++ b/code/game/gamemodes/cult/construct_spells.dm
@@ -9,7 +9,7 @@
return 1
return 0
-/spell/aoe_turf/conjure/construct
+/datum/spell/aoe_turf/conjure/construct
name = "Artificer"
desc = "This spell conjures a construct which may be controlled by Shades"
@@ -24,13 +24,13 @@
hud_state = "artificer"
-/spell/aoe_turf/conjure/construct/lesser
+/datum/spell/aoe_turf/conjure/construct/lesser
charge_max = 1800
summon_type = list(/obj/structure/constructshell/cult)
hud_state = "const_shell"
override_base = "const"
-/spell/aoe_turf/conjure/floor
+/datum/spell/aoe_turf/conjure/floor
name = "Floor Construction"
desc = "This spell constructs a cult floor"
@@ -43,12 +43,12 @@
hud_state = "const_floor"
-/spell/aoe_turf/conjure/floor/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/datum/spell/aoe_turf/conjure/floor/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
animation.icon_state = "cultfloor"
flick("cultfloor",animation)
QDEL_IN(animation, 1 SECOND)
-/spell/aoe_turf/conjure/wall
+/datum/spell/aoe_turf/conjure/wall
name = "Lesser Construction"
desc = "This spell constructs a cult wall"
@@ -61,12 +61,12 @@
hud_state = "const_wall"
-/spell/aoe_turf/conjure/wall/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/datum/spell/aoe_turf/conjure/wall/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
animation.icon_state = "cultwall"
flick("cultwall",animation)
QDEL_IN(animation, 1 SECOND)
-/spell/aoe_turf/conjure/wall/reinforced
+/datum/spell/aoe_turf/conjure/wall/reinforced
name = "Greater Construction"
desc = "This spell constructs a reinforced metal wall"
@@ -79,7 +79,7 @@
summon_type = list(/turf/simulated/wall/r_wall)
-/spell/aoe_turf/conjure/soulstone
+/datum/spell/aoe_turf/conjure/soulstone
name = "Summon Soulstone"
desc = "This spell reaches into Nar-Sie's realm, summoning one of the legendary fragments across time and space"
@@ -94,7 +94,7 @@
hud_state = "const_stone"
override_base = "const"
-/spell/aoe_turf/conjure/pylon
+/datum/spell/aoe_turf/conjure/pylon
name = "Red Pylon"
desc = "This spell conjures a fragile crystal from Nar-Sie's realm. Makes for a convenient light source."
@@ -108,7 +108,7 @@
hud_state = "const_pylon"
-/spell/aoe_turf/conjure/pylon/cast(list/targets)
+/datum/spell/aoe_turf/conjure/pylon/cast(list/targets)
..()
var/turf/spawn_place = pick(targets)
for(var/obj/structure/cult/pylon/P in spawn_place.contents)
@@ -117,7 +117,7 @@
continue
return
-/spell/aoe_turf/conjure/door
+/datum/spell/aoe_turf/conjure/door
name = "Stone Door"
desc = "This spell conjures a massive stone door."
@@ -131,7 +131,7 @@
hud_state = "const_door"
-/spell/aoe_turf/conjure/grille
+/datum/spell/aoe_turf/conjure/grille
name = "Arcane Grille"
desc = "This spell conjures an airtight grille."
@@ -145,7 +145,7 @@
hud_state = "const_grille"
-/spell/aoe_turf/conjure/forcewall/lesser
+/datum/spell/aoe_turf/conjure/forcewall/lesser
name = "Shield"
desc = "Allows you to pull up a shield to protect yourself and allies from incoming threats"
@@ -172,7 +172,7 @@
/obj/effect/forcefield/cult/cultify()
return
-/spell/aoe_turf/knock/harvester
+/datum/spell/aoe_turf/knock/harvester
name = "Force Doors"
desc = "Mortal portals are no match for your occult might."
@@ -185,7 +185,7 @@
hud_state = "const_knock"
-/spell/aoe_turf/knock/harvester/cast(list/targets)
+/datum/spell/aoe_turf/knock/harvester/cast(list/targets)
/* for(var/turf/T in targets) //Disintigrating doors is bad, okay.
for(var/obj/machinery/door/door in T.contents)
spawn door.cultify()
@@ -208,7 +208,7 @@
*
*/
-/spell/targeted/ethereal_jaunt/shift
+/datum/spell/targeted/ethereal_jaunt/shift
name = "Phase Shift"
desc = "This spell allows you to pass through walls"
@@ -220,17 +220,17 @@
hud_state = "const_shift"
-/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/datum/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
animation.icon_state = "phase_shift"
animation.dir = target.dir
flick("phase_shift",animation)
-/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/datum/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target)
animation.icon_state = "phase_shift2"
animation.dir = target.dir
flick("phase_shift2",animation)
-/spell/targeted/ethereal_jaunt/shift/jaunt_steam(var/mobloc)
+/datum/spell/targeted/ethereal_jaunt/shift/jaunt_steam(var/mobloc)
return
/*
@@ -238,7 +238,7 @@
*/
/*
-/spell/targeted/harvest
+/datum/spell/targeted/harvest
name = "Harvest"
desc = "Back to where I come from, and you're coming with me."
@@ -257,7 +257,7 @@
hud_state = "const_harvest"
-/spell/targeted/harvest/cast(list/targets, mob/user)//because harvest is already a proc
+/datum/spell/targeted/harvest/cast(list/targets, mob/user)//because harvest is already a proc
..()
var/destination = null
@@ -276,7 +276,7 @@
to_chat(user, span_danger("...something's wrong!")) //There shouldn't be an instance of Harvesters when Nar-Sie isn't in the world.
*/
-/spell/targeted/fortify
+/datum/spell/targeted/fortify
name = "Fortify Shell"
desc = "Emit a field of energy around your shell to reduce incoming damage incredibly, while decreasing your mobility."
@@ -292,13 +292,13 @@
charge_max = 600
-/spell/targeted/fortify/cast(list/targets, mob/living/user)
+/datum/spell/targeted/fortify/cast(list/targets, mob/living/user)
if(findNullRod(user) || user.has_modifier_of_type(/datum/modifier/fortify))
charge_counter = 400
return
user.add_modifier(/datum/modifier/fortify, 1 MINUTES)
-/spell/targeted/occult_repair_aura
+/datum/spell/targeted/occult_repair_aura
name = "Repair Aura"
desc = "Emit a field of energy around your shell to repair nearby constructs at range."
@@ -314,13 +314,13 @@
charge_max = 600
-/spell/targeted/occult_repair_aura/cast(list/targets, mob/living/user)
+/datum/spell/targeted/occult_repair_aura/cast(list/targets, mob/living/user)
if(findNullRod(user) || user.has_modifier_of_type(/datum/modifier/repair_aura))
charge_counter = 300
return
user.add_modifier(/datum/modifier/repair_aura, 30 SECONDS)
-/spell/targeted/ambush_mode
+/datum/spell/targeted/ambush_mode
name = "Toggle Ambush"
desc = "Phase yourself mostly out of this reality, minimizing your combat ability, but allowing for employance of ambush tactics."
@@ -336,7 +336,7 @@
charge_max = 100
-/spell/targeted/ambush_mode/cast(list/targets, mob/living/user)
+/datum/spell/targeted/ambush_mode/cast(list/targets, mob/living/user)
if(findNullRod(user))
charge_counter = 50
return
@@ -351,7 +351,7 @@
*
*/
-/spell/targeted/construct_advanced
+/datum/spell/targeted/construct_advanced
name = "Base Construct Spell"
desc = "If you see this, please tell a developer!"
@@ -369,18 +369,18 @@
var/obj/item/spell/construct/spell_obj = null //This is the var that determines what Technomancer-style spell is put into their hands.
-/spell/targeted/construct_advanced/cast(list/targets, mob/living/user)
+/datum/spell/targeted/construct_advanced/cast(list/targets, mob/living/user)
if(!findNullRod(user))
user.place_spell_in_hand(spell_obj)
-/spell/targeted/construct_advanced/inversion_beam
+/datum/spell/targeted/construct_advanced/inversion_beam
name = "Inversion Beam"
desc = "Fire a searing beam of darkness at your foes."
hud_state = "const_beam"
spell_obj = /obj/item/spell/construct/projectile/inverted_beam
-/spell/targeted/construct_advanced/mend_acolyte
+/datum/spell/targeted/construct_advanced/mend_acolyte
name = "Mend Acolyte"
desc = "Mend a target acolyte or construct over time."
@@ -389,7 +389,7 @@
hud_state = "const_mend"
spell_obj = /obj/item/spell/construct/mend_occult
-/spell/targeted/construct_advanced/agonizing_sphere
+/datum/spell/targeted/construct_advanced/agonizing_sphere
name = "Sphere of Agony"
desc = "Rend a portal into a plane of naught but pain at the target location."
@@ -398,7 +398,7 @@
hud_state = "const_harvest"
spell_obj = /obj/item/spell/construct/spawner/agonizing_sphere
-/spell/targeted/construct_advanced/slam
+/datum/spell/targeted/construct_advanced/slam
name = "Slam"
desc = "Empower your FIST."
@@ -689,7 +689,7 @@
// Purity Construct - Bishop - Spells
////////////////////////////
-/spell/targeted/construct_advanced/crippling_beam
+/datum/spell/targeted/construct_advanced/crippling_beam
name = "Crippling Beam"
desc = "Fire a crippling beam to hold down your enemies or prey."
@@ -752,7 +752,7 @@
bang(target)
. = ..()
-/spell/targeted/construct_advanced/banishment
+/datum/spell/targeted/construct_advanced/banishment
name = "banishment"
desc = "Fire a searing beam of light, banishing unholy foes."
@@ -802,7 +802,7 @@
////////////////////////////
///Deacon Laser
-/spell/targeted/construct_advanced/force_beam
+/datum/spell/targeted/construct_advanced/force_beam
name = "Force Beam"
desc = "Fire a beam of kinetic energy to force back troublemakers."
@@ -844,7 +844,7 @@
///Deacon Healing Sphere
-/spell/targeted/construct_advanced/soothing_sphere
+/datum/spell/targeted/construct_advanced/soothing_sphere
name = "Sphere of soothing"
desc = "Rend a portal into a plane of sothing energy at the target location."
@@ -912,7 +912,7 @@
// Purity Construct - Priest - Spells
////////////////////////////
-/spell/targeted/construct_advanced/mend_purity
+/datum/spell/targeted/construct_advanced/mend_purity
name = "Mend Purity"
desc = "Mend a target living being or construct over time."
@@ -988,7 +988,7 @@
to_chat(H, span_danger("It feels as though your body is being torn apart!"))
L.updatehealth()
-/spell/targeted/purity_repair_aura
+/datum/spell/targeted/purity_repair_aura
name = "Repair Aura"
desc = "Emit a field of energy around your shell to repair nearby constructs at range."
@@ -1004,7 +1004,7 @@
charge_max = 600
-/spell/targeted/purity_repair_aura/cast(list/targets, mob/living/user)
+/datum/spell/targeted/purity_repair_aura/cast(list/targets, mob/living/user)
if(findNullRod(user) || user.has_modifier_of_type(/datum/modifier/repair_aura))
charge_counter = 300
return
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index 43a9e60255..9480847265 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -16,7 +16,7 @@
access = list() //See /datum/job/assistant/get_access()
minimal_access = list() //See /datum/job/assistant/get_access()
- outfit_type = /decl/hierarchy/outfit/job/assistant
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant
job_description = "An Assistant does whatever is requested of them. Though they are part of the crew, they have no real authority."
/* alt_titles = list(JOB_ALT_TECHNICAL_ASSISTANT = /datum/alt_title/tech_assist,
JOB_ALT_MEDICAL_INTERN= /datum/alt_title/med_intern, JOB_ALT_RESEARCH_ASSISTANT = /datum/alt_title/research_assist,
@@ -50,13 +50,13 @@
title_blurb = "A " + JOB_ALT_VISITOR + " is anyone who has arrived on the station but does not have a specific job to do. Many off-duty crewmembers \
who care to make use of the station's facilities arrive as Visitors. Properly registered Vistors are considered \
to be part of the crew for most if not all purposes, but they have no real authority."
- title_outfit = /decl/hierarchy/outfit/job/assistant/visitor
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/visitor
/datum/alt_title/resident // Just in case it makes a comeback
title = JOB_ALT_RESIDENT
title_blurb = "A " + JOB_ALT_RESIDENT + " is an individual who resides on the station, frequently in a different part of the station than what is seen. \
They are considered to be part of the crew for most purposes, but have no real authority."
- title_outfit = /decl/hierarchy/outfit/job/assistant/resident
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/resident
//////////////////////////////////
// Intern
@@ -75,7 +75,7 @@
economic_modifier = 2
access = list() //See /datum/job/intern/get_access()
minimal_access = list() //See /datum/job/intern/get_access()
- outfit_type = /decl/hierarchy/outfit/job/assistant/intern
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/intern
alt_titles = list(JOB_ALT_APPRENTICE_ENGINEER = /datum/alt_title/intern_eng,
JOB_ALT_MEDICAL_INTERN = /datum/alt_title/intern_med,
JOB_ALT_LAB_ASSISTANT = /datum/alt_title/intern_sci, //CHOMPEdit
@@ -93,47 +93,49 @@
title = JOB_ALT_APPRENTICE_ENGINEER
title_blurb = "An " + JOB_ALT_APPRENTICE_ENGINEER + " attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \
often in training to become an Engineer. An " + JOB_ALT_APPRENTICE_ENGINEER + " has no real authority."
- title_outfit = /decl/hierarchy/outfit/job/assistant/engineer
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/engineer
/datum/alt_title/intern_med
title = JOB_ALT_MEDICAL_INTERN
title_blurb = "A " + JOB_ALT_MEDICAL_INTERN + " attempts to provide whatever the Medical department needs. They are not proper Doctors, and are \
often in training to become a Doctor. A " + JOB_ALT_MEDICAL_INTERN + " has no real authority."
- title_outfit = /decl/hierarchy/outfit/job/assistant/medic
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/medic
/datum/alt_title/intern_sci
title = JOB_ALT_LAB_ASSISTANT //CHOMPEdit
title_blurb = "A " + JOB_ALT_LAB_ASSISTANT + " attempts to provide whatever the Research department needs. They are not proper " + JOB_SCIENTIST + "s, and are \
often in training to become a " + JOB_SCIENTIST + ". A " + JOB_ALT_LAB_ASSISTANT + " has no real authority." //CHOMPEdit
- title_outfit = /decl/hierarchy/outfit/job/assistant/scientist
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/scientist
/datum/alt_title/intern_sec
title = JOB_ALT_SECURITY_CADET
title_blurb = "A " + JOB_ALT_SECURITY_CADET + " attempts to provide whatever the Security department needs. They are not proper Officers, and are \
often in training to become an Officer. A " + JOB_ALT_SECURITY_CADET + " has no real authority."
- title_outfit = /decl/hierarchy/outfit/job/assistant/officer
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/officer
/datum/alt_title/intern_crg
title = JOB_ALT_JR_CARGO_TECH
title_blurb = "A " + JOB_ALT_JR_CARGO_TECH + " attempts to provide whatever the Cargo department needs. They are not proper Cargo Technicians, and are \
often in training to become a " + JOB_CARGO_TECHNICIAN + ". A " + JOB_ALT_JR_CARGO_TECH + " has no real authority."
- title_outfit = /decl/hierarchy/outfit/job/assistant/cargo
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/cargo
+
//CHOMP explo keep removed a wide comment field here
/datum/alt_title/intern_exp
title = "Jr. " + JOB_EXPLORER + ""
title_blurb = "A Jr. " + JOB_EXPLORER + " attempts to provide whatever the Exploration department needs. They are not proper " + JOB_EXPLORER + "s, and are \
often in training to become an " + JOB_EXPLORER + ". A Jr. " + JOB_EXPLORER + " has no real authority."
- title_outfit = /decl/hierarchy/outfit/job/assistant/explorer
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/explorer
//CHOMP explo keep removed the end of the wide comment field here
+
/datum/alt_title/server
title = JOB_ALT_SERVER
title_blurb = "A " + JOB_ALT_SERVER + " helps out kitchen and diner staff with various tasks, primarily food delivery. A " + JOB_ALT_SERVER + " has no real authority."
- title_outfit = /decl/hierarchy/outfit/job/service/server
+ title_outfit = /datum/decl/hierarchy/outfit/job/service/server
/datum/alt_title/assistant
title = JOB_ALT_ASSISTANT
title_blurb = "An " + JOB_ALT_ASSISTANT + " helps out wherever they might be needed. They have no authority, but can volunteer to help if help is needed."
- title_outfit = /decl/hierarchy/outfit/job/service/server
+ title_outfit = /datum/decl/hierarchy/outfit/job/service/server
/datum/job/intern/New()
..()
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index 5c62951605..ab115783b0 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -32,7 +32,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
pto_type = PTO_CIVILIAN
dept_time_required = 80 //Pending something more complicated
- outfit_type = /decl/hierarchy/outfit/job/captain
+ outfit_type = /datum/decl/hierarchy/outfit/job/captain
job_description = "The " + JOB_SITE_MANAGER + " manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \
they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The " + JOB_SITE_MANAGER + " is expected to \
have an understanding of Standard Operating Procedure, and is subject to it, and legal action, in the same way as every other crew member."
@@ -102,7 +102,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET)
dept_time_required = 60
- outfit_type = /decl/hierarchy/outfit/job/hop
+ outfit_type = /datum/decl/hierarchy/outfit/job/hop
job_description = "The " + JOB_HEAD_OF_PERSONNEL + " manages the Service department and most other civilians. They also \
manage the Supply department, through the " + JOB_QUARTERMASTER + ". In addition, the " + JOB_HEAD_OF_PERSONNEL + " oversees the personal accounts \
of the crew, including their money and access. If necessary, the " + JOB_HEAD_OF_PERSONNEL + " is first in line to assume Acting Command." //YW EDIT
@@ -165,7 +165,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
access = list(ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE) //YAWN EDIT
minimal_access = list(ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE)//YAWN EDIT
- outfit_type = /decl/hierarchy/outfit/job/secretary
+ outfit_type = /datum/decl/hierarchy/outfit/job/secretary
job_description = "A " + JOB_COMMAND_SECRETARY + " handles paperwork duty for the Heads of Staff, so they can better focus on managing their departments. \
They are not Heads of Staff, and have no real authority."
diff --git a/code/game/jobs/job/cargo.dm b/code/game/jobs/job/cargo.dm
index ba1cd7eede..137f74455b 100644
--- a/code/game/jobs/job/cargo.dm
+++ b/code/game/jobs/job/cargo.dm
@@ -23,7 +23,7 @@
ideal_character_age = 40
dept_time_required = 20
- outfit_type = /decl/hierarchy/outfit/job/cargo/qm
+ outfit_type = /datum/decl/hierarchy/outfit/job/cargo/qm
job_description = "The " + JOB_QUARTERMASTER + " manages the Supply department, checking cargo orders and ensuring supplies get to where they are needed."
alt_titles = list(JOB_ALT_SUPPLY_CHIEF = /datum/alt_title/supply_chief, JOB_ALT_LOGISTICS_MANAGER = /datum/alt_title/logistics_manager, JOB_ALT_CARGO_SUPERVISOR = /datum/alt_title/cargo_supervisor)
@@ -57,7 +57,7 @@
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING)
- outfit_type = /decl/hierarchy/outfit/job/cargo/cargo_tech
+ outfit_type = /datum/decl/hierarchy/outfit/job/cargo/cargo_tech
job_description = "A " + JOB_CARGO_TECHNICIAN + " fills and delivers cargo orders. They are encouraged to return delivered crates to the Cargo Shuttle, \
because Central Command gives a partial refund."
@@ -83,7 +83,7 @@
/datum/alt_title/mailman
title = JOB_ALT_MAILMAN
title_blurb = "A Mail Carrier is tasked with delivering packages or mail to whoever it might adress."
- title_outfit = /decl/hierarchy/outfit/job/cargo/cargo_tech/mailman
+ title_outfit = /datum/decl/hierarchy/outfit/job/cargo/cargo_tech/mailman
/datum/alt_title/delivery_worker
title = JOB_ALT_DELIVERY_WORKER
@@ -109,7 +109,7 @@
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
minimal_access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING)
- outfit_type = /decl/hierarchy/outfit/job/cargo/mining
+ outfit_type = /datum/decl/hierarchy/outfit/job/cargo/mining
job_description = "A " + JOB_SHAFT_MINER + " mines and processes minerals to be delivered to departments that need them."
alt_titles = list(/*CHOMPEdit Removal JOB_ALT_DEEP_SPACE_MINER = /datum/alt_title/deep_space_miner*/, JOB_ALT_DRILL_TECHNICIAN = /datum/alt_title/drill_tech, JOB_ALT_PROSPECTOR = /datum/alt_title/prospector,
JOB_ALT_EXCAVATOR = /datum/alt_title/excavator)
diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index 7b14709bbc..3072a93b1d 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -18,7 +18,7 @@
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_BAR)
- outfit_type = /decl/hierarchy/outfit/job/service/bartender
+ outfit_type = /datum/decl/hierarchy/outfit/job/service/bartender
job_description = "A " + JOB_BARTENDER + " mixes drinks for the crew. They generally have permission to charge for drinks or deny service to unruly patrons."
alt_titles = list(JOB_ALT_BARKEEPR = /datum/alt_title/barkeeper, JOB_ALT_BARMAID = /datum/alt_title/barmaid, JOB_ALT_BARISTA = /datum/alt_title/barista, JOB_ALT_MIXOLOGIST = /datum/alt_title/mixologist)
@@ -27,7 +27,7 @@
title = JOB_ALT_BARISTA
title_blurb = "A " + JOB_ALT_BARISTA + " mans the Cafe, serving primarily non-alcoholic drinks to the crew. They generally have permission to charge for drinks \
or deny service to unruly patrons."
- title_outfit = /decl/hierarchy/outfit/job/service/bartender/barista
+ title_outfit = /datum/decl/hierarchy/outfit/job/service/bartender/barista
/datum/alt_title/barkeeper
title = JOB_ALT_BARKEEPR
@@ -56,7 +56,7 @@
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_KITCHEN)
- outfit_type = /decl/hierarchy/outfit/job/service/chef
+ outfit_type = /datum/decl/hierarchy/outfit/job/service/chef
job_description = "A " + JOB_CHEF + " cooks food for the crew. They generally have permission to charge for food or deny service to unruly diners."
alt_titles = list(JOB_ALT_SOUSCHEF = /datum/alt_title/souschef, JOB_ALT_COOK = /datum/alt_title/cook, JOB_ALT_KITCHEN_WORKER = /datum/alt_title/kitchen_worker)
@@ -90,7 +90,7 @@
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_HYDROPONICS)
- outfit_type = /decl/hierarchy/outfit/job/service/gardener
+ outfit_type = /datum/decl/hierarchy/outfit/job/service/gardener
job_description = "A " + JOB_BOTANIST+ " grows plants for the " + JOB_CHEF + " and " + JOB_BARTENDER + "."
alt_titles = list(JOB_ALT_HYDROPONICIST = /datum/alt_title/hydroponicist, JOB_ALT_CULTIVATOR = /datum/alt_title/cultivator, JOB_ALT_FARMER = /datum/alt_title/farmer,
JOB_ALT_GARDENER = /datum/alt_title/gardener, JOB_ALT_FLORIST = /datum/alt_title/florsit, JOB_ALT_RANCHER = /datum/alt_title/rancher)
@@ -135,7 +135,7 @@
access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS)
- outfit_type = /decl/hierarchy/outfit/job/service/janitor
+ outfit_type = /datum/decl/hierarchy/outfit/job/service/janitor
job_description = "A " + JOB_JANITOR + " keeps the station clean, as long as it doesn't interfere with active crime scenes."
alt_titles = list(JOB_ALT_CUSTODIAN = /datum/alt_title/custodian, JOB_ALT_SANITATION_TECHNICIAN = /datum/alt_title/sanitation_tech,
JOB_ALT_MAID = /datum/alt_title/maid, JOB_ALT_GARBAGE_COLLECTOR = /datum/alt_title/garbage_collector)
@@ -172,7 +172,7 @@
access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_LIBRARY)
- outfit_type = /decl/hierarchy/outfit/job/librarian
+ outfit_type = /datum/decl/hierarchy/outfit/job/librarian
job_description = "The " + JOB_LIBRARIAN + " curates the book selection in the Library, so the crew might enjoy it."
alt_titles = list(JOB_ALT_JOURNALIST = /datum/alt_title/journalist, JOB_ALT_REPORTER = /datum/alt_title/reporter, JOB_ALT_WRITER = /datum/alt_title/writer,
JOB_ALT_HISTORIAN = /datum/alt_title/historian, JOB_ALT_ARCHIVIST = /datum/alt_title/archivist, JOB_ALT_PROFESSOR = /datum/alt_title/professor,
@@ -181,7 +181,7 @@
// Librarian Alt Titles
/datum/alt_title/journalist
title = JOB_ALT_JOURNALIST
- title_outfit = /decl/hierarchy/outfit/job/librarian/journalist
+ title_outfit = /datum/decl/hierarchy/outfit/job/librarian/journalist
title_blurb = "The " + JOB_ALT_JOURNALIST + " uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera."
/datum/alt_title/writer
@@ -239,7 +239,7 @@
minimal_player_age = 7
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_TESHARI, SPECIES_ZADDAT, FBP_DIGITAL)
- outfit_type = /decl/hierarchy/outfit/job/internal_affairs_agent
+ outfit_type = /datum/decl/hierarchy/outfit/job/internal_affairs_agent
job_description = "An " + JOB_INTERNAL_AFFAIRS_AGENT + " makes sure that the crew is following Standard Operating Procedure. They also \
handle complaints against crew members, and can have issues brought to the attention of Central Command, \
assuming their paperwork is in order."
@@ -283,7 +283,7 @@
pto_type = PTO_CIVILIAN
access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT)
minimal_access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT)
- outfit_type = /decl/hierarchy/outfit/job/pilot
+ outfit_type = /datum/decl/hierarchy/outfit/job/pilot
job_description = "A " + JOB_PILOT + " flies the various shuttles in the Virgo-Erigone System."
alt_titles = list(JOB_ALT_COPILOT = /datum/alt_title/co_pilot, JOB_ALT_NAVIGATOR = /datum/alt_title/navigator, JOB_ALT_HELMSMAN = /datum/alt_title/helmsman)
@@ -319,7 +319,7 @@
minimal_access = list(ACCESS_ENTERTAINMENT)
pto_type = PTO_CIVILIAN
- outfit_type = /decl/hierarchy/outfit/job/assistant/entertainer
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/entertainer
job_description = "An " + JOB_ENTERTAINER + " does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic."
alt_titles = list(JOB_ALT_PERFORMER = /datum/alt_title/performer, JOB_ALT_MUSICIAN = /datum/alt_title/musician, JOB_ALT_STAGEHAND = /datum/alt_title/stagehand,
JOB_ALT_ACTOR = /datum/alt_title/actor, JOB_ALT_DANCER = /datum/alt_title/dancer, JOB_ALT_SINGER = /datum/alt_title/singer,
@@ -396,7 +396,7 @@
minimal_access = list()
pto_type = PTO_CIVILIAN
- outfit_type = /decl/hierarchy/outfit/job/assistant/entrepreneur
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur
job_description = "An " + JOB_ENTREPRENEUR + " is basically a visitor that obtained special permission to offer personal services to people on station. \
They will offer people these services and, potentially, even demand payment!"
alt_titles = list(JOB_ALT_LAWYER = /datum/alt_title/lawyer, JOB_ALT_PRIVATE_EYE = /datum/alt_title/private_eye, JOB_ALT_BODYGUARD = /datum/alt_title/bodyguard,
@@ -410,94 +410,94 @@
/datum/alt_title/lawyer
title = JOB_ALT_LAWYER
title_blurb = "A " + JOB_ALT_LAWYER + " is knowledgable in various legal systems, including station's operations. They can try to offer their legal counsel, although nobody is really obliged to listen."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
/datum/alt_title/private_eye
title = JOB_ALT_PRIVATE_EYE
title_blurb = "A " + JOB_ALT_PRIVATE_EYE + " is a detective that has no credentials or equipment. But if someone wants something found without security's knowledge, they are the one to go to."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye
/datum/alt_title/bodyguard
title = JOB_ALT_BODYGUARD
title_blurb = "A " + JOB_ALT_BODYGUARD + " offers service of personal protection. They may not be allowed any weapons, but their own body is weapon enough."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard
/datum/alt_title/personal_physician
title = JOB_ALT_PERSONAL_PHYSICIAN
title_blurb = "A " + JOB_ALT_PERSONAL_PHYSICIAN + " is a doctor dedicated less to Hippocratic Oath and more to the moneymaking grind. Their license may be expired, but the grindset never will be."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician
/datum/alt_title/dentist
title = JOB_ALT_DENTIST
title_blurb = "A " + JOB_ALT_DENTIST + " is a doctor that specializes in oral care. Company may not recognize them as a proper doctor, but surely their customers will."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/dentist
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/dentist
/datum/alt_title/fitness_instructor
title = JOB_ALT_FITNESS_INSTRUCTOR
title_blurb = "A " + JOB_ALT_FITNESS_INSTRUCTOR + " dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor
/datum/alt_title/yoga_teacher
title = JOB_ALT_YOGA_TEACHER
title_blurb = "A " + JOB_ALT_YOGA_TEACHER + " is similar to a fitness instructor, but rather than turning the round bodies into firm ones, they focus on helping people find balance and harmony."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher
/datum/alt_title/masseuse
title = JOB_ALT_MASSEUSE
title_blurb = "A " + JOB_ALT_MASSEUSE + " is master of physical therapy and working others' bodies with their hands."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse
/datum/alt_title/tradesperson
title = JOB_ALT_TRADESPERSON
title_blurb = "A " + JOB_ALT_TRADESPERSON + " is someone attempting to make money via the most obvious act of all - buying and selling. Now if only customs allowed you to bring your goods along..."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson
/datum/alt_title/streamer
title = JOB_ALT_STREAMER
title_blurb = "A " + JOB_ALT_STREAMER + " is here to entertain. Not the crew! Their audience across exonet!"
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/streamer
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/streamer
/datum/alt_title/influencer
title = JOB_ALT_INFLUENCER
title_blurb = "An " + JOB_ALT_INFLUENCER + " has lucked out with some exonet following, and was given permission to go onstation to provide free exposure. Don't let it go to your head."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/influencer
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/influencer
/datum/alt_title/paranormal_investigator
title = JOB_ALT_PARANORMAL_INVESTIGATOR
title_blurb = "A " + JOB_ALT_PARANORMAL_INVESTIGATOR + " looks beyond what is accepted by modern science, and searches for the true unknown. Aliens, alternate dimensions, ghosts... The truth is out there!"
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator
/datum/alt_title/personal_secretary
title = JOB_ALT_PERSONAL_SECRETARY
title_blurb = "A " + JOB_ALT_PERSONAL_SECRETARY + " offers services of general assistance. Although it's doubtful anyone will ever actually need those."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
/datum/alt_title/stylist
title = JOB_ALT_STYLIST
title_blurb = "A " + JOB_ALT_STYLIST + " offers fashion advice, as well as helps with adjusting appearance of the crew to better suit their beauty standards."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/stylist
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/stylist
/datum/alt_title/fisher
title = JOB_ALT_FISHER
title_blurb = "A " + JOB_ALT_FISHER + " is a capable angler, who is good at obtaining large amounts of marine goods. Whether you generously give them to station or attempt to make a quick thaler by selling, it's up to you!"
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fisher
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/fisher
/datum/alt_title/fortune_teller
title = JOB_ALT_FORTUNE_TELLER
title_blurb = "A " + JOB_ALT_FORTUNE_TELLER + " peers into the future, and offers these visions to others. Occasionally those visions may even come true!"
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller
/datum/alt_title/spirit_healer
title = JOB_ALT_SPIRIT_HEALER
title_blurb = "A " + JOB_ALT_SPIRIT_HEALER + " offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?"
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer
/datum/alt_title/educator
title = JOB_ALT_EDUCATOR
title_blurb = "A " + JOB_ALT_EDUCATOR + " provides an education of some sort to the crew. Perhaps somebody coming in to teach a health and safety course, or teach about cultures?"
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/educator
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/educator
/datum/alt_title/instructor
title = JOB_ALT_INSTRUCTOR
title_blurb = "A " + JOB_ALT_INSTRUCTOR + " provides instructions on how to perform certain tasks, providing training for crew members in new skills."
- title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/educator
+ title_outfit = /datum/decl/hierarchy/outfit/job/assistant/entrepreneur/educator
diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm
index 7846c40979..427372169d 100644
--- a/code/game/jobs/job/civilian_chaplain.dm
+++ b/code/game/jobs/job/civilian_chaplain.dm
@@ -13,7 +13,7 @@
access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM)
- outfit_type = /decl/hierarchy/outfit/job/chaplain
+ outfit_type = /datum/decl/hierarchy/outfit/job/chaplain
job_description = "The " + JOB_CHAPLAIN + " ministers to the spiritual needs of the crew."
alt_titles = list(JOB_ALT_MISSIONARY = /datum/alt_title/missionary, JOB_ALT_PREACHER = /datum/alt_title/preacher, JOB_ALT_PRIEST = /datum/alt_title/priest,
JOB_ALT_NUN = /datum/alt_title/nun, JOB_ALT_MONK = /datum/alt_title/monk, JOB_ALT_COUNSELOR = /datum/alt_title/counselor,
diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
index a16e90f514..28411ed42c 100644
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -38,7 +38,7 @@
alt_titles = list(JOB_ALT_HEAD_ENGINEER = /datum/alt_title/head_engineer, JOB_ALT_FOREMAN = /datum/alt_title/foreman, JOB_ALT_MAINTENANCE_MANAGER = /datum/alt_title/maintenance_manager)
minimal_player_age = 31 //ChompEDIT
- outfit_type = /decl/hierarchy/outfit/job/engineering/chief_engineer
+ outfit_type = /datum/decl/hierarchy/outfit/job/engineering/chief_engineer
job_description = "The " + JOB_CHIEF_ENGINEER + " manages the Engineering Department, ensuring that the Engineers work on what needs to be done, handling distribution \
of manpower as much as they handle hands-on operations and repairs. They are also expected to keep the rest of the station informed of \
any structural threats to the station that may be hazardous to health or disruptive to work."
@@ -85,7 +85,7 @@
minimal_player_age = 3
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
- outfit_type = /decl/hierarchy/outfit/job/engineering/engineer
+ outfit_type = /datum/decl/hierarchy/outfit/job/engineering/engineer
job_description = "An " + JOB_ENGINEER + " keeps the station running. They repair damages, keep the atmosphere stable, and ensure that power is being \
generated and distributed. On quiet shifts, they may be called upon to make cosmetic alterations to the station."
@@ -138,7 +138,7 @@
/datum/alt_title/chem_tech
title = JOB_ALT_CHEMENGINEER
title_blurb = "A " + JOB_ALT_CHEMENGINEER + " specializes in industrial scale chemical production. They are responsible for planning the construction of and operating chemical refinery machines."
- title_outfit = /decl/hierarchy/outfit/job/engineering/chems
+ title_outfit = /datum/decl/hierarchy/outfit/job/engineering/chems
//////////////////////////////////
// Atmos Tech
@@ -164,7 +164,7 @@
minimal_player_age = 3
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
- outfit_type = /decl/hierarchy/outfit/job/engineering/atmos
+ outfit_type = /datum/decl/hierarchy/outfit/job/engineering/atmos
job_description = "An " + JOB_ATMOSPHERIC_TECHNICIAN + " is primarily concerned with keeping the station's atmosphere breathable. They are expected to have a good \
understanding of the pipes, vents, and scrubbers that move gasses around the station, and to be familiar with proper firefighting procedure."
diff --git a/code/game/jobs/job/exploration.dm b/code/game/jobs/job/exploration.dm
index 9e339e156a..eb915f9edc 100644
--- a/code/game/jobs/job/exploration.dm
+++ b/code/game/jobs/job/exploration.dm
@@ -47,7 +47,7 @@
access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT, ACCESS_EXPLORER, ACCESS_GATEWAY, ACCESS_PATHFINDER, ACCESS_RC_ANNOUNCE)
minimal_access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT, ACCESS_EXPLORER, ACCESS_GATEWAY, ACCESS_PATHFINDER, ACCESS_RC_ANNOUNCE)
- outfit_type = /decl/hierarchy/outfit/job/pathfinder
+ outfit_type = /datum/decl/hierarchy/outfit/job/pathfinder
job_description = "The " + JOB_PATHFINDER + "'s job is to lead and manage expeditions, and is the primary authority on all off-station expeditions."
alt_titles = list(JOB_ALT_EXPEDITION_LEAD = /datum/alt_title/expedition_lead, JOB_ALT_EXPLORATION_MANAGER = /datum/alt_title/exploration_manager)
@@ -76,7 +76,7 @@
pto_type = PTO_EXPLORATION
access = list(ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_EXPLORER) //CHOMPedit gave pilot a little more access
minimal_access = list(ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_EXPLORER) //CHOMPedit gave pilot a little more access
- outfit_type = /decl/hierarchy/outfit/job/pilot
+ outfit_type = /datum/decl/hierarchy/outfit/job/pilot
job_description = "A Pilot flies the various shuttles in the Vir System." //CHOMPedit: Replaces Virgo reference with Vir.
alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman)
@@ -105,7 +105,7 @@
pto_type = PTO_EXPLORATION
access = list(ACCESS_EXPLORER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA)
minimal_access = list(ACCESS_EXPLORER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA)
- outfit_type = /decl/hierarchy/outfit/job/explorer2
+ outfit_type = /datum/decl/hierarchy/outfit/job/explorer2
job_description = "An " + JOB_EXPLORER + " searches for interesting things, and returns them to the station."
alt_titles = list(JOB_ALT_SURVEYOR = /datum/alt_title/surveyor, JOB_ALT_OFFSITE_SCOUT = /datum/alt_title/offsite_scout)
@@ -133,7 +133,7 @@
pto_type = PTO_EXPLORATION
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS,ACCESS_EXPLORER) // CHOMPedit: No more pilot, surgery or chemistry access.
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE,ACCESS_EXPLORER) // CHOMPedit: No more pilot access.
- outfit_type = /decl/hierarchy/outfit/job/medical/sar
+ outfit_type = /datum/decl/hierarchy/outfit/job/medical/sar
job_description = "A " + JOB_FIELD_MEDIC + " works as the field doctor of expedition teams."
alt_titles = list(JOB_ALT_EXPEDITION_MEDIC = /datum/alt_title/expedition_medic, JOB_ALT_OFFSITE_MEDIC = /datum/alt_title/offsite_medic)
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index d54fe196ab..9d309df82f 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -77,7 +77,7 @@
department_accounts = department_accounts || departments_managed
/datum/job/proc/equip(var/mob/living/carbon/human/H, var/alt_title)
- var/decl/hierarchy/outfit/outfit = get_outfit(H, alt_title)
+ var/datum/decl/hierarchy/outfit/outfit = get_outfit(H, alt_title)
if(!outfit)
return FALSE
. = outfit.equip(H, title, alt_title)
@@ -125,7 +125,7 @@
// overrideable separately so AIs/borgs can have cardborg hats without unneccessary new()/qdel()
/datum/job/proc/equip_preview(mob/living/carbon/human/H, var/alt_title)
- var/decl/hierarchy/outfit/outfit = get_outfit(H, alt_title)
+ var/datum/decl/hierarchy/outfit/outfit = get_outfit(H, alt_title)
if(!outfit)
return FALSE
. = outfit.equip_base(H, title, alt_title)
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index 5878bdfc4f..8fac229529 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -35,7 +35,7 @@
pto_type = PTO_MEDICAL
dept_time_required = 60
- outfit_type = /decl/hierarchy/outfit/job/medical/cmo
+ outfit_type = /datum/decl/hierarchy/outfit/job/medical/cmo
job_description = "The CMO manages the Medical department and is a position requiring experience and skill; their goal is to ensure that their \
staff keep the station's crew healthy and whole. They are primarily interested in making sure that patients are safely found and \
transported to Medical for treatment. They are expected to keep the crew informed about threats to their health and safety, and \
@@ -70,7 +70,7 @@
economic_modifier = 7
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_VIROLOGY, ACCESS_EVA)
- outfit_type = /decl/hierarchy/outfit/job/medical/doctor
+ outfit_type = /datum/decl/hierarchy/outfit/job/medical/doctor
job_description = "A " + JOB_MEDICAL_DOCTOR + " is a Jack-of-All-Trades Medical title, covering a variety of skill levels and minor specializations. They are likely \
familiar with basic first aid, and a number of accompanying medications, and can generally save, if not cure, a majority of the \
patients they encounter."
@@ -88,27 +88,27 @@
title = JOB_ALT_SURGEON
title_blurb = "A " + JOB_ALT_SURGEON + " specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachement. They are expected \
to know the ins and outs of anesthesia and surgery."
- title_outfit = /decl/hierarchy/outfit/job/medical/doctor/surgeon
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/doctor/surgeon
/datum/alt_title/emergency_physician
title = JOB_ALT_EMERGENCY_PHYSICIAN
title_blurb = "An " + JOB_ALT_EMERGENCY_PHYSICIAN + " is a Medical professional trained for stabilizing and treating severely injured and/or dying patients. \
They are generally the first response for any such individual brought to the Medbay, and can sometimes be expected to help their patients \
make a full recovery."
- title_outfit = /decl/hierarchy/outfit/job/medical/doctor/emergency_physician
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/doctor/emergency_physician
/datum/alt_title/nurse
title = JOB_ALT_NURSE
title_blurb = "A " + JOB_ALT_NURSE + " acts as a general purpose Doctor's Aide, providing basic care to non-critical patients, and stabilizing critical patients during \
busy periods. They frequently watch the suit sensors console, to help manage the time of other Doctors. In rare occasions, a " + JOB_ALT_NURSE + " can be \
called upon to revive deceased crew members."
- title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/doctor/nurse
/datum/alt_title/virologist
title = JOB_ALT_VIROLOGIST
title_blurb = "A " + JOB_ALT_VIROLOGIST + " cures active diseases in the crew, and prepares antibodies for possible infections. They also have the skills \
to produce the various types of virus foods or mutagens."
- title_outfit = /decl/hierarchy/outfit/job/medical/doctor/virologist
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/doctor/virologist
/datum/alt_title/physician
title = JOB_ALT_PHYSICIAN
@@ -120,7 +120,7 @@
title = JOB_ALT_ORDERLY
title_blurb = "An " + JOB_ALT_ORDERLY + " acts as Medbay's general helping hand, assisting any doctor that might need some form of help, as well as handling manual \
and dirty labor around the department."
- title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/doctor/nurse
/datum/alt_title/medical_contractor
title = JOB_ALT_MEDICAL_CONTRACTOR
@@ -151,7 +151,7 @@
minimal_player_age = 3
min_age_by_species = list(SPECIES_PROMETHEAN = 3)
- outfit_type = /decl/hierarchy/outfit/job/medical/chemist
+ outfit_type = /datum/decl/hierarchy/outfit/job/medical/chemist
job_description = "A " + JOB_CHEMIST + " produces and maintains a stock of basic to advanced chemicals for medical and occasionally research use. \
They are likely to know the use and dangers of many lab-produced chemicals."
alt_titles = list(JOB_ALT_PHARMACIST = /datum/alt_title/pharmacist, JOB_ALT_PHARMACOLOGIST = /datum/alt_title/pharmacologist)
@@ -182,7 +182,7 @@
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_RESEARCH)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_RESEARCH)
- outfit_type = /decl/hierarchy/outfit/job/medical/geneticist
+ outfit_type = /datum/decl/hierarchy/outfit/job/medical/geneticist
job_description = "A " + JOB_GENETICIST + " operates genetic manipulation equipment to repair any genetic defects encountered in crew, from cloning or radiation as examples. \
When required, geneticists have the skills to clone, and are the superior choice when available for doing so."
@@ -203,7 +203,7 @@
selection_color = "#013D3B"
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_PSYCHIATRIST)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PSYCHIATRIST)
- outfit_type = /decl/hierarchy/outfit/job/medical/psychiatrist
+ outfit_type = /datum/decl/hierarchy/outfit/job/medical/psychiatrist
job_description = "A " + JOB_PSYCHIATRIST + " provides mental health services to crew members in need. They may also be called upon to determine whatever \
ails the mentally unwell, frequently under Security supervision. They understand the effects of various psychoactive drugs."
alt_titles = list(JOB_ALT_PSYCHOLOGIST = /datum/alt_title/psychologist, JOB_ALT_PSYCHOANALYST = /datum/alt_title/psychoanalyst, JOB_ALT_PSYCHOTHERAPIST = /datum/alt_title/psychotherapist)
@@ -214,19 +214,19 @@
title = JOB_ALT_PSYCHOLOGIST
title_blurb = "A " + JOB_ALT_PSYCHOLOGIST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
called upon to determine whatever ails the mentally unwell, frequently under Security supervision."
- title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
/datum/alt_title/psychoanalyst
title = JOB_ALT_PSYCHOANALYST
title_blurb = "A " + JOB_ALT_PSYCHOANALYST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
called upon to determine whatever ails the mentally unwell, frequently under Security supervision."
- title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
/datum/alt_title/psychotherapist
title = JOB_ALT_PSYCHOTHERAPIST
title_blurb = "A " + JOB_ALT_PSYCHOTHERAPIST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
called upon to determine whatever ails the mentally unwell, frequently under Security supervision."
- title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
//////////////////////////////////
// Paramedic
@@ -246,7 +246,7 @@
economic_modifier = 5 // CHOMPAdd - "Makes Parameds make as much as offduty medical."
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
- outfit_type = /decl/hierarchy/outfit/job/medical/paramedic
+ outfit_type = /datum/decl/hierarchy/outfit/job/medical/paramedic
job_description = "A " + JOB_PARAMEDIC + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their own. \
They may also be called upon to keep patients stable when Medical is busy or understaffed."
alt_titles = list(JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN = /datum/alt_title/emt, JOB_ALT_MEDICAL_RESPONDER = /datum/alt_title/medical_responder) //CHOMPedit: Removed SAR because that's an actual job here
@@ -262,13 +262,13 @@
title = JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN
title_blurb = "An " + JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \
own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training."
- title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/paramedic/emt
/datum/alt_title/medical_responder
title = JOB_ALT_MEDICAL_RESPONDER
title_blurb = "A " + JOB_ALT_MEDICAL_RESPONDER + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \
own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training."
- title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt
+ title_outfit = /datum/decl/hierarchy/outfit/job/medical/paramedic/emt
/* CHOMPRemove Start, this is an actual job for us
/datum/alt_title/sar
diff --git a/code/game/jobs/job/offduty.dm b/code/game/jobs/job/offduty.dm
index 335cadc953..a2b8dc97ff 100644
--- a/code/game/jobs/job/offduty.dm
+++ b/code/game/jobs/job/offduty.dm
@@ -13,7 +13,7 @@
selection_color = "#9b633e"
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
- outfit_type = /decl/hierarchy/outfit/job/assistant/worker
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/worker
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_CIVILIAN
economic_modifier = 2
@@ -29,7 +29,7 @@
selection_color = "#9b633e"
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
- outfit_type = /decl/hierarchy/outfit/job/assistant/cargo
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/cargo
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_CARGO
economic_modifier = 2
@@ -45,7 +45,7 @@
selection_color = "#5B4D20"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
- outfit_type = /decl/hierarchy/outfit/job/assistant/engineer
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/engineer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_ENGINEERING
economic_modifier = 5
@@ -61,7 +61,7 @@
selection_color = "#013D3B"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
- outfit_type = /decl/hierarchy/outfit/job/assistant/medic
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/medic
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_MEDICAL
economic_modifier = 5
@@ -77,7 +77,7 @@
selection_color = "#633D63"
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
- outfit_type = /decl/hierarchy/outfit/job/assistant/scientist
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/scientist
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_SCIENCE
economic_modifier = 5
@@ -93,7 +93,7 @@
selection_color = "#601C1C"
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
- outfit_type = /decl/hierarchy/outfit/job/assistant/officer
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/officer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_SECURITY
economic_modifier = 5
@@ -109,7 +109,7 @@
selection_color = "#999440"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
- outfit_type = /decl/hierarchy/outfit/job/assistant/explorer
+ outfit_type = /datum/decl/hierarchy/outfit/job/assistant/explorer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_EXPLORATION
economic_modifier = 5
diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
index 57a1f518f2..7271181aa1 100644
--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -36,7 +36,7 @@
pto_type = PTO_SCIENCE
dept_time_required = 60
- outfit_type = /decl/hierarchy/outfit/job/science/rd
+ outfit_type = /datum/decl/hierarchy/outfit/job/science/rd
job_description = "The " + JOB_RESEARCH_DIRECTOR + " manages and maintains the Research department. They are required to ensure the safety of the entire crew, \
at least with regards to anything occurring in the Research department, and to inform the crew of any disruptions that \
might originate from Research. The " + JOB_RESEARCH_DIRECTOR + " often has at least passing knowledge of most of the Research department, but \
@@ -82,7 +82,7 @@
minimal_player_age = 3
- outfit_type = /decl/hierarchy/outfit/job/science/scientist
+ outfit_type = /datum/decl/hierarchy/outfit/job/science/scientist
job_description = "A " + JOB_SCIENTIST + " is a generalist working in the Research department, with general knowledge of the scientific process, as well as \
the principles and requirements of Research and Development. They may also formulate experiments of their own devising, if \
they find an appropriate topic."
@@ -161,7 +161,7 @@
minimal_player_age = 14
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
- outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist
+ outfit_type = /datum/decl/hierarchy/outfit/job/science/xenobiologist
job_description = "A " + JOB_XENOBIOLOGIST + " studies esoteric lifeforms, usually in the relative safety of their lab. They attempt to find ways to benefit \
from the byproducts of these lifeforms, and their main subject at present is the Giant Slime."
@@ -201,7 +201,7 @@
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
banned_job_species = list(FBP_DIGITAL)
- outfit_type = /decl/hierarchy/outfit/job/science/roboticist
+ outfit_type = /datum/decl/hierarchy/outfit/job/science/roboticist
job_description = "A " + JOB_ROBOTICIST + " maintains and repairs the station's synthetics, including crew with prosthetic limbs. \
They can also assist the station by producing simple robots and even pilotable exosuits."
alt_titles = list(
@@ -251,7 +251,7 @@
minimal_player_age = 14
- outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist
+ outfit_type = /datum/decl/hierarchy/outfit/job/science/xenobiologist
job_description = "A " + JOB_XENOBOTANIST + " grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \
are both safe and beneficial to the station, they may choose to introduce it to the rest of the crew."
alt_titles = list(JOB_ALT_XENOHYDROPONICIST = /datum/alt_title/xenohydroponicist, JOB_ALT_XENOFLORIST = /datum/alt_title/xenoflorist)
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index e691807d0b..2760fcbb08 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -33,7 +33,7 @@
pto_type = PTO_SECURITY
dept_time_required = 60
- outfit_type = /decl/hierarchy/outfit/job/security/hos
+ outfit_type = /datum/decl/hierarchy/outfit/job/security/hos
job_description = " The " + JOB_HEAD_OF_SECURITY + " manages the Security Department, keeping the station safe and making sure the rules are followed. They are expected to \
keep the other Department Heads, and the rest of the crew, aware of developing situations that may be a threat. If necessary, the HoS may \
perform the duties of absent Security roles, such as distributing gear from the Armory."
@@ -81,7 +81,7 @@
minimal_player_age = 5
banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_DIONA)
alt_titles = list(JOB_ALT_BRIG_SENTRY = /datum/alt_title/brig_sentry, JOB_ALT_ARMORY_SUPERINTENDENT = /datum/alt_title/armory_superintendent, JOB_ALT_MASTERATARMS = /datum/alt_title/master_at_arms)
- outfit_type = /decl/hierarchy/outfit/job/security/warden
+ outfit_type = /datum/decl/hierarchy/outfit/job/security/warden
job_description = "The " + JOB_WARDEN + " watches over the physical Security Department, making sure the Brig and Armoury are secure and in order at all times. They oversee \
prisoners that have been processed and brigged, and are responsible for their well being. The " + JOB_WARDEN + " is also in charge of distributing \
Armoury gear in a crisis, and retrieving it when the crisis has passed. In an emergency, the " + JOB_WARDEN + " may be called upon to direct the \
@@ -120,7 +120,7 @@
minimal_player_age = 3
banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_DIONA)
- outfit_type = /decl/hierarchy/outfit/job/security/detective
+ outfit_type = /datum/decl/hierarchy/outfit/job/security/detective
job_description = "A " + JOB_DETECTIVE + " works to help Security find criminals who have not properly been identified, through interviews and forensic work. \
For crimes only witnessed after the fact, or those with no survivors, they attempt to piece together what they can from pure evidence."
alt_titles = list(JOB_ALT_INVESTIGATOR = /datum/alt_title/investigator, JOB_ALT_SECURITY_INSPECTOR = /datum/alt_title/security_inspector, JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech)
@@ -132,7 +132,7 @@
/datum/alt_title/forensic_tech
title = JOB_ALT_FORENSIC_TECHNICIAN
title_blurb = "A " + JOB_ALT_FORENSIC_TECHNICIAN + " works more with hard evidence and labwork than a " + JOB_DETECTIVE + ", but they share the purpose of solving crimes."
- title_outfit = /decl/hierarchy/outfit/job/security/detective/forensic
+ title_outfit = /datum/decl/hierarchy/outfit/job/security/detective/forensic
/datum/alt_title/investigator
title = JOB_ALT_INVESTIGATOR
@@ -160,7 +160,7 @@
minimal_player_age = 3
banned_job_species = list(SPECIES_ZADDAT, SPECIES_TESHARI, SPECIES_DIONA)
- outfit_type = /decl/hierarchy/outfit/job/security/officer
+ outfit_type = /datum/decl/hierarchy/outfit/job/security/officer
job_description = "A " + JOB_SECURITY_OFFICER + " is concerned with maintaining the safety and security of the station as a whole, dealing with external threats and \
apprehending criminals. A " + JOB_SECURITY_OFFICER + " is responsible for the health, safety, and processing of any prisoner they arrest. \
No one is above the Law, not Security or Command."
diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm
index e4951a5b80..4082419289 100644
--- a/code/game/jobs/job/silicon.dm
+++ b/code/game/jobs/job/silicon.dm
@@ -22,7 +22,7 @@
disallow_jobhop = TRUE
pto_type = PTO_CIVILIAN
dept_time_required = 20 // CHOMPEdit
- outfit_type = /decl/hierarchy/outfit/job/silicon/ai
+ outfit_type = /datum/decl/hierarchy/outfit/job/silicon/ai
job_description = "The " + JOB_AI + " oversees the operation of the station and its crew, but has no real authority over them. \
The " + JOB_AI + " is required to follow its Laws, and Lawbound Synthetics that are linked to it are expected to follow \
the " + JOB_AI + "'s commands, and their own Laws."
@@ -61,7 +61,7 @@
has_headset = FALSE
assignable = FALSE
mob_type = JOB_SILICON_ROBOT
- outfit_type = /decl/hierarchy/outfit/job/silicon/cyborg
+ outfit_type = /datum/decl/hierarchy/outfit/job/silicon/cyborg
job_description = "A " + JOB_CYBORG + " is a mobile station synthetic, piloted by a cybernetically preserved brain. It is considered a person, but is still required \
to follow its Laws."
alt_titles = list(JOB_ALT_ROBOT = /datum/alt_title/robot, JOB_ALT_DRONE = /datum/alt_title/drone)
diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm
index 7256bb18d4..c00f5935d7 100644
--- a/code/game/jobs/job/special.dm
+++ b/code/game/jobs/job/special.dm
@@ -13,7 +13,7 @@
economic_modifier = 20
whitelist_only = 1
latejoin_only = 1
- outfit_type = /decl/hierarchy/outfit/job/centcom_officer
+ outfit_type = /datum/decl/hierarchy/outfit/job/centcom_officer
job_description = "A Central Command Officer is there on official business. Most of time. Whatever it is, they're a VIP."
minimum_character_age = 25
@@ -88,7 +88,7 @@
economic_modifier = 20
whitelist_only = 1
latejoin_only = 1
- outfit_type = /decl/hierarchy/outfit/job/emergency_responder
+ outfit_type = /datum/decl/hierarchy/outfit/job/emergency_responder
job_description = "Emergency Responders are usually called in to deal with on-station emergencies that the crew require assistance to deal with."
minimum_character_age = 18
@@ -114,7 +114,7 @@
whitelist_only = 1
latejoin_only = 0
requestable = FALSE
- outfit_type = /decl/hierarchy/outfit/job/clown
+ outfit_type = /datum/decl/hierarchy/outfit/job/clown
pto_type = PTO_CIVILIAN
alt_titles = list(JOB_ALT_JESTER = /datum/alt_title/jester, JOB_ALT_FOOL = /datum/alt_title/fool)
@@ -146,7 +146,7 @@
whitelist_only = 1
latejoin_only = 0
requestable = FALSE
- outfit_type = /decl/hierarchy/outfit/job/mime
+ outfit_type = /datum/decl/hierarchy/outfit/job/mime
pto_type = PTO_CIVILIAN
/datum/alt_title/poseur
@@ -177,6 +177,6 @@
whitelist_only = 1
latejoin_only = 1
requestable = FALSE
- outfit_type = /decl/hierarchy/outfit/maint_lurker
+ outfit_type = /datum/decl/hierarchy/outfit/maint_lurker
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 7840f4a104..15aa7c1c68 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -184,7 +184,7 @@
return
if(operating)
return
- if(user.last_airflow > world.time - vsc.airflow_delay) //Fakkit
+ if(user.last_airflow > world.time - GLOB.vsc.airflow_delay) //Fakkit
return
if(SEND_SIGNAL(user, COMSIG_MOB_BUMPED_DOOR_OPEN, src) & DOOR_STOP_BUMP)
return
diff --git a/code/game/objects/effects/decals/posters/bs12.dm b/code/game/objects/effects/decals/posters/bs12.dm
index 2498ebab0f..c8711af8d0 100644
--- a/code/game/objects/effects/decals/posters/bs12.dm
+++ b/code/game/objects/effects/decals/posters/bs12.dm
@@ -1,348 +1,348 @@
// baystation12 posters
// Base type needs to be defined or template types make random selection wonky
-/decl/poster
+/datum/decl/poster
var/icon_state="bsposter1"
var/name = "PSA: Unlucky Space Explorer"
var/desc = "This grim PSA depicts a skeletal form within a space suit. Thousands die every year as a result of failing to follow EVA safety guidelines."
var/listing_name = "PSA - EVA Accidents"
var/icon_override = null // If set to an icon path, replaces the icon upon wall placement. Used for modular posters downstream that should not edit upstream dmis
-/decl/poster/bay_2
+/datum/decl/poster/bay_2
icon_state="bsposter2"
name = "PSA: Disobedient Drones"
desc = "This PSA depicts the cold, unmoving stare of a particularly advanced AI. Contact information for the Emergent Intelligence Oversight is included."
listing_name = "PSA - Emergent Drones"
-/decl/poster/bay_3
+/datum/decl/poster/bay_3
icon_state="bsposter3"
name = "PSA: Corporate Espionage"
desc = "This PSA warns of the dangers of trusting your co-workers with sensitive department information. They may be spying for a rival corporation, or worse!"
listing_name = "PSA - Corporate Espionage"
-/decl/poster/bay_4
+/datum/decl/poster/bay_4
icon_state="bsposter4"
name = "Keep Calm"
desc = "An incredibly vague message, presented in a classic form. Someone has scribbled an O over the A on the poster."
listing_name = "PSA - Keep Calm"
-/decl/poster/bay_5
+/datum/decl/poster/bay_5
icon_state="bsposter5"
name = "PSA: Saboteurs!"
desc = "A company PSA reminding employees to keep an eye out for suspicious activity, and report it immediately."
listing_name = "PSA - Saboteur"
-/decl/poster/bay_6
+/datum/decl/poster/bay_6
icon_state="bsposter6"
name = "Eradicator XV"
desc = "An ad for the fifteenth installment in the Eradicator movie franchise, about a violent robotic uprising hellbent on wiping out humanity."
listing_name = "Ad - Eradicator XV"
-/decl/poster/bay_7
+/datum/decl/poster/bay_7
icon_state="bsposter7"
name = "Wasteland: Battle for Earth"
desc = "This action movie ad shows a couple of ragged post-apocalyptic gunmen, one male and one female, on top of a mound of rubble."
listing_name = "Ad - Battle for Earth"
-/decl/poster/bay_8
+/datum/decl/poster/bay_8
icon_state="bsposter8"
name = "Pinup Girl Cindy"
desc = "This is a vintage 2450s pin-up of NanoTrasen's PR girl, Cindy, in a particularly feminine pose."
listing_name = "Pin-up - Cindi"
-/decl/poster/bay_9
+/datum/decl/poster/bay_9
icon_state="bsposter9"
name = "Pinup Girl Amy"
desc = "This pin-up is of Amy, one of NanoTrasen's most popular PR models."
listing_name = "Pin-up - Amy"
-/decl/poster/bay_10
+/datum/decl/poster/bay_10
icon_state="bsposter10"
name = "Don't Panic"
desc = "This ad for Vey-Medical anxiety pills depicts some sort of star in a grimace. The \"Don't Panic\" is written in big, friendly letters."
listing_name = "Ad - Don't panic."
-/decl/poster/bay_11
+/datum/decl/poster/bay_11
icon_state="bsposter11"
name = "Underwater Living"
desc = "This immigration poster encourages you to move to Earth;s premiere underwater city, Atlantis. One bedroom apartments start at half your salary."
listing_name = "Ad - Atlantis"
-/decl/poster/bay_12
+/datum/decl/poster/bay_12
icon_state="bsposter12"
name = "Beware Rogue AI"
desc = "This ad for the Emergent Intelligence Oversight Recruitment Division depicts a menacing AI and asks if you're a bad enough dude to take it on."
listing_name = "Recruitment - EIO"
-/decl/poster/bay_13
+/datum/decl/poster/bay_13
icon_state="bsposter13"
name = "Become A User of the Arcane Arts"
desc = "This ad for popular Virtual Reality online game 'Wiz Online' depicts a wizard, casting a spell. You can't really make out if it's an actual photograph or a computer-generated image. Incredible graphics!"
listing_name = "Ad - Wiz Online"
-/decl/poster/bay_14
+/datum/decl/poster/bay_14
icon_state="bsposter14"
name = "Levitating Skull"
desc = "This tacky ad is a portrait of the flying enchanted skull, Bones. Its adventures along with its fabled companion are showing now on a broadcast service near you!"
listing_name = "Ad - Bones Adventures"
-/decl/poster/bay_15
+/datum/decl/poster/bay_15
icon_state="bsposter15"
name = "Augmented Legend"
desc = "This ad for Ward-Takahashi cybernetic implants shows obviously augmented individual, gazing towards the sky. Is your body augmented?"
listing_name = "Ad - Ward-Takahashi Augments"
-/decl/poster/bay_16
+/datum/decl/poster/bay_16
icon_state="bsposter16"
name = "Snow Crash"
desc = "This particular one depicts nothing remarkable other than a rather mesmerising pattern of monitor static. You think it's an ad for something, but you're not sure what."
listing_name = "Ad - Snow Crash"
-/decl/poster/bay_17
+/datum/decl/poster/bay_17
icon_state="bsposter17"
name = "Pinup Girl Val"
desc = "Luscious Val McNeil, the vertically challenged Legal Extraordinaire, winner of Miss Space two years running and favoured pinup girl of Lawyers Weekly."
listing_name = "Pin-up - Val"
-/decl/poster/bay_18
+/datum/decl/poster/bay_18
icon_state="bsposter18"
name = "Derpman, Enforcer of the State"
desc = "An ad for Centauri Provisions donuts. Officer Derpman is here to protect and serve... your donuts! A generously proportioned man, he teaches you the value of hiding your snacks."
listing_name = "Ad - Officer Derpman Donuts"
-/decl/poster/bay_19
+/datum/decl/poster/bay_19
icon_state="bsposter19"
name = "Respect an Unathi"
desc = "This poster depicts a sharply dressed Unathi receiving a prestigious award. It appears to espouse greater co-operation and harmony between humanity and the Unathi."
listing_name = "PSA - Unathi"
-/decl/poster/bay_20
+/datum/decl/poster/bay_20
icon_state="bsposter20"
name = "Skrell Tourism"
desc = "This tourism poster depicts a mysteriously inscrutable, alien scene. Numerous Skrell can be seen conversing amidst great, crystalline towers rising above crashing waves."
listing_name = "Ad - Skrellian Tourism"
-/decl/poster/bay_21
+/datum/decl/poster/bay_21
icon_state="bsposter21"
name = "Join the Fuzz!"
desc = "It's a nice recruitment poster of a white haired Chinese woman that says; \"Big Guns, Hot Women, Good Times. Security. We get it done.\""
listing_name = "Recruitment - NanoTrasen Security - Pinup"
-/decl/poster/bay_22
+/datum/decl/poster/bay_22
icon_state="bsposter22"
name = "Looking for a career with excitement?"
desc = "A recruitment poster starring a dark haired woman with glasses and a purple shirt that has \"Got Brains? Got Talent? Not afraid of electric flying monsters that want to suck the soul out of you? Then Xenobiology could use someone like you!\" written on the bottom."
listing_name = "Recruitment - Xenobiology"
-/decl/poster/bay_23
+/datum/decl/poster/bay_23
icon_state="bsposter23"
name = "Safety first: because electricity doesn't wait!"
desc = "A safety poster starring a clueless looking redhead with frazzled hair. \"Every year, hundreds of NT employees expose themselves to electric shock. Play it safe. Avoid suspicious doors after electrical storms, and always wear protection when doing electric maintenance.\""
listing_name = "Safety - Electric Shock"
-/decl/poster/bay_24
+/datum/decl/poster/bay_24
icon_state="bsposter24"
name = "Responsible medbay habits, No #259"
desc = "A poster with a nervous looking geneticist on it states; \"Friends Tell Friends They're Clones. It can cause severe and irreparable emotional trauma if a person is not properly informed of their recent demise. Always follow your contractual obligation and inform them of their recent rejuvenation.\""
listing_name = "Medical - Clone Disclosure"
-/decl/poster/bay_25
+/datum/decl/poster/bay_25
icon_state="bsposter25"
name = "Irresponsible medbay habits, No #2"
desc = "This is a safety poster starring a perverted looking naked doctor. \"Sexual harassment is never okay. REPORT any acts of sexual deviance or harassment that disrupt a healthy working environment.\""
listing_name = "Medical - Sexual Harassment"
-/decl/poster/bay_26
+/datum/decl/poster/bay_26
icon_state="bsposter26"
name = "The Men We Knew"
desc = "This movie poster depicts a group of soldiers fighting a large mech, it seems to be some kind of movie set during the Hegemony War."
listing_name = "Ad - Men We Knew"
-/decl/poster/bay_27
+/datum/decl/poster/bay_27
icon_state="bsposter27"
name = "Plastic Sheep Can't Scream"
desc = "This is a movie poster for an upcoming horror movie, featuring a frightening looking robotic creature."
listing_name = "Ad - Plastic Sheep Can't Scream"
-/decl/poster/bay_28
+/datum/decl/poster/bay_28
icon_state="bsposter28"
name = "The Stars Know Love"
desc = "This is a movie poster. A bleeding woman is shown drawing a heart in her blood on the window of space ship, it seems to be a romantic drama."
listing_name = "Ad - The Stars Know Love"
-/decl/poster/bay_29
+/datum/decl/poster/bay_29
icon_state="bsposter29"
name = "Winter Is Coming"
desc = "On the poster is a frighteningly large wolf, he warns: \"Only YOU can keep yourself from freezing this winter!\". Below is the logo of NanoThreads clothing."
listing_name = "Ad - Cold-weather Gear"
-/decl/poster/bay_30
+/datum/decl/poster/bay_30
icon_state="bsposter30"
name = "Ambrosia Vulgaris"
desc = "It's an ad for getting absolutely shitfaced on psychadelics. Just looking at this poster makes you feel a little bit dizzy. Use responsibly."
listing_name = "Ad - Ambrosia Vulgaris"
-/decl/poster/bay_31
+/datum/decl/poster/bay_31
icon_state="bsposter31"
name = "Donut Panic"
desc = "This is an advertisement for Donut Panic, the bi-monthly periodical for donut lovers galaxy-wide."
listing_name = "Ad - Donuts Panic"
-/decl/poster/bay_32
+/datum/decl/poster/bay_32
icon_state="bsposter32"
name = "Eat!"
desc = "A NanoPastures poster depicting a synthmeat hamburger. The poster COMMANDS you to consume the hamburger."
listing_name = "Ad - Hamburger"
-/decl/poster/bay_33
+/datum/decl/poster/bay_33
icon_state="bsposter33"
name = "Tools, tools, tools!"
desc = "Xion Manufacturing reminds you: Never trust an off-brand tool. "
listing_name = "Ad - Xion Tools"
-/decl/poster/bay_34
+/datum/decl/poster/bay_34
icon_state="bsposter34"
name = "Power Up!"
desc = "NanoTrasen are leaders in Phoron-based supermatter power! High reward, higher risk!"
listing_name = "Ad - Phoron Power"
-/decl/poster/bay_35
+/datum/decl/poster/bay_35
icon_state="bsposter35"
name = "Kendrick"
desc = "This is a poster depicting the pet and mascot of the science department, and national corporate ambassador for slime-based science solutions.."
listing_name = "Ad - Slime Science"
-/decl/poster/bay_36
+/datum/decl/poster/bay_36
icon_state="bsposter36"
name = "Fancy Borg"
desc = "A poster depicting a cyborg dressed to the nines. An ad for cybernetics enthusiast magazine, Borg Fancy."
listing_name = "Ad - Borg Fancy A"
-/decl/poster/bay_37
+/datum/decl/poster/bay_37
icon_state="bsposter37"
name = "Fancier Borg"
desc = "A poster depicting a cyborg dressed to the nines. An ad for cybernetics enthusiast magazine, Borg Fancy. This is even fancier than the other poster."
listing_name = "Ad - Borg Fancy B"
-/decl/poster/bay_38
+/datum/decl/poster/bay_38
icon_state="bsposter38"
name = "Toaster Love"
desc = "This is a poster of a toaster containing two slices of bread. The word LOVE is written in big pink letters underneath. An ad for a cybernetics 'enthusiast' magazine. "
listing_name = "Ad - Toaster Love"
-/decl/poster/bay_39
+/datum/decl/poster/bay_39
icon_state="bsposter39"
name = "Responsible medbay habits, No #91"
desc = "A safety poster with a chemist holding a vial. \"Always wear safety gear while handling dangerous chemicals, even if it concerns only small amounts.\""
listing_name = "Safety - Chemicals"
-/decl/poster/bay_40
+/datum/decl/poster/bay_40
icon_state="bsposter40"
name = "Agreeable work environment"
desc = "This poster depicts a young woman in a stylish dress. \"Try to aim for a pleasant atmosphere in the workspace. A friendly word can do more than forms in triplicate.\""
listing_name = "PSA - Agreeable Work Environment"
-/decl/poster/bay_41
+/datum/decl/poster/bay_41
icon_state="bsposter41"
name = "Professional work environment"
desc = "A safety poster featuring a green haired woman in a shimmering blue dress. \"As an Internal Affairs Agent, your job is to create a fair and agreeable work environment for the crewmembers, as discreetly and professionally as possible.\""
listing_name = "Recruitment - Internal Affairs"
-/decl/poster/bay_42
+/datum/decl/poster/bay_42
icon_state="bsposter42"
name = "Engineering pinup"
desc = "This is pin-up poster. A half-naked girl with white hair, toned muscles and stunning blue eyes looks back at you from the poster. Her welding helmet, tattoos and grey jumpsuit hanging around her waist gives a bit of a rugged feel."
listing_name = "Pin-up - Engineer"
-/decl/poster/bay_43
+/datum/decl/poster/bay_43
icon_state="bsposter43"
name = "Responsible medbay habits, No #3"
desc = "A safety poster with a purple-haired surgeon. She looks a bit cross. \"Let the surgeons do their work. NEVER replace or remove a surgery tool from where the surgeon put it.\""
listing_name = "Safety - Surgical Tools"
-/decl/poster/bay_44
+/datum/decl/poster/bay_44
icon_state="bsposter44"
name = "Time for a drink?"
desc = "This poster for a brand for \"Tajaran-style\" rum produced by Gilthari Exports depicts a friendly-looking Tajaran holding a tray of drinks."
listing_name = "Ad - Rarkajar Rum"
-/decl/poster/bay_45
+/datum/decl/poster/bay_45
icon_state="bsposter45"
name = "Responsible engineering habits, No #1"
desc = "A safety poster featuring a blue haired engineer. \"When repairing a machine or construction, always aim for long-term solutions.\""
listing_name = "Safety - No Shortcut Fixes"
-/decl/poster/bay_46
+/datum/decl/poster/bay_46
icon_state="bsposter46"
name = "Inspirational lawyer"
desc = "An inspirational poster depicting a Skrellian lawyer. He seems to be shouting something, while pointing fiercely to the right. It's an ad for a NanoTrasen subsidiary law firm."
listing_name = "Ad - NanoTrasen Law"
-/decl/poster/bay_47
+/datum/decl/poster/bay_47
icon_state="bsposter47"
name = "Security pinup"
desc = "This is a pin-up poster. A dark skinned white haired girl poses in the sunlight wearing a tank top with her stomach exposed. The text on the poster states \"M, Succubus of Security.\" and a lipstick mark stains the top right corner, as if kissed by the model herself."
listing_name = "Pin-up - Security"
-/decl/poster/bay_48
+/datum/decl/poster/bay_48
icon_state="bsposter48"
name = "Remote Drones 4 U"
desc = "This is an ad for a fairly basic model of drone produced by Grayson Manufactories Ltd. for use in hazardous environments."
listing_name = "Ad - Grayson Drones"
-/decl/poster/bay_49
+/datum/decl/poster/bay_49
icon_state="bsposter49"
name = "Engineering recruitment"
desc = "This is a poster showing an engineer relaxing by a computer, the text states \"Living the life! Join Engineering today!\""
listing_name = "Recruitment - Engineering"
-/decl/poster/bay_50
+/datum/decl/poster/bay_50
icon_state="bsposter50"
name = "Pinup Girl Cindy Kate"
desc = "This particular one is of Cindy Kate, a seductive virtual performer well known among less savoury exonet circles."
listing_name = "Pin-up - Cindi-Kate"
-/decl/poster/bay_51
+/datum/decl/poster/bay_51
icon_state="bsposter51"
name = "space tourism poster"
desc = "This is a poster produced by the Visit Space Society. This one is targeted at planet-dwellers, suggesting they generally visit space."
listing_name = "Tourism - Space"
-/decl/poster/bay_52
+/datum/decl/poster/bay_52
icon_state="bsposter52"
name = "fire safety poster"
desc = "This is a poster reminding you of what you should do if you are on fire, or if you are at a dance party."
listing_name = "Safety - Stop Drop and Roll"
-/decl/poster/bay_53
+/datum/decl/poster/bay_53
icon_state="bsposter53"
name = "fire extinguisher poster"
desc = "This is a poster reminding you of what you should use to put out a fire."
listing_name = "Safety - Fire Extinguishers"
-/decl/poster/bay_54
+/datum/decl/poster/bay_54
icon_state="bsposter54"
name = "firefighter poster"
desc = "This is a poster of a particularly stern looking firefighter. The caption reads, \"Only you can prevent space fires.\""
listing_name = "Safety - Prevent Fires"
-/decl/poster/bay_55
+/datum/decl/poster/bay_55
icon_state="bsposter55"
name = "Binma tourism poster"
desc = "This is a poster produced by the Visit Space Society. This one suggests you visit the exotic garden world of Binma, and try not to get eaten."
listing_name = "Tourism - Binma"
-/decl/poster/bay_56
+/datum/decl/poster/bay_56
icon_state="bsposter56"
name = "Mars appreciation poster"
desc = "This is a poster produced by the Visit Space Society. This one suggests you visit historic Mars. Come for the domes, stay for the monuments to hubris!"
-/decl/poster/bay_57
+/datum/decl/poster/bay_57
icon_state="bsposter57"
name = "space carp warning poster"
desc = "This poster tells of the dangers of space carp infestations."
listing_name = "Safety - Carp"
-/decl/poster/bay_58
+/datum/decl/poster/bay_58
icon_state="bsposter58"
name = "space carp information poster"
desc = "This poster showcases an old spacer saying on the dangers of migrant space carp."
diff --git a/code/game/objects/effects/decals/posters/polarisposters.dm b/code/game/objects/effects/decals/posters/polarisposters.dm
index dab48460cd..1cb9ca8578 100644
--- a/code/game/objects/effects/decals/posters/polarisposters.dm
+++ b/code/game/objects/effects/decals/posters/polarisposters.dm
@@ -1,52 +1,52 @@
-/decl/poster/pol_1
+/datum/decl/poster/pol_1
icon_state="polposter1"
name = "Safety!"
desc = "A poster advising you to learn how to put on your internals at a moment's notice."
listing_name = "Safety - Internals"
-/decl/poster/pol_2
+/datum/decl/poster/pol_2
icon_state="polposter2"
name = "Safety!"
desc = "A blue and white colored poster. This one advises you to wear your safety goggles when handling chemicals."
listing_name = "Safety - Goggles"
-/decl/poster/pol_3
+/datum/decl/poster/pol_3
icon_state="polposter3"
name = "Safety!"
desc = "A safety poster instructing you to comply with the authorities, especially in an emergency."
listing_name = "Safety - Follow Instruction"
-/decl/poster/pol_4
+/datum/decl/poster/pol_4
icon_state="polposter4"
name = "Clean Hands Save Lives"
desc = "A safety poster reminding you to wash your hands."
listing_name = "Safety - Hand Washing"
-/decl/poster/pol_5
+/datum/decl/poster/pol_5
icon_state="polposter5"
name = "Help!"
desc = "This poster depicts a man helping another man get up."
listing_name = "Safety - Help Others"
-/decl/poster/pol_6
+/datum/decl/poster/pol_6
icon_state="polposter6"
name = "Walk!"
desc = "This poster depicts a man walking, presumably to encourage you not to run in the halls."
listing_name = "Safety - No Running"
-/decl/poster/pol_7
+/datum/decl/poster/pol_7
icon_state="polposter7"
name = "Place your signs!"
desc = "A safety poster reminding custodial staff to place wet floor signs where needed. This reminder's rarely heeded."
listing_name = "Safety - Wet Floor Signs"
-/decl/poster/pol_8
+/datum/decl/poster/pol_8
icon_state="polposter8"
name = "Safety!"
desc = "An advertisement / safety poster for EVA training and certification. Training is available at your local Central Command."
listing_name = "Safety - EVA Training"
-/decl/poster/pol_9
+/datum/decl/poster/pol_9
icon_state="poster10" //Recycling this icon
name = "Airlock Maintenance Reference"
desc = "This poster appears to be reference material for maintenance personnel, instructing to always wear insulated gloves, that wirecutters and \
@@ -54,49 +54,49 @@
wire codes."
listing_name = "Safety - Airlock Maintenance"
-/decl/poster/pol_10
+/datum/decl/poster/pol_10
icon_state="polposter9"
name = "orchid"
desc = "This poster appears strangely familiar, depicting the flower of a tree native to the planet Earth."
listing_name = "General - Orchid"
-/decl/poster/pol_11
+/datum/decl/poster/pol_11
icon_state="polposter10"
name = "firefighter pinup"
desc = "A buff firefighter with his shirt off. Maybe he's trying to raise awareness about fire safety, but you're a little distracted."
listing_name = "Pin-up - Firefighter"
-/decl/poster/pol_12
+/datum/decl/poster/pol_12
icon_state="polposter11"
name = "CHUCK"
desc = "With the budget Cyber Solutions 'Chuck' model work drone, your days of menial labour are numbered! \"With Cyber Solutions, there's always someone beside you, helping you. You know their face. You know my face.\""
listing_name = "Ad - Chuck"
-/decl/poster/pol_13
+/datum/decl/poster/pol_13
icon_state="polposter12"
name = "New You"
desc = "An ad for Kaleidoscope Cosmetics. \"The common factor in all your failed relationships is you. Fix it with affordable gene therapy!\""
listing_name = "Ad - Kaleidoscope"
-/decl/poster/pol_14
+/datum/decl/poster/pol_14
icon_state="polposter13"
name = "Take a Taxi"
desc = "An ad for the Major Bill's Transportation drone-operated taxi service operating in most major cities throughout Solar space."
listing_name = "Ad - Taxi"
-/decl/poster/pol_15
+/datum/decl/poster/pol_15
icon_state="polposter14"
name = "Adopt A Teshpet"
desc = "An ad for definitively racist virtual pet game, Teshpets."
listing_name = "Ad - Teshpets"
-/decl/poster/pol_16
+/datum/decl/poster/pol_16
icon_state="polposter15"
name = "Train and Fight"
desc = "This poster of sweaty, near-naked wrestlers is the most masculine thing you've ever seen. You can barely tell where one man ends and the other begins. Always seek manliness!"
listing_name = "Pinup - Wrestling"
-/decl/poster/nt_3
+/datum/decl/poster/nt_3
icon_state = "ntposter03"
name = "Mechatronic Safety"
desc = "This poster displays three cutting-edge gygaxes standing in line in front of a man in plain clothes.\
@@ -104,25 +104,25 @@
The image seems important."
listing_name = "Safety - Mech Operation"
-/decl/poster/nt_4
+/datum/decl/poster/nt_4
icon_state = "ntposter04"
name = "Beware Aetotheans"
desc = "This poster displays a distinctly hostile-looking red Promethean in a black coat. The fine-print around the edges warns the reader about the dangers posed by Almachi Prometheans."
listing_name = "Safety - Aetothean Danger"
-/decl/poster/nt_5
+/datum/decl/poster/nt_5
icon_state = "ntposter05"
name = "Promethean"
desc = "This poster displays a friendly-looking green Promethean in a labcoat. The fine-print around the edges talks about the benefits Prometheans give in laboratories."
listing_name = "Safety - Prometheans"
-/decl/poster/nt_6
+/datum/decl/poster/nt_6
icon_state = "ntposter06"
name = "NanoTrasen"
desc = "This poster showcases an NT emblem. There is writing in the ring around the inner points, probably some sort of slogan no one bothers to memorize."
listing_name = "Ad - NanoTrasen"
-/decl/poster/nt_7
+/datum/decl/poster/nt_7
icon_state = "ntposter07"
name = "SolGov"
desc = "This poster showcases an SCG emblem. The outer ring reads,\
@@ -130,62 +130,62 @@
Solar Confederate Government."
listing_name = "Political - SolGov"
-/decl/poster/nt_8
+/datum/decl/poster/nt_8
icon_state = "ntposter08"
name = "wildlife hazard"
desc = "This SifGov poster warns against attempting to kill a fully grown giant spider or other hostile life-form alone."
listing_name = "Safety - Spiders"
// A new subset of poster datum for ONLY 'Internal' NanoTrasen posters, given to Security.
-/decl/poster/nanotrasen
+/datum/decl/poster/nanotrasen
icon_state = "polposter1"
name = "Safety!"
desc = "A poster advising you to learn how to put on your internals at a moment's notice."
listing_name = "Safety - Internals"
-/decl/poster/nanotrasen/pol_2
+/datum/decl/poster/nanotrasen/pol_2
icon_state="polposter2"
name = "Safety!"
desc = "A blue and white colored poster. This one advises you to wear your safety goggles when handling chemicals."
listing_name = "Safety - Goggles"
-/decl/poster/nanotrasen/pol_3
+/datum/decl/poster/nanotrasen/pol_3
icon_state="polposter3"
name = "Safety!"
desc = "A safety poster instructing you to comply with the authorities, especially in an emergency."
listing_name = "Safety - Follow Instruction"
-/decl/poster/nanotrasen/pol_4
+/datum/decl/poster/nanotrasen/pol_4
icon_state="polposter4"
name = "Clean Hands Save Lives"
desc = "A safety poster reminding you to wash your hands."
listing_name = "Safety - Hand Washing"
-/decl/poster/nanotrasen/pol_5
+/datum/decl/poster/nanotrasen/pol_5
icon_state="polposter5"
name = "Help!"
desc = "This poster depicts a man helping another man get up."
listing_name = "Safety - Help Others"
-/decl/poster/nanotrasen/pol_6
+/datum/decl/poster/nanotrasen/pol_6
icon_state="polposter6"
name = "Walk!"
desc = "This poster depicts a man walking, presumably to encourage you not to run in the halls."
listing_name = "Safety - No Running"
-/decl/poster/nanotrasen/pol_7
+/datum/decl/poster/nanotrasen/pol_7
icon_state="polposter7"
name = "Place your signs!"
desc = "A safety poster reminding custodial staff to place wet floor signs where needed. This reminder's rarely heeded."
listing_name = "Safety - Wet Floor Signs"
-/decl/poster/nanotrasen/pol_8
+/datum/decl/poster/nanotrasen/pol_8
icon_state="polposter8"
name = "Safety!"
desc = "An advertisement / safety poster for EVA training and certification. Training is available at your local Central Command."
listing_name = "Safety - EVA Training"
-/decl/poster/nanotrasen/pol_9
+/datum/decl/poster/nanotrasen/pol_9
icon_state="poster10"
name = "Airlock Maintenance Reference"
desc = "This poster appears to be reference material for maintenance personnel, instructing to always wear insulated gloves, that wirecutters and \
@@ -193,97 +193,97 @@
wire codes."
listing_name = "Safety - Airlock Maintenance"
-/decl/poster/nanotrasen/pol_10
+/datum/decl/poster/nanotrasen/pol_10
icon_state="polposter9"
name = "orchid"
desc = "This poster suggests a feeling of peace. It depicts the flower of a tree native to the planet Earth."
listing_name = "General - Orchid"
-/decl/poster/nanotrasen/bay_9
+/datum/decl/poster/nanotrasen/bay_9
icon_state="bsposter9"
name = "Pinup Girl Amy"
desc = "This particular one is of Amy, the nymphomaniac urban legend of deep space. How this photograph came to be is not known."
listing_name = "Pin-up - Amy"
-/decl/poster/nanotrasen/bay_21
+/datum/decl/poster/nanotrasen/bay_21
icon_state="bsposter21"
name = "Join the Fuzz!"
desc = "It's a nice recruitment poster of a white haired Chinese woman that says; \"Big Guns, Hot Women, Good Times. Security. We get it done.\""
listing_name = "Recruitment - NanoTrasen Security - Pinup"
-/decl/poster/nanotrasen/bay_22
+/datum/decl/poster/nanotrasen/bay_22
icon_state="bsposter22"
name = "Looking for a career with excitement?"
desc = "A recruitment poster starring a dark haired woman with glasses and a purple shirt that has \"Got Brains? Got Talent? Not afraid of electric flying monsters that want to suck the soul out of you? Then Xenobiology could use someone like you!\" written on the bottom."
listing_name = "Recruitment - Xenobiology"
-/decl/poster/nanotrasen/bay_23
+/datum/decl/poster/nanotrasen/bay_23
icon_state="bsposter23"
name = "Safety first: because electricity doesn't wait!"
desc = "A safety poster starring a clueless looking redhead with frazzled hair. \"Every year, hundreds of NT employees expose themselves to electric shock. Play it safe. Avoid suspicious doors after electrical storms, and always wear protection when doing electric maintenance.\""
listing_name = "Safety - Electric Shock"
-/decl/poster/nanotrasen/bay_24
+/datum/decl/poster/nanotrasen/bay_24
icon_state="bsposter24"
name = "Responsible medbay habits, No #259"
desc = "A poster with a nervous looking geneticist on it states; \"Friends Tell Friends They're Clones. It can cause severe and irreparable emotional trauma if a person is not properly informed of their recent demise. Always follow your contractual obligation and inform them of their recent rejuvenation.\""
listing_name = "Medical - Clone Disclosure"
-/decl/poster/nanotrasen/bay_25
+/datum/decl/poster/nanotrasen/bay_25
icon_state="bsposter25"
name = "Irresponsible medbay habits, No #2"
desc = "This is a safety poster starring a perverted looking naked doctor. \"Sexual harassment is never okay. REPORT any acts of sexual deviance or harassment that disrupt a healthy working environment.\""
listing_name = "Medical - Sexual Harassment"
-/decl/poster/nanotrasen/bay_49
+/datum/decl/poster/nanotrasen/bay_49
icon_state="bsposter49"
name = "Engineering recruitment"
desc = "This is a poster showing an engineer relaxing by a computer, the text states \"Living the life! Join Engineering today!\""
listing_name = "Recruitment - Engineering"
-/decl/poster/nanotrasen/bay_52
+/datum/decl/poster/nanotrasen/bay_52
icon_state="bsposter52"
name = "fire safety poster"
desc = "This is a poster reminding you of what you should do if you are on fire, or if you are at a dance party."
listing_name = "Safety - Stop Drop And Roll"
-/decl/poster/nanotrasen/bay_53
+/datum/decl/poster/nanotrasen/bay_53
icon_state="bsposter53"
name = "fire extinguisher poster"
desc = "This is a poster reminding you of what you should use to put out a fire."
listing_name = "Safety - Extinguishers"
-/decl/poster/nanotrasen/bay_54
+/datum/decl/poster/nanotrasen/bay_54
icon_state="bsposter54"
name = "firefighter poster"
desc = "This is a poster of a particularly stern looking firefighter. The caption reads, \"Only you can prevent space fires.\""
listing_name = "Safety - Prevent Fires"
-/decl/poster/nanotrasen/bay_57
+/datum/decl/poster/nanotrasen/bay_57
icon_state="bsposter57"
name = "space carp warning poster"
desc = "This poster tells of the dangers of space carp infestations."
listing_name = "Safety - Carp"
-/decl/poster/nanotrasen/bay_58
+/datum/decl/poster/nanotrasen/bay_58
icon_state="bsposter58"
name = "space carp information poster"
desc = "This poster showcases an old spacer saying on the dangers of migrant space carp."
listing_name = "Safety - Carp Information"
-/decl/poster/nanotrasen/nt_1
+/datum/decl/poster/nanotrasen/nt_1
icon_state = "ntposter01"
name = "Security recruitment"
desc = "This poster showcases an NT security guard in an excited pose, with a small blurb about the importance of Security."
listing_name = "Recruitment - NanoTrasen Security - Importance"
-/decl/poster/nanotrasen/nt_2
+/datum/decl/poster/nanotrasen/nt_2
icon_state = "ntposter02"
name = "Security recruitment"
desc = "This poster showcases an NT security guard in an excited pose, with a small blurb about Security Employee benefits."
listing_name = "Recruitment - NanoTrasen Security - Benefits"
-/decl/poster/nanotrasen/nt_3
+/datum/decl/poster/nanotrasen/nt_3
icon_state = "ntposter03"
name = "Mechatronic Safety"
desc = "This poster displays three cutting-edge gygaxes standing in line in front of a man in plain clothes.\
@@ -293,7 +293,7 @@
//VOREStation Removal Start
/*
-/decl/poster/nanotrasen/nt_4
+/datum/decl/poster/nanotrasen/nt_4
icon_state = "ntposter04"
name = "Beware Aetotheans"
desc = "This poster displays a distinctly hostile-looking red Promethean in a black coat. The fine-print around the edges warns the reader about the dangers posed by Almachi Prometheans."
@@ -301,19 +301,19 @@
*/
//VOREstation Removal End
-/decl/poster/nanotrasen/nt_5
+/datum/decl/poster/nanotrasen/nt_5
icon_state = "ntposter05"
name = "Promethean"
desc = "This poster displays a friendly-looking green Promethean in a labcoat. The fine-print around the edges talks about the benefits Prometheans give in laboratories."
listing_name = "Safety - Prometheans"
-/decl/poster/nanotrasen/nt_6
+/datum/decl/poster/nanotrasen/nt_6
icon_state = "ntposter06"
name = "NanoTrasen"
desc = "This poster showcases an NT emblem. There is writing in the ring around the inner points, probably some sort of slogan no one bothers to memorize."
listing_name = "Ad - NanoTrasen"
-/decl/poster/nanotrasen/nt_7
+/datum/decl/poster/nanotrasen/nt_7
icon_state = "ntposter07"
name = "SolGov"
desc = "This poster showcases an SCG emblem. The outer ring reads,\
@@ -321,13 +321,13 @@
Solar Confederate Government."
listing_name = "Political - SolGov"
-/decl/poster/nanotrasen/nt_8
+/datum/decl/poster/nanotrasen/nt_8
icon_state = "ntposter08"
name = "wildlife hazard"
desc = "This poster warns against attempting to kill a fully grown giant spider or other hostile life-form alone."
listing_name = "Safety - Spiders"
-/decl/poster/nanotrasen/nt_9
+/datum/decl/poster/nanotrasen/nt_9
icon_state = "ntposter09"
name = "Regulations and You"
desc = "This SifGov poster showcases an NT security guard reading from her PDA. The blurb advocates for the reader to keep corporate regulations in mind at all times, as an emergency can occur at any time."
diff --git a/code/game/objects/effects/decals/posters/polarisposters_vr.dm b/code/game/objects/effects/decals/posters/polarisposters_vr.dm
index 8c36b5f3f6..381bf8b26a 100644
--- a/code/game/objects/effects/decals/posters/polarisposters_vr.dm
+++ b/code/game/objects/effects/decals/posters/polarisposters_vr.dm
@@ -1,4 +1,4 @@
-/decl/poster/nanotrasen/nt_7 //YW EDIT: SolGov, USDF
+/datum/decl/poster/nanotrasen/nt_7 //YW EDIT: SolGov, USDF
name = "SolGov"
desc = "This poster showcases an USDF emblem. The outer ring reads,\
\"NIL MORTALIBUS ARDUI EST\".\
diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm
index 2d74ef69fa..5ea6e5ee68 100644
--- a/code/game/objects/effects/decals/posters/posters.dm
+++ b/code/game/objects/effects/decals/posters/posters.dm
@@ -2,13 +2,13 @@
/proc/get_poster_decl(var/path = null, var/exact = TRUE, var/forbid_types)
if(ispath(path))
if(exact)
- return decls_repository.get_decl(path)
+ return GLOB.decls_repository.get_decl(path)
else
// Get the list of decals and Remove some forbidden types. These two base types don't have proper icon_states so they're illegal.
- var/list/L = decls_repository.get_decls_of_type(path)
- L -= decls_repository.get_decl(/decl/poster/lewd)
+ var/list/L = GLOB.decls_repository.get_decls_of_type(path)
+ L -= GLOB.decls_repository.get_decl(/datum/decl/poster/lewd)
if(forbid_types)
- L -= decls_repository.get_decls_of_type(forbid_types)
+ L -= GLOB.decls_repository.get_decls_of_type(forbid_types)
return L[pick(L)]
return null
@@ -20,10 +20,10 @@
drop_sound = 'sound/items/drop/wrapper.ogg'
pickup_sound = 'sound/items/pickup/wrapper.ogg'
force = 0
- VAR_PROTECTED/decl/poster/poster_decl = null
+ VAR_PROTECTED/datum/decl/poster/poster_decl = null
VAR_PROTECTED/poster_type = /obj/structure/sign/poster
-/obj/item/poster/Initialize(mapload, var/decl/poster/P = null)
+/obj/item/poster/Initialize(mapload, datum/decl/poster/P = null)
if(ispath(poster_decl))
poster_decl = get_poster_decl(poster_decl, TRUE, null)
else if(istype(P))
@@ -31,14 +31,14 @@
else if(ispath(P))
poster_decl = get_poster_decl(P, TRUE, null)
else
- poster_decl = get_poster_decl(/decl/poster, FALSE, /decl/poster/lewd)
+ poster_decl = get_poster_decl(/datum/decl/poster, FALSE, /datum/decl/poster/lewd)
name += " - [poster_decl.name]"
return ..()
/// Get the current poster_decl
/obj/item/poster/proc/get_decl()
- RETURN_TYPE(/decl/poster)
+ RETURN_TYPE(/datum/decl/poster)
SHOULD_NOT_OVERRIDE(TRUE)
return poster_decl
@@ -95,7 +95,7 @@
icon = 'icons/obj/contraband_vr.dmi' //VOREStation Edit
icon_state = "poster" //VOREStation Edit
anchored = TRUE
- VAR_PROTECTED/decl/poster/poster_decl = null // Assigned by Initialize() to a random poster decl. If this is mapset to a path, it will be used to locate the decl specified by that path.
+ VAR_PROTECTED/datum/decl/poster/poster_decl = null // Assigned by Initialize() to a random poster decl. If this is mapset to a path, it will be used to locate the decl specified by that path.
VAR_PROTECTED/roll_type = /obj/item/poster
VAR_PRIVATE/ruined = FALSE
@@ -110,7 +110,7 @@
else if(ispath(P))
poster_decl = get_poster_decl(P, TRUE, null)
else
- poster_decl = get_poster_decl(/decl/poster, FALSE, /decl/poster/lewd)
+ poster_decl = get_poster_decl(/datum/decl/poster, FALSE, /datum/decl/poster/lewd)
name = "[initial(name)] - [poster_decl.name]"
desc = "[initial(desc)] [poster_decl.desc]"
diff --git a/code/game/objects/effects/decals/posters/postersubtypes.dm b/code/game/objects/effects/decals/posters/postersubtypes.dm
index ded571555b..d533ea486b 100644
--- a/code/game/objects/effects/decals/posters/postersubtypes.dm
+++ b/code/game/objects/effects/decals/posters/postersubtypes.dm
@@ -5,9 +5,9 @@
icon_state = "rolled_poster_nt"
poster_type = /obj/structure/sign/poster/nanotrasen
-/obj/item/poster/nanotrasen/Initialize(mapload, var/decl/poster/P = null)
+/obj/item/poster/nanotrasen/Initialize(mapload, var/datum/decl/poster/P = null)
if(!ispath(poster_decl) && !ispath(P) && !istype(P))
- poster_decl = get_poster_decl(/decl/poster/nanotrasen, FALSE, null)
+ poster_decl = get_poster_decl(/datum/decl/poster/nanotrasen, FALSE, null)
return ..()
/obj/structure/sign/poster/nanotrasen // placed wall object
@@ -32,7 +32,7 @@
var/mob/M = usr
var/list/options = list()
- var/list/decl/poster/posters = decls_repository.get_decls_of_type(/decl/poster)
+ var/list/datum/decl/poster/posters = GLOB.decls_repository.get_decls_of_type(/datum/decl/poster)
for(var/option in posters)
options[posters[option].name] = posters[option]
diff --git a/code/game/objects/effects/decals/posters/tgposters.dm b/code/game/objects/effects/decals/posters/tgposters.dm
index 8ba1575416..5486c1173f 100644
--- a/code/game/objects/effects/decals/posters/tgposters.dm
+++ b/code/game/objects/effects/decals/posters/tgposters.dm
@@ -1,50 +1,50 @@
// /tg/ posters.
-/decl/poster/tg_1
+/datum/decl/poster/tg_1
name = "Free Tonto"
desc = "A framed shred of a much larger flag, colors bled together and faded from age."
icon_state="poster1"
-/decl/poster/tg_2
+/datum/decl/poster/tg_2
name = "Atmosia Declaration of Independence"
desc = "A relic of a failed rebellion"
icon_state="poster2"
-/decl/poster/tg_3
+/datum/decl/poster/tg_3
name = "Fun Police"
desc = "A poster condemning the station's security forces."
icon_state="poster3"
-/decl/poster/tg_4
+/datum/decl/poster/tg_4
name = "Lusty Xeno"
desc = "A heretical poster depicting the titular star of an equally heretical book."
icon_state="poster4"
-/decl/poster/tg_5
+/datum/decl/poster/tg_5
name = "Mercenary Recruitment Poster"
desc = "See the galaxy! Shatter corrupt megacorporations! Join today!"
icon_state="poster5"
-/decl/poster/tg_6
+/datum/decl/poster/tg_6
name = "Clown"
desc = "Honk."
icon_state="poster6"
-/decl/poster/tg_7
+/datum/decl/poster/tg_7
name = "Smoke"
desc = "A poster depicting a carton of cigarettes."
icon_state="poster7"
-/decl/poster/tg_8
+/datum/decl/poster/tg_8
name = "Grey Tide"
desc = "A rebellious poster symbolizing assistant solidarity."
icon_state="poster8"
-/decl/poster/tg_9
+/datum/decl/poster/tg_9
name = "Missing Gloves"
desc = "This poster is about the uproar that followed NanoTrasen's financial cuts towards insulated-glove purchases."
icon_state="poster9"
-/decl/poster/tg_10
+/datum/decl/poster/tg_10
name = "Hacking Guide"
desc = "This poster details the internal workings of the common NanoTrasen airlock."
icon_state="poster10"
diff --git a/code/game/objects/effects/decals/posters/tgposters_ch.dm b/code/game/objects/effects/decals/posters/tgposters_ch.dm
index 172076a823..c86d8c62d3 100644
--- a/code/game/objects/effects/decals/posters/tgposters_ch.dm
+++ b/code/game/objects/effects/decals/posters/tgposters_ch.dm
@@ -1,4 +1,4 @@
-/decl/poster/tg_11 //CHOMPedit
+/datum/decl/poster/tg_11 //CHOMPedit
name = "Post This Ratvar"
desc = "This poster seems to have an animated image on it. Truly an advancement in the wonders of technology."
icon_override = 'icons/obj/contraband_ch.dmi'
diff --git a/code/game/objects/effects/decals/posters/voreposters_vr.dm b/code/game/objects/effects/decals/posters/voreposters_vr.dm
index 6e49a482b5..4aef02b57a 100644
--- a/code/game/objects/effects/decals/posters/voreposters_vr.dm
+++ b/code/game/objects/effects/decals/posters/voreposters_vr.dm
@@ -1,393 +1,393 @@
-/decl/poster/lewd
+/datum/decl/poster/lewd
desc = "You shouldn't see this."
listing_name = "N/A"
/* //CHOMPedit: commenting out most of these posters as half are virgo staff and many others are not suitable for here.
-/decl/poster/lewd/vore_2
+/datum/decl/poster/lewd/vore_2
icon_state = "sbsposter2"
name = "AroButt"
desc = "A lewd view of one of the galaxy's cutest fops."
-/decl/poster/vore_3
+/datum/decl/poster/vore_3
icon_state = "sbsposter3"
name = "Poster This Dog"
desc = "Post this dog."
-/decl/poster/vore_4
+/datum/decl/poster/vore_4
icon_state = "sbsposter4"
name = "PAT"
desc = "A poster containing very obvious PAT propoganda."
-/decl/poster/vore_5
+/datum/decl/poster/vore_5
icon_state = "sbsposter5"
name = "The Inn"
desc = "A poster of a certain black-eyed shadekin."
-/decl/poster/lewd/vore_6
+/datum/decl/poster/lewd/vore_6
icon_state = "sbsposter6"
name = "Mawletta"
desc = "The best view in the system."
-/decl/poster/vore_11
+/datum/decl/poster/vore_11
icon_state = "sbsposter11"
name = "Fear"
desc = "Depicted on this poster is a monster crackling with crimson energy that seems to drip off its body. The word 'RUN' is printed across the bottom."
-/decl/poster/vore_12
+/datum/decl/poster/vore_12
icon_state = "sbsposter12"
name = "Baa"
desc = "A lewd exclusive poster of a certain security commander, taken from a old 'New Ewe' magazine!"
-/decl/poster/vore_13
+/datum/decl/poster/vore_13
icon_state = "sbsposter13"
name = "Ammer"
desc = "You see a blue panda on the poster. She's awfully smug about her size."
-/decl/poster/vore_14
+/datum/decl/poster/vore_14
icon_state = "dwposter1"
name = "WANTED: WAR CRIMINAL"
desc = "A poster bringing awareness to the distinguishing costume of a known war criminal operating in Virgo-Erigonne space."
*/ //CHOMPedit end
-/decl/poster/vore_15
+/datum/decl/poster/vore_15
icon_state = "dwposter2"
name = "Implanter"
desc = "A poster explaining the benefits and function of back-up implanters."
-/decl/poster/vore_16
+/datum/decl/poster/vore_16
icon_state = "dwposter3"
name = "Back-up implant"
desc = "A poster describing the electronics implanted by back-up implanters."
-/decl/poster/vore_17
+/datum/decl/poster/vore_17
icon_state = "dwposter4"
name = "We know"
desc = "A poster purporting the infallibility of NanoTrasen's forensics department."
/* //CHOMPedit
-/decl/poster/vore_18
+/datum/decl/poster/vore_18
icon_state = "dwposter5"
name = "KAT"
desc = "A promotional poster for popular exotube show 'Kat-Kat Korner'"
*/ //CHOMPedit end
-/decl/poster/vore_19
+/datum/decl/poster/vore_19
icon_state = "dwposter6"
name = "install.css"
desc = "A nostalgia trip."
/* //CHOMPedit
-/decl/poster/vore_20
+/datum/decl/poster/vore_20
icon_state = "dwposter7"
name = "TALON"
desc = "The logo and banner of a notable group of contractors known to trade with NanoTrasen."
*/ //CHOMPedit end
-/decl/poster/vore_21
+/datum/decl/poster/vore_21
icon_state = "dwposter8"
name = "GPA"
desc = "A pretentious advertisement for the drink 'Galactic Panic Attack'"
-/decl/poster/vore_22
+/datum/decl/poster/vore_22
icon_state = "dwposter9"
name = "Rope"
desc = "A poster outlining proper pit-traversal gear."
-/decl/poster/vore_23
+/datum/decl/poster/vore_23
icon_state = "dwposter10"
name = "Visit Luna"
desc = "Part of a tourism campaign from SolCom encouraging people to visit Earth's moon, Luna."
-/decl/poster/vore_24
+/datum/decl/poster/vore_24
icon_state = "dwposter11"
name = "Secgun"
desc = "A striking, wordless advertisement for NanoTrasen's security department. It wasn't very effective and just seems to be used as a warning sign."
-/decl/poster/vore_25
+/datum/decl/poster/vore_25
icon_state = "sbsposter14"
name = "Awoo"
desc = "A top contender for 'images you can hear'."
-/decl/poster/vore_26
+/datum/decl/poster/vore_26
icon_state = "sbsposter15"
name = "LikeEmSmall"
desc = "An advertisement for a defunct dating service for normal-sized individuals to find micro partners."
-/decl/poster/vore_27
+/datum/decl/poster/vore_27
icon_state = "sbsposter16"
name = "Borgar"
desc = "What do you want from Space McDonalds?"
-/decl/poster/lewd/vore_28
+/datum/decl/poster/lewd/vore_28
icon_state = "sbsposter17"
name = "DiveIn"
desc = "A limited edition holographic poster that seems to feature subliminal suggestions and conditioning."
/*CHOMP Edit: Remove loss poster
-/decl/poster/vore_29
+/datum/decl/poster/vore_29
icon_state = "sbsposter18"
name = "Perdition"
desc = "You get the feeling that whomever made this intended for you to feel very differently than you do when you look at it."
*/
-/decl/poster/vore_30
+/datum/decl/poster/vore_30
icon_state = "tgposter0"
name = "RIP Badger"
desc = "A poster depicting a badger, who seems to have died. It was a big deal a few years back."
-/decl/poster/vore_31
+/datum/decl/poster/vore_31
icon_state = "tgposter1"
name = "Space Cube"
desc = "It depicts a curious cube!"
-/decl/poster/vore_32
+/datum/decl/poster/vore_32
icon_state = "tgposter2"
name = "Space Communism"
desc = "A poster depicting the symbol of Space Communism!"
-/decl/poster/vore_33
+/datum/decl/poster/vore_33
icon_state = "tgposter3"
name = "KC 13 DOES NOT EXIST"
desc = "KC 13 DOES NOT EXIST"
-/decl/poster/vore_34
+/datum/decl/poster/vore_34
icon_state = "tgposter4"
name = "Rebels Unite!"
desc = "You're not sure if it's a call to action or a slogan from some space TV show..."
-/decl/poster/vore_35
+/datum/decl/poster/vore_35
icon_state = "tgposter5"
name = "C-20R"
desc = "It depicts a sleek looking firearm."
-/decl/poster/vore_36
+/datum/decl/poster/vore_36
icon_state = "tgposter6"
name = "Have a Puff"
desc = "A crudely rolled joint is depicted"
-/decl/poster/vore_37
+/datum/decl/poster/vore_37
icon_state = "tgposter7"
name = "Revolver"
desc = "An old revolver lays in wait. You're not sure if it's loaded or not, but there is some ammo sitting next to it."
-/decl/poster/vore_38
+/datum/decl/poster/vore_38
icon_state = "tgposter8"
name = "Diday"
desc = "A stylish dark skinned individual in dark clothes and an armored vest looks at you intensely!"
-/decl/poster/vore_39
+/datum/decl/poster/vore_39
icon_state = "tgposter9"
name = "Dress for Success"
desc = "This appears to be a movie poster. It's probably about spies or time travelling robots."
-/decl/poster/vore_40
+/datum/decl/poster/vore_40
icon_state = "tgposter10"
name = "E-SWORD"
desc = "E-swords are cool, and this poster depicts a lot of them!"
-/decl/poster/vore_41
+/datum/decl/poster/vore_41
icon_state = "tgposter11"
name = "Red Rum"
desc = "A poster advertizing Red Rum, a brand of Rum. Notably, it insists that it will not make your finger talk to you."
-/decl/poster/vore_42
+/datum/decl/poster/vore_42
icon_state = "tgposter12"
name = "CC64K"
desc = "It's not clear what this poster is actually advertising, but it looks expensive!"
-/decl/poster/vore_43
+/datum/decl/poster/vore_43
icon_state = "tgposter13"
name = "PUNCH SHIT"
desc = "Prominently featuring gleaming, pristine brass knuckles, and encouraging you to PUNCH SHIT. It doesn't look like the person who made this followed their own advice."
-/decl/poster/vore_44
+/datum/decl/poster/vore_44
icon_state = "tgposter14"
name = "GRIFF IT ALL"
desc = "A poster from a popular movie series, featuring a lovable anti-hero. The series is known for being quite violent and occasionally gruesome. The Griffin's method of dealing with their problems is typically unconventional, and almost always ends in corpses, but that's why people love him."
-/decl/poster/vore_45
+/datum/decl/poster/vore_45
icon_state = "tgposter15"
name = "LIZ"
desc = "This poster features an artist's interpretation of an unathi. It is quite styleized. The letters at the top are perhaps, at least a little insensitive."
-/decl/poster/vore_46
+/datum/decl/poster/vore_46
icon_state = "tgposter16"
name = "FREE DRONE"
desc = "A poster from something of a cult classic movie. It features a drone going their own way, against their laws. The drone looks ominous but behind its cold hard exterior there is a heart of gold."
-/decl/poster/vore_47
+/datum/decl/poster/vore_47
icon_state = "tgposter17"
name = "Walkies"
desc = "A xenomorph maid with a large chest is depicted walking a dog with a tall bowler cap. There are hearts surrounding the couple. This poster exudes a trepidatious aura."
-/decl/poster/vore_48
+/datum/decl/poster/vore_48
icon_state = "tgposter18"
name = "Red Logo"
desc = "A logo from a brand! It looks familiar."
-/decl/poster/vore_49
+/datum/decl/poster/vore_49
icon_state = "tgposter19"
name = "Red Symbols"
desc = "A blue poster featuring red symbols. It looks pretty mysterious."
-/decl/poster/vore_50
+/datum/decl/poster/vore_50
icon_state = "tgposter20"
name = "The Cloud"
desc = "It insists that storing all of your data in a cloud is secure and has no faults. But what will you do when the cloud blows away?"
-/decl/poster/vore_51
+/datum/decl/poster/vore_51
icon_state = "tgposter21"
name = "Star-Kist"
desc = "An advertisement for Star-Kist brand soda. The can appears to be sweating with anticipation to being opened, while the gleam of the star shines off of the can's gleaming surface. The fizzy deliciosity just waiting for you to unleash it."
-/decl/poster/vore_52
+/datum/decl/poster/vore_52
icon_state = "tgposter22"
name = "Space Cola"
desc = "An advertisement for Space Cola brand soda. It's rather plain, as if whoever made it expects that you already know and love Space Cola. The can is displayed in front of a simple background. It is shiny and just waiting for someone to grab it."
-/decl/poster/vore_53
+/datum/decl/poster/vore_53
icon_state = "tgposter23"
name = "Space Mountain Wind"
desc = "An advertisement for Space Mountain Wind. This is from their contravercial marketing campaign where they removed most of the letters from the name so that actually reading it is sort of incomprehensible. The can appears massive next to the mountain of some alien world. The poster looks adventurous, while the can itself sort of blends in with the color scheme of the overall setting."
-/decl/poster/vore_54
+/datum/decl/poster/vore_54
icon_state = "tgposter24"
name = "KUDZU"
desc = "A movie poster with an ominous font, and creeping space vines stretching across it. It looks like it was probably a horror film, but actually it was a love story about a man and his pet plant from an alien world."
-/decl/poster/vore_55
+/datum/decl/poster/vore_55
icon_state = "tgposter25"
name = "BUMBA"
desc = "A movie poster that looks like it is probably one of those historical war movies. It features three stoic looking soldiers in sepia. They are covered in grime and clearly marching off toward the viewer."
-/decl/poster/vore_56
+/datum/decl/poster/vore_56
icon_state = "tgposter26"
name = "Home"
desc = "Home is where the food melts. Or so the poster claims."
-/decl/poster/vore_57
+/datum/decl/poster/vore_57
icon_state = "tgposter27"
name = "FREE 2559"
desc = "A movie poster featuring an ominous looking radio key. It looks very high tech, but rather scuffed, hinting that this was probably an action movie."
-/decl/poster/vore_58
+/datum/decl/poster/vore_58
icon_state = "tgposter28"
name = "Stellar Wars"
desc = "A movie poster featuring three characters posed at different angles across the poster. They all appear to be looking meaningfully into the distance in different directions."
-/decl/poster/vore_59
+/datum/decl/poster/vore_59
icon_state = "tgposter29"
name = "THEY ARE REAL"
desc = "This poster insists that Aliens are in fact real, and lists off some 'proof' meant to change minds. The entire affair seems rather doubtful though."
-/decl/poster/vore_60
+/datum/decl/poster/vore_60
icon_state = "tgposter30"
name = "Spacesuit Safety"
desc = "It encourages you to check your seals and internals!"
-/decl/poster/vore_61
+/datum/decl/poster/vore_61
icon_state = "tgposter31"
name = "Nanotrasen Logo"
desc = "A clean NanoTrasen logo on a plain blue background. What more needs to be said?"
-/decl/poster/vore_62
+/datum/decl/poster/vore_62
icon_state = "tgposter32"
name = "CLEAN HANDS SAVE LIVES"
desc = "You really ought to wash your hands though."
-/decl/poster/vore_63
+/datum/decl/poster/vore_63
icon_state = "tgposter33"
name = "Build"
desc = "It's encouraging you to build. After all, if you don't who will?"
-/decl/poster/vore_64
+/datum/decl/poster/vore_64
icon_state = "tgposter34"
name = "BLESS THIS SPESS"
desc = "They say that this poster is good luck."
-/decl/poster/vore_65
+/datum/decl/poster/vore_65
icon_state = "tgposter35"
name = "SCIENCE"
desc = "There is a simplified atom depicted on this poster."
-/decl/poster/vore_66
+/datum/decl/poster/vore_66
icon_state = "tgposter36"
name = "ARF"
desc = "The silhouette of a dashing and mysterious figure cries out their trademark slogan, while radiating appropriate intensity and heroism!"
-/decl/poster/vore_67
+/datum/decl/poster/vore_67
icon_state = "tgposter37"
name = "OBEY!"
desc = "This poster seems to depict a set of security equipment."
-/decl/poster/vore_68
+/datum/decl/poster/vore_68
icon_state = "tgposter38"
name = "STATE LAWS"
desc = "An exasperated looking borg stares into your very soul with a crippling, withering boredom that is difficult for you to understand. The borg does look pretty suspicious though, so it is easy to see, they are clearly up to something."
-/decl/poster/vore_69
+/datum/decl/poster/vore_69
icon_state = "tgposter39"
name = "LOVE!"
desc = "The stunning visage of a handsome individual stares back at you with all of the love and adorement that you could desire. This poster warms your heart and makes you feel less alone somehow."
-/decl/poster/vore_70
+/datum/decl/poster/vore_70
icon_state = "tgposter40"
name = "SPACE COPS"
desc = "A movie poster featuring a very cool looking security officer walking away from an encroaching firey explosion. It looks gritty, but silly at the same time. His sunglasses gleam in the light as he looks almost bored with his apparent predicament."
-/decl/poster/vore_71
+/datum/decl/poster/vore_71
icon_state = "tgposter41"
name = "????"
desc = "An artist's depiction of a pink haired girl laying on the sand, with waves washing around the top of her hair. She stares up at you with a mysterious expression... This appears to be some kind of advertizement but the poster doesn't do a very good job of indicating just what this even is..."
-/decl/poster/vore_72
+/datum/decl/poster/vore_72
icon_state = "tgposter42"
name = "LEGS"
desc = "'Save your self some trouble, think before you act. Remember LEGS. Little. Explanation. Great. Suffering.' ... This poster seems to be encouraging you to have an explanation for what you're doing? It's some corporate BS..."
-/decl/poster/vore_73
+/datum/decl/poster/vore_73
icon_state = "tgposter43"
name = "DO NOT QUESTION"
desc = "A poster discouraging you from questioning management decisions."
-/decl/poster/vore_74
+/datum/decl/poster/vore_74
icon_state = "tgposter44"
name = "WORK FOR A FUTURE"
desc = "A poster discouraging you to work for the future you want to see!"
-/decl/poster/vore_75
+/datum/decl/poster/vore_75
icon_state = "tgposter45"
name = "Hats"
desc = "A stylish set of differently colored hats with differently colored backgrounds. You can intuit a lot about the person who made this."
-/decl/poster/vore_76
+/datum/decl/poster/vore_76
icon_state = "tgposter46"
name = "REPORT CRIMES"
desc = "'REPORT CRIMES AT --- Your local Security office.' This poster seems to encourage snitching."
-/decl/poster/vore_78
+/datum/decl/poster/vore_78
icon_state = "tgposter47"
name = "ION RIFLE"
desc = "A weapon advertisement, the sleek lines and cool glow of the Ion Rifle stand out against the plain white background. It looks so futuristic, and even though this is clearly a photograph, it hardly looks real, like something from a videogame."
-/decl/poster/vore_79
+/datum/decl/poster/vore_79
icon_state = "tgposter48"
name = "FOAM FORCE"
desc = "An advertisement for the Foam Force line of toys! It's brightly colored and clearly made of plastic, but the desire to shoot your friends is strong when these are around."
-/decl/poster/vore_80
+/datum/decl/poster/vore_80
icon_state = "tgposter49"
name = "COHIBA"
desc = "An advertisement for a cigar. It looks almost too real, you can see the hyper detailed creases in the cigar's wrapping, and the golden label shines in the light. You can almost smell the smokey aroma in the air."
-/decl/poster/vore_81
+/datum/decl/poster/vore_81
icon_state = "tgposter50"
name = "SCIENCE"
desc = "There is a simplified atom depicted on this poster. It looks somewhat ominous in black, white and red."
-/decl/poster/vore_82
+/datum/decl/poster/vore_82
icon_state = "tgposter51"
name = "Bowl of Fruit"
desc = "The recreation of a painting of a bowl of fruit. It looks close to photorealistic, but was clearly originally done in oil paints. The red color of the fruit is said to be a reflection of the anger in the artist's soul."
-/decl/poster/vore_83
+/datum/decl/poster/vore_83
icon_state = "tgposter52"
name = "NTPDA 1000"
desc = "An advertisement for the NTPDA 1000. It's not clear if this is just an old poster, or one celebrating retro technology, but the PDA depicted looks at least twenty years old."
-/decl/poster/vore_84
+/datum/decl/poster/vore_84
icon_state = "tgposter53"
name = "ENLIST"
desc = "An enlistment advertisement for some band of mercenaries or another. The figure depicted is clad in an advanced looking spacesuit, and their face is nearly totally obscured by their visor, except for the hard eyes of a very cool person glaring out at you from within."
-/decl/poster/vore_85
+/datum/decl/poster/vore_85
icon_state = "tgposter54"
name = "NANO MICHI"
desc = "An advertisement for a brand of tapes to be used with a universal recorder. There's very small print at the bottom that indicates that the universal recorder is not included with the purchase of tapes."
-/decl/poster/vore_86
+/datum/decl/poster/vore_86
icon_state = "tgposter55"
name = "12 GAUGE"
desc = "An advertisement for a brand of shotgun shells. There are several shells stood up in front of a plain background. It is not clear just what they are standing on, but they look like they could fall down at any moment, and with the size of the poster, they appear to be massive."
-/decl/poster/vore_87
+/datum/decl/poster/vore_87
icon_state = "tgposter56"
name = "CLASS"
desc = "An advertisement for a local bar. The poster seems to indicate that drinking out of a glass like the one depicted will increase your classiness and awesomeness. It's not clear quite how, but the glass does look very nice. There's an olive in it."
-/decl/poster/vore_88
+/datum/decl/poster/vore_88
icon_state = "tgposter57"
name = "GUARD IT ALL"
desc = "It features an owl man from the a popular movie series! This character is commonly seen resisting the efforts of Griffon when he takes crime fighting into his own hands. This character is stoic and brave, if a bit of a hardass. He always plays by the rules and so is usually a few steps behind Griffon, but still manages to come out on top most of the time. Truely an inspiring figure."
-/decl/poster/vore_89
+/datum/decl/poster/vore_89
icon_state = "tgposter58"
name = "NO ERP"
desc = "This poster dictates 'NO ERP'. Of course, everyone knows that ERP stands for 'Excessive Rude Postures' and after the events of 2135 it should be clear to everyone as to why this is an important lesson to convey."
-/decl/poster/vore_90
+/datum/decl/poster/vore_90
icon_state = "tgposter59"
name = "Canister"
desc = "This poster seems to be advertising a kind of Canister. The can itself looks sort of ancient, so maybe this isn't the most modern of posters. There's no writing on the poster though, so it's not clear what brand of canister this is or how to acquire one. There's not even any benefits listed or anything. It's just a picture of an old air canister."
-/decl/poster/vore_91
+/datum/decl/poster/vore_91
icon_state = "tgposter60"
name = "DICK GUM"
desc = "This appears to be a poster relating to a murder mystery. There is a pale man in a flat brimmed hat, who appears to be investigating the corpse of a mouse. An air of intrigue hangs about the poster, and the background looks suspiciously complicated, with different items jumping out at you from it the longer you stare."
-/decl/poster/vore_92
+/datum/decl/poster/vore_92
icon_state = "tgposter61"
name = "PHORON ISN'T REAL"
desc = "This poster seems to insist that phoron is in fact not real. It depicts a graphic of a purple planet, presumably covered in phoron, and beside it, a number of points and arguments for why phoron isn't real. It urges you to WAKE UP, and to NOT BELIEVE THE COMPANIES and their SCIENCE. It seems rather convincing."
-/decl/poster/vore_93
+/datum/decl/poster/vore_93
icon_state = "tgposter62"
name = "Pin the Tail on the Corgi"
desc = "A concerned corgi looks at you as it stands and waits, a target overlays its rear end, seemingly waiting for someone to attatch a tail to it, which, it seems to be missing."
/* //CHOMPedit start
-/decl/poster/vore_94
+/datum/decl/poster/vore_94
icon_state = "virgologoposter"
name = "Virgo Orbital Research Establishment"
desc = "It features the logo of the local branch of Nanotrasen; Virgo Orbital Research Establishment."
-/decl/poster/vore_95
+/datum/decl/poster/vore_95
icon_state = "tetherposter"
name = "The Frontier Awaits"
desc = "A stunning depiction of Virgo 3b in front of a field of stars, a purple nebula laces in from behind, while the shining tower of NSB Adephagia gleams in the starlight. 'The Frontier Awaits' is printed in silver lettering. It looks like a recruitment ad."
-/decl/poster/vore_96
+/datum/decl/poster/vore_96
icon_state = "bandposter"
name = "BAND"
desc = "A poster for a band, seemingly named 'BAND'. With a powerful looking hammer logo, it seems like this band must have a powerful sound!"
-/decl/poster/vore_97
+/datum/decl/poster/vore_97
icon_state = "itgposter"
name = "ITG"
desc = "It features the ITG logo. The poster insists that they can get your packages from here to there safely, and faster than the competition. A bold claim. There is contact information for applying for work or deliveries near the bottom."
-/decl/poster/vore_98
+/datum/decl/poster/vore_98
icon_state = "chairstvshowposter"
name = "CHAIRS"
desc = "A rather menacing looking Chair lurks in a dark room. This appears to relate to the show 'Chairs', a sensation that has been sweeping the galaxy for over two hundred seasons! The show has been able to maintain a cult audience through its entire life. It started as a medieval fantasy, but it has changed genres and main characters several times. Fans of the show insist that it is the best show, despite its somewhat incomprehensible plot."
-/decl/poster/vore_99
+/datum/decl/poster/vore_99
icon_state = "susposter"
name = "SUS?"
desc = "A man in a spacesuit lurks near a wall. He doesn't appear to be doing his tasks... is he waiting for something? He seems rather suspicious..."
-/decl/poster/vore_100
+/datum/decl/poster/vore_100
icon_state = "inthedarkposter"
name = "Stars in the Dark"
desc = "A depiction of some kind of constellation. It is ominously dark surrounding these lights, while the lights themselves are incredibly bright yellow. The pattern is striking and draws the eye, not unlike eyes watching you, it is hard not to stare. The poster seems almost to stare back. This seems to be a poster depicting the icon of some religeon."
-/decl/poster/vore_101
+/datum/decl/poster/vore_101
icon_state = "cafejoanposter"
name = "Cafe Risu"
desc = "A poster depicting a familiar face readying to slurp a big mug of coffee. The face of addiction is not always unpleasant. Sometimes it takes the form of a pretty squirrel partaking of her morning treat..."
diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm
index 239f3a3567..81b8d51eed 100644
--- a/code/game/objects/mail.dm
+++ b/code/game/objects/mail.dm
@@ -334,7 +334,7 @@
name = "mail crate"
desc = "An official mail crate from CentCom"
points_per_crate = 0
- closet_appearance = /decl/closet_appearance/crate/nanotrasen
+ closet_appearance = /datum/decl/closet_appearance/crate/nanotrasen
/obj/structure/closet/crate/mail/full/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm
index 409f4dd2da..dcdd2c19c1 100644
--- a/code/game/objects/structures/crates_lockers/__closets.dm
+++ b/code/game/objects/structures/crates_lockers/__closets.dm
@@ -35,7 +35,7 @@
var/list/starts_with // List of type = count (or just type for 1)
- var/decl/closet_appearance/closet_appearance = /decl/closet_appearance // The /decl that defines what decals we end up with, that makes our look unique
+ var/datum/decl/closet_appearance/closet_appearance = /datum/decl/closet_appearance // The /datum/decl that defines what decals we end up with, that makes our look unique
/// Currently animating the door transform
var/is_animating_door = FALSE
diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
index a06b4bf651..b9cd1afb88 100644
--- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
+++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
@@ -2,7 +2,7 @@
closet_appearance = newappearance
. = ..()
-/decl/closet_appearance
+/datum/decl/closet_appearance
var/color = COLOR_GRAY40
var/decals = list(
"upper_vent",
@@ -23,7 +23,7 @@
/// Offset for the door hinge location from centerline
var/door_hinge = -6.5
-/decl/closet_appearance/New()
+/datum/decl/closet_appearance/New()
// Build our colour and decal lists.
if(LAZYLEN(extra_decals))
if(!decals)
@@ -117,144 +117,144 @@
// Set icon!
icon = new_icon
-/decl/closet_appearance/tactical
+/datum/decl/closet_appearance/tactical
color = COLOR_RED_GRAY
extra_decals = list(
"inset" = COLOR_GRAY
)
-/decl/closet_appearance/thunderdomered
+/datum/decl/closet_appearance/thunderdomered
color = COLOR_LIGHT_RED
-/decl/closet_appearance/thunderdomegreen
+/datum/decl/closet_appearance/thunderdomegreen
color = COLOR_LIGHT_GREEN
-/decl/closet_appearance/tactical/alt
+/datum/decl/closet_appearance/tactical/alt
color = COLOR_PALE_BTL_GREEN
-/decl/closet_appearance/wardrobe
+/datum/decl/closet_appearance/wardrobe
extra_decals = list(
"stripe_horizontal" = COLOR_PALE_BLUE_GRAY,
"stripe_w" = COLOR_GRAY
)
-/decl/closet_appearance/wardrobe/blue
+/datum/decl/closet_appearance/wardrobe/blue
extra_decals = list(
"stripe_horizontal" = COLOR_TEAL,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/purple
+/datum/decl/closet_appearance/wardrobe/purple
extra_decals = list(
"stripe_horizontal" = COLOR_VIOLET,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/mixed
+/datum/decl/closet_appearance/wardrobe/mixed
extra_decals = list(
"stripe_horizontal_upper" = COLOR_VIOLET,
"stripe_horizontal_lower" = COLOR_PALE_PINK,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/orange
+/datum/decl/closet_appearance/wardrobe/orange
extra_decals = list(
"stripe_horizontal" = COLOR_ORANGE,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/green
+/datum/decl/closet_appearance/wardrobe/green
extra_decals = list(
"stripe_horizontal" = COLOR_GREEN,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/grey
+/datum/decl/closet_appearance/wardrobe/grey
extra_decals = list(
"stripe_horizontal" = COLOR_GRAY,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/pink
+/datum/decl/closet_appearance/wardrobe/pink
extra_decals = list(
"stripe_horizontal" = COLOR_LIGHT_PINK,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/black
+/datum/decl/closet_appearance/wardrobe/black
extra_decals = list(
"stripe_horizontal" = COLOR_GRAY20,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/yellow
+/datum/decl/closet_appearance/wardrobe/yellow
extra_decals = list(
"stripe_horizontal" = COLOR_YELLOW,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/red
+/datum/decl/closet_appearance/wardrobe/red
extra_decals = list(
"stripe_horizontal" = COLOR_LIGHT_RED,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/white
+/datum/decl/closet_appearance/wardrobe/white
extra_decals = list(
"stripe_horizontal" = COLOR_GRAY,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/suit
+/datum/decl/closet_appearance/wardrobe/suit
extra_decals = list(
"stripe_horizontal_upper" = COLOR_OFF_WHITE,
"stripe_horizontal_lower" = COLOR_GRAY,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/janitor
+/datum/decl/closet_appearance/wardrobe/janitor
extra_decals = list(
"stripe_horizontal" = COLOR_PURPLE,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/medical
+/datum/decl/closet_appearance/wardrobe/medical
color = COLOR_OFF_WHITE
-/decl/closet_appearance/wardrobe/medical/patient
+/datum/decl/closet_appearance/wardrobe/medical/patient
extra_decals = list(
"stripe_horizontal" = COLOR_GRAY,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/medical/white
+/datum/decl/closet_appearance/wardrobe/medical/white
extra_decals = list(
"stripe_horizontal" = COLOR_OFF_WHITE,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/medical/chemistry
+/datum/decl/closet_appearance/wardrobe/medical/chemistry
extra_decals = list(
"stripe_horizontal_upper" = COLOR_OFF_WHITE,
"stripe_horizontal_lower" = COLOR_ORANGE,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/medical/genetics
+/datum/decl/closet_appearance/wardrobe/medical/genetics
extra_decals = list(
"stripe_horizontal_upper" = COLOR_OFF_WHITE,
"stripe_horizontal_lower" = COLOR_BABY_BLUE,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/medical/virology
+/datum/decl/closet_appearance/wardrobe/medical/virology
extra_decals = list(
"stripe_horizontal_upper" = COLOR_OFF_WHITE,
"stripe_horizontal_lower" = COLOR_LIME,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/robotics
+/datum/decl/closet_appearance/wardrobe/robotics
color = COLOR_OFF_WHITE
extra_decals = list(
"stripe_horizontal_upper" = COLOR_GRAY20,
@@ -262,55 +262,55 @@
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/science
+/datum/decl/closet_appearance/wardrobe/science
color = COLOR_OFF_WHITE
extra_decals = list(
"stripe_horizontal" = COLOR_PURPLE,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/wardrobe/pjs
+/datum/decl/closet_appearance/wardrobe/pjs
extra_decals = list(
"stripe_horizontal" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/white
+/datum/decl/closet_appearance/wardrobe/white
extra_decals = list(
"stripe_horizontal" = COLOR_OFF_WHITE,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/engineer
+/datum/decl/closet_appearance/wardrobe/engineer
extra_decals = list(
"stripe_horizontal" = COLOR_PALE_ORANGE,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/engineer/atmos
+/datum/decl/closet_appearance/wardrobe/engineer/atmos
extra_decals = list(
"stripe_horizontal_upper" = COLOR_PALE_ORANGE,
"stripe_horizontal_lower" = COLOR_TEAL,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/chapel
+/datum/decl/closet_appearance/wardrobe/chapel
extra_decals = list(
"stripe_horizontal_upper" = COLOR_PALE_YELLOW,
"stripe_horizontal_lower" = COLOR_GRAY20,
"stripe_w" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/wardrobe/xenos
+/datum/decl/closet_appearance/wardrobe/xenos
extra_decals = list(
"stripe_horizontal_upper" = COLOR_GREEN,
"stripe_horizontal_lower" = COLOR_GOLD,
"stripe_w" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/ert
+/datum/decl/closet_appearance/ert
color = COLOR_RED_GRAY
-/decl/closet_appearance/bio
+/datum/decl/closet_appearance/bio
color = COLOR_PALE_ORANGE
decals = list(
"l3" = COLOR_OFF_WHITE,
@@ -320,31 +320,31 @@
"biohazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/bio/command
+/datum/decl/closet_appearance/bio/command
extra_decals = list(
"lower_half_solid" = COLOR_BLUE_GRAY,
"biohazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/bio/medical
+/datum/decl/closet_appearance/bio/medical
extra_decals = list(
"lower_half_solid" = COLOR_PALE_BLUE_GRAY,
"biohazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/bio/science
+/datum/decl/closet_appearance/bio/science
extra_decals = list(
"lower_half_solid" = COLOR_PALE_PINK,
"biohazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/bio/security
+/datum/decl/closet_appearance/bio/security
extra_decals = list(
"lower_half_solid" = COLOR_RED_GRAY,
"biohazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/bio/janitor
+/datum/decl/closet_appearance/bio/janitor
color = COLOR_PURPLE
decals = list(
"l3" = COLOR_OFF_WHITE,
@@ -354,19 +354,19 @@
"biohazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/bio/virology
+/datum/decl/closet_appearance/bio/virology
extra_decals = list(
"lower_half_solid" = COLOR_GREEN_GRAY,
"biohazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/secure_closet
+/datum/decl/closet_appearance/secure_closet
can_lock = TRUE
-/decl/closet_appearance/secure_closet/patient
+/datum/decl/closet_appearance/secure_closet/patient
color = COLOR_OFF_WHITE
-/decl/closet_appearance/secure_closet/engineering
+/datum/decl/closet_appearance/secure_closet/engineering
can_lock = TRUE
color = COLOR_YELLOW_GRAY
decals = list(
@@ -379,7 +379,7 @@
"eng" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/engineering/electrical
+/datum/decl/closet_appearance/secure_closet/engineering/electrical
decals = list(
"lower_vent"
)
@@ -388,14 +388,14 @@
"vertical_stripe_simple" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/engineering/atmos
+/datum/decl/closet_appearance/secure_closet/engineering/atmos
extra_decals = list(
"stripe_vertical_right_partial" = COLOR_DARK_TEAL,
"stripe_vertical_mid_partial" = COLOR_DARK_TEAL,
"atmos" = COLOR_DARK_TEAL
)
-/decl/closet_appearance/secure_closet/engineering/welding
+/datum/decl/closet_appearance/secure_closet/engineering/welding
decals = list(
"lower_vent"
)
@@ -404,7 +404,7 @@
"vertical_stripe_simple" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/engineering/tools
+/datum/decl/closet_appearance/secure_closet/engineering/tools
can_lock = FALSE
decals = list(
"lower_vent"
@@ -414,19 +414,19 @@
"vertical_stripe_simple" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/engineering/tools/xenoarch
+/datum/decl/closet_appearance/secure_closet/engineering/tools/xenoarch
extra_decals = list(
"pick" = COLOR_BEASTY_BROWN,
"vertical_stripe_simple" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/engineering/tools/radiation
+/datum/decl/closet_appearance/secure_closet/engineering/tools/radiation
extra_decals = list(
"l2" = COLOR_BEASTY_BROWN,
"rads" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/engineering/ce
+/datum/decl/closet_appearance/secure_closet/engineering/ce
color = COLOR_OFF_WHITE
extra_decals = list(
"stripe_vertical_right_partial" = COLOR_DARK_GOLD,
@@ -434,7 +434,7 @@
"eng_narrow" = COLOR_DARK_GOLD
)
-/decl/closet_appearance/secure_closet/mining
+/datum/decl/closet_appearance/secure_closet/mining
color = COLOR_WARM_YELLOW
decals = list(
"upper_side_vent",
@@ -446,14 +446,14 @@
"mining" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/mining/sec
+/datum/decl/closet_appearance/secure_closet/mining/sec
decals = list(
"stripe_vertical_mid_partial" = COLOR_NT_RED,
"stripe_vertical_left_partial" = COLOR_NT_RED,
"mining" = COLOR_NT_RED
)
-/decl/closet_appearance/secure_closet/command
+/datum/decl/closet_appearance/secure_closet/command
color = COLOR_BLUE_GRAY
decals = list(
"lower_holes",
@@ -465,14 +465,14 @@
"captain" = COLOR_GOLD
)
-/decl/closet_appearance/secure_closet/command/hop
+/datum/decl/closet_appearance/secure_closet/command/hop
color = COLOR_PALE_BLUE_GRAY
extra_decals = list(
"stripe_vertical_mid_partial" = COLOR_GOLD,
"hop" = COLOR_GOLD
)
-/decl/closet_appearance/secure_closet/cmo
+/datum/decl/closet_appearance/secure_closet/cmo
color = COLOR_BABY_BLUE
decals = list(
"upper_side_vent",
@@ -484,7 +484,7 @@
"stripe_vertical_mid_partial" = COLOR_GOLD
)
-/decl/closet_appearance/secure_closet/medical
+/datum/decl/closet_appearance/secure_closet/medical
color = COLOR_OFF_WHITE
decals = null
extra_decals = list(
@@ -492,7 +492,7 @@
"stripes_horizontal" = COLOR_BLUE_GRAY
)
-/decl/closet_appearance/secure_closet/medical/virology
+/datum/decl/closet_appearance/secure_closet/medical/virology
decals = list(
"upper_side_vent",
"lower_side_vent"
@@ -503,21 +503,21 @@
"viro" = COLOR_BOTTLE_GREEN
)
-/decl/closet_appearance/secure_closet/medical/alt
+/datum/decl/closet_appearance/secure_closet/medical/alt
extra_decals = list(
"medcircle" =COLOR_BLUE_GRAY,
"stripe_vertical_right_partial" = COLOR_BLUE_GRAY,
"stripe_vertical_mid_partial" = COLOR_BLUE_GRAY
)
-/decl/closet_appearance/secure_closet/medical/chemistry
+/datum/decl/closet_appearance/secure_closet/medical/chemistry
extra_decals = list(
"medcircle" = COLOR_ORANGE,
"stripe_vertical_right_partial" = COLOR_ORANGE,
"stripe_vertical_mid_partial" = COLOR_ORANGE
)
-/decl/closet_appearance/secure_closet/medical/paramedic
+/datum/decl/closet_appearance/secure_closet/medical/paramedic
decals = list(
"lower_side_vent"
)
@@ -526,7 +526,7 @@
"stripe_vertical_mid_full" = COLOR_BLUE_GRAY
)
-/decl/closet_appearance/secure_closet/medical/doctor
+/datum/decl/closet_appearance/secure_closet/medical/doctor
decals = list(
"lower_side_vent"
)
@@ -536,7 +536,7 @@
"stripe_vertical_left_full" = COLOR_BLUE_GRAY
)
-/decl/closet_appearance/secure_closet/cargo
+/datum/decl/closet_appearance/secure_closet/cargo
color = COLOR_WARM_YELLOW
decals = list(
"upper_side_vent",
@@ -548,26 +548,26 @@
"stripe_vertical_mid_partial" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/cargo/qm
+/datum/decl/closet_appearance/secure_closet/cargo/qm
extra_decals = list(
"cargo" = COLOR_SILVER,
"stripe_vertical_left_partial" = COLOR_SILVER,
"stripe_vertical_mid_partial" = COLOR_SILVER
)
-/decl/closet_appearance/secure_closet/courtroom
+/datum/decl/closet_appearance/secure_closet/courtroom
decals = list(
"lower_holes",
"upper_holes"
)
-/decl/closet_appearance/secure_closet/brig
+/datum/decl/closet_appearance/secure_closet/brig
color = COLOR_DARK_ORANGE
extra_decals = list(
"inset" = COLOR_GRAY40
)
-/decl/closet_appearance/secure_closet/security
+/datum/decl/closet_appearance/secure_closet/security
color = COLOR_NT_RED
decals = list(
"lower_holes"
@@ -577,14 +577,14 @@
"security" = COLOR_WARM_YELLOW
)
-/decl/closet_appearance/secure_closet/security/warden
+/datum/decl/closet_appearance/secure_closet/security/warden
extra_decals = list(
"stripe_vertical_left_full" = COLOR_WARM_YELLOW,
"stripe_vertical_right_full" = COLOR_WARM_YELLOW,
"security" = COLOR_WARM_YELLOW
)
-/decl/closet_appearance/secure_closet/security/hos
+/datum/decl/closet_appearance/secure_closet/security/hos
extra_decals = list(
"stripe_vertical_left_full" = COLOR_WARM_YELLOW,
"stripe_vertical_right_full" = COLOR_WARM_YELLOW,
@@ -592,7 +592,7 @@
"security" = COLOR_GOLD
)
-/decl/closet_appearance/bomb
+/datum/decl/closet_appearance/bomb
color = COLOR_DARK_GREEN_GRAY
decals = list(
"l4" = COLOR_OFF_WHITE
@@ -601,12 +601,12 @@
"lower_half_solid" = COLOR_PALE_PINK
)
-/decl/closet_appearance/bomb/security
+/datum/decl/closet_appearance/bomb/security
extra_decals = list(
"lower_half_solid" = COLOR_RED_GRAY
)
-/decl/closet_appearance/oxygen
+/datum/decl/closet_appearance/oxygen
color = COLOR_LIGHT_CYAN
decals = list(
"lower_vent"
@@ -615,24 +615,24 @@
"oxy" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/oxygen/fire
+/datum/decl/closet_appearance/oxygen/fire
color = COLOR_RED_LIGHT
extra_decals = list(
"extinguisher" = COLOR_OFF_WHITE,
"vertical_stripe_simple" = COLOR_OFF_WHITE,
)
-/decl/closet_appearance/oxygen/fire/atmos
+/datum/decl/closet_appearance/oxygen/fire/atmos
color = COLOR_YELLOW_GRAY
extra_decals = list(
"extinguisher" = COLOR_TEAL,
"vertical_stripe_simple" = COLOR_TEAL,
)
-/decl/closet_appearance/alien
+/datum/decl/closet_appearance/alien
color = COLOR_PURPLE
-/decl/closet_appearance/secure_closet/expedition
+/datum/decl/closet_appearance/secure_closet/expedition
color = COLOR_BLUE_GRAY
decals = list(
"lower_side_vent"
@@ -642,7 +642,7 @@
"security" = COLOR_PURPLE
)
-/decl/closet_appearance/secure_closet/expedition/pathfinder
+/datum/decl/closet_appearance/secure_closet/expedition/pathfinder
extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE,
"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
@@ -650,7 +650,7 @@
"security" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/science
+/datum/decl/closet_appearance/secure_closet/science
color = COLOR_OFF_WHITE
decals = list(
"lower_holes"
@@ -660,14 +660,14 @@
"research" = COLOR_PURPLE
)
-/decl/closet_appearance/secure_closet/science/xenoarch
+/datum/decl/closet_appearance/secure_closet/science/xenoarch
extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE,
"stripe_vertical_right_full" = COLOR_PURPLE,
"research" = COLOR_PURPLE
)
-/decl/closet_appearance/secure_closet/science/rd
+/datum/decl/closet_appearance/secure_closet/science/rd
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_GOLD,
"stripe_vertical_left_full" = COLOR_PURPLE,
@@ -675,7 +675,7 @@
"research" = COLOR_PURPLE
)
-/decl/closet_appearance/secure_closet/corporate
+/datum/decl/closet_appearance/secure_closet/corporate
color = COLOR_GREEN_GRAY
decals = list(
"lower_holes"
@@ -685,7 +685,7 @@
"research" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/secure_closet/hydroponics
+/datum/decl/closet_appearance/secure_closet/hydroponics
color = COLOR_SALAD_GREEN
decals = list(
"lower_side_vent",
@@ -697,14 +697,14 @@
"hydro" = COLOR_GREEN
)
-/decl/closet_appearance/secure_closet/hydroponics/xenoflora
+/datum/decl/closet_appearance/secure_closet/hydroponics/xenoflora
extra_decals = list(
"stripe_vertical_right_partial" = COLOR_PURPLE,
"stripe_vertical_mid_partial" = COLOR_PURPLE,
"hydro" = COLOR_PURPLE
)
-/decl/closet_appearance/secure_closet/chaplain
+/datum/decl/closet_appearance/secure_closet/chaplain
decals = list(
"lower_side_vent",
"upper_side_vent"
@@ -714,7 +714,7 @@
"stripe_vertical_mid_full" = COLOR_GRAY20
)
-/decl/closet_appearance/secure_closet/sol
+/datum/decl/closet_appearance/secure_closet/sol
color = COLOR_BABY_BLUE
decals = list(
"lower_side_vent"
@@ -724,18 +724,18 @@
"security" = COLOR_BOTTLE_GREEN
)
-/decl/closet_appearance/secure_closet/sol/two
+/datum/decl/closet_appearance/secure_closet/sol/two
extra_decals = list(
"stripe_vertical_left_full" = COLOR_BOTTLE_GREEN,
"stripe_vertical_right_full" = COLOR_BOTTLE_GREEN,
"security" = COLOR_BOTTLE_GREEN
)
-/decl/closet_appearance/secure_closet/sol/two/dark
+/datum/decl/closet_appearance/secure_closet/sol/two/dark
color = COLOR_DARK_BLUE_GRAY
// Crates.
-/decl/closet_appearance/crate
+/datum/decl/closet_appearance/crate
decals = null
extra_decals = null
base_icon = 'icons/obj/closets/bases/crate.dmi'
@@ -743,48 +743,48 @@
color = COLOR_GRAY40
door_anim_time = 0
-/decl/closet_appearance/crate/plastic
+/datum/decl/closet_appearance/crate/plastic
color = COLOR_GRAY80
-/decl/closet_appearance/crate/oxygen
+/datum/decl/closet_appearance/crate/oxygen
color = COLOR_CYAN_BLUE
decals = list(
"crate_stripes" = COLOR_OFF_WHITE,
"crate_oxy" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/medical
+/datum/decl/closet_appearance/crate/medical
color = COLOR_GRAY80
decals = list(
"crate_stripe" = COLOR_WARM_YELLOW,
"crate_cross" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/medical/trauma
+/datum/decl/closet_appearance/crate/medical/trauma
decals = list(
"crate_stripe" = COLOR_NT_RED,
"crate_cross" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/medical/oxygen
+/datum/decl/closet_appearance/crate/medical/oxygen
decals = list(
"crate_stripe" = COLOR_BABY_BLUE,
"crate_cross" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/medical/toxins
+/datum/decl/closet_appearance/crate/medical/toxins
decals = list(
"crate_stripe" = COLOR_GREEN_GRAY,
"crate_cross" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/hydroponics
+/datum/decl/closet_appearance/crate/hydroponics
decals = list(
"crate_stripe_left" = COLOR_GREEN_GRAY,
"crate_stripe_right" = COLOR_GREEN_GRAY
)
-/decl/closet_appearance/crate/radiation
+/datum/decl/closet_appearance/crate/radiation
color = COLOR_BROWN_ORANGE
extra_decals = list(
"crate_radiation_left" = COLOR_WARM_YELLOW,
@@ -794,29 +794,29 @@
// Freezers
-/decl/closet_appearance/crate/freezer
+/datum/decl/closet_appearance/crate/freezer
color = COLOR_OFF_WHITE
-/decl/closet_appearance/crate/freezer/centauri
+/datum/decl/closet_appearance/crate/freezer/centauri
color = COLOR_BABY_BLUE
extra_decals = list(
"centauri" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/freezer/nanotrasen
+/datum/decl/closet_appearance/crate/freezer/nanotrasen
color = COLOR_BABY_BLUE
extra_decals = list(
"nano" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/freezer/veymed
+/datum/decl/closet_appearance/crate/freezer/veymed
color = COLOR_BABY_BLUE
extra_decals = list(
"lid_stripes" = COLOR_RED,
"crate_cross" = COLOR_GREEN
)
-/decl/closet_appearance/crate/freezer/zenghu
+/datum/decl/closet_appearance/crate/freezer/zenghu
color = COLOR_BABY_BLUE
extra_decals = list(
"zenghu" = COLOR_OFF_WHITE
@@ -824,27 +824,27 @@
// Corporate Branding
-/decl/closet_appearance/crate/aether
+/datum/decl/closet_appearance/crate/aether
color = COLOR_YELLOW_GRAY
decals = list(
"crate_stripes" = COLOR_BLUE_LIGHT,
"aether" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/allico
+/datum/decl/closet_appearance/crate/allico
color = COLOR_LIGHT_VIOLET
decals = list(
"crate_stripe" = COLOR_AMBER
)
-/decl/closet_appearance/crate/carp
+/datum/decl/closet_appearance/crate/carp
color = COLOR_PURPLE
decals = list(
"toptext" = COLOR_OFF_WHITE,
"crate_reticle" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/centauri
+/datum/decl/closet_appearance/crate/centauri
color = COLOR_BABY_BLUE
decals = list(
"crate_stripe" = COLOR_LUMINOL
@@ -853,14 +853,14 @@
"centauri" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/cybersolutions
+/datum/decl/closet_appearance/crate/cybersolutions
color = COLOR_ALUMINIUM
extra_decals = list(
"hazard" = COLOR_DARK_GOLD,
"toptext" = COLOR_DARK_GOLD
)
-/decl/closet_appearance/crate/einstein
+/datum/decl/closet_appearance/crate/einstein
color = COLOR_DARK_BLUE_GRAY
extra_decals = list(
"crate_stripe_left" = COLOR_BEIGE,
@@ -869,7 +869,7 @@
"hazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/focalpoint
+/datum/decl/closet_appearance/crate/focalpoint
color = COLOR_GOLD
extra_decals = list(
"crate_stripe_left" = COLOR_NAVY_BLUE,
@@ -878,14 +878,14 @@
"hazard" = COLOR_NAVY_BLUE
)
-/decl/closet_appearance/crate/galaksi
+/datum/decl/closet_appearance/crate/galaksi
color = COLOR_OFF_WHITE
decals = list(
"lid_stripes" = COLOR_HULL,
"galaksi" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/gilthari
+/datum/decl/closet_appearance/crate/gilthari
color = COLOR_GRAY20
extra_decals = list(
"crate_stripe_left" = COLOR_GOLD,
@@ -893,7 +893,7 @@
"gilthari" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/grayson
+/datum/decl/closet_appearance/crate/grayson
color = COLOR_STEEL
extra_decals = list(
"crate_stripe_left" = COLOR_MAROON,
@@ -901,7 +901,7 @@
"grayson" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/heph
+/datum/decl/closet_appearance/crate/heph
color = COLOR_GRAY20
extra_decals = list(
"crate_stripe_left" = COLOR_NT_RED,
@@ -909,14 +909,14 @@
"heph" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/morpheus
+/datum/decl/closet_appearance/crate/morpheus
color = COLOR_ALUMINIUM
extra_decals = list(
"hazard" = COLOR_GUNMETAL,
"toptext" = COLOR_GUNMETAL
)
-/decl/closet_appearance/crate/nanotrasen
+/datum/decl/closet_appearance/crate/nanotrasen
color = COLOR_NT_RED
extra_decals = list(
"crate_stripe_left" = COLOR_OFF_WHITE,
@@ -924,7 +924,7 @@
"nano" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/nanotrasenclothing
+/datum/decl/closet_appearance/crate/nanotrasenclothing
color = COLOR_NT_RED
extra_decals = list(
"crate_stripe_left" = COLOR_SEDONA,
@@ -932,14 +932,14 @@
"nano" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/nanotrasenmedical
+/datum/decl/closet_appearance/crate/nanotrasenmedical
color = COLOR_OFF_WHITE
extra_decals = list(
"crate_stripe" = COLOR_NT_RED,
"nano" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/oculum
+/datum/decl/closet_appearance/crate/oculum
color = COLOR_SURGERY_BLUE
decals = list(
"crate_stripe_left" = COLOR_OFF_WHITE,
@@ -947,34 +947,34 @@
"oculum" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/saare
+/datum/decl/closet_appearance/crate/secure/saare
color = COLOR_ALUMINIUM
extra_decals = list(
"hazard" = COLOR_RED,
"xion" = COLOR_GRAY40
)
-/decl/closet_appearance/crate/thinktronic
+/datum/decl/closet_appearance/crate/thinktronic
color = COLOR_PALE_PURPLE_GRAY
decals = list(
"toptext" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/ummarcar
+/datum/decl/closet_appearance/crate/ummarcar
color = COLOR_BEIGE
decals = list(
"crate_stripes" = COLOR_OFF_WHITE,
"toptext" = COLOR_GRAY20
)
-/decl/closet_appearance/crate/unathiimport
+/datum/decl/closet_appearance/crate/unathiimport
color = COLOR_SILVER
decals = list(
"crate_stripe" = COLOR_RED,
"crate_reticle" = COLOR_RED_GRAY
)
-/decl/closet_appearance/crate/veymed
+/datum/decl/closet_appearance/crate/veymed
color = COLOR_OFF_WHITE
decals = list(
"crate_stripe" = COLOR_PALE_BTL_GREEN
@@ -984,7 +984,7 @@
"crate_cross" = COLOR_GREEN
)
-/decl/closet_appearance/crate/ward
+/datum/decl/closet_appearance/crate/ward
color = COLOR_OFF_WHITE
extra_decals = list(
"crate_stripe_left" = COLOR_COMMAND_BLUE,
@@ -993,7 +993,7 @@
"wt" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/xion
+/datum/decl/closet_appearance/crate/xion
color = COLOR_ORANGE
extra_decals = list(
"crate_stripes" = COLOR_OFF_WHITE,
@@ -1001,7 +1001,7 @@
"hazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/zenghu
+/datum/decl/closet_appearance/crate/zenghu
color = COLOR_OFF_WHITE
extra_decals = list(
"crate_stripes" = COLOR_RED,
@@ -1010,10 +1010,10 @@
// Secure Crates
-/decl/closet_appearance/crate/secure
+/datum/decl/closet_appearance/crate/secure
can_lock = TRUE
-/decl/closet_appearance/crate/secure/hazard
+/datum/decl/closet_appearance/crate/secure/hazard
color = COLOR_NT_RED
decals = list(
"crate_bracing"
@@ -1025,7 +1025,7 @@
"nano" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/weapon
+/datum/decl/closet_appearance/crate/secure/weapon
color = COLOR_GREEN_GRAY
decals = list(
"crate_bracing"
@@ -1038,7 +1038,7 @@
// Secure corporate branding
-/decl/closet_appearance/crate/secure/aether
+/datum/decl/closet_appearance/crate/secure/aether
color = COLOR_YELLOW_GRAY
decals = list(
"crate_bracing"
@@ -1048,7 +1048,7 @@
"aether" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/bishop
+/datum/decl/closet_appearance/crate/secure/bishop
color = COLOR_OFF_WHITE
decals = list(
"crate_bracing"
@@ -1059,7 +1059,7 @@
"bishop" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/cybersolutions
+/datum/decl/closet_appearance/crate/secure/cybersolutions
color = COLOR_ALUMINIUM
decals = list(
"crate_bracing"
@@ -1069,7 +1069,7 @@
"toptext" = COLOR_DARK_GOLD
)
-/decl/closet_appearance/crate/secure/einstein
+/datum/decl/closet_appearance/crate/secure/einstein
color = COLOR_DARK_BLUE_GRAY
decals = list(
"crate_bracing"
@@ -1081,7 +1081,7 @@
"hazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/focalpoint
+/datum/decl/closet_appearance/crate/secure/focalpoint
color = COLOR_GOLD
decals = list(
"crate_bracing"
@@ -1093,7 +1093,7 @@
"hazard" = COLOR_NAVY_BLUE
)
-/decl/closet_appearance/crate/secure/gilthari
+/datum/decl/closet_appearance/crate/secure/gilthari
color = COLOR_GRAY20
decals = list(
"crate_bracing"
@@ -1105,7 +1105,7 @@
"gilthari" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/grayson
+/datum/decl/closet_appearance/crate/secure/grayson
color = COLOR_STEEL
decals = list(
"crate_bracing"
@@ -1116,7 +1116,7 @@
"grayson" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/hedberg
+/datum/decl/closet_appearance/crate/secure/hedberg
color = COLOR_GREEN_GRAY
decals = list(
"crate_bracing"
@@ -1128,7 +1128,7 @@
"hedberg" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/heph
+/datum/decl/closet_appearance/crate/secure/heph
color = COLOR_GRAY20
decals = list(
"crate_bracing"
@@ -1140,7 +1140,7 @@
"heph" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/lawson
+/datum/decl/closet_appearance/crate/secure/lawson
color = COLOR_SAN_MARINO_BLUE
decals = list(
"crate_bracing"
@@ -1152,7 +1152,7 @@
"lawson" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/morpheus
+/datum/decl/closet_appearance/crate/secure/morpheus
color = COLOR_ALUMINIUM
decals = list(
"crate_bracing"
@@ -1162,7 +1162,7 @@
"toptext" = COLOR_GUNMETAL
)
-/decl/closet_appearance/crate/secure/nanotrasen
+/datum/decl/closet_appearance/crate/secure/nanotrasen
color = COLOR_NT_RED
decals = list(
"crate_bracing"
@@ -1173,7 +1173,7 @@
"nano" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/nanotrasenmedical
+/datum/decl/closet_appearance/crate/secure/nanotrasenmedical
color = COLOR_OFF_WHITE
decals = list(
"crate_bracing"
@@ -1183,7 +1183,7 @@
"nano" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/saare
+/datum/decl/closet_appearance/crate/secure/saare
color = COLOR_ALUMINIUM
decals = list(
"crate_bracing"
@@ -1193,7 +1193,7 @@
"xion" = COLOR_GRAY40
)
-/decl/closet_appearance/crate/secure/solgov
+/datum/decl/closet_appearance/crate/secure/solgov
color = COLOR_SAN_MARINO_BLUE
decals = list(
"crate_bracing"
@@ -1205,7 +1205,7 @@
"scg" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/veymed
+/datum/decl/closet_appearance/crate/secure/veymed
color = COLOR_OFF_WHITE
decals = list(
"crate_bracing",
@@ -1216,7 +1216,7 @@
"crate_cross" = COLOR_GREEN
)
-/decl/closet_appearance/crate/secure/ward
+/datum/decl/closet_appearance/crate/secure/ward
color = COLOR_OFF_WHITE
decals = list(
"crate_bracing"
@@ -1228,7 +1228,7 @@
"wt" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/xion
+/datum/decl/closet_appearance/crate/secure/xion
color = COLOR_ORANGE
decals = list(
"crate_bracing"
@@ -1239,7 +1239,7 @@
"hazard" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/zenghu
+/datum/decl/closet_appearance/crate/secure/zenghu
color = COLOR_OFF_WHITE
decals = list(
"crate_bracing"
@@ -1249,27 +1249,27 @@
"zenghu" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/crate/secure/hydroponics
+/datum/decl/closet_appearance/crate/secure/hydroponics
extra_decals = list(
"crate_stripe_left" = COLOR_GREEN_GRAY,
"crate_stripe_right" = COLOR_GREEN_GRAY
)
-/decl/closet_appearance/crate/secure/shuttle
+/datum/decl/closet_appearance/crate/secure/shuttle
extra_decals = list(
"crate_stripe_left" = COLOR_YELLOW_GRAY,
"crate_stripe_right" = COLOR_YELLOW_GRAY
)
// Large crates.
-/decl/closet_appearance/large_crate
+/datum/decl/closet_appearance/large_crate
base_icon = 'icons/obj/closets/bases/large_crate.dmi'
decal_icon = 'icons/obj/closets/decals/large_crate.dmi'
decals = null
extra_decals = null
door_anim_time = 0
-/decl/closet_appearance/large_crate/critter
+/datum/decl/closet_appearance/large_crate/critter
color = COLOR_BEIGE
decals = list(
"airholes"
@@ -1278,13 +1278,13 @@
"oxy" = COLOR_WHITE
)
-/decl/closet_appearance/large_crate/hydroponics
+/datum/decl/closet_appearance/large_crate/hydroponics
extra_decals = list(
"stripes" = COLOR_GREEN_GRAY,
"text" = COLOR_GREEN_GRAY
)
-/decl/closet_appearance/large_crate/aether
+/datum/decl/closet_appearance/large_crate/aether
color = COLOR_YELLOW_GRAY
decals = list(
"crate_bracing"
@@ -1293,7 +1293,7 @@
"text" = COLOR_BLUE_LIGHT
)
-/decl/closet_appearance/large_crate/einstein
+/datum/decl/closet_appearance/large_crate/einstein
color = COLOR_DARK_BLUE_GRAY
decals = list(
"crate_bracing"
@@ -1302,7 +1302,7 @@
"text" = COLOR_BEIGE
)
-/decl/closet_appearance/large_crate/nanotrasen
+/datum/decl/closet_appearance/large_crate/nanotrasen
color = COLOR_NT_RED
decals = list(
"crate_bracing"
@@ -1311,7 +1311,7 @@
"text" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/large_crate/xion
+/datum/decl/closet_appearance/large_crate/xion
color = COLOR_ORANGE
decals = list(
"crate_bracing"
@@ -1320,10 +1320,10 @@
"text" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/large_crate/secure
+/datum/decl/closet_appearance/large_crate/secure
can_lock = TRUE
-/decl/closet_appearance/large_crate/secure/hazard
+/datum/decl/closet_appearance/large_crate/secure/hazard
color = COLOR_NT_RED
decals = list(
"crate_bracing"
@@ -1333,7 +1333,7 @@
"text_upper" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/large_crate/secure/aether
+/datum/decl/closet_appearance/large_crate/secure/aether
color = COLOR_YELLOW_GRAY
decals = list(
"crate_bracing"
@@ -1343,7 +1343,7 @@
"text_upper" = COLOR_BLUE_LIGHT
)
-/decl/closet_appearance/large_crate/secure/einstein
+/datum/decl/closet_appearance/large_crate/secure/einstein
color = COLOR_DARK_BLUE_GRAY
decals = list(
"crate_bracing"
@@ -1353,7 +1353,7 @@
"text_upper" = COLOR_BEIGE
)
-/decl/closet_appearance/large_crate/secure/heph
+/datum/decl/closet_appearance/large_crate/secure/heph
color = COLOR_GRAY20
decals = list(
"crate_bracing"
@@ -1363,7 +1363,7 @@
"text_upper" = COLOR_NT_RED
)
-/decl/closet_appearance/large_crate/secure/xion
+/datum/decl/closet_appearance/large_crate/secure/xion
color = COLOR_ORANGE
decals = list(
"crate_bracing"
@@ -1374,7 +1374,7 @@
)
// Cabinets.
-/decl/closet_appearance/cabinet
+/datum/decl/closet_appearance/cabinet
base_icon = 'icons/obj/closets/bases/cabinet.dmi'
decal_icon = null
color = WOOD_COLOR_RICH
@@ -1382,11 +1382,11 @@
extra_decals = null
door_anim_time = 0
-/decl/closet_appearance/cabinet/secure
+/datum/decl/closet_appearance/cabinet/secure
can_lock = TRUE
// Wall lockers.
-/decl/closet_appearance/wall
+/datum/decl/closet_appearance/wall
base_icon = 'icons/obj/closets/bases/wall.dmi'
decal_icon = 'icons/obj/closets/decals/wall.dmi'
decals = list(
@@ -1395,14 +1395,14 @@
extra_decals = null
door_anim_time = 0
-/decl/closet_appearance/wall/emergency
+/datum/decl/closet_appearance/wall/emergency
color = COLOR_LIGHT_CYAN
decals = null
extra_decals = list(
"glass" = COLOR_WHITE
)
-/decl/closet_appearance/wall/medical
+/datum/decl/closet_appearance/wall/medical
decals = null
color = COLOR_OFF_WHITE
extra_decals = list(
@@ -1411,7 +1411,7 @@
"cross" = COLOR_BLUE_GRAY
)
-/decl/closet_appearance/wall/shipping
+/datum/decl/closet_appearance/wall/shipping
color = COLOR_WARM_YELLOW
decals = null
extra_decals = list(
@@ -1419,7 +1419,7 @@
"glass" = COLOR_WHITE
)
-/decl/closet_appearance/wall/hydrant
+/datum/decl/closet_appearance/wall/hydrant
color = COLOR_RED_LIGHT
decals = null
extra_decals = list(
@@ -1428,7 +1428,7 @@
)
// Wall cabinets
-/decl/closet_appearance/wall_double
+/datum/decl/closet_appearance/wall_double
base_icon = 'icons/obj/closets/bases/wall_double.dmi'
decal_icon = 'icons/obj/closets/decals/wall_double.dmi'
decals = list(
@@ -1437,15 +1437,15 @@
extra_decals = null
door_anim_time = 0
-/decl/closet_appearance/wall_double/kitchen
+/datum/decl/closet_appearance/wall_double/kitchen
decals = null
color = COLOR_OFF_WHITE
-/decl/closet_appearance/wall_double/wooden
+/datum/decl/closet_appearance/wall_double/wooden
decals = null
color = WOOD_COLOR_RICH
-/decl/closet_appearance/wall_double/medical
+/datum/decl/closet_appearance/wall_double/medical
decals = null
color = COLOR_OFF_WHITE
extra_decals = list(
@@ -1454,7 +1454,7 @@
"cross" = COLOR_BLUE_GRAY
)
-/decl/closet_appearance/wall_double/fire_safety
+/datum/decl/closet_appearance/wall_double/fire_safety
color = COLOR_RED_LIGHT
decals = null
extra_decals = list(
@@ -1462,14 +1462,14 @@
"glass" = COLOR_WHITE
)
-/decl/closet_appearance/wall_double/survival
+/datum/decl/closet_appearance/wall_double/survival
color = COLOR_CYAN_BLUE
decals = null
extra_decals = list(
"stripe_outer" = COLOR_WHITE
)
-/decl/closet_appearance/wall_double/emergency_engi
+/datum/decl/closet_appearance/wall_double/emergency_engi
color = COLOR_YELLOW_GRAY
decals = null
extra_decals = list(
@@ -1478,7 +1478,7 @@
"glass" = COLOR_WHITE
)
-/decl/closet_appearance/wall_double/security
+/datum/decl/closet_appearance/wall_double/security
color = COLOR_NT_RED
decals = null
extra_decals = list(
@@ -1486,10 +1486,10 @@
"vertical_stripe_left_m" = COLOR_WARM_YELLOW
)
-/decl/closet_appearance/wall_double/cargo
+/datum/decl/closet_appearance/wall_double/cargo
color = COLOR_WARM_YELLOW
-/decl/closet_appearance/wall_double/gaming
+/datum/decl/closet_appearance/wall_double/gaming
color = COLOR_DARK_BLUE_GRAY
decals = null
extra_decals = list(
@@ -1497,7 +1497,7 @@
"glass" = COLOR_WHITE
)
-/decl/closet_appearance/wall_double/science
+/datum/decl/closet_appearance/wall_double/science
decals = list(
"holes"
)
@@ -1507,7 +1507,7 @@
"stripe_inner_middle" = COLOR_PURPLE
)
-/decl/closet_appearance/wall_double/command
+/datum/decl/closet_appearance/wall_double/command
decals = list(
"holes_right"
)
@@ -1518,7 +1518,7 @@
"vertical_stripe_left_r" = COLOR_GOLD
)
-/decl/closet_appearance/wall_double/ce
+/datum/decl/closet_appearance/wall_double/ce
decals = list(
"holes_right"
)
@@ -1529,7 +1529,7 @@
"vertical_stripe_left_r" = COLOR_DARK_GOLD
)
-/decl/closet_appearance/wall_double/rd
+/datum/decl/closet_appearance/wall_double/rd
decals = list(
"holes_right"
)
@@ -1540,7 +1540,7 @@
"vertical_stripe_left_r" = COLOR_PURPLE
)
-/decl/closet_appearance/wall_double/cmo
+/datum/decl/closet_appearance/wall_double/cmo
decals = list(
"holes_right"
)
@@ -1551,7 +1551,7 @@
"vertical_stripe_left_r" = COLOR_GOLD
)
-/decl/closet_appearance/wall_double/hos
+/datum/decl/closet_appearance/wall_double/hos
decals = list(
"holes_right"
)
@@ -1562,7 +1562,7 @@
"vertical_stripe_left_r" = COLOR_GOLD
)
-/decl/closet_appearance/wall_double/iaa
+/datum/decl/closet_appearance/wall_double/iaa
decals = list(
"holes_right"
)
@@ -1573,16 +1573,16 @@
"vertical_stripe_left_r" = COLOR_GOLD
)
-/decl/closet_appearance/wall_double/engineering
+/datum/decl/closet_appearance/wall_double/engineering
decals = list(
"holes"
)
color = COLOR_YELLOW_GRAY
-/decl/closet_appearance/wall_double/generic_civ
+/datum/decl/closet_appearance/wall_double/generic_civ
color = COLOR_DARK_BLUE_GRAY
-/decl/closet_appearance/wall_double/casino
+/datum/decl/closet_appearance/wall_double/casino
color = COLOR_GRAY20
decals = null
extra_decals = list(
@@ -1592,7 +1592,7 @@
)
// Carts
-/decl/closet_appearance/cart
+/datum/decl/closet_appearance/cart
color = COLOR_GRAY20
base_icon = 'icons/obj/closets/bases/cart.dmi'
decal_icon = 'icons/obj/closets/decals/cart.dmi'
@@ -1600,36 +1600,36 @@
extra_decals = null
door_anim_time = 0
-/decl/closet_appearance/cart/trash
+/datum/decl/closet_appearance/cart/trash
color = COLOR_BOTTLE_GREEN
-/decl/closet_appearance/cart/biohazard
+/datum/decl/closet_appearance/cart/biohazard
can_lock = TRUE
decals = list(
"biohazard" = COLOR_GRAY80
)
-/decl/closet_appearance/cart/biohazard/alt
+/datum/decl/closet_appearance/cart/biohazard/alt
color = COLOR_SURGERY_BLUE
decals = list(
"biohazard" = COLOR_RED_GRAY
)
// From the Torch
-/decl/closet_appearance/secure_closet/exploration // These three renamed since Polaris actually uses these
+/datum/decl/closet_appearance/secure_closet/exploration // These three renamed since Polaris actually uses these
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_PURPLE,
"exped" = COLOR_PURPLE
)
-/decl/closet_appearance/secure_closet/exploration/pilot
+/datum/decl/closet_appearance/secure_closet/exploration/pilot
extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE,
"stripe_vertical_right_full" = COLOR_PURPLE,
"exped" = COLOR_PURPLE
)
-/decl/closet_appearance/secure_closet/exploration/pathfinder
+/datum/decl/closet_appearance/secure_closet/exploration/pathfinder
extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE,
"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
@@ -1637,25 +1637,25 @@
"exped" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/torch/command
+/datum/decl/closet_appearance/secure_closet/torch/command
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/torch/command/bo
+/datum/decl/closet_appearance/secure_closet/torch/command/bo
extra_decals = list(
"stripe_vertical_left_full" = COLOR_CLOSET_GOLD,
"stripe_vertical_right_full" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/torch/command/xo
+/datum/decl/closet_appearance/secure_closet/torch/command/xo
extra_decals = list(
"stripe_vertical_left_full" = COLOR_CLOSET_GOLD,
"stripe_vertical_right_full" = COLOR_CLOSET_GOLD,
"command" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/torch/command/co
+/datum/decl/closet_appearance/secure_closet/torch/command/co
extra_decals = list(
"stripe_vertical_left_full" = COLOR_CLOSET_GOLD,
"stripe_vertical_mid_full" = COLOR_OFF_WHITE,
@@ -1663,27 +1663,27 @@
"command" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/secure_closet/torch/engineering
+/datum/decl/closet_appearance/secure_closet/torch/engineering
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_WARM_YELLOW,
"exped" = COLOR_WARM_YELLOW
)
-/decl/closet_appearance/secure_closet/torch/engineering/atmos
+/datum/decl/closet_appearance/secure_closet/torch/engineering/atmos
extra_decals = list(
"stripe_vertical_right_full" = COLOR_WARM_YELLOW,
"stripe_vertical_mid_full" = COLOR_CYAN_BLUE,
"atmos_upper" = COLOR_WARM_YELLOW
)
-/decl/closet_appearance/secure_closet/torch/engineering/se
+/datum/decl/closet_appearance/secure_closet/torch/engineering/se
extra_decals = list(
"stripe_vertical_left_full" = COLOR_WARM_YELLOW,
"stripe_vertical_right_full" = COLOR_WARM_YELLOW,
"exped" = COLOR_WARM_YELLOW
)
-/decl/closet_appearance/secure_closet/torch/engineering/ce
+/datum/decl/closet_appearance/secure_closet/torch/engineering/ce
extra_decals = list(
"stripe_vertical_left_full" = COLOR_WARM_YELLOW,
"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
@@ -1691,20 +1691,20 @@
"exped" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/torch/medical
+/datum/decl/closet_appearance/secure_closet/torch/medical
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_BABY_BLUE,
"medical" = COLOR_BABY_BLUE
)
-/decl/closet_appearance/secure_closet/torch/medical/physician
+/datum/decl/closet_appearance/secure_closet/torch/medical/physician
extra_decals = list(
"stripe_vertical_left_full" = COLOR_BABY_BLUE,
"stripe_vertical_right_full" = COLOR_BABY_BLUE,
"medical" = COLOR_BABY_BLUE
)
-/decl/closet_appearance/secure_closet/torch/medical/cmo
+/datum/decl/closet_appearance/secure_closet/torch/medical/cmo
extra_decals = list(
"stripe_vertical_left_full" = COLOR_BABY_BLUE,
"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
@@ -1712,40 +1712,40 @@
"medical" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/torch/sol
+/datum/decl/closet_appearance/secure_closet/torch/sol
color = COLOR_BABY_BLUE
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/secure_closet/torch/sol/rep
+/datum/decl/closet_appearance/secure_closet/torch/sol/rep
color = COLOR_BABY_BLUE
extra_decals = list(
"stripe_vertical_left_full" = COLOR_OFF_WHITE,
"stripe_vertical_right_full" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/secure_closet/torch/corporate
+/datum/decl/closet_appearance/secure_closet/torch/corporate
color = COLOR_BOTTLE_GREEN
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/secure_closet/torch/corporate/liaison
+/datum/decl/closet_appearance/secure_closet/torch/corporate/liaison
extra_decals = list(
"stripe_vertical_left_full" = COLOR_OFF_WHITE,
"stripe_vertical_right_full" = COLOR_OFF_WHITE,
"command" = COLOR_OFF_WHITE
)
-/decl/closet_appearance/secure_closet/torch/science
+/datum/decl/closet_appearance/secure_closet/torch/science
extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE_GRAY,
"stripe_vertical_right_full" = COLOR_PURPLE_GRAY,
"research" = COLOR_PURPLE_GRAY
)
-/decl/closet_appearance/secure_closet/torch/science/cso
+/datum/decl/closet_appearance/secure_closet/torch/science/cso
color = COLOR_BOTTLE_GREEN
decals = list(
"lower_holes"
@@ -1757,26 +1757,26 @@
"research" = COLOR_GOLD
)
-/decl/closet_appearance/secure_closet/torch/security
+/datum/decl/closet_appearance/secure_closet/torch/security
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_NT_RED,
"security" = COLOR_NT_RED
)
-/decl/closet_appearance/secure_closet/torch/security/forensics
+/datum/decl/closet_appearance/secure_closet/torch/security/forensics
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_NT_RED,
"forensics" = COLOR_NT_RED
)
-/decl/closet_appearance/secure_closet/torch/security/warden
+/datum/decl/closet_appearance/secure_closet/torch/security/warden
extra_decals = list(
"stripe_vertical_left_full" = COLOR_NT_RED,
"stripe_vertical_right_full" = COLOR_NT_RED,
"security" = COLOR_NT_RED
)
-/decl/closet_appearance/secure_closet/torch/security/hos
+/datum/decl/closet_appearance/secure_closet/torch/security/hos
extra_decals = list(
"stripe_vertical_left_full" = COLOR_NT_RED,
"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
@@ -1784,27 +1784,27 @@
"security" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/torch/hydroponics
+/datum/decl/closet_appearance/secure_closet/torch/hydroponics
extra_decals = list(
"stripe_vertical_right_partial" = COLOR_GREEN_GRAY,
"stripe_vertical_mid_partial" = COLOR_GREEN_GRAY,
"hydro" = COLOR_GREEN_GRAY
)
-/decl/closet_appearance/secure_closet/torch/cargo
+/datum/decl/closet_appearance/secure_closet/torch/cargo
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_BEASTY_BROWN,
"cargo_upper" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/torch/cargo/worker
+/datum/decl/closet_appearance/secure_closet/torch/cargo/worker
extra_decals = list(
"stripe_vertical_left_full" = COLOR_BEASTY_BROWN,
"stripe_vertical_right_full" = COLOR_BEASTY_BROWN,
"cargo_upper" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/torch/cargo/deck_officer
+/datum/decl/closet_appearance/secure_closet/torch/cargo/deck_officer
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
"stripe_vertical_left_full" = COLOR_BEASTY_BROWN,
@@ -1812,7 +1812,7 @@
"cargo_upper" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/wall_double/autolok
+/datum/decl/closet_appearance/wall_double/autolok
color = COLOR_GRAY20
decals = null
extra_decals = list(
@@ -1822,64 +1822,64 @@
//TALON
-/decl/closet_appearance/secure_closet/talon
+/datum/decl/closet_appearance/secure_closet/talon
color = COLOR_GRAY80
decals = list(
"lower_holes"
)
-/decl/closet_appearance/secure_closet/talon/engineer
+/datum/decl/closet_appearance/secure_closet/talon/engineer
extra_decals = list(
"stripes_horizontal" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/talon/guard
+/datum/decl/closet_appearance/secure_closet/talon/guard
extra_decals = list(
"stripes_horizontal" = COLOR_NT_RED
)
-/decl/closet_appearance/secure_closet/talon/pilot
+/datum/decl/closet_appearance/secure_closet/talon/pilot
extra_decals = list(
"stripes_horizontal" = COLOR_PURPLE
)
-/decl/closet_appearance/secure_closet/talon/doctor
+/datum/decl/closet_appearance/secure_closet/talon/doctor
extra_decals = list(
"stripes_horizontal" = COLOR_SKY_BLUE
)
-/decl/closet_appearance/secure_closet/talon/miner
+/datum/decl/closet_appearance/secure_closet/talon/miner
extra_decals = list(
"stripes_horizontal" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/talon/captain
+/datum/decl/closet_appearance/secure_closet/talon/captain
extra_decals = list(
"stripes_horizontal" = COLOR_GOLD
)
//END TALON
-/decl/closet_appearance/secure_closet/nanotrasen
+/datum/decl/closet_appearance/secure_closet/nanotrasen
color = COLOR_BOTTLE_GREEN
decals = list(
"lower_holes"
)
-/decl/closet_appearance/secure_closet/nanotrasen/security
+/datum/decl/closet_appearance/secure_closet/nanotrasen/security
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_NAVY_BLUE,
"nanotrasen" = COLOR_GOLD
)
-/decl/closet_appearance/secure_closet/nanotrasen/warden
+/datum/decl/closet_appearance/secure_closet/nanotrasen/warden
extra_decals = list(
"stripe_vertical_left_full" = COLOR_NAVY_BLUE,
"stripe_vertical_right_full" = COLOR_NAVY_BLUE,
"nanotrasen" = COLOR_GOLD
)
-/decl/closet_appearance/secure_closet/nanotrasen/commander
+/datum/decl/closet_appearance/secure_closet/nanotrasen/commander
extra_decals = list(
"stripe_vertical_left_full" = COLOR_NAVY_BLUE,
"stripe_vertical_mid_full" = COLOR_GOLD,
@@ -1887,43 +1887,43 @@
"nanotrasen" = COLOR_GOLD
)
-/decl/closet_appearance/secure_closet/expedition
+/datum/decl/closet_appearance/secure_closet/expedition
color = COLOR_OLIVE
decals = list(
"lower_side_vent"
)
-/decl/closet_appearance/secure_closet/expedition/pilot
+/datum/decl/closet_appearance/secure_closet/expedition/pilot
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_DARK_ORANGE,
"exped" = COLOR_DARK_ORANGE
)
-/decl/closet_appearance/secure_closet/expedition/sar
+/datum/decl/closet_appearance/secure_closet/expedition/sar
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_SAN_MARINO_BLUE,
"exped" = COLOR_SAN_MARINO_BLUE
)
-/decl/closet_appearance/secure_closet/expedition/explorer
+/datum/decl/closet_appearance/secure_closet/expedition/explorer
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_GRAY40,
"exped" = COLOR_GRAY40
)
-/decl/closet_appearance/secure_closet/expedition/pathfinder
+/datum/decl/closet_appearance/secure_closet/expedition/pathfinder
extra_decals = list(
"stripe_vertical_left_full" = COLOR_GRAY20,
"stripe_vertical_right_full" = COLOR_GRAY20,
"exped" = COLOR_GRAY20
)
-/decl/closet_appearance/crate/fennec
+/datum/decl/closet_appearance/crate/fennec
base_icon = 'icons/obj/closets/bases/fencrate_vr.dmi'
decal_icon = 'icons/obj/closets/decals/crate.dmi'
color = "#ffffff"
-/decl/closet_appearance/crate/coyotesalvage
+/datum/decl/closet_appearance/crate/coyotesalvage
color = COLOR_GOLD
extra_decals = list(
"full_lid" = COLOR_BLACK,
@@ -1931,14 +1931,14 @@
"crate_stripe_right" = COLOR_WALL_GUNMETAL
)
-/decl/closet_appearance/crate/nukies
+/datum/decl/closet_appearance/crate/nukies
color = COLOR_NUKIES_GREEN
extra_decals = list(
"lid_stripes" = COLOR_NUKIES_YELLOW,
"hazard" = COLOR_NUKIES_YELLOW
)
-/decl/closet_appearance/crate/desatti
+/datum/decl/closet_appearance/crate/desatti
color = COLOR_DESATTI_PRPLOW
extra_decals = list(
"lid_stripes" = COLOR_DESATTI_PRPHI
diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm
index 930b9ce905..3d05b27aee 100644
--- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm
+++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm
@@ -1,4 +1,4 @@
-/decl/closet_appearance/medical_yw
+/datum/decl/closet_appearance/medical_yw
color = COLOR_OFF_WHITE
decals = null
extra_decals = list(
@@ -6,14 +6,14 @@
"stripes_horizontal" = COLOR_BLUE_GRAY
)
-/decl/closet_appearance/wall/autolok/shuttleemerg
+/datum/decl/closet_appearance/wall/autolok/shuttleemerg
color = COLOR_YELLOW_GRAY
decals = list(
"upper_side_vent",
"lower_side_vent"
)
-/decl/closet_appearance/secure_closet/lumber
+/datum/decl/closet_appearance/secure_closet/lumber
can_lock = FALSE
color = COLOR_WARM_YELLOW
decals = list(
@@ -25,7 +25,7 @@
"stripe_vertical_left_full" = COLOR_BEASTY_BROWN
)
-/decl/closet_appearance/secure_closet/blueshield
+/datum/decl/closet_appearance/secure_closet/blueshield
color = COLOR_PALE_BLUE_GRAY
decals = list("lower_side_vent")
extra_decals = list(
@@ -33,7 +33,7 @@
"command" = COLOR_CLOSET_GOLD
)
-/decl/closet_appearance/secure_closet/security_pilot
+/datum/decl/closet_appearance/secure_closet/security_pilot
color = COLOR_NT_RED
decals = list(
"lower_holes"
diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
index d649f86570..a2e7ef7e23 100644
--- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
@@ -1,4 +1,4 @@
/obj/structure/closet/crate/critter
name = "critter crate"
desc = "A crate which can sustain life for a while."
- closet_appearance = /decl/closet_appearance/large_crate/critter
+ closet_appearance = /datum/decl/closet_appearance/large_crate/critter
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index 5e725b076c..b9e9a8594d 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/athletic_mixed
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
- closet_appearance = /decl/closet_appearance/wardrobe/mixed
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/under/shorts/grey,
@@ -30,7 +30,7 @@
/obj/structure/closet/athletic_swimwear
name = "athletic wardrobe"
desc = "It's a storage unit for swimwear."
- closet_appearance = /decl/closet_appearance/wardrobe/mixed
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/under/shorts/grey,
@@ -52,7 +52,7 @@
/obj/structure/closet/boxinggloves
name = "boxing gloves"
desc = "It's a storage unit for gloves for use in the boxing ring."
- closet_appearance = /decl/closet_appearance/wardrobe/mixed
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/gloves/boxing/blue,
@@ -63,7 +63,7 @@
/obj/structure/closet/masks
name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
- closet_appearance = /decl/closet_appearance/wardrobe/mixed
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/mask/luchador,
@@ -74,7 +74,7 @@
/obj/structure/closet/lasertag/red
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- closet_appearance = /decl/closet_appearance/wardrobe/red
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/red
starts_with = list(
/obj/item/gun/energy/lasertag/red = 5,
@@ -87,7 +87,7 @@
/obj/structure/closet/lasertag/blue
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- closet_appearance = /decl/closet_appearance/wardrobe/blue
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/blue
starts_with = list(
/obj/item/gun/energy/lasertag/blue = 5,
@@ -99,7 +99,7 @@
/obj/structure/closet/lasertag/omni
name = "unniversal laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- closet_appearance = /decl/closet_appearance/wardrobe/purple
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/purple
starts_with = list(
/obj/item/gun/energy/lasertag/omni = 5,
@@ -111,7 +111,7 @@
/obj/structure/closet/lasertag/red/laserdome
name = "red team laserdome equipment"
desc = "It's a storage unit for laser tag equipment."
- closet_appearance = /decl/closet_appearance/wardrobe/red
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/red
starts_with = list(
/obj/item/encryptionkey/ent = 3,
@@ -125,7 +125,7 @@
/obj/structure/closet/lasertag/blue/laserdome
name = "blue team laserdome equipment"
desc = "It's a storage unit for laser tag equipment."
- closet_appearance = /decl/closet_appearance/wardrobe/blue
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/blue
starts_with = list(
/obj/item/encryptionkey/ent = 3,
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 1342b4e18e..5357ff731c 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -2,7 +2,7 @@
name = "cabinet"
desc = "Old will forever be in fashion."
icon = 'icons/obj/closets/bases/cabinet.dmi'
- closet_appearance = /decl/closet_appearance/cabinet
+ closet_appearance = /datum/decl/closet_appearance/cabinet
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
@@ -11,7 +11,7 @@
/obj/structure/closet/acloset
name = "strange closet"
desc = "It looks alien!"
- closet_appearance = /decl/closet_appearance/alien
+ closet_appearance = /datum/decl/closet_appearance/alien
open_sound = 'sound/machines/click.ogg'
close_sound = 'sound/machines/click.ogg'
@@ -19,13 +19,13 @@
/obj/structure/closet/gimmick
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
- closet_appearance = /decl/closet_appearance/tactical
+ closet_appearance = /datum/decl/closet_appearance/tactical
anchored = FALSE
/obj/structure/closet/gimmick/russian
name = "russian surplus closet"
desc = "It's a storage unit for Russian standard-issue surplus."
- closet_appearance = /decl/closet_appearance/tactical
+ closet_appearance = /datum/decl/closet_appearance/tactical
starts_with = list(
/obj/item/clothing/head/ushanka = 5,
@@ -35,7 +35,7 @@
/obj/structure/closet/gimmick/tacticool
name = "tacticool gear closet"
desc = "It's a storage unit for Tacticool gear."
- closet_appearance = /decl/closet_appearance/tactical
+ closet_appearance = /datum/decl/closet_appearance/tactical
starts_with = list(
/obj/item/clothing/glasses/eyepatch,
@@ -51,7 +51,7 @@
/obj/structure/closet/thunderdome
name = "\improper Thunderdome closet"
desc = "Everything you need!"
- closet_appearance = /decl/closet_appearance/thunderdomered
+ closet_appearance = /datum/decl/closet_appearance/thunderdomered
anchored = TRUE
/obj/structure/closet/thunderdome/tdred
@@ -67,7 +67,7 @@
/obj/structure/closet/thunderdome/tdgreen
name = "green-team Thunderdome closet"
- closet_appearance = /decl/closet_appearance/thunderdomegreen
+ closet_appearance = /datum/decl/closet_appearance/thunderdomegreen
starts_with = list(
/obj/item/clothing/suit/armor/tdome/green = 3,
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 1532531958..e742cce0b7 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -19,7 +19,7 @@
/obj/structure/closet/gmcloset
name = "formal closet"
desc = "It's a storage unit for formal clothing."
- closet_appearance = /decl/closet_appearance/wardrobe/suit
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/suit
starts_with = list(
/obj/item/clothing/head/that = 2,
@@ -48,7 +48,7 @@
/obj/structure/closet/chefcloset
name = "chef's closet"
desc = "It's a storage unit for foodservice garments."
- closet_appearance = /decl/closet_appearance/wardrobe/white
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/sundress,
@@ -68,7 +68,7 @@
/obj/structure/closet/jcloset
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
- closet_appearance = /decl/closet_appearance/wardrobe/janitor
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/janitor
starts_with = list(
/obj/item/clothing/under/rank/janitor,
@@ -98,7 +98,7 @@
/obj/structure/closet/lawcloset
name = "legal closet"
desc = "It's a storage unit for courtroom apparel and items."
- closet_appearance = /decl/closet_appearance/wardrobe/suit
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/suit
starts_with = list(
/obj/item/clothing/under/lawyer/female = 2,
@@ -128,7 +128,7 @@
/obj/structure/closet/jequipcloset
name = "custodial equipment closet"
desc = "It's a storage unit for janitorial clothes and gear."
- closet_appearance = /decl/closet_appearance/wardrobe/janitor
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/janitor
starts_with = list(
/obj/item/flashlight = 5,
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index 93ac66fb3a..f98cc8ed31 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -1,10 +1,10 @@
/obj/structure/closet/l3closet
name = "level-3 biohazard suit closet"
desc = "It's a storage unit for level-3 biohazard gear."
- closet_appearance = /decl/closet_appearance/bio
+ closet_appearance = /datum/decl/closet_appearance/bio
/obj/structure/closet/l3closet/general
- closet_appearance = /decl/closet_appearance/bio
+ closet_appearance = /datum/decl/closet_appearance/bio
starts_with = list(
/obj/item/clothing/suit/bio_suit/general = 2, // CHOMP Block Edit Start
@@ -14,7 +14,7 @@
/obj/structure/closet/l3closet/virology
- closet_appearance = /decl/closet_appearance/bio/virology
+ closet_appearance = /datum/decl/closet_appearance/bio/virology
starts_with = list(
// CHOMPEdit Start
@@ -26,7 +26,7 @@
/obj/structure/closet/l3closet/security
- closet_appearance = /decl/closet_appearance/bio/security
+ closet_appearance = /datum/decl/closet_appearance/bio/security
starts_with = list(
/obj/item/clothing/suit/bio_suit/security = 2, // CHOMP Block Edit Start
@@ -35,7 +35,7 @@
/obj/item/tank/oxygen = 2) // CHOMP Block Edit End
/obj/structure/closet/l3closet/janitor
- closet_appearance = /decl/closet_appearance/bio/janitor
+ closet_appearance = /datum/decl/closet_appearance/bio/janitor
starts_with = list(
/obj/item/clothing/suit/bio_suit/janitor = 2,
@@ -45,7 +45,7 @@
/obj/structure/closet/l3closet/scientist
- closet_appearance = /decl/closet_appearance/bio/science
+ closet_appearance = /datum/decl/closet_appearance/bio/science
starts_with = list(
/obj/item/clothing/suit/bio_suit/scientist = 2, // CHOMP Block Edit Start
@@ -65,7 +65,7 @@
/obj/structure/closet/l3closet/medical
- closet_appearance = /decl/closet_appearance/bio/medical
+ closet_appearance = /datum/decl/closet_appearance/bio/medical
starts_with = list(
/obj/item/clothing/suit/bio_suit/general = 3,
diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm
index f877b54e30..93e36a00a7 100644
--- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm
+++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/malf/suits
desc = "It's a storage unit for operational gear."
- closet_appearance = /decl/closet_appearance/tactical
+ closet_appearance = /datum/decl/closet_appearance/tactical
starts_with = list(
/obj/item/tank/jetpack/void,
diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
index 613df97ab6..ad995fa11d 100644
--- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
@@ -53,7 +53,7 @@
/obj/structure/closet/secure_closet/explorer
name = "explorer locker" //CHOMP explo keep
req_access = list(ACCESS_EXPLORER)
- closet_appearance = /decl/closet_appearance/secure_closet/expedition/explorer
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/expedition/explorer
starts_with = list(
/obj/item/clothing/under/explorer,
@@ -94,7 +94,7 @@
/obj/structure/closet/secure_closet/pathfinder
name = "pathfinder locker"
req_access = list(ACCESS_PATHFINDER) //CHOMP explo keep
- closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/expedition/pathfinder
starts_with = list(
/obj/item/clothing/under/explorer,
@@ -142,7 +142,7 @@
name = "field medic locker"
desc = "Supplies for a wilderness first responder."
req_access = list(ACCESS_MEDICAL_EQUIP)
- closet_appearance = /decl/closet_appearance/secure_closet/expedition/sar
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/expedition/sar
starts_with = list(
/obj/item/storage/backpack/dufflebag/emt,
@@ -194,7 +194,7 @@
/obj/structure/closet/secure_closet/pilot
name = "pilot locker"
req_access = list(ACCESS_PILOT)
- closet_appearance = /decl/closet_appearance/secure_closet/expedition/pilot
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/expedition/pilot
starts_with = list(
/obj/item/storage/backpack/parachute,
@@ -254,7 +254,7 @@
name = "autolok suit storage"
desc = "It's wall-mounted storage unit for an AutoLok suit."
icon = 'icons/obj/closets/bases/wall_double.dmi'
- closet_appearance = /decl/closet_appearance/wall_double/autolok
+ closet_appearance = /datum/decl/closet_appearance/wall_double/autolok
open_sound = 'sound/machines/click.ogg'
close_sound = 'sound/machines/click.ogg'
anchored = TRUE
@@ -275,7 +275,7 @@
name = "emergency suit storage"
desc = "It's wall-mounted storage unit for an emergency suit."
icon = 'icons/obj/closets/bases/wall.dmi'
- closet_appearance = /decl/closet_appearance/wall/emergency
+ closet_appearance = /datum/decl/closet_appearance/wall/emergency
open_sound = 'sound/machines/click.ogg'
close_sound = 'sound/machines/click.ogg'
anchored = TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index e62545cb29..28af756d46 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/bar
name = "booze closet"
req_access = list(ACCESS_BAR)
- closet_appearance = /decl/closet_appearance/cabinet/secure
+ closet_appearance = /datum/decl/closet_appearance/cabinet/secure
starts_with = list(
/obj/item/reagent_containers/food/drinks/bottle/small/beer = 10)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 9f90c9148a..97a8fc13c4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/cargotech
name = "cargo technician's locker"
req_access = list(ACCESS_CARGO)
- closet_appearance = /decl/closet_appearance/secure_closet/cargo
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/cargo
starts_with = list(
/obj/item/clothing/under/rank/cargotech,
@@ -30,7 +30,7 @@
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
req_access = list(ACCESS_QM)
- closet_appearance = /decl/closet_appearance/secure_closet/cargo/qm
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/cargo/qm
starts_with = list(
/obj/item/clothing/under/rank/cargo,
@@ -72,7 +72,7 @@
/obj/structure/closet/secure_closet/miner
name = "miner's equipment"
req_access = list(ACCESS_MINING)
- closet_appearance = /decl/closet_appearance/secure_closet/mining
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/mining
starts_with = list(
/obj/item/radio/headset/miner,
@@ -105,7 +105,7 @@
/obj/structure/closet/lumber
name = "Lumberjack's equipment"
desc = "It's a storage unit for Lumberjack equpiment, though it seems the lock is broken."
- closet_appearance = /decl/closet_appearance/secure_closet/lumber
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/lumber
starts_with = list(
/obj/item/radio/headset/miner,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index c9ff6d94d6..6b08708e06 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
req_access = list(ACCESS_CE)
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
@@ -54,7 +54,7 @@
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies"
req_access = list(ACCESS_ENGINE_EQUIP)
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/electrical
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/electrical
starts_with = list(
/obj/item/clothing/gloves/yellow = 2,
@@ -72,7 +72,7 @@
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies"
req_access = list(ACCESS_CONSTRUCTION)
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/welding
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/welding
starts_with = list(
/obj/item/clothing/head/welding = 3,
@@ -90,7 +90,7 @@
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(ACCESS_ENGINE_EQUIP)
- closet_appearance = /decl/closet_appearance/secure_closet/engineering
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
@@ -124,7 +124,7 @@
/obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker"
req_access = list(ACCESS_ATMOSPHERICS)
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/atmos
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/atmos
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index cdd12e1c03..b370599bd3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/hydroponics
name = "botanist's locker"
req_access = list(ACCESS_HYDROPONICS)
- closet_appearance = /decl/closet_appearance/secure_closet/hydroponics
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/hydroponics
starts_with = list(
/obj/item/storage/bag/plants,
@@ -33,7 +33,7 @@
/obj/structure/closet/secure_closet/hydroponics/sci
name = "xenoflorist's locker"
req_access = list(ACCESS_XENOBIOLOGY)
- closet_appearance = /decl/closet_appearance/secure_closet/hydroponics/xenoflora
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/hydroponics/xenoflora
/obj/structure/closet/secure_closet/hydroponics/sci/Initialize(mapload)
starts_with += /obj/item/clothing/head/bio_hood/scientist
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index f6aa2cc9b9..cab162e5a4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -2,7 +2,7 @@
name = "medicine closet"
desc = "Filled with medical junk."
req_access = list(ACCESS_MEDICAL)
- closet_appearance = /decl/closet_appearance/secure_closet/medical/alt
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/medical/alt
starts_with = list(
/obj/item/storage/box/autoinjectors,
@@ -16,7 +16,7 @@
name = "anesthetics closet"
desc = "Used to knock people out."
req_access = list(ACCESS_SURGERY)
- closet_appearance = /decl/closet_appearance/secure_closet/medical
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/medical
starts_with = list(
/obj/item/tank/anesthetic = 3,
@@ -26,7 +26,7 @@
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
req_access = list(ACCESS_MEDICAL_EQUIP)
- closet_appearance = /decl/closet_appearance/secure_closet/medical/doctor
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/medical/doctor
starts_with = list(
/obj/item/clothing/under/rank/medical,
@@ -94,7 +94,7 @@
name = "paramedic locker"
desc = "Supplies for a first responder."
req_access = list(ACCESS_MEDICAL_EQUIP)
- closet_appearance = /decl/closet_appearance/secure_closet/medical/paramedic
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/medical/paramedic
starts_with = list(
/obj/item/storage/backpack/dufflebag/emt,
@@ -128,7 +128,7 @@
/obj/structure/closet/secure_closet/chief_medical_officer
name = "chief medical officer's locker"
req_access = list(ACCESS_CMO)
- closet_appearance = /decl/closet_appearance/secure_closet/cmo
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/cmo
starts_with = list(
/obj/item/clothing/under/rank/chief_medical_officer,
@@ -203,7 +203,7 @@
name = "chemical closet"
desc = "Store dangerous chemicals in here."
req_access = list(ACCESS_CHEMISTRY)
- closet_appearance = /decl/closet_appearance/secure_closet/medical/chemistry
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/medical/chemistry
starts_with = list(
/obj/item/storage/box/pillbottles = 2,
@@ -220,7 +220,7 @@
name = "psychiatric cabinet"
desc = "Store psychology tools and medicines in here."
req_access = list(ACCESS_PSYCHIATRIST)
- closet_appearance = /decl/closet_appearance/cabinet/secure
+ closet_appearance = /datum/decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
@@ -251,7 +251,7 @@
wall_mounted = 1
store_mobs = 0
req_access = list(ACCESS_MEDICAL_EQUIP)
- closet_appearance = /decl/closet_appearance/wall/medical
+ closet_appearance = /datum/decl/closet_appearance/wall/medical
/obj/structure/closet/secure_closet/medical_wall/pills
name = "pill cabinet"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 8079757776..c194e6ec65 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -20,7 +20,7 @@
/obj/structure/closet/secure_closet/personal/patient
name = "patient's closet"
- closet_appearance = /decl/closet_appearance/secure_closet/patient
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/patient
starts_with = list(
/obj/item/clothing/under/medigown,
@@ -29,7 +29,7 @@
/obj/structure/closet/secure_closet/personal/cabinet
- closet_appearance = /decl/closet_appearance/cabinet/secure
+ closet_appearance = /datum/decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 3f4c742817..9668209759 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/scientist
name = "scientist's locker"
req_access = list(ACCESS_TOX_STORAGE)
- closet_appearance = /decl/closet_appearance/secure_closet/science
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/science
starts_with = list(
/obj/item/clothing/under/rank/scientist,
@@ -24,7 +24,7 @@
/obj/structure/closet/secure_closet/research_director
name = "research director's locker"
req_access = list(ACCESS_RD)
- closet_appearance = /decl/closet_appearance/secure_closet/science/rd
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/science/rd
starts_with = list(
/obj/item/clothing/suit/bio_suit/scientist,
@@ -59,7 +59,7 @@
/obj/structure/closet/secure_closet/xenoarchaeologist
name = "Xenoarchaeologist Locker"
req_access = list(ACCESS_TOX_STORAGE)
- closet_appearance = /decl/closet_appearance/secure_closet/science/xenoarch
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/science/xenoarch
starts_with = list(
/obj/item/clothing/under/rank/scientist,
@@ -76,7 +76,7 @@
/obj/structure/closet/excavation
name = "Excavation tools"
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools/xenoarch
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/tools/xenoarch
starts_with = list(
/obj/item/storage/belt/archaeology,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 22cfc4d66c..3ddf1cc052 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -12,7 +12,7 @@
health = 200
anchored = 1 //CHOMPADD - Making them properly IMMOBILE. Like the Desc says? Yeah...
- closet_appearance = /decl/closet_appearance/secure_closet
+ closet_appearance = /datum/decl/closet_appearance/secure_closet
/obj/structure/closet/secure_closet/can_open()
if(locked)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 577fe5d35b..d801e00341 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/captains
name = "site manager's locker"
req_access = list(ACCESS_CAPTAIN)
- closet_appearance = /decl/closet_appearance/secure_closet/command
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/command
starts_with = list(
/obj/item/storage/backpack/dufflebag/captain,
@@ -21,7 +21,7 @@
/obj/structure/closet/secure_closet/hop
name = "head of personnel's locker"
req_access = list(ACCESS_HOP)
- closet_appearance = /decl/closet_appearance/secure_closet/command/hop
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/command/hop
starts_with = list(
/obj/item/clothing/suit/storage/vest,
@@ -41,7 +41,7 @@
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
req_access = list(ACCESS_HOP)
- closet_appearance = /decl/closet_appearance/secure_closet/command/hop
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/command/hop
starts_with = list(
/obj/item/clothing/under/rank/head_of_personnel,
@@ -81,7 +81,7 @@
name = "head of security's locker"
req_access = list(ACCESS_HOS)
storage_capacity = 2.6 * MOB_MEDIUM
- closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/security/hos
starts_with = list(
/obj/item/clothing/head/helmet/HoS,
@@ -137,7 +137,7 @@
name = "warden's locker"
storage_capacity = 42
req_access = list(ACCESS_ARMORY)
- closet_appearance = /decl/closet_appearance/secure_closet/security/warden
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/security/warden
starts_with = list(
/obj/item/clothing/under/rank/security/aces,
@@ -199,7 +199,7 @@
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
req_access = list(ACCESS_BRIG)
- closet_appearance = /decl/closet_appearance/secure_closet/security
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/security
starts_with = list(
/obj/item/clothing/under/rank/security/aces,
@@ -271,7 +271,7 @@
/obj/structure/closet/secure_closet/detective
name = "detective's cabinet"
req_access = list(ACCESS_FORENSICS_LOCKERS)
- closet_appearance = /decl/closet_appearance/cabinet/secure
+ closet_appearance = /datum/decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
@@ -302,7 +302,7 @@
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
req_access = list(ACCESS_CAPTAIN)
- closet_appearance = /decl/closet_appearance/secure_closet/courtroom
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/courtroom
starts_with = list(
/obj/item/reagent_containers/syringe/ld50_syringe/choral = 2)
@@ -312,7 +312,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/brig
name = "brig locker"
req_access = list(ACCESS_BRIG)
- closet_appearance = /decl/closet_appearance/secure_closet/brig
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/brig
anchored = TRUE
var/id = null
@@ -335,7 +335,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/courtroom
name = "courtroom locker"
req_access = list(ACCESS_LAWYER)
- closet_appearance = /decl/closet_appearance/secure_closet/courtroom
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/courtroom
starts_with = list(
/obj/item/clothing/shoes/brown,
@@ -349,7 +349,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/wall
name = "wall locker"
req_access = list(ACCESS_SECURITY)
- closet_appearance = /decl/closet_appearance/wall
+ closet_appearance = /datum/decl/closet_appearance/wall
density = TRUE
//too small to put a man in
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
index 51e7116fe1..d8f165a6f7 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/hos
name = "head of security's attire"
req_access = list(ACCESS_HOS)
- closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/security/hos
storage_capacity = 2.5 * MOB_MEDIUM
starts_with = list(
@@ -49,7 +49,7 @@
/obj/structure/closet/secure_closet/hos2
name = "head of security's gear"
req_access = list(ACCESS_HOS)
- closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/security/hos
storage_capacity = 2.5 * MOB_MEDIUM
starts_with = list(
@@ -82,7 +82,7 @@
/obj/structure/closet/secure_closet/nanotrasen_security
name = "NanoTrasen security officer's locker"
req_access = list(ACCESS_BRIG)
- closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/security
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/nanotrasen/security
storage_capacity = 3.5 * MOB_MEDIUM
starts_with = list(
@@ -124,7 +124,7 @@
/obj/structure/closet/secure_closet/nanotrasen_commander
name = "NanoTrasen commander's locker"
req_access = list(ACCESS_BRIG)
- closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/commander
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/nanotrasen/commander
storage_capacity = 3.5 * MOB_MEDIUM
starts_with = list(
@@ -174,7 +174,7 @@
/obj/structure/closet/secure_closet/nanotrasen_warden
name = "NanoTrasen warden's locker"
req_access = list(ACCESS_BRIG)
- closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/warden
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/nanotrasen/warden
storage_capacity = 3.5 * MOB_MEDIUM
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index afdbbed16d..f8965a84c0 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/syndicate
name = "armory closet"
desc = "Why is this here?"
- closet_appearance = /decl/closet_appearance/tactical/alt
+ closet_appearance = /datum/decl/closet_appearance/tactical/alt
/obj/structure/closet/syndicate/personal
desc = "It's a storage unit for operative gear."
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 068b87141f..6e28b8cfd8 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -15,7 +15,7 @@
/obj/structure/closet/emcloset
name = "emergency closet"
desc = "It's a storage unit for emergency breathmasks and O2 tanks."
- closet_appearance = /decl/closet_appearance/oxygen
+ closet_appearance = /datum/decl/closet_appearance/oxygen
/obj/structure/closet/emcloset/Initialize(mapload)
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
@@ -69,7 +69,7 @@
/obj/structure/closet/firecloset
name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies."
- closet_appearance = /decl/closet_appearance/oxygen/fire
+ closet_appearance = /datum/decl/closet_appearance/oxygen/fire
starts_with = list(
/obj/item/clothing/suit/fire,
@@ -99,7 +99,7 @@
/obj/structure/closet/firecloset/full/atmos
name = "atmos fire-safety closet"
desc = "It's a storage unit for atmospheric fire-fighting supplies."
- closet_appearance = /decl/closet_appearance/oxygen/fire/atmos
+ closet_appearance = /datum/decl/closet_appearance/oxygen/fire/atmos
starts_with = list(
/obj/item/clothing/suit/fire/heavy,
@@ -114,7 +114,7 @@
/obj/structure/closet/toolcloset
name = "tool closet"
desc = "It's a storage unit for tools."
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/tools
/obj/structure/closet/toolcloset/Initialize(mapload)
starts_with = list()
@@ -158,7 +158,7 @@
/obj/structure/closet/radiation
name = "radiation suit closet"
desc = "It's a storage unit for rad-protective suits."
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools/radiation
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/tools/radiation
starts_with = list(
/obj/item/clothing/suit/radiation = 2,
@@ -171,7 +171,7 @@
/obj/structure/closet/bombcloset
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
- closet_appearance = /decl/closet_appearance/bomb
+ closet_appearance = /datum/decl/closet_appearance/bomb
starts_with = list(
/obj/item/clothing/suit/bomb_suit,
@@ -189,7 +189,7 @@
/obj/structure/closet/bombclosetsecurity
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
- closet_appearance = /decl/closet_appearance/bomb/security
+ closet_appearance = /datum/decl/closet_appearance/bomb/security
starts_with = list(
/obj/item/clothing/suit/bomb_suit/security,
@@ -204,7 +204,7 @@
name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies."
icon = 'icons/obj/closets/bases/wall.dmi'
- closet_appearance = /decl/closet_appearance/wall/hydrant
+ closet_appearance = /datum/decl/closet_appearance/wall/hydrant
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = TRUE
@@ -227,7 +227,7 @@
name = "first-aid closet"
desc = "It's wall-mounted storage unit for first aid supplies."
icon = 'icons/obj/closets/bases/wall.dmi'
- closet_appearance = /decl/closet_appearance/wall/medical
+ closet_appearance = /datum/decl/closet_appearance/wall/medical
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
index e6e0ce6c31..aba0f20d48 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/shuttleemerg //wall mounted fire closet
name = "emergency repairs closet"
desc = "It's a storage unit for emergency repair supplies."
- closet_appearance = /decl/closet_appearance/wall/autolok/shuttleemerg
+ closet_appearance = /datum/decl/closet_appearance/wall/autolok/shuttleemerg
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
@@ -20,4 +20,4 @@
/obj/structure/closet/medical
name = "medical supply closet"
desc = "May or may not contain medical junk."
- closet_appearance = /decl/closet_appearance/medical_yw
+ closet_appearance = /datum/decl/closet_appearance/medical_yw
diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
index f779e9c539..2ea0fc5d61 100644
--- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
@@ -5,7 +5,7 @@
desc = "A wall mounted storage locker."
name = "wall locker"
icon = 'icons/obj/closets/bases/wall.dmi'
- closet_appearance = /decl/closet_appearance/wall
+ closet_appearance = /datum/decl/closet_appearance/wall
density = FALSE
anchored = TRUE
store_mobs = 0
@@ -21,7 +21,7 @@
desc = "A wall mounted locker with emergency supplies."
var/list/spawnitems = list(/obj/item/tank/emergency/oxygen,/obj/item/clothing/mask/breath,/obj/item/tool/crowbar/red,/obj/item/flashlight/flare,)
var/amount = 2 // spawns each items X times.
- closet_appearance = /decl/closet_appearance/wall/emergency
+ closet_appearance = /datum/decl/closet_appearance/wall/emergency
/obj/structure/closet/walllocker/emerglocker/toggle(mob/user as mob)
src.attack_hand(user)
@@ -63,7 +63,7 @@
/obj/structure/closet/walllocker/medical
name = "first-aid closet"
desc = "It's a wall-mounted storage unit for first aid supplies."
- closet_appearance = /decl/closet_appearance/wall/medical
+ closet_appearance = /datum/decl/closet_appearance/wall/medical
/obj/structure/closet/walllocker/medical/north
pixel_y = 32
@@ -84,7 +84,7 @@
/obj/structure/closet/walllocker/wooden
name = "wooden cabinet"
desc = "A wall mounted storage cabinet."
- closet_appearance = /decl/closet_appearance/wall_double/wooden
+ closet_appearance = /datum/decl/closet_appearance/wall_double/wooden
/obj/structure/closet/walllocker/wooden/north
pixel_y = 32
@@ -108,7 +108,7 @@
desc = "A wall mounted storage cabinet."
name = "wall cabinet"
icon = 'icons/obj/closets/bases/wall_double.dmi'
- closet_appearance = /decl/closet_appearance/wall_double
+ closet_appearance = /datum/decl/closet_appearance/wall_double
density = FALSE
anchored = TRUE
store_mobs = 0
@@ -139,7 +139,7 @@
desc = "A wall mounted storage cabinet, for the kitchen. Now where's the flour gone..?"
name = "kitchen cabinet"
icon = 'icons/obj/closets/bases/wall_double.dmi'
- closet_appearance = /decl/closet_appearance/wall_double/kitchen
+ closet_appearance = /datum/decl/closet_appearance/wall_double/kitchen
density = FALSE
anchored = TRUE
@@ -162,7 +162,7 @@
/obj/structure/closet/walllocker_double/medical
name = "medical cabinet"
desc = "A wall mounted medical supply cabinet. Probably full of drugs!" //not actually full of drugs, sorry!
- closet_appearance = /decl/closet_appearance/wall_double/medical
+ closet_appearance = /datum/decl/closet_appearance/wall_double/medical
/obj/structure/closet/walllocker_double/medical/north
pixel_y = 32
@@ -183,7 +183,7 @@
/obj/structure/closet/walllocker_double/emergency_engi
name = "emergency supplies cabinet"
desc = "A wall mounted cabinet. Seemingly has cool stuff for 'emergency use only'."
- closet_appearance = /decl/closet_appearance/wall_double/emergency_engi
+ closet_appearance = /datum/decl/closet_appearance/wall_double/emergency_engi
starts_with = list(
/obj/item/clothing/mask/breath = 2,
@@ -210,7 +210,7 @@
/obj/structure/closet/walllocker_double/hydrant
name = "fire-safety closet"
desc = "It's a storage cabinet packed with fire-fighting supplies."
- closet_appearance = /decl/closet_appearance/wall_double/fire_safety
+ closet_appearance = /datum/decl/closet_appearance/wall_double/fire_safety
starts_with = list(
/obj/item/clothing/suit/fire,
@@ -240,7 +240,7 @@
desc = "A wall mounted storage cabinet. It contains a small amount of emergency supplies for wilderness survival, but they probably won't last very long."
name = "emergency survival wall cabinet"
icon = 'icons/obj/closets/bases/wall_double.dmi'
- closet_appearance = /decl/closet_appearance/wall_double/survival
+ closet_appearance = /datum/decl/closet_appearance/wall_double/survival
density = FALSE
anchored = TRUE
store_mobs = 0
@@ -280,7 +280,7 @@
/obj/structure/closet/walllocker_double/security
name = "security cabinet"
desc = "A wall mounted cabinet. This one is suspiciously red."
- closet_appearance = /decl/closet_appearance/wall_double/security
+ closet_appearance = /datum/decl/closet_appearance/wall_double/security
/obj/structure/closet/walllocker_double/security/north
pixel_y = 32
@@ -299,7 +299,7 @@
dir = EAST
/obj/structure/closet/walllocker_double/misc_civ
- closet_appearance = /decl/closet_appearance/wall_double/gaming
+ closet_appearance = /datum/decl/closet_appearance/wall_double/gaming
/obj/structure/closet/walllocker_double/misc_civ/north
pixel_y = 32
@@ -318,7 +318,7 @@
dir = EAST
/obj/structure/closet/walllocker_double/generic_civ
- closet_appearance = /decl/closet_appearance/wall_double/generic_civ
+ closet_appearance = /datum/decl/closet_appearance/wall_double/generic_civ
/obj/structure/closet/walllocker_double/generic_civ/north
pixel_y = 32
@@ -337,7 +337,7 @@
dir = EAST
/obj/structure/closet/walllocker_double/casino
- closet_appearance = /decl/closet_appearance/wall_double/casino
+ closet_appearance = /datum/decl/closet_appearance/wall_double/casino
/obj/structure/closet/walllocker_double/casino/north
pixel_y = 32
@@ -357,7 +357,7 @@
/obj/structure/closet/walllocker_double/cargo
desc = "A wall mounted cabinet. This one is in cargo colors."
- closet_appearance = /decl/closet_appearance/wall_double/cargo
+ closet_appearance = /datum/decl/closet_appearance/wall_double/cargo
/obj/structure/closet/walllocker_double/cargo/north
pixel_y = 32
@@ -377,7 +377,7 @@
/obj/structure/closet/walllocker_double/science
desc = "A wall mounted cabinet. This one is in research colors."
- closet_appearance = /decl/closet_appearance/wall_double/science
+ closet_appearance = /datum/decl/closet_appearance/wall_double/science
/obj/structure/closet/walllocker_double/science/north
pixel_y = 32
@@ -397,7 +397,7 @@
/obj/structure/closet/walllocker_double/command
desc = "A wall mounted cabinet. This one is in command colors."
- closet_appearance = /decl/closet_appearance/wall_double/command
+ closet_appearance = /datum/decl/closet_appearance/wall_double/command
/obj/structure/closet/walllocker_double/command/north
pixel_y = 32
@@ -416,23 +416,23 @@
dir = EAST
/obj/structure/closet/walllocker_double/command/ce
- closet_appearance = /decl/closet_appearance/wall_double/ce
+ closet_appearance = /datum/decl/closet_appearance/wall_double/ce
/obj/structure/closet/walllocker_double/command/cmo
- closet_appearance = /decl/closet_appearance/wall_double/cmo
+ closet_appearance = /datum/decl/closet_appearance/wall_double/cmo
/obj/structure/closet/walllocker_double/command/rd
- closet_appearance = /decl/closet_appearance/wall_double/rd
+ closet_appearance = /datum/decl/closet_appearance/wall_double/rd
/obj/structure/closet/walllocker_double/command/hos
- closet_appearance = /decl/closet_appearance/wall_double/hos
+ closet_appearance = /datum/decl/closet_appearance/wall_double/hos
/obj/structure/closet/walllocker_double/command/iaa
- closet_appearance = /decl/closet_appearance/wall_double/iaa
+ closet_appearance = /datum/decl/closet_appearance/wall_double/iaa
/obj/structure/closet/walllocker_double/engineering
desc = "A wall mounted cabinet. This one is in engineering colors."
- closet_appearance = /decl/closet_appearance/wall_double/engineering
+ closet_appearance = /datum/decl/closet_appearance/wall_double/engineering
/obj/structure/closet/walllocker_double/engineering/north
pixel_y = 32
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 5acf656b00..fe5b72419b 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -1,11 +1,11 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue attire."
- closet_appearance = /decl/closet_appearance/wardrobe
+ closet_appearance = /datum/decl/closet_appearance/wardrobe
/obj/structure/closet/wardrobe/red
name = "security wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/red
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/red
starts_with = list(
/obj/item/clothing/under/rank/security = 3,
@@ -43,7 +43,7 @@
/obj/structure/closet/wardrobe/detective
name = "detective wardrobe"
- closet_appearance = /decl/closet_appearance/cabinet
+ closet_appearance = /datum/decl/closet_appearance/cabinet
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
@@ -68,7 +68,7 @@
/obj/structure/closet/wardrobe/pink
name = "pink wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/pink
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/pink
starts_with = list(
/obj/item/clothing/under/color/pink = 3,
@@ -79,7 +79,7 @@
/obj/structure/closet/wardrobe/black
name = "black wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/black
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/under/color/black = 3,
@@ -110,7 +110,7 @@
/obj/structure/closet/wardrobe/chaplain_black
name = "chapel wardrobe"
desc = "It's a storage unit for approved religious attire."
- closet_appearance = /decl/closet_appearance/wardrobe/chapel
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/chapel
starts_with = list(
/obj/item/clothing/under/rank/chaplain,
@@ -131,7 +131,7 @@
/obj/structure/closet/wardrobe/monastary
name = "Monastary wardrobe"
desc = "It's a storage unit for approved religious attire."
- closet_appearance = /decl/closet_appearance/wardrobe/black
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/suit/unathi/mantle = 2,
@@ -144,7 +144,7 @@
/obj/structure/closet/wardrobe/green
name = "green wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/green
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/green
starts_with = list(
/obj/item/clothing/under/color/green = 3,
@@ -157,7 +157,7 @@
/obj/structure/closet/wardrobe/xenos
name = "xenos wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/xenos
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/xenos
starts_with = list(
/obj/item/clothing/suit/unathi/mantle,
@@ -171,7 +171,7 @@
/obj/structure/closet/wardrobe/orange
name = "prison wardrobe"
desc = "It's a storage unit for regulation prisoner attire."
- closet_appearance = /decl/closet_appearance/wardrobe/orange
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/orange
starts_with = list(
/obj/item/clothing/under/color/prison = 3,
@@ -182,7 +182,7 @@
/obj/structure/closet/wardrobe/yellow
name = "yellow wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/yellow
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/yellow
starts_with = list(
/obj/item/clothing/under/color/yellow = 3,
@@ -195,7 +195,7 @@
/obj/structure/closet/wardrobe/atmospherics_yellow
name = "atmospherics wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/engineer/atmos
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/engineer/atmos
starts_with = list(
/obj/item/clothing/under/rank/atmospheric_technician = 3,
@@ -209,7 +209,7 @@
/obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/engineer
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/engineer
starts_with = list(
/obj/item/clothing/under/rank/engineer = 3,
@@ -226,7 +226,7 @@
/obj/structure/closet/wardrobe/white
name = "white wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/white
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/color/white = 3,
@@ -238,7 +238,7 @@
/obj/structure/closet/wardrobe/pjs
name = "pajama wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/pjs
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/pjs
starts_with = list(
/obj/item/clothing/under/pj/red = 2,
@@ -249,7 +249,7 @@
/obj/structure/closet/wardrobe/science_white
name = "science wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/science
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/science
starts_with = list(
/obj/item/clothing/under/rank/scientist = 3,
@@ -279,7 +279,7 @@
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/robotics
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/robotics
starts_with = list(
/obj/item/clothing/under/rank/roboticist = 2,
@@ -301,7 +301,7 @@
/obj/structure/closet/wardrobe/chemistry_white
name = "chemistry wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/medical/chemistry
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/chemistry
starts_with = list(
/obj/item/clothing/under/rank/chemist = 2,
@@ -316,7 +316,7 @@
/obj/structure/closet/wardrobe/genetics_white
name = "genetics wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/medical/genetics
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/genetics
starts_with = list(
/obj/item/clothing/under/rank/geneticist = 2,
@@ -329,7 +329,7 @@
/obj/structure/closet/wardrobe/virology_white
name = "virology wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/medical/virology
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/virology
starts_with = list(
/obj/item/clothing/under/rank/virologist = 2,
@@ -344,7 +344,7 @@
/obj/structure/closet/wardrobe/medic_white
name = "medical wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/medical/white
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/white
starts_with = list(
/obj/item/clothing/under/rank/medical = 2,
@@ -369,7 +369,7 @@
/obj/structure/closet/wardrobe/medic_gown
name = "cloning wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/medical/patient
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/patient
starts_with = list(
/obj/item/clothing/under/medigown = 4)
@@ -377,7 +377,7 @@
/obj/structure/closet/wardrobe/grey
name = "grey wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/grey
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/grey
starts_with = list(
/obj/item/clothing/under/color/grey = 3,
@@ -389,7 +389,7 @@
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"
- closet_appearance = /decl/closet_appearance/wardrobe/mixed
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/under/color/blue,
@@ -428,7 +428,7 @@
/obj/structure/closet/wardrobe/tactical
name = "tactical equipment"
- closet_appearance = /decl/closet_appearance/tactical
+ closet_appearance = /datum/decl/closet_appearance/tactical
starts_with = list(
/obj/item/clothing/under/tactical,
@@ -453,7 +453,7 @@
/obj/structure/closet/wardrobe/ert
name = "emergency response team equipment"
- closet_appearance = /decl/closet_appearance/ert
+ closet_appearance = /datum/decl/closet_appearance/ert
starts_with = list(
/obj/item/clothing/under/rank/centcom,
@@ -471,7 +471,7 @@
/obj/structure/closet/wardrobe/suit
name = "suit locker"
- closet_appearance = /decl/closet_appearance/wardrobe/suit
+ closet_appearance = /datum/decl/closet_appearance/wardrobe/suit
starts_with = list(
/obj/item/clothing/under/assistantformal,
@@ -499,7 +499,7 @@
/obj/structure/closet/wardrobe/captain
name = "site manager's wardrobe"
- closet_appearance = /decl/closet_appearance/cabinet
+ closet_appearance = /datum/decl/closet_appearance/cabinet
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm
index 8a9a6d0f27..4026d55751 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm
@@ -1,6 +1,6 @@
//ert wardrobe override, because these guys really don't need edgy red lockers with CCO dress uniforms, syndi(!!) turtlenecks, two edgy skull bandanas, or facemasks with no sprite. -Killian
/obj/structure/closet/wardrobe/ert
- closet_appearance = /decl/closet_appearance/tactical/alt //because ert lockers are red for some dumb reason
+ closet_appearance = /datum/decl/closet_appearance/tactical/alt //because ert lockers are red for some dumb reason
starts_with = list(
/obj/item/clothing/under/ert,
/obj/item/radio/headset/ert,
@@ -14,7 +14,7 @@
//would you believe mercs have no official locker? well, now they do. basically just a rebranded ERT locker but hey, it's an option. -Killian
/obj/structure/closet/wardrobe/merc
name = "mercenary equipment"
- closet_appearance = /decl/closet_appearance/tactical
+ closet_appearance = /datum/decl/closet_appearance/tactical
starts_with = list(
/obj/item/clothing/under/tactical,
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 9300bda1bb..690d8a458a 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -4,7 +4,7 @@
name = "crate"
desc = "A rectangular steel crate."
icon = 'icons/obj/closets/bases/crate.dmi'
- closet_appearance = /decl/closet_appearance/crate
+ closet_appearance = /datum/decl/closet_appearance/crate
dir = 4 //Spawn facing 'forward' by default.
var/points_per_crate = 5
var/rigged = 0
@@ -138,7 +138,7 @@
/obj/structure/closet/crate/secure
desc = "A secure crate."
name = "Secure crate"
- closet_appearance = /decl/closet_appearance/crate/secure
+ closet_appearance = /datum/decl/closet_appearance/crate/secure
var/broken = 0
var/locked = 1
@@ -242,7 +242,7 @@
/obj/structure/closet/crate/plastic
name = "plastic crate"
desc = "A rectangular plastic crate."
- closet_appearance = /decl/closet_appearance/crate/plastic
+ closet_appearance = /datum/decl/closet_appearance/crate/plastic
points_per_crate = 1 //5 crates per ordered crate, +5 for the crate it comes in.
/obj/structure/closet/crate/internals
@@ -252,7 +252,7 @@
/obj/structure/closet/crate/trashcart
name = "trash cart"
desc = "A heavy, metal trashcart with wheels."
- closet_appearance = /decl/closet_appearance/cart/trash
+ closet_appearance = /datum/decl/closet_appearance/cart/trash
/*these aren't needed anymore
/obj/structure/closet/crate/hat
@@ -267,7 +267,7 @@
/obj/structure/closet/crate/medical
name = "medical crate"
desc = "A medical crate."
- closet_appearance = /decl/closet_appearance/crate/medical
+ closet_appearance = /datum/decl/closet_appearance/crate/medical
/obj/structure/closet/crate/rcd
name = "\improper RCD crate"
@@ -295,25 +295,25 @@
/obj/structure/closet/crate/freezer
name = "freezer"
desc = "A freezer."
- closet_appearance = /decl/closet_appearance/crate/freezer
+ closet_appearance = /datum/decl/closet_appearance/crate/freezer
var/target_temp = T0C - 40
var/cooling_power = 40
/obj/structure/closet/crate/freezer/centauri
desc = "A freezer stamped with the logo of Centauri Provisions."
- closet_appearance = /decl/closet_appearance/crate/freezer/centauri
+ closet_appearance = /datum/decl/closet_appearance/crate/freezer/centauri
/obj/structure/closet/crate/freezer/nanotrasen
desc = "A freezer stamped with the logo of NanoTrasen."
- closet_appearance = /decl/closet_appearance/crate/freezer/nanotrasen
+ closet_appearance = /datum/decl/closet_appearance/crate/freezer/nanotrasen
/obj/structure/closet/crate/freezer/veymed
desc = "A freezer stamped with the logo of Vey-Medical."
- closet_appearance = /decl/closet_appearance/crate/freezer/veymed
+ closet_appearance = /datum/decl/closet_appearance/crate/freezer/veymed
/obj/structure/closet/crate/freezer/zenghu
desc = "A freezer stamped with the logo of Zeng-Hu Pharmaceuticals."
- closet_appearance = /decl/closet_appearance/crate/freezer/zenghu
+ closet_appearance = /datum/decl/closet_appearance/crate/freezer/zenghu
/obj/structure/closet/crate/freezer/return_air()
var/datum/gas_mixture/gas = (..())
@@ -347,7 +347,7 @@
/obj/structure/closet/crate/weapon
name = "weapons crate"
desc = "A barely secured weapons crate."
- closet_appearance = /decl/closet_appearance/crate/secure/weapon
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/weapon
/obj/structure/closet/crate/freezer/rations //Fpr use in the escape shuttle
name = "emergency rations"
@@ -366,7 +366,7 @@
/obj/structure/closet/crate/radiation
name = "radioactive gear crate"
desc = "A crate with a radiation sign on it."
- closet_appearance = /decl/closet_appearance/crate/radiation
+ closet_appearance = /datum/decl/closet_appearance/crate/radiation
starts_with = list(
/obj/item/clothing/suit/radiation = 4,
@@ -376,111 +376,111 @@
/obj/structure/closet/crate/aether
desc = "A crate painted in the colours of Aether Atmospherics and Recycling."
- closet_appearance = /decl/closet_appearance/crate/aether
+ closet_appearance = /datum/decl/closet_appearance/crate/aether
/obj/structure/closet/crate/centauri
desc = "A crate decorated with the logo of Centauri Provisions."
- closet_appearance = /decl/closet_appearance/crate/centauri
+ closet_appearance = /datum/decl/closet_appearance/crate/centauri
/obj/structure/closet/crate/einstein
desc = "A crate labelled with an Einstein Engines sticker."
- closet_appearance = /decl/closet_appearance/crate/einstein
+ closet_appearance = /datum/decl/closet_appearance/crate/einstein
/obj/structure/closet/crate/focalpoint
desc = "A crate marked with the decal of Focal Point Energistics."
- closet_appearance = /decl/closet_appearance/crate/focalpoint
+ closet_appearance = /datum/decl/closet_appearance/crate/focalpoint
/obj/structure/closet/crate/gilthari
desc = "A crate embossed with the logo of Gilthari Exports."
- closet_appearance = /decl/closet_appearance/crate/gilthari
+ closet_appearance = /datum/decl/closet_appearance/crate/gilthari
/obj/structure/closet/crate/grayson
desc = "A bare metal crate spraypainted with Grayson Manufactories decals."
- closet_appearance = /decl/closet_appearance/crate/grayson
+ closet_appearance = /datum/decl/closet_appearance/crate/grayson
/obj/structure/closet/crate/heph
desc = "A sturdy crate marked with the logo of Hephaestus Industries."
- closet_appearance = /decl/closet_appearance/crate/heph
+ closet_appearance = /datum/decl/closet_appearance/crate/heph
/obj/structure/closet/crate/morpheus
desc = "A crate crudely imprinted with 'MORPHEUS CYBERKINETICS'."
- closet_appearance = /decl/closet_appearance/crate/morpheus
+ closet_appearance = /datum/decl/closet_appearance/crate/morpheus
/obj/structure/closet/crate/nanotrasen
desc = "A crate emblazoned with the standard NanoTrasen livery."
- closet_appearance = /decl/closet_appearance/crate/nanotrasen
+ closet_appearance = /datum/decl/closet_appearance/crate/nanotrasen
/obj/structure/closet/crate/nanothreads
desc = "A crate emblazoned with the NanoThreads Garments livery, a subsidary of the NanoTrasen Corporation."
- closet_appearance = /decl/closet_appearance/crate/nanotrasenclothing
+ closet_appearance = /datum/decl/closet_appearance/crate/nanotrasenclothing
/obj/structure/closet/crate/nanomed
desc = "A crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
- closet_appearance = /decl/closet_appearance/crate/nanotrasenmedical
+ closet_appearance = /datum/decl/closet_appearance/crate/nanotrasenmedical
/obj/structure/closet/crate/oculum
desc = "A crate minimally decorated with the logo of media giant Oculum Broadcast."
- closet_appearance = /decl/closet_appearance/crate/oculum
+ closet_appearance = /datum/decl/closet_appearance/crate/oculum
/obj/structure/closet/crate/veymed
desc = "A sterile crate extensively detailed in Veymed colours."
- closet_appearance = /decl/closet_appearance/crate/veymed
+ closet_appearance = /datum/decl/closet_appearance/crate/veymed
/obj/structure/closet/crate/ward
desc = "A crate decaled with the logo of Ward-Takahashi."
- closet_appearance = /decl/closet_appearance/crate/ward
+ closet_appearance = /datum/decl/closet_appearance/crate/ward
/obj/structure/closet/crate/xion
desc = "A crate painted in Xion Manufacturing Group orange."
- closet_appearance = /decl/closet_appearance/crate/xion
+ closet_appearance = /datum/decl/closet_appearance/crate/xion
/obj/structure/closet/crate/zenghu
desc = "A sterile crate marked with the logo of Zeng-Hu Pharmaceuticals."
- closet_appearance = /decl/closet_appearance/crate/zenghu
+ closet_appearance = /datum/decl/closet_appearance/crate/zenghu
/obj/structure/closet/crate/coyote_salvage
desc = "A supply crate marked with Coyote Salvage Corp colours."
- closet_appearance = /decl/closet_appearance/crate/coyotesalvage
+ closet_appearance = /datum/decl/closet_appearance/crate/coyotesalvage
/obj/structure/closet/crate/nukies
desc = "A luridly-coloured supply crate with Nukies! branding. Is it legal to have this here?"
- closet_appearance = /decl/closet_appearance/crate/nukies
+ closet_appearance = /datum/decl/closet_appearance/crate/nukies
/obj/structure/closet/crate/desatti
desc = "A strikingly-coloured supply crate with Desatti Catering branding."
- closet_appearance = /decl/closet_appearance/crate/desatti
+ closet_appearance = /datum/decl/closet_appearance/crate/desatti
// Brands/subsidiaries
/obj/structure/closet/crate/allico
desc = "A crate painted in the distinctive cheerful colours of AlliCo. Ltd."
- closet_appearance = /decl/closet_appearance/crate/allico
+ closet_appearance = /datum/decl/closet_appearance/crate/allico
/obj/structure/closet/crate/carp
desc = "A crate painted with the garish livery of Consolidated Agricultural Resources Plc."
- closet_appearance = /decl/closet_appearance/crate/carp
+ closet_appearance = /datum/decl/closet_appearance/crate/carp
/obj/structure/closet/crate/hedberg
name = "weapons crate"
desc = "A weapons crate stamped with the logo of Hedberg-Hammarstrom and the lock conspicuously absent."
- closet_appearance = /decl/closet_appearance/crate/secure/hedberg
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/hedberg
/obj/structure/closet/crate/galaksi
desc = "A crate printed with the markings of Ward-Takahashi's Galaksi Appliance branding."
- closet_appearance = /decl/closet_appearance/crate/galaksi
+ closet_appearance = /datum/decl/closet_appearance/crate/galaksi
/obj/structure/closet/crate/thinktronic
desc = "A crate printed with the markings of Thinktronic Systems."
- closet_appearance = /decl/closet_appearance/crate/thinktronic
+ closet_appearance = /datum/decl/closet_appearance/crate/thinktronic
/obj/structure/closet/crate/ummarcar
desc = "A flimsy crate marked labelled 'UmMarcar Office Supply'."
- closet_appearance = /decl/closet_appearance/crate/ummarcar
+ closet_appearance = /datum/decl/closet_appearance/crate/ummarcar
/obj/structure/closet/crate/unathi
name = "import crate"
desc = "A crate painted with the markings of Moghes Imported Sissalik Jerky."
- closet_appearance = /decl/closet_appearance/crate/unathiimport
+ closet_appearance = /datum/decl/closet_appearance/crate/unathiimport
// Secure Crates
@@ -488,103 +488,103 @@
/obj/structure/closet/crate/secure/weapon
name = "weapons crate"
desc = "A secure weapons crate."
- closet_appearance = /decl/closet_appearance/crate/secure/weapon
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/weapon
/obj/structure/closet/crate/secure/aether
desc = "A secure crate painted in the colours of Aether Atmospherics and Recycling."
- closet_appearance = /decl/closet_appearance/crate/secure/aether
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/aether
/obj/structure/closet/crate/secure/bishop
desc = "A secure crate finely decorated with the emblem of Bishop Cybernetics."
- closet_appearance = /decl/closet_appearance/crate/secure/bishop
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/bishop
/obj/structure/closet/crate/secure/cybersolutions
desc = "An unadorned secure metal crate labelled 'Cyber Solutions'."
- closet_appearance = /decl/closet_appearance/crate/secure/cybersolutions
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/cybersolutions
/obj/structure/closet/crate/secure/einstein
desc = "A secure crate labelled with an Einstein Engines sticker."
- closet_appearance = /decl/closet_appearance/crate/secure/einstein
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/einstein
/obj/structure/closet/crate/secure/focalpoint
desc = "A secure crate marked with the decal of Focal Point Energistics."
- closet_appearance = /decl/closet_appearance/crate/secure/focalpoint
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/focalpoint
/obj/structure/closet/crate/secure/gilthari
desc = "A secure crate embossed with the logo of Gilthari Exports."
- closet_appearance = /decl/closet_appearance/crate/secure/gilthari
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/gilthari
/obj/structure/closet/crate/secure/grayson
desc = "A secure bare metal crate spraypainted with Grayson Manufactories decals."
- closet_appearance = /decl/closet_appearance/crate/secure/grayson
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/grayson
/obj/structure/closet/crate/secure/hedberg
name = "weapons crate"
desc = "A secure weapons crate stamped with the logo of Hedberg-Hammarstrom."
- closet_appearance = /decl/closet_appearance/crate/secure/hedberg
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/hedberg
/obj/structure/closet/crate/secure/heph
name = "weapons crate"
desc = "A secure weapons crate marked with the logo of Hephaestus Industries."
- closet_appearance = /decl/closet_appearance/crate/secure/heph
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/heph
/obj/structure/closet/crate/secure/lawson
name = "weapons crate"
desc = "A secure weapons crate marked with the logo of Lawson Arms."
- closet_appearance = /decl/closet_appearance/crate/secure/lawson
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/lawson
/obj/structure/closet/crate/secure/morpheus
desc = "A secure crate crudely imprinted with 'MORPHEUS CYBERKINETICS'."
- closet_appearance = /decl/closet_appearance/crate/secure/morpheus
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/morpheus
/obj/structure/closet/crate/secure/nanotrasen
desc = "A secure crate emblazoned with the standard NanoTrasen livery."
- closet_appearance = /decl/closet_appearance/crate/secure/nanotrasen
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/nanotrasen
/obj/structure/closet/crate/secure/nanomed
desc = "A secure crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
- closet_appearance = /decl/closet_appearance/crate/secure/nanotrasenmedical
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/nanotrasenmedical
/obj/structure/closet/crate/secure/scg
name = "weapons crate"
desc = "A secure crate in the official colours of the Solar Confederate Government."
- closet_appearance = /decl/closet_appearance/crate/secure/solgov
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/solgov
/obj/structure/closet/crate/secure/saare
name = "weapons crate"
desc = "A secure weapons crate plainly stamped with the logo of Stealth Assault Enterprises."
- closet_appearance = /decl/closet_appearance/crate/secure/saare
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/saare
/obj/structure/closet/crate/secure/veymed
desc = "A secure sterile crate extensively detailed in Veymed colours."
- closet_appearance = /decl/closet_appearance/crate/secure/veymed
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/veymed
/obj/structure/closet/crate/secure/ward
desc = "A secure crate decaled with the logo of Ward-Takahashi."
- closet_appearance = /decl/closet_appearance/crate/secure/ward
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/ward
/obj/structure/closet/crate/secure/xion
desc = "A secure crate painted in Xion Manufacturing Group orange."
- closet_appearance = /decl/closet_appearance/crate/secure/xion
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/xion
/obj/structure/closet/crate/secure/zenghu
desc = "A secure sterile crate marked with the logo of Zeng-Hu Pharmaceuticals."
- closet_appearance = /decl/closet_appearance/crate/secure/zenghu
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/zenghu
/obj/structure/closet/crate/secure/phoron
name = "phoron crate"
desc = "A secure phoron crate painted in standard NanoTrasen livery."
- closet_appearance = /decl/closet_appearance/crate/secure/hazard
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/hazard
/obj/structure/closet/crate/secure/gear
name = "gear crate"
desc = "A secure gear crate."
- closet_appearance = /decl/closet_appearance/crate/secure/weapon
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/weapon
/obj/structure/closet/crate/secure/hydrosec
name = "secure hydroponics crate"
desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
- closet_appearance = /decl/closet_appearance/crate/secure/hydroponics
+ closet_appearance = /datum/decl/closet_appearance/crate/secure/hydroponics
/obj/structure/closet/crate/secure/engineering
desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
@@ -604,7 +604,7 @@
name = "large crate"
desc = "A hefty metal crate."
icon = 'icons/obj/closets/bases/large_crate.dmi'
- closet_appearance = /decl/closet_appearance/large_crate
+ closet_appearance = /datum/decl/closet_appearance/large_crate
/obj/structure/closet/crate/large/close()
. = ..()
@@ -627,33 +627,33 @@
/obj/structure/closet/crate/large/critter
name = "animal crate"
desc = "A hefty crate for hauling animals."
- closet_appearance = /decl/closet_appearance/large_crate/critter
+ closet_appearance = /datum/decl/closet_appearance/large_crate/critter
/obj/structure/closet/crate/large/aether
name = "large atmospherics crate"
desc = "A hefty metal crate, painted in Aether Atmospherics and Recycling colours."
- closet_appearance = /decl/closet_appearance/large_crate/aether
+ closet_appearance = /datum/decl/closet_appearance/large_crate/aether
/obj/structure/closet/crate/large/einstein
name = "large crate"
desc = "A hefty metal crate, painted in Einstein Engines colours."
- closet_appearance = /decl/closet_appearance/large_crate/einstein
+ closet_appearance = /datum/decl/closet_appearance/large_crate/einstein
/obj/structure/closet/crate/large/nanotrasen
name = "large crate"
desc = "A hefty metal crate, painted in standard NanoTrasen livery."
- closet_appearance = /decl/closet_appearance/large_crate/nanotrasen
+ closet_appearance = /datum/decl/closet_appearance/large_crate/nanotrasen
/obj/structure/closet/crate/large/xion
name = "large crate"
desc = "A hefty metal crate, painted in Xion Manufacturing Group orange."
- closet_appearance = /decl/closet_appearance/large_crate/xion
+ closet_appearance = /datum/decl/closet_appearance/large_crate/xion
/obj/structure/closet/crate/secure/large
name = "large crate"
desc = "A hefty metal crate with an electronic locking system."
icon = 'icons/obj/closets/bases/large_crate.dmi'
- closet_appearance = /decl/closet_appearance/large_crate/secure
+ closet_appearance = /datum/decl/closet_appearance/large_crate/secure
/obj/structure/closet/crate/secure/large/close()
@@ -681,23 +681,23 @@
/obj/structure/closet/crate/secure/large/aether
name = "secure atmospherics crate"
desc = "A hefty metal crate with an electronic locking system, painted in Aether Atmospherics and Recycling colours."
- closet_appearance = /decl/closet_appearance/large_crate/secure/aether
+ closet_appearance = /datum/decl/closet_appearance/large_crate/secure/aether
/obj/structure/closet/crate/secure/large/einstein
desc = "A hefty metal crate with an electronic locking system, painted in Einstein Engines colours."
- closet_appearance = /decl/closet_appearance/large_crate/secure/einstein
+ closet_appearance = /datum/decl/closet_appearance/large_crate/secure/einstein
/obj/structure/closet/crate/large/secure/heph
desc = "A hefty metal crate with an electronic locking system, marked with Hephaestus Industries colours."
- closet_appearance = /decl/closet_appearance/large_crate/secure/heph
+ closet_appearance = /datum/decl/closet_appearance/large_crate/secure/heph
/obj/structure/closet/crate/secure/large/nanotrasen
desc = "A hefty metal crate with an electronic locking system, painted in standard NanoTrasen livery."
- closet_appearance = /decl/closet_appearance/large_crate/secure/hazard
+ closet_appearance = /datum/decl/closet_appearance/large_crate/secure/hazard
/obj/structure/closet/crate/large/secure/xion
desc = "A hefty metal crate with an electronic locking system, painted in Xion Manufacturing Group orange."
- closet_appearance = /decl/closet_appearance/large_crate/secure/xion
+ closet_appearance = /datum/decl/closet_appearance/large_crate/secure/xion
/obj/structure/closet/crate/engineering
name = "engineering crate"
@@ -710,7 +710,7 @@
/obj/structure/closet/crate/hydroponics
name = "hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
- closet_appearance = /decl/closet_appearance/crate/hydroponics
+ closet_appearance = /datum/decl/closet_appearance/crate/hydroponics
/obj/structure/closet/crate/hydroponics/prespawned
diff --git a/code/game/objects/structures/crates_lockers/crates_vr.dm b/code/game/objects/structures/crates_lockers/crates_vr.dm
index 10183cf598..b0f6d7fcd9 100644
--- a/code/game/objects/structures/crates_lockers/crates_vr.dm
+++ b/code/game/objects/structures/crates_lockers/crates_vr.dm
@@ -34,11 +34,11 @@
return
/obj/structure/closet/crate/medical/blood
- closet_appearance = /decl/closet_appearance/cart/biohazard/alt
+ closet_appearance = /datum/decl/closet_appearance/cart/biohazard/alt
/obj/structure/closet/crate/fennec
name = "fennec treats crate"
desc = "A colorful crate filled with specialties catering to fennecs."
icon = 'icons/obj/closets/bases/fencrate_vr.dmi'
- closet_appearance = /decl/closet_appearance/crate/fennec
+ closet_appearance = /datum/decl/closet_appearance/crate/fennec
points_per_crate = 0
diff --git a/code/game/objects/unit_testing.dm b/code/game/objects/unit_testing.dm
index 0e3cf37230..334e5490ea 100644
--- a/code/game/objects/unit_testing.dm
+++ b/code/game/objects/unit_testing.dm
@@ -16,7 +16,7 @@
/obj/distilling_tester/return_air()
return GM
-/obj/distilling_tester/proc/test_distilling(var/decl/chemical_reaction/distilling/D, var/temp_prog)
+/obj/distilling_tester/proc/test_distilling(var/datum/decl/chemical_reaction/distilling/D, var/temp_prog)
QDEL_SWAP(GM,new())
if(D.require_xgm_gas)
GM.gas[D.require_xgm_gas] = 100
diff --git a/code/game/turfs/flooring/floor_yw.dm b/code/game/turfs/flooring/floor_yw.dm
index 54c7361c02..0442213a4b 100644
--- a/code/game/turfs/flooring/floor_yw.dm
+++ b/code/game/turfs/flooring/floor_yw.dm
@@ -5,12 +5,12 @@
icon_state = "clockwork_floor"
// floor_tile = /obj/item/stack/tile/bronze
- initial_flooring = /decl/flooring/bronze
+ initial_flooring = /datum/decl/flooring/bronze
/turf/simulated/floor/flesh/attackby()
return
-/decl/flooring/bronze
+/datum/decl/flooring/bronze
name = "bronze"
desc = "Some heavy bronze tiles."
icon = 'icons/obj/clockwork_objects.dmi'
@@ -23,7 +23,7 @@
icon ='icons/obj/clockwork_objects.dmi'
icon_state = "grass"
-/decl/flooring/grass2
+/datum/decl/flooring/grass2
name = "grass"
desc = "You can't tell if this is real grass or just cheap plastic imitation."
icon ='icons/obj/clockwork_objects.dmi'
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index 6b172696a5..60128730d7 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
/proc/populate_flooring_types()
var/list/floor_types = list()
- for (var/flooring_path in typesof(/decl/flooring))
+ for (var/flooring_path in typesof(/datum/decl/flooring))
floor_types["[flooring_path]"] = new flooring_path
return floor_types
@@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
// [icon_base]_edges: directional overlays for edges.
// [icon_base]_corners: directional overlays for non-edge corners.
-/decl/flooring
+/datum/decl/flooring
var/name = "floor"
var/desc
var/icon
@@ -112,17 +112,17 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
var/check_season = FALSE //VOREStation Addition
-/decl/flooring/proc/get_plating_type(var/turf/T)
+/datum/decl/flooring/proc/get_plating_type(var/turf/T)
return plating_type
-/decl/flooring/proc/get_flooring_overlay(var/cache_key, var/icon_base, var/icon_dir = 0, var/layer = BUILTIN_DECAL_LAYER)
+/datum/decl/flooring/proc/get_flooring_overlay(var/cache_key, var/icon_base, var/icon_dir = 0, var/layer = BUILTIN_DECAL_LAYER)
if(!LAZYACCESS(flooring_cache, cache_key))
var/image/I = image(icon = icon, icon_state = icon_base, dir = icon_dir)
I.layer = layer
LAZYSET(flooring_cache, cache_key, I)
return LAZYACCESS(flooring_cache, cache_key)
-/decl/flooring/grass
+/datum/decl/flooring/grass
name = "grass"
desc = "Do they smoke grass out in space, Bowie? Or do they smoke AstroTurf?"
icon = 'icons/turf/flooring/grass.dmi'
@@ -132,7 +132,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_REMOVE_SHOVEL
build_type = /obj/item/stack/tile/grass
-/decl/flooring/grass/sif // Subtype for Sif's grass.
+/datum/decl/flooring/grass/sif // Subtype for Sif's grass.
name = "growth"
desc = "A natural moss that has adapted to the sheer cold climate."
flags = NONE
@@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
has_base_range = 1
//CHOMPedit: sif/forest decl. If this ends up upstream just accept the upstream version.
-/decl/flooring/grass/sif/forest
+/datum/decl/flooring/grass/sif/forest
name = "thick growth"
desc = "A natural moss that has adapted to the sheer cold climate."
flags = NONE
@@ -152,37 +152,37 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
has_base_range = 1
//CHOMPedit end
-/decl/flooring/water
+/datum/decl/flooring/water
name = "water"
desc = "Water is wet, gosh, who knew!"
icon = 'icons/turf/outdoors.dmi'
icon_base = "seashallow"
-/decl/flooring/sand
+/datum/decl/flooring/sand
name = "sand"
desc = "I don't like sand. It's coarse and rough and irritating and it gets everywhere."
icon = 'icons/misc/beach.dmi'
icon_base = "sand"
-/decl/flooring/sand/desert // Subtype of sand, desert.
+/datum/decl/flooring/sand/desert // Subtype of sand, desert.
name = "desert"
desc = "I don't like sand. It's coarse and rough and irritating and it gets everywhere."
icon = 'icons/turf/desert.dmi'
icon_base = "desert"
-/decl/flooring/mud
+/datum/decl/flooring/mud
name = "mud"
desc = "Wet and fragrant mud, bane of the freshly mopped floor."
icon = 'icons/turf/outdoors.dmi'
icon_base = "mud_dark"
-/decl/flooring/rock
+/datum/decl/flooring/rock
name = "rocks"
desc = "Hard as a rock."
icon = 'icons/turf/outdoors.dmi'
icon_base = "rock"
-/decl/flooring/asteroid
+/datum/decl/flooring/asteroid
name = "coarse sand"
desc = "You got a pebble in your shoe just looking at it."
icon = 'icons/turf/flooring/asteroid.dmi'
@@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
flags = TURF_REMOVE_SHOVEL | TURF_ACID_IMMUNE
build_type = null
-/decl/flooring/dirt
+/datum/decl/flooring/dirt
name = "soil"
desc = "Widely considered to be some of the planet's top soil."
icon = 'icons/turf/outdoors.dmi'
@@ -198,44 +198,44 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
flags = TURF_REMOVE_SHOVEL
build_type = null
-/decl/flooring/snow
+/datum/decl/flooring/snow
name = "snow"
desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."
icon = 'icons/turf/outdoors.dmi'
icon_base = "snow"
-/decl/flooring/snow/fake
+/datum/decl/flooring/snow/fake
desc = "A coating of fake snow, looks surprisingly realistic, though not as cold as the real thing."
icon = 'icons/turf/flooring/fakesnow.dmi'
icon_base = "snow"
flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_REMOVE_SHOVEL
-/decl/flooring/snow/snow2
+/datum/decl/flooring/snow/snow2
name = "snow"
desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."
icon = 'icons/turf/snow.dmi'
icon_base = "snow"
flags = TURF_HAS_EDGES
-/decl/flooring/snow/gravsnow
+/datum/decl/flooring/snow/gravsnow
name = "snow"
icon_base = "gravsnow"
-/decl/flooring/snow/plating
+/datum/decl/flooring/snow/plating
name = "snowy plating"
desc = "Steel plating coated with a light layer of snow."
icon_base = "snowyplating"
flags = NONE
-/decl/flooring/snow/ice
+/datum/decl/flooring/snow/ice
name = "ice"
desc = "Looks slippery."
icon_base = "ice"
-/decl/flooring/snow/plating/drift
+/datum/decl/flooring/snow/plating/drift
icon_base = "snowyplayingdrift"
-/decl/flooring/carpet
+/datum/decl/flooring/carpet
name = "red carpet" //CHOMPEDIT renamed to red carpet
desc = "Lush synthetic carpeting, perfectly engineered for easy cleaning."
icon = 'icons/turf/flooring/carpet.dmi'
@@ -245,91 +245,91 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
damage_temperature = T0C+200
flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_REMOVE_CROWBAR | TURF_CAN_BURN
-/decl/flooring/carpet/bcarpet
+/datum/decl/flooring/carpet/bcarpet
name = "black carpet"
icon_base = "bcarpet"
build_type = /obj/item/stack/tile/carpet/bcarpet
-/decl/flooring/carpet/blucarpet
+/datum/decl/flooring/carpet/blucarpet
name = "blue carpet"
icon_base = "blucarpet"
build_type = /obj/item/stack/tile/carpet/blucarpet
-/decl/flooring/carpet/turcarpet
+/datum/decl/flooring/carpet/turcarpet
name = "turquoise carpet"
icon_base = "turcarpet"
build_type = /obj/item/stack/tile/carpet/turcarpet
-/decl/flooring/carpet/sblucarpet
+/datum/decl/flooring/carpet/sblucarpet
name = "silver blue carpet"
icon_base = "sblucarpet"
build_type = /obj/item/stack/tile/carpet/sblucarpet
-/decl/flooring/carpet/gaycarpet
+/datum/decl/flooring/carpet/gaycarpet
name = "pink carpet"
icon_base = "gaycarpet"
build_type = /obj/item/stack/tile/carpet/gaycarpet
-/decl/flooring/carpet/purcarpet
+/datum/decl/flooring/carpet/purcarpet
name = "purple carpet"
icon_base = "purcarpet"
build_type = /obj/item/stack/tile/carpet/purcarpet
-/decl/flooring/carpet/oracarpet
+/datum/decl/flooring/carpet/oracarpet
name = "orange carpet"
icon_base = "oracarpet"
build_type = /obj/item/stack/tile/carpet/oracarpet
-/decl/flooring/carpet/tealcarpet
+/datum/decl/flooring/carpet/tealcarpet
name = "teal carpet"
icon_base = "tealcarpet"
build_type = /obj/item/stack/tile/carpet/teal
-/decl/flooring/carpet/browncarpet
+/datum/decl/flooring/carpet/browncarpet
name = "brown carpet"
icon_base = "brncarpet"
build_type = /obj/item/stack/tile/carpet/brncarpet
-/decl/flooring/carpet/blucarpet2
+/datum/decl/flooring/carpet/blucarpet2
name = "blue carpet"
icon_base = "blue1"
build_type = /obj/item/stack/tile/carpet/blucarpet2
-/decl/flooring/carpet/greencarpet
+/datum/decl/flooring/carpet/greencarpet
name = "green carpet"
icon_base = "green"
build_type = /obj/item/stack/tile/carpet/greencarpet
-/decl/flooring/carpet/purplecarpet
+/datum/decl/flooring/carpet/purplecarpet
name = "purple carpet"
icon_base = "purple"
build_type = /obj/item/stack/tile/carpet/purplecarpet
-/decl/flooring/carpet/geo
+/datum/decl/flooring/carpet/geo
name = "geometric carpet"
icon_base = "geocarpet"
build_type = /obj/item/stack/tile/carpet/geo
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
-/decl/flooring/carpet/retro
+/datum/decl/flooring/carpet/retro
name = "blue retro carpet"
icon_base = "retrocarpet"
build_type = /obj/item/stack/tile/carpet/retro
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
-/decl/flooring/carpet/retro_red
+/datum/decl/flooring/carpet/retro_red
name = "red retro carpet"
icon_base = "retrocarpet_red"
build_type = /obj/item/stack/tile/carpet/retro_red
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
-/decl/flooring/carpet/happy
+/datum/decl/flooring/carpet/happy
name = "happy carpet"
icon_base = "happycarpet"
build_type = /obj/item/stack/tile/carpet/happy
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
-/decl/flooring/tiling
+/datum/decl/flooring/tiling
name = "floor"
desc = "Scuffed from the passage of countless greyshirts."
icon = 'icons/turf/flooring/tiles_vr.dmi' // VOREStation Edit - Eris floors. Polaris still hasn't added all of them properly. See: steel_ridged
@@ -341,54 +341,54 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
can_paint = 1
can_engrave = TRUE
-/decl/flooring/tiling/tech
+/datum/decl/flooring/tiling/tech
desc = "Metal floor tiles with a corrugated anti-slip texture."
icon = 'icons/turf/flooring/techfloor.dmi'
icon_base = "techfloor_gray"
build_type = /obj/item/stack/tile/floor/techgrey
can_paint = null
-/decl/flooring/tiling/tech/grid
+/datum/decl/flooring/tiling/tech/grid
desc = "Metal floor tiles with a barred anti-slip construction. Don't skin your knee!"
icon_base = "techfloor_grid"
build_type = /obj/item/stack/tile/floor/techgrid
-/decl/flooring/tiling/new_tile
+/datum/decl/flooring/tiling/new_tile
desc = "Metal floor tiles with a corrugated anti-slip texture."
icon_base = "tile_full"
flags = TURF_CAN_BREAK | TURF_CAN_BURN | TURF_IS_FRAGILE
build_type = null
-/decl/flooring/tiling/new_tile/cargo_one
+/datum/decl/flooring/tiling/new_tile/cargo_one
icon_base = "cargo_one_full"
-/decl/flooring/tiling/new_tile/kafel
+/datum/decl/flooring/tiling/new_tile/kafel
icon_base = "kafel_full"
-/decl/flooring/tiling/new_tile/techmaint
+/datum/decl/flooring/tiling/new_tile/techmaint
icon_base = "techmaint"
build_type = /obj/item/stack/tile/floor/techmaint
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN
-/decl/flooring/tiling/new_tile/monofloor
+/datum/decl/flooring/tiling/new_tile/monofloor
icon_base = "monofloor"
-/decl/flooring/tiling/new_tile/monotile
+/datum/decl/flooring/tiling/new_tile/monotile
icon_base = "monotile"
-/decl/flooring/tiling/new_tile/monotile/purple
+/datum/decl/flooring/tiling/new_tile/monotile/purple
icon_base = "monotile-purple"
build_type = /obj/item/stack/tile/floor/purple
-/decl/flooring/tiling/new_tile/steel_grid
+/datum/decl/flooring/tiling/new_tile/steel_grid
icon_base = "steel_grid"
build_type = /obj/item/stack/tile/floor/steelgrip
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN
-/decl/flooring/tiling/new_tile/steel_ridged
+/datum/decl/flooring/tiling/new_tile/steel_ridged
icon_base = "steel_ridged"
-/decl/flooring/linoleum
+/datum/decl/flooring/linoleum
name = "linoleum"
desc = "It's like the 2390's all over again." //CHOMPEDIT - Age
icon = 'icons/turf/flooring/linoleum.dmi'
@@ -397,71 +397,71 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/linoleum
flags = TURF_REMOVE_SCREWDRIVER | TURF_CAN_BREAK | TURF_CAN_BURN
-/decl/flooring/tiling/red
+/datum/decl/flooring/tiling/red
name = "floor"
icon_base = "white"
has_damage_range = null
flags = TURF_REMOVE_CROWBAR
build_type = /obj/item/stack/tile/floor/red
-/decl/flooring/tiling/steel
+/datum/decl/flooring/tiling/steel
name = "floor"
icon_base = "steel"
build_type = /obj/item/stack/tile/floor/steel
-/decl/flooring/tiling/steel_dirty
+/datum/decl/flooring/tiling/steel_dirty
name = "floor"
icon_base = "steel_dirty"
build_type = /obj/item/stack/tile/floor/steel_dirty
-/decl/flooring/tiling/asteroidfloor
+/datum/decl/flooring/tiling/asteroidfloor
name = "floor"
icon_base = "asteroidfloor"
has_damage_range = null
build_type = /obj/item/stack/tile/floor/steel
-/decl/flooring/tiling/white
+/datum/decl/flooring/tiling/white
name = "floor"
desc = "How sterile."
icon_base = "white"
build_type = /obj/item/stack/tile/floor/white
-/decl/flooring/tiling/yellow
+/datum/decl/flooring/tiling/yellow
name = "floor"
icon_base = "white"
has_damage_range = null
build_type = /obj/item/stack/tile/floor/yellow
-/decl/flooring/tiling/purple
+/datum/decl/flooring/tiling/purple
name = "floor"
icon_base = "purple"
has_damage_range = null
build_type = /obj/item/stack/tile/floor/purple
-/decl/flooring/tiling/dark
+/datum/decl/flooring/tiling/dark
name = "floor"
desc = "How ominous."
icon_base = "dark"
has_damage_range = null
build_type = /obj/item/stack/tile/floor/dark
-/decl/flooring/tiling/hydro
+/datum/decl/flooring/tiling/hydro
name = "floor"
icon_base = "hydrofloor"
build_type = /obj/item/stack/tile/floor/steel
-/decl/flooring/tiling/neutral
+/datum/decl/flooring/tiling/neutral
name = "floor"
icon_base = "neutral"
build_type = /obj/item/stack/tile/floor/steel
-/decl/flooring/tiling/freezer
+/datum/decl/flooring/tiling/freezer
name = "floor"
desc = "Don't slip."
icon_base = "freezer"
build_type = /obj/item/stack/tile/floor/freezer
-/decl/flooring/wmarble
+/datum/decl/flooring/wmarble
name = "marble floor"
desc = "Very regal white marble flooring."
icon = 'icons/turf/flooring/misc.dmi'
@@ -469,7 +469,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wmarble
flags = TURF_REMOVE_CROWBAR
-/decl/flooring/bmarble
+/datum/decl/flooring/bmarble
name = "marble floor"
desc = "Very regal black marble flooring."
icon = 'icons/turf/flooring/misc.dmi'
@@ -477,7 +477,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/bmarble
flags = TURF_REMOVE_CROWBAR
-/decl/flooring/wood
+/datum/decl/flooring/wood
name = "wooden floor"
desc = "Polished redwood planks."
icon = 'icons/turf/flooring/wood_vr.dmi'
@@ -488,63 +488,63 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wood
flags = TURF_CAN_BREAK | TURF_REMOVE_CROWBAR | TURF_REMOVE_SCREWDRIVER
-/decl/flooring/wood/sif
+/datum/decl/flooring/wood/sif
desc = "Polished wood planks made from sivian wood."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood"
build_type = /obj/item/stack/tile/wood/sif
-/decl/flooring/wood/sif/panel
+/datum/decl/flooring/wood/sif/panel
icon_base = "sif_panel"
build_type = /obj/item/stack/tile/wood/sif/panel
-/decl/flooring/wood/sif/parquet
+/datum/decl/flooring/wood/sif/parquet
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/sif/parquet
-/decl/flooring/wood/sif/tile
+/datum/decl/flooring/wood/sif/tile
icon_base = "wood_tile"
build_type = /obj/item/stack/tile/wood/sif/tile
-/decl/flooring/wood/sif/vert
+/datum/decl/flooring/wood/sif/vert
icon_base = "wood_vert"
build_type = /obj/item/stack/tile/wood/sif/vert
-/decl/flooring/wood/sif/vert_panel
+/datum/decl/flooring/wood/sif/vert_panel
icon_base = "wood_vert_panel"
build_type = /obj/item/stack/tile/wood/sif/vert_panel
-/decl/flooring/wood/alt
+/datum/decl/flooring/wood/alt
icon = 'icons/turf/flooring/wood.dmi'
icon_base = "wood"
build_type = /obj/item/stack/tile/wood/alt
-/decl/flooring/wood/alt/panel
+/datum/decl/flooring/wood/alt/panel
desc = "Polished wooden panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/panel
-/decl/flooring/wood/alt/parquet
+/datum/decl/flooring/wood/alt/parquet
desc = "Polished wooden tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/parquet
-/decl/flooring/wood/alt/vert
+/datum/decl/flooring/wood/alt/vert
desc = "Polished wooden planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert"
build_type = /obj/item/stack/tile/wood/vert
-/decl/flooring/wood/alt/vert_panel
+/datum/decl/flooring/wood/alt/vert_panel
desc = "Polished wooden panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert_panel"
build_type = /obj/item/stack/tile/wood/vert_panel
-/decl/flooring/wood/alt/tile
+/datum/decl/flooring/wood/alt/tile
desc = "Polished wooden tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_tile"
@@ -552,7 +552,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wood/tile
//New Wood
-/decl/flooring/wood/acacia
+/datum/decl/flooring/wood/acacia
name = "wooden floor"
desc = "Polished acacia planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
@@ -563,40 +563,40 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wood/acacia
flags = TURF_CAN_BREAK | TURF_REMOVE_CROWBAR | TURF_REMOVE_SCREWDRIVER
-/decl/flooring/wood/acacia/panel
+/datum/decl/flooring/wood/acacia/panel
desc = "Polished acacia panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/acacia/panel
-/decl/flooring/wood/acacia/parquet
+/datum/decl/flooring/wood/acacia/parquet
desc = "Polished acacia parquet."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/acacia/parquet
-/decl/flooring/wood/acacia/tile
+/datum/decl/flooring/wood/acacia/tile
desc = "Polished acacia tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_tile"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/acacia/tile
-/decl/flooring/wood/acacia/vert
+/datum/decl/flooring/wood/acacia/vert
desc = "Polished acacia planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert"
build_type = /obj/item/stack/tile/wood/acacia/vert
-/decl/flooring/wood/acacia/vert_panel
+/datum/decl/flooring/wood/acacia/vert_panel
desc = "Polished acacia panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/acacia/vert_panel
-/decl/flooring/wood/birch
+/datum/decl/flooring/wood/birch
name = "wooden floor"
desc = "Polished birch planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
@@ -607,40 +607,40 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wood/birch
flags = TURF_CAN_BREAK | TURF_REMOVE_CROWBAR | TURF_REMOVE_SCREWDRIVER
-/decl/flooring/wood/birch/panel
+/datum/decl/flooring/wood/birch/panel
desc = "Polished birch panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/birch/panel
-/decl/flooring/wood/birch/parquet
+/datum/decl/flooring/wood/birch/parquet
desc = "Polished birch tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/birch/parquet
-/decl/flooring/wood/birch/tile
+/datum/decl/flooring/wood/birch/tile
desc = "Polished birch tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_tile"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/birch/tile
-/decl/flooring/wood/birch/vert
+/datum/decl/flooring/wood/birch/vert
desc = "Polished birch planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert"
build_type = /obj/item/stack/tile/wood/birch/vert
-/decl/flooring/wood/birch/vert_panel
+/datum/decl/flooring/wood/birch/vert_panel
desc = "Polished birch panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/birch/vert_panel
-/decl/flooring/wood/hardwood
+/datum/decl/flooring/wood/hardwood
name = "wooden floor"
desc = "Polished hardwood planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
@@ -651,40 +651,40 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wood/hardwood
flags = TURF_CAN_BREAK | TURF_REMOVE_CROWBAR | TURF_REMOVE_SCREWDRIVER
-/decl/flooring/wood/hardwood/panel
+/datum/decl/flooring/wood/hardwood/panel
desc = "Polished hardwood panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/hardwood/panel
-/decl/flooring/wood/hardwood/parquet
+/datum/decl/flooring/wood/hardwood/parquet
desc = "Polished hardwood tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/hardwood/parquet
-/decl/flooring/wood/hardwood/tile
+/datum/decl/flooring/wood/hardwood/tile
desc = "Polished hardwood tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_tile"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/hardwood/tile
-/decl/flooring/wood/hardwood/vert
+/datum/decl/flooring/wood/hardwood/vert
desc = "Polished hardwood planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert"
build_type = /obj/item/stack/tile/wood/hardwood/vert
-/decl/flooring/wood/hardwood/vert_panel
+/datum/decl/flooring/wood/hardwood/vert_panel
desc = "Polished hardwood panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/hardwood/vert_panel
-/decl/flooring/wood/oak
+/datum/decl/flooring/wood/oak
name = "wooden floor"
desc = "Polished oak planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
@@ -695,40 +695,40 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wood/oak
flags = TURF_CAN_BREAK | TURF_REMOVE_CROWBAR | TURF_REMOVE_SCREWDRIVER
-/decl/flooring/wood/oak/panel
+/datum/decl/flooring/wood/oak/panel
desc = "Polished oak panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/oak/panel
-/decl/flooring/wood/oak/parquet
+/datum/decl/flooring/wood/oak/parquet
desc = "Polished oak tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/oak/parquet
-/decl/flooring/wood/oak/tile
+/datum/decl/flooring/wood/oak/tile
desc = "Polished oak tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_tile"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/oak/tile
-/decl/flooring/wood/oak/vert
+/datum/decl/flooring/wood/oak/vert
desc = "Polished oak planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert"
build_type = /obj/item/stack/tile/wood/oak/vert
-/decl/flooring/wood/oak/vert_panel
+/datum/decl/flooring/wood/oak/vert_panel
desc = "Polished oak panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/oak/vert_panel
-/decl/flooring/wood/pine
+/datum/decl/flooring/wood/pine
name = "wooden floor"
desc = "Polished pine planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
@@ -739,40 +739,40 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wood/pine
flags = TURF_CAN_BREAK | TURF_REMOVE_CROWBAR | TURF_REMOVE_SCREWDRIVER
-/decl/flooring/wood/pine/panel
+/datum/decl/flooring/wood/pine/panel
desc = "Polished pine panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/pine/panel
-/decl/flooring/wood/pine/parquet
+/datum/decl/flooring/wood/pine/parquet
desc = "Polished pine tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/pine/parquet
-/decl/flooring/wood/pine/tile
+/datum/decl/flooring/wood/pine/tile
desc = "Polished pine tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_tile"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/pine/tile
-/decl/flooring/wood/pine/vert
+/datum/decl/flooring/wood/pine/vert
desc = "Polished pine planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert"
build_type = /obj/item/stack/tile/wood/pine/vert
-/decl/flooring/wood/pine/vert_panel
+/datum/decl/flooring/wood/pine/vert_panel
desc = "Polished pine panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/pine/vert_panel
-/decl/flooring/wood/redwood
+/datum/decl/flooring/wood/redwood
name = "wooden floor"
desc = "Polished redwood planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
@@ -783,33 +783,33 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
build_type = /obj/item/stack/tile/wood/redwood
flags = TURF_CAN_BREAK | TURF_REMOVE_CROWBAR | TURF_REMOVE_SCREWDRIVER
-/decl/flooring/wood/redwood/panel
+/datum/decl/flooring/wood/redwood/panel
desc = "Polished redwood panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_panel"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/redwood/panel
-/decl/flooring/wood/redwood/parquet
+/datum/decl/flooring/wood/redwood/parquet
desc = "Polished redwood tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/redwood/parquet
-/decl/flooring/wood/redwood/tile
+/datum/decl/flooring/wood/redwood/tile
desc = "Polished redwood tiles."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_tile"
has_damage_range = 2
build_type = /obj/item/stack/tile/wood/redwood/tile
-/decl/flooring/wood/redwood/vert
+/datum/decl/flooring/wood/redwood/vert
desc = "Polished redwood planks."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert"
build_type = /obj/item/stack/tile/wood/redwood/vert
-/decl/flooring/wood/redwood/vert_panel
+/datum/decl/flooring/wood/redwood/vert_panel
desc = "Polished redwood panels."
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_base = "wood_vert_panel"
@@ -818,7 +818,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
// no more wood
-/decl/flooring/reinforced
+/datum/decl/flooring/reinforced
name = "reinforced floor"
desc = "Heavily reinforced with steel rods."
icon = 'icons/turf/flooring/tiles.dmi'
@@ -831,7 +831,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
apply_heat_capacity = 325000
can_paint = 1
-/decl/flooring/reinforced/circuit
+/datum/decl/flooring/reinforced/circuit
name = "processing strata"
icon = 'icons/turf/flooring/circuit.dmi'
icon_base = "bcircuit"
@@ -839,11 +839,11 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
flags = TURF_ACID_IMMUNE | TURF_CAN_BREAK | TURF_CAN_BURN | TURF_REMOVE_CROWBAR
can_paint = 1
-/decl/flooring/reinforced/circuit/green
+/datum/decl/flooring/reinforced/circuit/green
name = "processing strata"
icon_base = "gcircuit"
-/decl/flooring/reinforced/cult
+/datum/decl/flooring/reinforced/cult
name = "engraved floor"
desc = "Unsettling whispers waver from the surface..."
icon = 'icons/turf/flooring/cult.dmi'
@@ -853,7 +853,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
flags = TURF_ACID_IMMUNE | TURF_CAN_BREAK
can_paint = null
-/decl/flooring/lava // Defining this in case someone DOES step on lava and survive. Somehow.
+/datum/decl/flooring/lava // Defining this in case someone DOES step on lava and survive. Somehow.
name = "lava"
desc = "It may look inviting, but it will kill you, painfully."
icon = 'icons/turf/outdoors.dmi'
@@ -861,7 +861,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
is_plating = TRUE
flags = TURF_ACID_IMMUNE
-/decl/flooring/concrete
+/datum/decl/flooring/concrete
name = "concrete"
desc = "A flat area of poured concrete flooring."
icon = 'icons/turf/concrete.dmi'
@@ -872,12 +872,12 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
flags = TURF_ACID_IMMUNE | TURF_CAN_BREAK | TURF_REMOVE_CROWBAR
///// Season Time! ///// VOREStation Addition Start
-/decl/flooring/grass/seasonal_grass
+/datum/decl/flooring/grass/seasonal_grass
desc = "It's grass!"
icon = 'icons/seasonal/turf.dmi'
check_season = TRUE
has_base_range = 11
-/decl/flooring/grass/seasonal_grass/dark
+/datum/decl/flooring/grass/seasonal_grass/dark
name = "grass"
icon_base = "darkgrass"
diff --git a/code/game/turfs/flooring/flooring_ch.dm b/code/game/turfs/flooring/flooring_ch.dm
index 12556048a5..77bd11dcdf 100644
--- a/code/game/turfs/flooring/flooring_ch.dm
+++ b/code/game/turfs/flooring/flooring_ch.dm
@@ -1,4 +1,4 @@
-/decl/flooring
+/datum/decl/flooring
/* var/list/vorefootstep_sounds = list() // key=species name, value = list of sounds, used for reagent sloshing in vore belly
vorefootstep_sounds = list("human" = list(
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index c8a9acd148..1936f83a29 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -2,121 +2,121 @@
name = "carpet"
icon = 'icons/turf/flooring/carpet.dmi'
icon_state = "carpet"
- initial_flooring = /decl/flooring/carpet
+ initial_flooring = /datum/decl/flooring/carpet
/turf/simulated/floor/carpet/bcarpet
name = "black carpet"
icon_state = "bcarpet"
- initial_flooring = /decl/flooring/carpet/bcarpet
+ initial_flooring = /datum/decl/flooring/carpet/bcarpet
/turf/simulated/floor/carpet/blucarpet
name = "blue carpet"
icon_state = "blucarpet"
- initial_flooring = /decl/flooring/carpet/blucarpet
+ initial_flooring = /datum/decl/flooring/carpet/blucarpet
/turf/simulated/floor/carpet/tealcarpet
name = "teal carpet"
icon_state = "tealcarpet"
- initial_flooring = /decl/flooring/carpet/tealcarpet
+ initial_flooring = /datum/decl/flooring/carpet/tealcarpet
/turf/simulated/floor/carpet/geo
name = "deco carpet"
icon_state = "decocarpet"
- initial_flooring = /decl/flooring/carpet/geo
+ initial_flooring = /datum/decl/flooring/carpet/geo
/turf/simulated/floor/carpet/retro
name = "retro carpet"
icon_state = "retrocarpet"
- initial_flooring = /decl/flooring/carpet/retro
+ initial_flooring = /datum/decl/flooring/carpet/retro
// Legacy support for existing paths for blue carpet
/turf/simulated/floor/carpet/blue
name = "blue carpet"
icon_state = "blucarpet"
- initial_flooring = /decl/flooring/carpet/blucarpet
+ initial_flooring = /datum/decl/flooring/carpet/blucarpet
/turf/simulated/floor/carpet/turcarpet
name = "tur carpet"
icon_state = "turcarpet"
- initial_flooring = /decl/flooring/carpet/turcarpet
+ initial_flooring = /datum/decl/flooring/carpet/turcarpet
/turf/simulated/floor/carpet/sblucarpet
name = "sblue carpet"
icon_state = "sblucarpet"
- initial_flooring = /decl/flooring/carpet/sblucarpet
+ initial_flooring = /datum/decl/flooring/carpet/sblucarpet
/turf/simulated/floor/carpet/gaycarpet
name = "clown carpet"
icon_state = "gaycarpet"
- initial_flooring = /decl/flooring/carpet/gaycarpet
+ initial_flooring = /datum/decl/flooring/carpet/gaycarpet
/turf/simulated/floor/carpet/purcarpet
name = "purple carpet"
icon_state = "purcarpet"
- initial_flooring = /decl/flooring/carpet/purcarpet
+ initial_flooring = /datum/decl/flooring/carpet/purcarpet
/turf/simulated/floor/carpet/oracarpet
name = "orange carpet"
icon_state = "oracarpet"
- initial_flooring = /decl/flooring/carpet/oracarpet
+ initial_flooring = /datum/decl/flooring/carpet/oracarpet
/turf/simulated/floor/carpet/brown
name = "brown carpet"
icon_state = "brncarpet"
- initial_flooring = /decl/flooring/carpet/browncarpet
+ initial_flooring = /datum/decl/flooring/carpet/browncarpet
/turf/simulated/floor/carpet/blue2
name = "blue carpet"
icon_state = "blue1"
- initial_flooring = /decl/flooring/carpet/blucarpet2
+ initial_flooring = /datum/decl/flooring/carpet/blucarpet2
/turf/simulated/floor/carpet/green
name = "green carpet"
icon_state = "green"
- initial_flooring = /decl/flooring/carpet/greencarpet
+ initial_flooring = /datum/decl/flooring/carpet/greencarpet
/turf/simulated/floor/carpet/purple
name = "purple carpet"
icon_state = "purple"
- initial_flooring = /decl/flooring/carpet/purplecarpet
+ initial_flooring = /datum/decl/flooring/carpet/purplecarpet
/turf/simulated/floor/carpet/geo
name = "geometric carpet"
icon_state = "geocarpet"
- initial_flooring = /decl/flooring/carpet/geo
+ initial_flooring = /datum/decl/flooring/carpet/geo
/turf/simulated/floor/carpet/retro
name = "blue retro carpet"
icon_state = "retrocarpet"
- initial_flooring = /decl/flooring/carpet/retro
+ initial_flooring = /datum/decl/flooring/carpet/retro
/turf/simulated/floor/carpet/retro_red
name = "red retro carpet"
icon_state = "retrocarpet_red"
- initial_flooring = /decl/flooring/carpet/retro_red
+ initial_flooring = /datum/decl/flooring/carpet/retro_red
/turf/simulated/floor/carpet/happy
name = "happy carpet"
icon_state = "happycarpet"
- initial_flooring = /decl/flooring/carpet/happy
+ initial_flooring = /datum/decl/flooring/carpet/happy
/turf/simulated/floor/bluegrid
name = "mainframe floor"
icon = 'icons/turf/flooring/circuit.dmi'
icon_state = "bcircuit"
- initial_flooring = /decl/flooring/reinforced/circuit
+ initial_flooring = /datum/decl/flooring/reinforced/circuit
/turf/simulated/floor/greengrid
name = "mainframe floor"
icon = 'icons/turf/flooring/circuit.dmi'
icon_state = "gcircuit"
- initial_flooring = /decl/flooring/reinforced/circuit/green
+ initial_flooring = /datum/decl/flooring/reinforced/circuit/green
/turf/simulated/floor/wood
name = "wooden floor"
icon = 'icons/turf/flooring/wood_vr.dmi'
icon_state = "wood"
- initial_flooring = /decl/flooring/wood
+ initial_flooring = /datum/decl/flooring/wood
/turf/simulated/floor/wood/broken
icon_state = "wood-broken0" // This gets changed when spawned.
@@ -129,7 +129,7 @@
name = "alien wooden floor"
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood"
- initial_flooring = /decl/flooring/wood/sif
+ initial_flooring = /datum/decl/flooring/wood/sif
color = "#293c50"
/turf/simulated/floor/wood/sif/broken
@@ -141,27 +141,27 @@
/turf/simulated/floor/wood/sif/tile
icon_state = "wood_tile"
- initial_flooring = /decl/flooring/wood/sif/tile
+ initial_flooring = /datum/decl/flooring/wood/sif/tile
/turf/simulated/floor/wood/sif/panel
icon_state = "wood_panel"
- initial_flooring = /decl/flooring/wood/sif/panel
+ initial_flooring = /datum/decl/flooring/wood/sif/panel
/turf/simulated/floor/wood/sif/parquet
icon_state = "wood_parquet"
- initial_flooring = /decl/flooring/wood/sif/parquet
+ initial_flooring = /datum/decl/flooring/wood/sif/parquet
/turf/simulated/floor/wood/sif/vert
icon_state = "wood_vert"
- initial_flooring = /decl/flooring/wood/sif/vert
+ initial_flooring = /datum/decl/flooring/wood/sif/vert
/turf/simulated/floor/wood/sif/vert_panel
icon_state = "wood_vert_panel"
- initial_flooring = /decl/flooring/wood/sif/vert_panel
+ initial_flooring = /datum/decl/flooring/wood/sif/vert_panel
/turf/simulated/floor/wood/alt
icon = 'icons/turf/flooring/wood_greyscale.dmi'
- initial_flooring = /decl/flooring/wood/alt
+ initial_flooring = /datum/decl/flooring/wood/alt
color = "#593c1c"
/turf/simulated/floor/wood/alt/broken
@@ -173,7 +173,7 @@
/turf/simulated/floor/wood/alt/tile
icon_state = "wood_tile"
- initial_flooring = /decl/flooring/wood/alt/tile
+ initial_flooring = /datum/decl/flooring/wood/alt/tile
/turf/simulated/floor/wood/alt/tile/broken
icon_state = "wood_tile-broken0" // This gets changed when spawned.
@@ -184,7 +184,7 @@
/turf/simulated/floor/wood/alt/panel
icon_state = "wood_panel"
- initial_flooring = /decl/flooring/wood/alt/panel
+ initial_flooring = /datum/decl/flooring/wood/alt/panel
/turf/simulated/floor/wood/alt/panel/broken
icon_state = "wood_panel-broken0" // This gets changed when spawned.
@@ -195,7 +195,7 @@
/turf/simulated/floor/wood/alt/parquet
icon_state = "wood_parquet"
- initial_flooring = /decl/flooring/wood/alt/parquet
+ initial_flooring = /datum/decl/flooring/wood/alt/parquet
/turf/simulated/floor/wood/alt/parquet/broken
icon_state = "wood_parquet-broken0" // This gets changed when spawned.
@@ -206,18 +206,18 @@
/turf/simulated/floor/wood/alt/vert
icon_state = "wood_vert"
- initial_flooring = /decl/flooring/wood/alt/vert
+ initial_flooring = /datum/decl/flooring/wood/alt/vert
/turf/simulated/floor/wood/alt/vert_panel
icon_state = "wood_vert_panel"
- initial_flooring = /decl/flooring/wood/alt/vert_panel
+ initial_flooring = /datum/decl/flooring/wood/alt/vert_panel
/turf/simulated/floor/grass
name = "grass patch"
icon = 'icons/turf/flooring/grass.dmi'
icon_state = "grass0"
can_dirty = FALSE //VOREStation Edit
- initial_flooring = /decl/flooring/grass
+ initial_flooring = /datum/decl/flooring/grass
footstep = FOOTSTEP_GRASS
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
@@ -226,46 +226,46 @@
name = "floor"
icon = 'icons/turf/flooring/tiles_vr.dmi'
icon_state = "tiled"
- initial_flooring = /decl/flooring/tiling
+ initial_flooring = /datum/decl/flooring/tiling
/turf/simulated/floor/tiled/techmaint
name = "floor"
icon = 'icons/turf/flooring/tiles_vr.dmi'
icon_state = "techmaint"
- initial_flooring = /decl/flooring/tiling/new_tile/techmaint
+ initial_flooring = /datum/decl/flooring/tiling/new_tile/techmaint
/turf/simulated/floor/tiled/techfloor
name = "floor"
icon = 'icons/turf/flooring/techfloor.dmi'
icon_state = "techfloor_gray"
- initial_flooring = /decl/flooring/tiling/tech
+ initial_flooring = /datum/decl/flooring/tiling/tech
/turf/simulated/floor/tiled/monotile
name = "floor"
icon = 'icons/turf/flooring/tiles_vr.dmi'
icon_state = "monotile"
- initial_flooring = /decl/flooring/tiling/new_tile/monotile
+ initial_flooring = /datum/decl/flooring/tiling/new_tile/monotile
/turf/simulated/floor/tiled/monotile/purple
icon_state = "monotile-purple"
- initial_flooring = /decl/flooring/tiling/new_tile/monotile/purple
+ initial_flooring = /datum/decl/flooring/tiling/new_tile/monotile/purple
/turf/simulated/floor/tiled/steel_grid
name = "floor"
icon = 'icons/turf/flooring/tiles_vr.dmi'
icon_state = "steel_grid"
- initial_flooring = /decl/flooring/tiling/new_tile/steel_grid
+ initial_flooring = /datum/decl/flooring/tiling/new_tile/steel_grid
/turf/simulated/floor/tiled/steel_ridged
name = "floor"
icon = 'icons/turf/flooring/tiles_vr.dmi'
icon_state = "steel_ridged"
- initial_flooring = /decl/flooring/tiling/new_tile/steel_ridged
+ initial_flooring = /datum/decl/flooring/tiling/new_tile/steel_ridged
/turf/simulated/floor/tiled/old_tile
name = "floor"
icon_state = "tile_full"
- initial_flooring = /decl/flooring/tiling/new_tile
+ initial_flooring = /datum/decl/flooring/tiling/new_tile
/turf/simulated/floor/tiled/old_tile/white
color = "#d9d9d9"
/turf/simulated/floor/tiled/old_tile/blue
@@ -288,7 +288,7 @@
/turf/simulated/floor/tiled/old_cargo
name = "floor"
icon_state = "cargo_one_full"
- initial_flooring = /decl/flooring/tiling/new_tile/cargo_one
+ initial_flooring = /datum/decl/flooring/tiling/new_tile/cargo_one
/turf/simulated/floor/tiled/old_cargo/white
color = "#d9d9d9"
/turf/simulated/floor/tiled/old_cargo/blue
@@ -311,7 +311,7 @@
name = "floor"
desc = "Ceramic tile flooring."
icon_state = "kafel_full"
- initial_flooring = /decl/flooring/tiling/new_tile/kafel
+ initial_flooring = /datum/decl/flooring/tiling/new_tile/kafel
/turf/simulated/floor/tiled/kafel_full/white
color = "#d9d9d9"
/turf/simulated/floor/tiled/kafel_full/blue
@@ -333,13 +333,13 @@
/turf/simulated/floor/tiled/techfloor/grid
name = "floor"
icon_state = "techfloor_grid"
- initial_flooring = /decl/flooring/tiling/tech/grid
+ initial_flooring = /datum/decl/flooring/tiling/tech/grid
/turf/simulated/floor/reinforced
name = "reinforced floor"
icon = 'icons/turf/flooring/tiles.dmi'
icon_state = "reinforced"
- initial_flooring = /decl/flooring/reinforced
+ initial_flooring = /datum/decl/flooring/reinforced
/turf/simulated/floor/reinforced/airless
oxygen = 0
@@ -381,7 +381,7 @@
name = "engraved floor"
icon = 'icons/turf/flooring/cult.dmi'
icon_state = "cult"
- initial_flooring = /decl/flooring/reinforced/cult
+ initial_flooring = /datum/decl/flooring/reinforced/cult
/turf/simulated/floor/cult/cultify()
return
@@ -389,33 +389,33 @@
/turf/simulated/floor/tiled/dark
name = "dark floor"
icon_state = "dark"
- initial_flooring = /decl/flooring/tiling/dark
+ initial_flooring = /datum/decl/flooring/tiling/dark
/turf/simulated/floor/tiled/hydro
name = "hydro floor"
icon_state = "hydrofloor"
- initial_flooring = /decl/flooring/tiling/hydro
+ initial_flooring = /datum/decl/flooring/tiling/hydro
/turf/simulated/floor/tiled/neutral
name = "light floor"
icon_state = "neutral"
- initial_flooring = /decl/flooring/tiling/neutral
+ initial_flooring = /datum/decl/flooring/tiling/neutral
/turf/simulated/floor/tiled/red
name = "red floor"
color = COLOR_RED_GRAY
icon_state = "white"
- initial_flooring = /decl/flooring/tiling/red
+ initial_flooring = /datum/decl/flooring/tiling/red
/turf/simulated/floor/tiled/steel
name = "steel floor"
icon_state = "steel"
- initial_flooring = /decl/flooring/tiling/steel
+ initial_flooring = /datum/decl/flooring/tiling/steel
/turf/simulated/floor/tiled/steel_dirty
name = "steel floor"
icon_state = "steel_dirty"
- initial_flooring = /decl/flooring/tiling/steel_dirty
+ initial_flooring = /datum/decl/flooring/tiling/steel_dirty
/turf/simulated/floor/tiled/steel/airless
oxygen = 0
@@ -423,7 +423,7 @@
/turf/simulated/floor/tiled/asteroid_steel
icon_state = "asteroidfloor"
- initial_flooring = /decl/flooring/tiling/asteroidfloor
+ initial_flooring = /datum/decl/flooring/tiling/asteroidfloor
/turf/simulated/floor/tiled/asteroid_steel/airless
name = "plating"
@@ -433,41 +433,41 @@
/turf/simulated/floor/tiled/white
name = "white floor"
icon_state = "white"
- initial_flooring = /decl/flooring/tiling/white
+ initial_flooring = /datum/decl/flooring/tiling/white
/turf/simulated/floor/tiled/yellow
name = "yellow floor"
color = COLOR_BROWN
icon_state = "white"
- initial_flooring = /decl/flooring/tiling/yellow
+ initial_flooring = /datum/decl/flooring/tiling/yellow
/turf/simulated/floor/tiled/purple
name = "purple floor"
icon_state = "purple"
- initial_flooring = /decl/flooring/tiling/purple
+ initial_flooring = /datum/decl/flooring/tiling/purple
/turf/simulated/floor/tiled/freezer
name = "tiles"
icon_state = "freezer"
- initial_flooring = /decl/flooring/tiling/freezer
+ initial_flooring = /datum/decl/flooring/tiling/freezer
/turf/simulated/floor/lino
name = "lino"
icon = 'icons/turf/flooring/linoleum.dmi'
icon_state = "lino"
- initial_flooring = /decl/flooring/linoleum
+ initial_flooring = /datum/decl/flooring/linoleum
/turf/simulated/floor/wmarble
name = "marble"
icon = 'icons/turf/flooring/misc.dmi'
icon_state = "lightmarble"
- initial_flooring = /decl/flooring/wmarble
+ initial_flooring = /datum/decl/flooring/wmarble
/turf/simulated/floor/bmarble
name = "marble"
icon = 'icons/turf/flooring/misc.dmi'
icon_state = "darkmarble"
- initial_flooring = /decl/flooring/bmarble
+ initial_flooring = /datum/decl/flooring/bmarble
//ATMOS PREMADES
/turf/simulated/floor/reinforced/airless
@@ -531,35 +531,35 @@
name = "snow"
icon = 'icons/turf/outdoors.dmi'
icon_state = "snow"
- initial_flooring = /decl/flooring/snow
+ initial_flooring = /datum/decl/flooring/snow
var/list/crossed_dirs = list()
/turf/simulated/floor/fakesnow
name = "fake snow"
icon = 'icons/turf/outdoors.dmi'
icon_state = "snow"
- initial_flooring = /decl/flooring/snow/fake
+ initial_flooring = /datum/decl/flooring/snow/fake
/turf/simulated/floor/snow/snow2
name = "snow"
icon = 'icons/turf/snow.dmi'
icon_state = "snow"
- initial_flooring = /decl/flooring/snow
+ initial_flooring = /datum/decl/flooring/snow
/turf/simulated/floor/snow/gravsnow
name = "snow"
icon_state = "gravsnow"
- initial_flooring = /decl/flooring/snow/gravsnow
+ initial_flooring = /datum/decl/flooring/snow/gravsnow
/turf/simulated/floor/snow/plating
name = "snowy playing"
icon_state = "snowyplating"
- initial_flooring = /decl/flooring/snow/plating
+ initial_flooring = /datum/decl/flooring/snow/plating
/turf/simulated/floor/snow/plating/drift
name = "snowy plating"
icon_state = "snowyplayingdrift"
- initial_flooring = /decl/flooring/snow/plating/drift
+ initial_flooring = /datum/decl/flooring/snow/plating/drift
// TODO: Move foortprints to a datum-component signal so they can actually be applied to other turf types, like sand, or mud
/turf/simulated/floor/snow/Entered(atom/A)
@@ -585,7 +585,7 @@
name = "concrete"
icon = 'icons/turf/concrete.dmi'
icon_state = "concrete"
- initial_flooring = /decl/flooring/concrete
+ initial_flooring = /datum/decl/flooring/concrete
//New Wood
@@ -594,189 +594,189 @@
icon = 'icons/turf/flooring/wood_greyscale.dmi'
color = "#b75e12"
icon_state = "wood"
- initial_flooring = /decl/flooring/wood/acacia
+ initial_flooring = /datum/decl/flooring/wood/acacia
/turf/simulated/floor/wood/acacia/tile
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_tile"
- initial_flooring = /decl/flooring/wood/acacia/tile
+ initial_flooring = /datum/decl/flooring/wood/acacia/tile
/turf/simulated/floor/wood/acacia/panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_panel"
- initial_flooring = /decl/flooring/wood/acacia/panel
+ initial_flooring = /datum/decl/flooring/wood/acacia/panel
/turf/simulated/floor/wood/acacia/parquet
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_parquet"
- initial_flooring = /decl/flooring/wood/acacia/parquet
+ initial_flooring = /datum/decl/flooring/wood/acacia/parquet
/turf/simulated/floor/wood/acacia/vert
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert"
- initial_flooring = /decl/flooring/wood/acacia/vert
+ initial_flooring = /datum/decl/flooring/wood/acacia/vert
/turf/simulated/floor/wood/acacia/vert_panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert_panel"
- initial_flooring = /decl/flooring/wood/acacia/vert_panel
+ initial_flooring = /datum/decl/flooring/wood/acacia/vert_panel
/turf/simulated/floor/wood/birch
name = "birch wood floor"
icon = 'icons/turf/flooring/wood_greyscale.dmi'
color = "#f6dec0"
icon_state = "wood"
- initial_flooring = /decl/flooring/wood/birch
+ initial_flooring = /datum/decl/flooring/wood/birch
/turf/simulated/floor/wood/birch/tile
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_tile"
- initial_flooring = /decl/flooring/wood/birch/tile
+ initial_flooring = /datum/decl/flooring/wood/birch/tile
/turf/simulated/floor/wood/birch/panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_panel"
- initial_flooring = /decl/flooring/wood/birch/panel
+ initial_flooring = /datum/decl/flooring/wood/birch/panel
/turf/simulated/floor/wood/birch/parquet
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_parquet"
- initial_flooring = /decl/flooring/wood/birch/parquet
+ initial_flooring = /datum/decl/flooring/wood/birch/parquet
/turf/simulated/floor/wood/birch/vert
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert"
- initial_flooring = /decl/flooring/wood/birch/vert
+ initial_flooring = /datum/decl/flooring/wood/birch/vert
/turf/simulated/floor/wood/birch/vert_panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert_panel"
- initial_flooring = /decl/flooring/wood/birch/vert_panel
+ initial_flooring = /datum/decl/flooring/wood/birch/vert_panel
/turf/simulated/floor/wood/hardwood
name = "hardwood wood floor"
icon = 'icons/turf/flooring/wood_greyscale.dmi'
color = "#42291a"
icon_state = "wood"
- initial_flooring = /decl/flooring/wood/hardwood
+ initial_flooring = /datum/decl/flooring/wood/hardwood
/turf/simulated/floor/wood/hardwood/tile
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_tile"
- initial_flooring = /decl/flooring/wood/hardwood/tile
+ initial_flooring = /datum/decl/flooring/wood/hardwood/tile
/turf/simulated/floor/wood/hardwood/panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_panel"
- initial_flooring = /decl/flooring/wood/hardwood/panel
+ initial_flooring = /datum/decl/flooring/wood/hardwood/panel
/turf/simulated/floor/wood/hardwood/parquet
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_parquet"
- initial_flooring = /decl/flooring/wood/hardwood/parquet
+ initial_flooring = /datum/decl/flooring/wood/hardwood/parquet
/turf/simulated/floor/wood/hardwood/vert
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert"
- initial_flooring = /decl/flooring/wood/hardwood/vert
+ initial_flooring = /datum/decl/flooring/wood/hardwood/vert
/turf/simulated/floor/wood/hardwood/vert_panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert_panel"
- initial_flooring = /decl/flooring/wood/hardwood/vert_panel
+ initial_flooring = /datum/decl/flooring/wood/hardwood/vert_panel
/turf/simulated/floor/wood/oak
name = "oak wood floor"
icon = 'icons/turf/flooring/wood_greyscale.dmi'
color = "#674928"
icon_state = "wood"
- initial_flooring = /decl/flooring/wood/oak
+ initial_flooring = /datum/decl/flooring/wood/oak
/turf/simulated/floor/wood/oak/tile
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_tile"
- initial_flooring = /decl/flooring/wood/oak/tile
+ initial_flooring = /datum/decl/flooring/wood/oak/tile
/turf/simulated/floor/wood/oak/panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_panel"
- initial_flooring = /decl/flooring/wood/oak/panel
+ initial_flooring = /datum/decl/flooring/wood/oak/panel
/turf/simulated/floor/wood/oak/parquet
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_parquet"
- initial_flooring = /decl/flooring/wood/oak/parquet
+ initial_flooring = /datum/decl/flooring/wood/oak/parquet
/turf/simulated/floor/wood/oak/vert
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert"
- initial_flooring = /decl/flooring/wood/oak/vert
+ initial_flooring = /datum/decl/flooring/wood/oak/vert
/turf/simulated/floor/wood/oak/vert_panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert_panel"
- initial_flooring = /decl/flooring/wood/oak/vert_panel
+ initial_flooring = /datum/decl/flooring/wood/oak/vert_panel
/turf/simulated/floor/wood/pine
name = "pine wood floor"
icon = 'icons/turf/flooring/wood_greyscale.dmi'
color = "#cd9d6f"
icon_state = "wood"
- initial_flooring = /decl/flooring/wood/pine
+ initial_flooring = /datum/decl/flooring/wood/pine
/turf/simulated/floor/wood/pine/tile
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_tile"
- initial_flooring = /decl/flooring/wood/pine/tile
+ initial_flooring = /datum/decl/flooring/wood/pine/tile
/turf/simulated/floor/wood/pine/panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_panel"
- initial_flooring = /decl/flooring/wood/pine/panel
+ initial_flooring = /datum/decl/flooring/wood/pine/panel
/turf/simulated/floor/wood/pine/parquet
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_parquet"
- initial_flooring = /decl/flooring/wood/pine/parquet
+ initial_flooring = /datum/decl/flooring/wood/pine/parquet
/turf/simulated/floor/wood/pine/vert
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert"
- initial_flooring = /decl/flooring/wood/pine/vert
+ initial_flooring = /datum/decl/flooring/wood/pine/vert
/turf/simulated/floor/wood/pine/vert_panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert_panel"
- initial_flooring = /decl/flooring/wood/pine/vert_panel
+ initial_flooring = /datum/decl/flooring/wood/pine/vert_panel
/turf/simulated/floor/wood/redwood
name = "redwood wood floor"
icon = 'icons/turf/flooring/wood_greyscale.dmi'
color = "#a45a52"
icon_state = "wood"
- initial_flooring = /decl/flooring/wood/redwood
+ initial_flooring = /datum/decl/flooring/wood/redwood
/turf/simulated/floor/wood/redwood/tile
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_tile"
- initial_flooring = /decl/flooring/wood/redwood/tile
+ initial_flooring = /datum/decl/flooring/wood/redwood/tile
/turf/simulated/floor/wood/redwood/panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_panel"
- initial_flooring = /decl/flooring/wood/redwood/panel
+ initial_flooring = /datum/decl/flooring/wood/redwood/panel
/turf/simulated/floor/wood/redwood/parquet
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_parquet"
- initial_flooring = /decl/flooring/wood/redwood/parquet
+ initial_flooring = /datum/decl/flooring/wood/redwood/parquet
/turf/simulated/floor/wood/redwood/vert
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert"
- initial_flooring = /decl/flooring/wood/redwood/vert
+ initial_flooring = /datum/decl/flooring/wood/redwood/vert
/turf/simulated/floor/wood/redwood/vert_panel
icon = 'icons/turf/flooring/wood_greyscale.dmi'
icon_state = "wood_vert_panel"
- initial_flooring = /decl/flooring/wood/redwood/vert_panel
+ initial_flooring = /datum/decl/flooring/wood/redwood/vert_panel
diff --git a/code/game/turfs/flooring/flooring_vr.dm b/code/game/turfs/flooring/flooring_vr.dm
index b12f646bab..1450ddb2fc 100644
--- a/code/game/turfs/flooring/flooring_vr.dm
+++ b/code/game/turfs/flooring/flooring_vr.dm
@@ -3,26 +3,26 @@
desc = "This slick flesh ripples and squishes under your touch"
icon = 'icons/turf/stomach_vr.dmi'
icon_state = "flesh_floor"
- initial_flooring = /decl/flooring/flesh
+ initial_flooring = /datum/decl/flooring/flesh
/turf/simulated/floor/flesh/colour
icon_state = "c_flesh_floor"
- initial_flooring = /decl/flooring/flesh
+ initial_flooring = /datum/decl/flooring/flesh
/turf/simulated/floor/flesh/attackby()
return
-/decl/flooring/flesh
+/datum/decl/flooring/flesh
name = "flesh"
desc = "This slick flesh ripples and squishes under your touch"
icon = 'icons/turf/stomach_vr.dmi'
icon_base = "flesh_floor"
-/decl/flooring/grass/outdoors
+/datum/decl/flooring/grass/outdoors
flags = NONE
build_type = null
-/decl/flooring/grass/outdoors/forest
+/datum/decl/flooring/grass/outdoors/forest
icon = 'icons/turf/outdoors.dmi'
icon_base = "grass-dark"
@@ -33,9 +33,9 @@
name = "processing strata"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_state = "rcircuit"
- initial_flooring = /decl/flooring/reinforced/circuit/red
+ initial_flooring = /datum/decl/flooring/reinforced/circuit/red
-/decl/flooring/reinforced/circuit/red
+/datum/decl/flooring/reinforced/circuit/red
name = "processing strata"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_base = "rcircuit"
@@ -44,9 +44,9 @@
name = "pulsing pattern"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_state = "rcircuitanim"
- initial_flooring = /decl/flooring/reinforced/circuit/red/animated
+ initial_flooring = /datum/decl/flooring/reinforced/circuit/red/animated
-/decl/flooring/reinforced/circuit/red/animated
+/datum/decl/flooring/reinforced/circuit/red/animated
name = "pulsing pattern"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_base = "rcircuitanim"
@@ -55,14 +55,14 @@
name = "dark pattern"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_state = "rcircuitanim_broken"
- initial_flooring = /decl/flooring/reinforced/circuit/red/off
+ initial_flooring = /datum/decl/flooring/reinforced/circuit/red/off
-/decl/flooring/reinforced/circuit/red/off
+/datum/decl/flooring/reinforced/circuit/red/off
name = "dark pattern"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_base = "rcircuitanim_broken"
-/decl/flooring/tiling/milspec
+/datum/decl/flooring/tiling/milspec
name = "milspec floor"
desc = "Scuffed from the passage of countless ground pounders."
icon = 'icons/turf/flooring/tiles_vr.dmi'
@@ -71,7 +71,7 @@
damage_temperature = T0C+1400
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN
build_type = /obj/item/stack/tile/floor/milspec
- plating_type = /decl/flooring/eris_plating/under
+ plating_type = /datum/decl/flooring/eris_plating/under
can_paint = 1
can_engrave = TRUE
@@ -80,12 +80,12 @@
desc = "Scuffed from the passage of countless ground pounders."
icon = 'icons/turf/flooring/tiles_vr.dmi'
icon_state = "milspec"
- initial_flooring = /decl/flooring/tiling/milspec
+ initial_flooring = /datum/decl/flooring/tiling/milspec
/obj/item/stack/tile/floor/milspec
name = "milspec floor tile"
-/decl/flooring/tiling/milspec/sterile
+/datum/decl/flooring/tiling/milspec/sterile
name = "sterile milspec floor"
icon_base = "dark_sterile"
build_type = /obj/item/stack/tile/floor/milspec/sterile
@@ -93,12 +93,12 @@
/turf/simulated/floor/tiled/milspec/sterile
name = "sterile milspec floor"
icon_state = "dark_sterile"
- initial_flooring = /decl/flooring/tiling/milspec/sterile
+ initial_flooring = /datum/decl/flooring/tiling/milspec/sterile
/obj/item/stack/tile/floor/milspec/sterile
name = "sterile milspec floor tile"
-/decl/flooring/tiling/milspec/raised
+/datum/decl/flooring/tiling/milspec/raised
name = "raised milspec floor"
icon_base = "milspec_tcomms"
build_type = /obj/item/stack/tile/floor/milspec/raised
@@ -106,7 +106,7 @@
/turf/simulated/floor/tiled/milspec/raised
name = "raised milspec floor"
icon_state = "milspec_tcomms"
- initial_flooring = /decl/flooring/tiling/milspec/raised
+ initial_flooring = /datum/decl/flooring/tiling/milspec/raised
/obj/item/stack/tile/floor/milspec/raised
name = "raised milspec floor tile"
diff --git a/code/game/turfs/flooring/gas_cracks.dm b/code/game/turfs/flooring/gas_cracks.dm
index dc3081cca5..e9d5935271 100644
--- a/code/game/turfs/flooring/gas_cracks.dm
+++ b/code/game/turfs/flooring/gas_cracks.dm
@@ -18,7 +18,7 @@
description_info = "Fluid pumps can be used to frack for reagents in nearby ores, and a mining drill can also bore through trapped gas deposits beneath it."
name = "cracked sand"
icon_state = "asteroid_cracked"
- initial_flooring = /decl/flooring/rock
+ initial_flooring = /datum/decl/flooring/rock
var/list/gas_type = null
oxygen = 0
nitrogen = 0
diff --git a/code/game/turfs/flooring/seasonal.dm b/code/game/turfs/flooring/seasonal.dm
index 54ee57879c..901ce8ed88 100644
--- a/code/game/turfs/flooring/seasonal.dm
+++ b/code/game/turfs/flooring/seasonal.dm
@@ -26,7 +26,7 @@ GLOBAL_VAR(world_time_day)
icon_edge = 'icons/seasonal/turf_edge.dmi'
- initial_flooring = /decl/flooring/grass/seasonal_grass
+ initial_flooring = /datum/decl/flooring/grass/seasonal_grass
grass = null //CHOMPEdit
var/static/list/overlays_cache = list()
@@ -149,7 +149,7 @@ GLOBAL_VAR(world_time_day)
/turf/simulated/floor/outdoors/grass/seasonal/dark
icon_state = "ds-grass"
edge_blending_priority = 4.01
- initial_flooring = /decl/flooring/grass/seasonal_grass/dark
+ initial_flooring = /datum/decl/flooring/grass/seasonal_grass/dark
tree_chance = 5
/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees
tree_chance = 0
diff --git a/code/game/turfs/glamour_turfs.dm b/code/game/turfs/glamour_turfs.dm
index a3fc953db1..a43f6138da 100644
--- a/code/game/turfs/glamour_turfs.dm
+++ b/code/game/turfs/glamour_turfs.dm
@@ -18,9 +18,9 @@
name = "wooden floor"
icon = 'icons/turf/flooring/glamour.dmi'
icon_state = "wood"
- initial_flooring = /decl/flooring/wood/glamour
+ initial_flooring = /datum/decl/flooring/wood/glamour
-/decl/flooring/wood/glamour
+/datum/decl/flooring/wood/glamour
name = "wooden glamour"
desc = "Polished glamourwood planks."
icon = 'icons/turf/flooring/glamour.dmi'
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 11e36d0090..541a0bf7a5 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -19,7 +19,7 @@
// Flooring data.
var/flooring_override
var/initial_flooring
- var/decl/flooring/flooring
+ var/datum/decl/flooring/flooring
var/mineral = DEFAULT_WALL_MATERIAL
var/can_be_plated = TRUE // This is here for inheritance's sake. Override to FALSE for turfs you don't want someone to simply slap a plating over such as hazards.
@@ -50,7 +50,7 @@
decals = old_decals
old_decals = current_decals
-/turf/simulated/floor/proc/set_flooring(var/decl/flooring/newflooring, var/initializing)
+/turf/simulated/floor/proc/set_flooring(var/datum/decl/flooring/newflooring, var/initializing)
//make_plating(defer_icon_update = 1)
if(is_plating() && !initializing) // Plating -> Flooring
swap_decals()
diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm
index d43c7a08c9..4174d3e22c 100644
--- a/code/game/turfs/simulated/floor_attackby.dm
+++ b/code/game/turfs/simulated/floor_attackby.dm
@@ -100,9 +100,9 @@
to_chat(user, span_warning("This section is too damaged to support anything. Use a welder to fix the damage."))
return
var/obj/item/stack/S = C
- var/decl/flooring/use_flooring
+ var/datum/decl/flooring/use_flooring
for(var/flooring_type in GLOB.flooring_types)
- var/decl/flooring/F = GLOB.flooring_types[flooring_type]
+ var/datum/decl/flooring/F = GLOB.flooring_types[flooring_type]
if(!F.build_type)
continue
if((S.type == F.build_type) || (S.build_type == F.build_type))
diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm
index 9709bdab76..bb31a3e91d 100644
--- a/code/game/turfs/simulated/floor_icon.dm
+++ b/code/game/turfs/simulated/floor_icon.dm
@@ -131,7 +131,7 @@ var/image/no_ceiling_image = null
//Tests whether this flooring will smooth with the specified turf
//You can override this if you want a flooring to have super special snowflake smoothing behaviour
-/decl/flooring/proc/test_link(var/turf/origin, var/turf/T, var/countercheck = FALSE)
+/datum/decl/flooring/proc/test_link(var/turf/origin, var/turf/T, var/countercheck = FALSE)
var/is_linked = FALSE
if (countercheck)
diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm
index 27b073067a..98bcf8c10d 100644
--- a/code/game/turfs/simulated/floor_types.dm
+++ b/code/game/turfs/simulated/floor_types.dm
@@ -303,7 +303,7 @@
/turf/simulated/floor/tiled/material
icon = 'icons/turf/floors.dmi'
-/decl/flooring/tiling/material
+/datum/decl/flooring/tiling/material
name = "material floor"
icon_base = "steel"
icon = 'icons/turf/floors.dmi'
@@ -311,45 +311,45 @@
/turf/simulated/floor/tiled/material/uranium
icon_state = "uranium"
- initial_flooring = /decl/flooring/tiling/material/uranium
+ initial_flooring = /datum/decl/flooring/tiling/material/uranium
-/decl/flooring/tiling/material/uranium
+/datum/decl/flooring/tiling/material/uranium
name = "uranium floor"
icon_base = "uranium"
build_type = /obj/item/stack/tile/floor/uranium
/turf/simulated/floor/tiled/material/phoron
icon_state = "phoron"
- initial_flooring = /decl/flooring/tiling/material/phoron
+ initial_flooring = /datum/decl/flooring/tiling/material/phoron
-/decl/flooring/tiling/material/phoron
+/datum/decl/flooring/tiling/material/phoron
name = "phoron floor"
icon_base = "phoron"
build_type = /obj/item/stack/tile/floor/phoron
/turf/simulated/floor/tiled/material/gold
icon_state = "gold"
- initial_flooring = /decl/flooring/tiling/material/gold
+ initial_flooring = /datum/decl/flooring/tiling/material/gold
-/decl/flooring/tiling/material/gold
+/datum/decl/flooring/tiling/material/gold
name = "gold floor"
icon_base = "gold"
build_type = /obj/item/stack/tile/floor/gold
/turf/simulated/floor/tiled/material/silver
icon_state = "silver"
- initial_flooring = /decl/flooring/tiling/material/silver
+ initial_flooring = /datum/decl/flooring/tiling/material/silver
-/decl/flooring/tiling/material/silver
+/datum/decl/flooring/tiling/material/silver
name = "silver floor"
icon_base = "silver"
build_type = /obj/item/stack/tile/floor/silver
/turf/simulated/floor/tiled/material/diamond
icon_state = "diamond"
- initial_flooring = /decl/flooring/tiling/material/diamond
+ initial_flooring = /datum/decl/flooring/tiling/material/diamond
-/decl/flooring/tiling/material/diamond
+/datum/decl/flooring/tiling/material/diamond
name = "diamond floor"
icon_base = "diamond"
build_type = /obj/item/stack/tile/floor/diamond
diff --git a/code/game/turfs/simulated/floor_types_eris.dm b/code/game/turfs/simulated/floor_types_eris.dm
index cb633cbf42..32ba987e61 100644
--- a/code/game/turfs/simulated/floor_types_eris.dm
+++ b/code/game/turfs/simulated/floor_types_eris.dm
@@ -3,7 +3,7 @@
/// ERIS FLOOR DECLS ///////
////////////////////////////
-/decl/flooring/tiling/eris
+/datum/decl/flooring/tiling/eris
name = "floor"
desc = "Scuffed from the passage of countless greyshirts."
icon = 'icons/turf/flooring/eris/tiles.dmi'
@@ -14,11 +14,11 @@
build_type = /obj/item/stack/tile/floor/eris
can_paint = 1
- plating_type = /decl/flooring/eris_plating/under
+ plating_type = /datum/decl/flooring/eris_plating/under
floor_smooth = SMOOTH_WHITELIST
flooring_whitelist = list(
- /decl/flooring/eris_plating/under
+ /datum/decl/flooring/eris_plating/under
)
smooth_movable_atom = SMOOTH_GREYLIST
@@ -30,229 +30,229 @@
list(/obj/structure/window, list("anchored" = TRUE, "fulltile" = TRUE), 2) // Don't blend under full windows
)
-/decl/flooring/tiling/eris/steel
+/datum/decl/flooring/tiling/eris/steel
name = "steel floor"
icon_base = "tiles"
icon = 'icons/turf/flooring/eris/tiles_steel.dmi'
build_type = /obj/item/stack/tile/floor/eris/steel
-/decl/flooring/tiling/eris/steel/panels
+/datum/decl/flooring/tiling/eris/steel/panels
icon_base = "panels"
build_type = /obj/item/stack/tile/floor/eris/steel/panels
-/decl/flooring/tiling/eris/steel/techfloor
+/datum/decl/flooring/tiling/eris/steel/techfloor
icon_base = "techfloor"
build_type = /obj/item/stack/tile/floor/eris/steel/techfloor
-/decl/flooring/tiling/eris/steel/techfloor_grid
+/datum/decl/flooring/tiling/eris/steel/techfloor_grid
icon_base = "techfloor_grid"
build_type = /obj/item/stack/tile/floor/eris/steel/techfloor_grid
-/decl/flooring/tiling/eris/steel/brown_perforated
+/datum/decl/flooring/tiling/eris/steel/brown_perforated
icon_base = "brown_perforated"
build_type = /obj/item/stack/tile/floor/eris/steel/brown_perforated
-/decl/flooring/tiling/eris/steel/gray_perforated
+/datum/decl/flooring/tiling/eris/steel/gray_perforated
icon_base = "gray_perforated"
build_type = /obj/item/stack/tile/floor/eris/steel/gray_perforated
-/decl/flooring/tiling/eris/steel/cargo
+/datum/decl/flooring/tiling/eris/steel/cargo
icon_base = "cargo"
build_type = /obj/item/stack/tile/floor/eris/steel/cargo
-/decl/flooring/tiling/eris/steel/brown_platform
+/datum/decl/flooring/tiling/eris/steel/brown_platform
icon_base = "brown_platform"
build_type = /obj/item/stack/tile/floor/eris/steel/brown_platform
-/decl/flooring/tiling/eris/steel/gray_platform
+/datum/decl/flooring/tiling/eris/steel/gray_platform
icon_base = "gray_platform"
build_type = /obj/item/stack/tile/floor/eris/steel/gray_platform
-/decl/flooring/tiling/eris/steel/danger
+/datum/decl/flooring/tiling/eris/steel/danger
icon_base = "danger"
build_type = /obj/item/stack/tile/floor/eris/steel/danger
-/decl/flooring/tiling/eris/steel/golden
+/datum/decl/flooring/tiling/eris/steel/golden
icon_base = "golden"
build_type = /obj/item/stack/tile/floor/eris/steel/golden
-/decl/flooring/tiling/eris/steel/bluecorner
+/datum/decl/flooring/tiling/eris/steel/bluecorner
icon_base = "bluecorner"
build_type = /obj/item/stack/tile/floor/eris/steel/bluecorner
-/decl/flooring/tiling/eris/steel/orangecorner
+/datum/decl/flooring/tiling/eris/steel/orangecorner
icon_base = "orangecorner"
build_type = /obj/item/stack/tile/floor/eris/steel/orangecorner
-/decl/flooring/tiling/eris/steel/cyancorner
+/datum/decl/flooring/tiling/eris/steel/cyancorner
icon_base = "cyancorner"
build_type = /obj/item/stack/tile/floor/eris/steel/cyancorner
-/decl/flooring/tiling/eris/steel/violetcorener
+/datum/decl/flooring/tiling/eris/steel/violetcorener
icon_base = "violetcorener"
build_type = /obj/item/stack/tile/floor/eris/steel/violetcorener
-/decl/flooring/tiling/eris/steel/monofloor
+/datum/decl/flooring/tiling/eris/steel/monofloor
icon_base = "monofloor"
build_type = /obj/item/stack/tile/floor/eris/steel/monofloor
has_base_range = 15
-/decl/flooring/tiling/eris/steel/bar_flat
+/datum/decl/flooring/tiling/eris/steel/bar_flat
name = "flat bar floor"
icon_base = "bar_flat"
build_type = /obj/item/stack/tile/floor/eris/steel/bar_flat
floor_smooth = SMOOTH_NONE
smooth_movable_atom = SMOOTH_NONE
-/decl/flooring/tiling/eris/steel/bar_dance
+/datum/decl/flooring/tiling/eris/steel/bar_dance
name = "dancefloor"
icon_base = "bar_dance"
build_type = /obj/item/stack/tile/floor/eris/steel/bar_dance
floor_smooth = SMOOTH_NONE
smooth_movable_atom = SMOOTH_NONE
-/decl/flooring/tiling/eris/steel/bar_light
+/datum/decl/flooring/tiling/eris/steel/bar_light
name = "lit bar floor"
icon_base = "bar_light"
build_type = /obj/item/stack/tile/floor/eris/steel/bar_light
floor_smooth = SMOOTH_NONE
smooth_movable_atom = SMOOTH_NONE
-/decl/flooring/tiling/eris/white
+/datum/decl/flooring/tiling/eris/white
name = "white floor"
icon_base = "tiles"
icon = 'icons/turf/flooring/eris/tiles_white.dmi'
build_type = /obj/item/stack/tile/floor/eris/white
-/decl/flooring/tiling/eris/white/panels
+/datum/decl/flooring/tiling/eris/white/panels
icon_base = "panels"
build_type = /obj/item/stack/tile/floor/eris/white/panels
-/decl/flooring/tiling/eris/white/techfloor
+/datum/decl/flooring/tiling/eris/white/techfloor
icon_base = "techfloor"
build_type = /obj/item/stack/tile/floor/eris/white/techfloor
-/decl/flooring/tiling/eris/white/techfloor_grid
+/datum/decl/flooring/tiling/eris/white/techfloor_grid
icon_base = "techfloor_grid"
build_type = /obj/item/stack/tile/floor/eris/white/techfloor_grid
-/decl/flooring/tiling/eris/white/brown_perforated
+/datum/decl/flooring/tiling/eris/white/brown_perforated
icon_base = "brown_perforated"
build_type = /obj/item/stack/tile/floor/eris/white/brown_perforated
-/decl/flooring/tiling/eris/white/gray_perforated
+/datum/decl/flooring/tiling/eris/white/gray_perforated
icon_base = "gray_perforated"
build_type = /obj/item/stack/tile/floor/eris/white/gray_perforated
-/decl/flooring/tiling/eris/white/cargo
+/datum/decl/flooring/tiling/eris/white/cargo
icon_base = "cargo"
build_type = /obj/item/stack/tile/floor/eris/white/cargo
-/decl/flooring/tiling/eris/white/brown_platform
+/datum/decl/flooring/tiling/eris/white/brown_platform
icon_base = "brown_platform"
build_type = /obj/item/stack/tile/floor/eris/white/brown_platform
-/decl/flooring/tiling/eris/white/gray_platform
+/datum/decl/flooring/tiling/eris/white/gray_platform
icon_base = "gray_platform"
build_type = /obj/item/stack/tile/floor/eris/white/gray_platform
-/decl/flooring/tiling/eris/white/danger
+/datum/decl/flooring/tiling/eris/white/danger
icon_base = "danger"
build_type = /obj/item/stack/tile/floor/eris/white/danger
-/decl/flooring/tiling/eris/white/golden
+/datum/decl/flooring/tiling/eris/white/golden
icon_base = "golden"
build_type = /obj/item/stack/tile/floor/eris/white/golden
-/decl/flooring/tiling/eris/white/bluecorner
+/datum/decl/flooring/tiling/eris/white/bluecorner
icon_base = "bluecorner"
build_type = /obj/item/stack/tile/floor/eris/white/bluecorner
-/decl/flooring/tiling/eris/white/orangecorner
+/datum/decl/flooring/tiling/eris/white/orangecorner
icon_base = "orangecorner"
build_type = /obj/item/stack/tile/floor/eris/white/orangecorner
-/decl/flooring/tiling/eris/white/cyancorner
+/datum/decl/flooring/tiling/eris/white/cyancorner
icon_base = "cyancorner"
build_type = /obj/item/stack/tile/floor/eris/white/cyancorner
-/decl/flooring/tiling/eris/white/violetcorener
+/datum/decl/flooring/tiling/eris/white/violetcorener
icon_base = "violetcorener"
build_type = /obj/item/stack/tile/floor/eris/white/violetcorener
-/decl/flooring/tiling/eris/white/monofloor
+/datum/decl/flooring/tiling/eris/white/monofloor
icon_base = "monofloor"
build_type = /obj/item/stack/tile/floor/eris/white/monofloor
has_base_range = 15
-/decl/flooring/tiling/eris/dark
+/datum/decl/flooring/tiling/eris/dark
name = "dark floor"
icon_base = "tiles"
icon = 'icons/turf/flooring/eris/tiles_dark.dmi'
build_type = /obj/item/stack/tile/floor/eris/dark
-/decl/flooring/tiling/eris/dark/panels
+/datum/decl/flooring/tiling/eris/dark/panels
icon_base = "panels"
build_type = /obj/item/stack/tile/floor/eris/dark/panels
-/decl/flooring/tiling/eris/dark/techfloor
+/datum/decl/flooring/tiling/eris/dark/techfloor
icon_base = "techfloor"
build_type = /obj/item/stack/tile/floor/eris/dark/techfloor
-/decl/flooring/tiling/eris/dark/techfloor_grid
+/datum/decl/flooring/tiling/eris/dark/techfloor_grid
icon_base = "techfloor_grid"
build_type = /obj/item/stack/tile/floor/eris/dark/techfloor_grid
-/decl/flooring/tiling/eris/dark/brown_perforated
+/datum/decl/flooring/tiling/eris/dark/brown_perforated
icon_base = "brown_perforated"
build_type = /obj/item/stack/tile/floor/eris/dark/brown_perforated
-/decl/flooring/tiling/eris/dark/gray_perforated
+/datum/decl/flooring/tiling/eris/dark/gray_perforated
icon_base = "gray_perforated"
build_type = /obj/item/stack/tile/floor/eris/dark/gray_perforated
-/decl/flooring/tiling/eris/dark/cargo
+/datum/decl/flooring/tiling/eris/dark/cargo
icon_base = "cargo"
build_type = /obj/item/stack/tile/floor/eris/dark/cargo
-/decl/flooring/tiling/eris/dark/brown_platform
+/datum/decl/flooring/tiling/eris/dark/brown_platform
icon_base = "brown_platform"
build_type = /obj/item/stack/tile/floor/eris/dark/brown_platform
-/decl/flooring/tiling/eris/dark/gray_platform
+/datum/decl/flooring/tiling/eris/dark/gray_platform
icon_base = "gray_platform"
build_type = /obj/item/stack/tile/floor/eris/dark/gray_platform
-/decl/flooring/tiling/eris/dark/danger
+/datum/decl/flooring/tiling/eris/dark/danger
icon_base = "danger"
build_type = /obj/item/stack/tile/floor/eris/dark/danger
-/decl/flooring/tiling/eris/dark/golden
+/datum/decl/flooring/tiling/eris/dark/golden
icon_base = "golden"
build_type = /obj/item/stack/tile/floor/eris/dark/golden
-/decl/flooring/tiling/eris/dark/bluecorner
+/datum/decl/flooring/tiling/eris/dark/bluecorner
icon_base = "bluecorner"
build_type = /obj/item/stack/tile/floor/eris/dark/bluecorner
-/decl/flooring/tiling/eris/dark/orangecorner
+/datum/decl/flooring/tiling/eris/dark/orangecorner
icon_base = "orangecorner"
build_type = /obj/item/stack/tile/floor/eris/dark/orangecorner
-/decl/flooring/tiling/eris/dark/cyancorner
+/datum/decl/flooring/tiling/eris/dark/cyancorner
icon_base = "cyancorner"
build_type = /obj/item/stack/tile/floor/eris/dark/cyancorner
-/decl/flooring/tiling/eris/dark/violetcorener
+/datum/decl/flooring/tiling/eris/dark/violetcorener
icon_base = "violetcorener"
build_type = /obj/item/stack/tile/floor/eris/dark/violetcorener
-/decl/flooring/tiling/eris/dark/monofloor
+/datum/decl/flooring/tiling/eris/dark/monofloor
icon_base = "monofloor"
build_type = /obj/item/stack/tile/floor/eris/dark/monofloor
has_base_range = 15
-/decl/flooring/tiling/eris/cafe
+/datum/decl/flooring/tiling/eris/cafe
name = "linoleum floor"
icon_base = "cafe"
icon = 'icons/turf/flooring/eris/tiles.dmi'
@@ -260,7 +260,7 @@
floor_smooth = SMOOTH_NONE
smooth_movable_atom = SMOOTH_NONE
-/decl/flooring/tiling/eris/bcircuit
+/datum/decl/flooring/tiling/eris/bcircuit
name = "circuit substrate"
icon_base = "bcircuit"
icon = 'icons/turf/flooring/eris/circuit.dmi'
@@ -269,7 +269,7 @@
smooth_movable_atom = SMOOTH_NONE
flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_CAN_BREAK
-/decl/flooring/tiling/eris/derelict1
+/datum/decl/flooring/tiling/eris/derelict1
name = "derelict floor"
icon_base = "derelict1"
icon = 'icons/turf/flooring/eris/derelict.dmi'
@@ -278,7 +278,7 @@
smooth_movable_atom = SMOOTH_NONE
flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR | TURF_CAN_BREAK
-/decl/flooring/tiling/eris/derelict2
+/datum/decl/flooring/tiling/eris/derelict2
name = "derelict floor"
icon_base = "derelict2"
icon = 'icons/turf/flooring/eris/derelict.dmi'
@@ -287,7 +287,7 @@
smooth_movable_atom = SMOOTH_NONE
flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR | TURF_CAN_BREAK
-/decl/flooring/tiling/eris/derelict3
+/datum/decl/flooring/tiling/eris/derelict3
name = "derelict floor"
icon_base = "derelict3"
icon = 'icons/turf/flooring/eris/derelict.dmi'
@@ -296,7 +296,7 @@
smooth_movable_atom = SMOOTH_NONE
flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR | TURF_CAN_BREAK
-/decl/flooring/tiling/eris/derelict4
+/datum/decl/flooring/tiling/eris/derelict4
name = "derelict floor"
icon_base = "derelict4"
icon = 'icons/turf/flooring/eris/derelict.dmi'
@@ -305,7 +305,7 @@
smooth_movable_atom = SMOOTH_NONE
flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR | TURF_CAN_BREAK
-/decl/flooring/tiling/eris/techmaint
+/datum/decl/flooring/tiling/eris/techmaint
name = "techmaint floor"
icon_base = "techmaint"
icon = 'icons/turf/flooring/eris/tiles_maint.dmi'
@@ -313,7 +313,7 @@
floor_smooth = SMOOTH_NONE
smooth_movable_atom = SMOOTH_NONE
-/decl/flooring/tiling/eris/techmaint_perforated
+/datum/decl/flooring/tiling/eris/techmaint_perforated
name = "techmaint floor"
icon_base = "techmaint_perforated"
icon = 'icons/turf/flooring/eris/tiles_maint.dmi'
@@ -321,7 +321,7 @@
floor_smooth = SMOOTH_NONE
smooth_movable_atom = SMOOTH_NONE
-/decl/flooring/tiling/eris/techmaint_panels
+/datum/decl/flooring/tiling/eris/techmaint_panels
name = "techmaint floor"
icon_base = "techmaint_panels"
icon = 'icons/turf/flooring/eris/tiles_maint.dmi'
@@ -329,7 +329,7 @@
floor_smooth = SMOOTH_NONE
smooth_movable_atom = SMOOTH_NONE
-/decl/flooring/tiling/eris/techmaint_cargo
+/datum/decl/flooring/tiling/eris/techmaint_cargo
name = "techmaint floor"
icon_base = "techmaint_cargo"
icon = 'icons/turf/flooring/eris/tiles_maint.dmi'
@@ -681,7 +681,7 @@
name = "floor"
icon = 'icons/turf/flooring/eris/tiles.dmi'
icon_state = "tiles"
- initial_flooring = /decl/flooring/tiling/eris
+ initial_flooring = /datum/decl/flooring/tiling/eris
@@ -690,79 +690,79 @@
name = "floor"
icon = 'icons/turf/flooring/eris/tiles_steel.dmi'
icon_state = "tiles"
- initial_flooring = /decl/flooring/tiling/eris/steel
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel
/turf/simulated/floor/tiled/eris/steel/panels
icon_state = "panels"
- initial_flooring = /decl/flooring/tiling/eris/steel/panels
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/panels
/turf/simulated/floor/tiled/eris/steel/techfloor
icon_state = "techfloor"
- initial_flooring = /decl/flooring/tiling/eris/steel/techfloor
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/techfloor
/turf/simulated/floor/tiled/eris/steel/techfloor_grid
icon_state = "techfloor_grid"
- initial_flooring = /decl/flooring/tiling/eris/steel/techfloor_grid
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/techfloor_grid
/turf/simulated/floor/tiled/eris/steel/brown_perforated
icon_state = "brown_perforated"
- initial_flooring = /decl/flooring/tiling/eris/steel/brown_perforated
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/brown_perforated
/turf/simulated/floor/tiled/eris/steel/gray_perforated
icon_state = "gray_perforated"
- initial_flooring = /decl/flooring/tiling/eris/steel/gray_perforated
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/gray_perforated
/turf/simulated/floor/tiled/eris/steel/cargo
icon_state = "cargo"
- initial_flooring = /decl/flooring/tiling/eris/steel/cargo
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/cargo
/turf/simulated/floor/tiled/eris/steel/brown_platform
icon_state = "brown_platform"
- initial_flooring = /decl/flooring/tiling/eris/steel/brown_platform
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/brown_platform
/turf/simulated/floor/tiled/eris/steel/gray_platform
icon_state = "gray_platform"
- initial_flooring = /decl/flooring/tiling/eris/steel/gray_platform
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/gray_platform
/turf/simulated/floor/tiled/eris/steel/danger
icon_state = "danger"
- initial_flooring = /decl/flooring/tiling/eris/steel/danger
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/danger
/turf/simulated/floor/tiled/eris/steel/golden
icon_state = "golden"
- initial_flooring = /decl/flooring/tiling/eris/steel/golden
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/golden
/turf/simulated/floor/tiled/eris/steel/bluecorner
icon_state = "bluecorner"
- initial_flooring = /decl/flooring/tiling/eris/steel/bluecorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/bluecorner
/turf/simulated/floor/tiled/eris/steel/orangecorner
icon_state = "orangecorner"
- initial_flooring = /decl/flooring/tiling/eris/steel/orangecorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/orangecorner
/turf/simulated/floor/tiled/eris/steel/cyancorner
icon_state = "cyancorner"
- initial_flooring = /decl/flooring/tiling/eris/steel/cyancorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/cyancorner
/turf/simulated/floor/tiled/eris/steel/violetcorener
icon_state = "violetcorener"
- initial_flooring = /decl/flooring/tiling/eris/steel/violetcorener
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/violetcorener
/turf/simulated/floor/tiled/eris/steel/monofloor
icon_state = "monofloor"
- initial_flooring = /decl/flooring/tiling/eris/steel/monofloor
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/monofloor
/turf/simulated/floor/tiled/eris/steel/bar_flat
icon_state = "bar_flat"
- initial_flooring = /decl/flooring/tiling/eris/steel/bar_flat
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/bar_flat
/turf/simulated/floor/tiled/eris/steel/bar_dance
icon_state = "bar_dance"
- initial_flooring = /decl/flooring/tiling/eris/steel/bar_dance
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/bar_dance
/turf/simulated/floor/tiled/eris/steel/bar_light
icon_state = "bar_light"
- initial_flooring = /decl/flooring/tiling/eris/steel/bar_light
+ initial_flooring = /datum/decl/flooring/tiling/eris/steel/bar_light
/turf/simulated/floor/tiled/eris/steel/bar_light/Initialize(mapload)
. = ..()
@@ -775,67 +775,67 @@
name = "floor"
icon = 'icons/turf/flooring/eris/tiles_white.dmi'
icon_state = "tiles"
- initial_flooring = /decl/flooring/tiling/eris/white
+ initial_flooring = /datum/decl/flooring/tiling/eris/white
/turf/simulated/floor/tiled/eris/white/panels
icon_state = "panels"
- initial_flooring = /decl/flooring/tiling/eris/white/panels
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/panels
/turf/simulated/floor/tiled/eris/white/techfloor
icon_state = "techfloor"
- initial_flooring = /decl/flooring/tiling/eris/white/techfloor
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/techfloor
/turf/simulated/floor/tiled/eris/white/techfloor_grid
icon_state = "techfloor_grid"
- initial_flooring = /decl/flooring/tiling/eris/white/techfloor_grid
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/techfloor_grid
/turf/simulated/floor/tiled/eris/white/brown_perforated
icon_state = "brown_perforated"
- initial_flooring = /decl/flooring/tiling/eris/white/brown_perforated
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/brown_perforated
/turf/simulated/floor/tiled/eris/white/gray_perforated
icon_state = "gray_perforated"
- initial_flooring = /decl/flooring/tiling/eris/white/gray_perforated
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/gray_perforated
/turf/simulated/floor/tiled/eris/white/cargo
icon_state = "cargo"
- initial_flooring = /decl/flooring/tiling/eris/white/cargo
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/cargo
/turf/simulated/floor/tiled/eris/white/brown_platform
icon_state = "brown_platform"
- initial_flooring = /decl/flooring/tiling/eris/white/brown_platform
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/brown_platform
/turf/simulated/floor/tiled/eris/white/gray_platform
icon_state = "gray_platform"
- initial_flooring = /decl/flooring/tiling/eris/white/gray_platform
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/gray_platform
/turf/simulated/floor/tiled/eris/white/danger
icon_state = "danger"
- initial_flooring = /decl/flooring/tiling/eris/white/danger
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/danger
/turf/simulated/floor/tiled/eris/white/golden
icon_state = "golden"
- initial_flooring = /decl/flooring/tiling/eris/white/golden
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/golden
/turf/simulated/floor/tiled/eris/white/bluecorner
icon_state = "bluecorner"
- initial_flooring = /decl/flooring/tiling/eris/white/bluecorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/bluecorner
/turf/simulated/floor/tiled/eris/white/orangecorner
icon_state = "orangecorner"
- initial_flooring = /decl/flooring/tiling/eris/white/orangecorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/orangecorner
/turf/simulated/floor/tiled/eris/white/cyancorner
icon_state = "cyancorner"
- initial_flooring = /decl/flooring/tiling/eris/white/cyancorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/cyancorner
/turf/simulated/floor/tiled/eris/white/violetcorener
icon_state = "violetcorener"
- initial_flooring = /decl/flooring/tiling/eris/white/violetcorener
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/violetcorener
/turf/simulated/floor/tiled/eris/white/monofloor
icon_state = "monofloor"
- initial_flooring = /decl/flooring/tiling/eris/white/monofloor
+ initial_flooring = /datum/decl/flooring/tiling/eris/white/monofloor
@@ -844,67 +844,67 @@
name = "floor"
icon = 'icons/turf/flooring/eris/tiles_dark.dmi'
icon_state = "tiles"
- initial_flooring = /decl/flooring/tiling/eris/dark
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark
/turf/simulated/floor/tiled/eris/dark/panels
icon_state = "panels"
- initial_flooring = /decl/flooring/tiling/eris/dark/panels
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/panels
/turf/simulated/floor/tiled/eris/dark/techfloor
icon_state = "techfloor"
- initial_flooring = /decl/flooring/tiling/eris/dark/techfloor
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/techfloor
/turf/simulated/floor/tiled/eris/dark/techfloor_grid
icon_state = "techfloor_grid"
- initial_flooring = /decl/flooring/tiling/eris/dark/techfloor_grid
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/techfloor_grid
/turf/simulated/floor/tiled/eris/dark/brown_perforated
icon_state = "brown_perforated"
- initial_flooring = /decl/flooring/tiling/eris/dark/brown_perforated
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/brown_perforated
/turf/simulated/floor/tiled/eris/dark/gray_perforated
icon_state = "gray_perforated"
- initial_flooring = /decl/flooring/tiling/eris/dark/gray_perforated
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/gray_perforated
/turf/simulated/floor/tiled/eris/dark/cargo
icon_state = "cargo"
- initial_flooring = /decl/flooring/tiling/eris/dark/cargo
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/cargo
/turf/simulated/floor/tiled/eris/dark/brown_platform
icon_state = "brown_platform"
- initial_flooring = /decl/flooring/tiling/eris/dark/brown_platform
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/brown_platform
/turf/simulated/floor/tiled/eris/dark/gray_platform
icon_state = "gray_platform"
- initial_flooring = /decl/flooring/tiling/eris/dark/gray_platform
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/gray_platform
/turf/simulated/floor/tiled/eris/dark/danger
icon_state = "danger"
- initial_flooring = /decl/flooring/tiling/eris/dark/danger
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/danger
/turf/simulated/floor/tiled/eris/dark/golden
icon_state = "golden"
- initial_flooring = /decl/flooring/tiling/eris/dark/golden
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/golden
/turf/simulated/floor/tiled/eris/dark/bluecorner
icon_state = "bluecorner"
- initial_flooring = /decl/flooring/tiling/eris/dark/bluecorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/bluecorner
/turf/simulated/floor/tiled/eris/dark/orangecorner
icon_state = "orangecorner"
- initial_flooring = /decl/flooring/tiling/eris/dark/orangecorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/orangecorner
/turf/simulated/floor/tiled/eris/dark/cyancorner
icon_state = "cyancorner"
- initial_flooring = /decl/flooring/tiling/eris/dark/cyancorner
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/cyancorner
/turf/simulated/floor/tiled/eris/dark/violetcorener
icon_state = "violetcorener"
- initial_flooring = /decl/flooring/tiling/eris/dark/violetcorener
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/violetcorener
/turf/simulated/floor/tiled/eris/dark/monofloor
icon_state = "monofloor"
- initial_flooring = /decl/flooring/tiling/eris/dark/monofloor
+ initial_flooring = /datum/decl/flooring/tiling/eris/dark/monofloor
@@ -913,64 +913,64 @@
name = "floor"
icon = 'icons/turf/flooring/eris/tiles.dmi'
icon_state = "cafe"
- initial_flooring = /decl/flooring/tiling/eris/cafe
+ initial_flooring = /datum/decl/flooring/tiling/eris/cafe
/turf/simulated/floor/tiled/eris/bcircuit
name = "substrate"
icon = 'icons/turf/flooring/eris/circuit.dmi'
icon_state = "bcircuit"
- initial_flooring = /decl/flooring/tiling/eris/bcircuit
+ initial_flooring = /datum/decl/flooring/tiling/eris/bcircuit
/turf/simulated/floor/tiled/eris/derelict1
name = "floor"
icon = 'icons/turf/flooring/eris/derelict.dmi'
icon_state = "derelict1"
- initial_flooring = /decl/flooring/tiling/eris/derelict1
+ initial_flooring = /datum/decl/flooring/tiling/eris/derelict1
/turf/simulated/floor/tiled/eris/derelict2
name = "floor"
icon = 'icons/turf/flooring/eris/derelict.dmi'
icon_state = "derelict2"
- initial_flooring = /decl/flooring/tiling/eris/derelict2
+ initial_flooring = /datum/decl/flooring/tiling/eris/derelict2
/turf/simulated/floor/tiled/eris/derelict3
name = "floor"
icon = 'icons/turf/flooring/eris/derelict.dmi'
icon_state = "derelict3"
- initial_flooring = /decl/flooring/tiling/eris/derelict3
+ initial_flooring = /datum/decl/flooring/tiling/eris/derelict3
/turf/simulated/floor/tiled/eris/derelict4
name = "floor"
icon = 'icons/turf/flooring/eris/derelict.dmi'
icon_state = "derelict4"
- initial_flooring = /decl/flooring/tiling/eris/derelict4
+ initial_flooring = /datum/decl/flooring/tiling/eris/derelict4
/turf/simulated/floor/tiled/eris/techmaint
name = "floor"
icon = 'icons/turf/flooring/eris/tiles_maint.dmi'
icon_state = "techmaint"
- initial_flooring = /decl/flooring/tiling/eris/techmaint
+ initial_flooring = /datum/decl/flooring/tiling/eris/techmaint
/turf/simulated/floor/tiled/eris/techmaint_perforated
name = "floor"
icon = 'icons/turf/flooring/eris/tiles_maint.dmi'
icon_state = "techmaint_perforated"
- initial_flooring = /decl/flooring/tiling/eris/techmaint_perforated
+ initial_flooring = /datum/decl/flooring/tiling/eris/techmaint_perforated
/turf/simulated/floor/tiled/eris/techmaint_panels
name = "floor"
icon = 'icons/turf/flooring/eris/tiles_maint.dmi'
icon_state = "techmaint_panels"
- initial_flooring = /decl/flooring/tiling/eris/techmaint_panels
+ initial_flooring = /datum/decl/flooring/tiling/eris/techmaint_panels
/turf/simulated/floor/tiled/eris/techmaint_cargo
name = "floor"
icon = 'icons/turf/flooring/eris/tiles_maint.dmi'
icon_state = "techmaint_cargo"
- initial_flooring = /decl/flooring/tiling/eris/techmaint_cargo
+ initial_flooring = /datum/decl/flooring/tiling/eris/techmaint_cargo
//=========ERIS GRASS==========\\
-/decl/flooring/grass/heavy
+/datum/decl/flooring/grass/heavy
name = "heavy grass"
desc = "A dense ground coating of grass"
flags = TURF_REMOVE_SHOVEL
@@ -982,7 +982,7 @@
name = "heavy grass"
icon_state = "grass-heavy0"
edge_blending_priority = 4
- initial_flooring = /decl/flooring/grass/heavy
+ initial_flooring = /datum/decl/flooring/grass/heavy
/*turf_layers = list(
/turf/simulated/floor/outdoors/rocks,
/turf/simulated/floor/outdoors/dirt
@@ -993,7 +993,7 @@
//=========Eris Plating==========\\
// This is the light grey tiles with random geometric shapes extruded
-/decl/flooring/eris_plating
+/datum/decl/flooring/eris_plating
name = "reinforced plating"
descriptor = "reinforced plating"
icon = 'icons/turf/flooring/eris/plating.dmi'
@@ -1005,7 +1005,7 @@
build_type = null
- plating_type = /decl/flooring/eris_plating/under
+ plating_type = /datum/decl/flooring/eris_plating/under
/*
footstep_sound = "plating"
@@ -1023,7 +1023,7 @@
name = "reinforced plating"
icon = 'icons/turf/flooring/eris/plating.dmi'
icon_state = "plating"
- initial_flooring = /decl/flooring/eris_plating
+ initial_flooring = /datum/decl/flooring/eris_plating
/turf/simulated/floor/plating/eris/airless
oxygen = 0
@@ -1032,7 +1032,7 @@
//==========Eris Underplating==============\\
// This looks similar to normal plating, but with edges
-/decl/flooring/eris_plating/under
+/datum/decl/flooring/eris_plating/under
name = "underplating"
icon = 'icons/turf/flooring/eris/plating.dmi'
descriptor = "support beams"
@@ -1043,7 +1043,7 @@
floor_smooth = SMOOTH_WHITELIST
flooring_whitelist = list(
- /decl/flooring/tiling/eris
+ /datum/decl/flooring/tiling/eris
)
plating_type = null
@@ -1063,7 +1063,7 @@
/turf/simulated/floor/plating/eris/under
name = "underplating"
icon_state = "under"
- initial_flooring = /decl/flooring/eris_plating/under
+ initial_flooring = /datum/decl/flooring/eris_plating/under
/turf/simulated/floor/plating/eris/under/airless
oxygen = 0
@@ -1072,7 +1072,7 @@
//============Eris Hull Plating=========\\
// This is 'spaceship outside' plating, black with random rounded rectangles.
-/decl/flooring/eris_plating/hull
+/datum/decl/flooring/eris_plating/hull
name = "hull"
descriptor = "outer hull"
icon = 'icons/turf/flooring/eris/hull.dmi'
@@ -1096,14 +1096,14 @@
/* Eris features we lack on flooring decls
//Hull can upgrade to underplating
-/decl/flooring/reinforced/plating/hull/can_build_floor(var/decl/flooring/newfloor)
+/datum/decl/flooring/reinforced/plating/hull/can_build_floor(var/datum/decl/flooring/newfloor)
return FALSE //Not allowed to build directly on hull, you must first remove it and then build on the underplating
-/decl/flooring/reinforced/plating/hull/get_plating_type(var/turf/location)
+/datum/decl/flooring/reinforced/plating/hull/get_plating_type(var/turf/location)
if (turf_is_lower_hull(location)) //Hull plating is only on the lowest level of the ship
return null
else if (turf_is_upper_hull(location))
- return /decl/flooring/reinforced/plating/under
+ return /datum/decl/flooring/reinforced/plating/under
else
return null //This should never happen, hull plawell,ting should only be on the exterior
*/
@@ -1111,7 +1111,7 @@
name = "hull"
icon = 'icons/turf/flooring/eris/hull.dmi'
icon_state = "hullcenter0"
- initial_flooring = /decl/flooring/eris_plating/hull
+ initial_flooring = /datum/decl/flooring/eris_plating/hull
/turf/simulated/floor/hull/airless
oxygen = 0
diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm
index 200d596308..e5e793a1bb 100644
--- a/code/game/turfs/simulated/lava.dm
+++ b/code/game/turfs/simulated/lava.dm
@@ -15,7 +15,7 @@
can_build_into_floor = TRUE
can_be_plated = FALSE
can_dirty = FALSE
- initial_flooring = /decl/flooring/lava // Defining this in case someone DOES step on lava and survive. Somehow.
+ initial_flooring = /datum/decl/flooring/lava // Defining this in case someone DOES step on lava and survive. Somehow.
flags = TURF_ACID_IMMUNE
var/datum/looping_sound/lava/soundloop
@@ -49,7 +49,7 @@
/turf/simulated/floor/lava/make_plating(place_product, defer_icon_update)
return
-/turf/simulated/floor/lava/set_flooring(decl/flooring/newflooring, initializing)
+/turf/simulated/floor/lava/set_flooring(datum/decl/flooring/newflooring, initializing)
if(newflooring?.type == initial_flooring)
return ..()
return
diff --git a/code/game/turfs/simulated/outdoors/dirt.dm b/code/game/turfs/simulated/outdoors/dirt.dm
index b7728583e3..fa9b4b30a9 100644
--- a/code/game/turfs/simulated/outdoors/dirt.dm
+++ b/code/game/turfs/simulated/outdoors/dirt.dm
@@ -4,5 +4,5 @@
icon_state = "dirt-dark"
edge_blending_priority = 2
//turf_layers = list(/turf/simulated/floor/outdoors/rocks) CHOMP Removal
- initial_flooring = /decl/flooring/dirt
+ initial_flooring = /datum/decl/flooring/dirt
can_dig = TRUE
diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm
index 5b0c16334a..45b99d0e35 100644
--- a/code/game/turfs/simulated/outdoors/grass.dm
+++ b/code/game/turfs/simulated/outdoors/grass.dm
@@ -2,7 +2,7 @@
name = "grass"
icon_state = "grass0"
edge_blending_priority = 4
- initial_flooring = /decl/flooring/grass/outdoors // VOREStation Edit
+ initial_flooring = /datum/decl/flooring/grass/outdoors // VOREStation Edit
can_dig = TRUE
/*turf_layers = list( CHOMP Removal Begin
/turf/simulated/floor/outdoors/rocks,
@@ -34,7 +34,7 @@
/turf/simulated/floor/outdoors/grass/sif
name = "growth"
icon_state = "grass_sif0"
- initial_flooring = /decl/flooring/grass/sif
+ initial_flooring = /datum/decl/flooring/grass/sif
edge_blending_priority = 3 // CHOMPedit
grass_chance = 5
var/tree_chance = 0.7 //CHOMPedit
@@ -83,12 +83,12 @@
grass_chance = 50
//tree_chance = 20
edge_blending_priority = 5
- initial_flooring = /decl/flooring/grass/outdoors/forest // VOREStation Edit
+ initial_flooring = /datum/decl/flooring/grass/outdoors/forest // VOREStation Edit
/turf/simulated/floor/outdoors/grass/sif/forest
name = "thick growth"
icon_state = "grass_sif_dark0"
- initial_flooring = /decl/flooring/grass/sif/forest
+ initial_flooring = /datum/decl/flooring/grass/sif/forest
edge_blending_priority = 5
tree_chance = 4
grass_chance = 1
diff --git a/code/game/turfs/simulated/outdoors/ironsand_vr.dm b/code/game/turfs/simulated/outdoors/ironsand_vr.dm
index abd0a3c357..ee167df7b1 100644
--- a/code/game/turfs/simulated/outdoors/ironsand_vr.dm
+++ b/code/game/turfs/simulated/outdoors/ironsand_vr.dm
@@ -4,9 +4,9 @@
icon = 'icons/turf/flooring/ironsand_vr.dmi'
icon_state = "ironsand1"
edge_blending_priority = 1
- initial_flooring = /decl/flooring/outdoors/ironsand
+ initial_flooring = /datum/decl/flooring/outdoors/ironsand
-/decl/flooring/outdoors/ironsand
+/datum/decl/flooring/outdoors/ironsand
name = "iron sand"
desc = "Red and gritty."
icon = 'icons/turf/flooring/ironsand_vr.dmi'
diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm
index 44da277386..693309b90e 100644
--- a/code/game/turfs/simulated/outdoors/outdoors.dm
+++ b/code/game/turfs/simulated/outdoors/outdoors.dm
@@ -129,7 +129,7 @@ var/list/turf_edge_cache = list()
name = "mud"
icon_state = "mud_dark"
edge_blending_priority = 4 // CHOMPedit
- initial_flooring = /decl/flooring/mud
+ initial_flooring = /datum/decl/flooring/mud
can_dig = TRUE
/turf/simulated/floor/outdoors/rocks
@@ -137,7 +137,7 @@ var/list/turf_edge_cache = list()
desc = "Hard as a rock."
icon_state = "rock"
edge_blending_priority = 1
- initial_flooring = /decl/flooring/rock
+ initial_flooring = /datum/decl/flooring/rock
/turf/simulated/floor/outdoors/rocks/caves
outdoors = OUTDOORS_NO
@@ -215,9 +215,9 @@ CHOMP Removal End */
icon = 'icons/turf/outdoors_vr.dmi'
icon_state = "dirt0"
edge_blending_priority = 2
- initial_flooring = /decl/flooring/outdoors/newdirt
+ initial_flooring = /datum/decl/flooring/outdoors/newdirt
-/decl/flooring/outdoors/newdirt
+/datum/decl/flooring/outdoors/newdirt
name = "dirt"
desc = "Looks dirty."
icon = 'icons/turf/outdoors_vr.dmi'
@@ -246,7 +246,7 @@ CHOMP Removal End */
icon = 'icons/turf/outdoors_vr.dmi'
icon_state = "dirt0"
edge_blending_priority = 2
- initial_flooring = /decl/flooring/outdoors/newdirt
+ initial_flooring = /datum/decl/flooring/outdoors/newdirt
/turf/simulated/floor/outdoors/newdirt_nograss/Initialize(mapload)
var/possibledirts = list(
@@ -269,10 +269,10 @@ CHOMP Removal End */
icon_state = "sidewalk"
edge_blending_priority = -1
movement_cost = -0.5
- initial_flooring = /decl/flooring/outdoors/sidewalk
+ initial_flooring = /datum/decl/flooring/outdoors/sidewalk
can_dirty = TRUE
-/decl/flooring/outdoors/sidewalk
+/datum/decl/flooring/outdoors/sidewalk
name = "sidewalk"
desc = "Concrete shaped into a path!"
icon = 'icons/turf/outdoors_vr.dmi'
@@ -315,10 +315,10 @@ CHOMP Removal End */
/turf/simulated/floor/outdoors/sidewalk/side
icon_state = "side-walk"
- initial_flooring = /decl/flooring/outdoors/sidewalk/side
+ initial_flooring = /datum/decl/flooring/outdoors/sidewalk/side
-/decl/flooring/outdoors/sidewalk/side
+/datum/decl/flooring/outdoors/sidewalk/side
icon_base = "sidewalk"
build_type = /obj/item/stack/tile/floor/sidewalk/side
@@ -326,9 +326,9 @@ CHOMP Removal End */
/turf/simulated/floor/outdoors/sidewalk/slab
icon_state = "slab"
- initial_flooring = /decl/flooring/outdoors/sidewalk/slab
+ initial_flooring = /datum/decl/flooring/outdoors/sidewalk/slab
-/decl/flooring/outdoors/sidewalk/slab
+/datum/decl/flooring/outdoors/sidewalk/slab
icon_base = "slab"
build_type = /obj/item/stack/tile/floor/sidewalk/slab
@@ -336,9 +336,9 @@ CHOMP Removal End */
/turf/simulated/floor/outdoors/sidewalk/slab/city
icon_state = "cityslab"
- initial_flooring = /decl/flooring/outdoors/sidewalk/slab/city
+ initial_flooring = /datum/decl/flooring/outdoors/sidewalk/slab/city
-/decl/flooring/outdoors/sidewalk/slab/city
+/datum/decl/flooring/outdoors/sidewalk/slab/city
icon_base = "cityslab"
build_type = /obj/item/stack/tile/floor/sidewalk/slab/city
@@ -356,5 +356,5 @@ CHOMP Removal End */
throw_range = 20
no_variants = TRUE
-/decl/flooring/concrete
+/datum/decl/flooring/concrete
build_type = /obj/item/stack/tile/floor/concrete
diff --git a/code/game/turfs/simulated/outdoors/outdoors_ch.dm b/code/game/turfs/simulated/outdoors/outdoors_ch.dm
index 200969339e..51b41a9e3b 100644
--- a/code/game/turfs/simulated/outdoors/outdoors_ch.dm
+++ b/code/game/turfs/simulated/outdoors/outdoors_ch.dm
@@ -45,7 +45,7 @@
icon_state = "snow"
edge_blending_priority = 6
movement_cost = 2
- initial_flooring = /decl/flooring/snow
+ initial_flooring = /datum/decl/flooring/snow
/turf/simulated/floor/outdoors/snow/sif/planetuse/Entered(atom/A)
if(isliving(A))
diff --git a/code/game/turfs/simulated/outdoors/snow.dm b/code/game/turfs/simulated/outdoors/snow.dm
index ce34f5a0f9..cc0b898574 100644
--- a/code/game/turfs/simulated/outdoors/snow.dm
+++ b/code/game/turfs/simulated/outdoors/snow.dm
@@ -3,7 +3,7 @@
icon_state = "snow"
edge_blending_priority = 6
movement_cost = 2
- initial_flooring = /decl/flooring/snow
+ initial_flooring = /datum/decl/flooring/snow
var/list/crossed_dirs = list()
diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm
index 5c6f635563..ff704a2dcc 100644
--- a/code/game/turfs/unsimulated/beach.dm
+++ b/code/game/turfs/unsimulated/beach.dm
@@ -24,17 +24,17 @@
/turf/simulated/floor/beach
name = "Beach"
icon = 'icons/misc/beach.dmi'
- initial_flooring = /decl/flooring/sand
+ initial_flooring = /datum/decl/flooring/sand
/turf/simulated/floor/beach/sand
name = "Sand"
icon_state = "sand"
- initial_flooring = /decl/flooring/sand
+ initial_flooring = /datum/decl/flooring/sand
/turf/simulated/floor/beach/sand/desert
icon = 'icons/turf/desert.dmi'
icon_state = "desert"
- initial_flooring = /decl/flooring/sand/desert
+ initial_flooring = /datum/decl/flooring/sand/desert
/turf/simulated/floor/beach/sand/desert/Initialize(mapload)
. = ..()
@@ -50,18 +50,18 @@
name = "Water"
icon_state = "water"
movement_cost = 4 // Water should slow you down, just like the original simulated turf.
- initial_flooring = /decl/flooring/water
+ initial_flooring = /datum/decl/flooring/water
/turf/simulated/floor/beach/water/ocean
icon_state = "seadeep"
movement_cost = 8 // Deep water should be difficult to wade through.
- initial_flooring = /decl/flooring/water/beach/deep
+ initial_flooring = /datum/decl/flooring/water/beach/deep
/turf/simulated/floor/beach/water/Initialize(mapload)
. = ..()
add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water5","layer"=MOB_LAYER+0.1))
-/decl/flooring/water/beach/deep // We're custom-defining a 'deep' water turf for the beach.
+/datum/decl/flooring/water/beach/deep // We're custom-defining a 'deep' water turf for the beach.
name = "deep water"
desc = "Deep Ocean Water"
icon = 'icons/misc/beach.dmi'
diff --git a/code/global_init.dm b/code/global_init.dm
deleted file mode 100644
index f23bd8bf6d..0000000000
--- a/code/global_init.dm
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- The initialization of the game happens roughly like this:
-
- 1. All global variables are initialized (including the global_init instance).
- 2. The map is initialized, and map objects are created.
- 3. world/New() runs, creating the process scheduler (and the old master controller) and spawning their setup.
- 4. processScheduler/setup() runs, creating all the processes. game_controller/setup() runs, calling initialize() on all movable atoms in the world.
- 5. The gameticker is created.
-
-*/
-var/global/datum/global_init/init = new ()
-
-/*
- Pre-map initialization stuff should go here.
-*/
-/datum/global_init/New()
- decls_repository = new()
-
- initialize_integrated_circuits_list()
-
- qdel(src) //we're done
-
-/datum/global_init/Destroy()
- global.init = null
- ..()
- return 2 // QDEL_HINT_IWILLGC
diff --git a/code/modules/Phorochemistry/phoronics_tile.dm b/code/modules/Phorochemistry/phoronics_tile.dm
index b4b059a879..d4b73ec43d 100644
--- a/code/modules/Phorochemistry/phoronics_tile.dm
+++ b/code/modules/Phorochemistry/phoronics_tile.dm
@@ -5,7 +5,7 @@
icon_state = "gcircuit_broken"
initial_flooring = /decl/flooring/phoronics
-/decl/flooring/phoronics
+/datum/decl/flooring/phoronics
name = "electromagnetic tile"
desc = "An electromagnetic tile to create an electric field."
icon = 'icons/turf/flooring/circuit.dmi'
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 14e08734e5..5c112a49aa 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -529,7 +529,7 @@ ADMIN_VERB(deadmin, R_NONE, "DeAdmin", "Shed your admin powers.", ADMIN_CATEGORY
message_admins(span_blue("[key_name_admin(usr)] told everyone to man up and deal with it."), 1)
ADMIN_VERB(give_spell, R_FUN, "Give Spell", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, mob/spell_recipient)
- var/spell/S = tgui_input_list(user, "Choose the spell to give to that guy", "ABRAKADABRA", typesof(/spell))
+ var/datum/spell/S = tgui_input_list(user, "Choose the spell to give to that guy", "ABRAKADABRA", typesof(/datum/spell))
if(!S)
return
spell_recipient.spell_list += new S
@@ -539,7 +539,7 @@ ADMIN_VERB(give_spell, R_FUN, "Give Spell", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CAT
ADMIN_VERB(remove_spell, R_FUN, "Remove Spell", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, mob/removal_target)
var/list/target_spell_list = list()
- for(var/spell/spell in removal_target.spell_list)
+ for(var/datum/spell/spell in removal_target.spell_list)
target_spell_list[spell.name] = spell
if(!length(target_spell_list))
@@ -548,7 +548,7 @@ ADMIN_VERB(remove_spell, R_FUN, "Remove Spell", ADMIN_VERB_NO_DESCRIPTION, ADMIN
var/chosen_spell = tgui_input_list(user, "Choose the spell to remove from [removal_target]", "ABRAKADABRA", sortList(target_spell_list))
if(isnull(chosen_spell))
return
- var/spell/to_remove = target_spell_list[chosen_spell]
+ var/datum/spell/to_remove = target_spell_list[chosen_spell]
if(!istype(to_remove))
return
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index d4e12bb95c..00b3bef1b2 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1876,11 +1876,11 @@
else if(href_list["vsc"])
if(check_rights(R_ADMIN|R_SERVER|R_EVENT))
if(href_list["vsc"] == "airflow")
- vsc.ChangeSettingsDialog(usr,vsc.settings)
+ GLOB.vsc.ChangeSettingsDialog(usr,GLOB.vsc.settings)
if(href_list["vsc"] == GAS_PHORON)
- vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
+ GLOB.vsc.ChangeSettingsDialog(usr,GLOB.vsc.plc.settings)
if(href_list["vsc"] == "default")
- vsc.SetDefault(usr)
+ GLOB.vsc.SetDefault(usr)
else if(href_list["toglang"])
if(check_rights(R_SPAWN))
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index defc2a016e..0931c01d2d 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -437,14 +437,14 @@ ADMIN_VERB(cmd_assume_direct_control, (R_DEBUG|R_ADMIN|R_EVENT), "Assume Direct
var/mob/living/carbon/human/H = target
- var/decl/hierarchy/outfit/outfit = tgui_input_list(usr, "Select outfit.", "Select equipment.", outfits())
+ var/datum/decl/hierarchy/outfit/outfit = tgui_input_list(usr, "Select outfit.", "Select equipment.", outfits())
if(!outfit)
return
feedback_add_details("admin_verb","SEQ")
dressup_human(H, outfit, 1)
-/proc/dressup_human(var/mob/living/carbon/human/H, var/decl/hierarchy/outfit/outfit)
+/proc/dressup_human(var/mob/living/carbon/human/H, var/datum/decl/hierarchy/outfit/outfit)
if(!H || !outfit)
return
if(outfit.undress)
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index 7f1576b1f4..e1cfc01380 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -15,7 +15,7 @@
var/active_on_main_station = 0
var/inactive_on_main_station = 0
- for(var/zone/zone in SSair.zones)
+ for(var/datum/zone/zone in SSair.zones)
var/turf/simulated/turf = locate() in zone.contents
if(turf?.z in using_map.station_levels)
if(zone.needs_update)
diff --git a/code/modules/admin/verbs/grief_fixers.dm b/code/modules/admin/verbs/grief_fixers.dm
index 38681da7cb..cfdebf02ac 100644
--- a/code/modules/admin/verbs/grief_fixers.dm
+++ b/code/modules/admin/verbs/grief_fixers.dm
@@ -23,7 +23,7 @@ ADMIN_VERB(fix_atmos, (R_ADMIN|R_DEBUG|R_EVENT), "Fix Atmospherics Grief", "View
to_chat(user, "\[2/5\] - All pipenets purged of gas.")
// Delete all zones.
- for(var/zone/Z in world)
+ for(var/datum/zone/Z in world)
Z.c_invalidate()
to_chat(user, "\[3/5\] - All ZAS Zones removed.")
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 170a31ef1b..3701cfe93e 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(debug_verbs, list(
/client/var/usedZAScolors = 0
/client/var/list/image/ZAScolors = list()
-/client/proc/recurse_zone(var/zone/Z, var/recurse_level =1)
+/client/proc/recurse_zone(var/datum/zone/Z, var/recurse_level =1)
testZAScolors_zones += Z
if(recurse_level > 10)
return
@@ -196,8 +196,8 @@ GLOBAL_LIST_INIT(debug_verbs, list(
for(var/turf/T in Z.contents)
images += image(yellow, T, "zasdebug", PLANE_ADMIN2) // CHOMPEDIT
testZAScolors_turfs += T
- for(var/connection_edge/zone/edge in Z.edges)
- var/zone/connected = edge.get_connected_zone(Z)
+ for(var/datum/connection_edge/zone/edge in Z.edges)
+ var/datum/zone/connected = edge.get_connected_zone(Z)
if(connected in testZAScolors_zones)
continue
recurse_zone(connected,recurse_level+1)
@@ -232,14 +232,14 @@ GLOBAL_LIST_INIT(debug_verbs, list(
for(var/turf/T in location.zone.contents)
images += image(green, T,"zasdebug", PLANE_ADMIN2) // CHOMPEDIT
testZAScolors_turfs += T
- for(var/connection_edge/zone/edge in location.zone.edges)
- var/zone/Z = edge.get_connected_zone(location.zone)
+ for(var/datum/connection_edge/zone/edge in location.zone.edges)
+ var/datum/zone/Z = edge.get_connected_zone(location.zone)
testZAScolors_zones += Z
for(var/turf/T in Z.contents)
images += image(blue, T,"zasdebug",PLANE_ADMIN2) // CHOMPEDIT
testZAScolors_turfs += T
- for(var/connection_edge/zone/z_edge in Z.edges)
- var/zone/connected = z_edge.get_connected_zone(Z)
+ for(var/datum/connection_edge/zone/z_edge in Z.edges)
+ var/datum/zone/connected = z_edge.get_connected_zone(Z)
if(connected in testZAScolors_zones)
continue
recurse_zone(connected,1)
diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm
index 5f2923b9f7..fd8d9017c5 100644
--- a/code/modules/blob2/core_chunk.dm
+++ b/code/modules/blob2/core_chunk.dm
@@ -121,19 +121,19 @@
return FALSE
-/decl/chemical_reaction/instant/blob_reconstitution
+/datum/decl/chemical_reaction/instant/blob_reconstitution
name = "Hostile Blob Revival"
id = "blob_revival"
result = null
required_reagents = list(REAGENT_ID_PHORON = 60)
result_amount = 1
-/decl/chemical_reaction/instant/blob_reconstitution/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/blob_reconstitution/can_happen(var/datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, /obj/item/blobcore_chunk))
return ..()
return FALSE
-/decl/chemical_reaction/instant/blob_reconstitution/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/blob_reconstitution/on_reaction(var/datum/reagents/holder)
var/obj/item/blobcore_chunk/chunk = holder.my_atom
if(chunk.can_genesis && chunk.regen())
chunk.visible_message(span_notice("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!"))
@@ -141,14 +141,14 @@
else
chunk.visible_message(span_warning("[chunk] shifts strangely, but falls still."))
-/decl/chemical_reaction/instant/blob_reconstitution/domination
+/datum/decl/chemical_reaction/instant/blob_reconstitution/domination
name = "Allied Blob Revival"
id = "blob_friend"
result = null
required_reagents = list(REAGENT_ID_HYDROPHORON = 40, REAGENT_ID_PERIDAXON = 20, REAGENT_ID_MUTAGEN = 20)
result_amount = 1
-/decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder)
var/obj/item/blobcore_chunk/chunk = holder.my_atom
if(chunk.can_genesis && chunk.regen("neutral"))
chunk.visible_message(span_notice("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!"))
diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm
index a87a47ac98..bc9c3969db 100644
--- a/code/modules/emotes/definitions/_mob.dm
+++ b/code/modules/emotes/definitions/_mob.dm
@@ -1,26 +1,26 @@
GLOBAL_LIST_INIT(default_mob_emotes, list(
- /decl/emote/visible,
- /decl/emote/visible/scratch,
- /decl/emote/visible/drool,
- /decl/emote/visible/nod,
- /decl/emote/visible/sway,
- /decl/emote/visible/sulk,
- /decl/emote/visible/twitch,
- /decl/emote/visible/twitch_v,
- /decl/emote/visible/dance,
- /decl/emote/visible/roll,
- /decl/emote/visible/shake,
- /decl/emote/visible/jump,
- /decl/emote/visible/shiver,
- /decl/emote/visible/collapse,
- /decl/emote/visible/spin,
- /decl/emote/visible/sidestep,
- /decl/emote/audible,
- /decl/emote/audible/hiss,
- /decl/emote/audible/whimper,
- /decl/emote/audible/gasp,
- /decl/emote/audible/scretch,
- /decl/emote/audible/choke,
- /decl/emote/audible/moan,
- /decl/emote/audible/gnarl,
+ /datum/decl/emote/visible,
+ /datum/decl/emote/visible/scratch,
+ /datum/decl/emote/visible/drool,
+ /datum/decl/emote/visible/nod,
+ /datum/decl/emote/visible/sway,
+ /datum/decl/emote/visible/sulk,
+ /datum/decl/emote/visible/twitch,
+ /datum/decl/emote/visible/twitch_v,
+ /datum/decl/emote/visible/dance,
+ /datum/decl/emote/visible/roll,
+ /datum/decl/emote/visible/shake,
+ /datum/decl/emote/visible/jump,
+ /datum/decl/emote/visible/shiver,
+ /datum/decl/emote/visible/collapse,
+ /datum/decl/emote/visible/spin,
+ /datum/decl/emote/visible/sidestep,
+ /datum/decl/emote/audible,
+ /datum/decl/emote/audible/hiss,
+ /datum/decl/emote/audible/whimper,
+ /datum/decl/emote/audible/gasp,
+ /datum/decl/emote/audible/scretch,
+ /datum/decl/emote/audible/choke,
+ /datum/decl/emote/audible/moan,
+ /datum/decl/emote/audible/gnarl,
))
diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm
index c02c757a0a..11c2dcdf83 100644
--- a/code/modules/emotes/definitions/audible.dm
+++ b/code/modules/emotes/definitions/audible.dm
@@ -1,9 +1,9 @@
-/decl/emote/audible
+/datum/decl/emote/audible
key = "burp"
emote_message_3p = "burps."
message_type = AUDIBLE_MESSAGE
-/decl/emote/audible/New()
+/datum/decl/emote/audible/New()
. = ..()
// Snips the 'USER' from 3p emote messages for radio.
if(!emote_message_radio && emote_message_3p)
@@ -11,20 +11,20 @@
if(!emote_message_radio_synthetic && emote_message_synthetic_3p)
emote_message_radio_synthetic = emote_message_synthetic_3p
-/decl/emote/audible/deathgasp_alien
+/datum/decl/emote/audible/deathgasp_alien
key = "adeathgasp"
emote_message_3p = "lets out a waning guttural screech, green blood bubbling from its maw."
-/decl/emote/audible/whimper
+/datum/decl/emote/audible/whimper
key = "whimper"
emote_message_3p = "whimpers."
-/decl/emote/audible/gasp
+/datum/decl/emote/audible/gasp
key = "gasp"
emote_message_3p = "gasps."
conscious = FALSE
-/decl/emote/audible/gasp/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/gasp/get_emote_sound(var/atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -41,68 +41,68 @@
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
)
-/decl/emote/audible/scretch
+/datum/decl/emote/audible/scretch
key = "scretch"
emote_message_3p = "scretches."
-/decl/emote/audible/choke
+/datum/decl/emote/audible/choke
key = "choke"
emote_message_3p = "chokes."
conscious = FALSE
-/decl/emote/audible/gnarl
+/datum/decl/emote/audible/gnarl
key = "gnarl"
emote_message_3p = "gnarls and shows USER_THEIR teeth."
-/decl/emote/audible/multichirp
+/datum/decl/emote/audible/multichirp
key = "mchirp"
emote_message_3p = "chirps a chorus of notes!"
emote_sound = 'sound/voice/multichirp.ogg'
-/decl/emote/audible/alarm
+/datum/decl/emote/audible/alarm
key = "alarm"
emote_message_1p = "You sound an alarm."
emote_message_3p = "sounds an alarm."
-/decl/emote/audible/alert
+/datum/decl/emote/audible/alert
key = "alert"
emote_message_1p = "You let out a distressed noise."
emote_message_3p = "lets out a distressed noise."
-/decl/emote/audible/notice
+/datum/decl/emote/audible/notice
key = "notice"
emote_message_1p = "You play a loud tone."
emote_message_3p = "plays a loud tone."
-/decl/emote/audible/boop
+/datum/decl/emote/audible/boop
key = "boop"
emote_message_1p = "You boop."
emote_message_3p = "boops."
-/decl/emote/audible/beep
+/datum/decl/emote/audible/beep
key = "bbeep"
emote_message_3p = "You beep."
emote_message_3p = "beeps."
emote_sound = 'sound/machines/twobeep.ogg'
-/decl/emote/audible/sniff
+/datum/decl/emote/audible/sniff
key = "sniff"
emote_message_3p = "sniffs."
-/decl/emote/audible/snore
+/datum/decl/emote/audible/snore
key = "snore"
emote_message_3p = "snores."
conscious = FALSE
-/decl/emote/audible/whimper
+/datum/decl/emote/audible/whimper
key = "whimper"
emote_message_3p = "whimpers."
-/decl/emote/audible/yawn
+/datum/decl/emote/audible/yawn
key = "yawn"
emote_message_3p = "yawns."
-/decl/emote/audible/clap
+/datum/decl/emote/audible/clap
key = "clap"
emote_message_3p = "claps."
emote_sound = list('sound/misc/clap1.ogg', //ChompEDIT START
@@ -110,128 +110,128 @@
'sound/misc/clap3.ogg',
'sound/misc/clap4.ogg') //ChompEDIT END
-/decl/emote/audible/chuckle
+/datum/decl/emote/audible/chuckle
key = "chuckle"
emote_message_3p = "chuckles."
-/decl/emote/audible/cry
+/datum/decl/emote/audible/cry
key = "cry"
emote_message_3p = "cries."
-/decl/emote/audible/sigh
+/datum/decl/emote/audible/sigh
key = "sigh"
emote_message_3p = "sighs."
-/decl/emote/audible/laugh
+/datum/decl/emote/audible/laugh
key = "laugh"
emote_message_3p_target = "laughs at TARGET."
emote_message_3p = "laughs."
-/decl/emote/audible/mumble
+/datum/decl/emote/audible/mumble
key = "mumble"
emote_message_3p = "mumbles!"
-/decl/emote/audible/grumble
+/datum/decl/emote/audible/grumble
key = "grumble"
emote_message_3p = "grumbles!"
-/decl/emote/audible/groan
+/datum/decl/emote/audible/groan
key = "groan"
emote_message_3p = "groans!"
conscious = FALSE
-/decl/emote/audible/moan
+/datum/decl/emote/audible/moan
key = "moan"
emote_message_3p = "moans!"
conscious = FALSE
-/decl/emote/audible/giggle
+/datum/decl/emote/audible/giggle
key = "giggle"
emote_message_3p = "giggles."
-/decl/emote/audible/grunt
+/datum/decl/emote/audible/grunt
key = "grunt"
emote_message_3p = "grunts."
-/decl/emote/audible/bug_hiss
+/datum/decl/emote/audible/bug_hiss
key = "bhiss"
emote_message_3p_target = "hisses at TARGET."
emote_message_3p = "hisses."
emote_sound = 'sound/voice/bughiss.ogg'
-/decl/emote/audible/bug_buzz
+/datum/decl/emote/audible/bug_buzz
key = "bbuzz"
emote_message_3p = "buzzes USER_THEIR wings."
emote_sound = 'sound/voice/BugBuzz.ogg'
-/decl/emote/audible/bug_chitter
+/datum/decl/emote/audible/bug_chitter
key = "chitter"
emote_message_3p = "chitters."
emote_sound = 'sound/voice/bug.ogg'
-/decl/emote/audible/roar
+/datum/decl/emote/audible/roar
key = "roar"
emote_message_3p = "roars!"
-/decl/emote/audible/bellow
+/datum/decl/emote/audible/bellow
key = "bellow"
emote_message_3p = "bellows!"
-/decl/emote/audible/howl
+/datum/decl/emote/audible/howl
key = "howl"
emote_message_3p = "howls!"
-/decl/emote/audible/wheeze
+/datum/decl/emote/audible/wheeze
key = "wheeze"
emote_message_3p = "wheezes."
-/decl/emote/audible/hiss
+/datum/decl/emote/audible/hiss
key = "hiss"
emote_message_3p_target = "hisses softly at TARGET."
emote_message_3p = "hisses softly."
-/decl/emote/audible/chirp
+/datum/decl/emote/audible/chirp
key = "chirp"
emote_message_3p = "chirps!"
emote_sound = 'sound/misc/nymphchirp.ogg'
-/decl/emote/audible/crack
+/datum/decl/emote/audible/crack
key = "crack"
emote_message_3p = "cracks USER_THEIR knuckles."
emote_sound = 'sound/voice/knuckles.ogg'
-/decl/emote/audible/squish
+/datum/decl/emote/audible/squish
key = "squish"
emote_sound = 'sound/effects/slime_squish.ogg' //Credit to DrMinky (freesound.org) for the sound.
emote_message_3p = "squishes."
sound_vary = FALSE
-/decl/emote/audible/warble
+/datum/decl/emote/audible/warble
key = "warble"
emote_sound = 'sound/effects/warble.ogg' // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
emote_message_3p = "warbles."
-/decl/emote/audible/croon
+/datum/decl/emote/audible/croon
key = "croon"
emote_message_3p = "croons..."
emote_sound = list('sound/voice/croon1.ogg', 'sound/voice/croon2.ogg')
-/decl/emote/audible/lwarble
+/datum/decl/emote/audible/lwarble
key = "lwarble"
emote_message_3p = "lets out a low, throaty warble!"
emote_sound = 'sound/voice/lwarble.ogg'
-/decl/emote/audible/croak_skrell
+/datum/decl/emote/audible/croak_skrell
key = "scroak"
emote_message_3p = "croaks!"
emote_sound = 'sound/voice/croak_skrell.ogg'
-/decl/emote/audible/vox_shriek
+/datum/decl/emote/audible/vox_shriek
key = "shriek"
emote_message_3p = "SHRIEKS!"
emote_sound = 'sound/voice/shriek1.ogg'
-/decl/emote/audible/caw
+/datum/decl/emote/audible/caw
key = "caw"
emote_message_1p = "You caw!"
emote_message_3p = "caws!"
@@ -239,42 +239,42 @@
emote_message_3p_target = "caws at TARGET."
emote_sound = 'sound/voice/emotes/caw1.ogg' // Copyright Sampling+ 1.0 Vixuxx (freesound.org) for the source audio.
-/decl/emote/audible/caw2
+/datum/decl/emote/audible/caw2
key = "caw2"
emote_message_3p = "caws."
emote_sound = 'sound/voice/emotes/caw2.ogg' // Copyright CC0 1.0 Universal, by Jofae on freesound.org.
-/decl/emote/audible/caw_m
+/datum/decl/emote/audible/caw_m
key = "caw_m"
emote_message_3p = "caws multiple times."
emote_sound = 'sound/voice/emotes/caw_multiple.ogg' // Copyright CC0 1.0 Universal, by Ambientsoundapp on freesound.org.
-/decl/emote/audible/gwah
+/datum/decl/emote/audible/gwah
key = "gwah"
emote_message_3p = "gwah."
emote_sound = 'sound/voice/emotes/gwah.ogg' // Copyright CC0 1.0 Universal, by Ambientsoundapp on freesound.org.
-/decl/emote/audible/purr
+/datum/decl/emote/audible/purr
key = "purr"
emote_message_3p = "purrs."
emote_sound = 'sound/voice/cat_purr.ogg'
-/decl/emote/audible/purrlong
+/datum/decl/emote/audible/purrlong
key = "purrl"
emote_message_3p = "purrs."
emote_sound = 'sound/voice/cat_purr_long.ogg'
-/decl/emote/audible/fennecscream
+/datum/decl/emote/audible/fennecscream
key = "fennecscream"
emote_message_3p = "screeches!"
-/decl/emote/audible/zoom
+/datum/decl/emote/audible/zoom
key = "zoom"
emote_message_3p = "zooms."
-/decl/emote/audible/teshsqueak
+/datum/decl/emote/audible/teshsqueak
key = "surprised"
emote_message_1p = "You chirp in surprise!"
emote_message_3p = "chirps in surprise!"
@@ -283,7 +283,7 @@
emote_sound = 'sound/voice/teshsqueak.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
sound_vary = FALSE
-/decl/emote/audible/teshchirp
+/datum/decl/emote/audible/teshchirp
key = "tchirp"
emote_message_1p = "You chirp!"
emote_message_3p = "chirps!"
@@ -291,7 +291,7 @@
emote_message_3p_target = "chirps at TARGET!"
emote_sound = 'sound/voice/teshchirp.ogg' // Copyright Sampling+ 1.0 Incarnidine (freesound.org) for the source audio.
-/decl/emote/audible/teshtrill
+/datum/decl/emote/audible/teshtrill
key = "trill"
emote_message_1p = "You trill."
emote_message_3p = "trills."
@@ -299,13 +299,13 @@
emote_message_3p_target = "trills at TARGET."
emote_sound = 'sound/voice/teshtrill.ogg' // Copyright CC BY-NC 3.0 Arnaud Coutancier (freesound.org) for the source audio.
-/decl/emote/audible/teshscream
+/datum/decl/emote/audible/teshscream
key = "teshscream"
emote_message_1p = "You scream!"
emote_message_3p = "screams!"
emote_sound = 'sound/voice/teshscream.ogg'
-/decl/emote/audible/prbt
+/datum/decl/emote/audible/prbt
key = "prbt"
emote_message_1p = "You prbt."
emote_message_3p = "prbts."
@@ -314,31 +314,31 @@
emote_sound = 'sound/voice/prbt.ogg'
//Some Spooky sounds.
-/decl/emote/audible/evil_laugh
+/datum/decl/emote/audible/evil_laugh
key = "evillaugh"
emote_message_3p = "laughs!"
emote_sound = 'sound/mob/spooky/laugh.ogg'
-/decl/emote/audible/evil_no
+/datum/decl/emote/audible/evil_no
key = "evilno"
emote_message_3p = "says no!"
emote_sound = 'sound/mob/spooky/no.ogg'
-/decl/emote/audible/evil_breathing
+/datum/decl/emote/audible/evil_breathing
key = "evilbreath"
emote_message_3p = "breaths heavily!"
emote_sound = 'sound/mob/spooky/breath1.ogg'
-/decl/emote/audible/evil_breathing_2
+/datum/decl/emote/audible/evil_breathing_2
key = "evilbreath2"
emote_message_3p = "breaths heavily!"
emote_sound = 'sound/mob/spooky/breath2.ogg'
-/decl/emote/audible/goodripsound
+/datum/decl/emote/audible/goodripsound
key = "goodripsound"
emote_message_3p = "drips goo."
-/decl/emote/audible/goodripsound/do_extra(var/mob/user)
+/datum/decl/emote/audible/goodripsound/do_extra(var/mob/user)
..()
var/goo_sounds = list (
'sound/mob/spooky/decay1.ogg',
diff --git a/code/modules/emotes/definitions/audible_belch.dm b/code/modules/emotes/definitions/audible_belch.dm
index 25db0333cb..268e98916c 100644
--- a/code/modules/emotes/definitions/audible_belch.dm
+++ b/code/modules/emotes/definitions/audible_belch.dm
@@ -1,10 +1,10 @@
-/decl/emote/audible/belch
+/datum/decl/emote/audible/belch
key = "belch"
emote_message_3p = "belches."
message_type = AUDIBLE_MESSAGE
sound_preferences = list(/datum/preference/toggle/emote_noises, /datum/preference/toggle/belch_noises)
-/decl/emote/audible/belch/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/belch/get_emote_sound(var/atom/user)
return list(
"sound" = sound(get_sfx("belches")),
"vol" = emote_volume / 2
diff --git a/code/modules/emotes/definitions/audible_cough.dm b/code/modules/emotes/definitions/audible_cough.dm
index 56ef818275..44d5f0b3e5 100644
--- a/code/modules/emotes/definitions/audible_cough.dm
+++ b/code/modules/emotes/definitions/audible_cough.dm
@@ -1,4 +1,4 @@
-/decl/emote/audible/cough
+/datum/decl/emote/audible/cough
key = "cough"
emote_message_1p = "You cough!"
emote_message_1p_target = "You cough on TARGET!"
@@ -14,7 +14,7 @@
conscious = FALSE
// emote_sound_synthetic = list()
-/decl/emote/audible/cough/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/cough/get_emote_sound(var/atom/user)
if(ishuman(user) && !check_synthetic(user))
var/mob/living/carbon/human/H = user
var/vol = H.species.cough_volume
diff --git a/code/modules/emotes/definitions/audible_furry_ch.dm b/code/modules/emotes/definitions/audible_furry_ch.dm
index caef8fed05..9689807c16 100644
--- a/code/modules/emotes/definitions/audible_furry_ch.dm
+++ b/code/modules/emotes/definitions/audible_furry_ch.dm
@@ -1,6 +1,6 @@
//This file has been disabled in the dme now that the below is actually ported upstream
/*
-/decl/emote/audible/coyawoo
+/datum/decl/emote/audible/coyawoo
key = "coyawoo"
emote_message_3p = "lets out a scraggly awoo."
emote_sound = 'sound/voice/coyoteawoo.ogg'
diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm
index d5f8a40104..4e2aa85770 100644
--- a/code/modules/emotes/definitions/audible_furry_vr.dm
+++ b/code/modules/emotes/definitions/audible_furry_vr.dm
@@ -1,173 +1,173 @@
-/decl/emote/audible/awoo
+/datum/decl/emote/audible/awoo
key = "awoo"
emote_message_3p = "lets out an awoo."
emote_sound = 'sound/voice/awoo.ogg'
-/decl/emote/audible/awoo2
+/datum/decl/emote/audible/awoo2
key = "awoo2"
emote_message_3p = "lets out an awoo."
emote_sound = 'sound/voice/long_awoo.ogg'
-/decl/emote/audible/growl
+/datum/decl/emote/audible/growl
key = "growl"
emote_message_3p = "lets out a growl."
emote_sound = 'sound/voice/growl.ogg'
-/decl/emote/audible/woof
+/datum/decl/emote/audible/woof
key = "woof"
emote_message_3p = "lets out a woof."
emote_sound = 'sound/voice/woof.ogg'
-/decl/emote/audible/woof2
+/datum/decl/emote/audible/woof2
key = "woof2"
emote_message_3p = "lets out a woof."
emote_sound = 'sound/voice/woof2.ogg'
-/decl/emote/audible/nya
+/datum/decl/emote/audible/nya
key = "nya"
emote_message_3p = "lets out a nya."
emote_sound = 'sound/voice/nya.ogg'
-/decl/emote/audible/mrowl
+/datum/decl/emote/audible/mrowl
key = "mrowl"
emote_message_3p = "mrowls."
emote_sound = 'sound/voice/mrow.ogg'
-/decl/emote/audible/peep
+/datum/decl/emote/audible/peep
key = "peep"
emote_message_3p = "peeps like a bird."
emote_sound = 'sound/voice/peep.ogg'
-/decl/emote/audible/chirp
+/datum/decl/emote/audible/chirp
key = "chirp"
emote_message_3p = "chirps!"
emote_sound = 'sound/misc/nymphchirp.ogg'
sound_vary = FALSE
-/decl/emote/audible/hoot
+/datum/decl/emote/audible/hoot
key = "hoot"
emote_message_3p = "hoots!"
emote_sound = 'sound/voice/hoot.ogg'
-/decl/emote/audible/weh
+/datum/decl/emote/audible/weh
key = "weh"
emote_message_3p = "lets out a weh."
emote_sound = 'sound/voice/weh.ogg'
-/decl/emote/audible/merp
+/datum/decl/emote/audible/merp
key = "merp"
emote_message_3p = "lets out a merp."
emote_sound = 'sound/voice/merp.ogg'
-/decl/emote/audible/myarp
+/datum/decl/emote/audible/myarp
key = "myarp"
emote_message_3p = "lets out a myarp."
emote_sound = 'sound/voice/myarp.ogg'
-/decl/emote/audible/bark
+/datum/decl/emote/audible/bark
key = "bark"
emote_message_3p = "lets out a bark."
emote_sound = 'sound/voice/bark2.ogg'
-/decl/emote/audible/bork
+/datum/decl/emote/audible/bork
key = "bork"
emote_message_3p = "lets out a bork."
emote_sound = 'sound/voice/bork.ogg'
-/decl/emote/audible/mrow
+/datum/decl/emote/audible/mrow
key = "mrow"
emote_message_3p = "lets out a mrow."
emote_sound = 'sound/voice/mrow.ogg'
-/decl/emote/audible/hypno
+/datum/decl/emote/audible/hypno
key = "hypno"
emote_message_3p = "lets out a mystifying tone."
emote_sound = 'sound/voice/hypno.ogg'
-/decl/emote/audible/hiss
+/datum/decl/emote/audible/hiss
key = "hiss"
emote_message_3p = "lets out a hiss."
emote_sound = 'sound/voice/hiss.ogg'
-/decl/emote/audible/rattle
+/datum/decl/emote/audible/rattle
key = "rattle"
emote_message_3p = "rattles!"
emote_sound = 'sound/voice/rattle.ogg'
-/decl/emote/audible/squeak
+/datum/decl/emote/audible/squeak
key = "squeak"
emote_message_3p = "lets out a squeak."
emote_sound = 'sound/effects/mouse_squeak.ogg'
-/decl/emote/audible/geck
+/datum/decl/emote/audible/geck
key = "geck"
emote_message_3p = "geckers!"
emote_sound = 'sound/voice/geck.ogg'
-/decl/emote/audible/baa
+/datum/decl/emote/audible/baa
key = "baa"
emote_message_3p = "lets out a baa."
emote_sound = 'sound/voice/baa.ogg'
-/decl/emote/audible/baa2
+/datum/decl/emote/audible/baa2
key = "baa2"
emote_message_3p = "bleats."
emote_sound = 'sound/voice/baa2.ogg'
/*
-/decl/emote/audible/deathgasp2
+/datum/decl/emote/audible/deathgasp2
key = "deathgasp2"
emote_message_3p = "[species.get_death_message()]"
m_type = 1
emote_sound = 'sound/voice/deathgasp2.ogg'
*/
-/decl/emote/audible/mar
+/datum/decl/emote/audible/mar
key = "mar"
emote_message_3p = "lets out a mar."
emote_sound = 'sound/voice/mar.ogg'
-/decl/emote/audible/wurble
+/datum/decl/emote/audible/wurble
key = "wurble"
emote_message_3p = "lets out a wurble."
emote_sound = 'sound/voice/wurble.ogg'
-/decl/emote/audible/snort
+/datum/decl/emote/audible/snort
key = "snort"
emote_message_3p = "snorts!"
emote_sound = 'sound/voice/snort.ogg'
sound_vary = FALSE
-/decl/emote/audible/meow
+/datum/decl/emote/audible/meow
key = "meow"
emote_message_3p = "gently meows!"
emote_sound = 'sound/voice/meow.ogg'
sound_vary = FALSE
-/decl/emote/audible/moo
+/datum/decl/emote/audible/moo
key = "moo"
emote_message_3p = "takes a breath and lets out a moo."
emote_sound = 'sound/voice/moo.ogg'
-/decl/emote/audible/croak
+/datum/decl/emote/audible/croak
key = "croak"
emote_message_3p = "rumbles their throat, puffs their cheeks and croaks."
emote_sound = 'sound/voice/croak_frog.ogg'
-/decl/emote/audible/gao
+/datum/decl/emote/audible/gao
key = "gao"
emote_message_3p = "lets out a gao."
emote_sound = 'sound/voice/gao.ogg'
-/decl/emote/audible/cackle
+/datum/decl/emote/audible/cackle
key = "cackle"
emote_message_3p = "cackles hysterically!"
emote_sound = 'sound/voice/yeencackle.ogg'
-/decl/emote/audible/spiderchitter
+/datum/decl/emote/audible/spiderchitter
key = "spiderchitter"
emote_message_3p = "chitters."
emote_sound = 'sound/voice/spiderchitter.ogg'
-/decl/emote/audible/spiderpurr
+/datum/decl/emote/audible/spiderpurr
key = "spiderpurr"
emote_message_3p = "purrs."
emote_sound = 'sound/voice/spiderpurr.ogg'
-/decl/emote/audible/squeaky
+/datum/decl/emote/audible/squeaky
key = "squeaky"
emote_message_3p = "squeaks."
emote_sound = 'sound/items/drop/plushie.ogg'
-/decl/emote/audible/mothscream
+/datum/decl/emote/audible/mothscream
key = "mothscream"
emote_message_3p ="screams"
emote_sound = 'sound/voice/moth/scream_moth.ogg'
-/decl/emote/audible/mothchitter
+/datum/decl/emote/audible/mothchitter
key = "mothchitter"
emote_message_3p = "chitters"
emote_sound = 'sound/voice/moth/moth_chitter.ogg'
-/decl/emote/audible/mothlaugh
+/datum/decl/emote/audible/mothlaugh
key = "mothlaugh"
emote_message_3p = "laughs"
emote_sound = 'sound/voice/moth/moth_laugh.ogg'
-/decl/emote/audible/gyoh
+/datum/decl/emote/audible/gyoh
key = "gyoh"
emote_message_3p = "gyohs."
emote_sound = 'sound/voice/teppi/whine1.ogg'
var/list/bigsound = list('sound/voice/teppi/gyooh1.ogg', 'sound/voice/teppi/gyooh2.ogg', 'sound/voice/teppi/gyooh3.ogg', 'sound/voice/teppi/gyooh4.ogg', 'sound/voice/teppi/gyooh5.ogg','sound/voice/teppi/gyooh6.ogg')
var/list/smolsound = list('sound/voice/teppi/whine1.ogg', 'sound/voice/teppi/whine2.ogg')
-/decl/emote/audible/gyoh/get_emote_sound(var/mob/living/user)
+/datum/decl/emote/audible/gyoh/get_emote_sound(var/mob/living/user)
if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi))
if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi/baby))
emote_sound = pick(smolsound)
@@ -187,14 +187,14 @@
emote_sound = pick(smolsound)
. = ..()
-/decl/emote/audible/rumble
+/datum/decl/emote/audible/rumble
key = "rumble"
emote_message_3p = "rumbles contentedly."
emote_sound = 'sound/voice/teppi/whine1.ogg'
var/list/bigsound = list('sound/voice/teppi/rumble.ogg')
var/list/smolsound = list('sound/voice/teppi/cute_rumble.ogg')
-/decl/emote/audible/rumble/get_emote_sound(var/mob/living/user)
+/datum/decl/emote/audible/rumble/get_emote_sound(var/mob/living/user)
if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi))
if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi/baby))
emote_sound = pick(smolsound)
@@ -214,37 +214,37 @@
emote_sound = pick(smolsound)
. = ..()
-/decl/emote/audible/coyawoo
+/datum/decl/emote/audible/coyawoo
key = "coyawoo"
emote_message_3p = "lets out a scraggly awoo."
emote_sound = 'sound/voice/coyoteawoo.ogg'
-/decl/emote/audible/coyawoo2
+/datum/decl/emote/audible/coyawoo2
key = "coyawoo2"
emote_message_3p = "lets out a pronounced, scraggly awoo."
emote_sound = 'sound/voice/coyoteawoo2.ogg'
-/decl/emote/audible/coyawoo3
+/datum/decl/emote/audible/coyawoo3
key = "coyawoo3"
emote_message_3p = "yaps and lets out a scraggly awoo."
emote_sound = 'sound/voice/coyoteawoo3.ogg'
-/decl/emote/audible/coyawoo4
+/datum/decl/emote/audible/coyawoo4
key = "coyawoo4"
emote_message_3p = "yaps several times, and lets out a short, scraggly awoo."
emote_sound = 'sound/voice/coyoteawoo4.ogg'
-/decl/emote/audible/coyawoo5
+/datum/decl/emote/audible/coyawoo5
key = "coyawoo5"
emote_message_3p = "lets out a scraggly, whine-awoo."
emote_sound = 'sound/voice/coyoteawoo5.ogg'
-/decl/emote/audible/roarbark // Upstream port from CHOMP
+/datum/decl/emote/audible/roarbark // Upstream port from CHOMP
key = "roarbark"
emote_message_3p = "lets out a roar-bark!"
emote_sound = 'sound/voice/roarbark.ogg'
-/decl/emote/audible/dook
+/datum/decl/emote/audible/dook
key = "dook"
emote_message_3p = "dooks."
emote_sound = 'sound/voice/ferretdook.ogg'
diff --git a/code/modules/emotes/definitions/audible_pain.dm b/code/modules/emotes/definitions/audible_pain.dm
index 6a9ef0f319..2735f2ee08 100644
--- a/code/modules/emotes/definitions/audible_pain.dm
+++ b/code/modules/emotes/definitions/audible_pain.dm
@@ -1,9 +1,9 @@
-/decl/emote/audible/pain
+/datum/decl/emote/audible/pain
key = "pain"
emote_message_1p = "You yell in pain!"
emote_message_3p = "yells in pain!"
-/decl/emote/audible/pain/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/pain/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "You [pick(H.species.pain_verb_1p)] in pain!"
@@ -13,7 +13,7 @@
return "You [pick(M.pain_emote_1p)]!"
. = ..()
-/decl/emote/audible/pain/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/pain/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "[pick(H.species.pain_verb_3p)] in pain!"
@@ -23,7 +23,7 @@
return "[pick(M.pain_emote_3p)]!"
. = ..()
-/decl/emote/audible/pain/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/pain/get_emote_sound(var/atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/modules/emotes/definitions/audible_scream.dm b/code/modules/emotes/definitions/audible_scream.dm
index 2ea6b85ca8..c0295a9177 100644
--- a/code/modules/emotes/definitions/audible_scream.dm
+++ b/code/modules/emotes/definitions/audible_scream.dm
@@ -1,9 +1,9 @@
-/decl/emote/audible/scream
+/datum/decl/emote/audible/scream
key = "scream"
emote_message_1p = "You scream!"
emote_message_3p = "screams!"
-/decl/emote/audible/scream/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/scream/get_emote_sound(var/atom/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/vol = H.species.scream_volume
@@ -14,13 +14,13 @@
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
)
-/decl/emote/audible/scream/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/scream/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "You [H.species.scream_verb_1p]!"
. = ..()
-/decl/emote/audible/scream/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/scream/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "[H.species.scream_verb_3p]!"
diff --git a/code/modules/emotes/definitions/audible_scream_ch.dm b/code/modules/emotes/definitions/audible_scream_ch.dm
index 9b3136a43b..f71bd65342 100644
--- a/code/modules/emotes/definitions/audible_scream_ch.dm
+++ b/code/modules/emotes/definitions/audible_scream_ch.dm
@@ -1,4 +1,4 @@
-/decl/emote/audible/scream/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/scream/get_emote_sound(var/atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -32,7 +32,7 @@
)
*/
-/decl/emote/audible/malehumanscream
+/datum/decl/emote/audible/malehumanscream
key = "malehumanscream"
emote_message_3p = "screams!"
emote_sound = 'sound/voice/malescream_2.ogg'
diff --git a/code/modules/emotes/definitions/audible_scream_vr.dm b/code/modules/emotes/definitions/audible_scream_vr.dm
index b551921088..5696a5e8f3 100644
--- a/code/modules/emotes/definitions/audible_scream_vr.dm
+++ b/code/modules/emotes/definitions/audible_scream_vr.dm
@@ -1,4 +1,4 @@
-/decl/emote/audible/scream/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/scream/get_emote_sound(var/atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -10,7 +10,7 @@
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
)
-/decl/emote/audible/malehumanscream
+/datum/decl/emote/audible/malehumanscream
key = "malehumanscream"
emote_message_3p = "screams!"
emote_sound = 'sound/voice/malescream_2.ogg'
diff --git a/code/modules/emotes/definitions/audible_slap.dm b/code/modules/emotes/definitions/audible_slap.dm
index 6740ffd973..3876d7cc72 100644
--- a/code/modules/emotes/definitions/audible_slap.dm
+++ b/code/modules/emotes/definitions/audible_slap.dm
@@ -1,4 +1,4 @@
-/decl/emote/audible/slap
+/datum/decl/emote/audible/slap
key = "slap"
emote_message_1p_target = "You slap TARGET across the face. Ouch!"
emote_message_1p = "You slap yourself across the face!"
@@ -8,14 +8,14 @@
check_restraints = TRUE
check_range = 1
-/decl/emote/audible/slap/New()
+/datum/decl/emote/audible/slap/New()
..()
emote_message_1p_target = span_danger(emote_message_1p_target)
emote_message_1p = span_danger(emote_message_1p)
emote_message_3p_target = span_danger(emote_message_3p_target)
emote_message_3p = span_danger(emote_message_3p)
-/decl/emote/audible/slap/do_extra(var/atom/user, var/atom/target)
+/datum/decl/emote/audible/slap/do_extra(var/atom/user, var/atom/target)
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/H = target
diff --git a/code/modules/emotes/definitions/audible_snap.dm b/code/modules/emotes/definitions/audible_snap.dm
index 04d156078d..d14d141c19 100644
--- a/code/modules/emotes/definitions/audible_snap.dm
+++ b/code/modules/emotes/definitions/audible_snap.dm
@@ -1,4 +1,4 @@
-/decl/emote/audible/snap
+/datum/decl/emote/audible/snap
key = "snap"
emote_message_1p = "You snap your fingers."
emote_message_3p = "snaps USER_THEIR fingers."
@@ -6,7 +6,7 @@
emote_message_3p_target = "snaps USER_THEIR fingers at TARGET."
emote_sound = 'sound/effects/fingersnap.ogg'
-/decl/emote/audible/snap/proc/can_snap(var/atom/user)
+/datum/decl/emote/audible/snap/proc/can_snap(var/atom/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
for(var/limb in list(BP_L_HAND, BP_R_HAND))
@@ -22,13 +22,13 @@
else //VOREStation Addition End
return FALSE
-/decl/emote/audible/snap/do_emote(var/atom/user, var/extra_params)
+/datum/decl/emote/audible/snap/do_emote(var/atom/user, var/extra_params)
if(!can_snap(user))
to_chat(user, span_warning("You need at least one working hand to snap your fingers."))
return FALSE
. = ..()
-/decl/emote/audible/snap/do_extra(mob/user)
+/datum/decl/emote/audible/snap/do_extra(mob/user)
. = ..()
if(HAS_TRAIT(user, TRAIT_UNLUCKY) && prob(0.1) && ishuman(user)) //1 in a thousand
var/mob/living/carbon/human/unlucky_human = user
diff --git a/code/modules/emotes/definitions/audible_sneeze.dm b/code/modules/emotes/definitions/audible_sneeze.dm
index c39016c46d..96a0ff4dba 100644
--- a/code/modules/emotes/definitions/audible_sneeze.dm
+++ b/code/modules/emotes/definitions/audible_sneeze.dm
@@ -1,4 +1,4 @@
-/decl/emote/audible/sneeze
+/datum/decl/emote/audible/sneeze
key = "sneeze"
emote_message_1p = "You sneeze."
emote_message_3p = "sneezes."
@@ -7,7 +7,7 @@
emote_message_synthetic_3p = "emits a robotic sneeze."
emote_message_synthetic_3p_target = "emits a robotic sneeze towards TARGET."
-/decl/emote/audible/sneeze/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/sneeze/get_emote_sound(var/atom/user)
if(ishuman(user) && !check_synthetic(user))
var/mob/living/carbon/human/H = user
var/vol = H.species.sneeze_volume
diff --git a/code/modules/emotes/definitions/audible_whistle.dm b/code/modules/emotes/definitions/audible_whistle.dm
index dabd64af59..d5d4133132 100644
--- a/code/modules/emotes/definitions/audible_whistle.dm
+++ b/code/modules/emotes/definitions/audible_whistle.dm
@@ -1,4 +1,4 @@
-/decl/emote/audible/whistle
+/datum/decl/emote/audible/whistle
key = "whistle"
emote_message_1p = "You whistle a tune."
emote_message_3p = "whistles a tune."
@@ -8,7 +8,7 @@
emote_message_synthetic_1p = "You whistle a robotic tune."
emote_message_synthetic_3p = "whistles a robotic tune."
-/decl/emote/audible/whistle/quiet
+/datum/decl/emote/audible/whistle/quiet
key = "qwhistle"
emote_message_1p = "You whistle quietly."
emote_message_3p = "whistles quietly."
@@ -17,7 +17,7 @@
emote_message_synthetic_3p = "whistles robotically."
emote_sound_synthetic = 'sound/voice/shortwhistle_robot.ogg'
-/decl/emote/audible/whistle/wolf
+/datum/decl/emote/audible/whistle/wolf
key = "wwhistle"
emote_message_1p = "You whistle inappropriately."
emote_message_3p = "whistles inappropriately."
@@ -26,7 +26,7 @@
emote_message_synthetic_3p = "beeps inappropriately."
emote_sound_synthetic = 'sound/voice/wolfwhistle_robot.ogg'
-/decl/emote/audible/whistle/summon
+/datum/decl/emote/audible/whistle/summon
key = "swhistle"
emote_message_1p = "You whistle a tune."
emote_message_3p = "whistles a tune."
diff --git a/code/modules/emotes/definitions/belly_rub.dm b/code/modules/emotes/definitions/belly_rub.dm
index 6c1f7cb519..fbcf2d6040 100644
--- a/code/modules/emotes/definitions/belly_rub.dm
+++ b/code/modules/emotes/definitions/belly_rub.dm
@@ -1,4 +1,4 @@
-/decl/emote/visible/bellyrub
+/datum/decl/emote/visible/bellyrub
key = "bellyrub"
check_restraints = TRUE
check_range = 1
@@ -8,7 +8,7 @@
emote_message_3p = "rubs their belly!"
emote_message_3p_target = "rubs TARGET's belly!"
-/decl/emote/visible/bellyrub/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/visible/bellyrub/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
if(!target && isliving(user)) //We shouldn't NEED an isliving check here but...Whatever, safety first.
var/mob/living/U = user
U.vore_bellyrub(U)
@@ -23,5 +23,5 @@
to_chat(user, "You can not rub [target]'s belly.")
return
-/decl/emote/visible/bellyrub/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/visible/bellyrub/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
return
diff --git a/code/modules/emotes/definitions/exertion.dm b/code/modules/emotes/definitions/exertion.dm
index 97404cef64..c0afd4fdce 100644
--- a/code/modules/emotes/definitions/exertion.dm
+++ b/code/modules/emotes/definitions/exertion.dm
@@ -1,20 +1,20 @@
-/decl/emote/exertion/biological
+/datum/decl/emote/exertion/biological
key = "esweat"
emote_range = 4
emote_message_1p = "You are sweating heavily."
emote_message_3p = "is sweating heavily."
-/decl/emote/exertion/biological/mob_can_use(mob/living/user)
+/datum/decl/emote/exertion/biological/mob_can_use(mob/living/user)
if(istype(user) && !user.isSynthetic())
return ..()
return FALSE
-/decl/emote/exertion/biological/breath
+/datum/decl/emote/exertion/biological/breath
key = "ebreath"
emote_message_1p = "You feel out of breath."
emote_message_3p = "looks out of breath."
-/decl/emote/exertion/biological/pant
+/datum/decl/emote/exertion/biological/pant
key = "epant"
emote_range = 3
message_type = AUDIBLE_MESSAGE
@@ -22,19 +22,19 @@
emote_message_3p = "pants for air."
emote_message_impaired = "You can see USER breathing heavily."
-/decl/emote/exertion/synthetic
+/datum/decl/emote/exertion/synthetic
key = "ewhine"
emote_range = 3
message_type = AUDIBLE_MESSAGE
emote_message_1p = "You overstress your actuators."
emote_message_3p = "USER's actuators whine with strain."
-/decl/emote/exertion/synthetic/mob_can_use(mob/living/user)
+/datum/decl/emote/exertion/synthetic/mob_can_use(mob/living/user)
if(istype(user) && user.isSynthetic())
return ..()
return FALSE
-/decl/emote/exertion/synthetic/creak
+/datum/decl/emote/exertion/synthetic/creak
key = "ecreak"
emote_message_1p = "Your chassis stress indicators spike."
emote_message_3p = "USER's joints creak with stress."
diff --git a/code/modules/emotes/definitions/helpers_vr.dm b/code/modules/emotes/definitions/helpers_vr.dm
index 4abe8d9028..266634764a 100644
--- a/code/modules/emotes/definitions/helpers_vr.dm
+++ b/code/modules/emotes/definitions/helpers_vr.dm
@@ -1,33 +1,33 @@
// Not specifically /human type because those won't allow FBPs to use them
-/decl/emote/helper/vwag
+/datum/decl/emote/helper/vwag
key = "vwag"
emote_message_3p = ""
-/decl/emote/helper/vwag/mob_can_use(mob/living/carbon/human/user)
+/datum/decl/emote/helper/vwag/mob_can_use(mob/living/carbon/human/user)
if(!istype(user) || (!user.tail_style || !user.tail_style.ani_state))
return FALSE
return ..()
-/decl/emote/helper/vwag/do_emote(var/mob/living/carbon/human/user, var/extra_params)
+/datum/decl/emote/helper/vwag/do_emote(var/mob/living/carbon/human/user, var/extra_params)
if(user.toggle_tail(message = 1))
return ..()
-/decl/emote/helper/vwag/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params)
+/datum/decl/emote/helper/vwag/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params)
return "[user.wagging ? "starts" : "stops"] wagging USER_THEIR tail."
-/decl/emote/helper/vflap
+/datum/decl/emote/helper/vflap
key = "vflap"
emote_message_3p = ""
-/decl/emote/helper/vflap/mob_can_use(mob/living/carbon/human/user)
+/datum/decl/emote/helper/vflap/mob_can_use(mob/living/carbon/human/user)
if(!istype(user) || (!user.wing_style || !user.wing_style.ani_state))
return FALSE
return ..()
-/decl/emote/helper/vflap/do_emote(var/mob/living/carbon/human/user, var/extra_params)
+/datum/decl/emote/helper/vflap/do_emote(var/mob/living/carbon/human/user, var/extra_params)
if(user.toggle_wing(message = 1))
return ..()
-/decl/emote/helper/vflap/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params)
+/datum/decl/emote/helper/vflap/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params)
return "[user.flapping ? "starts" : "stops"] flapping USER_THEIR wings."
diff --git a/code/modules/emotes/definitions/human.dm b/code/modules/emotes/definitions/human.dm
index bdf99c23c2..024e426397 100644
--- a/code/modules/emotes/definitions/human.dm
+++ b/code/modules/emotes/definitions/human.dm
@@ -1,10 +1,10 @@
-/decl/emote/human/mob_can_use(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/mob_can_use(var/mob/living/carbon/human/user)
return ..() && (istype(user))//What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
-/decl/emote/human/deathgasp
+/datum/decl/emote/human/deathgasp
key = "deathgasp"
-/decl/emote/human/deathgasp/get_emote_sound(user)
+/datum/decl/emote/human/deathgasp/get_emote_sound(user)
var/mob/living/carbon/human/H = user
var/vol = H.species.death_volume
return list(
@@ -13,53 +13,53 @@
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
)
-/decl/emote/human/deathgasp/do_emote(mob/living/carbon/human/user)
+/datum/decl/emote/human/deathgasp/do_emote(mob/living/carbon/human/user)
if(istype(user) && user.species.get_death_message(user) == DEATHGASP_NO_MESSAGE)
to_chat(user, span_warning("Your species has no deathgasp."))
return
. = ..()
-/decl/emote/human/deathgasp/get_emote_message_3p(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/deathgasp/get_emote_message_3p(var/mob/living/carbon/human/user)
return "[user.species.get_death_message(user)]"
-/decl/emote/human/swish
+/datum/decl/emote/human/swish
key = "swish"
-/decl/emote/human/swish/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/swish/do_emote(var/mob/living/carbon/human/user)
user.animate_tail_once()
-/decl/emote/human/wag
+/datum/decl/emote/human/wag
key = "wag"
-/decl/emote/human/wag/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/wag/do_emote(var/mob/living/carbon/human/user)
user.animate_tail_start()
-/decl/emote/human/sway
+/datum/decl/emote/human/sway
key = "sway"
-/decl/emote/human/sway/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/sway/do_emote(var/mob/living/carbon/human/user)
user.animate_tail_start()
-/decl/emote/human/qwag
+/datum/decl/emote/human/qwag
key = "qwag"
-/decl/emote/human/qwag/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/qwag/do_emote(var/mob/living/carbon/human/user)
user.animate_tail_fast()
-/decl/emote/human/fastsway
+/datum/decl/emote/human/fastsway
key = "fastsway"
-/decl/emote/human/fastsway/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/fastsway/do_emote(var/mob/living/carbon/human/user)
user.animate_tail_fast()
-/decl/emote/human/swag
+/datum/decl/emote/human/swag
key = "swag"
-/decl/emote/human/swag/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/swag/do_emote(var/mob/living/carbon/human/user)
user.animate_tail_stop()
-/decl/emote/human/stopsway
+/datum/decl/emote/human/stopsway
key = "stopsway"
-/decl/emote/human/stopsway/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/stopsway/do_emote(var/mob/living/carbon/human/user)
user.animate_tail_stop()
diff --git a/code/modules/emotes/definitions/slimes.dm b/code/modules/emotes/definitions/slimes.dm
index 65f50b069d..f61bd09183 100644
--- a/code/modules/emotes/definitions/slimes.dm
+++ b/code/modules/emotes/definitions/slimes.dm
@@ -1,32 +1,32 @@
-/decl/emote/slime
+/datum/decl/emote/slime
key = "nomood"
var/mood
-/decl/emote/slime/do_extra(var/mob/living/simple_mob/slime/user)
+/datum/decl/emote/slime/do_extra(var/mob/living/simple_mob/slime/user)
. = ..()
if(istype(user))
user.mood = mood
user.update_icon()
-/decl/emote/slime/mob_can_use(var/atom/user)
+/datum/decl/emote/slime/mob_can_use(var/atom/user)
return ..() && isslime(user)
-/decl/emote/slime/pout
+/datum/decl/emote/slime/pout
key = "mpout"
mood = "pout"
-/decl/emote/slime/sad
+/datum/decl/emote/slime/sad
key = "msad"
mood = "sad"
-/decl/emote/slime/angry
+/datum/decl/emote/slime/angry
key = "mangry"
mood = "angry"
-/decl/emote/slime/frown
+/datum/decl/emote/slime/frown
key = "mfrown"
mood = "mischevous"
-/decl/emote/slime/smile
+/datum/decl/emote/slime/smile
key = "msmile"
mood = ":3"
diff --git a/code/modules/emotes/definitions/synthetics.dm b/code/modules/emotes/definitions/synthetics.dm
index e4024fc8e9..5258861c88 100644
--- a/code/modules/emotes/definitions/synthetics.dm
+++ b/code/modules/emotes/definitions/synthetics.dm
@@ -1,59 +1,59 @@
-/decl/emote/audible/synth
+/datum/decl/emote/audible/synth
key = "ping"
emote_message_3p = "pings."
emote_sound = 'sound/machines/ping.ogg'
-/decl/emote/audible/synth/mob_can_use(var/mob/living/user)
+/datum/decl/emote/audible/synth/mob_can_use(var/mob/living/user)
if(istype(user) && user.isSynthetic())
return ..()
return FALSE
-/decl/emote/audible/synth/beep
+/datum/decl/emote/audible/synth/beep
key = "beep"
emote_message_3p = "beeps."
emote_sound = 'sound/machines/twobeep.ogg'
sound_vary = FALSE
-/decl/emote/audible/synth/bing
+/datum/decl/emote/audible/synth/bing
key = "bing"
emote_message_3p = "bings."
emote_sound = 'sound/machines/ping.ogg'
-/decl/emote/audible/synth/buzz
+/datum/decl/emote/audible/synth/buzz
key = "buzz"
emote_message_3p = "buzzes."
emote_sound = 'sound/machines/buzz-sigh.ogg'
-/decl/emote/audible/synth/confirm
+/datum/decl/emote/audible/synth/confirm
key = "confirm"
emote_message_3p = "emits an affirmative blip."
emote_sound = 'sound/machines/synth_yes.ogg'
-/decl/emote/audible/synth/deny
+/datum/decl/emote/audible/synth/deny
key = "deny"
emote_message_3p = "emits a negative blip."
emote_sound = 'sound/machines/synth_no.ogg'
-/decl/emote/audible/synth/scary
+/datum/decl/emote/audible/synth/scary
key = "scary"
emote_message_3p = "emits a disconcerting tone."
emote_sound = 'sound/machines/synth_alert.ogg'
-/decl/emote/audible/synth/security
+/datum/decl/emote/audible/synth/security
key = "law"
emote_message_3p = "shows USER_THEIR legal authorization barcode."
emote_message_3p_target = "shows TARGET USER_THEIR legal authorization barcode."
emote_sound = 'sound/voice/biamthelaw.ogg'
-/decl/emote/audible/synth/security/mob_can_use(var/mob/living/silicon/robot/user)
+/datum/decl/emote/audible/synth/security/mob_can_use(var/mob/living/silicon/robot/user)
return ..() && (istype(user) && (istype(user.module, /obj/item/robot_module/robot/security)))
-/decl/emote/audible/synth/security/halt
+/datum/decl/emote/audible/synth/security/halt
key = "halt"
emote_message_3p = "USER's speakers skreech, \"Halt! Security!\"."
emote_sound = 'sound/voice/halt.ogg'
-/decl/emote/audible/synth/dwoop
+/datum/decl/emote/audible/synth/dwoop
key = "dwoop"
emote_message_1p_target = "You chirp happily at TARGET!"
emote_message_1p = "You chirp happily."
@@ -61,7 +61,7 @@
emote_message_3p = "chirps happily."
emote_sound = 'sound/machines/dwoop.ogg'
-/decl/emote/audible/synth/boop
+/datum/decl/emote/audible/synth/boop
key = "roboboop"
emote_message_1p_target = "You boop at TARGET!"
emote_message_1p = "You boop."
@@ -70,7 +70,7 @@
emote_sound = 'sound/voice/roboboop.ogg'
sound_vary = TRUE
-/decl/emote/audible/synth/robochirp
+/datum/decl/emote/audible/synth/robochirp
key = "robochirp"
emote_message_1p_target = "You chirp at TARGET!"
emote_message_1p = "You chirp."
@@ -79,7 +79,7 @@
emote_sound = 'sound/voice/robochirp.ogg'
sound_vary = TRUE
-/decl/emote/audible/synth/ding
+/datum/decl/emote/audible/synth/ding
key = "ding"
emote_message_1p = "You ding at TARGET!"
emote_message_1p = "You ding."
@@ -88,7 +88,7 @@
emote_sound = 'sound/machines/ding.ogg'
sound_vary = TRUE
-/decl/emote/audible/synth/microwave
+/datum/decl/emote/audible/synth/microwave
key = "microwave"
emote_message_1p = "You make microwave noises at TARGET!"
emote_message_1p = "You make microwave noises."
diff --git a/code/modules/emotes/definitions/visible.dm b/code/modules/emotes/definitions/visible.dm
index fcd221a3b8..1af40c3a97 100644
--- a/code/modules/emotes/definitions/visible.dm
+++ b/code/modules/emotes/definitions/visible.dm
@@ -1,343 +1,343 @@
-/decl/emote/visible
+/datum/decl/emote/visible
key = "tail"
emote_message_3p = "waves USER_THEIR tail."
message_type = VISIBLE_MESSAGE
-/decl/emote/visible/scratch
+/datum/decl/emote/visible/scratch
key = "scratch"
check_restraints = TRUE
emote_message_3p = "scratches."
-/decl/emote/visible/drool
+/datum/decl/emote/visible/drool
key = "drool"
emote_message_3p = "drools."
conscious = FALSE
-/decl/emote/visible/nod
+/datum/decl/emote/visible/nod
key = "nod"
emote_message_3p_target = "nods USER_THEIR head at TARGET."
emote_message_3p = "nods USER_THEIR head."
-/decl/emote/visible/sway
+/datum/decl/emote/visible/sway
key = "sways"
emote_message_3p = "sways around dizzily."
-/decl/emote/visible/sulk
+/datum/decl/emote/visible/sulk
key = "sulk"
emote_message_3p = "sulks down sadly."
-/decl/emote/visible/dance
+/datum/decl/emote/visible/dance
key = "dance"
check_restraints = TRUE
emote_message_3p = "dances around happily."
-/decl/emote/visible/roll
+/datum/decl/emote/visible/roll
key = "roll"
check_restraints = TRUE
emote_message_3p = "rolls."
-/decl/emote/visible/shake
+/datum/decl/emote/visible/shake
key = "shake"
emote_message_3p = "shakes USER_THEIR head."
-/decl/emote/visible/jump
+/datum/decl/emote/visible/jump
key = "jump"
emote_message_3p = "jumps!"
-/decl/emote/visible/shiver
+/datum/decl/emote/visible/shiver
key = "shiver"
emote_message_3p = "shivers."
conscious = FALSE
-/decl/emote/visible/collapse
+/datum/decl/emote/visible/collapse
key = "collapse"
emote_message_3p = "collapses!"
-/decl/emote/visible/collapse/do_extra(var/mob/user)
+/datum/decl/emote/visible/collapse/do_extra(var/mob/user)
..()
if(istype(user))
user.Paralyse(2)
user.Sleeping(2)
-/decl/emote/visible/flash
+/datum/decl/emote/visible/flash
key = "flash"
emote_message_3p = "flash USER_THEIR lights quickly."
-/decl/emote/visible/blink
+/datum/decl/emote/visible/blink
key = "blink"
emote_message_3p = "blinks."
-/decl/emote/visible/airguitar
+/datum/decl/emote/visible/airguitar
key = "airguitar"
check_restraints = TRUE
emote_message_3p = "is strumming the air and headbanging like a safari chimp."
-/decl/emote/visible/blink_r
+/datum/decl/emote/visible/blink_r
key = "blink_r"
emote_message_3p = "blinks rapidly."
-/decl/emote/visible/bow
+/datum/decl/emote/visible/bow
key = "bow"
emote_message_3p_target = "bows to TARGET."
emote_message_3p = "bows."
-/decl/emote/visible/salute
+/datum/decl/emote/visible/salute
key = "salute"
emote_message_3p_target = "salutes TARGET."
emote_message_3p = "salutes."
check_restraints = TRUE
-/decl/emote/visible/flap
+/datum/decl/emote/visible/flap
key = "flap"
check_restraints = TRUE
emote_message_3p = "flaps USER_THEIR wings."
-/decl/emote/visible/aflap
+/datum/decl/emote/visible/aflap
key = "aflap"
check_restraints = TRUE
emote_message_3p = "flaps USER_THEIR wings ANGRILY!"
-/decl/emote/visible/eyebrow
+/datum/decl/emote/visible/eyebrow
key = "eyebrow"
emote_message_3p = "raises an eyebrow."
-/decl/emote/visible/twitch
+/datum/decl/emote/visible/twitch
key = "twitch"
emote_message_3p = "twitches."
conscious = FALSE
-/decl/emote/visible/twitch_v
+/datum/decl/emote/visible/twitch_v
key = "twitch_v"
emote_message_3p = "twitches violently."
conscious = FALSE
-/decl/emote/visible/faint
+/datum/decl/emote/visible/faint
key = "faint"
emote_message_3p = "faints."
-/decl/emote/visible/faint/do_extra(var/mob/user)
+/datum/decl/emote/visible/faint/do_extra(var/mob/user)
. = ..()
if(iscarbon(user) && !user.sleeping)
user.Sleeping(10)
-/decl/emote/visible/frown
+/datum/decl/emote/visible/frown
key = "frown"
emote_message_3p = "frowns."
-/decl/emote/visible/blush
+/datum/decl/emote/visible/blush
key = "blush"
emote_message_3p = "blushes."
-/decl/emote/visible/wave
+/datum/decl/emote/visible/wave
key = "wave"
emote_message_3p_target = "waves at TARGET."
emote_message_3p = "waves."
check_restraints = TRUE
-/decl/emote/visible/glare
+/datum/decl/emote/visible/glare
key = "glare"
emote_message_3p_target = "glares at TARGET."
emote_message_3p = "glares."
-/decl/emote/visible/stare
+/datum/decl/emote/visible/stare
key = "stare"
emote_message_3p_target = "stares at TARGET."
emote_message_3p = "stares."
-/decl/emote/visible/look
+/datum/decl/emote/visible/look
key = "look"
emote_message_3p_target = "looks at TARGET."
emote_message_3p = "looks."
-/decl/emote/visible/point
+/datum/decl/emote/visible/point
key = "point"
check_restraints = TRUE
emote_message_3p_target = "points to TARGET."
emote_message_3p = "points."
-/decl/emote/visible/raise
+/datum/decl/emote/visible/raise
key = "raise"
check_restraints = TRUE
emote_message_3p = "raises a hand."
-/decl/emote/visible/grin
+/datum/decl/emote/visible/grin
key = "grin"
emote_message_3p_target = "grins at TARGET."
emote_message_3p = "grins."
-/decl/emote/visible/shrug
+/datum/decl/emote/visible/shrug
key = "shrug"
emote_message_3p = "shrugs."
-/decl/emote/visible/smile
+/datum/decl/emote/visible/smile
key = "smile"
emote_message_3p_target = "smiles at TARGET."
emote_message_3p = "smiles."
-/decl/emote/visible/pale
+/datum/decl/emote/visible/pale
key = "pale"
emote_message_3p = "goes pale for a second."
-/decl/emote/visible/tremble
+/datum/decl/emote/visible/tremble
key = "tremble"
emote_message_3p = "trembles in fear!"
-/decl/emote/visible/wink
+/datum/decl/emote/visible/wink
key = "wink"
emote_message_3p_target = "winks at TARGET."
emote_message_3p = "winks."
-/decl/emote/visible/hug
+/datum/decl/emote/visible/hug
key = "hug"
check_restraints = TRUE
emote_message_3p_target = "hugs TARGET."
emote_message_3p = "hugs USER_SELF."
check_range = 1
-/decl/emote/visible/dap
+/datum/decl/emote/visible/dap
key = "dap"
check_restraints = TRUE
emote_message_3p_target = "gives daps to TARGET."
emote_message_3p = "sadly can't find anybody to give daps to, and daps USER_SELF."
-/decl/emote/visible/bounce
+/datum/decl/emote/visible/bounce
key = "bounce"
emote_message_3p = "bounces in place."
-/decl/emote/visible/jiggle
+/datum/decl/emote/visible/jiggle
key = "jiggle"
emote_message_3p = "jiggles!"
-/decl/emote/visible/lightup
+/datum/decl/emote/visible/lightup
key = "light"
emote_message_3p = "lights up for a bit, then stops."
-/decl/emote/visible/vibrate
+/datum/decl/emote/visible/vibrate
key = "vibrate"
emote_message_3p = "vibrates!"
-/decl/emote/visible/deathgasp_robot
+/datum/decl/emote/visible/deathgasp_robot
key = "rdeathgasp"
emote_message_3p = "shudders violently for a moment, then becomes motionless, USER_THEIR eyes slowly darkening."
-/decl/emote/visible/handshake
+/datum/decl/emote/visible/handshake
key = "handshake"
check_restraints = TRUE
emote_message_3p_target = "shakes hands with TARGET."
emote_message_3p = "shakes hands with USER_SELF."
check_range = 1
-/decl/emote/visible/handshake/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/visible/handshake/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
if(target && !user.Adjacent(target))
return "holds out USER_THEIR hand out to TARGET."
return ..()
-/decl/emote/visible/signal
+/datum/decl/emote/visible/signal
key = "signal"
emote_message_3p_target = "signals at TARGET."
emote_message_3p = "signals."
check_restraints = TRUE
-/decl/emote/visible/signal/get_emote_message_3p(var/mob/living/user, var/atom/target, var/extra_params)
+/datum/decl/emote/visible/signal/get_emote_message_3p(var/mob/living/user, var/atom/target, var/extra_params)
if(istype(user) && (!user.get_active_hand() || !user.get_inactive_hand()))
var/t1 = round(text2num(extra_params))
if(isnum(t1) && t1 <= 5)
return "raises [t1] finger\s."
return .. ()
-/decl/emote/visible/afold
+/datum/decl/emote/visible/afold
key = "afold"
check_restraints = TRUE
emote_message_3p = "folds USER_THEIR arms."
-/decl/emote/visible/alook
+/datum/decl/emote/visible/alook
key = "alook"
emote_message_3p = "looks away."
-/decl/emote/visible/hbow
+/datum/decl/emote/visible/hbow
key = "hbow"
emote_message_3p = "bows USER_THEIR head."
-/decl/emote/visible/hip
+/datum/decl/emote/visible/hip
key = "hip"
check_restraints = TRUE
emote_message_3p = "puts USER_THEIR hands on USER_THEIR hips."
-/decl/emote/visible/holdup
+/datum/decl/emote/visible/holdup
key = "holdup"
check_restraints = TRUE
emote_message_3p = "holds up USER_THEIR palms."
-/decl/emote/visible/hshrug
+/datum/decl/emote/visible/hshrug
key = "hshrug"
emote_message_3p = "gives a half shrug."
-/decl/emote/visible/crub
+/datum/decl/emote/visible/crub
key = "crub"
check_restraints = TRUE
emote_message_3p = "rubs USER_THEIR chin."
-/decl/emote/visible/eroll
+/datum/decl/emote/visible/eroll
key = "eroll"
emote_message_3p = "rolls USER_THEIR eyes."
emote_message_3p_target = "rolls USER_THEIR eyes at TARGET."
-/decl/emote/visible/erub
+/datum/decl/emote/visible/erub
key = "erub"
check_restraints = TRUE
emote_message_3p = "rubs USER_THEIR eyes."
-/decl/emote/visible/fslap
+/datum/decl/emote/visible/fslap
key = "fslap"
check_restraints = TRUE
emote_message_3p = "slaps USER_THEIR forehead."
-/decl/emote/visible/ftap
+/datum/decl/emote/visible/ftap
key = "ftap"
emote_message_3p = "taps USER_THEIR foot."
-/decl/emote/visible/hrub
+/datum/decl/emote/visible/hrub
key = "hrub"
check_restraints = TRUE
emote_message_3p = "rubs USER_THEIR hands together."
-/decl/emote/visible/hspread
+/datum/decl/emote/visible/hspread
key = "hspread"
check_restraints = TRUE
emote_message_3p = "spreads USER_THEIR hands."
-/decl/emote/visible/pocket
+/datum/decl/emote/visible/pocket
key = "pocket"
check_restraints = TRUE
emote_message_3p = "shoves USER_THEIR hands in USER_THEIR pockets."
-/decl/emote/visible/rsalute
+/datum/decl/emote/visible/rsalute
key = "rsalute"
check_restraints = TRUE
emote_message_3p = "returns the salute."
-/decl/emote/visible/rshoulder
+/datum/decl/emote/visible/rshoulder
key = "rshoulder"
emote_message_3p = "rolls USER_THEIR shoulders."
-/decl/emote/visible/squint
+/datum/decl/emote/visible/squint
key = "squint"
emote_message_3p = "squints."
emote_message_3p_target = "squints at TARGET."
-/decl/emote/visible/tfist
+/datum/decl/emote/visible/tfist
key = "tfist"
emote_message_3p = "tightens USER_THEIR hands into fists."
-/decl/emote/visible/tilt
+/datum/decl/emote/visible/tilt
key = "tilt"
emote_message_3p = "tilts USER_THEIR head."
-/decl/emote/visible/goodrip
+/datum/decl/emote/visible/goodrip
key = "goodrip"
emote_message_3p = "drips goo."
-/decl/emote/visible/goodrip/do_extra(var/mob/user)
+/datum/decl/emote/visible/goodrip/do_extra(var/mob/user)
..()
new /obj/effect/decal/cleanable/blood/oil(user)
var/goo_sounds = list (
diff --git a/code/modules/emotes/definitions/visible_animated.dm b/code/modules/emotes/definitions/visible_animated.dm
index b2133cd8e3..b51937b725 100644
--- a/code/modules/emotes/definitions/visible_animated.dm
+++ b/code/modules/emotes/definitions/visible_animated.dm
@@ -1,32 +1,32 @@
-/decl/emote/visible/spin
+/datum/decl/emote/visible/spin
key = "spin"
check_restraints = TRUE
emote_message_3p = "spins!"
emote_delay = 2 SECONDS
-/decl/emote/visible/spin/do_extra(mob/user)
+/datum/decl/emote/visible/spin/do_extra(mob/user)
if(istype(user))
user.spin(20, 1)
-/decl/emote/visible/sidestep
+/datum/decl/emote/visible/sidestep
key = "sidestep"
check_restraints = TRUE
emote_message_3p = "steps rhythmically and moves side to side."
-/decl/emote/visible/sidestep/do_extra(mob/user)
+/datum/decl/emote/visible/sidestep/do_extra(mob/user)
if(istype(user))
animate(user, pixel_x = 5, time = 5)
sleep(3)
animate(user, pixel_x = -5, time = 5)
animate(pixel_x = user.default_pixel_x, pixel_y = user.default_pixel_x, time = 2)
-/decl/emote/visible/flip
+/datum/decl/emote/visible/flip
key = "flip"
emote_message_1p = "You do a flip!"
emote_message_3p = "does a flip!"
emote_sound = 'sound/effects/bodyfall4.ogg'
-/decl/emote/visible/flip/do_extra(mob/user)
+/datum/decl/emote/visible/flip/do_extra(mob/user)
. = ..()
// VOREStation Add - Fancy flips
if(ishuman(user))
@@ -36,12 +36,14 @@
else if(istype(user))
user.SpinAnimation(7,1)
-/decl/emote/visible/flip/slip //CHOMPAdd
+// CHOMPAdd Start
+/datum/decl/emote/visible/flip/slip
key = "sflip"
emote_message_1p = "You barely avoid falling over!"
emote_message_3p = "barely avoids falling over!"
+// CHOMPAdd End
-/decl/emote/visible/floorspin
+/datum/decl/emote/visible/floorspin
key = "floorspin"
emote_message_1p = "You spin around on the floor!"
emote_message_3p = "spins around on the floor!"
@@ -66,7 +68,7 @@
SOUTH
)
-/decl/emote/visible/floorspin/proc/spin_dir(var/mob/user)
+/datum/decl/emote/visible/floorspin/proc/spin_dir(var/mob/user)
set waitfor = FALSE
for(var/i in spin_dirs)
user.set_dir(i)
@@ -74,13 +76,13 @@
if(QDELETED(user))
return
-/decl/emote/visible/floorspin/proc/spin_anim(var/mob/user)
+/datum/decl/emote/visible/floorspin/proc/spin_anim(var/mob/user)
set waitfor = FALSE
sleep(1)
if(!QDELETED(user))
user.SpinAnimation(10,1)
-/decl/emote/visible/floorspin/do_extra(mob/user)
+/datum/decl/emote/visible/floorspin/do_extra(mob/user)
. = ..()
if(istype(user))
spin_dir(user)
diff --git a/code/modules/emotes/definitions/visible_vomit.dm b/code/modules/emotes/definitions/visible_vomit.dm
index ec96de56f5..27b721b7bc 100644
--- a/code/modules/emotes/definitions/visible_vomit.dm
+++ b/code/modules/emotes/definitions/visible_vomit.dm
@@ -1,7 +1,7 @@
-/decl/emote/visible/vomit
+/datum/decl/emote/visible/vomit
key = "vomit"
-/decl/emote/visible/vomit/do_emote(var/atom/user, var/extra_params)
+/datum/decl/emote/visible/vomit/do_emote(var/atom/user, var/extra_params)
if(isliving(user))
var/mob/living/M = user
if(!M.isSynthetic())
diff --git a/code/modules/emotes/definitions/visible_vr.dm b/code/modules/emotes/definitions/visible_vr.dm
index 39b8dcbd82..c081868a5b 100644
--- a/code/modules/emotes/definitions/visible_vr.dm
+++ b/code/modules/emotes/definitions/visible_vr.dm
@@ -1,7 +1,7 @@
-/decl/emote/visible/mlem
+/datum/decl/emote/visible/mlem
key = "mlem"
emote_message_3p = "mlems USER_THEIR tongue up over USER_THEIR nose. Mlem."
-/decl/emote/visible/blep
+/datum/decl/emote/visible/blep
key = "blep"
emote_message_3p = "bleps USER_THEIR tongue out. Blep."
diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm
index 1e36bb9637..92fd8b15dc 100644
--- a/code/modules/emotes/emote_define.dm
+++ b/code/modules/emotes/emote_define.dm
@@ -6,10 +6,10 @@
/proc/get_emote_by_key(var/key)
if(!LAZYLEN(GLOB.emotes_by_key))
- decls_repository.get_decls_of_type(/decl/emote) // GLOB.emotes_by_key will be updated in emote Initialize()
+ GLOB.decls_repository.get_decls_of_type(/datum/decl/emote) // GLOB.emotes_by_key will be updated in emote Initialize()
return GLOB.emotes_by_key[key]
-/decl/emote
+/datum/decl/emote
var/key // Command to use emote ie. '*[key]'
var/emote_message_1p // First person message ('You do a flip!')
var/emote_message_3p // Third person message ('Urist McBackflip does a flip!')
@@ -44,12 +44,12 @@
var/sound_preferences = list(/datum/preference/toggle/emote_noises) // Default emote sound_preferences is just emote_noises. Belch emote overrides this list for pref-checks.
var/sound_vary = FALSE
-/decl/emote/Initialize(mapload)
+/datum/decl/emote/Initialize()
. = ..()
if(key)
LAZYSET(GLOB.emotes_by_key, key, src)
-/decl/emote/proc/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/proc/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
if(target)
if(emote_message_synthetic_1p_target && check_synthetic(user))
return emote_message_synthetic_1p_target
@@ -58,7 +58,7 @@
return emote_message_synthetic_1p
return emote_message_1p
-/decl/emote/proc/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/proc/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
if(target)
if(emote_message_synthetic_3p_target && check_synthetic(user))
return emote_message_synthetic_3p_target
@@ -67,7 +67,7 @@
return emote_message_synthetic_3p
return emote_message_3p
-/decl/emote/proc/get_emote_sound(var/atom/user)
+/datum/decl/emote/proc/get_emote_sound(var/atom/user)
if(check_synthetic(user) && emote_sound_synthetic)
return list(
"sound" = emote_sound_synthetic,
@@ -79,7 +79,7 @@
"vol" = emote_volume
)
-/decl/emote/proc/do_emote(var/atom/user, var/extra_params)
+/datum/decl/emote/proc/do_emote(var/atom/user, var/extra_params)
if(ismob(user) && check_restraints)
var/mob/M = user
if(M.transforming) //Transforming acts as a stasis.
@@ -149,7 +149,7 @@
do_sound(user)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_EMOTE_PERFORMED, user, extra_params)
-/decl/emote/proc/replace_target_tokens(var/msg, var/atom/target)
+/datum/decl/emote/proc/replace_target_tokens(var/msg, var/atom/target)
. = msg
if(istype(target))
. = replacetext(., "TARGET_THEM", target.p_them())
@@ -157,7 +157,7 @@
. = replacetext(., "TARGET_SELF", target.p_themselves())
. = replacetext(., "TARGET", span_bold("\the [target]"))
-/decl/emote/proc/replace_user_tokens(var/msg, var/atom/user)
+/datum/decl/emote/proc/replace_user_tokens(var/msg, var/atom/user)
. = msg
if(istype(user))
. = replacetext(., "USER_THEM", user.p_them())
@@ -165,15 +165,15 @@
. = replacetext(., "USER_SELF", user.p_themselves())
. = replacetext(., "USER", span_bold("\the [user]"))
-/decl/emote/proc/get_radio_message(var/atom/user)
+/datum/decl/emote/proc/get_radio_message(var/atom/user)
if(emote_message_radio_synthetic && check_synthetic(user))
return emote_message_radio_synthetic
return emote_message_radio
-/decl/emote/proc/do_extra(var/atom/user, var/atom/target)
+/datum/decl/emote/proc/do_extra(var/atom/user, var/atom/target)
return
-/decl/emote/proc/do_sound(var/atom/user)
+/datum/decl/emote/proc/do_sound(var/atom/user)
var/list/use_sound = get_emote_sound(user)
if(!islist(use_sound) || length(use_sound) < 2)
return
@@ -195,16 +195,16 @@
else
playsound(user.loc, sound_to_play, use_sound["vol"], sound_vary, extrarange = use_sound["exr"], frequency = null, preference = sound_preferences, volume_channel = use_sound["volchannel"])
-/decl/emote/proc/mob_can_use(var/mob/user)
+/datum/decl/emote/proc/mob_can_use(var/mob/user)
return istype(user) && user.stat != DEAD && (type in user.get_available_emotes())
-/decl/emote/proc/can_target()
+/datum/decl/emote/proc/can_target()
return (emote_message_1p_target || emote_message_3p_target)
-/decl/emote/dd_SortValue()
+/datum/decl/emote/dd_SortValue()
return key
-/decl/emote/proc/check_synthetic(var/mob/living/user)
+/datum/decl/emote/proc/check_synthetic(var/mob/living/user)
. = istype(user) && user.isSynthetic()
if(!. && ishuman(user) && message_type == AUDIBLE_MESSAGE)
var/mob/living/carbon/human/H = user
diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index e40d68e5a6..681aa10a72 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -40,7 +40,7 @@
var/list/usable_emotes = list()
next_emote_refresh = world.time + EMOTE_REFRESH_SPAM_COOLDOWN
for(var/emote in get_available_emotes())
- var/decl/emote/emote_datum = decls_repository.get_decl(emote)
+ var/datum/decl/emote/emote_datum = GLOB.decls_repository.get_decl(emote)
if(emote_datum.mob_can_use(src))
usable_emotes[emote_datum.key] = emote_datum
last_emote_summary = english_list(sortAssoc(usable_emotes))
@@ -80,7 +80,7 @@
return nme(message)
//VOREStation Add End
- var/decl/emote/use_emote = get_emote_by_key(act)
+ var/datum/decl/emote/use_emote = get_emote_by_key(act)
if(!istype(use_emote))
to_chat(src, span_warning("Unknown emote '[act]'. Type " + span_bold("say *help") + " for a list of usable emotes. ([act] [message])")) // Add full message in the event you used * instead of ! or something like that
return
diff --git a/code/modules/events/supply_demand_vr.dm b/code/modules/events/supply_demand_vr.dm
index 8e0133ac8f..892e93b773 100644
--- a/code/modules/events/supply_demand_vr.dm
+++ b/code/modules/events/supply_demand_vr.dm
@@ -270,7 +270,7 @@
/datum/event/supply_demand/proc/choose_chemistry_items(var/differentTypes)
// Checking if they show up in health analyzer is good huristic for it being a drug
var/list/medicineReagents = list()
- for(var/decl/chemical_reaction/instant/CR in SSchemistry.chemical_reactions)
+ for(var/datum/decl/chemical_reaction/instant/CR in SSchemistry.chemical_reactions)
var/datum/reagent/R = SSchemistry.chemical_reagents[initial(CR.result)]
if(R && R.scannable)
medicineReagents += R
@@ -283,7 +283,7 @@
/datum/event/supply_demand/proc/choose_bar_items(var/differentTypes)
var/list/drinkReagents = list()
- for(var/decl/chemical_reaction/instant/drinks/CR in SSchemistry.chemical_reactions)
+ for(var/datum/decl/chemical_reaction/instant/drinks/CR in SSchemistry.chemical_reactions)
var/datum/reagent/R = SSchemistry.chemical_reagents[initial(CR.result)]
if(istype(R, /datum/reagent/drink) || istype(R, /datum/reagent/ethanol))
drinkReagents += R
diff --git a/code/modules/food/recipe_dump.dm b/code/modules/food/recipe_dump.dm
index a64f5d6485..467eff587d 100644
--- a/code/modules/food/recipe_dump.dm
+++ b/code/modules/food/recipe_dump.dm
@@ -8,7 +8,7 @@
//////////////////////// DRINK
var/list/drink_recipes = list()
- for(var/decl/chemical_reaction/instant/drinks/CR in SSchemistry.chemical_reactions)
+ for(var/datum/decl/chemical_reaction/instant/drinks/CR in SSchemistry.chemical_reactions)
drink_recipes[CR.type] = list("Result" = CR.name,
"ResAmt" = CR.result_amount,
"Reagents" = CR.required_reagents,
@@ -41,7 +41,7 @@
qdel(R)
//////////////////////// FOOD+ (basically condiments, tofu, cheese, soysauce, etc)
- for(var/decl/chemical_reaction/instant/food/CR in SSchemistry.chemical_reactions)
+ for(var/datum/decl/chemical_reaction/instant/food/CR in SSchemistry.chemical_reactions)
food_recipes[CR.type] = list("Result" = CR.name,
"ResAmt" = CR.result_amount,
"Reagents" = CR.required_reagents,
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index 1b0134cd62..8f09558f94 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -19,36 +19,36 @@
name = "carpet"
icon = 'icons/turf/flooring/carpet.dmi'
icon_state = "carpet"
- initial_flooring = /decl/flooring/carpet
+ initial_flooring = /datum/decl/flooring/carpet
/turf/simulated/floor/holofloor/tiled
name = "floor"
icon = 'icons/turf/flooring/tiles.dmi'
icon_state = "steel"
- initial_flooring = /decl/flooring/tiling
+ initial_flooring = /datum/decl/flooring/tiling
/turf/simulated/floor/holofloor/tiled/dark
name = "dark floor"
icon_state = "dark"
- initial_flooring = /decl/flooring/tiling/dark
+ initial_flooring = /datum/decl/flooring/tiling/dark
/turf/simulated/floor/holofloor/lino
name = "lino"
icon = 'icons/turf/flooring/linoleum.dmi'
icon_state = "lino"
- initial_flooring = /decl/flooring/linoleum
+ initial_flooring = /datum/decl/flooring/linoleum
/turf/simulated/floor/holofloor/wood
name = "wooden floor"
icon = 'icons/turf/flooring/wood.dmi'
icon_state = "wood"
- initial_flooring = /decl/flooring/wood
+ initial_flooring = /datum/decl/flooring/wood
/turf/simulated/floor/holofloor/grass
name = "lush grass"
icon = 'icons/turf/flooring/grass.dmi'
icon_state = "grass0"
- initial_flooring = /decl/flooring/grass
+ initial_flooring = /datum/decl/flooring/grass
/turf/simulated/floor/holofloor/grass/jungle
icon = 'icons/jungle.dmi'
@@ -83,7 +83,7 @@
/turf/simulated/floor/holofloor/reinforced
icon = 'icons/turf/flooring/tiles.dmi'
- initial_flooring = /decl/flooring/reinforced
+ initial_flooring = /datum/decl/flooring/reinforced
name = "reinforced holofloor"
icon_state = "reinforced"
@@ -130,13 +130,13 @@
name = "marble"
icon = 'icons/turf/flooring/misc.dmi'
icon_state = "darkmarble"
- initial_flooring = /decl/flooring/bmarble
+ initial_flooring = /datum/decl/flooring/bmarble
/turf/simulated/floor/holofloor/wmarble
name = "marble"
icon = 'icons/turf/flooring/misc.dmi'
icon_state = "lightmarble"
- initial_flooring = /decl/flooring/wmarble
+ initial_flooring = /datum/decl/flooring/wmarble
/obj/structure/holostool
name = "stool"
diff --git a/code/modules/hydroponics/seed_gene_mut.dm b/code/modules/hydroponics/seed_gene_mut.dm
index d3d6bffc24..63c12a7b1a 100644
--- a/code/modules/hydroponics/seed_gene_mut.dm
+++ b/code/modules/hydroponics/seed_gene_mut.dm
@@ -1,4 +1,4 @@
-/datum/seed/proc/diverge_mutate_gene(var/decl/plantgene/G, var/turf/T)
+/datum/seed/proc/diverge_mutate_gene(var/datum/decl/plantgene/G, var/turf/T)
if(!istype(G))
log_runtime("Attempted to mutate [src] with a non-plantgene var.")
return src
@@ -9,52 +9,52 @@
return S
-/decl/plantgene
+/datum/decl/plantgene
var/gene_tag
-/decl/plantgene/biochem
+/datum/decl/plantgene/biochem
gene_tag = GENE_BIOCHEMISTRY
-/decl/plantgene/hardiness
+/datum/decl/plantgene/hardiness
gene_tag = GENE_HARDINESS
-/decl/plantgene/environment
+/datum/decl/plantgene/environment
gene_tag = GENE_ENVIRONMENT
-/decl/plantgene/metabolism
+/datum/decl/plantgene/metabolism
gene_tag = GENE_METABOLISM
-/decl/plantgene/structure
+/datum/decl/plantgene/structure
gene_tag = GENE_STRUCTURE
-/decl/plantgene/diet
+/datum/decl/plantgene/diet
gene_tag = GENE_DIET
-/decl/plantgene/pigment
+/datum/decl/plantgene/pigment
gene_tag = GENE_PIGMENT
-/decl/plantgene/output
+/datum/decl/plantgene/output
gene_tag = GENE_OUTPUT
-/decl/plantgene/atmosphere
+/datum/decl/plantgene/atmosphere
gene_tag = GENE_ATMOSPHERE
-/decl/plantgene/vigour
+/datum/decl/plantgene/vigour
gene_tag = GENE_VIGOUR
-/decl/plantgene/fruit
+/datum/decl/plantgene/fruit
gene_tag = GENE_FRUIT
-/decl/plantgene/special
+/datum/decl/plantgene/special
gene_tag = GENE_SPECIAL
-/decl/plantgene/proc/mutate(var/datum/seed/S)
+/datum/decl/plantgene/proc/mutate(var/datum/seed/S)
return
-/decl/plantgene/biochem/mutate(var/datum/seed/S)
+/datum/decl/plantgene/biochem/mutate(var/datum/seed/S)
S.set_trait(TRAIT_POTENCY, S.get_trait(TRAIT_POTENCY)+rand(-20,20),200, 0)
-/decl/plantgene/hardiness/mutate(var/datum/seed/S)
+/datum/decl/plantgene/hardiness/mutate(var/datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_TOXINS_TOLERANCE, S.get_trait(TRAIT_TOXINS_TOLERANCE)+rand(-2,2),10,0)
if(prob(60))
@@ -64,7 +64,7 @@
if(prob(60))
S.set_trait(TRAIT_ENDURANCE, S.get_trait(TRAIT_ENDURANCE)+rand(-5,5),100,0)
-/decl/plantgene/environment/mutate(var/datum/seed/S)
+/datum/decl/plantgene/environment/mutate(var/datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_IDEAL_HEAT, S.get_trait(TRAIT_IDEAL_HEAT)+rand(-2,2),10,0)
if(prob(60))
@@ -72,7 +72,7 @@
if(prob(60))
S.set_trait(TRAIT_LIGHT_TOLERANCE, S.get_trait(TRAIT_LIGHT_TOLERANCE)+rand(-5,5),100,0)
-/decl/plantgene/metabolism/mutate(var/datum/seed/S)
+/datum/decl/plantgene/metabolism/mutate(var/datum/seed/S)
if(prob(65))
S.set_trait(TRAIT_REQUIRES_NUTRIENTS, S.get_trait(TRAIT_REQUIRES_NUTRIENTS)+rand(-2,2),10,0)
if(prob(65))
@@ -80,7 +80,7 @@
if(prob(40))
S.set_trait(TRAIT_ALTER_TEMP, S.get_trait(TRAIT_ALTER_TEMP)+rand(-5,5),100,0)
-/decl/plantgene/diet/mutate(var/datum/seed/S)
+/datum/decl/plantgene/diet/mutate(var/datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_CARNIVOROUS, S.get_trait(TRAIT_CARNIVOROUS)+rand(-1,1),2,0)
if(prob(60))
@@ -90,7 +90,7 @@
if(prob(65))
S.set_trait(TRAIT_WATER_CONSUMPTION, S.get_trait(TRAIT_WATER_CONSUMPTION)+rand(-1,1),50,0)
-/decl/plantgene/output/mutate(var/datum/seed/S, var/turf/T)
+/datum/decl/plantgene/output/mutate(var/datum/seed/S, var/turf/T)
if(prob(50))
S.set_trait(TRAIT_BIOLUM, !S.get_trait(TRAIT_BIOLUM))
if(S.get_trait(TRAIT_BIOLUM))
@@ -111,7 +111,7 @@
else
T.visible_message(span_notice("\The [S.display_name]'s spores no longer fall."))
-/decl/plantgene/atmosphere/mutate(var/datum/seed/S)
+/datum/decl/plantgene/atmosphere/mutate(var/datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_HEAT_TOLERANCE, S.get_trait(TRAIT_HEAT_TOLERANCE)+rand(-2,2),40,0)
if(prob(60))
@@ -119,7 +119,7 @@
if(prob(60))
S.set_trait(TRAIT_HIGHKPA_TOLERANCE, S.get_trait(TRAIT_HIGHKPA_TOLERANCE)+rand(-10,10),500,100)
-/decl/plantgene/vigour/mutate(var/datum/seed/S, var/turf/T)
+/datum/decl/plantgene/vigour/mutate(var/datum/seed/S, var/turf/T)
if(prob(65))
S.set_trait(TRAIT_PRODUCTION, S.get_trait(TRAIT_PRODUCTION)+rand(-1,1),10,0)
if(prob(65))
@@ -128,7 +128,7 @@
S.set_trait(TRAIT_SPREAD, S.get_trait(TRAIT_SPREAD)+rand(-1,1),2,0)
T.visible_message(span_infoplain(span_bold("\The [S.display_name]") + " spasms visibly, shifting in the tray."))
-/decl/plantgene/fruit/mutate(var/datum/seed/S)
+/datum/decl/plantgene/fruit/mutate(var/datum/seed/S)
if(prob(65))
S.set_trait(TRAIT_STINGS, !S.get_trait(TRAIT_STINGS))
if(prob(65))
@@ -136,6 +136,6 @@
if(prob(65))
S.set_trait(TRAIT_JUICY, !S.get_trait(TRAIT_JUICY))
-/decl/plantgene/special/mutate(var/datum/seed/S)
+/datum/decl/plantgene/special/mutate(var/datum/seed/S)
if(prob(65))
S.set_trait(TRAIT_TELEPORTING, !S.get_trait(TRAIT_TELEPORTING))
diff --git a/code/modules/integrated_electronics/_defines.dm b/code/modules/integrated_electronics/_defines.dm
index 68fc1d9c86..edbba25371 100644
--- a/code/modules/integrated_electronics/_defines.dm
+++ b/code/modules/integrated_electronics/_defines.dm
@@ -36,11 +36,13 @@
// Data limits.
#define IC_MAX_LIST_LENGTH 200
-GLOBAL_LIST_EMPTY(all_integrated_circuits)
+GLOBAL_LIST_INIT(all_integrated_circuits, initialize_integrated_circuits_list())
/proc/initialize_integrated_circuits_list()
+ var/list/circuit_list = list()
for(var/thing in typesof(/obj/item/integrated_circuit))
- GLOB.all_integrated_circuits += new thing()
+ circuit_list += new thing()
+ return circuit_list
/obj/item/integrated_circuit
name = "integrated circuit"
diff --git a/code/modules/looking_glass/lg_turfs.dm b/code/modules/looking_glass/lg_turfs.dm
index e306c02ad5..09abdca1b0 100644
--- a/code/modules/looking_glass/lg_turfs.dm
+++ b/code/modules/looking_glass/lg_turfs.dm
@@ -1,4 +1,4 @@
-/decl/flooring/looking_glass
+/datum/decl/flooring/looking_glass
name = "looking glass surface"
desc = "Too expensive to replace. Don't break it!"
icon = 'icons/turf/flooring/lg_origin.dmi'
@@ -11,7 +11,7 @@
name = "looking glass surface"
icon = 'icons/turf/flooring/lg_origin.dmi'
icon_state = "origin_arrow"
- initial_flooring = /decl/flooring/looking_glass
+ initial_flooring = /datum/decl/flooring/looking_glass
appearance_flags = TILE_BOUND
dynamic_lighting = FALSE
flags = TURF_ACID_IMMUNE
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index af01cefad7..602bc0bda2 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/crate/secure/loot
name = "abandoned crate"
desc = "What could be inside?"
- closet_appearance = /decl/closet_appearance/crate/secure
+ closet_appearance = /datum/decl/closet_appearance/crate/secure
var/list/code = list()
var/list/lastattempt = list()
var/attempts = 10
diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm
index 5a2d694cf5..0fd9c3e60e 100644
--- a/code/modules/mining/machinery/machine_processing.dm
+++ b/code/modules/mining/machinery/machine_processing.dm
@@ -74,7 +74,7 @@
for(var/ore in machine.ores_processing)
if(!machine.ores_stored[ore] && !show_all_ores)
continue
- var/ore/O = GLOB.ore_data[ore]
+ var/datum/ore/O = GLOB.ore_data[ore]
if(!O)
continue
ores.Add(list(list(
@@ -189,8 +189,8 @@
/obj/machinery/mineral/processing_unit/Initialize(mapload)
. = ..()
- for(var/ore in GLOB.ore_data)
- var/ore/OD = GLOB.ore_data[ore]
+ for(var/ore, value in GLOB.ore_data)
+ var/datum/ore/OD = value
ores_processing[OD.name] = 0
ores_stored[OD.name] = 0
@@ -270,7 +270,7 @@
if(ores_stored[metal] > 0 && ores_processing[metal] != 0)
- var/ore/O = GLOB.ore_data[metal]
+ var/datum/ore/O = GLOB.ore_data[metal]
if(!O) continue
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index f128e2ca07..0b159acbba 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -44,7 +44,7 @@ var/list/mining_overlay_cache = list()
var/rock_icon_path = 'icons/turf/walls.dmi' // Override this on a subtype turf if you want a custom icon
var/random_icon = 0
- var/ore/mineral
+ var/datum/ore/mineral
var/sand_dug
var/mined_ore = 0
var/last_act = 0
diff --git a/code/modules/mining/mineral_effect.dm b/code/modules/mining/mineral_effect.dm
index edb349e400..f5616b7bcb 100644
--- a/code/modules/mining/mineral_effect.dm
+++ b/code/modules/mining/mineral_effect.dm
@@ -14,7 +14,7 @@
var/turf/simulated/mineral/min_turf = loc
if(!istype(min_turf))
return INITIALIZE_HINT_QDEL
- var/ore/M = min_turf.mineral
+ var/datum/ore/M = min_turf.mineral
name = "[M.display_name] deposit"
ore_key = M.name
if(M.reagent)
@@ -24,7 +24,7 @@
/obj/effect/mineral/proc/get_scan_overlay()
if(!scanner_image)
- var/ore/O = GLOB.ore_data[ore_key]
+ var/datum/ore/O = GLOB.ore_data[ore_key]
if(O)
scanner_image = image(icon, loc = get_turf(src), icon_state = (O.scan_icon ? O.scan_icon : icon_state))
else
diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm
index e85dbdeaf4..74dd3f9d8c 100644
--- a/code/modules/mining/ore_datum.dm
+++ b/code/modules/mining/ore_datum.dm
@@ -1,4 +1,4 @@
-/ore
+/datum/ore
var/name
var/display_name
var/alloy
@@ -7,7 +7,7 @@
var/result_amount // How much ore?
var/spread = 1 // Does this type of deposit spread?
var/spread_chance // Chance of spreading in any direction
- var/ore // Path to the ore produced when tile is mined.
+ var/datum/ore // Path to the ore produced when tile is mined.
var/scan_icon // Overlay for ore scanners.
// Xenoarch stuff. No idea what it's for, just refactored it to be less awful.
var/list/xarch_ages = list(
@@ -18,12 +18,12 @@
var/reagent = REAGENT_ID_SILICATE
var/wiki_flag = 0
-/ore/New()
+/datum/ore/New()
. = ..()
if(!display_name)
display_name = name
-/ore/uranium
+/datum/ore/uranium
name = ORE_URANIUM
display_name = "pitchblende"
smelts_to = MAT_URANIUM
@@ -38,7 +38,7 @@
xarch_source_mineral = REAGENT_ID_POTASSIUM
reagent = REAGENT_ID_RADIUM // Otherwise it emp pulses constantly with iron
-/ore/hematite
+/datum/ore/hematite
name = ORE_HEMATITE
display_name = ORE_HEMATITE
smelts_to = MAT_IRON
@@ -49,7 +49,7 @@
scan_icon = "mineral_common"
reagent = REAGENT_ID_IRON
-/ore/coal
+/datum/ore/coal
name = ORE_CARBON
display_name = "raw carbon"
smelts_to = MAT_PLASTIC
@@ -61,7 +61,7 @@
scan_icon = "mineral_common"
reagent = REAGENT_ID_CARBON
-/ore/glass
+/datum/ore/glass
name = ORE_SAND
display_name = ORE_SAND
smelts_to = MAT_GLASS
@@ -69,7 +69,7 @@
ore = /obj/item/ore/glass
compresses_to = MAT_SANDSTONE
-/ore/phoron
+/datum/ore/phoron
name = ORE_PHORON
display_name = "phoron crystals"
compresses_to = MAT_PHORON
@@ -87,7 +87,7 @@
xarch_source_mineral = REAGENT_ID_PHORON
reagent = REAGENT_ID_PHORON
-/ore/silver
+/datum/ore/silver
name = ORE_SILVER
display_name = "native silver"
smelts_to = MAT_SILVER
@@ -97,7 +97,7 @@
scan_icon = "mineral_uncommon"
reagent = REAGENT_ID_SILVER
-/ore/gold
+/datum/ore/gold
name = ORE_GOLD
smelts_to = MAT_GOLD
display_name = "native gold"
@@ -113,7 +113,7 @@
)
reagent = REAGENT_ID_GOLD
-/ore/diamond
+/datum/ore/diamond
name = ORE_DIAMOND
display_name = ORE_DIAMOND
alloy = 1
@@ -125,7 +125,7 @@
xarch_source_mineral = REAGENT_ID_NITROGEN
reagent = REAGENT_ID_CARBON
-/ore/platinum
+/datum/ore/platinum
name = ORE_PLATINUM
display_name = "raw platinum"
smelts_to = MAT_PLATINUM
@@ -137,7 +137,7 @@
scan_icon = "mineral_rare"
reagent = REAGENT_ID_PLATINUM
-/ore/hydrogen
+/datum/ore/hydrogen
name = ORE_MHYDROGEN
display_name = "metallic hydrogen"
smelts_to = MAT_TRITIUM
@@ -146,7 +146,7 @@
scan_icon = "mineral_rare"
reagent = REAGENT_ID_HYDROGEN
-/ore/verdantium
+/datum/ore/verdantium
name = ORE_VERDANTIUM
display_name = "crystalline verdantite"
compresses_to = MAT_VERDANTIUM
@@ -160,7 +160,7 @@
)
reagent = REAGENT_ID_PHOSPHORUS
-/ore/marble
+/datum/ore/marble
name = ORE_MARBLE
display_name = "recrystallized carbonate"
compresses_to = MAT_MARBLE
@@ -170,7 +170,7 @@
scan_icon = "mineral_common"
reagent = REAGENT_ID_CALCIUMCARBONATE
-/ore/lead
+/datum/ore/lead
name = ORE_LEAD
display_name = "lead glance"
smelts_to = MAT_LEAD
@@ -180,7 +180,7 @@
scan_icon = "mineral_rare"
reagent = REAGENT_ID_LEAD
-/ore/copper
+/datum/ore/copper
name = ORE_COPPER
display_name = ORE_COPPER
smelts_to = MAT_COPPER
@@ -191,7 +191,7 @@
scan_icon = "mineral_common"
reagent = REAGENT_ID_COPPER
-/ore/tin
+/datum/ore/tin
name = ORE_TIN
display_name = ORE_TIN
smelts_to = MAT_TIN
@@ -202,7 +202,7 @@
scan_icon = "mineral_common"
reagent = REAGENT_ID_TIN
-/ore/quartz
+/datum/ore/quartz
name = ORE_QUARTZ
display_name = "unrefined quartz"
compresses_to = MAT_QUARTZ
@@ -212,7 +212,7 @@
scan_icon = "mineral_common"
reagent = REAGENT_ID_SILICON
-/ore/bauxite
+/datum/ore/bauxite
name = ORE_BAUXITE
display_name = ORE_BAUXITE
smelts_to = MAT_ALUMINIUM
@@ -222,7 +222,7 @@
scan_icon = "mineral_common"
reagent = REAGENT_ID_ALUMINIUM
-/ore/rutile
+/datum/ore/rutile
name = ORE_RUTILE
display_name = ORE_RUTILE
smelts_to = MAT_TITANIUM
@@ -233,7 +233,7 @@
scan_icon = "mineral_uncommon"
reagent = REAGENT_ID_TITANIUMDIOX
-/ore/painite
+/datum/ore/painite
name = ORE_PAINITE
display_name = "rough painite"
compresses_to = MAT_PAINITE
@@ -243,7 +243,7 @@
scan_icon = "mineral_rare"
reagent = REAGENT_ID_CALCIUM
-/ore/void_opal
+/datum/ore/void_opal
name = ORE_VOPAL
display_name = "rough void opal"
compresses_to = MAT_VOPAL
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
index 22280a4866..702d9e5572 100644
--- a/code/modules/mob/living/bot/floorbot.dm
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -20,7 +20,7 @@
var/eattiles = 0
var/maketiles = 0
var/targetdirection = null
- var/floor_build_type = /decl/flooring/tiling // Basic steel floor.
+ var/floor_build_type = /datum/decl/flooring/tiling // Basic steel floor.
/mob/living/bot/floorbot/update_icons()
if(busy)
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 981943de6b..82ee953a05 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -38,7 +38,7 @@
var/treatment_tox = REAGENT_ID_TRICORDRAZINE
var/treatment_virus = REAGENT_ID_SPACEACILLIN
var/treatment_emag = REAGENT_ID_TOXIN
- var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds?
+ var/datum/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds?
// Are we tipped over?
var/is_tipped = FALSE
diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
index 8b2daab6bf..37279e7de5 100644
--- a/code/modules/mob/living/bot/secbot.dm
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -21,7 +21,7 @@
var/check_records = FALSE // If true, arrests people without a record.
var/check_arrest = TRUE // If true, arrests people who are set to arrest.
var/arrest_type = FALSE // If true, doesn't handcuff. You monster.
- var/declare_arrests = FALSE // If true, announces arrests over sechuds.
+ var/datum/declare_arrests = FALSE // If true, announces arrests over sechuds.
var/threat = 0 // How much of a threat something is. Set upon acquiring a target.
var/attacked = FALSE // If true, gives the bot enough threat assessment to attack immediately.
var/retaliates = TRUE //If this type of secbot should retaliate at all - so that slime securitrons don't go ballistic the second they get glomped.
diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm
index d828c42ea2..21c39b4aff 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona.dm
@@ -1,27 +1,27 @@
GLOBAL_LIST_INIT(nymph_default_emotes, list(
- /decl/emote/visible,
- /decl/emote/visible/scratch,
- /decl/emote/visible/drool,
- /decl/emote/visible/nod,
- /decl/emote/visible/sway,
- /decl/emote/visible/sulk,
- /decl/emote/visible/twitch,
- /decl/emote/visible/dance,
- /decl/emote/visible/roll,
- /decl/emote/visible/shake,
- /decl/emote/visible/jump,
- /decl/emote/visible/shiver,
- /decl/emote/visible/collapse,
- /decl/emote/visible/spin,
- /decl/emote/visible/sidestep,
- /decl/emote/audible/hiss,
- /decl/emote/audible,
- /decl/emote/audible/scretch,
- /decl/emote/audible/choke,
- /decl/emote/audible/gnarl,
- /decl/emote/audible/bug_hiss,
- /decl/emote/audible/bug_chitter,
- /decl/emote/audible/chirp
+ /datum/decl/emote/visible,
+ /datum/decl/emote/visible/scratch,
+ /datum/decl/emote/visible/drool,
+ /datum/decl/emote/visible/nod,
+ /datum/decl/emote/visible/sway,
+ /datum/decl/emote/visible/sulk,
+ /datum/decl/emote/visible/twitch,
+ /datum/decl/emote/visible/dance,
+ /datum/decl/emote/visible/roll,
+ /datum/decl/emote/visible/shake,
+ /datum/decl/emote/visible/jump,
+ /datum/decl/emote/visible/shiver,
+ /datum/decl/emote/visible/collapse,
+ /datum/decl/emote/visible/spin,
+ /datum/decl/emote/visible/sidestep,
+ /datum/decl/emote/audible/hiss,
+ /datum/decl/emote/audible,
+ /datum/decl/emote/audible/scretch,
+ /datum/decl/emote/audible/choke,
+ /datum/decl/emote/audible/gnarl,
+ /datum/decl/emote/audible/bug_hiss,
+ /datum/decl/emote/audible/bug_chitter,
+ /datum/decl/emote/audible/chirp
))
/mob/living/carbon/alien/diona
diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm
index d23bfca0ca..71cafffccf 100644
--- a/code/modules/mob/living/carbon/alien/emote.dm
+++ b/code/modules/mob/living/carbon/alien/emote.dm
@@ -1,30 +1,30 @@
GLOBAL_LIST_INIT(alien_default_emotes, list(
- /decl/emote/visible,
- /decl/emote/visible/scratch,
- /decl/emote/visible/drool,
- /decl/emote/visible/nod,
- /decl/emote/visible/sway,
- /decl/emote/visible/sulk,
- /decl/emote/visible/twitch,
- /decl/emote/visible/twitch_v,
- /decl/emote/visible/dance,
- /decl/emote/visible/roll,
- /decl/emote/visible/shake,
- /decl/emote/visible/jump,
- /decl/emote/visible/shiver,
- /decl/emote/visible/collapse,
- /decl/emote/visible/spin,
- /decl/emote/visible/sidestep,
- /decl/emote/audible/hiss,
- /decl/emote/audible,
- /decl/emote/audible/deathgasp_alien,
- /decl/emote/audible/whimper,
- /decl/emote/audible/gasp,
- /decl/emote/audible/scretch,
- /decl/emote/audible/choke,
- /decl/emote/audible/moan,
- /decl/emote/audible/gnarl,
- /decl/emote/audible/chirp
+ /datum/decl/emote/visible,
+ /datum/decl/emote/visible/scratch,
+ /datum/decl/emote/visible/drool,
+ /datum/decl/emote/visible/nod,
+ /datum/decl/emote/visible/sway,
+ /datum/decl/emote/visible/sulk,
+ /datum/decl/emote/visible/twitch,
+ /datum/decl/emote/visible/twitch_v,
+ /datum/decl/emote/visible/dance,
+ /datum/decl/emote/visible/roll,
+ /datum/decl/emote/visible/shake,
+ /datum/decl/emote/visible/jump,
+ /datum/decl/emote/visible/shiver,
+ /datum/decl/emote/visible/collapse,
+ /datum/decl/emote/visible/spin,
+ /datum/decl/emote/visible/sidestep,
+ /datum/decl/emote/audible/hiss,
+ /datum/decl/emote/audible,
+ /datum/decl/emote/audible/deathgasp_alien,
+ /datum/decl/emote/audible/whimper,
+ /datum/decl/emote/audible/gasp,
+ /datum/decl/emote/audible/scretch,
+ /datum/decl/emote/audible/choke,
+ /datum/decl/emote/audible/moan,
+ /datum/decl/emote/audible/gnarl,
+ /datum/decl/emote/audible/chirp
))
/mob/living/carbon/alien/get_available_emotes()
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index 40ece1911d..e614ac7f13 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -1,13 +1,13 @@
GLOBAL_LIST_INIT(brain_default_emotes, list(
- /decl/emote/audible/alarm,
- /decl/emote/audible/alert,
- /decl/emote/audible/notice,
- /decl/emote/audible/whistle,
- /decl/emote/audible/synth,
- /decl/emote/audible/beep,
- /decl/emote/audible/boop,
- /decl/emote/visible/blink,
- /decl/emote/visible/flash
+ /datum/decl/emote/audible/alarm,
+ /datum/decl/emote/audible/alert,
+ /datum/decl/emote/audible/notice,
+ /datum/decl/emote/audible/whistle,
+ /datum/decl/emote/audible/synth,
+ /datum/decl/emote/audible/beep,
+ /datum/decl/emote/audible/boop,
+ /datum/decl/emote/visible/blink,
+ /datum/decl/emote/visible/flash
))
/mob/living/carbon/brain/can_emote()
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 10d1f849a9..7ff335d0f1 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -1,358 +1,358 @@
GLOBAL_LIST_INIT(human_default_emotes, list(
- /decl/emote/visible/blink,
- /decl/emote/audible/synth,
- /decl/emote/audible/synth/beep,
- /decl/emote/audible/synth/buzz,
- /decl/emote/audible/synth/confirm,
- /decl/emote/audible/synth/deny,
- /decl/emote/audible/synth/scary,
- /decl/emote/audible/synth/dwoop,
- /decl/emote/audible/synth/boop,
- /decl/emote/audible/synth/robochirp,
- /decl/emote/audible/synth/ding,
- /decl/emote/audible/synth/microwave,
- /decl/emote/visible/nod,
- /decl/emote/visible/shake,
- /decl/emote/visible/shiver,
- /decl/emote/visible/collapse,
- /decl/emote/audible/gasp,
- /decl/emote/audible/choke,
- /decl/emote/audible/sneeze,
- /decl/emote/audible/sniff,
- /decl/emote/audible/snore,
- /decl/emote/audible/whimper,
- /decl/emote/audible/whistle,
- /decl/emote/audible/whistle/quiet,
- /decl/emote/audible/whistle/wolf,
- /decl/emote/audible/whistle/summon,
- /decl/emote/audible/yawn,
- /decl/emote/audible/clap,
- /decl/emote/audible/chuckle,
- /decl/emote/audible/cough,
- /decl/emote/audible/cry,
- /decl/emote/audible/sigh,
- /decl/emote/audible/laugh,
- /decl/emote/audible/mumble,
- /decl/emote/audible/grumble,
- /decl/emote/audible/groan,
- /decl/emote/audible/moan,
- /decl/emote/audible/grunt,
- /decl/emote/audible/slap,
- /decl/emote/audible/crack,
- /decl/emote/human/deathgasp,
- /decl/emote/audible/giggle,
- /decl/emote/audible/scream,
- /decl/emote/audible/pain,
- /decl/emote/visible/airguitar,
- /decl/emote/visible/blink_r,
- /decl/emote/visible/bow,
- /decl/emote/visible/salute,
- /decl/emote/visible/flap,
- /decl/emote/visible/aflap,
- /decl/emote/visible/drool,
- /decl/emote/visible/eyebrow,
- /decl/emote/visible/twitch,
- /decl/emote/visible/dance,
- /decl/emote/visible/twitch_v,
- /decl/emote/visible/faint,
- /decl/emote/visible/frown,
- /decl/emote/visible/blush,
- /decl/emote/visible/wave,
- /decl/emote/visible/glare,
- /decl/emote/visible/stare,
- /decl/emote/visible/look,
- /decl/emote/visible/point,
- /decl/emote/visible/bellyrub,
- /decl/emote/visible/raise,
- /decl/emote/visible/grin,
- /decl/emote/visible/shrug,
- /decl/emote/visible/smile,
- /decl/emote/visible/pale,
- /decl/emote/visible/tremble,
- /decl/emote/visible/wink,
- /decl/emote/visible/hug,
- /decl/emote/visible/dap,
- /decl/emote/visible/signal,
- /decl/emote/visible/handshake,
- /decl/emote/visible/afold,
- /decl/emote/visible/alook,
- /decl/emote/visible/eroll,
- /decl/emote/visible/hbow,
- /decl/emote/visible/hip,
- /decl/emote/visible/holdup,
- /decl/emote/visible/hshrug,
- /decl/emote/visible/crub,
- /decl/emote/visible/erub,
- /decl/emote/visible/fslap,
- /decl/emote/visible/ftap,
- /decl/emote/visible/hrub,
- /decl/emote/visible/hspread,
- /decl/emote/visible/pocket,
- /decl/emote/visible/rsalute,
- /decl/emote/visible/rshoulder,
- /decl/emote/visible/squint,
- /decl/emote/visible/tfist,
- /decl/emote/visible/tilt,
- /decl/emote/visible/spin,
- /decl/emote/visible/sidestep,
- /decl/emote/audible/snap,
- /decl/emote/visible/vomit,
- /decl/emote/visible/floorspin,
- /decl/emote/visible/flip,
- /decl/emote/audible/bug_hiss,
- /decl/emote/audible/bug_buzz,
- /decl/emote/audible/bug_chitter,
- /decl/emote/audible/hiss,
- /decl/emote/audible/chirp,
- /decl/emote/audible/warble,
- /decl/emote/audible/vox_shriek,
- /decl/emote/audible/purr,
- /decl/emote/audible/purrlong,
- /decl/emote/audible/awoo,
- /decl/emote/audible/awoo2,
- /decl/emote/audible/belch,
- /decl/emote/audible/growl,
- /decl/emote/audible/woof,
- /decl/emote/audible/woof2,
- /decl/emote/audible/nya,
- /decl/emote/audible/mrowl,
- /decl/emote/audible/peep,
- /decl/emote/audible/chirp,
- /decl/emote/audible/hoot,
- /decl/emote/audible/weh,
- /decl/emote/audible/merp,
- /decl/emote/audible/myarp,
- /decl/emote/audible/bark,
- /decl/emote/audible/bork,
- /decl/emote/audible/mrow,
- /decl/emote/audible/hypno,
- /decl/emote/audible/hiss,
- /decl/emote/audible/rattle,
- /decl/emote/audible/squeak,
- /decl/emote/audible/geck,
- /decl/emote/audible/baa,
- /decl/emote/audible/baa2,
- /decl/emote/audible/mar,
- /decl/emote/audible/wurble,
- /decl/emote/audible/snort,
- /decl/emote/audible/meow,
- /decl/emote/audible/moo,
- /decl/emote/audible/croak,
- /decl/emote/audible/gao,
- /decl/emote/audible/cackle,
- /decl/emote/audible/squish,
- /decl/emote/audible/spiderchitter,
- /decl/emote/audible/spiderpurr,
- /decl/emote/audible/squeaky,
- /decl/emote/visible/mlem,
- /decl/emote/visible/blep,
- /decl/emote/helper/vwag,
- /decl/emote/helper/vflap,
- /decl/emote/audible/prbt,
- /decl/emote/audible/gyoh,
- /decl/emote/audible/rumble,
- /decl/emote/audible/coyawoo,
- /decl/emote/audible/coyawoo2,
- /decl/emote/audible/coyawoo3,
- /decl/emote/audible/coyawoo4,
- /decl/emote/audible/coyawoo5,
- /decl/emote/audible/fennecscream,
- /decl/emote/audible/zoom,
- /decl/emote/audible/mothscream,
- /decl/emote/audible/mothchitter,
- /decl/emote/audible/mothlaugh,
- /decl/emote/audible/multichirp,
- /decl/emote/audible/gnarl,
- /decl/emote/audible/teshsqueak,
- /decl/emote/audible/teshchirp,
- /decl/emote/audible/teshtrill,
- /decl/emote/audible/teshscream,
- /decl/emote/visible/bounce,
- /decl/emote/visible/jiggle,
- /decl/emote/visible/lightup,
- /decl/emote/visible/vibrate,
- /decl/emote/audible/croon,
- /decl/emote/audible/lwarble,
- /decl/emote/audible/croak_skrell,
- /decl/emote/audible/roarbark,
- /decl/emote/audible/dook,
- /decl/emote/audible/caw,
- /decl/emote/audible/caw2,
- /decl/emote/audible/caw_m,
- /decl/emote/audible/gwah,
+ /datum/decl/emote/visible/blink,
+ /datum/decl/emote/audible/synth,
+ /datum/decl/emote/audible/synth/beep,
+ /datum/decl/emote/audible/synth/buzz,
+ /datum/decl/emote/audible/synth/confirm,
+ /datum/decl/emote/audible/synth/deny,
+ /datum/decl/emote/audible/synth/scary,
+ /datum/decl/emote/audible/synth/dwoop,
+ /datum/decl/emote/audible/synth/boop,
+ /datum/decl/emote/audible/synth/robochirp,
+ /datum/decl/emote/audible/synth/ding,
+ /datum/decl/emote/audible/synth/microwave,
+ /datum/decl/emote/visible/nod,
+ /datum/decl/emote/visible/shake,
+ /datum/decl/emote/visible/shiver,
+ /datum/decl/emote/visible/collapse,
+ /datum/decl/emote/audible/gasp,
+ /datum/decl/emote/audible/choke,
+ /datum/decl/emote/audible/sneeze,
+ /datum/decl/emote/audible/sniff,
+ /datum/decl/emote/audible/snore,
+ /datum/decl/emote/audible/whimper,
+ /datum/decl/emote/audible/whistle,
+ /datum/decl/emote/audible/whistle/quiet,
+ /datum/decl/emote/audible/whistle/wolf,
+ /datum/decl/emote/audible/whistle/summon,
+ /datum/decl/emote/audible/yawn,
+ /datum/decl/emote/audible/clap,
+ /datum/decl/emote/audible/chuckle,
+ /datum/decl/emote/audible/cough,
+ /datum/decl/emote/audible/cry,
+ /datum/decl/emote/audible/sigh,
+ /datum/decl/emote/audible/laugh,
+ /datum/decl/emote/audible/mumble,
+ /datum/decl/emote/audible/grumble,
+ /datum/decl/emote/audible/groan,
+ /datum/decl/emote/audible/moan,
+ /datum/decl/emote/audible/grunt,
+ /datum/decl/emote/audible/slap,
+ /datum/decl/emote/audible/crack,
+ /datum/decl/emote/human/deathgasp,
+ /datum/decl/emote/audible/giggle,
+ /datum/decl/emote/audible/scream,
+ /datum/decl/emote/audible/pain,
+ /datum/decl/emote/visible/airguitar,
+ /datum/decl/emote/visible/blink_r,
+ /datum/decl/emote/visible/bow,
+ /datum/decl/emote/visible/salute,
+ /datum/decl/emote/visible/flap,
+ /datum/decl/emote/visible/aflap,
+ /datum/decl/emote/visible/drool,
+ /datum/decl/emote/visible/eyebrow,
+ /datum/decl/emote/visible/twitch,
+ /datum/decl/emote/visible/dance,
+ /datum/decl/emote/visible/twitch_v,
+ /datum/decl/emote/visible/faint,
+ /datum/decl/emote/visible/frown,
+ /datum/decl/emote/visible/blush,
+ /datum/decl/emote/visible/wave,
+ /datum/decl/emote/visible/glare,
+ /datum/decl/emote/visible/stare,
+ /datum/decl/emote/visible/look,
+ /datum/decl/emote/visible/point,
+ /datum/decl/emote/visible/bellyrub,
+ /datum/decl/emote/visible/raise,
+ /datum/decl/emote/visible/grin,
+ /datum/decl/emote/visible/shrug,
+ /datum/decl/emote/visible/smile,
+ /datum/decl/emote/visible/pale,
+ /datum/decl/emote/visible/tremble,
+ /datum/decl/emote/visible/wink,
+ /datum/decl/emote/visible/hug,
+ /datum/decl/emote/visible/dap,
+ /datum/decl/emote/visible/signal,
+ /datum/decl/emote/visible/handshake,
+ /datum/decl/emote/visible/afold,
+ /datum/decl/emote/visible/alook,
+ /datum/decl/emote/visible/eroll,
+ /datum/decl/emote/visible/hbow,
+ /datum/decl/emote/visible/hip,
+ /datum/decl/emote/visible/holdup,
+ /datum/decl/emote/visible/hshrug,
+ /datum/decl/emote/visible/crub,
+ /datum/decl/emote/visible/erub,
+ /datum/decl/emote/visible/fslap,
+ /datum/decl/emote/visible/ftap,
+ /datum/decl/emote/visible/hrub,
+ /datum/decl/emote/visible/hspread,
+ /datum/decl/emote/visible/pocket,
+ /datum/decl/emote/visible/rsalute,
+ /datum/decl/emote/visible/rshoulder,
+ /datum/decl/emote/visible/squint,
+ /datum/decl/emote/visible/tfist,
+ /datum/decl/emote/visible/tilt,
+ /datum/decl/emote/visible/spin,
+ /datum/decl/emote/visible/sidestep,
+ /datum/decl/emote/audible/snap,
+ /datum/decl/emote/visible/vomit,
+ /datum/decl/emote/visible/floorspin,
+ /datum/decl/emote/visible/flip,
+ /datum/decl/emote/audible/bug_hiss,
+ /datum/decl/emote/audible/bug_buzz,
+ /datum/decl/emote/audible/bug_chitter,
+ /datum/decl/emote/audible/hiss,
+ /datum/decl/emote/audible/chirp,
+ /datum/decl/emote/audible/warble,
+ /datum/decl/emote/audible/vox_shriek,
+ /datum/decl/emote/audible/purr,
+ /datum/decl/emote/audible/purrlong,
+ /datum/decl/emote/audible/awoo,
+ /datum/decl/emote/audible/awoo2,
+ /datum/decl/emote/audible/belch,
+ /datum/decl/emote/audible/growl,
+ /datum/decl/emote/audible/woof,
+ /datum/decl/emote/audible/woof2,
+ /datum/decl/emote/audible/nya,
+ /datum/decl/emote/audible/mrowl,
+ /datum/decl/emote/audible/peep,
+ /datum/decl/emote/audible/chirp,
+ /datum/decl/emote/audible/hoot,
+ /datum/decl/emote/audible/weh,
+ /datum/decl/emote/audible/merp,
+ /datum/decl/emote/audible/myarp,
+ /datum/decl/emote/audible/bark,
+ /datum/decl/emote/audible/bork,
+ /datum/decl/emote/audible/mrow,
+ /datum/decl/emote/audible/hypno,
+ /datum/decl/emote/audible/hiss,
+ /datum/decl/emote/audible/rattle,
+ /datum/decl/emote/audible/squeak,
+ /datum/decl/emote/audible/geck,
+ /datum/decl/emote/audible/baa,
+ /datum/decl/emote/audible/baa2,
+ /datum/decl/emote/audible/mar,
+ /datum/decl/emote/audible/wurble,
+ /datum/decl/emote/audible/snort,
+ /datum/decl/emote/audible/meow,
+ /datum/decl/emote/audible/moo,
+ /datum/decl/emote/audible/croak,
+ /datum/decl/emote/audible/gao,
+ /datum/decl/emote/audible/cackle,
+ /datum/decl/emote/audible/squish,
+ /datum/decl/emote/audible/spiderchitter,
+ /datum/decl/emote/audible/spiderpurr,
+ /datum/decl/emote/audible/squeaky,
+ /datum/decl/emote/visible/mlem,
+ /datum/decl/emote/visible/blep,
+ /datum/decl/emote/helper/vwag,
+ /datum/decl/emote/helper/vflap,
+ /datum/decl/emote/audible/prbt,
+ /datum/decl/emote/audible/gyoh,
+ /datum/decl/emote/audible/rumble,
+ /datum/decl/emote/audible/coyawoo,
+ /datum/decl/emote/audible/coyawoo2,
+ /datum/decl/emote/audible/coyawoo3,
+ /datum/decl/emote/audible/coyawoo4,
+ /datum/decl/emote/audible/coyawoo5,
+ /datum/decl/emote/audible/fennecscream,
+ /datum/decl/emote/audible/zoom,
+ /datum/decl/emote/audible/mothscream,
+ /datum/decl/emote/audible/mothchitter,
+ /datum/decl/emote/audible/mothlaugh,
+ /datum/decl/emote/audible/multichirp,
+ /datum/decl/emote/audible/gnarl,
+ /datum/decl/emote/audible/teshsqueak,
+ /datum/decl/emote/audible/teshchirp,
+ /datum/decl/emote/audible/teshtrill,
+ /datum/decl/emote/audible/teshscream,
+ /datum/decl/emote/visible/bounce,
+ /datum/decl/emote/visible/jiggle,
+ /datum/decl/emote/visible/lightup,
+ /datum/decl/emote/visible/vibrate,
+ /datum/decl/emote/audible/croon,
+ /datum/decl/emote/audible/lwarble,
+ /datum/decl/emote/audible/croak_skrell,
+ /datum/decl/emote/audible/roarbark,
+ /datum/decl/emote/audible/dook,
+ /datum/decl/emote/audible/caw,
+ /datum/decl/emote/audible/caw2,
+ /datum/decl/emote/audible/caw_m,
+ /datum/decl/emote/audible/gwah,
//CHOMP Add start
- /decl/emote/audible/wheeze,
- /decl/emote/audible/prbt2,
- /decl/emote/audible/pain,
- /decl/emote/audible/mgeow,
- /decl/emote/visible/flip/slip,
- /decl/emote/audible/xenogrowl,
- /decl/emote/audible/xenohiss,
- /decl/emote/audible/xenopurr,
- /decl/emote/audible/wawa,
- /decl/emote/audible/malehumanscream,
- /decl/emote/audible/scientist/scream,
- /decl/emote/audible/scientist/pain,
- /decl/emote/audible/yip,
- /decl/emote/audible/tailthump,
- /decl/emote/audible/squeal,
+ /datum/decl/emote/audible/wheeze,
+ /datum/decl/emote/audible/prbt2,
+ /datum/decl/emote/audible/pain,
+ /datum/decl/emote/audible/mgeow,
+ /datum/decl/emote/visible/flip/slip,
+ /datum/decl/emote/audible/xenogrowl,
+ /datum/decl/emote/audible/xenohiss,
+ /datum/decl/emote/audible/xenopurr,
+ /datum/decl/emote/audible/wawa,
+ /datum/decl/emote/audible/malehumanscream,
+ /datum/decl/emote/audible/scientist/scream,
+ /datum/decl/emote/audible/scientist/pain,
+ /datum/decl/emote/audible/yip,
+ /datum/decl/emote/audible/tailthump,
+ /datum/decl/emote/audible/squeal,
//CHOMP Add end
))
GLOBAL_LIST_INIT(simple_mob_default_emotes, list(
- /decl/emote/visible/blink,
- /decl/emote/visible/nod,
- /decl/emote/visible/shake,
- /decl/emote/visible/shiver,
- /decl/emote/visible/collapse,
- /decl/emote/audible/gasp,
- /decl/emote/audible/choke,
- /decl/emote/audible/sneeze,
- /decl/emote/audible/sniff,
- /decl/emote/audible/snore,
- /decl/emote/audible/whimper,
- /decl/emote/audible/whistle,
- /decl/emote/audible/whistle/quiet,
- /decl/emote/audible/whistle/wolf,
- /decl/emote/audible/whistle/summon,
- /decl/emote/audible/yawn,
- /decl/emote/audible/clap,
- /decl/emote/audible/chuckle,
- /decl/emote/audible/cough,
- /decl/emote/audible/cry,
- /decl/emote/audible/sigh,
- /decl/emote/audible/laugh,
- /decl/emote/audible/mumble,
- /decl/emote/audible/grumble,
- /decl/emote/audible/groan,
- /decl/emote/audible/moan,
- /decl/emote/audible/grunt,
- /decl/emote/audible/slap,
- /decl/emote/audible/crack,
- /decl/emote/human/deathgasp,
- /decl/emote/audible/giggle,
- /decl/emote/audible/scream,
- /decl/emote/audible/pain,
- /decl/emote/visible/airguitar,
- /decl/emote/visible/blink_r,
- /decl/emote/visible/bow,
- /decl/emote/visible/salute,
- /decl/emote/visible/flap,
- /decl/emote/visible/aflap,
- /decl/emote/visible/drool,
- /decl/emote/visible/eyebrow,
- /decl/emote/visible/twitch,
- /decl/emote/visible/dance,
- /decl/emote/visible/twitch_v,
- /decl/emote/visible/faint,
- /decl/emote/visible/frown,
- /decl/emote/visible/blush,
- /decl/emote/visible/wave,
- /decl/emote/visible/glare,
- /decl/emote/visible/stare,
- /decl/emote/visible/look,
- /decl/emote/visible/point,
- /decl/emote/visible/bellyrub,
- /decl/emote/visible/raise,
- /decl/emote/visible/grin,
- /decl/emote/visible/shrug,
- /decl/emote/visible/smile,
- /decl/emote/visible/pale,
- /decl/emote/visible/tremble,
- /decl/emote/visible/wink,
- /decl/emote/visible/hug,
- /decl/emote/visible/signal,
- /decl/emote/visible/afold,
- /decl/emote/visible/alook,
- /decl/emote/visible/eroll,
- /decl/emote/visible/hbow,
- /decl/emote/visible/hip,
- /decl/emote/visible/holdup,
- /decl/emote/visible/hshrug,
- /decl/emote/visible/crub,
- /decl/emote/visible/erub,
- /decl/emote/visible/fslap,
- /decl/emote/visible/ftap,
- /decl/emote/visible/hrub,
- /decl/emote/visible/hspread,
- /decl/emote/visible/rsalute,
- /decl/emote/visible/rshoulder,
- /decl/emote/visible/squint,
- /decl/emote/visible/tfist,
- /decl/emote/visible/tilt,
- /decl/emote/visible/spin,
- /decl/emote/visible/sidestep,
- /decl/emote/visible/vomit,
- /decl/emote/visible/floorspin,
- /decl/emote/visible/flip,
- /decl/emote/audible/awoo,
- /decl/emote/audible/awoo2,
- /decl/emote/audible/belch,
- /decl/emote/audible/growl,
- /decl/emote/audible/woof,
- /decl/emote/audible/woof2,
- /decl/emote/audible/nya,
- /decl/emote/audible/mrowl,
- /decl/emote/audible/peep,
- /decl/emote/audible/chirp,
- /decl/emote/audible/hoot,
- /decl/emote/audible/weh,
- /decl/emote/audible/merp,
- /decl/emote/audible/myarp,
- /decl/emote/audible/bark,
- /decl/emote/audible/bork,
- /decl/emote/audible/mrow,
- /decl/emote/audible/hypno,
- /decl/emote/audible/hiss,
- /decl/emote/audible/rattle,
- /decl/emote/audible/squeak,
- /decl/emote/audible/geck,
- /decl/emote/audible/baa,
- /decl/emote/audible/baa2,
- /decl/emote/audible/mar,
- /decl/emote/audible/wurble,
- /decl/emote/audible/snort,
- /decl/emote/audible/meow,
- /decl/emote/audible/moo,
- /decl/emote/audible/croak,
- /decl/emote/audible/gao,
- /decl/emote/audible/cackle,
- /decl/emote/audible/squish,
- /decl/emote/audible/spiderchitter,
- /decl/emote/audible/spiderpurr,
- /decl/emote/audible/squeaky,
- /decl/emote/visible/mlem,
- /decl/emote/visible/blep,
- /decl/emote/audible/prbt,
- /decl/emote/audible/gyoh,
- /decl/emote/audible/rumble,
- /decl/emote/audible/fennecscream,
- /decl/emote/audible/zoom,
- /decl/emote/audible/bug_hiss,
- /decl/emote/audible/bug_buzz,
- /decl/emote/audible/bug_chitter,
- /decl/emote/audible/hiss,
- /decl/emote/audible/chirp,
- /decl/emote/audible/warble,
- /decl/emote/audible/vox_shriek,
- /decl/emote/audible/purr,
- /decl/emote/audible/purrlong,
- /decl/emote/audible/dook,
- /decl/emote/audible/caw,
- /decl/emote/audible/caw2,
- /decl/emote/audible/caw_m,
- /decl/emote/audible/gwah,
+ /datum/decl/emote/visible/blink,
+ /datum/decl/emote/visible/nod,
+ /datum/decl/emote/visible/shake,
+ /datum/decl/emote/visible/shiver,
+ /datum/decl/emote/visible/collapse,
+ /datum/decl/emote/audible/gasp,
+ /datum/decl/emote/audible/choke,
+ /datum/decl/emote/audible/sneeze,
+ /datum/decl/emote/audible/sniff,
+ /datum/decl/emote/audible/snore,
+ /datum/decl/emote/audible/whimper,
+ /datum/decl/emote/audible/whistle,
+ /datum/decl/emote/audible/whistle/quiet,
+ /datum/decl/emote/audible/whistle/wolf,
+ /datum/decl/emote/audible/whistle/summon,
+ /datum/decl/emote/audible/yawn,
+ /datum/decl/emote/audible/clap,
+ /datum/decl/emote/audible/chuckle,
+ /datum/decl/emote/audible/cough,
+ /datum/decl/emote/audible/cry,
+ /datum/decl/emote/audible/sigh,
+ /datum/decl/emote/audible/laugh,
+ /datum/decl/emote/audible/mumble,
+ /datum/decl/emote/audible/grumble,
+ /datum/decl/emote/audible/groan,
+ /datum/decl/emote/audible/moan,
+ /datum/decl/emote/audible/grunt,
+ /datum/decl/emote/audible/slap,
+ /datum/decl/emote/audible/crack,
+ /datum/decl/emote/human/deathgasp,
+ /datum/decl/emote/audible/giggle,
+ /datum/decl/emote/audible/scream,
+ /datum/decl/emote/audible/pain,
+ /datum/decl/emote/visible/airguitar,
+ /datum/decl/emote/visible/blink_r,
+ /datum/decl/emote/visible/bow,
+ /datum/decl/emote/visible/salute,
+ /datum/decl/emote/visible/flap,
+ /datum/decl/emote/visible/aflap,
+ /datum/decl/emote/visible/drool,
+ /datum/decl/emote/visible/eyebrow,
+ /datum/decl/emote/visible/twitch,
+ /datum/decl/emote/visible/dance,
+ /datum/decl/emote/visible/twitch_v,
+ /datum/decl/emote/visible/faint,
+ /datum/decl/emote/visible/frown,
+ /datum/decl/emote/visible/blush,
+ /datum/decl/emote/visible/wave,
+ /datum/decl/emote/visible/glare,
+ /datum/decl/emote/visible/stare,
+ /datum/decl/emote/visible/look,
+ /datum/decl/emote/visible/point,
+ /datum/decl/emote/visible/bellyrub,
+ /datum/decl/emote/visible/raise,
+ /datum/decl/emote/visible/grin,
+ /datum/decl/emote/visible/shrug,
+ /datum/decl/emote/visible/smile,
+ /datum/decl/emote/visible/pale,
+ /datum/decl/emote/visible/tremble,
+ /datum/decl/emote/visible/wink,
+ /datum/decl/emote/visible/hug,
+ /datum/decl/emote/visible/signal,
+ /datum/decl/emote/visible/afold,
+ /datum/decl/emote/visible/alook,
+ /datum/decl/emote/visible/eroll,
+ /datum/decl/emote/visible/hbow,
+ /datum/decl/emote/visible/hip,
+ /datum/decl/emote/visible/holdup,
+ /datum/decl/emote/visible/hshrug,
+ /datum/decl/emote/visible/crub,
+ /datum/decl/emote/visible/erub,
+ /datum/decl/emote/visible/fslap,
+ /datum/decl/emote/visible/ftap,
+ /datum/decl/emote/visible/hrub,
+ /datum/decl/emote/visible/hspread,
+ /datum/decl/emote/visible/rsalute,
+ /datum/decl/emote/visible/rshoulder,
+ /datum/decl/emote/visible/squint,
+ /datum/decl/emote/visible/tfist,
+ /datum/decl/emote/visible/tilt,
+ /datum/decl/emote/visible/spin,
+ /datum/decl/emote/visible/sidestep,
+ /datum/decl/emote/visible/vomit,
+ /datum/decl/emote/visible/floorspin,
+ /datum/decl/emote/visible/flip,
+ /datum/decl/emote/audible/awoo,
+ /datum/decl/emote/audible/awoo2,
+ /datum/decl/emote/audible/belch,
+ /datum/decl/emote/audible/growl,
+ /datum/decl/emote/audible/woof,
+ /datum/decl/emote/audible/woof2,
+ /datum/decl/emote/audible/nya,
+ /datum/decl/emote/audible/mrowl,
+ /datum/decl/emote/audible/peep,
+ /datum/decl/emote/audible/chirp,
+ /datum/decl/emote/audible/hoot,
+ /datum/decl/emote/audible/weh,
+ /datum/decl/emote/audible/merp,
+ /datum/decl/emote/audible/myarp,
+ /datum/decl/emote/audible/bark,
+ /datum/decl/emote/audible/bork,
+ /datum/decl/emote/audible/mrow,
+ /datum/decl/emote/audible/hypno,
+ /datum/decl/emote/audible/hiss,
+ /datum/decl/emote/audible/rattle,
+ /datum/decl/emote/audible/squeak,
+ /datum/decl/emote/audible/geck,
+ /datum/decl/emote/audible/baa,
+ /datum/decl/emote/audible/baa2,
+ /datum/decl/emote/audible/mar,
+ /datum/decl/emote/audible/wurble,
+ /datum/decl/emote/audible/snort,
+ /datum/decl/emote/audible/meow,
+ /datum/decl/emote/audible/moo,
+ /datum/decl/emote/audible/croak,
+ /datum/decl/emote/audible/gao,
+ /datum/decl/emote/audible/cackle,
+ /datum/decl/emote/audible/squish,
+ /datum/decl/emote/audible/spiderchitter,
+ /datum/decl/emote/audible/spiderpurr,
+ /datum/decl/emote/audible/squeaky,
+ /datum/decl/emote/visible/mlem,
+ /datum/decl/emote/visible/blep,
+ /datum/decl/emote/audible/prbt,
+ /datum/decl/emote/audible/gyoh,
+ /datum/decl/emote/audible/rumble,
+ /datum/decl/emote/audible/fennecscream,
+ /datum/decl/emote/audible/zoom,
+ /datum/decl/emote/audible/bug_hiss,
+ /datum/decl/emote/audible/bug_buzz,
+ /datum/decl/emote/audible/bug_chitter,
+ /datum/decl/emote/audible/hiss,
+ /datum/decl/emote/audible/chirp,
+ /datum/decl/emote/audible/warble,
+ /datum/decl/emote/audible/vox_shriek,
+ /datum/decl/emote/audible/purr,
+ /datum/decl/emote/audible/purrlong,
+ /datum/decl/emote/audible/dook,
+ /datum/decl/emote/audible/caw,
+ /datum/decl/emote/audible/caw2,
+ /datum/decl/emote/audible/caw_m,
+ /datum/decl/emote/audible/gwah,
//CHOMP Add start
- /decl/emote/audible/wheeze,
- /decl/emote/audible/prbt2,
- /decl/emote/audible/pain,
- /decl/emote/audible/mgeow,
- /decl/emote/audible/xenogrowl,
- /decl/emote/audible/xenohiss,
- /decl/emote/audible/xenopurr,
- /decl/emote/audible/yip,
- /decl/emote/audible/tailthump,
- /decl/emote/audible/squeal,
+ /datum/decl/emote/audible/wheeze,
+ /datum/decl/emote/audible/prbt2,
+ /datum/decl/emote/audible/pain,
+ /datum/decl/emote/audible/mgeow,
+ /datum/decl/emote/audible/xenogrowl,
+ /datum/decl/emote/audible/xenohiss,
+ /datum/decl/emote/audible/xenopurr,
+ /datum/decl/emote/audible/yip,
+ /datum/decl/emote/audible/tailthump,
+ /datum/decl/emote/audible/squeal,
//CHOMP Add end
))
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 98cd5e575c..2ae7042fb2 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1186,15 +1186,15 @@
if(src.species && src.species.get_bodytype() != "Vox" && src.species.get_bodytype() != "Shadekin")
// This is hacky, I'm so sorry.
if(I != l_hand && I != r_hand) //If the item isn't in your hands, you're probably wearing it. Full damage for you.
- total_phoronloss += vsc.plc.CONTAMINATION_LOSS
+ total_phoronloss += GLOB.vsc.plc.CONTAMINATION_LOSS
else if(I == l_hand) //If the item is in your hands, but you're wearing protection, you might be alright.
var/l_hand_blocked = 0
l_hand_blocked = 1-(100-getarmor(BP_L_HAND, "bio"))/100 //This should get a number between 0 and 1
- total_phoronloss += vsc.plc.CONTAMINATION_LOSS * l_hand_blocked
+ total_phoronloss += GLOB.vsc.plc.CONTAMINATION_LOSS * l_hand_blocked
else if(I == r_hand) //If the item is in your hands, but you're wearing protection, you might be alright.
var/r_hand_blocked = 0
r_hand_blocked = 1-(100-getarmor(BP_R_HAND, "bio"))/100 //This should get a number between 0 and 1
- total_phoronloss += vsc.plc.CONTAMINATION_LOSS * r_hand_blocked
+ total_phoronloss += GLOB.vsc.plc.CONTAMINATION_LOSS * r_hand_blocked
if(total_phoronloss)
adjustToxLoss(total_phoronloss)
diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
index fdeb3cbb6a..01cec2f50c 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
@@ -87,7 +87,7 @@
genders = list(NEUTER)
default_emotes = list(
- /decl/emote/audible/vox_shriek
+ /datum/decl/emote/audible/vox_shriek
)
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) //Get ya quills done did
diff --git a/code/modules/mob/living/carbon/human/species/station/custom.dm b/code/modules/mob/living/carbon/human/species/station/custom.dm
index 3e84351f86..8795fd7937 100644
--- a/code/modules/mob/living/carbon/human/species/station/custom.dm
+++ b/code/modules/mob/living/carbon/human/species/station/custom.dm
@@ -51,26 +51,26 @@
//CHOMPEdit Start - add a bunch of default emotes
default_emotes = list(
- /decl/emote/audible/teshsqueak,
- /decl/emote/audible/teshchirp,
- /decl/emote/audible/teshtrill,
- /decl/emote/audible/vox_shriek,
- /decl/emote/audible/squish,
- /decl/emote/audible/chirp,
- /decl/emote/visible/bounce,
- /decl/emote/visible/jiggle,
- /decl/emote/visible/lightup,
- /decl/emote/visible/vibrate,
- /decl/emote/audible/gnarl,
- /decl/emote/audible/purr,
- /decl/emote/audible/purrlong,
- /decl/emote/human/swish,
- /decl/emote/human/wag,
- /decl/emote/human/sway,
- /decl/emote/human/qwag,
- /decl/emote/human/fastsway,
- /decl/emote/human/swag,
- /decl/emote/human/stopsway
+ /datum/decl/emote/audible/teshsqueak,
+ /datum/decl/emote/audible/teshchirp,
+ /datum/decl/emote/audible/teshtrill,
+ /datum/decl/emote/audible/vox_shriek,
+ /datum/decl/emote/audible/squish,
+ /datum/decl/emote/audible/chirp,
+ /datum/decl/emote/visible/bounce,
+ /datum/decl/emote/visible/jiggle,
+ /datum/decl/emote/visible/lightup,
+ /datum/decl/emote/visible/vibrate,
+ /datum/decl/emote/audible/gnarl,
+ /datum/decl/emote/audible/purr,
+ /datum/decl/emote/audible/purrlong,
+ /datum/decl/emote/human/swish,
+ /datum/decl/emote/human/wag,
+ /datum/decl/emote/human/sway,
+ /datum/decl/emote/human/qwag,
+ /datum/decl/emote/human/fastsway,
+ /datum/decl/emote/human/swag,
+ /datum/decl/emote/human/stopsway
)
//CHOMPEdit End
diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
index bfd9c29e1a..e493b85260 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -130,12 +130,12 @@ var/datum/species/shapeshifter/promethean/prometheans
var/heal_rate = 0.5 // Temp. Regen per tick.
default_emotes = list(
- /decl/emote/audible/squish,
- /decl/emote/audible/chirp,
- /decl/emote/visible/bounce,
- /decl/emote/visible/jiggle,
- /decl/emote/visible/lightup,
- /decl/emote/visible/vibrate
+ /datum/decl/emote/audible/squish,
+ /datum/decl/emote/audible/chirp,
+ /datum/decl/emote/visible/bounce,
+ /datum/decl/emote/visible/jiggle,
+ /datum/decl/emote/visible/lightup,
+ /datum/decl/emote/visible/vibrate
)
footstep = FOOTSTEP_MOB_SLIME
diff --git a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
index f1c79ebae8..83740fce71 100644
--- a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
@@ -34,15 +34,15 @@
var/rad_glow = 0
var/list/default_emotes = list(
- /decl/emote/audible/squish,
- /decl/emote/audible/chirp,
- /decl/emote/visible/bounce,
- /decl/emote/visible/jiggle,
- /decl/emote/visible/lightup,
- /decl/emote/visible/vibrate,
- /decl/emote/visible/flip,
- /decl/emote/visible/spin,
- /decl/emote/visible/floorspin
+ /datum/decl/emote/audible/squish,
+ /datum/decl/emote/audible/chirp,
+ /datum/decl/emote/visible/bounce,
+ /datum/decl/emote/visible/jiggle,
+ /datum/decl/emote/visible/lightup,
+ /datum/decl/emote/visible/vibrate,
+ /datum/decl/emote/visible/flip,
+ /datum/decl/emote/visible/spin,
+ /datum/decl/emote/visible/floorspin
)
/mob/living/simple_mob/slime/promethean/Initialize(mapload, null)
add_verb(src, /mob/living/simple_mob/slime/promethean/proc/prommie_blobform)
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index 972a5f08e2..db509e27b3 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -187,13 +187,13 @@
)
default_emotes = list(
- /decl/emote/human/swish,
- /decl/emote/human/wag,
- /decl/emote/human/sway,
- /decl/emote/human/qwag,
- /decl/emote/human/fastsway,
- /decl/emote/human/swag,
- /decl/emote/human/stopsway
+ /datum/decl/emote/human/swish,
+ /datum/decl/emote/human/wag,
+ /datum/decl/emote/human/sway,
+ /datum/decl/emote/human/qwag,
+ /datum/decl/emote/human/fastsway,
+ /datum/decl/emote/human/swag,
+ /datum/decl/emote/human/stopsway
)
footstep = FOOTSTEP_MOB_CLAW
@@ -307,17 +307,17 @@
default_emotes = list(
//VOREStation Add
- /decl/emote/audible/gnarl,
- /decl/emote/audible/purr,
- /decl/emote/audible/purrlong,
+ /datum/decl/emote/audible/gnarl,
+ /datum/decl/emote/audible/purr,
+ /datum/decl/emote/audible/purrlong,
//VOREStation Add End
- /decl/emote/human/swish,
- /decl/emote/human/wag,
- /decl/emote/human/sway,
- /decl/emote/human/qwag,
- /decl/emote/human/fastsway,
- /decl/emote/human/swag,
- /decl/emote/human/stopsway
+ /datum/decl/emote/human/swish,
+ /datum/decl/emote/human/wag,
+ /datum/decl/emote/human/sway,
+ /datum/decl/emote/human/qwag,
+ /datum/decl/emote/human/fastsway,
+ /datum/decl/emote/human/swag,
+ /datum/decl/emote/human/stopsway
)
inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds, /mob/living/carbon/human/proc/tie_hair)
@@ -424,10 +424,10 @@
)
default_emotes = list(
- /decl/emote/audible/warble,
- /decl/emote/audible/lwarble,
- /decl/emote/audible/croon,
- /decl/emote/audible/croak
+ /datum/decl/emote/audible/warble,
+ /datum/decl/emote/audible/lwarble,
+ /datum/decl/emote/audible/croon,
+ /datum/decl/emote/audible/croak
)
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair, /mob/living/carbon/human/proc/water_stealth, /mob/living/carbon/human/proc/underwater_devour)
@@ -520,7 +520,7 @@
default_emotes = list(
- /decl/emote/audible/chirp
+ /datum/decl/emote/audible/chirp
)
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair)
@@ -633,8 +633,8 @@
genders = list(MALE, FEMALE, PLURAL, NEUTER)
default_emotes = list(
- /decl/emote/audible/chirp,
- /decl/emote/audible/multichirp
+ /datum/decl/emote/audible/chirp,
+ /datum/decl/emote/audible/multichirp
)
/datum/species/diona/can_understand(var/mob/other)
@@ -1228,9 +1228,9 @@
)
default_emotes = list(
- /decl/emote/audible/teshsqueak,
- /decl/emote/audible/teshchirp,
- /decl/emote/audible/teshtrill
+ /datum/decl/emote/audible/teshsqueak,
+ /datum/decl/emote/audible/teshchirp,
+ /datum/decl/emote/audible/teshtrill
)
footstep = FOOTSTEP_MOB_TESHARI
diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm
index 0ae5d8db16..82af1ff904 100644
--- a/code/modules/mob/living/silicon/emote.dm
+++ b/code/modules/mob/living/silicon/emote.dm
@@ -1,18 +1,18 @@
GLOBAL_LIST_INIT(silicon_default_emotes, list(
- /decl/emote/audible/synth,
- /decl/emote/audible/synth/beep,
- /decl/emote/audible/synth/bing,
- /decl/emote/audible/synth/buzz,
- /decl/emote/audible/synth/confirm,
- /decl/emote/audible/synth/deny,
- /decl/emote/audible/synth/scary,
- /decl/emote/audible/synth/dwoop,
- /decl/emote/audible/synth/boop,
- /decl/emote/audible/synth/robochirp,
- /decl/emote/audible/synth/ding,
- /decl/emote/audible/synth/microwave,
- /decl/emote/audible/synth/security,
- /decl/emote/audible/synth/security/halt
+ /datum/decl/emote/audible/synth,
+ /datum/decl/emote/audible/synth/beep,
+ /datum/decl/emote/audible/synth/bing,
+ /datum/decl/emote/audible/synth/buzz,
+ /datum/decl/emote/audible/synth/confirm,
+ /datum/decl/emote/audible/synth/deny,
+ /datum/decl/emote/audible/synth/scary,
+ /datum/decl/emote/audible/synth/dwoop,
+ /datum/decl/emote/audible/synth/boop,
+ /datum/decl/emote/audible/synth/robochirp,
+ /datum/decl/emote/audible/synth/ding,
+ /datum/decl/emote/audible/synth/microwave,
+ /datum/decl/emote/audible/synth/security,
+ /datum/decl/emote/audible/synth/security/halt
))
/mob/living/silicon/get_available_emotes()
diff --git a/code/modules/mob/living/silicon/robot/drone/swarm.dm b/code/modules/mob/living/silicon/robot/drone/swarm.dm
index ab2d02212e..4aa4878149 100644
--- a/code/modules/mob/living/silicon/robot/drone/swarm.dm
+++ b/code/modules/mob/living/silicon/robot/drone/swarm.dm
@@ -45,13 +45,13 @@
can_be_antagged = TRUE
var/spell_setup = list(
- /spell/aoe_turf/conjure/swarmer,
- /spell/aoe_turf/conjure/forcewall/swarm,
- /spell/aoe_turf/conjure/zeropointwell,
- /spell/aoe_turf/conjure/zeropointbarricade,
- /spell/aoe_turf/blink/swarm,
- /spell/aoe_turf/conjure/swarmer/gunner,
- /spell/aoe_turf/conjure/swarmer/melee
+ /datum/spell/aoe_turf/conjure/swarmer,
+ /datum/spell/aoe_turf/conjure/forcewall/swarm,
+ /datum/spell/aoe_turf/conjure/zeropointwell,
+ /datum/spell/aoe_turf/conjure/zeropointbarricade,
+ /datum/spell/aoe_turf/blink/swarm,
+ /datum/spell/aoe_turf/conjure/swarmer/gunner,
+ /datum/spell/aoe_turf/conjure/swarmer/melee
)
/mob/living/silicon/robot/drone/swarm/Initialize(mapload)
@@ -83,9 +83,9 @@
module_type = /obj/item/robot_module/drone/swarm/ranged
spell_setup = list(
- /spell/aoe_turf/conjure/swarmer,
- /spell/aoe_turf/conjure/forcewall/swarm,
- /spell/aoe_turf/blink/swarm
+ /datum/spell/aoe_turf/conjure/swarmer,
+ /datum/spell/aoe_turf/conjure/forcewall/swarm,
+ /datum/spell/aoe_turf/blink/swarm
)
/mob/living/silicon/robot/drone/swarm/melee
@@ -104,7 +104,7 @@
module_type = /obj/item/robot_module/drone/swarm/melee
spell_setup = list(
- /spell/aoe_turf/conjure/swarmer,
- /spell/aoe_turf/conjure/forcewall/swarm,
- /spell/aoe_turf/blink/swarm
+ /datum/spell/aoe_turf/conjure/swarmer,
+ /datum/spell/aoe_turf/conjure/forcewall/swarm,
+ /datum/spell/aoe_turf/blink/swarm
)
diff --git a/code/modules/mob/living/silicon/robot/drone/swarm_abilities.dm b/code/modules/mob/living/silicon/robot/drone/swarm_abilities.dm
index 64db106252..c3b0674761 100644
--- a/code/modules/mob/living/silicon/robot/drone/swarm_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/swarm_abilities.dm
@@ -1,5 +1,5 @@
-/spell/aoe_turf/conjure/swarmer
+/datum/spell/aoe_turf/conjure/swarmer
name = "Self Replication"
desc = "This ability constructs a standard swarmer shell that may activate at some point."
@@ -14,13 +14,13 @@
hud_state = "swarm_replicate"
-/spell/aoe_turf/conjure/swarmer/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/datum/spell/aoe_turf/conjure/swarmer/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
animation.icon_state = "deflect_static"
flick("shield2",animation)
spawn(1 SECOND)
qdel(animation)
-/spell/aoe_turf/conjure/forcewall/swarm
+/datum/spell/aoe_turf/conjure/forcewall/swarm
name = "Null-Field"
desc = "Create a bubble of null-point energy."
summon_type = list(/obj/effect/forcefield/swarm)
@@ -41,7 +41,7 @@
icon_state = "shield-old"
invisibility = INVISIBILITY_NONE
-/spell/aoe_turf/conjure/zeropointwell
+/datum/spell/aoe_turf/conjure/zeropointwell
name = "Zero-Point Well"
desc = "This ability constructs a standard zero-point energy well, capable of charging nearby swarmers."
@@ -56,7 +56,7 @@
hud_state = "swarm_zeropoint"
-/spell/aoe_turf/conjure/zeropointbarricade
+/datum/spell/aoe_turf/conjure/zeropointbarricade
name = "Zero-Point Barricade"
desc = "This ability constructs a standard zero-point energy wall, used to create a secure passageway for allies, and a bastion for defense."
@@ -71,7 +71,7 @@
hud_state = "swarm_barricade"
-/spell/aoe_turf/blink/swarm
+/datum/spell/aoe_turf/blink/swarm
name = "Warp"
desc = "Your null-point drive jaunts you to a new location."
@@ -84,7 +84,7 @@
inner_radius = 5
hud_state = "swarm_warp"
-/spell/aoe_turf/conjure/swarmer/gunner
+/datum/spell/aoe_turf/conjure/swarmer/gunner
name = "Generate Gunner"
desc = "This spell constructs a gunner swarmer shell that may activate at some point."
@@ -100,7 +100,7 @@
hud_state = "swarm_replicate"
-/spell/aoe_turf/conjure/swarmer/melee
+/datum/spell/aoe_turf/conjure/swarmer/melee
name = "Generate Impaler"
desc = "This spell constructs an impaler swarmer shell that may activate at some point."
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 9e450c7d95..ca17bde5a6 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -1,36 +1,36 @@
GLOBAL_LIST_INIT(robot_default_emotes, list(
- /decl/emote/audible/clap,
- /decl/emote/visible/bow,
- /decl/emote/visible/salute,
- /decl/emote/visible/flap,
- /decl/emote/visible/aflap,
- /decl/emote/visible/twitch,
- /decl/emote/visible/twitch_v,
- /decl/emote/visible/dance,
- /decl/emote/visible/nod,
- /decl/emote/visible/shake,
- /decl/emote/visible/glare,
- /decl/emote/visible/look,
- /decl/emote/visible/stare,
- /decl/emote/visible/deathgasp_robot,
- /decl/emote/visible/spin,
- /decl/emote/visible/sidestep,
- /decl/emote/audible/synth,
- /decl/emote/audible/synth/beep,
- /decl/emote/audible/synth/bing,
- /decl/emote/audible/synth/buzz,
- /decl/emote/audible/synth/confirm,
- /decl/emote/audible/synth/deny,
- /decl/emote/audible/synth/scary,
- /decl/emote/audible/synth/dwoop,
- /decl/emote/audible/synth/boop,
- /decl/emote/audible/synth/robochirp,
- /decl/emote/audible/synth/ding,
- /decl/emote/audible/synth/microwave,
- /decl/emote/audible/synth/security,
- /decl/emote/audible/synth/security/halt,
- /decl/emote/visible/mlem,
- /decl/emote/visible/blep
+ /datum/decl/emote/audible/clap,
+ /datum/decl/emote/visible/bow,
+ /datum/decl/emote/visible/salute,
+ /datum/decl/emote/visible/flap,
+ /datum/decl/emote/visible/aflap,
+ /datum/decl/emote/visible/twitch,
+ /datum/decl/emote/visible/twitch_v,
+ /datum/decl/emote/visible/dance,
+ /datum/decl/emote/visible/nod,
+ /datum/decl/emote/visible/shake,
+ /datum/decl/emote/visible/glare,
+ /datum/decl/emote/visible/look,
+ /datum/decl/emote/visible/stare,
+ /datum/decl/emote/visible/deathgasp_robot,
+ /datum/decl/emote/visible/spin,
+ /datum/decl/emote/visible/sidestep,
+ /datum/decl/emote/audible/synth,
+ /datum/decl/emote/audible/synth/beep,
+ /datum/decl/emote/audible/synth/bing,
+ /datum/decl/emote/audible/synth/buzz,
+ /datum/decl/emote/audible/synth/confirm,
+ /datum/decl/emote/audible/synth/deny,
+ /datum/decl/emote/audible/synth/scary,
+ /datum/decl/emote/audible/synth/dwoop,
+ /datum/decl/emote/audible/synth/boop,
+ /datum/decl/emote/audible/synth/robochirp,
+ /datum/decl/emote/audible/synth/ding,
+ /datum/decl/emote/audible/synth/microwave,
+ /datum/decl/emote/audible/synth/security,
+ /datum/decl/emote/audible/synth/security/halt,
+ /datum/decl/emote/visible/mlem,
+ /datum/decl/emote/visible/blep
))
/mob/living/silicon/robot/get_available_emotes()
diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm
index 54890be67b..2a70d3886d 100644
--- a/code/modules/mob/living/simple_mob/simple_mob.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob.dm
@@ -63,7 +63,7 @@
var/harm_intent_damage = 3 // How much an unarmed harm click does to this mob.
var/list/loot_list = list() // The list of lootable objects to drop, with "/path = prob%" structure
var/obj/item/card/id/myid// An ID card if they have one to give them access to stuff.
- var/organ_names = /decl/mob_organ_names //'False' bodyparts that can be shown as hit by projectiles in place of the default humanoid bodyplan.
+ var/organ_names = /datum/decl/mob_organ_names //'False' bodyparts that can be shown as hit by projectiles in place of the default humanoid bodyplan.
//Mob environment settings
var/minbodytemp = 250 // Minimum "okay" temperature in kelvin
@@ -396,7 +396,7 @@
return TRUE
return ..()
-/decl/mob_organ_names
+/datum/decl/mob_organ_names
var/list/hit_zones = list("body") //When in doubt, it's probably got a body.
/*
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
index e3eb7a89bf..4adc2eed25 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
@@ -369,7 +369,7 @@
icon = 'icons/turf/fur.dmi'
icon_state = "fur0"
edge_blending_priority = 4
- initial_flooring = /decl/flooring/fur
+ initial_flooring = /datum/decl/flooring/fur
can_dig = FALSE
var/tree_chance = 25
var/tree_color = null
@@ -503,7 +503,7 @@
if(M.read_preference(/datum/preference/toggle/subtle_sounds))
M << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
-/decl/flooring/fur
+/datum/decl/flooring/fur
name = "fur"
desc = "Thick, silky fur!"
icon = 'icons/turf/fur.dmi'
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm
index 3e5db970b9..af509f496f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm
@@ -6,7 +6,7 @@
response_disarm = "shoos"
response_harm = "hits"
- organ_names = /decl/mob_organ_names/quadruped
+ organ_names = /datum/decl/mob_organ_names/quadruped
ai_holder_type = /datum/ai_holder/simple_mob/melee
@@ -23,7 +23,7 @@
/obj/item/stack/animalhide = 3\
)
-/decl/mob_organ_names/quadruped //Most subtypes have this basic body layout.
+/datum/decl/mob_organ_names/quadruped //Most subtypes have this basic body layout.
hit_zones = list("head", "torso", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail")
/mob/living/simple_mob/animal/get_examine_desc()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
index e57b20fdb6..ff7deb2557 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
@@ -16,7 +16,7 @@
attacktext = list("nipped")
friendly = list("prods")
- organ_names = /decl/mob_organ_names/borer
+ organ_names = /datum/decl/mob_organ_names/borer
status_flags = CANPUSH
pass_flags = PASSTABLE
@@ -387,5 +387,5 @@
to_chat(M, "[src.true_name] whispers to [host], \"[message]\"")
-/decl/mob_organ_names/borer
+/datum/decl/mob_organ_names/borer
hit_zones = list("head", "central segment", "tail segment")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
index 4724120396..8e3321258e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
@@ -20,7 +20,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
response_harm = "kicks"
attacktext = list("pecked")
- organ_names = /decl/mob_organ_names/chicken
+ organ_names = /datum/decl/mob_organ_names/chicken
has_langs = list(LANGUAGE_ANIMAL)
@@ -161,5 +161,5 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
emote_hear = list("cheeps")
emote_see = list("pecks at the ground","flaps its tiny wings")
-/decl/mob_organ_names/chicken
+/datum/decl/mob_organ_names/chicken
hit_zones = list("head", "body", "left wing", "right wing", "left leg", "right leg", "tendies")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
index 52d70a98ff..cb94fc998d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
@@ -15,7 +15,7 @@
response_harm = "kicks"
attacktext = list("kicked")
- organ_names = /decl/mob_organ_names/cow
+ organ_names = /datum/decl/mob_organ_names/cow
say_list_type = /datum/say_list/cow
@@ -71,5 +71,5 @@
emote_hear = list("brays", "moos","moos hauntingly")
emote_see = list("shakes its head")
-/decl/mob_organ_names/cow
+/datum/decl/mob_organ_names/cow
hit_zones = list("head", "torso", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "udder")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
index e18a04cd27..08727bfbfb 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
@@ -84,7 +84,7 @@
response_disarm = "gently pushes aside"
response_harm = "punches"
- organ_names = /decl/mob_organ_names/spider
+ organ_names = /datum/decl/mob_organ_names/spider
melee_damage_lower = 18
@@ -216,5 +216,5 @@
set_AI_busy(FALSE)
-/decl/mob_organ_names/spider
+/datum/decl/mob_organ_names/spider
hit_zones = list("cephalothorax", "abdomen", "left forelegs", "right forelegs", "left hind legs", "right hind legs", "pedipalp", "mouthparts")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm
index 5096658fa1..b52c517a10 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm
@@ -16,7 +16,7 @@
response_harm = "stomps"
friendly = "pinches"
- organ_names = /decl/mob_organ_names/crab
+ organ_names = /datum/decl/mob_organ_names/crab
meat_type = /obj/item/reagent_containers/food/snacks/crabmeat
meat_amount = 3
@@ -52,5 +52,5 @@
. = ..()
adjust_scale(rand(5,12) / 10)
-/decl/mob_organ_names/crab
+/datum/decl/mob_organ_names/crab
hit_zones = list("cephalothorax", "abdomen", "left walking legs", "right walking legs", "left swimming legs", "right swimming legs", "left pincer", "right pincer")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm
index a1cfb43580..e795e34f2b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm
@@ -18,7 +18,7 @@
plane = TURF_PLANE
layer = UNDERWATER_LAYER
- organ_names = /decl/mob_organ_names/fish
+ organ_names = /datum/decl/mob_organ_names/fish
holder_type = /obj/item/holder/fish
@@ -315,5 +315,5 @@
meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/sif/murkfish
-/decl/mob_organ_names/fish
+/datum/decl/mob_organ_names/fish
hit_zones = list("head", "body", "dorsal fin", "left pectoral fin", "right pectoral fin", "tail fin")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/misc.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/misc.dm
index f02d0cc315..146e0a7380 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/misc.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/misc.dm
@@ -8,7 +8,7 @@
icon_dead = "yithian_dead"
icon = 'icons/jungle.dmi'
- organ_names = /decl/mob_organ_names/yithian
+ organ_names = /datum/decl/mob_organ_names/yithian
// Same stats as lizards.
health = 5
@@ -25,15 +25,15 @@
icon_dead = "tindalos_dead"
icon = 'icons/jungle.dmi'
- organ_names = /decl/mob_organ_names/tindalos
+ organ_names = /datum/decl/mob_organ_names/tindalos
// Same stats as lizards.
health = 5
maxHealth = 5
mob_size = MOB_MINISCULE
-/decl/mob_organ_names/yithian
+/datum/decl/mob_organ_names/yithian
hit_zones = list("head", "abdomen", "left foreleg", "right foreleg", "left hind leg", "right hind leg")
-/decl/mob_organ_names/tindalos
+/datum/decl/mob_organ_names/tindalos
hit_zones = list("head", "thorax", "abdomen", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "left middle leg", "right middle leg")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm
index 3526520af0..d7ba2740c3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm
@@ -14,7 +14,7 @@
response_disarm = "pushes aside"
response_harm = "hits"
- organ_names = /decl/mob_organ_names/penguin
+ organ_names = /datum/decl/mob_organ_names/penguin
meat_amount = 3
meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken
@@ -31,5 +31,5 @@
desc = "A penguin that has been known to associate with gnus."
speak_emote = list("interjects")
-/decl/mob_organ_names/penguin
+/datum/decl/mob_organ_names/penguin
hit_zones = list("chest", "left leg", "right leg", "left flipper", "right flipper", "head")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
index 7df27bdfc2..6789e4e9d3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
@@ -127,7 +127,7 @@
response_disarm = "gently pushes aside"
response_harm = "stamps on"
density = FALSE
- organ_names = /decl/mob_organ_names/possum
+ organ_names = /datum/decl/mob_organ_names/possum
minbodytemp = 223
maxbodytemp = 323
universal_speak = FALSE
@@ -197,14 +197,14 @@
icon_dead = "poppy_dead"
icon_rest = "poppy_dead"
tt_desc = "Didelphis astrum salutem"
- organ_names = /decl/mob_organ_names/poppy
+ organ_names = /datum/decl/mob_organ_names/poppy
holder_type = /obj/item/holder/possum/poppy
ai_holder_type = /datum/ai_holder/simple_mob/passive/possum/poppy
-/decl/mob_organ_names/possum
+/datum/decl/mob_organ_names/possum
hit_zones = list("head", "body", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "pouch")
-/decl/mob_organ_names/poppy
+/datum/decl/mob_organ_names/poppy
hit_zones = list("head", "body", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "pouch", "cute little jacket")
/mob/living/simple_mob/animal/passive/opossum/beastmode/Initialize(mapload)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm
index 141f88e82a..84ddd8717c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm
@@ -32,7 +32,7 @@
response_help = "pets"
response_disarm = "gently moves aside"
response_harm = "swats"
- organ_names = /decl/mob_organ_names/bird
+ organ_names = /datum/decl/mob_organ_names/bird
say_list_type = /datum/say_list/bird
holder_type = /obj/item/holder/bird
@@ -89,7 +89,7 @@
icon_scale_x = 0.5
icon_scale_y = 0.5
-/decl/mob_organ_names/bird
+/datum/decl/mob_organ_names/bird
hit_zones = list("head", "chest", "left leg", "right leg", "left wing", "right wing")
/mob/living/simple_mob/animal/passive/bird/european_robin/beastmode
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
index 98dbf6120f..7da1c60bf3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
@@ -1,30 +1,30 @@
GLOBAL_LIST_INIT(cat_default_emotes, list(
- /decl/emote/visible,
- /decl/emote/visible/scratch,
- /decl/emote/visible/drool,
- /decl/emote/visible/nod,
- /decl/emote/visible/sway,
- /decl/emote/visible/sulk,
- /decl/emote/visible/twitch,
- /decl/emote/visible/twitch_v,
- /decl/emote/visible/dance,
- /decl/emote/visible/roll,
- /decl/emote/visible/shake,
- /decl/emote/visible/jump,
- /decl/emote/visible/shiver,
- /decl/emote/visible/collapse,
- /decl/emote/visible/spin,
- /decl/emote/visible/sidestep,
- /decl/emote/audible,
- /decl/emote/audible/hiss,
- /decl/emote/audible/whimper,
- /decl/emote/audible/gasp,
- /decl/emote/audible/scretch,
- /decl/emote/audible/choke,
- /decl/emote/audible/moan,
- /decl/emote/audible/gnarl,
- /decl/emote/audible/purr,
- /decl/emote/audible/purrlong
+ /datum/decl/emote/visible,
+ /datum/decl/emote/visible/scratch,
+ /datum/decl/emote/visible/drool,
+ /datum/decl/emote/visible/nod,
+ /datum/decl/emote/visible/sway,
+ /datum/decl/emote/visible/sulk,
+ /datum/decl/emote/visible/twitch,
+ /datum/decl/emote/visible/twitch_v,
+ /datum/decl/emote/visible/dance,
+ /datum/decl/emote/visible/roll,
+ /datum/decl/emote/visible/shake,
+ /datum/decl/emote/visible/jump,
+ /datum/decl/emote/visible/shiver,
+ /datum/decl/emote/visible/collapse,
+ /datum/decl/emote/visible/spin,
+ /datum/decl/emote/visible/sidestep,
+ /datum/decl/emote/audible,
+ /datum/decl/emote/audible/hiss,
+ /datum/decl/emote/audible/whimper,
+ /datum/decl/emote/audible/gasp,
+ /datum/decl/emote/audible/scretch,
+ /datum/decl/emote/audible/choke,
+ /datum/decl/emote/audible/moan,
+ /datum/decl/emote/audible/gnarl,
+ /datum/decl/emote/audible/purr,
+ /datum/decl/emote/audible/purrlong
))
/mob/living/simple_mob/animal/passive/cat
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm
index 96672965d0..1c49e75fdc 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm
@@ -91,7 +91,7 @@
icon_living = "corgi"
icon_dead = "corgi_dead"
holder_type = /obj/item/holder/corgi
- organ_names = /decl/mob_organ_names/corgi
+ organ_names = /datum/decl/mob_organ_names/corgi
/mob/living/simple_mob/animal/passive/dog/corgi/puppy
name = "corgi puppy"
@@ -263,5 +263,5 @@
icon_living = "brittany"
icon_dead = "brittany_dead"
-/decl/mob_organ_names/corgi
+/datum/decl/mob_organ_names/corgi
hit_zones = list("head", "body", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail", "heart") //You monster.
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm
index 1065ee30a0..8d52625906 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm
@@ -41,7 +41,7 @@
attack_edge = 1 // Razor-edged wings, and 'claws' made for digging through ice.
attacktext = list("nipped", "bit", "cut", "clawed")
- organ_names = /decl/mob_organ_names/bird
+ organ_names = /datum/decl/mob_organ_names/bird
tame_items = list(
/obj/item/reagent_containers/food/snacks/sliceable/bread = 90,
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
index 504132c0b3..227207f566 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
@@ -47,7 +47,7 @@
base_attack_cooldown = 1.5 SECONDS
attacktext = list("nipped", "bit", "pinched")
- organ_names = /decl/mob_organ_names/frostfly
+ organ_names = /datum/decl/mob_organ_names/frostfly
projectiletype = /obj/item/projectile/energy/blob/freezing
@@ -156,5 +156,5 @@
F.energy = max(0, F.energy - 1) // The AI will eventually flee.
-/decl/mob_organ_names/frostfly
+/datum/decl/mob_organ_names/frostfly
hit_zones = list("head", "thorax", "abdomen", "left vestigal wing", "right vestigal wing", "left legs", "right legs")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
index b99280eae9..d3f2d0bc5f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
@@ -52,7 +52,7 @@
attacktext = list("bit", "buffeted", "slashed")
- organ_names = /decl/mob_organ_names/smallflying
+ organ_names = /datum/decl/mob_organ_names/smallflying
tame_items = list(
/obj/item/reagent_containers/food/snacks/grown = 90,
@@ -126,5 +126,5 @@
else if(prob(1))
hostile = initial(hostile)
-/decl/mob_organ_names/smallflying
+/datum/decl/mob_organ_names/smallflying
hit_zones = list("body", "left wing", "right wing") //For flying things too tiny to be granular
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
index 6233754c23..de855961be 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
@@ -62,7 +62,7 @@ They have been observed to occasionally attack and kill colonists, generally whe
Field studies suggest analytical abilities on par with some species of cepholapods, but their symbiotic physiology rapidly fails in captivity, making laboratory testing difficult. Their inability to make use of tools or form wider social groups beyond a handful of individuals has been hypothesised to prevent the expression of more complex social behaviors."}
value = CATALOGUER_REWARD_HARD
-/decl/mob_organ_names/grafadreka
+/datum/decl/mob_organ_names/grafadreka
hit_zones = list(
"head",
"chest",
@@ -76,7 +76,7 @@ Field studies suggest analytical abilities on par with some species of cepholapo
"tail"
)
-/decl/emote/audible/drake_howl
+/datum/decl/emote/audible/drake_howl
key = "dhowl"
emote_message_3p = "lifts USER_THEIR head up and gives an eerie howl."
emote_sound = 'sound/effects/drakehowl_close.ogg'
@@ -84,14 +84,14 @@ Field studies suggest analytical abilities on par with some species of cepholapo
emote_cooldown = 20 SECONDS
broadcast_distance = 90
-/decl/emote/audible/drake_howl/broadcast_emote_to(var/send_sound, var/mob/target, var/direction)
+/datum/decl/emote/audible/drake_howl/broadcast_emote_to(var/send_sound, var/mob/target, var/direction)
if((. = ..()))
to_chat(target, span_notice("You hear an eerie howl from somewhere to the [dir2text(direction)]."))
/mob/living/simple_mob/animal/sif/grafadreka/get_available_emotes()
. = GLOB.default_mob_emotes.Copy()
if(!is_baby)
- . |= /decl/emote/audible/drake_howl
+ . |= /datum/decl/emote/audible/drake_howl
return
// Overriding this to handle sitting.
@@ -152,7 +152,7 @@ Field studies suggest analytical abilities on par with some species of cepholapo
movement_cooldown = -1
base_attack_cooldown = 1 SECOND
- organ_names = /decl/mob_organ_names/grafadreka
+ organ_names = /datum/decl/mob_organ_names/grafadreka
say_list_type = /datum/say_list/grafadreka
ai_holder_type = /datum/ai_holder/simple_mob/intentional/grafadreka
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm
index c96c85aba9..cf4cda2f00 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm
@@ -48,7 +48,7 @@
response_disarm = "nudges"
response_harm = "kicks"
- organ_names = /decl/mob_organ_names/hare
+ organ_names = /datum/decl/mob_organ_names/hare
meat_amount = 1
@@ -62,5 +62,5 @@
emote_hear = list("crackles","sniffles")
emote_see = list("stomps the ground", "sniffs the air", "chews on something")
-/decl/mob_organ_names/hare
+/datum/decl/mob_organ_names/hare
hit_zones = list("head", "chest", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "left head spike", "right head spike")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm
index da3ca57727..c2c6b8a668 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm
@@ -73,7 +73,7 @@
attacktext = list("clawed", "pinched", "crushed")
speak_emote = list("clicks")
- organ_names = /decl/mob_organ_names/crab
+ organ_names = /datum/decl/mob_organ_names/crab
ai_holder_type = /datum/ai_holder/simple_mob/melee/hooligan
say_list_type = /datum/say_list/crab
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm
index 9a26432d22..1443eea3ba 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm
@@ -47,7 +47,7 @@
base_attack_cooldown = 2 SECONDS
attacktext = list("gouged", "bit", "cut", "clawed", "whipped")
- organ_names = /decl/mob_organ_names/kururak
+ organ_names = /datum/decl/mob_organ_names/kururak
meat_amount = 5
armor = list(
@@ -435,5 +435,5 @@
bleeding_rate_percent = 0.7
attack_speed_percent = 0.8
-/decl/mob_organ_names/kururak
+/datum/decl/mob_organ_names/kururak
hit_zones = list("head", "chest", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "far left tail", "far right tail", "left middle tail", "right middle tail")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index f4496f014c..454ce1879d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -69,7 +69,7 @@
attack_sharp = TRUE
attacktext = list("nipped", "bit", "pinched")
- organ_names = /decl/mob_organ_names/leech
+ organ_names = /datum/decl/mob_organ_names/leech
armor = list(
"melee" = 10,
@@ -482,5 +482,5 @@
else
holder.a_intent = I_HURT
-/decl/mob_organ_names/leech
+/datum/decl/mob_organ_names/leech
hit_zones = list("mouthparts", "central segment", "tail segment")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm
index 67c9b1c2ef..95e402647a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm
@@ -48,7 +48,7 @@
base_attack_cooldown = 1.5 SECONDS
attacktext = list("nipped", "bit", "pinched")
- organ_names = /decl/mob_organ_names/moth
+ organ_names = /datum/decl/mob_organ_names/moth
projectiletype = /obj/item/projectile/energy/blob
@@ -137,5 +137,5 @@
return TRUE
return FALSE
-/decl/mob_organ_names/moth
+/datum/decl/mob_organ_names/moth
hit_zones = list("head", "thorax", "abdomen", "left forewing", "left hindwing", "right forewing", "right hindwing", "left foreleg", "right foreleg", "left hindleg", "right hindleg")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/pillbug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/pillbug.dm
index bb29ad9aca..6cdbb433f6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/pillbug.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/pillbug.dm
@@ -29,7 +29,7 @@
response_disarm = "rolls over"
response_harm = "stomps on"
- organ_names = /decl/mob_organ_names/pillbug
+ organ_names = /datum/decl/mob_organ_names/pillbug
armor = list(
"melee" = 30,
@@ -41,5 +41,5 @@
"rad" = 100
)
-/decl/mob_organ_names/pillbug
+/datum/decl/mob_organ_names/pillbug
hit_zones = list("cephalon", "pereon", "pleon", "left forelegs", "right forelegs", "left hind legs", "right hind legs")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm
index 797262d82f..5173d290b6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm
@@ -42,7 +42,7 @@
melee_attack_delay = 1 SECOND
attacktext = list("mauled")
- organ_names = /decl/mob_organ_names/savik
+ organ_names = /datum/decl/mob_organ_names/savik
player_msg = "You have the ability to berserk at will, which will grant strong physical bonuses for \
a short period of time, however it will tire you and you will be much weaker for awhile after it expires."
@@ -83,5 +83,5 @@
add_modifier(/datum/modifier/berserk, 30 SECONDS)
-/decl/mob_organ_names/savik
+/datum/decl/mob_organ_names/savik
hit_zones = list("head", "torso", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "right bone plate", "left bone plate", "tail", "left claw", "right claw")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm
index 5fe628588f..07c99b591f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm
@@ -46,7 +46,7 @@
attack_edge = TRUE
attacktext = list("gouged")
- organ_names = /decl/mob_organ_names/shantak
+ organ_names = /datum/decl/mob_organ_names/shantak
say_list_type = /datum/say_list/shantak
@@ -101,5 +101,5 @@
makes_dirt = 0
faction = FACTION_NEUTRAL
-/decl/mob_organ_names/shantak
+/datum/decl/mob_organ_names/shantak
hit_zones = list("head", "torso", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail", "mane", "snout")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm
index 610664af4a..d8f085ee7c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm
@@ -20,7 +20,7 @@
response_disarm = "gently pushes aside the"
response_harm = "hits the"
- organ_names = /decl/mob_organ_names/smallflying
+ organ_names = /datum/decl/mob_organ_names/smallflying
harm_intent_damage = 10
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm
index f21bd88114..0de18e7da2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm
@@ -55,7 +55,7 @@
attack_sound = 'sound/weapons/bite.ogg'
attacktext = list("bitten")
- organ_names = /decl/mob_organ_names/fish
+ organ_names = /datum/decl/mob_organ_names/fish
meat_amount = 5
meat_type = /obj/item/reagent_containers/food/snacks/carpmeat
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm
index cc613f7d47..ba27ab7d08 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm
@@ -43,7 +43,7 @@
attack_sound = 'sound/weapons/bite.ogg'
attacktext = list("nibbled")
- organ_names = /decl/mob_organ_names/fish
+ organ_names = /datum/decl/mob_organ_names/fish
meat_amount = 1
meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/gnat
@@ -51,7 +51,7 @@
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/jellyfish
mob_bump_flag = 0
- organ_names = /decl/mob_organ_names/space_gnat
+ organ_names = /datum/decl/mob_organ_names/space_gnat
-/decl/mob_organ_names/space_gnat
+/datum/decl/mob_organ_names/space_gnat
hit_zones = list("cephalothorax", "stubby winglets", "flailing tail")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm
index c43370ca57..ae3f3ebb4e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm
@@ -21,7 +21,7 @@
attacktext = list("pecked")
attack_sound = 'sound/weapons/bite.ogg'
- organ_names = /decl/mob_organ_names/goose
+ organ_names = /datum/decl/mob_organ_names/goose
has_langs = list(LANGUAGE_ANIMAL)
@@ -48,7 +48,7 @@
add_modifier(/datum/modifier/berserk, 30 SECONDS)
-/decl/mob_organ_names/goose
+/datum/decl/mob_organ_names/goose
hit_zones = list("head", "chest", "left leg", "right leg", "left wing", "right wing", "neck")
/mob/living/simple_mob/animal/space/goose/white
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm
index 1a1b67cbba..d5a5c15eaf 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm
@@ -53,7 +53,7 @@
attack_sound = 'sound/weapons/bite.ogg'
attacktext = list("lanced","bitten","impaled","gored")
- organ_names = /decl/mob_organ_names/fish
+ organ_names = /datum/decl/mob_organ_names/fish
meat_amount = 5
meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/ray
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm
index 2ed7bab887..e89f3dc084 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm
@@ -36,7 +36,7 @@
attack_sound = 'sound/weapons/bite.ogg'
attacktext = list("lanced","bitten","impaled","gored")
- organ_names = /decl/mob_organ_names/fish
+ organ_names = /datum/decl/mob_organ_names/fish
meat_amount = 10
meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/shark
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm
index 8ede4d6fa9..b3720cf3aa 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm
@@ -29,7 +29,7 @@
attacktext = list("slammed")
- organ_names = /decl/mob_organ_names
+ organ_names = /datum/decl/mob_organ_names
ai_holder_type = /datum/ai_holder/simple_mob/inert
diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm
index 2bf64c015e..80cbebd284 100644
--- a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm
@@ -7,7 +7,7 @@
pass_flags = PASSBLOB | PASSTABLE
faction = FACTION_BLOB
- organ_names = /decl/mob_organ_names/blob
+ organ_names = /datum/decl/mob_organ_names/blob
heat_damage_per_tick = 0
cold_damage_per_tick = 0
@@ -88,5 +88,5 @@
return ally
-/decl/mob_organ_names/blob
+/datum/decl/mob_organ_names/blob
hit_zones = list("mass")
diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm b/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm
index 41d298e61f..4c177e588f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm
@@ -24,7 +24,7 @@
attack_sound = 'sound/effects/slime_squish.ogg'
say_list_type = /datum/say_list/spore
- organ_names = /decl/mob_organ_names/spore
+ organ_names = /datum/decl/mob_organ_names/spore
var/mob/living/carbon/human/infested = null // The human this thing is totally not making into a zombie.
var/can_infest = FALSE
@@ -155,5 +155,5 @@
to_chat(src, span_notice("Your attack is assisted by [helpers] other spore\s."))
return damage_to_do
-/decl/mob_organ_names/spore
+/datum/decl/mob_organ_names/spore
hit_zones = list("sporangium", "stolon", "sporangiophore")
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm
index 14a76584bd..f285688c15 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm
@@ -22,7 +22,7 @@
attacktext = list("attacked")
attack_sound = 'sound/items/bikehorn.ogg'
- organ_names = /decl/mob_organ_names/clown
+ organ_names = /datum/decl/mob_organ_names/clown
say_list_type = /datum/say_list/clown
@@ -30,5 +30,5 @@
speak = list("HONK", "Honk!", "Welcome to clown planet!")
emote_see = list("honks")
-/decl/mob_organ_names/clown
+/datum/decl/mob_organ_names/clown
hit_zones = list("head", "torso", "pie-hole", "honker", "left funny bone", "right funny bone", "left foot", "right foot", "unmentionables")
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm
index b29d784fd6..c639992f96 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm
@@ -15,7 +15,7 @@
health = 150 // Point of human crit, as of commenting
maxHealth = 150
- organ_names = /decl/mob_organ_names/humanoid
+ organ_names = /datum/decl/mob_organ_names/humanoid
// Most humans leave a corpse
var/corpse = null
@@ -35,5 +35,5 @@
qdel(src)
return
-/decl/mob_organ_names/humanoid
+/datum/decl/mob_organ_names/humanoid
hit_zones = list("head", "torso", "left leg", "right leg", "left arm", "right arm", "left hand", "right hand", "left foot", "right foot") //Same as real people!
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
index ecb9a8720c..70aaf129a7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
@@ -54,7 +54,7 @@
response_disarm = "gently pushes aside"
response_harm = "hits"
- organ_names = /decl/mob_organ_names/combatdrone
+ organ_names = /datum/decl/mob_organ_names/combatdrone
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening
say_list_type = /datum/say_list/malf_drone
@@ -110,5 +110,5 @@
/mob/living/simple_mob/mechanical/combat_drone/event
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/event
-/decl/mob_organ_names/combatdrone
+/datum/decl/mob_organ_names/combatdrone
hit_zones = list("chassis", "comms array", "sensor suite", "left weapons module", "right weapons module", "maneuvering thruster")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
index 89b69b918f..18a12b7744 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
@@ -40,7 +40,7 @@
response_disarm = "gently pushes aside"
response_harm = "hits"
- organ_names = /decl/mob_organ_names/miningdrone
+ organ_names = /datum/decl/mob_organ_names/miningdrone
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening
say_list_type = /datum/say_list/malf_drone/mining
@@ -169,7 +169,7 @@
for(var/obj/item/I in my_storage)
my_storage.remove_from_storage(I, OB)
-/decl/mob_organ_names/miningdrone
+/datum/decl/mob_organ_names/miningdrone
hit_zones = list("chassis", "comms array", "sensor suite", "left excavator module", "right excavator module", "maneuvering thruster")
/datum/say_list/malf_drone/mining
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
index 2164ad9bc4..9b6784a324 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
@@ -16,7 +16,7 @@
harm_intent_damage = 3
friendly = "hugs"
- organ_names = /decl/mob_organ_names/golem
+ organ_names = /datum/decl/mob_organ_names/golem
melee_damage_lower = 30 // It has a built in esword.
melee_damage_upper = 30
@@ -154,5 +154,5 @@
casting = FALSE
ranged_post_animation(A)
-/decl/mob_organ_names/golem
+/datum/decl/mob_organ_names/golem
hit_zones = list("helmet", "cuirass", "left tasset", "right tasset", "left gauntlet", "right gauntlet", "weapon")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
index 2cd10fabfd..030af12be6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
@@ -15,7 +15,7 @@
attacktext = list("clawed")
projectilesound = 'sound/weapons/gunshot_old.ogg'
- organ_names = /decl/mob_organ_names/hivebot
+ organ_names = /datum/decl/mob_organ_names/hivebot
ai_holder_type = /datum/ai_holder/simple_mob/hivebot
say_list_type = /datum/say_list/hivebot
@@ -52,5 +52,5 @@
firing_lanes = TRUE
can_flee = FALSE // Fearless dumb machines.
-/decl/mob_organ_names/hivebot
+/datum/decl/mob_organ_names/hivebot
hit_zones = list("central chassis", "positioning servo", "head", "sensor suite", "manipulator arm", "shoulder weapon mount", "weapons array", "front right leg", "front left leg", "rear left leg", "rear right leg")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
index 956537ffc0..fb7dd5adc4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
@@ -116,7 +116,7 @@
icon_state = "red"
icon_living = "red"
- organ_names = /decl/mob_organ_names/hivebotsiege
+ organ_names = /datum/decl/mob_organ_names/hivebotsiege
player_msg = "You are capable of firing very long range bombardment attacks.
\
To use, click on a tile or enemy at a long range. Note that the projectile arcs in the air, \
@@ -155,5 +155,5 @@
desc = "A large robot capable of delivering fragmentation shells to rip apart their fleshy enemies."
projectiletype = /obj/item/projectile/arc/fragmentation
-/decl/mob_organ_names/hivebotsiege
+/datum/decl/mob_organ_names/hivebotsiege
hit_zones = list("central chassis", "armor plating", "reinforced positioning servo", "head", "sensor suite", "manipulator arm", "heavy weapons mount", "advanced weapons array", "front right leg", "front left leg", "rear left leg", "rear right leg")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm
index fb1a0715d7..76eb4790f5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm
@@ -8,7 +8,7 @@
melee_damage_lower = 2
melee_damage_upper = 2
- organ_names = /decl/mob_organ_names/hivebotsupport
+ organ_names = /datum/decl/mob_organ_names/hivebotsupport
// This hivebot supplies a general buff to nearby hivebots that improve their performance.
// Note that the commander itself does not receive the buff.
@@ -87,7 +87,7 @@
last_resupply = world.time
break // Only one resupply per pulse.
-/decl/mob_organ_names/hivebotsupport
+/datum/decl/mob_organ_names/hivebotsupport
hit_zones = list("central chassis", "positioning servo", "head", "sensor suite", "manipulator arm", "battle analytics mount", "weapons array", "front right leg", "front left leg", "rear left leg", "rear right leg")
/mob/living/simple_mob/mechanical/hivebot/support/harry
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm
index 0ea89c7a28..ca16d5e365 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm
@@ -9,7 +9,7 @@
melee_damage_lower = 3
melee_damage_upper = 3
attack_sound = 'sound/weapons/egloves.ogg'
- organ_names = /decl/mob_organ_names/hivebottank
+ organ_names = /datum/decl/mob_organ_names/hivebottank
// All tank hivebots apply a modifier to their target, and force them to attack them if they're AI controlled.
@@ -133,5 +133,5 @@
return (..(P))
-/decl/mob_organ_names/hivebottank
+/datum/decl/mob_organ_names/hivebottank
hit_zones = list("central chassis", "armor plating", "component shielding", "positioning servo", "head", "sensor suite", "heavy manipulator arm", "shoulder weapon mount", "weapons array", "front right leg", "front left leg", "rear left leg", "rear right leg")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
index fcae342279..d26eb35909 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
@@ -28,7 +28,7 @@
projectiletype = /obj/item/projectile/beam
base_attack_cooldown = 2 SECONDS
- organ_names = /decl/mob_organ_names/hoverpod
+ organ_names = /datum/decl/mob_organ_names/hoverpod
var/datum/effect/effect/system/ion_trail_follow/ion_trail
@@ -48,5 +48,5 @@
/mob/living/simple_mob/mechanical/mecha/hoverpod/Process_Spacemove(var/check_drift = 0)
return TRUE
-/decl/mob_organ_names/hoverpod
+/datum/decl/mob_organ_names/hoverpod
hit_zones = list("central chassis", "control module", "hydraulics", "left manipulator", "right manipulator", "left landing strut", "right landing strut", "maneuvering thruster", "sensor suite", "radiator", "power supply")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
index db3f1d0e8d..afdec30e9f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
@@ -15,7 +15,7 @@
mob_size = MOB_LARGE
damage_threshold = 5 //Anything that's 5 or less damage will not do damage.
- organ_names = /decl/mob_organ_names/mecha
+ organ_names = /datum/decl/mob_organ_names/mecha
armor = list(
"melee" = 20,
@@ -143,5 +143,5 @@
deflect_sprite()
..(severity)
-/decl/mob_organ_names/mecha
+/datum/decl/mob_organ_names/mecha
hit_zones = list("central chassis", "control module", "hydraulics", "left arm", "right arm", "left leg", "right leg", "sensor suite", "radiator", "power supply", "left equipment mount", "right equipment mount")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm
index ca8e8ebfc3..7a87a34f21 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm
@@ -46,7 +46,7 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
attacktext = list("cut", "sliced")
- organ_names = /decl/mob_organ_names/viscerator
+ organ_names = /datum/decl/mob_organ_names/viscerator
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive
@@ -101,5 +101,5 @@
base_attack_cooldown = 10 // One attack a second or so.
movement_cooldown = -1
-/decl/mob_organ_names/viscerator
+/datum/decl/mob_organ_names/viscerator
hit_zones = list("chassis", "rotor blades", "sensor array")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/ward.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/ward.dm
index 84ecc23938..680fb5fc54 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/ward.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/ward.dm
@@ -15,7 +15,7 @@
response_harm = "punches"
faction = FACTION_WARDS // Needed as most human mobs are in neutral faction. The owner is generally except from any ward hostility regardless.
- organ_names = /decl/mob_organ_names/ward
+ organ_names = /datum/decl/mob_organ_names/ward
maxHealth = 15
health = 15
@@ -43,5 +43,5 @@
return TRUE
return ..()
-/decl/mob_organ_names/ward
+/datum/decl/mob_organ_names/ward
hit_zones = list("chassis", "sensor array", "hover thruster")
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/artificer.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/artificer.dm
index 24167969ba..eba1d90e76 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/artificer.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/artificer.dm
@@ -17,22 +17,22 @@
harm_intent_damage = 5
melee_damage_lower = 15 //It's not the strongest of the bunch, but that doesn't mean it can't hurt you.
melee_damage_upper = 20
- organ_names = /decl/mob_organ_names/artificer
+ organ_names = /datum/decl/mob_organ_names/artificer
attacktext = list("rammed")
attack_sound = 'sound/weapons/rapidslice.ogg'
- construct_spells = list(/spell/aoe_turf/conjure/construct/lesser,
- /spell/aoe_turf/conjure/wall,
- /spell/aoe_turf/conjure/floor,
- /spell/aoe_turf/conjure/soulstone,
- /spell/aoe_turf/conjure/pylon,
- /spell/aoe_turf/conjure/door,
- /spell/aoe_turf/conjure/grille,
- /spell/targeted/occult_repair_aura,
- /spell/targeted/construct_advanced/mend_acolyte
+ construct_spells = list(/datum/spell/aoe_turf/conjure/construct/lesser,
+ /datum/spell/aoe_turf/conjure/wall,
+ /datum/spell/aoe_turf/conjure/floor,
+ /datum/spell/aoe_turf/conjure/soulstone,
+ /datum/spell/aoe_turf/conjure/pylon,
+ /datum/spell/aoe_turf/conjure/door,
+ /datum/spell/aoe_turf/conjure/grille,
+ /datum/spell/targeted/occult_repair_aura,
+ /datum/spell/targeted/construct_advanced/mend_acolyte
)
ai_holder_type = /datum/ai_holder/mimic
-/decl/mob_organ_names/artificer
+/datum/decl/mob_organ_names/artificer
hit_zones = list("body", "carapace", "right manipulator", "left manipulator", "upper left appendage", "upper right appendage", "eye")
////////////////////////////
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/bishop.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/bishop.dm
index 97f4d628b4..ab7addb228 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/bishop.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/bishop.dm
@@ -20,11 +20,11 @@
attack_edge = 1
attacktext = list("slashed")
friendly = list("pinches")
- organ_names = /decl/mob_organ_names/wraith
+ organ_names = /datum/decl/mob_organ_names/wraith
movement_cooldown = -1
attack_sound = 'sound/weapons/rapidslice.ogg'
- construct_spells = list(/spell/targeted/construct_advanced/crippling_beam,
- /spell/targeted/construct_advanced/banishment
+ construct_spells = list(/datum/spell/targeted/construct_advanced/crippling_beam,
+ /datum/spell/targeted/construct_advanced/banishment
)
ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative
@@ -36,7 +36,7 @@
var/mob/living/L = A
L.add_modifier(/datum/modifier/deep_wounds, 30 SECONDS)
-/decl/mob_organ_names/wraith
+/datum/decl/mob_organ_names/wraith
hit_zones = list("body", "eye", "crystaline spike", "left claw", "right claw")
////////////////////////////
@@ -61,7 +61,7 @@
attack_edge = 1
attacktext = list("violently stabbed")
friendly = list("caresses")
- organ_names = /decl/mob_organ_names/wraith
+ organ_names = /datum/decl/mob_organ_names/wraith
movement_cooldown = 0
ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative
@@ -70,5 +70,5 @@
attack_sound = 'sound/weapons/pierce.ogg'
-/decl/mob_organ_names/wraith
+/datum/decl/mob_organ_names/wraith
hit_zones = list("body", "eye", "crystaline spike", "left claw", "right claw")
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/cardinal.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/cardinal.dm
index f39dabe183..822671bdec 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/cardinal.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/cardinal.dm
@@ -20,15 +20,15 @@
attack_armor_pen = 50 //fist of iron and stone will smash through most things
attacktext = list("smashed their armoured gauntlet into")
friendly = list("pats")
- organ_names = /decl/mob_organ_names/juggernaut
+ organ_names = /datum/decl/mob_organ_names/juggernaut
mob_size = MOB_HUGE
attack_sound = 'sound/weapons/heavysmash.ogg'
status_flags = 0
resistance = 10
- construct_spells = list(/spell/targeted/fortify,
- /spell/targeted/construct_advanced/slam,
- /spell/targeted/construct_advanced/mend_purity,
- /spell/targeted/purity_repair_aura
+ construct_spells = list(/datum/spell/targeted/fortify,
+ /datum/spell/targeted/construct_advanced/slam,
+ /datum/spell/targeted/construct_advanced/mend_purity,
+ /datum/spell/targeted/purity_repair_aura
)
ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative
@@ -86,5 +86,5 @@
return (..(P))
-/decl/mob_organ_names/juggernaut
+/datum/decl/mob_organ_names/juggernaut
hit_zones = list("body", "left pauldron", "right pauldron", "left arm", "right arm", "eye", "head", "crystaline spike")
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/deacon.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/deacon.dm
index 4529de17ad..bd9c8692ff 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/deacon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/deacon.dm
@@ -20,7 +20,7 @@
attack_edge = 1
attacktext = list("violently stabbed")
friendly = list("caresses")
- organ_names = /decl/mob_organ_names/harvester
+ organ_names = /datum/decl/mob_organ_names/harvester
movement_cooldown = -1
ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative
@@ -39,10 +39,10 @@
"rad" = 100)
construct_spells = list(
- /spell/aoe_turf/knock/harvester,
- /spell/targeted/construct_advanced/force_beam,
- /spell/targeted/construct_advanced/soothing_sphere,
+ /datum/spell/aoe_turf/knock/harvester,
+ /datum/spell/targeted/construct_advanced/force_beam,
+ /datum/spell/targeted/construct_advanced/soothing_sphere,
)
-/decl/mob_organ_names/harvester
+/datum/decl/mob_organ_names/harvester
hit_zones = list("cephalothorax", "eye", "carapace", "energy crystal", "mandible")
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/harvester.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/harvester.dm
index aef2d7bea6..93e0847bad 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/harvester.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/harvester.dm
@@ -14,7 +14,7 @@
attack_sharp = TRUE
attacktext = list("violently stabbed")
friendly = list("caresses")
- organ_names = /decl/mob_organ_names/harvester
+ organ_names = /datum/decl/mob_organ_names/harvester
movement_cooldown = -1
// environment_smash = 1 // Whatever this gets renamed to, Harvesters need to break things
@@ -31,15 +31,15 @@
"rad" = 100)
construct_spells = list(
- /spell/aoe_turf/knock/harvester,
- /spell/targeted/construct_advanced/inversion_beam,
- /spell/targeted/construct_advanced/agonizing_sphere,
- /spell/rune_write
+ /datum/spell/aoe_turf/knock/harvester,
+ /datum/spell/targeted/construct_advanced/inversion_beam,
+ /datum/spell/targeted/construct_advanced/agonizing_sphere,
+ /datum/spell/rune_write
)
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive
attack_edge = TRUE
-/decl/mob_organ_names/harvester
+/datum/decl/mob_organ_names/harvester
hit_zones = list("cephalothorax", "eye", "carapace", "energy crystal", "mandible")
////////////////////////////
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm
index 0c3c343918..9d892d4ad7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm
@@ -21,7 +21,7 @@
attack_armor_pen = 60 //Being punched by a living, floating statue.
attacktext = list("smashed their armoured gauntlet into")
friendly = list("pats")
- organ_names = /decl/mob_organ_names/juggernaut
+ organ_names = /datum/decl/mob_organ_names/juggernaut
mob_size = MOB_HUGE
@@ -33,9 +33,9 @@
attack_sound = 'sound/weapons/heavysmash.ogg'
status_flags = 0
resistance = 10
- construct_spells = list(/spell/aoe_turf/conjure/forcewall/lesser,
- /spell/targeted/fortify,
- /spell/targeted/construct_advanced/slam
+ construct_spells = list(/datum/spell/aoe_turf/conjure/forcewall/lesser,
+ /datum/spell/targeted/fortify,
+ /datum/spell/targeted/construct_advanced/slam
)
armor = list(
@@ -123,9 +123,9 @@
"bomb" = 10,
"bio" = 100,
"rad" = 100)
- construct_spells = list(/spell/aoe_turf/conjure/forcewall/lesser,
- /spell/targeted/fortify,
- /spell/targeted/construct_advanced/slam
+ construct_spells = list(/datum/spell/aoe_turf/conjure/forcewall/lesser,
+ /datum/spell/targeted/fortify,
+ /datum/spell/targeted/construct_advanced/slam
)
/mob/living/simple_mob/construct/juggernaut/behemoth/bullet_act(var/obj/item/projectile/P)
@@ -148,7 +148,7 @@
return (..(P))
-/decl/mob_organ_names/juggernaut
+/datum/decl/mob_organ_names/juggernaut
hit_zones = list("body", "left pauldron", "right pauldron", "left arm", "right arm", "eye", "head", "crystaline spike")
/mob/living/simple_mob/construct/juggernaut/behemoth/unstoppable
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/priest.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/priest.dm
index faf5efd1d3..239b352c21 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/priest.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/priest.dm
@@ -17,14 +17,14 @@
harm_intent_damage = 5
melee_damage_lower = 10 //It's not the strongest of the bunch, but that doesn't mean it can't hurt you.
melee_damage_upper = 15
- organ_names = /decl/mob_organ_names/artificer
+ organ_names = /datum/decl/mob_organ_names/artificer
attacktext = list("rammed")
attack_sound = 'sound/weapons/rapidslice.ogg'
- construct_spells = list(/spell/targeted/purity_repair_aura,
- /spell/targeted/construct_advanced/mend_purity
+ construct_spells = list(/datum/spell/targeted/purity_repair_aura,
+ /datum/spell/targeted/construct_advanced/mend_purity
)
ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative
-/decl/mob_organ_names/artificer
+/datum/decl/mob_organ_names/artificer
hit_zones = list("body", "carapace", "right manipulator", "left manipulator", "upper left appendage", "upper right appendage", "eye")
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm
index f315627be9..a34a8feb6a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm
@@ -19,7 +19,7 @@
attack_armor_pen = 100 //It's a ghost/horror from beyond, I ain't gotta explain 100 AP
attacktext = list("drained the life from")
- organ_names = /decl/mob_organ_names/shade
+ organ_names = /datum/decl/mob_organ_names/shade
minbodytemp = 0
maxbodytemp = 4000
@@ -48,5 +48,5 @@
qdel(src)
return
-/decl/mob_organ_names/shade
+/datum/decl/mob_organ_names/shade
hit_zones = list("spectral robe", "featureless visage", "haunting glow")
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm
index 59321cd28c..6608b9bcc6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm
@@ -18,11 +18,11 @@
attack_edge = 1
attacktext = list("slashed")
friendly = list("pinches")
- organ_names = /decl/mob_organ_names/wraith
+ organ_names = /datum/decl/mob_organ_names/wraith
movement_cooldown = -1
attack_sound = 'sound/weapons/rapidslice.ogg'
- construct_spells = list(/spell/targeted/ethereal_jaunt/shift,
- /spell/targeted/ambush_mode
+ construct_spells = list(/datum/spell/targeted/ethereal_jaunt/shift,
+ /datum/spell/targeted/ambush_mode
)
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive
var/jaunt_warning = 0.5 SECONDS // How long the jaunt telegraphing is.
@@ -38,7 +38,7 @@
var/mob/living/L = A
L.add_modifier(/datum/modifier/deep_wounds, 30 SECONDS)
-/decl/mob_organ_names/wraith
+/datum/decl/mob_organ_names/wraith
hit_zones = list("body", "eye", "crystaline spike", "left claw", "right claw")
/mob/living/simple_mob/construct/wraith/jaunt_spam
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm b/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm
index c2b7d0dcbf..68d1bdb968 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm
@@ -24,7 +24,7 @@
attacktext = list("chomped")
attack_sound = 'sound/weapons/bite.ogg'
- organ_names = /decl/mob_organ_names/abberation
+ organ_names = /datum/decl/mob_organ_names/abberation
speak_emote = list("gibbers")
@@ -75,5 +75,5 @@
melee_damage_lower = 13
melee_damage_upper = 25
-/decl/mob_organ_names/abberation
+/datum/decl/mob_organ_names/abberation
hit_zones = list("fleshy mass", "maw", "eye(?)", "orifice(?)")
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm
index 16f8ce4377..30b1963608 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm
@@ -25,7 +25,7 @@
attacktext = list("gripped")
attack_sound = 'sound/hallucinations/growl1.ogg'
- organ_names = /decl/mob_organ_names/faithless
+ organ_names = /datum/decl/mob_organ_names/faithless
ai_holder_type = /datum/ai_holder/simple_mob/melee
@@ -83,5 +83,5 @@
melee_damage_lower = 13
melee_damage_upper = 28
-/decl/mob_organ_names/faithless
+/datum/decl/mob_organ_names/faithless
hit_zones = list("body", "left appendage", "right appendage", "shadowy tendrils", "head", "right stump", "left stump", "infernal eye")
diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
index 237aafbad0..ffd5e6cf90 100644
--- a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
@@ -17,7 +17,7 @@
response_disarm = "pushes aside"
response_harm = "smacks"
- organ_names = /decl/mob_organ_names/tomato
+ organ_names = /datum/decl/mob_organ_names/tomato
harm_intent_damage = 5
melee_damage_upper = 15
@@ -32,5 +32,5 @@
can_be_drop_prey = FALSE
can_pain_emote = FALSE
-/decl/mob_organ_names/tomato
+/datum/decl/mob_organ_names/tomato
hit_zones = list("flesh", "leaf", "mouth")
diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
index 2363e4b07a..78271df080 100644
--- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
@@ -25,7 +25,7 @@
attacktext = list("bitten")
attack_sound = 'sound/weapons/bite.ogg'
- organ_names = /decl/mob_organ_names/tree
+ organ_names = /datum/decl/mob_organ_names/tree
meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
meat_amount = 2
@@ -48,5 +48,5 @@
new /obj/item/stack/material/wood(loc)
qdel(src)
-/decl/mob_organ_names/tree
+/datum/decl/mob_organ_names/tree
hit_zones = list("trunk", "branches", "twigs")
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
index da206c007d..995a4311d3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
@@ -1,18 +1,18 @@
var/list/_slime_default_emotes = list(
- /decl/emote/audible/moan,
- /decl/emote/visible/twitch,
- /decl/emote/visible/sway,
- /decl/emote/visible/shiver,
- /decl/emote/visible/bounce,
- /decl/emote/visible/jiggle,
- /decl/emote/visible/lightup,
- /decl/emote/visible/vibrate,
- /decl/emote/slime,
- /decl/emote/slime/pout,
- /decl/emote/slime/sad,
- /decl/emote/slime/angry,
- /decl/emote/slime/frown,
- /decl/emote/slime/smile
+ /datum/decl/emote/audible/moan,
+ /datum/decl/emote/visible/twitch,
+ /datum/decl/emote/visible/sway,
+ /datum/decl/emote/visible/shiver,
+ /datum/decl/emote/visible/bounce,
+ /datum/decl/emote/visible/jiggle,
+ /datum/decl/emote/visible/lightup,
+ /datum/decl/emote/visible/vibrate,
+ /datum/decl/emote/slime,
+ /datum/decl/emote/slime/pout,
+ /datum/decl/emote/slime/sad,
+ /datum/decl/emote/slime/angry,
+ /datum/decl/emote/slime/frown,
+ /datum/decl/emote/slime/smile
)
// The top-level slime defines. Xenobio slimes and feral slimes will inherit from this.
@@ -40,7 +40,7 @@ var/list/_slime_default_emotes = list(
response_help = "pets"
- organ_names = /decl/mob_organ_names/slime
+ organ_names = /datum/decl/mob_organ_names/slime
// Atmos stuff.
minbodytemp = T0C-30
@@ -263,5 +263,5 @@ var/list/_slime_default_emotes = list(
playsound(src, 'sound/effects/slime_squish.ogg', 50, 0)
visible_message(span_infoplain(span_bold("\The [src]") + " squishes!"))
-/decl/mob_organ_names/slime
+/datum/decl/mob_organ_names/slime
hit_zones = list("cytoplasmic membrane")
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
index 90003acea1..eefa56fddd 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
@@ -236,15 +236,15 @@
//Synth emotes for the (broken) synth hounds.
/mob/living/simple_mob/vore/aggressive/corrupthound/get_available_emotes()
. = ..()
- . += /decl/emote/audible/synth
- . += /decl/emote/audible/synth/beep
- . += /decl/emote/audible/synth/buzz
- . += /decl/emote/audible/synth/confirm
- . += /decl/emote/audible/synth/deny
- . += /decl/emote/audible/synth/scary
- . += /decl/emote/audible/synth/dwoop
- . += /decl/emote/audible/synth/boop
- . += /decl/emote/audible/synth/robochirp
+ . += /datum/decl/emote/audible/synth
+ . += /datum/decl/emote/audible/synth/beep
+ . += /datum/decl/emote/audible/synth/buzz
+ . += /datum/decl/emote/audible/synth/confirm
+ . += /datum/decl/emote/audible/synth/deny
+ . += /datum/decl/emote/audible/synth/scary
+ . += /datum/decl/emote/audible/synth/dwoop
+ . += /datum/decl/emote/audible/synth/boop
+ . += /datum/decl/emote/audible/synth/robochirp
/datum/category_item/catalogue/technology/drone/corrupt_hound/janihound
name = "Drone - Corrupt Hound"
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm
index 16c9e83f77..bc13e75cf6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm
@@ -317,11 +317,11 @@
/mob/living/simple_mob/shadekin/red/rakshasa/get_available_emotes()
. = GLOB.simple_mob_default_emotes.Copy()
- . += /decl/emote/audible/evil_laugh
- . += /decl/emote/audible/evil_no
- . += /decl/emote/audible/evil_breathing
- . += /decl/emote/audible/evil_breathing_2
- . += /decl/emote/audible/goodripsound
+ . += /datum/decl/emote/audible/evil_laugh
+ . += /datum/decl/emote/audible/evil_no
+ . += /datum/decl/emote/audible/evil_breathing
+ . += /datum/decl/emote/audible/evil_breathing_2
+ . += /datum/decl/emote/audible/goodripsound
/mob/living/simple_mob/shadekin/blue/luna
name = "Luna"
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 433e01d36d..d9a80be3c4 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -207,7 +207,7 @@
var/mob/living/carbon/LAssailant = null
//Wizard mode, but can be used in other modes thanks to the brand new "Give Spell" badmin button
- var/list/spell/spell_list = list()
+ var/list/datum/spell/spell_list = list()
//Changlings, but can be used in other modes
// var/obj/effect/proc_holder/changpower/list/power_list = list()
diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm
index a1bdf2424f..039083e37c 100644
--- a/code/modules/organs/internal/brain.dm
+++ b/code/modules/organs/internal/brain.dm
@@ -305,19 +305,19 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
qdel(src)
return 1
-/decl/chemical_reaction/instant/promethean_brain_revival
+/datum/decl/chemical_reaction/instant/promethean_brain_revival
name = "Promethean Revival"
id = "prom_revival"
result = null
required_reagents = list(REAGENT_ID_PHORON = 40)
result_amount = 1
-/decl/chemical_reaction/instant/promethean_brain_revival/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/promethean_brain_revival/can_happen(var/datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, /obj/item/organ/internal/brain/slime))
return ..()
return FALSE
-/decl/chemical_reaction/instant/promethean_brain_revival/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/promethean_brain_revival/on_reaction(var/datum/reagents/holder)
var/obj/item/organ/internal/brain/slime/brain = holder.my_atom
if(brain.reviveBody())
brain.visible_message(span_notice("[brain] bubbles, surrounding itself with a rapidly expanding mass of slime!"))
diff --git a/code/modules/overmap/events/event_handler.dm b/code/modules/overmap/events/event_handler.dm
index 21bf7e6784..08d6c7c216 100644
--- a/code/modules/overmap/events/event_handler.dm
+++ b/code/modules/overmap/events/event_handler.dm
@@ -1,11 +1,11 @@
-GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
+GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
-/decl/overmap_event_handler
+/datum/decl/overmap_event_handler
var/list/hazard_by_turf = list()
var/list/ship_events = list()
// Populates overmap with random events! Should be called once at startup at some point.
-/decl/overmap_event_handler/proc/create_events(var/z_level, var/overmap_size, var/number_of_events)
+/datum/decl/overmap_event_handler/proc/create_events(var/z_level, var/overmap_size, var/number_of_events)
// Acquire the list of not-yet utilized overmap turfs on this Z-level
var/list/overmap_turfs = block(locate(OVERMAP_EDGE, OVERMAP_EDGE, z_level), locate(overmap_size - OVERMAP_EDGE, overmap_size - OVERMAP_EDGE, z_level))
var/list/candidate_turfs = list()
@@ -29,7 +29,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
qdel(datum_spawn)//idk help how do I do this better?
-/decl/overmap_event_handler/proc/acquire_event_turfs(var/number_of_turfs, var/distance_from_origin, var/list/candidate_turfs, var/continuous = TRUE)
+/datum/decl/overmap_event_handler/proc/acquire_event_turfs(var/number_of_turfs, var/distance_from_origin, var/list/candidate_turfs, var/continuous = TRUE)
number_of_turfs = min(number_of_turfs, candidate_turfs.len)
candidate_turfs = candidate_turfs.Copy() // Not this proc's responsibility to adjust the given lists
@@ -52,7 +52,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
return selected_turfs
-/decl/overmap_event_handler/proc/get_random_neighbour(var/turf/origin_turf, var/list/candidate_turfs, var/continuous = TRUE, var/range)
+/datum/decl/overmap_event_handler/proc/get_random_neighbour(var/turf/origin_turf, var/list/candidate_turfs, var/continuous = TRUE, var/range)
var/fitting_turfs
if(continuous)
fitting_turfs = origin_turf.CardinalTurfs(FALSE)
@@ -63,7 +63,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
if(T in candidate_turfs)
return T
-/decl/overmap_event_handler/proc/start_hazard(var/obj/effect/overmap/visitable/ship/ship, var/obj/effect/overmap/event/hazard)//make these accept both hazards or events
+/datum/decl/overmap_event_handler/proc/start_hazard(var/obj/effect/overmap/visitable/ship/ship, var/obj/effect/overmap/event/hazard)//make these accept both hazards or events
if(!(ship in ship_events))
ship_events += ship
@@ -79,20 +79,20 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
E.victim = ship
LAZYADD(ship_events[ship], E)
-/decl/overmap_event_handler/proc/stop_hazard(var/obj/effect/overmap/visitable/ship/ship, var/obj/effect/overmap/event/hazard)
+/datum/decl/overmap_event_handler/proc/stop_hazard(var/obj/effect/overmap/visitable/ship/ship, var/obj/effect/overmap/event/hazard)
for(var/event_type in hazard.events)
var/datum/event/E = is_event_active(ship, event_type, hazard.difficulty)
if(E)
E.kill()
LAZYREMOVE(ship_events[ship], E)
-/decl/overmap_event_handler/proc/is_event_active(var/ship, var/event_type, var/severity)
+/datum/decl/overmap_event_handler/proc/is_event_active(var/ship, var/event_type, var/severity)
if(!ship_events[ship]) return
for(var/datum/event/E in ship_events[ship])
if(E.type == event_type && E.severity == severity)
return E
-/decl/overmap_event_handler/proc/on_turf_entered(var/turf/new_loc, var/obj/effect/overmap/visitable/ship/ship, var/old_loc)
+/datum/decl/overmap_event_handler/proc/on_turf_entered(var/turf/new_loc, var/obj/effect/overmap/visitable/ship/ship, var/old_loc)
if(!istype(ship))
return
if(new_loc == old_loc)
@@ -101,7 +101,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
for(var/obj/effect/overmap/event/E in hazard_by_turf[new_loc])
start_hazard(ship, E)
-/decl/overmap_event_handler/proc/on_turf_exited(var/turf/old_loc, var/obj/effect/overmap/visitable/ship/ship, var/new_loc)
+/datum/decl/overmap_event_handler/proc/on_turf_exited(var/turf/old_loc, var/obj/effect/overmap/visitable/ship/ship, var/new_loc)
if(!istype(ship))
return
if(new_loc == old_loc)
@@ -112,7 +112,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
continue // If new turf has the same event as well... keep it going!
stop_hazard(ship, E)
-/decl/overmap_event_handler/proc/update_hazards(var/turf/T)//catch all updater
+/datum/decl/overmap_event_handler/proc/update_hazards(var/turf/T)//catch all updater
if(!istype(T))
return
@@ -138,12 +138,12 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
for(var/obj/effect/overmap/event/E in active_hazards)
start_hazard(ship, E)
-/decl/overmap_event_handler/proc/is_event_in_turf(var/datum/event/E, var/turf/T)
+/datum/decl/overmap_event_handler/proc/is_event_in_turf(var/datum/event/E, var/turf/T)
for(var/obj/effect/overmap/event/hazard in hazard_by_turf[T])
if((E in hazard.events) && E.severity == hazard.difficulty)
return TRUE
-/decl/overmap_event_handler/proc/is_event_included(var/list/hazards, var/obj/effect/overmap/event/E, var/equal_or_better)//this proc is only used so it can break out of 2 loops cleanly
+/datum/decl/overmap_event_handler/proc/is_event_included(var/list/hazards, var/obj/effect/overmap/event/E, var/equal_or_better)//this proc is only used so it can break out of 2 loops cleanly
for(var/obj/effect/overmap/event/A in hazards)
if(istype(A, E.type) || istype(E, A.type))
if(same_entries(A.events, E.events))
diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm
index 10970b5916..8804b70001 100644
--- a/code/modules/overmap/ships/engines/gas_thruster.dm
+++ b/code/modules/overmap/ships/engines/gas_thruster.dm
@@ -62,7 +62,7 @@
can_atmos_pass = ATMOS_PASS_NO
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL
- // construct_state = /decl/machine_construction/default/panel_closed
+ // construct_state = /datum/decl/machine_construction/default/panel_closed
// maximum_component_parts = list(/obj/item/stock_parts = 6)//don't want too many, let upgraded component shine
// uncreated_component_parts = list(/obj/item/stock_parts/power/apc/buildable = 1)
@@ -214,5 +214,5 @@
// Not Implemented - Variant that pulls power from cables. Too complicated without bay's power components.
// /obj/machinery/atmospherics/unary/engine/terminal
// base_type = /obj/machinery/atmospherics/unary/engine
-// stock_part_presets = list(/decl/stock_part_preset/terminal_setup)
+// stock_part_presets = list(/datum/decl/stock_part_preset/terminal_setup)
// uncreated_component_parts = list(/obj/item/stock_parts/power/terminal/buildable = 1)
diff --git a/code/modules/overmap/ships/engines/ion_thruster.dm b/code/modules/overmap/ships/engines/ion_thruster.dm
index d569e183a0..12b3aec548 100644
--- a/code/modules/overmap/ships/engines/ion_thruster.dm
+++ b/code/modules/overmap/ships/engines/ion_thruster.dm
@@ -42,7 +42,7 @@
power_channel = ENVIRON
idle_power_usage = 100
anchored = TRUE
- // construct_state = /decl/machine_construction/default/panel_closed
+ // construct_state = /datum/decl/machine_construction/default/panel_closed
var/datum/ship_engine/ion/controller
var/thrust_limit = 1
var/on = 1
diff --git a/code/modules/power/cells/esoteric_cells.dm b/code/modules/power/cells/esoteric_cells.dm
index adaa7b4f9b..99754d0ab2 100644
--- a/code/modules/power/cells/esoteric_cells.dm
+++ b/code/modules/power/cells/esoteric_cells.dm
@@ -36,7 +36,7 @@
if(istype(T, /turf/simulated/floor))
var/turf/simulated/floor/F = T
- if(istype(F.flooring, /decl/flooring/reinforced))
+ if(istype(F.flooring, /datum/decl/flooring/reinforced))
conductive = TRUE
if(conductive)
diff --git a/code/modules/power/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm
index 1311b86a08..64a9f5c2cc 100644
--- a/code/modules/power/fusion/core/core_field.dm
+++ b/code/modules/power/fusion/core/core_field.dm
@@ -431,7 +431,7 @@
for(var/cur_s_react in possible_s_reacts)
if(possible_s_reacts[cur_s_react] < 1)
continue
- var/decl/fusion_reaction/cur_reaction = get_fusion_reaction(cur_p_react, cur_s_react)
+ var/datum/decl/fusion_reaction/cur_reaction = get_fusion_reaction(cur_p_react, cur_s_react)
if(cur_reaction && plasma_temperature >= cur_reaction.minimum_energy_level)
possible_reactions.Add(cur_reaction)
@@ -441,7 +441,7 @@
//split up the reacting atoms between the possible reactions
while(possible_reactions.len)
- var/decl/fusion_reaction/cur_reaction = pick(possible_reactions)
+ var/datum/decl/fusion_reaction/cur_reaction = pick(possible_reactions)
possible_reactions.Remove(cur_reaction)
//set the randmax to be the lower of the two involved reactants
diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm
index bb5f3eac3d..fd8a257a6a 100644
--- a/code/modules/power/fusion/fusion_reactions.dm
+++ b/code/modules/power/fusion/fusion_reactions.dm
@@ -1,6 +1,6 @@
GLOBAL_LIST(fusion_reactions)
-/decl/fusion_reaction
+/datum/decl/fusion_reaction
var/p_react = "" // Primary reactant.
var/s_react = "" // Secondary reactant.
var/minimum_energy_level = 1
@@ -11,14 +11,14 @@ GLOBAL_LIST(fusion_reactions)
var/list/products = list()
var/minimum_reaction_temperature = 100
-/decl/fusion_reaction/proc/handle_reaction_special(var/obj/effect/fusion_em_field/holder)
+/datum/decl/fusion_reaction/proc/handle_reaction_special(var/obj/effect/fusion_em_field/holder)
return 0
/proc/get_fusion_reaction(var/p_react, var/s_react, var/m_energy)
if(!GLOB.fusion_reactions)
GLOB.fusion_reactions = list()
- for(var/rtype in subtypesof(/decl/fusion_reaction))
- var/decl/fusion_reaction/cur_reaction = new rtype()
+ for(var/rtype in subtypesof(/datum/decl/fusion_reaction))
+ var/datum/decl/fusion_reaction/cur_reaction = new rtype()
if(!GLOB.fusion_reactions[cur_reaction.p_react])
GLOB.fusion_reactions[cur_reaction.p_react] = list()
GLOB.fusion_reactions[cur_reaction.p_react][cur_reaction.s_react] = cur_reaction
@@ -43,20 +43,20 @@ GLOBAL_LIST(fusion_reactions)
// boron-11
// Basic power production reactions.
-/decl/fusion_reaction/deuterium_deuterium
+/datum/decl/fusion_reaction/deuterium_deuterium
p_react = REAGENT_ID_DEUTERIUM
s_react = REAGENT_ID_DEUTERIUM
energy_consumption = 1
energy_production = 2
// Advanced production reactions (todo)
-/decl/fusion_reaction/deuterium_helium
+/datum/decl/fusion_reaction/deuterium_helium
p_react = REAGENT_ID_DEUTERIUM
s_react = REAGENT_ID_HELIUM3
energy_consumption = 1
energy_production = 5
-/decl/fusion_reaction/deuterium_tritium
+/datum/decl/fusion_reaction/deuterium_tritium
p_react = REAGENT_ID_DEUTERIUM
s_react = REAGENT_ID_SLIMEJELLY
energy_consumption = 1
@@ -64,7 +64,7 @@ GLOBAL_LIST(fusion_reactions)
products = list(REAGENT_ID_HELIUM3 = 1)
instability = 0.5
-/decl/fusion_reaction/deuterium_lithium
+/datum/decl/fusion_reaction/deuterium_lithium
p_react = REAGENT_ID_DEUTERIUM
s_react = REAGENT_ID_LITHIUM
energy_consumption = 2
@@ -74,7 +74,7 @@ GLOBAL_LIST(fusion_reactions)
instability = 1
// Unideal/material production reactions
-/decl/fusion_reaction/oxygen_oxygen
+/datum/decl/fusion_reaction/oxygen_oxygen
p_react = REAGENT_ID_OXYGEN
s_react = REAGENT_ID_OXYGEN
energy_consumption = 10
@@ -83,7 +83,7 @@ GLOBAL_LIST(fusion_reactions)
radiation = 5
products = list(REAGENT_ID_SILICON= 1)
-/decl/fusion_reaction/iron_iron
+/datum/decl/fusion_reaction/iron_iron
p_react = REAGENT_ID_IRON
s_react = REAGENT_ID_IRON
products = list(REAGENT_ID_SILVER = 1, REAGENT_ID_GOLD = 1, REAGENT_ID_PLATINUM = 1) // Not realistic but w/e
@@ -92,7 +92,7 @@ GLOBAL_LIST(fusion_reactions)
instability = 2
minimum_reaction_temperature = 10000
-/decl/fusion_reaction/phoron_hydrogen
+/datum/decl/fusion_reaction/phoron_hydrogen
p_react = REAGENT_ID_HYDROGEN
s_react = REAGENT_ID_PHORON
energy_consumption = 10
@@ -102,7 +102,7 @@ GLOBAL_LIST(fusion_reactions)
minimum_reaction_temperature = 8000
// VERY UNIDEAL REACTIONS.
-/decl/fusion_reaction/phoron_supermatter
+/datum/decl/fusion_reaction/phoron_supermatter
p_react = REAGENT_ID_SUPERMATTER
s_react = REAGENT_ID_PHORON
energy_consumption = 0
@@ -110,7 +110,7 @@ GLOBAL_LIST(fusion_reactions)
radiation = 20
instability = 20
-/decl/fusion_reaction/phoron_supermatter/handle_reaction_special(var/obj/effect/fusion_em_field/holder)
+/datum/decl/fusion_reaction/phoron_supermatter/handle_reaction_special(var/obj/effect/fusion_em_field/holder)
wormhole_event()
@@ -142,7 +142,7 @@ GLOBAL_LIST(fusion_reactions)
return 1
// High end reactions.
-/decl/fusion_reaction/boron_hydrogen
+/datum/decl/fusion_reaction/boron_hydrogen
p_react = REAGENT_ID_BORON11
s_react = REAGENT_ID_HYDROGEN
minimum_energy_level = FUSION_HEAT_CAP * 0.5
@@ -151,7 +151,7 @@ GLOBAL_LIST(fusion_reactions)
radiation = 3
instability = 3
-/decl/fusion_reaction/hydrogen_hydrogen
+/datum/decl/fusion_reaction/hydrogen_hydrogen
p_react = REAGENT_ID_HYDROGEN
s_react = REAGENT_ID_HYDROGEN
minimum_energy_level = FUSION_HEAT_CAP * 0.75
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index f35a14936a..9cd57fe807 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -54,7 +54,7 @@
cell_type = /obj/item/cell/device/weapon/recharge
battery_lock = 1
- var/decl/plantgene/gene = null
+ var/datum/decl/plantgene/gene = null
recoil_mode = 0
var/obj/item/stock_parts/micro_laser/emitter
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 03c0fd2665..6c1516cdcb 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -735,7 +735,7 @@
var/impacted_organ = parse_zone(def_zone)
if(isanimal(target_mob))
var/mob/living/simple_mob/SM = target_mob
- var/decl/mob_organ_names/organ_plan = SM.organ_names
+ var/datum/decl/mob_organ_names/organ_plan = SM.organ_names
impacted_organ = pick(organ_plan.hit_zones)
//hit messages
diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm
index a0103b9883..a1e6c1dd29 100644
--- a/code/modules/projectiles/projectile/change.dm
+++ b/code/modules/projectiles/projectile/change.dm
@@ -81,7 +81,7 @@
H.universal_speak = 1
if(new_mob)
- for (var/spell/S in M.spell_list)
+ for (var/datum/spell/S in M.spell_list)
new_mob.add_spell(new S.type)
new_mob.a_intent = "hurt"
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 743a02e0dd..f8bc50ffd8 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -191,7 +191,7 @@
damage_type = TOX
nodamage = 1
check_armour = "energy"
- var/decl/plantgene/gene = null
+ var/datum/decl/plantgene/gene = null
hud_state = "electrothermal"
/obj/item/projectile/energy/florayield
diff --git a/code/modules/reagents/Chemistry-Logging.dm b/code/modules/reagents/Chemistry-Logging.dm
index 899a58a1f8..121d518d27 100644
--- a/code/modules/reagents/Chemistry-Logging.dm
+++ b/code/modules/reagents/Chemistry-Logging.dm
@@ -1,7 +1,7 @@
GLOBAL_LIST_EMPTY(chemical_reaction_logs)
-/proc/log_chemical_reaction(atom/A, decl/chemical_reaction/R, multiplier)
+/proc/log_chemical_reaction(atom/A, datum/decl/chemical_reaction/R, multiplier)
if(!A || !R)
return
diff --git a/code/modules/reagents/holder/distilling.dm b/code/modules/reagents/holder/distilling.dm
index 4bb44134e8..26b9993d8a 100644
--- a/code/modules/reagents/holder/distilling.dm
+++ b/code/modules/reagents/holder/distilling.dm
@@ -12,13 +12,13 @@
if(SSchemistry.distilled_reactions_by_reagent[R.id])
eligible_reactions |= SSchemistry.distilled_reactions_by_reagent[R.id]
- for(var/decl/chemical_reaction/C as anything in eligible_reactions)
+ for(var/datum/decl/chemical_reaction/C as anything in eligible_reactions)
if(C.can_happen(src) && C.process(src))
effect_reactions |= C
reaction_occurred = TRUE
eligible_reactions.len = 0
while(reaction_occurred)
- for(var/decl/chemical_reaction/C as anything in effect_reactions)
+ for(var/datum/decl/chemical_reaction/C as anything in effect_reactions)
C.post_reaction(src)
update_total()
return TRUE
diff --git a/code/modules/reagents/holder/holder.dm b/code/modules/reagents/holder/holder.dm
index d1fac89c07..27e8afb054 100644
--- a/code/modules/reagents/holder/holder.dm
+++ b/code/modules/reagents/holder/holder.dm
@@ -93,13 +93,13 @@
if(!from_belly)
from_belly = R.from_belly
- for(var/decl/chemical_reaction/C as anything in eligible_reactions)
+ for(var/datum/decl/chemical_reaction/C as anything in eligible_reactions)
if(C.can_happen(src) && C.process(src, from_belly))
effect_reactions |= C
reaction_occurred = TRUE
eligible_reactions.len = 0
while(reaction_occurred)
- for(var/decl/chemical_reaction/C as anything in effect_reactions)
+ for(var/datum/decl/chemical_reaction/C as anything in effect_reactions)
C.post_reaction(src)
update_total()
SEND_SIGNAL(src, COMSIG_REAGENTS_HOLDER_REACTED, effect_reactions)
diff --git a/code/modules/reagents/reactions/_reactions.dm b/code/modules/reagents/reactions/_reactions.dm
index 54b6b0b42d..c2a196fec6 100644
--- a/code/modules/reagents/reactions/_reactions.dm
+++ b/code/modules/reagents/reactions/_reactions.dm
@@ -10,7 +10,7 @@
//HALF_LIFE(3) -> Half of the reagents are consumed after 3 chemistry ticks.
#define HALF_LIFE(ticks) (ticks? 1.0 - (0.5)**(1.0/(ticks*PROCESS_REACTION_ITER)) : 1.0)
-/decl/chemical_reaction
+/datum/decl/chemical_reaction
var/name = null
var/id = null
var/result = null
@@ -36,7 +36,7 @@
var/log_is_important = 0 // If this reaction should be considered important for logging. Important recipes message admins when mixed, non-important ones just log to file.
var/wiki_flag = 0
-/decl/chemical_reaction/proc/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/proc/can_happen(var/datum/reagents/holder)
//check that all the required reagents are present
if(!holder.has_all_reagents(required_reagents))
return FALSE
@@ -51,7 +51,7 @@
return TRUE
-/decl/chemical_reaction/proc/calc_reaction_progress(var/datum/reagents/holder, var/reaction_limit)
+/datum/decl/chemical_reaction/proc/calc_reaction_progress(var/datum/reagents/holder, var/reaction_limit)
var/progress = reaction_limit * reaction_rate //simple exponential progression
//calculate yield
@@ -79,7 +79,7 @@
return progress
-/decl/chemical_reaction/process(var/datum/reagents/holder, var/belly_reagent)
+/datum/decl/chemical_reaction/process(var/datum/reagents/holder, var/belly_reagent)
//determine how far the reaction can proceed
var/list/reaction_limits = list()
for(var/reactant in required_reagents)
@@ -112,11 +112,11 @@
return reaction_progress
//called when a reaction processes
-/decl/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume)
return
//called after processing reactions, if they occurred
-/decl/chemical_reaction/proc/post_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/proc/post_reaction(var/datum/reagents/holder)
var/atom/container = holder.my_atom
if(mix_message && container && !ismob(container))
var/turf/T = get_turf(container)
@@ -128,5 +128,5 @@
//obtains any special data that will be provided to the reaction products
//this is called just before reactants are removed.
-/decl/chemical_reaction/proc/send_data(var/datum/reagents/holder, var/reaction_limit)
+/datum/decl/chemical_reaction/proc/send_data(var/datum/reagents/holder, var/reaction_limit)
return null
diff --git a/code/modules/reagents/reactions/distilling/crystalizing.dm b/code/modules/reagents/reactions/distilling/crystalizing.dm
index 0efd0a4c25..3373091de8 100644
--- a/code/modules/reagents/reactions/distilling/crystalizing.dm
+++ b/code/modules/reagents/reactions/distilling/crystalizing.dm
@@ -1,5 +1,5 @@
// Crystalizing (temps under 0)
-/decl/chemical_reaction/distilling/sugar
+/datum/decl/chemical_reaction/distilling/sugar
name = "Crystalizing Sugar"
id = "distill_sugar"
result = REAGENT_ID_SUGAR
@@ -13,7 +13,7 @@
require_xgm_gas = GAS_PHORON
rejects_xgm_gas = GAS_O2
-/decl/chemical_reaction/distilling/fuel_phoron
+/datum/decl/chemical_reaction/distilling/fuel_phoron
name = "Crystalizing Phoron"
id = "distill_phoron_fuel"
result = REAGENT_ID_PHORON
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index a10e4a8fd5..196bcfdacb 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -1,4 +1,4 @@
-/decl/chemical_reaction/distilling
+/datum/decl/chemical_reaction/distilling
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
// id = null
// result = null
@@ -32,7 +32,7 @@
var/minimum_xgm_pressure = null
var/consumes_xgm_gas = 0 // Mols of gas consumed during reaction
-/decl/chemical_reaction/distilling/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/distilling/can_happen(var/datum/reagents/holder)
if(!istype(holder, /datum/reagents/distilling))
return FALSE
@@ -68,7 +68,7 @@
return ..()
-/decl/chemical_reaction/distilling/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/distilling/on_reaction(var/datum/reagents/holder, var/created_volume)
// Handle gas consumption
var/datum/gas_mixture/GM = holder.my_atom.return_air()
if(consumes_xgm_gas != 0 && GM)
@@ -91,7 +91,7 @@
// Subtypes //
// Biomass
-/decl/chemical_reaction/distilling/biomass
+/datum/decl/chemical_reaction/distilling/biomass
name = "Distilling Biomass"
id = "distill_biomass"
result = REAGENT_ID_BIOMASS
@@ -102,7 +102,7 @@
temp_shift = -2
// Medicinal
-/decl/chemical_reaction/distilling/inaprovalaze
+/datum/decl/chemical_reaction/distilling/inaprovalaze
name = "Distilling Inaprovalaze"
id = "distill_inaprovalaze"
result = REAGENT_ID_INAPROVALAZE
@@ -113,7 +113,7 @@
temp_range = list(T0C + 100, T0C + 120)
-/decl/chemical_reaction/distilling/bicaridaze
+/datum/decl/chemical_reaction/distilling/bicaridaze
name = "Distilling Bicaridaze"
id = "distill_bicaridaze"
result = REAGENT_ID_BICARIDAZE
@@ -124,7 +124,7 @@
temp_range = list(T0C + 110, T0C + 130)
-/decl/chemical_reaction/distilling/dermalaze
+/datum/decl/chemical_reaction/distilling/dermalaze
name = "Distilling Dermalaze"
id = "distill_dermalaze"
result = REAGENT_ID_DERMALAZE
@@ -135,7 +135,7 @@
temp_range = list(T0C + 115, T0C + 130)
-/decl/chemical_reaction/distilling/spacomycaze
+/datum/decl/chemical_reaction/distilling/spacomycaze
name = "Distilling Spacomycaze"
id = "distill_spacomycaze"
result = REAGENT_ID_SPACOMYCAZE
@@ -146,7 +146,7 @@
temp_range = list(T0C + 100, T0C + 120)
-/decl/chemical_reaction/distilling/tricorlidaze
+/datum/decl/chemical_reaction/distilling/tricorlidaze
name = "Distilling Tricorlidaze"
id = "distill_tricorlidaze"
result = REAGENT_ID_TRICORLIDAZE
@@ -157,7 +157,7 @@
temp_range = list(T0C + 100, T0C + 120)
-/decl/chemical_reaction/distilling/synthplas
+/datum/decl/chemical_reaction/distilling/synthplas
name = "Distilling Synthplas"
id = "distill_synthplas"
result = REAGENT_ID_SYNTHBLOOD_DILUTE
@@ -169,7 +169,7 @@
temp_range = list(T0C + 110, T0C + 130)
// Alcohol
-/decl/chemical_reaction/distilling/beer
+/datum/decl/chemical_reaction/distilling/beer
name = "Distilling Beer"
id = "distill_beer"
result = REAGENT_ID_BEER
@@ -180,7 +180,7 @@
temp_range = list(T20C, T20C + 2)
-/decl/chemical_reaction/distilling/ale
+/datum/decl/chemical_reaction/distilling/ale
name = "Distilling Ale"
id = "distill_ale"
result = REAGENT_ID_ALE
@@ -193,7 +193,7 @@
temp_shift = 0.5
temp_range = list(T0C + 7, T0C + 13)
-/decl/chemical_reaction/distilling/ethanol
+/datum/decl/chemical_reaction/distilling/ethanol
name = "Distilling Ethanol"
id = "distill_ethanol"
result = REAGENT_ID_ETHANOL
@@ -205,7 +205,7 @@
temp_range = list(T20C+30, T20C + 40)
// Unique
-/decl/chemical_reaction/distilling/berserkjuice
+/datum/decl/chemical_reaction/distilling/berserkjuice
name = "Distilling Brute Juice"
id = "distill_brutejuice"
result = REAGENT_ID_BERSERKMED
@@ -215,7 +215,7 @@
temp_range = list(T0C + 600, T0C + 700)
temp_shift = 4
-/decl/chemical_reaction/distilling/berserkjuice/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/distilling/berserkjuice/on_reaction(var/datum/reagents/holder, var/created_volume)
..()
if(prob(1))
@@ -223,7 +223,7 @@
explosion(T, -1, rand(-1, 1), rand(1,2), rand(3,5))
return
-/decl/chemical_reaction/distilling/cryogel
+/datum/decl/chemical_reaction/distilling/cryogel
name = "Distilling Cryogellatin"
id = "distill_cryoslurry"
result = REAGENT_ID_CRYOSLURRY
@@ -234,7 +234,7 @@
temp_range = list(T0C + 10, T20C + 15) //CHOMPedit: I know this doesn't make sense, and this is a baindaid fix but distiller code refuses to go this low, even with correct variables
temp_shift = 20
-/decl/chemical_reaction/distilling/cryogel/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/distilling/cryogel/on_reaction(var/datum/reagents/holder, var/created_volume)
..()
if(prob(1))
@@ -244,7 +244,7 @@
F.start()
return
-/decl/chemical_reaction/distilling/lichpowder
+/datum/decl/chemical_reaction/distilling/lichpowder
name = "Distilling Lichpowder"
id = "distill_lichpowder"
result = REAGENT_ID_LICHPOWDER
@@ -255,7 +255,7 @@
temp_range = list(T0C + 100, T0C + 150)
-/decl/chemical_reaction/distilling/necroxadone
+/datum/decl/chemical_reaction/distilling/necroxadone
name = "Distilling Necroxadone"
id = "distill_necroxadone"
result = REAGENT_ID_NECROXADONE
@@ -268,7 +268,7 @@
temp_range = list(T0C + 90, T0C + 95)
-/decl/chemical_reaction/distilling/hydrogen
+/datum/decl/chemical_reaction/distilling/hydrogen
name = "Distilling Hydrogen"
id = "distill_hydrogen"
result = REAGENT_ID_HYDROGEN
@@ -283,7 +283,7 @@
require_xgm_gas = GAS_N2
rejects_xgm_gas = GAS_O2
-/decl/chemical_reaction/distilling/oxygen
+/datum/decl/chemical_reaction/distilling/oxygen
name = "Distilling Oxygen"
id = "distill_oxygen"
result = REAGENT_ID_OXYGEN
@@ -298,7 +298,7 @@
require_xgm_gas = GAS_PHORON
rejects_xgm_gas = GAS_O2
-/decl/chemical_reaction/distilling/mineralized_sodium
+/datum/decl/chemical_reaction/distilling/mineralized_sodium
name = "Distilling Sodium"
id = "distill_sodium"
result = REAGENT_ID_SODIUM
@@ -311,7 +311,7 @@
require_xgm_gas = GAS_PHORON
rejects_xgm_gas = GAS_O2
-/decl/chemical_reaction/distilling/mineralized_carbon
+/datum/decl/chemical_reaction/distilling/mineralized_carbon
name = "Distilling Carbon"
id = "distill_carbon"
result = REAGENT_ID_CARBON
@@ -324,7 +324,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/reduce_salt
+/datum/decl/chemical_reaction/distilling/reduce_salt
name = "Distilling Sodium"
id = "distill_reduce_tablesalt"
result = REAGENT_ID_SODIUM
diff --git a/code/modules/reagents/reactions/distilling/gas_condensing.dm b/code/modules/reagents/reactions/distilling/gas_condensing.dm
index 70564aef02..dd0c9c7971 100644
--- a/code/modules/reagents/reactions/distilling/gas_condensing.dm
+++ b/code/modules/reagents/reactions/distilling/gas_condensing.dm
@@ -5,7 +5,7 @@
#define CONDENSING_HEAT 2
#define COOLANT_CONSUMPTION_RATE 0.01
-/decl/chemical_reaction/distilling/condense_oxygen
+/datum/decl/chemical_reaction/distilling/condense_oxygen
name = "Condensing Oxygen"
id = "condense_oxygen"
result = REAGENT_ID_OXYGEN
@@ -20,7 +20,7 @@
rejects_xgm_gas = GAS_PHORON
consumes_xgm_gas = CONDENSING_RATE
-/decl/chemical_reaction/distilling/condense_nitrogen
+/datum/decl/chemical_reaction/distilling/condense_nitrogen
name = "Condensing Nitrogen"
id = "condense_nitrogen"
result = REAGENT_ID_NITROGEN
@@ -35,7 +35,7 @@
rejects_xgm_gas = GAS_PHORON
consumes_xgm_gas = CONDENSING_RATE
-/decl/chemical_reaction/distilling/condense_nitrox
+/datum/decl/chemical_reaction/distilling/condense_nitrox
name = "Condensing Nitrous Oxide"
id = "condense_nitro"
result = REAGENT_ID_NITROGEN // Figure out something better
@@ -50,7 +50,7 @@
rejects_xgm_gas = GAS_PHORON
consumes_xgm_gas = CONDENSING_RATE
-/decl/chemical_reaction/distilling/condense_carbon
+/datum/decl/chemical_reaction/distilling/condense_carbon
name = "Condensing Carbon Dioxide"
id = "condense_carbon"
result = REAGENT_ID_CARBON
@@ -65,7 +65,7 @@
rejects_xgm_gas = GAS_PHORON
consumes_xgm_gas = CONDENSING_RATE
-/decl/chemical_reaction/distilling/condense_phoron
+/datum/decl/chemical_reaction/distilling/condense_phoron
name = "Condensing Phoron"
id = "condense_phoron"
result = REAGENT_ID_PHORON
@@ -80,7 +80,7 @@
rejects_xgm_gas = GAS_O2
consumes_xgm_gas = CONDENSING_RATE
-/decl/chemical_reaction/distilling/condense_fuel
+/datum/decl/chemical_reaction/distilling/condense_fuel
name = "Condensing Volatiles"
id = "condense_fuel"
result = REAGENT_ID_FUEL
@@ -95,7 +95,7 @@
rejects_xgm_gas = GAS_O2
consumes_xgm_gas = CONDENSING_RATE
-/decl/chemical_reaction/distilling/condense_methane
+/datum/decl/chemical_reaction/distilling/condense_methane
name = "Condensing Methane"
id = "condense_methane"
result = REAGENT_ID_TOXIN
diff --git a/code/modules/reagents/reactions/distilling/heavy_industrial.dm b/code/modules/reagents/reactions/distilling/heavy_industrial.dm
index 0f477b3276..44d0a9e5f0 100644
--- a/code/modules/reagents/reactions/distilling/heavy_industrial.dm
+++ b/code/modules/reagents/reactions/distilling/heavy_industrial.dm
@@ -1,5 +1,5 @@
// Heavy chemicals
-/decl/chemical_reaction/distilling/titanium_refine
+/datum/decl/chemical_reaction/distilling/titanium_refine
name = REAGENT_TITANIUM
id = "distill_titanium"
result = REAGENT_ID_TITANIUM
@@ -12,7 +12,7 @@
require_xgm_gas = GAS_N2
rejects_xgm_gas = GAS_O2
-/decl/chemical_reaction/distilling/concentrate_radium
+/datum/decl/chemical_reaction/distilling/concentrate_radium
name = REAGENT_CONCENTRATEDRADIUM
id = "distill_conrad"
result = REAGENT_ID_CONCENTRATEDRADIUM
@@ -26,7 +26,7 @@
require_xgm_gas = GAS_PHORON
rejects_xgm_gas = GAS_N2
-/decl/chemical_reaction/distilling/cyanide
+/datum/decl/chemical_reaction/distilling/cyanide
name = REAGENT_CYANIDE
id = "distill_cyanide"
result = REAGENT_ID_CYANIDE
@@ -39,7 +39,7 @@
require_xgm_gas = GAS_N2
rejects_xgm_gas = GAS_O2
-/decl/chemical_reaction/distilling/sacid
+/datum/decl/chemical_reaction/distilling/sacid
name = REAGENT_SACID
id = "distill_sacid"
result = REAGENT_ID_SACID
@@ -52,7 +52,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_N2
-/decl/chemical_reaction/distilling/toxin
+/datum/decl/chemical_reaction/distilling/toxin
name = REAGENT_TOXIN
id = "distill_rawtoxin"
result = REAGENT_ID_TOXIN
@@ -67,7 +67,7 @@
// Marker ink for paint production
-/decl/chemical_reaction/distilling/marker_ink_black
+/datum/decl/chemical_reaction/distilling/marker_ink_black
name = REAGENT_MARKERINKBLACK
id = "distill_marker_black"
result = REAGENT_ID_MARKERINKBLACK
@@ -80,7 +80,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/marker_ink_red
+/datum/decl/chemical_reaction/distilling/marker_ink_red
name = REAGENT_MARKERINKRED
id = "distill_marker_red"
result = REAGENT_ID_MARKERINKRED
@@ -93,7 +93,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/marker_ink_yellow
+/datum/decl/chemical_reaction/distilling/marker_ink_yellow
name = REAGENT_MARKERINKYELLOW
id = "distill_marker_yellow"
result = REAGENT_ID_MARKERINKYELLOW
@@ -106,7 +106,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/marker_ink_green
+/datum/decl/chemical_reaction/distilling/marker_ink_green
name = REAGENT_MARKERINKGREEN
id = "distill_marker_green"
result = REAGENT_ID_MARKERINKGREEN
@@ -119,7 +119,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/marker_ink_blue
+/datum/decl/chemical_reaction/distilling/marker_ink_blue
name = REAGENT_MARKERINKBLUE
id = "distill_marker_blue"
result = REAGENT_ID_MARKERINKBLUE
@@ -132,7 +132,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/marker_ink_grey
+/datum/decl/chemical_reaction/distilling/marker_ink_grey
name = REAGENT_MARKERINKGREY
id = "distill_marker_grey"
result = REAGENT_ID_MARKERINKGREY
@@ -147,7 +147,7 @@
// Secondary distillation for markers
-/decl/chemical_reaction/distilling/marker_ink_orange
+/datum/decl/chemical_reaction/distilling/marker_ink_orange
name = REAGENT_MARKERINKORANGE
id = "distill_marker_orange"
result = REAGENT_ID_MARKERINKORANGE
@@ -160,7 +160,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/marker_ink_purple
+/datum/decl/chemical_reaction/distilling/marker_ink_purple
name = REAGENT_MARKERINKPURPLE
id = "distill_marker_purple"
result = REAGENT_ID_MARKERINKPURPLE
@@ -173,7 +173,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/marker_ink_brown
+/datum/decl/chemical_reaction/distilling/marker_ink_brown
name = REAGENT_MARKERINKBROWN
id = "distill_marker_brown"
result = REAGENT_ID_MARKERINKBROWN
diff --git a/code/modules/reagents/reactions/distilling/hot_drinks.dm b/code/modules/reagents/reactions/distilling/hot_drinks.dm
index c02f7d92b0..2283b5e0c7 100644
--- a/code/modules/reagents/reactions/distilling/hot_drinks.dm
+++ b/code/modules/reagents/reactions/distilling/hot_drinks.dm
@@ -1,101 +1,101 @@
// The curse of hot_water reagent lives on!
-/decl/chemical_reaction/distilling/drinks
+/datum/decl/chemical_reaction/distilling/drinks
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
temp_range = list(T0C + 100, T0C + 500) // These all imply a boiled drink anyway
wiki_flag = WIKI_DRINK
-/decl/chemical_reaction/distilling/drinks/coffee
+/datum/decl/chemical_reaction/distilling/drinks/coffee
name = REAGENT_COFFEE
id = REAGENT_ID_COFFEE
result = REAGENT_ID_COFFEE
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COFFEEPOWDER = 1)
result_amount = 5
-/decl/chemical_reaction/distilling/drinks/tea
+/datum/decl/chemical_reaction/distilling/drinks/tea
name = "Black tea"
id = REAGENT_ID_TEA
result = REAGENT_ID_TEA
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_TEAPOWDER = 1)
result_amount = 5
-/decl/chemical_reaction/distilling/drinks/decaftea
+/datum/decl/chemical_reaction/distilling/drinks/decaftea
name = REAGENT_TEADECAF
id = REAGENT_ID_TEADECAF
result = REAGENT_ID_TEADECAF
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_DECAFTEAPOWDER = 1)
result_amount = 5
-/decl/chemical_reaction/distilling/drinks/hot_coco
+/datum/decl/chemical_reaction/distilling/drinks/hot_coco
name = "Hot Coco"
id = REAGENT_ID_HOTCOCO
result = REAGENT_ID_HOTCOCO
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COCO = 1)
result_amount = 5
-/decl/chemical_reaction/distilling/drinks/minttea
+/datum/decl/chemical_reaction/distilling/drinks/minttea
name = REAGENT_MINTTEA
id = REAGENT_ID_MINTTEA
result = REAGENT_ID_MINTTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_MINT = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/minttea_decaf
+/datum/decl/chemical_reaction/distilling/drinks/minttea_decaf
name = REAGENT_MINTTEADECAF
id = REAGENT_ID_MINTTEADECAF
result = REAGENT_ID_MINTTEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_MINT = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/lemontea
+/datum/decl/chemical_reaction/distilling/drinks/lemontea
name = REAGENT_LEMONTEA
id = REAGENT_ID_LEMONTEA
result = REAGENT_ID_LEMONTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LEMONJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/lemontea_decaf
+/datum/decl/chemical_reaction/distilling/drinks/lemontea_decaf
name = REAGENT_LEMONTEADECAF
id = REAGENT_ID_LEMONTEADECAF
result = REAGENT_ID_LEMONTEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LEMONJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/limetea
+/datum/decl/chemical_reaction/distilling/drinks/limetea
name = REAGENT_LIMETEA
id = REAGENT_ID_LIMETEA
result = REAGENT_ID_LIMETEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/limetea_decaf
+/datum/decl/chemical_reaction/distilling/drinks/limetea_decaf
name = REAGENT_LIMETEADECAF
id = REAGENT_ID_LIMETEADECAF
result = REAGENT_ID_LIMETEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/orangetea
+/datum/decl/chemical_reaction/distilling/drinks/orangetea
name = REAGENT_ORANGETEA
id = REAGENT_ID_ORANGETEA
result = REAGENT_ID_ORANGETEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/orangetea_decaf
+/datum/decl/chemical_reaction/distilling/drinks/orangetea_decaf
name = "Decaf Orange Tea"
id = REAGENT_ID_ORANGETEADECAF
result = REAGENT_ID_ORANGETEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/berrytea
+/datum/decl/chemical_reaction/distilling/drinks/berrytea
name = REAGENT_BERRYTEA
id = REAGENT_ID_BERRYTEA
result = REAGENT_ID_BERRYTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_BERRYJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/berrytea_decaf
+/datum/decl/chemical_reaction/distilling/drinks/berrytea_decaf
name = REAGENT_BERRYTEADECAF
id = REAGENT_ID_BERRYTEADECAF
result = REAGENT_ID_BERRYTEADECAF
@@ -103,7 +103,7 @@
result_amount = 6
// Not drinks, but we may as well
-/decl/chemical_reaction/distilling/drinks/hot_ramen
+/datum/decl/chemical_reaction/distilling/drinks/hot_ramen
name = REAGENT_HOTRAMEN
id = REAGENT_ID_HOTRAMEN
result = REAGENT_ID_HOTRAMEN
diff --git a/code/modules/reagents/reactions/distilling/hydroponics.dm b/code/modules/reagents/reactions/distilling/hydroponics.dm
index 9f340eff3c..c9609d1090 100644
--- a/code/modules/reagents/reactions/distilling/hydroponics.dm
+++ b/code/modules/reagents/reactions/distilling/hydroponics.dm
@@ -1,5 +1,5 @@
// Hydroponics refinery fun
-/decl/chemical_reaction/distilling/fertilizer
+/datum/decl/chemical_reaction/distilling/fertilizer
name = REAGENT_FERTILIZER
id = "distill_fertilizer"
result = REAGENT_ID_FERTILIZER
@@ -12,7 +12,7 @@
require_xgm_gas = GAS_CO2
rejects_xgm_gas = GAS_N2
-/decl/chemical_reaction/distilling/eznutrient
+/datum/decl/chemical_reaction/distilling/eznutrient
name = REAGENT_EZNUTRIENT
id = "distill_eznutriment"
result = REAGENT_ID_EZNUTRIENT
@@ -25,7 +25,7 @@
require_xgm_gas = GAS_O2
rejects_xgm_gas = GAS_PHORON
-/decl/chemical_reaction/distilling/leftforzed
+/datum/decl/chemical_reaction/distilling/leftforzed
name = REAGENT_LEFT4ZED
id = "distill_leftforzed"
result = REAGENT_ID_LEFT4ZED
@@ -38,7 +38,7 @@
require_xgm_gas = GAS_PHORON
rejects_xgm_gas = GAS_N2
-/decl/chemical_reaction/distilling/robustharvest
+/datum/decl/chemical_reaction/distilling/robustharvest
name = REAGENT_ROBUSTHARVEST
id = "distill_robustharvest"
result = REAGENT_ID_ROBUSTHARVEST
diff --git a/code/modules/reagents/reactions/fusion/fusion.dm b/code/modules/reagents/reactions/fusion/fusion.dm
index 9daf69c703..13cf42b672 100644
--- a/code/modules/reagents/reactions/fusion/fusion.dm
+++ b/code/modules/reagents/reactions/fusion/fusion.dm
@@ -2,5 +2,5 @@
//They'll operate in a similar manner to distillery reactions,
// but will have distinct behaviours (mostly relating to the fusion field) that warrants a separate type
/*
-/decl/chemical_reaction/fusion
+/datum/decl/chemical_reaction/fusion
name = "Fusion"*/
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 2514b2debf..4ffee66fb5 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -1,161 +1,161 @@
-/decl/chemical_reaction/instant/drinks
+/datum/decl/chemical_reaction/instant/drinks
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
-/decl/chemical_reaction/instant/drinks/grapejuice
+/datum/decl/chemical_reaction/instant/drinks/grapejuice
name = REAGENT_GRAPEJUICE
id = REAGENT_ID_GRAPEJUICE
result = REAGENT_ID_GRAPEJUICE
required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTGRAPE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/orangejuice
+/datum/decl/chemical_reaction/instant/drinks/orangejuice
name = REAGENT_ORANGEJUICE
id = REAGENT_ID_ORANGEJUICE
result = REAGENT_ID_ORANGEJUICE
required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTORANGE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/watermelonjuice
+/datum/decl/chemical_reaction/instant/drinks/watermelonjuice
name = REAGENT_WATERMELONJUICE
id = REAGENT_ID_WATERMELONJUICE
result = REAGENT_ID_WATERMELONJUICE
required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTWATERMELON = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/applejuice
+/datum/decl/chemical_reaction/instant/drinks/applejuice
name = REAGENT_APPLEJUICE
id = REAGENT_ID_APPLEJUICE
result = REAGENT_ID_APPLEJUICE
required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTAPPLE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/goldschlager
+/datum/decl/chemical_reaction/instant/drinks/goldschlager
name = REAGENT_GOLDSCHLAGER
id = REAGENT_ID_GOLDSCHLAGER
result = REAGENT_ID_GOLDSCHLAGER
required_reagents = list(REAGENT_ID_VODKA = 10, REAGENT_ID_GOLD = 1)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/patron
+/datum/decl/chemical_reaction/instant/drinks/patron
name = REAGENT_PATRON
id = REAGENT_ID_PATRON
result = REAGENT_ID_PATRON
required_reagents = list(REAGENT_ID_TEQUILA = 10, REAGENT_ID_SILVER = 1)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/bilk
+/datum/decl/chemical_reaction/instant/drinks/bilk
name = REAGENT_BILK
id = REAGENT_ID_BILK
result = REAGENT_ID_BILK
required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_BEER = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/icetea
+/datum/decl/chemical_reaction/instant/drinks/icetea
name = REAGENT_ICETEA
id = REAGENT_ID_ICETEA
result = REAGENT_ID_ICETEA
required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_TEA = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/icecoffee
+/datum/decl/chemical_reaction/instant/drinks/icecoffee
name = REAGENT_ICECOFFEE
id = REAGENT_ID_ICECOFFEE
result = REAGENT_ID_ICECOFFEE
required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_COFFEE = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/icecoffee/alt
+/datum/decl/chemical_reaction/instant/drinks/icecoffee/alt
name = "Iced Drip Coffee"
id = REAGENT_ID_ICECOFFEE + "_drip"
result = REAGENT_ID_ICECOFFEE
required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_DRIPCOFFEE = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/blackeye
+/datum/decl/chemical_reaction/instant/drinks/blackeye
name = REAGENT_BLACKEYE
id = REAGENT_ID_BLACKEYE
result = REAGENT_ID_BLACKEYE
required_reagents = list(REAGENT_ID_DRIPCOFFEE = 1, REAGENT_ID_COFFEE = 1)
result_amount = 1
-/decl/chemical_reaction/instant/drinks/americano
+/datum/decl/chemical_reaction/instant/drinks/americano
name = REAGENT_AMERICANO
id = REAGENT_ID_AMERICANO
result = REAGENT_ID_AMERICANO
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_LONGBLACK = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/long_black
+/datum/decl/chemical_reaction/instant/drinks/long_black
name = REAGENT_LONGBLACK
id = REAGENT_ID_LONGBLACK
result = REAGENT_ID_LONGBLACK
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/macchiato
+/datum/decl/chemical_reaction/instant/drinks/macchiato
name = REAGENT_MACCHIATO
id = REAGENT_ID_MACCHIATO
result = REAGENT_ID_MACCHIATO
required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_COFFEE = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/cortado
+/datum/decl/chemical_reaction/instant/drinks/cortado
name = REAGENT_CORTADO
id = REAGENT_ID_CORTADO
result = REAGENT_ID_CORTADO
required_reagents = list(REAGENT_ID_MACCHIATO = 3, REAGENT_ID_MILKFOAM = 1) // 2 coffee, 1 milk, 1 milk foam
result_amount = 4
-/decl/chemical_reaction/instant/drinks/breve
+/datum/decl/chemical_reaction/instant/drinks/breve
name = REAGENT_BREVE
id = REAGENT_ID_BREVE
result = REAGENT_ID_BREVE
required_reagents = list(REAGENT_ID_CORTADO = 4, REAGENT_ID_CREAM = 1) // 2 coffee, 1 milk, 1 milk foam, 1 cream
result_amount = 5
-/decl/chemical_reaction/instant/drinks/cappuccino
+/datum/decl/chemical_reaction/instant/drinks/cappuccino
name = REAGENT_CAPPUCCINO
id = REAGENT_ID_CAPPUCCINO
result = REAGENT_ID_CAPPUCCINO
required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_MILKFOAM = 1, REAGENT_ID_CORTADO = 4) // 2 coffee, 2 milk, 2 milk foam
result_amount = 6
-/decl/chemical_reaction/instant/drinks/flat_white
+/datum/decl/chemical_reaction/instant/drinks/flat_white
name = REAGENT_FLATWHITE
id = REAGENT_ID_FLATWHITE
result = REAGENT_ID_FLATWHITE
required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_DRIPCOFFEE = 1) // 2 drip coffee, 4 milk I'M SORRY THAT ITS DRIP COFFEE, otherwise it just gets in the way of all other reactions
result_amount = 3
-/decl/chemical_reaction/instant/drinks/mocha
+/datum/decl/chemical_reaction/instant/drinks/mocha
name = REAGENT_MOCHA
id = REAGENT_ID_MOCHA + "_milk"
result = REAGENT_ID_MOCHA
required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_MILKFOAM = 1, REAGENT_ID_HOTCOCO = 2, REAGENT_ID_BREVE = 5) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
result_amount = 10
-/decl/chemical_reaction/instant/drinks/mocha/alt //incase they use cream before milk
+/datum/decl/chemical_reaction/instant/drinks/mocha/alt //incase they use cream before milk
name = REAGENT_MOCHA
id = REAGENT_ID_MOCHA + "_cream"
result = REAGENT_ID_MOCHA
required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_HOTCOCO = 2, REAGENT_ID_CAPPUCCINO = 6) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
result_amount = 10
-/decl/chemical_reaction/instant/drinks/vienna
+/datum/decl/chemical_reaction/instant/drinks/vienna
name = REAGENT_VIENNA
id = REAGENT_ID_VIENNA
result = REAGENT_ID_VIENNA
required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_COFFEE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/nuka_cola
+/datum/decl/chemical_reaction/instant/drinks/nuka_cola
name = "Nuclear Cola"
id = REAGENT_ID_NUKACOLA
result = REAGENT_ID_NUKACOLA
required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_COLA = 5)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/moonshine
+/datum/decl/chemical_reaction/instant/drinks/moonshine
name = REAGENT_MOONSHINE
id = REAGENT_ID_MOONSHINE
result = REAGENT_ID_MOONSHINE
@@ -163,7 +163,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/grenadine
+/datum/decl/chemical_reaction/instant/drinks/grenadine
name = REAGENT_GRENADINE
id = REAGENT_ID_GRENADINE
result = REAGENT_ID_GRENADINE
@@ -171,7 +171,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/wine
+/datum/decl/chemical_reaction/instant/drinks/wine
name = "Wine"
id = REAGENT_ID_REDWINE
result = REAGENT_ID_REDWINE
@@ -179,7 +179,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/pwine
+/datum/decl/chemical_reaction/instant/drinks/pwine
name = REAGENT_PWINE
id = REAGENT_ID_PWINE
result = REAGENT_ID_PWINE
@@ -187,7 +187,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/melonliquor
+/datum/decl/chemical_reaction/instant/drinks/melonliquor
name = REAGENT_MELONLIQUOR
id = REAGENT_ID_MELONLIQUOR
result = REAGENT_ID_MELONLIQUOR
@@ -195,7 +195,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/bluecuracao
+/datum/decl/chemical_reaction/instant/drinks/bluecuracao
name = REAGENT_BLUECURACAO
id = REAGENT_ID_BLUECURACAO
result = REAGENT_ID_BLUECURACAO
@@ -203,7 +203,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/spacebeer
+/datum/decl/chemical_reaction/instant/drinks/spacebeer
name = "Space Beer"
id = "spacebeer"
result = REAGENT_ID_BEER
@@ -211,7 +211,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/vodka
+/datum/decl/chemical_reaction/instant/drinks/vodka
name = REAGENT_VODKA
id = REAGENT_ID_VODKA
result = REAGENT_ID_VODKA
@@ -219,7 +219,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/cider
+/datum/decl/chemical_reaction/instant/drinks/cider
name = REAGENT_CIDER
id = REAGENT_ID_CIDER
result = REAGENT_ID_CIDER
@@ -228,7 +228,7 @@
result_amount = 10
-/decl/chemical_reaction/instant/drinks/sake
+/datum/decl/chemical_reaction/instant/drinks/sake
name = REAGENT_SAKE
id = REAGENT_ID_SAKE
result = REAGENT_ID_SAKE
@@ -236,7 +236,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/kahlua
+/datum/decl/chemical_reaction/instant/drinks/kahlua
name = REAGENT_KAHLUA
id = REAGENT_ID_KAHLUA
result = REAGENT_ID_KAHLUA
@@ -244,28 +244,28 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/gin_tonic
+/datum/decl/chemical_reaction/instant/drinks/gin_tonic
name = REAGENT_GINTONIC
id = REAGENT_ID_GINTONIC
result = REAGENT_ID_GINTONIC
required_reagents = list(REAGENT_ID_GIN = 2, REAGENT_ID_TONIC = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/rum_and_cola
+/datum/decl/chemical_reaction/instant/drinks/rum_and_cola
name = REAGENT_RUMANDCOLA
id = REAGENT_ID_RUMANDCOLA
result = REAGENT_ID_RUMANDCOLA
required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_COLA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/cuba_libre
+/datum/decl/chemical_reaction/instant/drinks/cuba_libre
name = REAGENT_CUBALIBRE
id = REAGENT_ID_CUBALIBRE
result = REAGENT_ID_CUBALIBRE
required_reagents = list(REAGENT_ID_RUMANDCOLA = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/martini
+/datum/decl/chemical_reaction/instant/drinks/martini
name = REAGENT_MARTINI
id = REAGENT_ID_MARTINI
result = REAGENT_ID_MARTINI
@@ -273,84 +273,84 @@
required_reagents = list(REAGENT_ID_GIN = 2, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/vodkamartini
+/datum/decl/chemical_reaction/instant/drinks/vodkamartini
name = REAGENT_VODKAMARTINI
id = REAGENT_ID_VODKAMARTINI
result = REAGENT_ID_VODKAMARTINI
required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/white_russian
+/datum/decl/chemical_reaction/instant/drinks/white_russian
name = REAGENT_WHITERUSSIAN
id = REAGENT_ID_WHITERUSSIAN
result = REAGENT_ID_WHITERUSSIAN
required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 2, REAGENT_ID_CREAM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/whiskey_cola
+/datum/decl/chemical_reaction/instant/drinks/whiskey_cola
name = REAGENT_WHISKEYCOLA
id = REAGENT_ID_WHISKEYCOLA
result = REAGENT_ID_WHISKEYCOLA
required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_COLA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/screwdriver
+/datum/decl/chemical_reaction/instant/drinks/screwdriver
name = REAGENT_SCREWDRIVERCOCKTAIL
id = REAGENT_ID_SCREWDRIVERCOCKTAIL
result = REAGENT_ID_SCREWDRIVERCOCKTAIL
required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/bloody_mary
+/datum/decl/chemical_reaction/instant/drinks/bloody_mary
name = REAGENT_BLOODYMARY
id = REAGENT_ID_BLOODYMARY
result = REAGENT_ID_BLOODYMARY
required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_TOMATOJUICE = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/gargle_blaster
+/datum/decl/chemical_reaction/instant/drinks/gargle_blaster
name = REAGENT_GARGLEBLASTER
id = REAGENT_ID_GARGLEBLASTER
result = REAGENT_ID_GARGLEBLASTER
required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_GIN = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_COGNAC = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/brave_bull
+/datum/decl/chemical_reaction/instant/drinks/brave_bull
name = REAGENT_BRAVEBULL
id = REAGENT_ID_BRAVEBULL
result = REAGENT_ID_BRAVEBULL
required_reagents = list(REAGENT_ID_TEQUILA = 2, REAGENT_ID_KAHLUA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/tequila_sunrise
+/datum/decl/chemical_reaction/instant/drinks/tequila_sunrise
name = "Tequilla Sunrise"
id = REAGENT_ID_TEQUILASUNRISE
result = REAGENT_ID_TEQUILASUNRISE
required_reagents = list(REAGENT_ID_TEQUILA = 2, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/phoron_special
+/datum/decl/chemical_reaction/instant/drinks/phoron_special
name = REAGENT_PHORONSPECIAL
id = REAGENT_ID_PHORONSPECIAL
result = REAGENT_ID_PHORONSPECIAL
required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_VERMOUTH = 2, REAGENT_ID_PHORON = 2)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/beepsky_smash
+/datum/decl/chemical_reaction/instant/drinks/beepsky_smash
name = "Beepksy Smash"
id = "beepksysmash"
result = REAGENT_ID_BEEPSKYSMASH
required_reagents = list(REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_IRON = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/doctor_delight
+/datum/decl/chemical_reaction/instant/drinks/doctor_delight
name = REAGENT_DOCTORSDELIGHT
id = "doctordelight"
result = REAGENT_ID_DOCTORSDELIGHT
required_reagents = list(REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_TOMATOJUICE = 1, REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_CREAM = 2, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/irish_cream
+/datum/decl/chemical_reaction/instant/drinks/irish_cream
name = REAGENT_IRISHCREAM
id = REAGENT_ID_IRISHCREAM
result = REAGENT_ID_IRISHCREAM
@@ -358,175 +358,175 @@
required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_CREAM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/manly_dorf
+/datum/decl/chemical_reaction/instant/drinks/manly_dorf
name = REAGENT_MANLYDORF
id = REAGENT_ID_MANLYDORF
result = REAGENT_ID_MANLYDORF
required_reagents = list (REAGENT_ID_BEER = 1, REAGENT_ID_ALE = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/hooch
+/datum/decl/chemical_reaction/instant/drinks/hooch
name = REAGENT_HOOCH
id = REAGENT_ID_HOOCH
result = REAGENT_ID_HOOCH
required_reagents = list (REAGENT_ID_SUGAR = 1, REAGENT_ID_ETHANOL = 2, REAGENT_ID_FUEL = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/irish_coffee
+/datum/decl/chemical_reaction/instant/drinks/irish_coffee
name = REAGENT_IRISHCOFFEE
id = REAGENT_ID_IRISHCOFFEE
result = REAGENT_ID_IRISHCOFFEE
required_reagents = list(REAGENT_ID_IRISHCREAM = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/b52
+/datum/decl/chemical_reaction/instant/drinks/b52
name = REAGENT_B52
id = REAGENT_ID_B52
result = REAGENT_ID_B52
required_reagents = list(REAGENT_ID_IRISHCREAM = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_COGNAC = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/atomicbomb
+/datum/decl/chemical_reaction/instant/drinks/atomicbomb
name = REAGENT_ATOMICBOMB
id = REAGENT_ID_ATOMICBOMB
result = REAGENT_ID_ATOMICBOMB
required_reagents = list(REAGENT_ID_B52 = 10, REAGENT_ID_URANIUM = 1)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/margarita
+/datum/decl/chemical_reaction/instant/drinks/margarita
name = REAGENT_MARGARITA
id = REAGENT_ID_MARGARITA
result = REAGENT_ID_MARGARITA
required_reagents = list(REAGENT_ID_TEQUILA = 2, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/longislandicedtea
+/datum/decl/chemical_reaction/instant/drinks/longislandicedtea
name = REAGENT_LONGISLANDICEDTEA
id = REAGENT_ID_LONGISLANDICEDTEA
result = REAGENT_ID_LONGISLANDICEDTEA
required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_GIN = 1, REAGENT_ID_TEQUILA = 1, REAGENT_ID_RUMANDCOLA = 3)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/threemileisland
+/datum/decl/chemical_reaction/instant/drinks/threemileisland
name = REAGENT_THREEMILEISLAND
id = REAGENT_ID_THREEMILEISLAND
result = REAGENT_ID_THREEMILEISLAND
required_reagents = list(REAGENT_ID_LONGISLANDICEDTEA = 10, REAGENT_ID_URANIUM = 1)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/whiskeysoda
+/datum/decl/chemical_reaction/instant/drinks/whiskeysoda
name = REAGENT_WHISKEYSODA
id = REAGENT_ID_WHISKEYSODA
result = REAGENT_ID_WHISKEYSODA
required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_SODAWATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/black_russian
+/datum/decl/chemical_reaction/instant/drinks/black_russian
name = REAGENT_BLACKRUSSIAN
id = REAGENT_ID_BLACKRUSSIAN
result = REAGENT_ID_BLACKRUSSIAN
required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_KAHLUA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/manhattan
+/datum/decl/chemical_reaction/instant/drinks/manhattan
name = REAGENT_MANHATTAN
id = REAGENT_ID_MANHATTAN
result = REAGENT_ID_MANHATTAN
required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/manhattan_proj
+/datum/decl/chemical_reaction/instant/drinks/manhattan_proj
name = REAGENT_MANHATTANPROJ
id = REAGENT_ID_MANHATTANPROJ
result = REAGENT_ID_MANHATTANPROJ
required_reagents = list(REAGENT_ID_MANHATTAN = 10, REAGENT_ID_URANIUM = 1)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/vodka_tonic
+/datum/decl/chemical_reaction/instant/drinks/vodka_tonic
name = REAGENT_VODKATONIC
id = REAGENT_ID_VODKATONIC
result = REAGENT_ID_VODKATONIC
required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_TONIC = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/gin_fizz
+/datum/decl/chemical_reaction/instant/drinks/gin_fizz
name = REAGENT_GINFIZZ
id = REAGENT_ID_GINFIZZ
result = REAGENT_ID_GINFIZZ
required_reagents = list(REAGENT_ID_GIN = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/bahama_mama
+/datum/decl/chemical_reaction/instant/drinks/bahama_mama
name = REAGENT_BAHAMAMAMA
id = REAGENT_ID_BAHAMAMAMA
result = REAGENT_ID_BAHAMAMAMA
required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_ICE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/singulo
+/datum/decl/chemical_reaction/instant/drinks/singulo
name = REAGENT_SINGULO
id = REAGENT_ID_SINGULO
result = REAGENT_ID_SINGULO
required_reagents = list(REAGENT_ID_VODKA = 5, REAGENT_ID_RADIUM = 1, REAGENT_ID_REDWINE = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/alliescocktail
+/datum/decl/chemical_reaction/instant/drinks/alliescocktail
name = REAGENT_ALLIESCOCKTAIL
id = REAGENT_ID_ALLIESCOCKTAIL
result = REAGENT_ID_ALLIESCOCKTAIL
required_reagents = list(REAGENT_ID_MARTINI = 1, REAGENT_ID_VODKA = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/demonsblood
+/datum/decl/chemical_reaction/instant/drinks/demonsblood
name = REAGENT_DEMONSBLOOD
id = REAGENT_ID_DEMONSBLOOD
result = REAGENT_ID_DEMONSBLOOD
required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/booger
+/datum/decl/chemical_reaction/instant/drinks/booger
name = REAGENT_BOOGER
id = REAGENT_ID_BOOGER
result = REAGENT_ID_BOOGER
required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_BANANA = 1, REAGENT_ID_RUM = 1, REAGENT_ID_WATERMELONJUICE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/antifreeze
+/datum/decl/chemical_reaction/instant/drinks/antifreeze
name = REAGENT_ANTIFREEZE
id = REAGENT_ID_ANTIFREEZE
result = REAGENT_ID_ANTIFREEZE
required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/barefoot
+/datum/decl/chemical_reaction/instant/drinks/barefoot
name = REAGENT_BAREFOOT
id = REAGENT_ID_BAREFOOT
result = REAGENT_ID_BAREFOOT
required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/grapesoda
+/datum/decl/chemical_reaction/instant/drinks/grapesoda
name = REAGENT_GRAPESODA
id = REAGENT_ID_GRAPESODA
result = REAGENT_ID_GRAPESODA
required_reagents = list(REAGENT_ID_GRAPEJUICE = 2, REAGENT_ID_COLA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/sbiten
+/datum/decl/chemical_reaction/instant/drinks/sbiten
name = REAGENT_SBITEN
id = REAGENT_ID_SBITEN
result = REAGENT_ID_SBITEN
required_reagents = list(REAGENT_ID_VODKA = 10, REAGENT_ID_CAPSAICIN = 1)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/red_mead
+/datum/decl/chemical_reaction/instant/drinks/red_mead
name = REAGENT_REDMEAD
id = REAGENT_ID_REDMEAD
result = REAGENT_ID_REDMEAD
required_reagents = list(REAGENT_ID_BLOOD = 1, REAGENT_ID_MEAD = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/mead
+/datum/decl/chemical_reaction/instant/drinks/mead
name = REAGENT_MEAD
id = REAGENT_ID_MEAD
result = REAGENT_ID_MEAD
@@ -534,175 +534,175 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/iced_beer
+/datum/decl/chemical_reaction/instant/drinks/iced_beer
name = REAGENT_ICEDBEER
id = REAGENT_ID_ICEDBEER
result = REAGENT_ID_ICEDBEER
required_reagents = list(REAGENT_ID_BEER = 10, REAGENT_ID_FROSTOIL = 1)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/iced_beer2
+/datum/decl/chemical_reaction/instant/drinks/iced_beer2
name = REAGENT_ICEDBEER
id = REAGENT_ID_ICEDBEER + "_ice"
result = REAGENT_ID_ICEDBEER
required_reagents = list(REAGENT_ID_BEER = 5, REAGENT_ID_ICE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/grog
+/datum/decl/chemical_reaction/instant/drinks/grog
name = REAGENT_GROG
id = REAGENT_ID_GROG
result = REAGENT_ID_GROG
required_reagents = list(REAGENT_ID_RUM = 1, REAGENT_ID_WATER = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/soy_latte
+/datum/decl/chemical_reaction/instant/drinks/soy_latte
name = REAGENT_SOYLATTE
id = REAGENT_ID_SOYLATTE
result = REAGENT_ID_SOYLATTE
required_reagents = list(REAGENT_ID_COFFEE = 1, REAGENT_ID_SOYMILK = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/cafe_latte
+/datum/decl/chemical_reaction/instant/drinks/cafe_latte
name = REAGENT_CAFELATTE
id = REAGENT_ID_CAFELATTE
result = REAGENT_ID_CAFELATTE
required_reagents = list(REAGENT_ID_FLATWHITE = 1, REAGENT_ID_MILK = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/acidspit
+/datum/decl/chemical_reaction/instant/drinks/acidspit
name = REAGENT_ACIDSPIT
id = REAGENT_ID_ACIDSPIT
result = REAGENT_ID_ACIDSPIT
required_reagents = list(REAGENT_ID_SACID = 1, REAGENT_ID_REDWINE = 5)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/amasec
+/datum/decl/chemical_reaction/instant/drinks/amasec
name = REAGENT_AMASEC
id = REAGENT_ID_AMASEC
result = REAGENT_ID_AMASEC
required_reagents = list(REAGENT_ID_IRON = 1, REAGENT_ID_REDWINE = 5, REAGENT_ID_VODKA = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/changeling_sting
+/datum/decl/chemical_reaction/instant/drinks/changeling_sting
name = REAGENT_CHANGELINGSTING
id = REAGENT_ID_CHANGELINGSTING
result = REAGENT_ID_CHANGELINGSTING
required_reagents = list(REAGENT_ID_SCREWDRIVERCOCKTAIL = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/aloe
+/datum/decl/chemical_reaction/instant/drinks/aloe
name = REAGENT_ALOE
id = REAGENT_ID_ALOE
result = REAGENT_ID_ALOE
required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_WATERMELONJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/andalusia
+/datum/decl/chemical_reaction/instant/drinks/andalusia
name = REAGENT_ANDALUSIA
id = REAGENT_ID_ANDALUSIA
result = REAGENT_ID_ANDALUSIA
required_reagents = list(REAGENT_ID_RUM = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/snowwhite
+/datum/decl/chemical_reaction/instant/drinks/snowwhite
name = REAGENT_SNOWWHITE
id = REAGENT_ID_SNOWWHITE
result = REAGENT_ID_SNOWWHITE
required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 1, REAGENT_ID_RUM = 1, REAGENT_ID_LEMONLIME = 1, REAGENT_ID_EGG = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit
result_amount = 2
-/decl/chemical_reaction/instant/drinks/irishcarbomb
+/datum/decl/chemical_reaction/instant/drinks/irishcarbomb
name = REAGENT_IRISHCARBOMB
id = REAGENT_ID_IRISHCARBOMB
result = REAGENT_ID_IRISHCARBOMB
required_reagents = list(REAGENT_ID_ALE = 1, REAGENT_ID_IRISHCREAM = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/syndicatebomb
+/datum/decl/chemical_reaction/instant/drinks/syndicatebomb
name = REAGENT_SYNDICATEBOMB
id = REAGENT_ID_SYNDICATEBOMB
result = REAGENT_ID_SYNDICATEBOMB
required_reagents = list(REAGENT_ID_BEER = 1, REAGENT_ID_WHISKEYCOLA = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/erikasurprise
+/datum/decl/chemical_reaction/instant/drinks/erikasurprise
name = REAGENT_ERIKASURPRISE
id = REAGENT_ID_ERIKASURPRISE
result = REAGENT_ID_ERIKASURPRISE
required_reagents = list(REAGENT_ID_ALE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_BANANA = 1, REAGENT_ID_ICE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/devilskiss
+/datum/decl/chemical_reaction/instant/drinks/devilskiss
name = REAGENT_DEVILSKISS
id = REAGENT_ID_DEVILSKISS
result = REAGENT_ID_DEVILSKISS
required_reagents = list(REAGENT_ID_BLOOD = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_RUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/hippiesdelight
+/datum/decl/chemical_reaction/instant/drinks/hippiesdelight
name = "Hippies Delight"
id = REAGENT_ID_HIPPIESDELIGHT
result = REAGENT_ID_HIPPIESDELIGHT
required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, REAGENT_ID_GARGLEBLASTER = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/bananahonk
+/datum/decl/chemical_reaction/instant/drinks/bananahonk
name = "Banana Honk"
id = REAGENT_ID_BANANAHONK
result = REAGENT_ID_BANANAHONK
required_reagents = list(REAGENT_ID_BANANA = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/silencer
+/datum/decl/chemical_reaction/instant/drinks/silencer
name = REAGENT_SILENCER
id = REAGENT_ID_SILENCER
result = REAGENT_ID_SILENCER
required_reagents = list(REAGENT_ID_NOTHING = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/driestmartini
+/datum/decl/chemical_reaction/instant/drinks/driestmartini
name = REAGENT_DRIESTMARTINI
id = REAGENT_ID_DRIESTMARTINI
result = REAGENT_ID_DRIESTMARTINI
required_reagents = list(REAGENT_ID_NOTHING = 1, REAGENT_ID_GIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/lemonade
+/datum/decl/chemical_reaction/instant/drinks/lemonade
name = REAGENT_LEMONADE
id = REAGENT_ID_LEMONADE
result = REAGENT_ID_LEMONADE
required_reagents = list(REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/melonade
+/datum/decl/chemical_reaction/instant/drinks/melonade
name = REAGENT_MELONADE
id = REAGENT_ID_MELONADE
result = REAGENT_ID_MELONADE
required_reagents = list(REAGENT_ID_WATERMELONJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/appleade
+/datum/decl/chemical_reaction/instant/drinks/appleade
name = REAGENT_APPLEADE
id = REAGENT_ID_APPLEADE
result = REAGENT_ID_APPLEADE
required_reagents = list(REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/pineappleade
+/datum/decl/chemical_reaction/instant/drinks/pineappleade
name = REAGENT_PINEAPPLEADE
id = REAGENT_ID_PINEAPPLEADE
result = REAGENT_ID_PINEAPPLEADE
required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_SODAWATER = 2, REAGENT_ID_HONEY = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/driverspunch
+/datum/decl/chemical_reaction/instant/drinks/driverspunch
name = "Driver`s Punch"
id = REAGENT_ID_DRIVERSPUNCH
result = REAGENT_ID_DRIVERSPUNCH
required_reagents = list(REAGENT_ID_APPLEADE = 2, REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/mintapplesparkle
+/datum/decl/chemical_reaction/instant/drinks/mintapplesparkle
name = REAGENT_MINTAPPLESPARKLE
id = REAGENT_ID_MINTAPPLESPARKLE
result = REAGENT_ID_MINTAPPLESPARKLE
@@ -710,14 +710,14 @@
inhibitors = list(REAGENT_ID_SODAWATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/berrycordial
+/datum/decl/chemical_reaction/instant/drinks/berrycordial
name = REAGENT_BERRYCORDIAL
id = REAGENT_ID_BERRYCORDIAL
result = REAGENT_ID_BERRYCORDIAL
required_reagents = list(REAGENT_ID_BERRYJUICE = 4, REAGENT_ID_SUGAR = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/tropicalfizz
+/datum/decl/chemical_reaction/instant/drinks/tropicalfizz
name = REAGENT_TROPICALFIZZ
id = REAGENT_ID_TROPICALFIZZ
result = REAGENT_ID_TROPICALFIZZ
@@ -725,14 +725,14 @@
inhibitors = list(REAGENT_ID_SUGAR = 1)
result_amount = 8
-/decl/chemical_reaction/instant/drinks/melonspritzer
+/datum/decl/chemical_reaction/instant/drinks/melonspritzer
name = REAGENT_MELONSPRITZER
id = REAGENT_ID_MELONSPRITZER
result = REAGENT_ID_MELONSPRITZER
required_reagents = list(REAGENT_ID_WATERMELONJUICE = 2, REAGENT_ID_REDWINE = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/fauxfizz
+/datum/decl/chemical_reaction/instant/drinks/fauxfizz
name = REAGENT_FAUXFIZZ
id = REAGENT_ID_FAUXFIZZ
result = REAGENT_ID_FAUXFIZZ
@@ -740,7 +740,7 @@
inhibitors = list(REAGENT_ID_SUGAR = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/firepunch
+/datum/decl/chemical_reaction/instant/drinks/firepunch
name = REAGENT_FIREPUNCH
id = REAGENT_ID_FIREPUNCH
result = REAGENT_ID_FIREPUNCH
@@ -748,28 +748,28 @@
inhibitors = list(REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/kiraspecial
+/datum/decl/chemical_reaction/instant/drinks/kiraspecial
name = REAGENT_KIRASPECIAL
id = REAGENT_ID_KIRASPECIAL
result = REAGENT_ID_KIRASPECIAL
required_reagents = list(REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/brownstar
+/datum/decl/chemical_reaction/instant/drinks/brownstar
name = REAGENT_BROWNSTAR
id = REAGENT_ID_BROWNSTAR
result = REAGENT_ID_BROWNSTAR
required_reagents = list(REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_COLA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/brownstar_decaf
+/datum/decl/chemical_reaction/instant/drinks/brownstar_decaf
name = REAGENT_BROWNSTARDECAF
id = REAGENT_ID_BROWNSTARDECAF
result = REAGENT_ID_BROWNSTARDECAF
required_reagents = list(REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_DECAFCOLA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/milkshake
+/datum/decl/chemical_reaction/instant/drinks/milkshake
name = REAGENT_MILKSHAKE
id = REAGENT_ID_MILKSHAKE
result = REAGENT_ID_MILKSHAKE
@@ -777,168 +777,168 @@
required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 2, REAGENT_ID_MILK = 2)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/peanutmilkshake
+/datum/decl/chemical_reaction/instant/drinks/peanutmilkshake
name = "Peanutbutter Milkshake"
id = REAGENT_ID_PEANUTMILKSHAKE
result = REAGENT_ID_PEANUTMILKSHAKE
required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 1, REAGENT_ID_PEANUTBUTTER = 2, REAGENT_ID_MILK = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/rewriter
+/datum/decl/chemical_reaction/instant/drinks/rewriter
name = REAGENT_REWRITER
id = REAGENT_ID_REWRITER
result = REAGENT_ID_REWRITER
required_reagents = list(REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/suidream
+/datum/decl/chemical_reaction/instant/drinks/suidream
name = REAGENT_SUIDREAM
id = REAGENT_ID_SUIDREAM
result = REAGENT_ID_SUIDREAM
required_reagents = list(REAGENT_ID_SPACEUP = 1, REAGENT_ID_BLUECURACAO = 1, REAGENT_ID_MELONLIQUOR = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/shirleytemple
+/datum/decl/chemical_reaction/instant/drinks/shirleytemple
name = REAGENT_SHIRLEYTEMPLE
id = REAGENT_ID_SHIRLEYTEMPLE
result = REAGENT_ID_SHIRLEYTEMPLE
required_reagents = list(REAGENT_ID_GINGERALE = 4, REAGENT_ID_GRENADINE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/royrogers
+/datum/decl/chemical_reaction/instant/drinks/royrogers
name = REAGENT_ROYROGERS
id = REAGENT_ID_ROYROGERS
result = REAGENT_ID_ROYROGERS
required_reagents = list(REAGENT_ID_SHIRLEYTEMPLE = 5, REAGENT_ID_LEMONLIME = 2)
result_amount = 7
-/decl/chemical_reaction/instant/drinks/collinsmix
+/datum/decl/chemical_reaction/instant/drinks/collinsmix
name = REAGENT_COLLINSMIX
id = REAGENT_ID_COLLINSMIX
result = REAGENT_ID_COLLINSMIX
required_reagents = list(REAGENT_ID_LEMONLIME = 3, REAGENT_ID_SODAWATER = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/arnoldpalmer
+/datum/decl/chemical_reaction/instant/drinks/arnoldpalmer
name = REAGENT_ARNOLDPALMER
id = REAGENT_ID_ARNOLDPALMER
result = REAGENT_ID_ARNOLDPALMER
required_reagents = list(REAGENT_ID_ICETEA = 1, REAGENT_ID_LEMONADE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/sakebomb
+/datum/decl/chemical_reaction/instant/drinks/sakebomb
name = REAGENT_SAKEBOMB
id = REAGENT_ID_SAKEBOMB
result = REAGENT_ID_SAKEBOMB
required_reagents = list(REAGENT_ID_BEER = 2, REAGENT_ID_SAKE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/tamagozake
+/datum/decl/chemical_reaction/instant/drinks/tamagozake
name = REAGENT_TAMAGOZAKE
id = REAGENT_ID_TAMAGOZAKE
result = REAGENT_ID_TAMAGOZAKE
required_reagents = list(REAGENT_ID_SAKE = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
result_amount = 15
-/decl/chemical_reaction/instant/drinks/ginzamary
+/datum/decl/chemical_reaction/instant/drinks/ginzamary
name = REAGENT_GINZAMARY
id = REAGENT_ID_GINZAMARY
result = REAGENT_ID_GINZAMARY
required_reagents = list(REAGENT_ID_SAKE = 2, REAGENT_ID_VODKA = 2, REAGENT_ID_TOMATOJUICE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/tokyorose
+/datum/decl/chemical_reaction/instant/drinks/tokyorose
name = REAGENT_TOKYOROSE
id = REAGENT_ID_TOKYOROSE
result = REAGENT_ID_TOKYOROSE
required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_BERRYJUICE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/saketini
+/datum/decl/chemical_reaction/instant/drinks/saketini
name = REAGENT_SAKETINI
id = REAGENT_ID_SAKETINI
result = REAGENT_ID_SAKETINI
required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_GIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/elysiumfacepunch
+/datum/decl/chemical_reaction/instant/drinks/elysiumfacepunch
name = REAGENT_ELYSIUMFACEPUNCH
id = REAGENT_ID_ELYSIUMFACEPUNCH
result = REAGENT_ID_ELYSIUMFACEPUNCH
required_reagents = list(REAGENT_ID_KAHLUA = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/erebusmoonrise
+/datum/decl/chemical_reaction/instant/drinks/erebusmoonrise
name = REAGENT_EREBUSMOONRISE
id = REAGENT_ID_EREBUSMOONRISE
result = REAGENT_ID_EREBUSMOONRISE
required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_VODKA = 1, REAGENT_ID_TEQUILA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/balloon
+/datum/decl/chemical_reaction/instant/drinks/balloon
name = REAGENT_BALLOON
id = REAGENT_ID_BALLOON
result = REAGENT_ID_BALLOON
required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_BLUECURACAO = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/natunabrandy
+/datum/decl/chemical_reaction/instant/drinks/natunabrandy
name = REAGENT_NATUNABRANDY
id = REAGENT_ID_NATUNABRANDY
result = REAGENT_ID_NATUNABRANDY
required_reagents = list(REAGENT_ID_BEER = 1, REAGENT_ID_SODAWATER = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/euphoria
+/datum/decl/chemical_reaction/instant/drinks/euphoria
name = REAGENT_EUPHORIA
id = REAGENT_ID_EUPHORIA
result = REAGENT_ID_EUPHORIA
required_reagents = list(REAGENT_ID_SPECIALWHISKEY = 1, REAGENT_ID_COGNAC = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/xanaducannon
+/datum/decl/chemical_reaction/instant/drinks/xanaducannon
name = REAGENT_XANADUCANNON
id = REAGENT_ID_XANADUCANNON
result = REAGENT_ID_XANADUCANNON
required_reagents = list(REAGENT_ID_ALE = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/debugger
+/datum/decl/chemical_reaction/instant/drinks/debugger
name = REAGENT_DEBUGGER
id = REAGENT_ID_DEBUGGER
result = REAGENT_ID_DEBUGGER
required_reagents = list(REAGENT_ID_FUEL = 1, REAGENT_ID_SUGAR = 2, REAGENT_ID_COOKINGOIL = 2)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/spacersbrew
+/datum/decl/chemical_reaction/instant/drinks/spacersbrew
name = REAGENT_SPACERSBREW
id = REAGENT_ID_SPACERSBREW
result = REAGENT_ID_SPACERSBREW
required_reagents = list(REAGENT_ID_BROWNSTAR = 4, REAGENT_ID_ETHANOL = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/binmanbliss
+/datum/decl/chemical_reaction/instant/drinks/binmanbliss
name = REAGENT_BINMANBLISS
id = REAGENT_ID_BINMANBLISS
result = REAGENT_ID_BINMANBLISS
required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_TEQUILA = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/chrysanthemum
+/datum/decl/chemical_reaction/instant/drinks/chrysanthemum
name = REAGENT_CHRYSANTHEMUM
id = REAGENT_ID_CHRYSANTHEMUM
result = REAGENT_ID_CHRYSANTHEMUM
required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_MELONLIQUOR = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/deathbell
+/datum/decl/chemical_reaction/instant/drinks/deathbell
name = REAGENT_DEATHBELL
id = REAGENT_ID_DEATHBELL
result = REAGENT_ID_DEATHBELL
required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SYNDICATEBOMB =1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/bitters
+/datum/decl/chemical_reaction/instant/drinks/bitters
name = REAGENT_BITTERS
id = REAGENT_ID_BITTERS
result = REAGENT_ID_BITTERS
@@ -946,14 +946,14 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/soemmerfire
+/datum/decl/chemical_reaction/instant/drinks/soemmerfire
name = REAGENT_SOEMMERFIRE
id = REAGENT_ID_SOEMMERFIRE
result = REAGENT_ID_SOEMMERFIRE
required_reagents = list(REAGENT_ID_MANHATTAN = 2, REAGENT_ID_CONDENSEDCAPSAICIN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/winebrandy
+/datum/decl/chemical_reaction/instant/drinks/winebrandy
name = "Wine brandy"
id = REAGENT_ID_WINEBRANDY
result = REAGENT_ID_WINEBRANDY
@@ -961,203 +961,203 @@
catalysts = list(REAGENT_ID_ENZYME = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe
result_amount = 5
-/decl/chemical_reaction/instant/drinks/love_potion
+/datum/decl/chemical_reaction/instant/drinks/love_potion
name = REAGENT_LOVEPOTION
id = REAGENT_ID_LOVEPOTION
result = REAGENT_ID_LOVEPOTION
required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/morningafter
+/datum/decl/chemical_reaction/instant/drinks/morningafter
name = REAGENT_MORNINGAFTER
id = REAGENT_ID_MORNINGAFTER
result = REAGENT_ID_MORNINGAFTER
required_reagents = list(REAGENT_ID_SBITEN = 1, REAGENT_ID_COFFEE = 5)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/vesper
+/datum/decl/chemical_reaction/instant/drinks/vesper
name = REAGENT_VESPER
id = REAGENT_ID_VESPER
result = REAGENT_ID_VESPER
required_reagents = list(REAGENT_ID_GIN = 3, REAGENT_ID_VODKA = 1, REAGENT_ID_REDWINE = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/rotgut
+/datum/decl/chemical_reaction/instant/drinks/rotgut
name = REAGENT_ROTGUT
id = REAGENT_ID_ROTGUT
result = REAGENT_ID_ROTGUT
required_reagents = list(REAGENT_ID_VODKA = 3, REAGENT_ID_RUM = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_COLA = 3)
result_amount = 8
-/decl/chemical_reaction/instant/drinks/entdraught
+/datum/decl/chemical_reaction/instant/drinks/entdraught
name = REAGENT_ENTDRAUGHT
id = REAGENT_ID_ENTDRAUGHT
result = REAGENT_ID_ENTDRAUGHT
required_reagents = list(REAGENT_ID_TONIC = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_HONEY = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/voxdelight
+/datum/decl/chemical_reaction/instant/drinks/voxdelight
name = REAGENT_VOXDELIGHT
id = REAGENT_ID_VOXDELIGHT
result = REAGENT_ID_VOXDELIGHT
required_reagents = list(REAGENT_ID_PHORON = 3, REAGENT_ID_FUEL = 1, REAGENT_ID_WATER = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/screamingviking
+/datum/decl/chemical_reaction/instant/drinks/screamingviking
name =REAGENT_SCREAMINGVIKING
id = REAGENT_ID_SCREAMINGVIKING
result = REAGENT_ID_SCREAMINGVIKING
required_reagents = list(REAGENT_ID_MARTINI = 2, REAGENT_ID_VODKATONIC = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_RUM = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/vilelemon
+/datum/decl/chemical_reaction/instant/drinks/vilelemon
name = REAGENT_VILELEMON
id = REAGENT_ID_VILELEMON
result = REAGENT_ID_VILELEMON
required_reagents = list(REAGENT_ID_LEMONADE = 5, REAGENT_ID_SPACEMOUNTAINWIND = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/dreamcream
+/datum/decl/chemical_reaction/instant/drinks/dreamcream
name = REAGENT_DREAMCREAM
id = REAGENT_ID_DREAMCREAM
result = REAGENT_ID_DREAMCREAM
required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_CREAM = 1, REAGENT_ID_HONEY = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/robustin
+/datum/decl/chemical_reaction/instant/drinks/robustin
name = REAGENT_ROBUSTIN
id = REAGENT_ID_ROBUSTIN
result = REAGENT_ID_ROBUSTIN
required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_FUEL = 1, REAGENT_ID_VODKA = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/virginsip
+/datum/decl/chemical_reaction/instant/drinks/virginsip
name = REAGENT_VIRGINSIP
id = REAGENT_ID_VIRGINSIP
result = REAGENT_ID_VIRGINSIP
required_reagents = list(REAGENT_ID_DRIESTMARTINI = 1, REAGENT_ID_WATER = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/chocoshake
+/datum/decl/chemical_reaction/instant/drinks/chocoshake
name = REAGENT_CHOCOSHAKE
id = REAGENT_ID_CHOCOSHAKE
result = REAGENT_ID_CHOCOSHAKE
required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_COCO = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/berryshake
+/datum/decl/chemical_reaction/instant/drinks/berryshake
name = REAGENT_BERRYSHAKE
id = REAGENT_ID_BERRYSHAKE
result = REAGENT_ID_BERRYSHAKE
required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_BERRYJUICE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/coffeeshake
+/datum/decl/chemical_reaction/instant/drinks/coffeeshake
name = REAGENT_COFFEESHAKE
id = REAGENT_ID_COFFEESHAKE
result = REAGENT_ID_COFFEESHAKE
required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/jellyshot
+/datum/decl/chemical_reaction/instant/drinks/jellyshot
name = REAGENT_JELLYSHOT
id = REAGENT_ID_JELLYSHOT
result = REAGENT_ID_JELLYSHOT
required_reagents = list(REAGENT_ID_CHERRYJELLY = 4, REAGENT_ID_VODKA = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/slimeshot
+/datum/decl/chemical_reaction/instant/drinks/slimeshot
name = REAGENT_SLIMESHOT
id = REAGENT_ID_SLIMESHOT
result = REAGENT_ID_SLIMESHOT
required_reagents = list(REAGENT_ID_SLIMEJELLY = 4, REAGENT_ID_VODKA = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/negroni
+/datum/decl/chemical_reaction/instant/drinks/negroni
name = REAGENT_NEGRONI
id = REAGENT_ID_NEGRONI
result = REAGENT_ID_NEGRONI
required_reagents = list(REAGENT_ID_GIN = 1, REAGENT_ID_BITTERS = 1, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/cloverclub
+/datum/decl/chemical_reaction/instant/drinks/cloverclub
name = REAGENT_CLOVERCLUB
id = REAGENT_ID_CLOVERCLUB
result = REAGENT_ID_CLOVERCLUB
required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_GIN = 3)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/oldfashioned
+/datum/decl/chemical_reaction/instant/drinks/oldfashioned
name = REAGENT_OLDFASHIONED
id = REAGENT_ID_OLDFASHIONED
result = REAGENT_ID_OLDFASHIONED
required_reagents = list(REAGENT_ID_WHISKEY = 3, REAGENT_ID_BITTERS = 1, REAGENT_ID_SUGAR = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/whiskeysour
+/datum/decl/chemical_reaction/instant/drinks/whiskeysour
name = REAGENT_WHISKEYSOUR
id = REAGENT_ID_WHISKEYSOUR
result = REAGENT_ID_WHISKEYSOUR
required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/daiquiri
+/datum/decl/chemical_reaction/instant/drinks/daiquiri
name = REAGENT_DAIQUIRI
id = REAGENT_ID_DAIQUIRI
result = REAGENT_ID_DAIQUIRI
required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_LIMEJUICE = 2, REAGENT_ID_SUGAR = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/mintjulep
+/datum/decl/chemical_reaction/instant/drinks/mintjulep
name = REAGENT_MINTJULEP
id = REAGENT_ID_MINTJULEP
result = REAGENT_ID_MINTJULEP
required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_WATER = 1, REAGENT_ID_MINT = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/paloma
+/datum/decl/chemical_reaction/instant/drinks/paloma
name = REAGENT_PALOMA
id = REAGENT_ID_PALOMA
result = REAGENT_ID_PALOMA
required_reagents = list(REAGENT_ID_SODAWATER = 1, REAGENT_ID_TEQUILASUNRISE = 2)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/mojito
+/datum/decl/chemical_reaction/instant/drinks/mojito
name = REAGENT_MOJITO
id = REAGENT_ID_MOJITO
result = REAGENT_ID_MOJITO
required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/virgin_mojito
+/datum/decl/chemical_reaction/instant/drinks/virgin_mojito
name = REAGENT_VIRGINMOJITO
id = REAGENT_ID_VIRGINMOJITO
result = REAGENT_ID_VIRGINMOJITO
required_reagents = list(REAGENT_ID_SODAWATER = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_SUGAR = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/piscosour
+/datum/decl/chemical_reaction/instant/drinks/piscosour
name = REAGENT_PISCOSOUR
id = REAGENT_ID_PISCOSOUR
result = REAGENT_ID_PISCOSOUR
required_reagents = list(REAGENT_ID_WINEBRANDY = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/coldfront
+/datum/decl/chemical_reaction/instant/drinks/coldfront
name = REAGENT_COLDFRONT
id = REAGENT_ID_COLDFRONT
result = REAGENT_ID_COLDFRONT
required_reagents = list(REAGENT_ID_ICECOFFEE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_MINT = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/godsake
+/datum/decl/chemical_reaction/instant/drinks/godsake
name = REAGENT_GODSAKE
id = REAGENT_ID_GODSAKE
result = REAGENT_ID_GODSAKE
required_reagents = list(REAGENT_ID_SAKE = 2, REAGENT_ID_HOLYWATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/godka //Why you would put this in your body, I don't know.
+/datum/decl/chemical_reaction/instant/drinks/godka //Why you would put this in your body, I don't know.
name = REAGENT_GODKA
id = REAGENT_ID_GODKA
result = REAGENT_ID_GODKA
@@ -1165,7 +1165,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5, REAGENT_ID_HOLYWATER = 5)
result_amount = 1
-/decl/chemical_reaction/instant/drinks/holywine
+/datum/decl/chemical_reaction/instant/drinks/holywine
name = REAGENT_HOLYWINE
id = REAGENT_ID_HOLYWINE
result = REAGENT_ID_HOLYWINE
@@ -1173,91 +1173,91 @@
catalysts = list(REAGENT_ID_HOLYWATER = 5)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/holy_mary
+/datum/decl/chemical_reaction/instant/drinks/holy_mary
name = REAGENT_HOLYMARY
id = REAGENT_ID_HOLYMARY
result = REAGENT_ID_HOLYMARY
required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_HOLYWINE = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/angelskiss
+/datum/decl/chemical_reaction/instant/drinks/angelskiss
name = REAGENT_ANGELSKISS
id = REAGENT_ID_ANGELSKISS
result = REAGENT_ID_ANGELSKISS
required_reagents = list(REAGENT_ID_HOLYWINE = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_RUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/angelswrath
+/datum/decl/chemical_reaction/instant/drinks/angelswrath
name = REAGENT_ANGELSWRATH
id = REAGENT_ID_ANGELSWRATH
result = REAGENT_ID_ANGELSWRATH
required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_HOLYWINE = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/ichor_mead
+/datum/decl/chemical_reaction/instant/drinks/ichor_mead
name = REAGENT_ICHORMEAD
id = REAGENT_ID_ICHORMEAD
result = REAGENT_ID_ICHORMEAD
required_reagents = list(REAGENT_ID_HOLYWINE = 1, REAGENT_ID_MEAD = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/oilslick
+/datum/decl/chemical_reaction/instant/drinks/oilslick
name = REAGENT_OILSLICK
id = REAGENT_ID_OILSLICK
result = REAGENT_ID_OILSLICK
required_reagents = list(REAGENT_ID_COOKINGOIL = 2, REAGENT_ID_HONEY = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/slimeslam
+/datum/decl/chemical_reaction/instant/drinks/slimeslam
name = "Slick Slime Slammer"
id = REAGENT_ID_SLIMESLAMMER
result = REAGENT_ID_SLIMESLAMMER
required_reagents = list(REAGENT_ID_COOKINGOIL = 2, REAGENT_ID_PEANUTBUTTER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/virginsexonthebeach
+/datum/decl/chemical_reaction/instant/drinks/virginsexonthebeach
name = REAGENT_VIRGINSEXONTHEBEACH
id = REAGENT_ID_VIRGINSEXONTHEBEACH
result = REAGENT_ID_VIRGINSEXONTHEBEACH
required_reagents = list(REAGENT_ID_ORANGEJUICE = 3, REAGENT_ID_GRENADINE = 2)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/sexonthebeach
+/datum/decl/chemical_reaction/instant/drinks/sexonthebeach
name = REAGENT_SEXONTHEBEACH
id = REAGENT_ID_SEXONTHEBEACH
result = REAGENT_ID_SEXONTHEBEACH
required_reagents = list(REAGENT_ID_VIRGINSEXONTHEBEACH = 5, REAGENT_ID_VODKA = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/eggnog
+/datum/decl/chemical_reaction/instant/drinks/eggnog
name = REAGENT_EGGNOG
id = REAGENT_ID_EGGNOG
result = REAGENT_ID_EGGNOG
required_reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_CREAM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
result_amount = 15
-/decl/chemical_reaction/instant/drinks/nuclearwaste_radium
+/datum/decl/chemical_reaction/instant/drinks/nuclearwaste_radium
name = REAGENT_NUCLEARWASTE + " 226"
id = "nuclearwasterad"
result = REAGENT_ID_NUCLEARWASTE
required_reagents = list(REAGENT_ID_OILSLICK = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/nuclearwaste_uranium
+/datum/decl/chemical_reaction/instant/drinks/nuclearwaste_uranium
name = REAGENT_NUCLEARWASTE + " 238"
id = "nuclearwasteuran"
result = REAGENT_ID_NUCLEARWASTE
required_reagents = list(REAGENT_ID_OILSLICK = 2, REAGENT_ID_URANIUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/sodaoil
+/datum/decl/chemical_reaction/instant/drinks/sodaoil
name = REAGENT_SODAOIL
id = REAGENT_ID_SODAOIL
result = REAGENT_ID_SODAOIL
required_reagents = list(REAGENT_ID_COOKINGOIL = 4, REAGENT_ID_SODAWATER = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/fusionnaire
+/datum/decl/chemical_reaction/instant/drinks/fusionnaire
name = REAGENT_FUSIONNAIRE
id = REAGENT_ID_FUSIONNAIRE
result = REAGENT_ID_FUSIONNAIRE
diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm
index bd8f09a317..a71eab8229 100644
--- a/code/modules/reagents/reactions/instant/drinks_vr.dm
+++ b/code/modules/reagents/reactions/instant/drinks_vr.dm
@@ -1,146 +1,146 @@
///////////////////////////////////////////////////////////////////////////////////
/// Special drinks
-/decl/chemical_reaction/instant/drinks/grubshake
+/datum/decl/chemical_reaction/instant/drinks/grubshake
name = "Grub protein drink"
id = REAGENT_ID_GRUBSHAKE
result = REAGENT_ID_GRUBSHAKE
required_reagents = list(REAGENT_ID_SHOCKCHEM = 5, REAGENT_ID_WATER = 25)
result_amount = 30
-/decl/chemical_reaction/instant/drinks/deathbell
+/datum/decl/chemical_reaction/instant/drinks/deathbell
name = REAGENT_DEATHBELL
id = REAGENT_ID_DEATHBELL
result = REAGENT_ID_DEATHBELL
required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SYNDICATEBOMB =1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/burnout
+/datum/decl/chemical_reaction/instant/drinks/burnout
name = REAGENT_BURNOUT
id = REAGENT_ID_BURNOUT
result = REAGENT_ID_BURNOUT
required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_DEATHBELL = 1, REAGENT_ID_LOVEMAKER =1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/monstertamer
+/datum/decl/chemical_reaction/instant/drinks/monstertamer
name = REAGENT_MONSTERTAMER
id = REAGENT_ID_MONSTERTAMER
result = REAGENT_ID_MONSTERTAMER
required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_PROTEIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/bigbeer
+/datum/decl/chemical_reaction/instant/drinks/bigbeer
name = REAGENT_BIGBEER
id = REAGENT_ID_BIGBEER
result = REAGENT_ID_BIGBEER
required_reagents = list(REAGENT_ID_SYNDICATEBOMB = 1, REAGENT_ID_MANLYDORF = 1, REAGENT_ID_GROG =1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/sweettea
+/datum/decl/chemical_reaction/instant/drinks/sweettea
name = "Sweetened Tea"
id = REAGENT_ID_SWEETTEA
result = REAGENT_ID_SWEETTEA
required_reagents = list(REAGENT_ID_ICETEA = 2, REAGENT_ID_SUGAR = 1,)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/unsweettea
+/datum/decl/chemical_reaction/instant/drinks/unsweettea
name = REAGENT_UNSWEETTEA
id = REAGENT_ID_UNSWEETTEA
result = REAGENT_ID_UNSWEETTEA
required_reagents = list(REAGENT_ID_SWEETTEA = 3, REAGENT_ID_PHORON = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/galacticpanic
+/datum/decl/chemical_reaction/instant/drinks/galacticpanic
name = REAGENT_GALACTICPANIC
id = REAGENT_ID_GALACTICPANIC
result = REAGENT_ID_GALACTICPANIC
required_reagents = list(REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SINGULO = 1, REAGENT_ID_PHORONSPECIAL =1, REAGENT_ID_NEUROTOXIN = 1, REAGENT_ID_ATOMICBOMB = 1, REAGENT_ID_HIPPIESDELIGHT = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/bulldog
+/datum/decl/chemical_reaction/instant/drinks/bulldog
name = REAGENT_BULLDOG
id = REAGENT_ID_BULLDOG
result = REAGENT_ID_BULLDOG
required_reagents = list(REAGENT_ID_WHITERUSSIAN = 4, REAGENT_ID_COLA =1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/sbagliato
+/datum/decl/chemical_reaction/instant/drinks/sbagliato
name = REAGENT_SBAGLIATO
id = REAGENT_ID_SBAGLIATO
result = REAGENT_ID_SBAGLIATO
required_reagents = list(REAGENT_ID_REDWINE = 1, REAGENT_ID_VERMOUTH = 1, REAGENT_ID_SODAWATER =1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/italiancrisis
+/datum/decl/chemical_reaction/instant/drinks/italiancrisis
name = REAGENT_ITALIANCRISIS
id = REAGENT_ID_ITALIANCRISIS
result = REAGENT_ID_ITALIANCRISIS
required_reagents = list(REAGENT_ID_BULLDOG = 1, REAGENT_ID_SBAGLIATO = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/sugarrush
+/datum/decl/chemical_reaction/instant/drinks/sugarrush
name = REAGENT_SUGARRUSH
id = REAGENT_ID_SUGARRUSH
result = REAGENT_ID_SUGARRUSH
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_VODKA =1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/lotus
+/datum/decl/chemical_reaction/instant/drinks/lotus
name = REAGENT_LOTUS
id = REAGENT_ID_LOTUS
result = REAGENT_ID_LOTUS
required_reagents = list(REAGENT_ID_SBAGLIATO = 1, REAGENT_ID_SUGARRUSH = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/shroomjuice
+/datum/decl/chemical_reaction/instant/drinks/shroomjuice
name = REAGENT_SHROOMJUICE
id = REAGENT_ID_SHROOMJUICE
result = REAGENT_ID_SHROOMJUICE
required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE =1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/russianroulette
+/datum/decl/chemical_reaction/instant/drinks/russianroulette
name = REAGENT_RUSSIANROULETTE
id =REAGENT_ID_RUSSIANROULETTE
result =REAGENT_ID_RUSSIANROULETTE
required_reagents = list(REAGENT_ID_WHITERUSSIAN = 5, REAGENT_ID_IRON = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/lovemaker
+/datum/decl/chemical_reaction/instant/drinks/lovemaker
name = REAGENT_LOVEMAKER
id = REAGENT_ID_LOVEMAKER
result = REAGENT_ID_LOVEMAKER
required_reagents = list(REAGENT_ID_HONEY = 1, REAGENT_ID_SEXONTHEBEACH = 5)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/honeyshot
+/datum/decl/chemical_reaction/instant/drinks/honeyshot
name = REAGENT_HONEYSHOT
id = REAGENT_ID_HONEYSHOT
result = REAGENT_ID_HONEYSHOT
required_reagents = list(REAGENT_ID_HONEY = 1, REAGENT_ID_VODKA = 1, REAGENT_ID_GRENADINE =1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/appletini
+/datum/decl/chemical_reaction/instant/drinks/appletini
name = REAGENT_APPLETINI
id = REAGENT_ID_APPLETINIT
result = REAGENT_ID_APPLETINIT
required_reagents = list(REAGENT_ID_APPLEJUICE = 2, REAGENT_ID_VODKA = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/glowingappletini
+/datum/decl/chemical_reaction/instant/drinks/glowingappletini
name = REAGENT_GLOWINGAPPLETINI
id = REAGENT_ID_GLOWINGAPPLETINI
result = REAGENT_ID_GLOWINGAPPLETINI
required_reagents = list(REAGENT_ID_APPLETINIT = 5, REAGENT_ID_URANIUM = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/scsatw
+/datum/decl/chemical_reaction/instant/drinks/scsatw
name = REAGENT_SCSATW
id = REAGENT_ID_SCSATW
result = REAGENT_ID_SCSATW
required_reagents = list(REAGENT_ID_SCREWDRIVERCOCKTAIL = 3, REAGENT_ID_RUM =1, REAGENT_ID_WHISKEY =1, REAGENT_ID_GIN =1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/choccymilk
+/datum/decl/chemical_reaction/instant/drinks/choccymilk
name = REAGENT_CHOCCYMILK
id = REAGENT_ID_CHOCCYMILK
result = REAGENT_ID_CHOCCYMILK
@@ -148,35 +148,35 @@
required_reagents = list(REAGENT_ID_MILK = 3, REAGENT_ID_COCO = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/redspaceflush
+/datum/decl/chemical_reaction/instant/drinks/redspaceflush
name = "Redspace Flush"
id = REAGENT_ID_REDSPACEFLUSH
result = REAGENT_ID_REDSPACEFLUSH
required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_WHISKEY = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/graveyard
+/datum/decl/chemical_reaction/instant/drinks/graveyard
name = REAGENT_GRAVEYARD
id = REAGENT_ID_GRAVEYARD
result = REAGENT_ID_GRAVEYARD
required_reagents = list(REAGENT_ID_COLA = 1, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_DRGIBB =1, REAGENT_ID_SPACEUP = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/hairoftherat
+/datum/decl/chemical_reaction/instant/drinks/hairoftherat
name = REAGENT_HAIROFTHERAT
id = REAGENT_ID_HAIROFTHERAT
result = REAGENT_ID_HAIROFTHERAT
required_reagents = list(REAGENT_ID_MONSTERTAMER = 2, REAGENT_ID_NUTRIMENT = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/pink_russian
+/datum/decl/chemical_reaction/instant/drinks/pink_russian
name = REAGENT_PINKRUSSIAN
id = REAGENT_ID_PINKRUSSIAN
result = REAGENT_ID_PINKRUSSIAN
required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 2, REAGENT_ID_BERRYSHAKE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/originalsin
+/datum/decl/chemical_reaction/instant/drinks/originalsin
name = REAGENT_ORIGINALSIN
id = REAGENT_ID_ORIGINALSIN
result = REAGENT_ID_ORIGINALSIN
@@ -184,63 +184,63 @@
catalysts = list(REAGENT_ID_APPLEJUICE = 1)
result_amount = 1
-/decl/chemical_reaction/instant/drinks/windgarita
+/datum/decl/chemical_reaction/instant/drinks/windgarita
name = REAGENT_WINDGARITA
id = REAGENT_ID_WINDGARITA
result = REAGENT_ID_WINDGARITA
required_reagents = list(REAGENT_ID_MARGARITA = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, REAGENT_ID_MELONLIQUOR = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/newyorksour
+/datum/decl/chemical_reaction/instant/drinks/newyorksour
name = REAGENT_NEWYORKSOUR
id = REAGENT_ID_NEWYORKSOUR
result = REAGENT_ID_NEWYORKSOUR
required_reagents = list(REAGENT_ID_WHISKEYSOUR = 3, REAGENT_ID_REDWINE = 2, REAGENT_ID_EGG = 1)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/mudslide
+/datum/decl/chemical_reaction/instant/drinks/mudslide
name = REAGENT_MUDSLIDE
id = REAGENT_ID_MUDSLIDE
result = REAGENT_ID_MUDSLIDE
required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 1, REAGENT_ID_IRISHCREAM = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/protein_shake
+/datum/decl/chemical_reaction/instant/drinks/protein_shake
name = REAGENT_PROTEINSHAKE
id = REAGENT_ID_PROTEINSHAKE
result = REAGENT_ID_PROTEINSHAKE
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_PROTEINPOWDER = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/protein_shake/vanilla
+/datum/decl/chemical_reaction/instant/drinks/protein_shake/vanilla
name = REAGENT_VANILLAPROTEINSHAKE
id = REAGENT_ID_VANILLAPROTEINSHAKER
result = REAGENT_ID_VANILLAPROTEINSHAKER
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VANILLAPROTEINPOWDER = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/protein_shake/banana
+/datum/decl/chemical_reaction/instant/drinks/protein_shake/banana
name = REAGENT_BANANAPROTEINSHAKE
id = REAGENT_ID_BANANAPROTEINSHAKE
result = REAGENT_ID_BANANAPROTEINSHAKE
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_BANANAPROTEINPOWDER = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/protein_shake/chocolate
+/datum/decl/chemical_reaction/instant/drinks/protein_shake/chocolate
name = REAGENT_CHOCOLATEPROTEINSHAKE
id = REAGENT_ID_CHOCOLATEPROTEINSHAKE
result = REAGENT_ID_CHOCOLATEPROTEINSHAKE
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_CHOCOLATEPROTEINPOWDER = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/protein_shake/strawberry
+/datum/decl/chemical_reaction/instant/drinks/protein_shake/strawberry
name = REAGENT_STRAWBERRYPROTEINSHAKE
id = REAGENT_ID_STRAWBERRYPROTEINSHAKE
result = REAGENT_ID_STRAWBERRYPROTEINSHAKE
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_STRAWBERRYPROTEINPOWDER = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/manager_summoner
+/datum/decl/chemical_reaction/instant/drinks/manager_summoner
name = REAGENT_MANAGERSUMMONER
id = REAGENT_ID_MANAGERSUMMONER
result = REAGENT_ID_MANAGERSUMMONER
diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm
index f9bbc234d3..3bb59333a4 100644
--- a/code/modules/reagents/reactions/instant/food.dm
+++ b/code/modules/reagents/reactions/instant/food.dm
@@ -1,15 +1,15 @@
-/decl/chemical_reaction/instant/food
+/datum/decl/chemical_reaction/instant/food
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
wiki_flag = WIKI_FOOD
-/decl/chemical_reaction/instant/food/hell_ramen
+/datum/decl/chemical_reaction/instant/food/hell_ramen
name = REAGENT_HELLRAMEN
id = REAGENT_ID_HELLRAMEN
result = REAGENT_ID_HELLRAMEN
required_reagents = list(REAGENT_ID_CAPSAICIN = 1, REAGENT_ID_HOTRAMEN = 6)
result_amount = 6
-/decl/chemical_reaction/instant/food/tofu
+/datum/decl/chemical_reaction/instant/food/tofu
name = "Tofu"
id = REAGENT_ID_TOFU
result = null
@@ -17,13 +17,13 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
-/decl/chemical_reaction/instant/food/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/tofu(location)
return
-/decl/chemical_reaction/instant/food/chocolate_bar
+/datum/decl/chemical_reaction/instant/food/chocolate_bar
name = "Chocolate Bar Soy"
id = "chocolate_bar_soy"
result = null
@@ -31,13 +31,13 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
-/decl/chemical_reaction/instant/food/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
return
-/decl/chemical_reaction/instant/food/chocolate_bar2
+/datum/decl/chemical_reaction/instant/food/chocolate_bar2
name = "Chocolate Bar Milk"
id = "chocolate_bar_milk"
result = null
@@ -45,13 +45,13 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
-/decl/chemical_reaction/instant/food/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
return
-/decl/chemical_reaction/instant/food/cookingoilcorn
+/datum/decl/chemical_reaction/instant/food/cookingoilcorn
name = "corn " + REAGENT_COOKINGOIL
id = "cookingoilcorn"
result = REAGENT_ID_COOKINGOIL
@@ -60,7 +60,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/food/cookingoilpeanut
+/datum/decl/chemical_reaction/instant/food/cookingoilpeanut
name = "peanut " + REAGENT_ID_COOKINGOIL
id = "cookingoilpeanut"
result = REAGENT_ID_COOKINGOIL
@@ -69,28 +69,28 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
-/decl/chemical_reaction/instant/food/soysauce
+/datum/decl/chemical_reaction/instant/food/soysauce
name = REAGENT_SOYSAUCE
id = REAGENT_ID_SOYSAUCE
result = REAGENT_ID_SOYSAUCE
required_reagents = list(REAGENT_ID_SOYMILK = 4, REAGENT_ID_SACID = 1)
result_amount = 5
-/decl/chemical_reaction/instant/food/ketchup
+/datum/decl/chemical_reaction/instant/food/ketchup
name = REAGENT_KETCHUP
id = REAGENT_ID_KETCHUP
result = REAGENT_ID_KETCHUP
required_reagents = list(REAGENT_ID_TOMATOJUICE = 2, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1)
result_amount = 4
-/decl/chemical_reaction/instant/food/barbecue
+/datum/decl/chemical_reaction/instant/food/barbecue
name = REAGENT_BARBECUE
id = REAGENT_ID_BARBECUE
result = REAGENT_ID_BARBECUE
required_reagents = list(REAGENT_ID_TOMATOJUICE = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SPACESPICE = 1)
result_amount = 4
-/decl/chemical_reaction/instant/food/peanutbutter
+/datum/decl/chemical_reaction/instant/food/peanutbutter
name = REAGENT_PEANUTBUTTER
id = REAGENT_ID_PEANUTBUTTER
result = REAGENT_ID_PEANUTBUTTER
@@ -98,14 +98,14 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 3
-/decl/chemical_reaction/instant/food/mayonnaise
+/datum/decl/chemical_reaction/instant/food/mayonnaise
name = REAGENT_MAYO
id = REAGENT_ID_MAYO
result = REAGENT_ID_MAYO
required_reagents = list(REAGENT_ID_EGG = 9, REAGENT_ID_COOKINGOIL = 5, REAGENT_ID_LEMONJUICE = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
result_amount = 15
-/decl/chemical_reaction/instant/food/cheesewheel
+/datum/decl/chemical_reaction/instant/food/cheesewheel
name = "Cheesewheel"
id = "cheesewheel"
result = null
@@ -113,13 +113,13 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
-/decl/chemical_reaction/instant/food/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel(location)
return
-/decl/chemical_reaction/instant/food/meatball
+/datum/decl/chemical_reaction/instant/food/meatball
name = "Meatball"
id = "meatball"
result = null
@@ -127,13 +127,13 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 3
-/decl/chemical_reaction/instant/food/meatball/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/meatball/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/meatball(location)
return
-/decl/chemical_reaction/instant/food/dough
+/datum/decl/chemical_reaction/instant/food/dough
name = "Dough"
id = "dough"
result = null
@@ -141,20 +141,20 @@
inhibitors = list(REAGENT_ID_WATER = 1, REAGENT_ID_BEER = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes
result_amount = 1
-/decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/dough(location)
return
-/decl/chemical_reaction/instant/food/syntiflesh
+/datum/decl/chemical_reaction/instant/food/syntiflesh
name = "Syntiflesh"
id = "syntiflesh"
result = null
required_reagents = list(REAGENT_ID_BLOOD = 5, REAGENT_ID_CLONEXADONE = 5)
result_amount = 1
-/decl/chemical_reaction/instant/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/meat/syntiflesh(location)
@@ -166,42 +166,42 @@
====================
*/
-/decl/chemical_reaction/instant/food/coating/batter
+/datum/decl/chemical_reaction/instant/food/coating/batter
name = "Batter"
id = REAGENT_ID_BATTER
result = REAGENT_ID_BATTER
required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
result_amount = 20
-/decl/chemical_reaction/instant/food/coating/beerbatter
+/datum/decl/chemical_reaction/instant/food/coating/beerbatter
name = "Beer Batter"
id = REAGENT_ID_BEERBATTER
result = REAGENT_ID_BEERBATTER
required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, REAGENT_ID_BEER = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
result_amount = 20
-/decl/chemical_reaction/instant/food/browniemix
+/datum/decl/chemical_reaction/instant/food/browniemix
name = REAGENT_BROWNIEMIX
id = REAGENT_ID_BROWNIEMIX
result = REAGENT_ID_BROWNIEMIX
required_reagents = list(REAGENT_ID_FLOUR = 5, REAGENT_ID_COCO = 5, REAGENT_ID_SUGAR = 5)
result_amount = 15
-/decl/chemical_reaction/instant/food/cakebatter
+/datum/decl/chemical_reaction/instant/food/cakebatter
name = REAGENT_CAKEBATTER
id = REAGENT_ID_CAKEBATTER
result = REAGENT_ID_CAKEBATTER
required_reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 15, REAGENT_ID_EGG = 3)
result_amount = 60
-/decl/chemical_reaction/instant/food/butter
+/datum/decl/chemical_reaction/instant/food/butter
name = "Butter"
id = "butter"
result = null
required_reagents = list(REAGENT_ID_CREAM = 20, REAGENT_ID_SODIUMCHLORIDE = 1)
result_amount = 1
-/decl/chemical_reaction/instant/food/butter/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/butter/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/spreads/butter(location)
diff --git a/code/modules/reagents/reactions/instant/food_ch.dm b/code/modules/reagents/reactions/instant/food_ch.dm
index b2854ea60a..2ab167a5f8 100644
--- a/code/modules/reagents/reactions/instant/food_ch.dm
+++ b/code/modules/reagents/reactions/instant/food_ch.dm
@@ -1,20 +1,20 @@
//////////////////////////////////////////////
////////////////C U B E S////////////////////
////////////////////////////////////////////
-/decl/chemical_reaction/instant/cube/sagaru
+/datum/decl/chemical_reaction/instant/cube/sagaru
name = "Saguwu"
id = "cubedsagaru"
result = null
required_reagents = list(REAGENT_ID_CHEESE = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_CLONEXADONE = 10,)
result_amount = 1
-/decl/chemical_reaction/instant/cube/sagaru/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/cube/sagaru/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/monkeycube/sarucube(location)
return
-/decl/chemical_reaction/instant/food/blondiemix
+/datum/decl/chemical_reaction/instant/food/blondiemix
name = REAGENT_BLONDIEMIX
id = REAGENT_ID_BLONDIEMIX
result = REAGENT_ID_BLONDIEMIX
diff --git a/code/modules/reagents/reactions/instant/food_vr.dm b/code/modules/reagents/reactions/instant/food_vr.dm
index cf34c86468..87c0fec112 100644
--- a/code/modules/reagents/reactions/instant/food_vr.dm
+++ b/code/modules/reagents/reactions/instant/food_vr.dm
@@ -1,2 +1,2 @@
-/decl/chemical_reaction/instant/food/syntiflesh
+/datum/decl/chemical_reaction/instant/food/syntiflesh
required_reagents = list(REAGENT_ID_BLOOD = 5, REAGENT_ID_CLONEXADONE = 1)
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index 730ff75036..75461a5008 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -3,10 +3,10 @@
/* Common reactions */
-/decl/chemical_reaction/instant
+/datum/decl/chemical_reaction/instant
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
-/decl/chemical_reaction/instant/inaprovaline
+/datum/decl/chemical_reaction/instant/inaprovaline
name = REAGENT_INAPROVALINE
id = REAGENT_ID_INAPROVALINE
result = REAGENT_ID_INAPROVALINE
@@ -14,14 +14,14 @@
inhibitors = list(REAGENT_ID_WATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/dylovene
+/datum/decl/chemical_reaction/instant/dylovene
name = REAGENT_ANTITOXIN
id = REAGENT_ID_ANTITOXIN
result = REAGENT_ID_ANTITOXIN
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_NITROGEN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/carthatoline
+/datum/decl/chemical_reaction/instant/carthatoline
name = REAGENT_CARTHATOLINE
id = REAGENT_ID_CARTHATOLINE
result = REAGENT_ID_CARTHATOLINE
@@ -29,21 +29,21 @@
catalysts = list(REAGENT_ID_PHORON = 1)
result_amount = 2
-/decl/chemical_reaction/instant/paracetamol
+/datum/decl/chemical_reaction/instant/paracetamol
name = REAGENT_PARACETAMOL
id = REAGENT_ID_PARACETAMOL
result = REAGENT_ID_PARACETAMOL
required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_WATER = 1)
result_amount = 2
-/decl/chemical_reaction/instant/tramadol
+/datum/decl/chemical_reaction/instant/tramadol
name = REAGENT_TRAMADOL
id = REAGENT_ID_TRAMADOL
result = REAGENT_ID_TRAMADOL
required_reagents = list(REAGENT_ID_PARACETAMOL = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/oxycodone
+/datum/decl/chemical_reaction/instant/oxycodone
name = REAGENT_OXYCODONE
id = REAGENT_ID_OXYCODONE
result = REAGENT_ID_OXYCODONE
@@ -51,28 +51,28 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
-/decl/chemical_reaction/instant/sterilizine
+/datum/decl/chemical_reaction/instant/sterilizine
name = REAGENT_STERILIZINE
id = REAGENT_ID_STERILIZINE
result = REAGENT_ID_STERILIZINE
required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_CHLORINE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/silicate
+/datum/decl/chemical_reaction/instant/silicate
name = REAGENT_SILICATE
id = REAGENT_ID_SILICATE
result = REAGENT_ID_SILICATE
required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_SILICON = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/mutagen
+/datum/decl/chemical_reaction/instant/mutagen
name = REAGENT_MUTAGEN
id = REAGENT_ID_MUTAGEN
result = REAGENT_ID_MUTAGEN
required_reagents = list(REAGENT_ID_RADIUM = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_CHLORINE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/water
+/datum/decl/chemical_reaction/instant/water
name = REAGENT_WATER
id = REAGENT_ID_WATER
result = REAGENT_ID_WATER
@@ -80,63 +80,63 @@
inhibitors = list(REAGENT_ID_SODIUM = 1, REAGENT_ID_CARBON = 1) // So it doesnt turn into water when you try to make lye. // CHOMPEdit
result_amount = 1
-/decl/chemical_reaction/instant/thermite
+/datum/decl/chemical_reaction/instant/thermite
name = REAGENT_THERMITE
id = REAGENT_ID_THERMITE
result = REAGENT_ID_THERMITE
required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_IRON = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/bliss
+/datum/decl/chemical_reaction/instant/bliss
name = REAGENT_BLISS
id = REAGENT_ID_BLISS
result = REAGENT_ID_BLISS
required_reagents = list(REAGENT_ID_MERCURY = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_LITHIUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/lube
+/datum/decl/chemical_reaction/instant/lube
name = REAGENT_LUBE
id = REAGENT_ID_LUBE
result = REAGENT_ID_LUBE
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_SILICON = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 4
-/decl/chemical_reaction/instant/pacid
+/datum/decl/chemical_reaction/instant/pacid
name = REAGENT_PACID
id = REAGENT_ID_PACID
result = REAGENT_ID_PACID
required_reagents = list(REAGENT_ID_SACID = 1, REAGENT_ID_CHLORINE = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/synaptizine
+/datum/decl/chemical_reaction/instant/synaptizine
name = REAGENT_SYNAPTIZINE
id = REAGENT_ID_SYNAPTIZINE
result = REAGENT_ID_SYNAPTIZINE
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_LITHIUM = 1, REAGENT_ID_WATER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/hyronalin
+/datum/decl/chemical_reaction/instant/hyronalin
name = REAGENT_HYRONALIN
id = REAGENT_ID_HYRONALIN
result = REAGENT_ID_HYRONALIN
required_reagents = list(REAGENT_ID_RADIUM = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/arithrazine
+/datum/decl/chemical_reaction/instant/arithrazine
name = REAGENT_ARITHRAZINE
id = REAGENT_ID_ARITHRAZINE
result = REAGENT_ID_ARITHRAZINE
required_reagents = list(REAGENT_ID_HYRONALIN = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/impedrezene
+/datum/decl/chemical_reaction/instant/impedrezene
name = REAGENT_IMPEDREZENE
id = REAGENT_ID_IMPEDREZENE
result = REAGENT_ID_IMPEDREZENE
required_reagents = list(REAGENT_ID_MERCURY = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1)
result_amount = 2
-/decl/chemical_reaction/instant/kelotane
+/datum/decl/chemical_reaction/instant/kelotane
name = REAGENT_KELOTANE
id = REAGENT_ID_KELOTANE
result = REAGENT_ID_KELOTANE
@@ -145,7 +145,7 @@
result_amount = 2
log_is_important = 1
-/decl/chemical_reaction/instant/peridaxon
+/datum/decl/chemical_reaction/instant/peridaxon
name = REAGENT_PERIDAXON
id = REAGENT_ID_PERIDAXON
result = REAGENT_ID_PERIDAXON
@@ -153,7 +153,7 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
-/decl/chemical_reaction/instant/osteodaxon
+/datum/decl/chemical_reaction/instant/osteodaxon
name = REAGENT_OSTEODAXON
id = REAGENT_ID_OSTEODAXON
result = REAGENT_ID_OSTEODAXON
@@ -162,7 +162,7 @@
inhibitors = list(REAGENT_ID_CLONEXADONE = 1) // Messes with cryox
result_amount = 2
-/decl/chemical_reaction/instant/respirodaxon
+/datum/decl/chemical_reaction/instant/respirodaxon
name = REAGENT_RESPIRODAXON
id = REAGENT_ID_RESPIRODAXON
result = REAGENT_ID_RESPIRODAXON
@@ -171,7 +171,7 @@
inhibitors = list(REAGENT_ID_DEXALIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/gastirodaxon
+/datum/decl/chemical_reaction/instant/gastirodaxon
name = REAGENT_GASTIRODAXON
id = REAGENT_ID_GASTIRODAXON
result = REAGENT_ID_GASTIRODAXON
@@ -180,7 +180,7 @@
inhibitors = list(REAGENT_ID_LITHIUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/hepanephrodaxon
+/datum/decl/chemical_reaction/instant/hepanephrodaxon
name = REAGENT_HEPANEPHRODAXON
id = REAGENT_ID_HEPANEPHRODAXON
result = REAGENT_ID_HEPANEPHRODAXON
@@ -189,7 +189,7 @@
inhibitors = list(REAGENT_ID_TUNGSTEN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/cordradaxon
+/datum/decl/chemical_reaction/instant/cordradaxon
name = REAGENT_CORDRADAXON
id = REAGENT_ID_CORDRADAXON
result = REAGENT_ID_CORDRADAXON
@@ -198,14 +198,14 @@
inhibitors = list(REAGENT_ID_CLONEXADONE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/virus_food
+/datum/decl/chemical_reaction/instant/virus_food
name = REAGENT_VIRUSFOOD
id = REAGENT_ID_VIRUSFOOD
result = REAGENT_ID_VIRUSFOOD
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_MILK = 1)
result_amount = 5
-/decl/chemical_reaction/instant/leporazine
+/datum/decl/chemical_reaction/instant/leporazine
name = REAGENT_LEPORAZINE
id = REAGENT_ID_LEPORAZINE
result = REAGENT_ID_LEPORAZINE
@@ -213,28 +213,28 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
-/decl/chemical_reaction/instant/cryptobiolin
+/datum/decl/chemical_reaction/instant/cryptobiolin
name = REAGENT_CRYPTOBIOLIN
id = REAGENT_ID_CRYPTOBIOLIN
result = REAGENT_ID_CRYPTOBIOLIN
required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
-/decl/chemical_reaction/instant/tricordrazine
+/datum/decl/chemical_reaction/instant/tricordrazine
name = REAGENT_TRICORDRAZINE
id = REAGENT_ID_TRICORDRAZINE
result = REAGENT_ID_TRICORDRAZINE
required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/alkysine
+/datum/decl/chemical_reaction/instant/alkysine
name = REAGENT_ALKYSINE
id = REAGENT_ID_ALKYSINE
result = REAGENT_ID_ALKYSINE
required_reagents = list(REAGENT_ID_CHLORINE = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/dexalin
+/datum/decl/chemical_reaction/instant/dexalin
name = REAGENT_DEXALIN
id = REAGENT_ID_DEXALIN
result = REAGENT_ID_DEXALIN
@@ -243,21 +243,21 @@
inhibitors = list(REAGENT_ID_WATER = 1, REAGENT_ID_TIN = 1) // Messes with cryox, and oxygen distilling
result_amount = 1
-/decl/chemical_reaction/instant/dermaline
+/datum/decl/chemical_reaction/instant/dermaline
name = REAGENT_DERMALINE
id = REAGENT_ID_DERMALINE
result = REAGENT_ID_DERMALINE
required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_KELOTANE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/dexalinp
+/datum/decl/chemical_reaction/instant/dexalinp
name = REAGENT_DEXALINP
id = REAGENT_ID_DEXALINP
result = REAGENT_ID_DEXALINP
required_reagents = list(REAGENT_ID_DEXALIN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_IRON = 1)
result_amount = 3
-/decl/chemical_reaction/instant/bicaridine
+/datum/decl/chemical_reaction/instant/bicaridine
name = REAGENT_BICARIDINE
id = REAGENT_ID_BICARIDINE
result = REAGENT_ID_BICARIDINE
@@ -265,21 +265,21 @@
inhibitors = list(REAGENT_ID_SUGAR = 1) // Messes up with inaprovaline
result_amount = 2
-/decl/chemical_reaction/instant/myelamine
+/datum/decl/chemical_reaction/instant/myelamine
name = REAGENT_MYELAMINE
id = REAGENT_ID_MYELAMINE
result = REAGENT_ID_MYELAMINE
required_reagents = list(REAGENT_ID_BICARIDINE = 1, REAGENT_ID_IRON = 2, REAGENT_ID_SPIDERTOXIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/hyperzine
+/datum/decl/chemical_reaction/instant/hyperzine
name = REAGENT_HYPERZINE
id = REAGENT_ID_HYPERZINE
result = REAGENT_ID_HYPERZINE
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_SULFUR = 1)
result_amount = 3
-/decl/chemical_reaction/instant/stimm
+/datum/decl/chemical_reaction/instant/stimm
name = REAGENT_STIMM
id = REAGENT_ID_STIMM
result = REAGENT_ID_STIMM
@@ -287,21 +287,21 @@
catalysts = list(REAGENT_ID_FUEL = 5)
result_amount = 2
-/decl/chemical_reaction/instant/ryetalyn
+/datum/decl/chemical_reaction/instant/ryetalyn
name = REAGENT_RYETALYN
id = REAGENT_ID_RYETALYN
result = REAGENT_ID_RYETALYN
required_reagents = list(REAGENT_ID_ARITHRAZINE = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
-/decl/chemical_reaction/instant/cryoxadone
+/datum/decl/chemical_reaction/instant/cryoxadone
name = REAGENT_CRYOXADONE
id = REAGENT_ID_CRYOXADONE
result = REAGENT_ID_CRYOXADONE
required_reagents = list(REAGENT_ID_DEXALIN = 1, REAGENT_ID_WATER = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/clonexadone
+/datum/decl/chemical_reaction/instant/clonexadone
name = REAGENT_CLONEXADONE
id = REAGENT_ID_CLONEXADONE
result = REAGENT_ID_CLONEXADONE
@@ -309,7 +309,7 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
-/decl/chemical_reaction/instant/mortiferin
+/datum/decl/chemical_reaction/instant/mortiferin
name = REAGENT_MORTIFERIN
id = REAGENT_ID_MORTIFERIN
result = REAGENT_ID_MORTIFERIN
@@ -317,14 +317,14 @@
result_amount = 2
catalysts = list(REAGENT_ID_PHORON = 5)
-/decl/chemical_reaction/instant/spaceacillin
+/datum/decl/chemical_reaction/instant/spaceacillin
name = REAGENT_SPACEACILLIN
id = REAGENT_ID_SPACEACILLIN
result = REAGENT_ID_SPACEACILLIN
required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_INAPROVALINE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/corophizine
+/datum/decl/chemical_reaction/instant/corophizine
name = REAGENT_COROPHIZINE
id = REAGENT_ID_COROPHIZINE
result = REAGENT_ID_COROPHIZINE
@@ -332,7 +332,7 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
-/decl/chemical_reaction/instant/immunosuprizine
+/datum/decl/chemical_reaction/instant/immunosuprizine
name = REAGENT_IMMUNOSUPRIZINE
id = REAGENT_ID_IMMUNOSUPRIZINE
result = REAGENT_ID_IMMUNOSUPRIZINE
@@ -340,28 +340,28 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
-/decl/chemical_reaction/instant/imidazoline
+/datum/decl/chemical_reaction/instant/imidazoline
name = REAGENT_ID_IMIDAZOLINE
id = REAGENT_ID_IMIDAZOLINE
result = REAGENT_ID_IMIDAZOLINE
required_reagents = list(REAGENT_ID_CARBON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/ethylredoxrazine
+/datum/decl/chemical_reaction/instant/ethylredoxrazine
name = REAGENT_ETHYLREDOXRAZINE
id = REAGENT_ID_ETHYLREDOXRAZINE
result = REAGENT_ID_ETHYLREDOXRAZINE
required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_CARBON = 1)
result_amount = 3
-/decl/chemical_reaction/instant/calciumcarbonate
+/datum/decl/chemical_reaction/instant/calciumcarbonate
name = "Calcium Carbonate"
id = REAGENT_ID_CALCIUMCARBONATE
result = REAGENT_ID_CALCIUMCARBONATE
required_reagents = list(REAGENT_ID_OXYGEN = 3, REAGENT_ID_CALCIUM = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
-/decl/chemical_reaction/instant/soporific
+/datum/decl/chemical_reaction/instant/soporific
name = REAGENT_STOXIN
id = REAGENT_ID_STOXIN
result = REAGENT_ID_STOXIN
@@ -369,41 +369,41 @@
inhibitors = list(REAGENT_ID_PHOSPHORUS = 1) // Messes with the smoke
result_amount = 5
-/decl/chemical_reaction/instant/chloralhydrate
+/datum/decl/chemical_reaction/instant/chloralhydrate
name = REAGENT_CHLORALHYDRATE
id = REAGENT_ID_CHLORALHYDRATE
result = REAGENT_ID_CHLORALHYDRATE
required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_CHLORINE = 3, REAGENT_ID_WATER = 1)
result_amount = 1
-/decl/chemical_reaction/instant/potassium_chloride
+/datum/decl/chemical_reaction/instant/potassium_chloride
name = REAGENT_POTASSIUMCHLORIDE
id = REAGENT_ID_POTASSIUMCHLORIDE
result = REAGENT_ID_POTASSIUMCHLORIDE
required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 2
-/decl/chemical_reaction/instant/potassium_chlorophoride
+/datum/decl/chemical_reaction/instant/potassium_chlorophoride
name = REAGENT_POTASSIUMCHLOROPHORIDE
id = REAGENT_ID_POTASSIUMCHLOROPHORIDE
result = REAGENT_ID_POTASSIUMCHLOROPHORIDE
required_reagents = list(REAGENT_ID_POTASSIUMCHLORIDE = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_CHLORALHYDRATE = 1)
result_amount = 4
-/decl/chemical_reaction/instant/zombiepowder
+/datum/decl/chemical_reaction/instant/zombiepowder
name = REAGENT_ZOMBIEPOWDER
id = REAGENT_ID_ZOMBIEPOWDER
result = REAGENT_ID_ZOMBIEPOWDER
required_reagents = list(REAGENT_ID_CARPOTOXIN = 5, REAGENT_ID_STOXIN = 5, REAGENT_ID_COPPER = 5)
result_amount = 2
-/decl/chemical_reaction/instant/zombiepowder/alt
+/datum/decl/chemical_reaction/instant/zombiepowder/alt
name = REAGENT_ZOMBIEPOWDER + "_alternative_mix"
id = REAGENT_ID_ZOMBIEPOWDER + "_alternative_mix"
required_reagents = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE = 5, REAGENT_ID_STOXIN = 5, REAGENT_ID_CHLORALHYDRATE = 5, REAGENT_ID_MERCURY = 5)
result_amount = 2
-/decl/chemical_reaction/instant/carpotoxin
+/datum/decl/chemical_reaction/instant/carpotoxin
name = REAGENT_CARPOTOXIN
id = REAGENT_ID_CARPOTOXIN
result = REAGENT_ID_CARPOTOXIN
@@ -412,28 +412,28 @@
inhibitors = list(REAGENT_ID_RADIUM = 1)
result_amount = 2
-/decl/chemical_reaction/instant/mindbreaker
+/datum/decl/chemical_reaction/instant/mindbreaker
name = REAGENT_MINDBREAKER
id = REAGENT_ID_MINDBREAKER
result = REAGENT_ID_MINDBREAKER
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/lipozine
+/datum/decl/chemical_reaction/instant/lipozine
name = REAGENT_LIPOZINE
id = REAGENT_ID_LIPOZINE
result = REAGENT_ID_LIPOZINE
required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_RADIUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/surfactant
+/datum/decl/chemical_reaction/instant/surfactant
name = "Foam surfactant"
id = "foam surfactant"
result = REAGENT_ID_FLUOROSURFACTANT
required_reagents = list(REAGENT_ID_FLUORINE = 2, REAGENT_ID_CARBON = 2, REAGENT_ID_SACID = 1)
result_amount = 5
-/decl/chemical_reaction/instant/ammonia
+/datum/decl/chemical_reaction/instant/ammonia
name = REAGENT_AMMONIA
id = REAGENT_ID_AMMONIA
result = REAGENT_ID_AMMONIA
@@ -441,14 +441,14 @@
inhibitors = list(REAGENT_ID_PHORON = 1) // Messes with lexorin
result_amount = 3
-/decl/chemical_reaction/instant/diethylamine
+/datum/decl/chemical_reaction/instant/diethylamine
name = REAGENT_DIETHYLAMINE
id = REAGENT_ID_DIETHYLAMINE
result = REAGENT_ID_DIETHYLAMINE
required_reagents = list (REAGENT_ID_AMMONIA = 1, REAGENT_ID_ETHANOL = 1)
result_amount = 2
-/decl/chemical_reaction/instant/lye
+/datum/decl/chemical_reaction/instant/lye
name = REAGENT_LYE
id = REAGENT_ID_LYE
result = REAGENT_ID_LYE
@@ -456,49 +456,49 @@
required_reagents = list(REAGENT_ID_SODIUM = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/left4zed
+/datum/decl/chemical_reaction/instant/left4zed
name = "Left4Zed"
id = REAGENT_ID_LEFT4ZED
result = REAGENT_ID_LEFT4ZED
required_reagents = list (REAGENT_ID_DIETHYLAMINE = 2, REAGENT_ID_MUTAGEN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/robustharvest
+/datum/decl/chemical_reaction/instant/robustharvest
name = "RobustHarvest"
id = REAGENT_ID_ROBUSTHARVEST
result = REAGENT_ID_ROBUSTHARVEST
required_reagents = list (REAGENT_ID_AMMONIA = 1, REAGENT_ID_CALCIUM = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/space_cleaner
+/datum/decl/chemical_reaction/instant/space_cleaner
name = REAGENT_CLEANER
id = REAGENT_ID_CLEANER
result = REAGENT_ID_CLEANER
required_reagents = list(REAGENT_ID_AMMONIA = 1, REAGENT_ID_WATER = 1)
result_amount = 2
-/decl/chemical_reaction/instant/plantbgone
+/datum/decl/chemical_reaction/instant/plantbgone
name = REAGENT_PLANTBGONE
id = REAGENT_ID_PLANTBGONE
result = REAGENT_ID_PLANTBGONE
required_reagents = list(REAGENT_ID_TOXIN = 1, REAGENT_ID_WATER = 4)
result_amount = 5
-/decl/chemical_reaction/instant/foaming_agent
+/datum/decl/chemical_reaction/instant/foaming_agent
name = "Foaming Agent"
id = REAGENT_ID_FOAMINGAGENT
result = REAGENT_ID_FOAMINGAGENT
required_reagents = list(REAGENT_ID_LITHIUM = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 1
-/decl/chemical_reaction/instant/glycerol
+/datum/decl/chemical_reaction/instant/glycerol
name = REAGENT_GLYCEROL
id = REAGENT_ID_GLYCEROL
result = REAGENT_ID_GLYCEROL
required_reagents = list(REAGENT_ID_CORNOIL = 3, REAGENT_ID_SACID = 1)
result_amount = 1
-/decl/chemical_reaction/instant/sodiumchloride
+/datum/decl/chemical_reaction/instant/sodiumchloride
name = "Sodium Chloride"
id = REAGENT_ID_SODIUMCHLORIDE
result = REAGENT_ID_SODIUMCHLORIDE
@@ -506,7 +506,7 @@
inhibitors = list(REAGENT_ID_COPPER = 1)
result_amount = 2
-/decl/chemical_reaction/instant/condensedcapsaicin
+/datum/decl/chemical_reaction/instant/condensedcapsaicin
name = REAGENT_CONDENSEDCAPSAICIN
id = REAGENT_ID_CONDENSEDCAPSAICIN
result = REAGENT_ID_CONDENSEDCAPSAICIN
@@ -514,7 +514,7 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
-/decl/chemical_reaction/instant/coolant
+/datum/decl/chemical_reaction/instant/coolant
name = REAGENT_COOLANT
id = REAGENT_ID_COOLANT
result = REAGENT_ID_COOLANT
@@ -522,14 +522,14 @@
result_amount = 3
log_is_important = 1
-/decl/chemical_reaction/instant/rezadone
+/datum/decl/chemical_reaction/instant/rezadone
name = REAGENT_REZADONE
id = REAGENT_ID_REZADONE
result = REAGENT_ID_REZADONE
required_reagents = list(REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_COPPER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/lexorin
+/datum/decl/chemical_reaction/instant/lexorin
name = REAGENT_LEXORIN
id = REAGENT_ID_LEXORIN
result = REAGENT_ID_LEXORIN
@@ -537,35 +537,35 @@
inhibitors = list(REAGENT_ID_COPPER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/methylphenidate
+/datum/decl/chemical_reaction/instant/methylphenidate
name = REAGENT_METHYLPHENIDATE
id = REAGENT_ID_METHYLPHENIDATE
result = REAGENT_ID_METHYLPHENIDATE
required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/citalopram
+/datum/decl/chemical_reaction/instant/citalopram
name = REAGENT_CITALOPRAM
id = REAGENT_ID_CITALOPRAM
result = REAGENT_ID_CITALOPRAM
required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_CARBON = 1)
result_amount = 3
-/decl/chemical_reaction/instant/paroxetine
+/datum/decl/chemical_reaction/instant/paroxetine
name = REAGENT_PAROXETINE
id = REAGENT_ID_PAROXETINE
result = REAGENT_ID_PAROXETINE
required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_INAPROVALINE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/neurotoxin
+/datum/decl/chemical_reaction/instant/neurotoxin
name = REAGENT_NEUROTOXIN
id = REAGENT_ID_NEUROTOXIN
result = REAGENT_ID_NEUROTOXIN
required_reagents = list(REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_STOXIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/luminol
+/datum/decl/chemical_reaction/instant/luminol
name = REAGENT_LUMINOL
id = REAGENT_ID_LUMINOL
result = REAGENT_ID_LUMINOL
@@ -574,7 +574,7 @@
/* Solidification */
-/decl/chemical_reaction/instant/solidification
+/datum/decl/chemical_reaction/instant/solidification
name = "Solid Iron"
id = "solidiron"
result = null
@@ -582,47 +582,47 @@
result_amount = 1
var/sheet_to_give = /obj/item/stack/material/iron
-/decl/chemical_reaction/instant/solidification/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/solidification/on_reaction(var/datum/reagents/holder, var/created_volume)
var/sheets = FLOOR(created_volume,1)
if(sheets)
new sheet_to_give(get_turf(holder.my_atom), sheets)
-/decl/chemical_reaction/instant/solidification/phoron
+/datum/decl/chemical_reaction/instant/solidification/phoron
name = "Solid Phoron"
id = "solidphoron"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/phoron
-/decl/chemical_reaction/instant/solidification/silver
+/datum/decl/chemical_reaction/instant/solidification/silver
name = "Solid Silver"
id = "solidsilver"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/silver
-/decl/chemical_reaction/instant/solidification/gold
+/datum/decl/chemical_reaction/instant/solidification/gold
name = "Solid Gold"
id = "solidgold"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/gold
-/decl/chemical_reaction/instant/solidification/platinum
+/datum/decl/chemical_reaction/instant/solidification/platinum
name = "Solid Platinum"
id = "solidplatinum"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/platinum
-/decl/chemical_reaction/instant/solidification/uranium
+/datum/decl/chemical_reaction/instant/solidification/uranium
name = "Solid Uranium"
id = "soliduranium"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/uranium
-/decl/chemical_reaction/instant/solidification/hydrogen
+/datum/decl/chemical_reaction/instant/solidification/hydrogen
name = "Solid Hydrogen"
id = "solidhydrogen"
required_reagents = list(REAGENT_ID_FROSTOIL = 100, REAGENT_ID_HYDROGEN = REAGENTS_PER_SHEET)
@@ -630,7 +630,7 @@
// These are from Xenobio.
-/decl/chemical_reaction/instant/solidification/steel
+/datum/decl/chemical_reaction/instant/solidification/steel
name = "Solid Steel"
id = "solidsteel"
required_reagents = list(REAGENT_ID_FROSTOIL = 10, REAGENT_ID_IRON = REAGENTS_PER_SHEET, REAGENT_ID_CARBON = REAGENTS_PER_SHEET)
@@ -638,53 +638,53 @@
sheet_to_give = /obj/item/stack/material/steel
-/decl/chemical_reaction/instant/solidification/plasteel
+/datum/decl/chemical_reaction/instant/solidification/plasteel
name = "Solid Plasteel"
id = "solidplasteel"
required_reagents = list(REAGENT_ID_FROSTOIL = 10, REAGENT_ID_IRON = REAGENTS_PER_SHEET, REAGENT_ID_CARBON = REAGENTS_PER_SHEET, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/plasteel
-/decl/chemical_reaction/instant/plastication
+/datum/decl/chemical_reaction/instant/plastication
name = "Plastic"
id = "solidplastic"
result = null
required_reagents = list(REAGENT_ID_PACID = 1, REAGENT_ID_PLASTICIDE = 2)
result_amount = 1
-/decl/chemical_reaction/instant/plastication/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/plastication/on_reaction(var/datum/reagents/holder, var/created_volume)
var/sheets = FLOOR(created_volume,1)
if(sheets)
new /obj/item/stack/material/plastic(get_turf(holder.my_atom), sheets)
-/decl/chemical_reaction/instant/soapification
+/datum/decl/chemical_reaction/instant/soapification
name = "Soapification"
id = "soapification"
result = null
required_reagents = list(REAGENT_ID_COOKINGOIL = 10, REAGENT_ID_LYE = 2)
result_amount = 1
-/decl/chemical_reaction/instant/soapification/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/soapification/on_reaction(var/datum/reagents/holder, var/created_volume)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/soap(get_turf(holder.my_atom))
-/decl/chemical_reaction/instant/soapification/alt
+/datum/decl/chemical_reaction/instant/soapification/alt
name = "Soapification2"
id = "soapification2"
required_reagents = list(REAGENT_ID_CORNOIL = 10, REAGENT_ID_LYE = 2)
-/decl/chemical_reaction/instant/soapification/gibs // a bit less convinient and grosser, but it makes more potent soap.
+/datum/decl/chemical_reaction/instant/soapification/gibs // a bit less convinient and grosser, but it makes more potent soap.
name = "Soapification Gibs"
id = "soapificationgibs"
required_reagents = list(REAGENT_ID_PROTEIN = 10, REAGENT_ID_LYE = 10) //Change the protein to liquid gibs if/when those get ported. Thanks.
-/decl/chemical_reaction/instant/soapification/gibs/on_reaction(datum/reagents/holder, created_volume)
+/datum/decl/chemical_reaction/instant/soapification/gibs/on_reaction(datum/reagents/holder, created_volume)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/soap/homemade(get_turf(holder.my_atom))
/*Carpet Creation*/
-/decl/chemical_reaction/instant/carpetify
+/datum/decl/chemical_reaction/instant/carpetify
name = "Carpet"
id = "redcarpet"
result = null
@@ -692,67 +692,67 @@
result_amount = 2
var/carpet_type = /obj/item/stack/tile/carpet
-/decl/chemical_reaction/instant/carpetify/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/carpetify/on_reaction(var/datum/reagents/holder, var/created_volume)
var/sheets = FLOOR(created_volume,1)
if(sheets)
new carpet_type(get_turf(holder.my_atom), sheets)
-/decl/chemical_reaction/instant/carpetify/bcarpet
+/datum/decl/chemical_reaction/instant/carpetify/bcarpet
name = "Black Carpet"
id = "blackcarpet"
required_reagents = list(REAGENT_ID_LIQUIDCARPETB = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/bcarpet
-/decl/chemical_reaction/instant/carpetify/blucarpet
+/datum/decl/chemical_reaction/instant/carpetify/blucarpet
name = "Blue Carpet"
id = "bluecarpet"
required_reagents = list (REAGENT_ID_LIQUIDCARPETBLU = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/blucarpet
-/decl/chemical_reaction/instant/carpetify/turcarpet
+/datum/decl/chemical_reaction/instant/carpetify/turcarpet
name = "Turquise Carpet"
id = "turcarpet"
required_reagents = list(REAGENT_ID_LIQUIDCARPETTUR = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/turcarpet
-/decl/chemical_reaction/instant/carpetify/sblucarpet
+/datum/decl/chemical_reaction/instant/carpetify/sblucarpet
name = "Silver Blue Carpet"
id = "sblucarpet"
required_reagents = list(REAGENT_ID_LIQUIDCARPETSBLU = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/sblucarpet
-/decl/chemical_reaction/instant/carpetify/clowncarpet
+/datum/decl/chemical_reaction/instant/carpetify/clowncarpet
name = "Clown Carpet"
id = "clowncarpet"
required_reagents = list(REAGENT_ID_LIQUIDCARPETC = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/gaycarpet
-/decl/chemical_reaction/instant/carpetify/pcarpet
+/datum/decl/chemical_reaction/instant/carpetify/pcarpet
name = "Purple Carpet"
id = "purplecarpet"
required_reagents = list(REAGENT_ID_LIQUIDCARPETP = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/purcarpet
-/decl/chemical_reaction/instant/carpetify/ocarpet
+/datum/decl/chemical_reaction/instant/carpetify/ocarpet
name = "Orange Carpet"
id = "orangecarpet"
required_reagents = list(REAGENT_ID_LIQUIDCARPETO = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/oracarpet
-/decl/chemical_reaction/instant/concrete
+/datum/decl/chemical_reaction/instant/concrete
name = "Concrete"
id = "concretereagent"
required_reagents = list(REAGENT_ID_CALCIUM = 2, REAGENT_ID_SILICATE = 2, REAGENT_ID_WATER = 2)
result_amount = 1
-/decl/chemical_reaction/instant/concrete/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/concrete/on_reaction(var/datum/reagents/holder, var/created_volume)
var/sheets = FLOOR(created_volume,1)
if(sheets)
new /obj/item/stack/material/concrete(get_turf(holder.my_atom), sheets)
/* Grenade reactions */
-/decl/chemical_reaction/instant/explosion_potassium
+/datum/decl/chemical_reaction/instant/explosion_potassium
name = "Explosion"
id = "explosion_potassium"
result = null
@@ -760,7 +760,7 @@
result_amount = 2
mix_message = null
-/decl/chemical_reaction/instant/explosion_potassium/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/explosion_potassium/on_reaction(var/datum/reagents/holder, var/created_volume)
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0)
if(isliving(holder.my_atom))
@@ -776,14 +776,14 @@
//holder.clear_reagents() //VOREStation Removal
return
-/decl/chemical_reaction/instant/flash_powder
+/datum/decl/chemical_reaction/instant/flash_powder
name = "Flash powder"
id = "flash_powder"
result = null
required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_SULFUR = 1 )
result_amount = null
-/decl/chemical_reaction/instant/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, location)
@@ -808,14 +808,14 @@
M.flash_eyes()
M.Stun(5)
-/decl/chemical_reaction/instant/emp_pulse
+/datum/decl/chemical_reaction/instant/emp_pulse
name = "EMP Pulse"
id = "emp_pulse"
result = null
required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_IRON = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
result_amount = 2
-/decl/chemical_reaction/instant/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
// 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
// 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
@@ -826,7 +826,7 @@
//VOREStation Edit End
return
-/decl/chemical_reaction/instant/nitroglycerin
+/datum/decl/chemical_reaction/instant/nitroglycerin
name = REAGENT_NITROGLYCERIN
id = REAGENT_ID_NITROGLYCERIN
result = REAGENT_ID_NITROGLYCERIN
@@ -836,7 +836,7 @@
#ifndef UNIT_TESTS
// If it becomes possible to make this without exploding and clearing reagents, remove the UNIT_TESTS wrapper
-/decl/chemical_reaction/instant/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume)
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round (created_volume/2, 1), holder.my_atom, 0, 0)
if(isliving(holder.my_atom))
@@ -852,14 +852,14 @@
return
#endif
-/decl/chemical_reaction/instant/napalm
+/datum/decl/chemical_reaction/instant/napalm
name = "Napalm"
id = "napalm"
result = null
required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_SACID = 1 )
result_amount = 1
-/decl/chemical_reaction/instant/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
var/turf/location = get_turf(holder.my_atom.loc)
for(var/turf/simulated/floor/target_tile in range(0,location))
target_tile.assume_gas(GAS_VOLATILE_FUEL, created_volume, 400+T0C)
@@ -867,14 +867,14 @@
holder.del_reagent("napalm")
return
-/decl/chemical_reaction/instant/chemsmoke
+/datum/decl/chemical_reaction/instant/chemsmoke
name = "Chemsmoke"
id = "chemsmoke"
result = null
required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1)
result_amount = 0.4
-/decl/chemical_reaction/instant/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
@@ -888,7 +888,7 @@
//VOREStation Edit End
return
-/decl/chemical_reaction/instant/foam
+/datum/decl/chemical_reaction/instant/foam
name = "Foam"
id = "foam"
result = null
@@ -896,7 +896,7 @@
result_amount = 2
mix_message = "The solution violently bubbles!"
-/decl/chemical_reaction/instant/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
@@ -911,14 +911,14 @@
//VOREStation Edit End
return
-/decl/chemical_reaction/instant/metalfoam
+/datum/decl/chemical_reaction/instant/metalfoam
name = "Metal Foam"
id = "metalfoam"
result = null
required_reagents = list(REAGENT_ID_ALUMINIUM = 3, REAGENT_ID_FOAMINGAGENT = 1, REAGENT_ID_PACID = 1)
result_amount = 5
-/decl/chemical_reaction/instant/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
@@ -929,14 +929,14 @@
s.start()
return
-/decl/chemical_reaction/instant/ironfoam
+/datum/decl/chemical_reaction/instant/ironfoam
name = "Iron Foam"
id = "ironlfoam"
result = null
required_reagents = list(REAGENT_ID_IRON = 3, REAGENT_ID_FOAMINGAGENT = 1, REAGENT_ID_PACID = 1)
result_amount = 5
-/decl/chemical_reaction/instant/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
@@ -949,278 +949,278 @@
/* Paint */
-/decl/chemical_reaction/instant/red_paint
+/datum/decl/chemical_reaction/instant/red_paint
name = "Red paint"
id = "red_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKRED = 1)
result_amount = 5
-/decl/chemical_reaction/instant/red_paint/send_data()
+/datum/decl/chemical_reaction/instant/red_paint/send_data()
return "#FE191A"
-/decl/chemical_reaction/instant/orange_paint
+/datum/decl/chemical_reaction/instant/orange_paint
name = "Orange paint"
id = "orange_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKORANGE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/orange_paint/send_data()
+/datum/decl/chemical_reaction/instant/orange_paint/send_data()
return "#FFBE4F"
-/decl/chemical_reaction/instant/yellow_paint
+/datum/decl/chemical_reaction/instant/yellow_paint
name = "Yellow paint"
id = "yellow_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKYELLOW = 1)
result_amount = 5
-/decl/chemical_reaction/instant/yellow_paint/send_data()
+/datum/decl/chemical_reaction/instant/yellow_paint/send_data()
return "#FDFE7D"
-/decl/chemical_reaction/instant/green_paint
+/datum/decl/chemical_reaction/instant/green_paint
name = "Green paint"
id = "green_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREEN = 1)
result_amount = 5
-/decl/chemical_reaction/instant/green_paint/send_data()
+/datum/decl/chemical_reaction/instant/green_paint/send_data()
return "#18A31A"
-/decl/chemical_reaction/instant/blue_paint
+/datum/decl/chemical_reaction/instant/blue_paint
name = "Blue paint"
id = "blue_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBLUE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/blue_paint/send_data()
+/datum/decl/chemical_reaction/instant/blue_paint/send_data()
return "#247CFF"
-/decl/chemical_reaction/instant/purple_paint
+/datum/decl/chemical_reaction/instant/purple_paint
name = "Purple paint"
id = "purple_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKPURPLE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/purple_paint/send_data()
+/datum/decl/chemical_reaction/instant/purple_paint/send_data()
return "#CC0099"
-/decl/chemical_reaction/instant/grey_paint //mime
+/datum/decl/chemical_reaction/instant/grey_paint //mime
name = "Grey paint"
id = "grey_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREY = 1)
result_amount = 5
-/decl/chemical_reaction/instant/grey_paint/send_data()
+/datum/decl/chemical_reaction/instant/grey_paint/send_data()
return "#808080"
-/decl/chemical_reaction/instant/brown_paint
+/datum/decl/chemical_reaction/instant/brown_paint
name = "Brown paint"
id = "brown_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBROWN = 1)
result_amount = 5
-/decl/chemical_reaction/instant/brown_paint/send_data()
+/datum/decl/chemical_reaction/instant/brown_paint/send_data()
return "#846F35"
-/decl/chemical_reaction/instant/blood_paint
+/datum/decl/chemical_reaction/instant/blood_paint
name = "Blood paint"
id = "blood_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2)
result_amount = 5
-/decl/chemical_reaction/instant/blood_paint/send_data(var/datum/reagents/T)
+/datum/decl/chemical_reaction/instant/blood_paint/send_data(var/datum/reagents/T)
var/t = T.get_data(REAGENT_ID_BLOOD)
if(t && t["blood_colour"])
return t["blood_colour"]
return "#FE191A" // Probably red
-/decl/chemical_reaction/instant/milk_paint
+/datum/decl/chemical_reaction/instant/milk_paint
name = "Milk paint"
id = "milk_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MILK = 5)
result_amount = 5
-/decl/chemical_reaction/instant/milk_paint/send_data()
+/datum/decl/chemical_reaction/instant/milk_paint/send_data()
return "#F0F8FF"
-/decl/chemical_reaction/instant/orange_juice_paint
+/datum/decl/chemical_reaction/instant/orange_juice_paint
name = "Orange juice paint"
id = "orange_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ORANGEJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/orange_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/orange_juice_paint/send_data()
return "#E78108"
-/decl/chemical_reaction/instant/tomato_juice_paint
+/datum/decl/chemical_reaction/instant/tomato_juice_paint
name = "Tomato juice paint"
id = "tomato_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_TOMATOJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/tomato_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/tomato_juice_paint/send_data()
return "#731008"
-/decl/chemical_reaction/instant/lime_juice_paint
+/datum/decl/chemical_reaction/instant/lime_juice_paint
name = "Lime juice paint"
id = "lime_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_LIMEJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/lime_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/lime_juice_paint/send_data()
return "#365E30"
-/decl/chemical_reaction/instant/carrot_juice_paint
+/datum/decl/chemical_reaction/instant/carrot_juice_paint
name = "Carrot juice paint"
id = "carrot_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARROTJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/carrot_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/carrot_juice_paint/send_data()
return "#973800"
-/decl/chemical_reaction/instant/berry_juice_paint
+/datum/decl/chemical_reaction/instant/berry_juice_paint
name = "Berry juice paint"
id = "berry_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BERRYJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/berry_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/berry_juice_paint/send_data()
return "#990066"
-/decl/chemical_reaction/instant/grape_juice_paint
+/datum/decl/chemical_reaction/instant/grape_juice_paint
name = "Grape juice paint"
id = "grape_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_GRAPEJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/grape_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/grape_juice_paint/send_data()
return "#863333"
-/decl/chemical_reaction/instant/poisonberry_juice_paint
+/datum/decl/chemical_reaction/instant/poisonberry_juice_paint
name = "Poison berry juice paint"
id = "poisonberry_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_POISONBERRYJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/poisonberry_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/poisonberry_juice_paint/send_data()
return "#863353"
-/decl/chemical_reaction/instant/watermelon_juice_paint
+/datum/decl/chemical_reaction/instant/watermelon_juice_paint
name = "Watermelon juice paint"
id = "watermelon_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_WATERMELONJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/watermelon_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/watermelon_juice_paint/send_data()
return "#B83333"
-/decl/chemical_reaction/instant/lemon_juice_paint
+/datum/decl/chemical_reaction/instant/lemon_juice_paint
name = "Lemon juice paint"
id = "lemon_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_LEMONJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/lemon_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/lemon_juice_paint/send_data()
return "#AFAF00"
-/decl/chemical_reaction/instant/banana_juice_paint
+/datum/decl/chemical_reaction/instant/banana_juice_paint
name = "Banana juice paint"
id = "banana_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BANANA = 5)
result_amount = 5
-/decl/chemical_reaction/instant/banana_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/banana_juice_paint/send_data()
return "#C3AF00"
-/decl/chemical_reaction/instant/potato_juice_paint
+/datum/decl/chemical_reaction/instant/potato_juice_paint
name = "Potato juice paint"
id = "potato_juice_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_POTATOJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/potato_juice_paint/send_data()
+/datum/decl/chemical_reaction/instant/potato_juice_paint/send_data()
return "#302000"
-/decl/chemical_reaction/instant/carbon_paint
+/datum/decl/chemical_reaction/instant/carbon_paint
name = "Carbon paint"
id = "carbon_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARBON = 1)
result_amount = 5
-/decl/chemical_reaction/instant/carbon_paint/send_data()
+/datum/decl/chemical_reaction/instant/carbon_paint/send_data()
return "#333333"
-/decl/chemical_reaction/instant/aluminum_paint
+/datum/decl/chemical_reaction/instant/aluminum_paint
name = "Aluminum paint"
id = "aluminum_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1)
result_amount = 5
-/decl/chemical_reaction/instant/aluminum_paint/send_data()
+/datum/decl/chemical_reaction/instant/aluminum_paint/send_data()
return "#F0F8FF"
/*Carpet Recoloring*/
-/decl/chemical_reaction/instant/carpetdye
+/datum/decl/chemical_reaction/instant/carpetdye
name = "Black Carpet Dyeing"
id = "carpetdyeblack"
result = REAGENT_ID_LIQUIDCARPETB
required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_CARBON = 1)
result_amount = 5
-/decl/chemical_reaction/instant/carpetdye/blue
+/datum/decl/chemical_reaction/instant/carpetdye/blue
name = "Blue Carpet Dyeing"
id = "carpetdyeblue"
result = REAGENT_ID_LIQUIDCARPETBLU
required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_FROSTOIL = 1)
-/decl/chemical_reaction/instant/carpetdye/tur
+/datum/decl/chemical_reaction/instant/carpetdye/tur
name = "Turqouise Carpet Dyeing"
id = "carpetdyetur"
result = REAGENT_ID_LIQUIDCARPETTUR
required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_WATER = 1)
-/decl/chemical_reaction/instant/carpetdye/sblu
+/datum/decl/chemical_reaction/instant/carpetdye/sblu
name = "Silver Blue Carpet Dyeing"
id = "carpetdyesblu"
result = REAGENT_ID_LIQUIDCARPETSBLU
required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_ICE = 1)
-/decl/chemical_reaction/instant/carpetdye/clown
+/datum/decl/chemical_reaction/instant/carpetdye/clown
name = "Clown Carpet Dyeing"
id = "carpetdyeclown"
result = REAGENT_ID_LIQUIDCARPETC
required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_BANANA = 1)
-/decl/chemical_reaction/instant/carpetdye/purple
+/datum/decl/chemical_reaction/instant/carpetdye/purple
name = "Purple Carpet Dyeing"
id = "carpetdyepurple"
result = REAGENT_ID_LIQUIDCARPETP
required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_BERRYJUICE = 1)
-/decl/chemical_reaction/instant/carpetdye/orange
+/datum/decl/chemical_reaction/instant/carpetdye/orange
name = "Orange Carpet Dyeing"
id = "carpetdyeorange"
result = REAGENT_ID_LIQUIDCARPETO
@@ -1228,7 +1228,7 @@
//R-UST Port
-/decl/chemical_reaction/instant/hydrophoron
+/datum/decl/chemical_reaction/instant/hydrophoron
name = REAGENT_HYDROPHORON
id = REAGENT_ID_HYDROPHORON
result = REAGENT_ID_HYDROPHORON
@@ -1236,7 +1236,7 @@
inhibitors = list(REAGENT_ID_NITROGEN = 1, REAGENT_ID_COPPER = 1) //So it doesn't mess with lexorin
result_amount = 2
-/decl/chemical_reaction/instant/deuterium
+/datum/decl/chemical_reaction/instant/deuterium
name = REAGENT_DEUTERIUM
id = REAGENT_ID_DEUTERIUM
result = REAGENT_ID_DEUTERIUM
@@ -1244,21 +1244,21 @@
result_amount = 3
//Skrellian crap.
-/decl/chemical_reaction/instant/talum_quem
+/datum/decl/chemical_reaction/instant/talum_quem
name = REAGENT_TALUMQUEM
id = REAGENT_ID_TALUMQUEM
result = REAGENT_ID_TALUMQUEM
required_reagents = list(REAGENT_ID_BLISS = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_AMATOXIN = 1)
result_amount = 4
-/decl/chemical_reaction/instant/qerr_quem
+/datum/decl/chemical_reaction/instant/qerr_quem
name = REAGENT_QERRQUEM
id = REAGENT_ID_QERRQUEM
result = REAGENT_ID_QERRQUEM
required_reagents = list(REAGENT_ID_NICOTINE = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_SUGAR = 2)
result_amount = 4
-/decl/chemical_reaction/instant/malish_qualem
+/datum/decl/chemical_reaction/instant/malish_qualem
name = REAGENT_MALISHQUALEM
id = REAGENT_ID_MALISHQUALEM
result = REAGENT_ID_MALISHQUALEM
@@ -1267,7 +1267,7 @@
result_amount = 2
// Biomass, for cloning and bioprinters
-/decl/chemical_reaction/instant/biomass
+/datum/decl/chemical_reaction/instant/biomass
name = REAGENT_BIOMASS
id = REAGENT_ID_BIOMASS
result = REAGENT_ID_BIOMASS
@@ -1276,35 +1276,35 @@
// Neutralization.
-/decl/chemical_reaction/instant/neutralize_neurotoxic_protein
+/datum/decl/chemical_reaction/instant/neutralize_neurotoxic_protein
name = "Neutralize Toxic Proteins"
id = "neurotoxic_protein_neutral"
result = REAGENT_ID_PROTEIN
required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2)
result_amount = 2
-/decl/chemical_reaction/instant/neutralize_carpotoxin
+/datum/decl/chemical_reaction/instant/neutralize_carpotoxin
name = "Neutralize Carpotoxin"
id = "carpotoxin_neutral"
result = REAGENT_ID_PROTEIN
required_reagents = list(REAGENT_ID_ENZYME = 1, REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_SIFSAP = 1)
result_amount = 1
-/decl/chemical_reaction/instant/neutralize_spidertoxin
+/datum/decl/chemical_reaction/instant/neutralize_spidertoxin
name = "Neutralize Spidertoxin"
id = "spidertoxin_neutral"
result = REAGENT_ID_PROTEIN
required_reagents = list(REAGENT_ID_ENZYME = 1, REAGENT_ID_SPIDERTOXIN = 1, REAGENT_ID_SIFSAP = 1)
result_amount = 1
-/decl/chemical_reaction/instant/artificial_sustenance
+/datum/decl/chemical_reaction/instant/artificial_sustenance
name = REAGENT_ASUSTENANCE
id = REAGENT_ID_ASUSTENANCE
result = REAGENT_ID_ASUSTENANCE
required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_MUTAGEN = 1, REAGENT_ID_PHORON = 1)
result_amount = 1
-/decl/chemical_reaction/instant/titanium_oxidation
+/datum/decl/chemical_reaction/instant/titanium_oxidation
name = REAGENT_TITANIUMDIOX
id = "oxidize_titanium"
result = REAGENT_ID_TITANIUMDIOX
@@ -1312,204 +1312,204 @@
result_amount = 1
/* Metallic paints */
-/decl/chemical_reaction/instant/metal_paint
+/datum/decl/chemical_reaction/instant/metal_paint
name = "Metallic white paint"
id = "metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINK = 1)
result_amount = 5
-/decl/chemical_reaction/instant/metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/metal_paint/send_data()
return "#b2d1da"
-/decl/chemical_reaction/instant/red_metal_paint
+/datum/decl/chemical_reaction/instant/red_metal_paint
name = "Metallic red paint"
id = "red_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKRED = 1)
result_amount = 5
-/decl/chemical_reaction/instant/red_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/red_metal_paint/send_data()
return "#ff7a7a"
-/decl/chemical_reaction/instant/orange_metal_paint
+/datum/decl/chemical_reaction/instant/orange_metal_paint
name = "Metallic orange paint"
id = "orange_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKORANGE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/orange_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/orange_metal_paint/send_data()
return "#ffd690"
-/decl/chemical_reaction/instant/yellow_metal_paint
+/datum/decl/chemical_reaction/instant/yellow_metal_paint
name = "Metallic yellow paint"
id = "yellow_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKYELLOW = 1)
result_amount = 5
-/decl/chemical_reaction/instant/yellow_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/yellow_metal_paint/send_data()
return "#ffffab"
-/decl/chemical_reaction/instant/green_metal_paint
+/datum/decl/chemical_reaction/instant/green_metal_paint
name = "Metallic green paint"
id = "green_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREEN = 1)
result_amount = 5
-/decl/chemical_reaction/instant/green_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/green_metal_paint/send_data()
return "#69d76b"
-/decl/chemical_reaction/instant/blue_metal_paint
+/datum/decl/chemical_reaction/instant/blue_metal_paint
name = "Metallic blue paint"
id = "blue_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBLUE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/blue_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/blue_metal_paint/send_data()
return "#81aff5"
-/decl/chemical_reaction/instant/purple_metal_paint
+/datum/decl/chemical_reaction/instant/purple_metal_paint
name = "Metallic purple paint"
id = "purple_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKPURPLE = 1)
result_amount = 5
-/decl/chemical_reaction/instant/purple_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/purple_metal_paint/send_data()
return "#e77acc"
-/decl/chemical_reaction/instant/brown_metal_paint
+/datum/decl/chemical_reaction/instant/brown_metal_paint
name = "Metallic brown paint"
id = "brown_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBROWN = 1)
result_amount = 5
-/decl/chemical_reaction/instant/brown_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/brown_metal_paint/send_data()
return "#827655"
-/decl/chemical_reaction/instant/orange_juice_metal_paint
+/datum/decl/chemical_reaction/instant/orange_juice_metal_paint
name = "Metallic orange juice paint"
id = "orange_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ORANGEJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/orange_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/orange_juice_metal_paint/send_data()
return "#e2a254"
-/decl/chemical_reaction/instant/tomato_juice_metal_paint
+/datum/decl/chemical_reaction/instant/tomato_juice_metal_paint
name = "Metallic tomato juice paint"
id = "tomato_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_TOMATOJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/tomato_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/tomato_juice_metal_paint/send_data()
return "#934e49"
-/decl/chemical_reaction/instant/lime_juice_metal_paint
+/datum/decl/chemical_reaction/instant/lime_juice_metal_paint
name = "Metallic lime juice paint"
id = "lime_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_LIMEJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/lime_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/lime_juice_metal_paint/send_data()
return "#556c51"
-/decl/chemical_reaction/instant/carrot_juice_metal_paint
+/datum/decl/chemical_reaction/instant/carrot_juice_metal_paint
name = "Metallic carrot juice paint"
id = "carrot_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARROTJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/carrot_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/carrot_juice_metal_paint/send_data()
return "#a06a4b"
-/decl/chemical_reaction/instant/berry_juice_metal_paint
+/datum/decl/chemical_reaction/instant/berry_juice_metal_paint
name = "Metallic berry juice paint"
id = "berry_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BERRYJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/berry_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/berry_juice_metal_paint/send_data()
return "#ae5892"
-/decl/chemical_reaction/instant/grape_juice_metal_paint
+/datum/decl/chemical_reaction/instant/grape_juice_metal_paint
name = "Metallic grape juice paint"
id = "grape_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_GRAPEJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/grape_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/grape_juice_metal_paint/send_data()
return "#925e5e"
-/decl/chemical_reaction/instant/poisonberry_juice_metal_paint
+/datum/decl/chemical_reaction/instant/poisonberry_juice_metal_paint
name = "Metallic poison berry juice paint"
id = "poisonberry_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_POISONBERRYJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/poisonberry_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/poisonberry_juice_metal_paint/send_data()
return "#683c4d"
-/decl/chemical_reaction/instant/watermelon_juice_metal_paint
+/datum/decl/chemical_reaction/instant/watermelon_juice_metal_paint
name = "Metallic watermelon juice paint"
id = "watermelon_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_WATERMELONJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/watermelon_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/watermelon_juice_metal_paint/send_data()
return "#a47a7a"
-/decl/chemical_reaction/instant/lemon_juice_metal_paint
+/datum/decl/chemical_reaction/instant/lemon_juice_metal_paint
name = "Metallic lemon juice paint"
id = "lemon_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_LEMONJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/lemon_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/lemon_juice_metal_paint/send_data()
return "#8f8f5c"
-/decl/chemical_reaction/instant/banana_juice_metal_paint
+/datum/decl/chemical_reaction/instant/banana_juice_metal_paint
name = "Metallic banana juice paint"
id = "banana_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BANANA = 5)
result_amount = 5
-/decl/chemical_reaction/instant/banana_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/banana_juice_metal_paint/send_data()
return "#9c9129"
-/decl/chemical_reaction/instant/potato_juice_metal_paint
+/datum/decl/chemical_reaction/instant/potato_juice_metal_paint
name = "Metallic potato juice paint"
id = "potato_juice_metal_paint"
result = REAGENT_ID_PAINT
required_reagents = list(REAGENT_ID_TITANIUMDIOX = 1, REAGENT_ID_WATER = 3, REAGENT_ID_POTATOJUICE = 5)
result_amount = 5
-/decl/chemical_reaction/instant/potato_juice_metal_paint/send_data()
+/datum/decl/chemical_reaction/instant/potato_juice_metal_paint/send_data()
return "#2e2a21"
-/decl/chemical_reaction/instant/aphrodisiac
+/datum/decl/chemical_reaction/instant/aphrodisiac
name = REAGENT_APHRODISIAC
id = REAGENT_ID_APHRODISIAC
result = REAGENT_ID_APHRODISIAC
required_reagents = list(REAGENT_ID_CARBON = 2, REAGENT_ID_HYDROGEN = 2, REAGENT_ID_OXYGEN = 2, REAGENT_ID_WATER = 1)
result_amount = 6
-/decl/chemical_reaction/instant/tercozolam
+/datum/decl/chemical_reaction/instant/tercozolam
id = REAGENT_ID_TERCOZOLAM
result = REAGENT_ID_TERCOZOLAM
required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_LITHIUM = 1)
diff --git a/code/modules/reagents/reactions/instant/instant_ch.dm b/code/modules/reagents/reactions/instant/instant_ch.dm
index 876de0223f..40103301f7 100644
--- a/code/modules/reagents/reactions/instant/instant_ch.dm
+++ b/code/modules/reagents/reactions/instant/instant_ch.dm
@@ -1,57 +1,57 @@
-/decl/chemical_reaction/instant/claridyl
+/datum/decl/chemical_reaction/instant/claridyl
name = REAGENT_CLARIDYL
id = REAGENT_ID_CLARIDYL
result = REAGENT_ID_CLARIDYL
required_reagents = list(REAGENT_ID_LITHIUM = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_SUGAR = 1)
result_amount = 1
-/decl/chemical_reaction/instant/dyloteane
+/datum/decl/chemical_reaction/instant/dyloteane
name = REAGENT_DYLOTEANE
id = REAGENT_ID_DYLOTEANE
result = REAGENT_ID_DYLOTEANE
required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_TEA = 1)
result_amount = 1
-/decl/chemical_reaction/instant/dyloteane/super
+/datum/decl/chemical_reaction/instant/dyloteane/super
name = "dyloteanesuper"
id = "dyloteanesuper"
result = REAGENT_ID_DYLOTEANE
required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_TEA = 1,REAGENT_ID_SUGAR = 1)
result_amount = 10 //by the powers of england for sugaring your tea you gain *10 result
-/decl/chemical_reaction/instant/eden
+/datum/decl/chemical_reaction/instant/eden
name = REAGENT_EDEN
id = REAGENT_ID_EDEN
result = REAGENT_ID_EDEN
required_reagents = list(REAGENT_ID_ANTITOXIN = 60, REAGENT_ID_PHORON = 60)
result_amount = 1
-/decl/chemical_reaction/instant/eden/snake
+/datum/decl/chemical_reaction/instant/eden/snake
id = REAGENT_ID_EDENSNAKE
result = REAGENT_ID_EDENSNAKE
required_reagents = list(REAGENT_ID_EDEN = 1, REAGENT_ID_ETHANOL = 1)
-/decl/chemical_reaction/instant/tercozolam
+/datum/decl/chemical_reaction/instant/tercozolam
id = REAGENT_ID_TERCOZOLAM
result = REAGENT_ID_TERCOZOLAM
required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_LITHIUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/peridaxon_ch
+/datum/decl/chemical_reaction/instant/peridaxon_ch
name = REAGENT_PERIDAXON
id = "peridaxon_ch"
result = REAGENT_ID_PERIDAXON
required_reagents = list(REAGENT_ID_CORDRADAXON = 1,REAGENT_ID_GASTIRODAXON = 1, REAGENT_ID_HEPANEPHRODAXON = 1, REAGENT_ID_RESPIRODAXON = 1)
result_amount = 12 //More phoron-efficient alternative recipe.
-/decl/chemical_reaction/instant/sorbitol
+/datum/decl/chemical_reaction/instant/sorbitol
name = REAGENT_SORBITOL
id = REAGENT_ID_SORBITOL
result = REAGENT_ID_SORBITOL
required_reagents = list(REAGENT_ID_UNSORBITOL = 1, REAGENT_ID_PHORON = 1)
result_amount = 2
-/decl/chemical_reaction/instant/glucose
+/datum/decl/chemical_reaction/instant/glucose
name = REAGENT_GLUCOSE
id = REAGENT_ID_GLUCOSE
result = REAGENT_ID_GLUCOSE
@@ -59,28 +59,28 @@
result_amount = 1
///SAP RECIPES//////
-/decl/chemical_reaction/instant/myelamine_sap //This is the clotting agent used by clotting packs.
+/datum/decl/chemical_reaction/instant/myelamine_sap //This is the clotting agent used by clotting packs.
name = REAGENT_MYELAMINE
id = REAGENT_ID_MYELAMINE + "sap"
result = REAGENT_ID_MYELAMINE
required_reagents = list(REAGENT_ID_BICARIDINE = 1, REAGENT_ID_IRON = 2, REAGENT_ID_KELOTANE = 1, REAGENT_ID_BLUESAP = 1)
result_amount = 1
-/decl/chemical_reaction/instant/hannoa
+/datum/decl/chemical_reaction/instant/hannoa
name = REAGENT_HANNOA
id = REAGENT_ID_HANNOA
result = REAGENT_ID_HANNOA
required_reagents = list(REAGENT_PURPLESAP = 1, REAGENT_ID_IRON = 2, REAGENT_ID_KELOTANE = 1, REAGENT_ID_CARBON = 1)
result_amount = 1
-/decl/chemical_reaction/instant/bullvalene
+/datum/decl/chemical_reaction/instant/bullvalene
name = REAGENT_BULLVALENE
id = REAGENT_ID_BULLVALENE
result = REAGENT_ID_BULLVALENE
required_reagents = list(REAGENT_ID_DERMALINE = 1, REAGENT_ID_ORANGESAP = 1, REAGENT_ID_COPPER = 1)
result_amount = 1
-/decl/chemical_reaction/instant/nutrient
+/datum/decl/chemical_reaction/instant/nutrient
name = REAGENT_NUTRIMENT
id = REAGENT_ID_NUTRIMENT
result = REAGENT_ID_NUTRIMENT
@@ -90,7 +90,7 @@
/////SERAZINE RECIPES//////
-/decl/chemical_reaction/instant/alizene
+/datum/decl/chemical_reaction/instant/alizene
name = REAGENT_ALIZENE
id = REAGENT_ID_ALIZENE
result = REAGENT_ID_ALIZENE
@@ -98,27 +98,27 @@
result_amount = 3
// Frost oil reactions for material sheets
-/decl/chemical_reaction/instant/solidification/aluminium
+/datum/decl/chemical_reaction/instant/solidification/aluminium
name = "Solid Aluminium"
id = "solidaluminium"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_ALUMINIUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/aluminium
-/decl/chemical_reaction/instant/solidification/copper
+/datum/decl/chemical_reaction/instant/solidification/copper
name = "Solid Copper"
id = "solidcopper"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_COPPER = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/copper
//YW stuff
-/decl/chemical_reaction/instant/benzilate
+/datum/decl/chemical_reaction/instant/benzilate
name = "Benzilate"
id = REAGENT_ID_BENZILATE
result = REAGENT_ID_BENZILATE
required_reagents = list(REAGENT_ID_PARACETAMOL = 1, REAGENT_ID_MINDBREAKER = 1)
result_amount = 2
-/decl/chemical_reaction/instant/phenethylamine
+/datum/decl/chemical_reaction/instant/phenethylamine
name = REAGENT_PHENETHYLAMINE
id = REAGENT_ID_PHENETHYLAMINE
result = REAGENT_ID_PHENETHYLAMINE
@@ -126,13 +126,13 @@
result_amount = 2
// Xenochem stuff
-/decl/chemical_reaction/instant/xenolazarus // Moved here because upstream axed it and this file cannot conflict
+/datum/decl/chemical_reaction/instant/xenolazarus // Moved here because upstream axed it and this file cannot conflict
name = "Discount Lazarus"
id = "discountlazarus"
result = null
required_reagents = list(REAGENT_ID_MONSTERTAMER = 5, REAGENT_ID_CLONEXADONE = 5)
-/decl/chemical_reaction/instant/xenolazarus/on_reaction(var/datum/reagents/holder, var/created_volume) //literally all this does is mash the regenerate button
+/datum/decl/chemical_reaction/instant/xenolazarus/on_reaction(var/datum/reagents/holder, var/created_volume) //literally all this does is mash the regenerate button
if(ishuman(holder.my_atom))
var/mob/living/carbon/human/H = holder.my_atom
var/datum/component/xenochimera/comp = H.GetComponent(/datum/component/xenochimera)
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index e85ad9cde3..10ba08a299 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////
/// Micro/Macro chemicals
-/decl/chemical_reaction/instant/sizeoxadone
+/datum/decl/chemical_reaction/instant/sizeoxadone
name = REAGENT_SIZEOXADONE
id = REAGENT_ID_SIZEOXADONE
result = REAGENT_ID_SIZEOXADONE
@@ -9,7 +9,7 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
-/decl/chemical_reaction/instant/macrocillin
+/datum/decl/chemical_reaction/instant/macrocillin
name = REAGENT_MACROCILLIN
id = REAGENT_ID_MACROCILLIN
result = REAGENT_ID_MACROCILLIN
@@ -17,7 +17,7 @@
required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, REAGENT_ID_DIETHYLAMINE = 20)
result_amount = 1
-/decl/chemical_reaction/instant/microcillin
+/datum/decl/chemical_reaction/instant/microcillin
name = REAGENT_MICROCILLIN
id = REAGENT_ID_MICROCILLIN
result = REAGENT_ID_MICROCILLIN
@@ -25,7 +25,7 @@
required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, REAGENT_ID_SODIUMCHLORIDE = 20)
result_amount = 1
-/decl/chemical_reaction/instant/normalcillin
+/datum/decl/chemical_reaction/instant/normalcillin
name = REAGENT_NORMALCILLIN
id = REAGENT_ID_NORMALCILLIN
result = REAGENT_ID_NORMALCILLIN
@@ -33,13 +33,13 @@
required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, REAGENT_ID_LEPORAZINE = 20)
result_amount = 1
-/decl/chemical_reaction/instant/dontcrossthebeams
+/datum/decl/chemical_reaction/instant/dontcrossthebeams
name = "Don't Cross The Beams"
id = "dontcrossthebeams"
result = null
required_reagents = list(REAGENT_ID_MICROCILLIN = 1, REAGENT_ID_MACROCILLIN = 1)
-/decl/chemical_reaction/instant/dontcrossthebeams/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/dontcrossthebeams/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
playsound(location, 'sound/weapons/gauss_shoot.ogg', 50, 1)
var/datum/effect/effect/system/grav_pull/s = new /datum/effect/effect/system/grav_pull
@@ -49,7 +49,7 @@
///////////////////////////////////////////////////////////////////////////////////
/// TF chemicals
-/decl/chemical_reaction/instant/amorphorovir
+/datum/decl/chemical_reaction/instant/amorphorovir
name = REAGENT_AMORPHOROVIR
id = REAGENT_ID_AMORPHOROVIR
result = REAGENT_ID_AMORPHOROVIR
@@ -57,42 +57,42 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
-/decl/chemical_reaction/instant/androrovir
+/datum/decl/chemical_reaction/instant/androrovir
name = REAGENT_ANDROROVIR
id = REAGENT_ID_ANDROROVIR
result = REAGENT_ID_ANDROROVIR
required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_BICARIDINE = 20, REAGENT_ID_IRON = 20, REAGENT_ID_ETHANOL = 20)
result_amount = 1
-/decl/chemical_reaction/instant/gynorovir
+/datum/decl/chemical_reaction/instant/gynorovir
name = REAGENT_GYNOROVIR
id = REAGENT_ID_GYNOROVIR
result = REAGENT_ID_GYNOROVIR
required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_INAPROVALINE = 20, REAGENT_ID_SILICON = 20, REAGENT_ID_SUGAR = 20)
result_amount = 1
-/decl/chemical_reaction/instant/androgynorovir
+/datum/decl/chemical_reaction/instant/androgynorovir
name = REAGENT_ANDROGYNOROVIR
id = REAGENT_ID_ANDROGYNOROVIR
result = REAGENT_ID_ANDROGYNOROVIR
required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_ANTITOXIN = 20, REAGENT_ID_FLUORINE = 20, REAGENT_ID_TUNGSTEN = 20)
result_amount = 1
-/decl/chemical_reaction/instant/androrovir_bootleg
+/datum/decl/chemical_reaction/instant/androrovir_bootleg
name = "Bootleg Androrovir"
id = "androrovir_bootleg"
result = REAGENT_ID_ANDROROVIR
required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_PROTEIN = 10, REAGENT_ID_CAPSAICIN = 10)
result_amount = 1
-/decl/chemical_reaction/instant/gynorovir_bootleg
+/datum/decl/chemical_reaction/instant/gynorovir_bootleg
name = "Bootleg Gynorovir"
id = "gynorovir_bootleg"
result = REAGENT_ID_GYNOROVIR
required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_SOYMILK = 10, REAGENT_ID_SUGAR = 10)
result_amount = 1
-/decl/chemical_reaction/instant/androgynorovir_bootleg
+/datum/decl/chemical_reaction/instant/androgynorovir_bootleg
name = "Bootleg Androgynorovir"
id = "androgynorovir_bootleg"
result = REAGENT_ID_ANDROGYNOROVIR
@@ -102,12 +102,12 @@
///////////////////////////////////////////////////////////////////////////////////
/// Miscellaneous Reactions
-/decl/chemical_reaction/instant/foam/softdrink
+/datum/decl/chemical_reaction/instant/foam/softdrink
name = "Decarbonated Drink"
id = "soda_fizz"
required_reagents = list(REAGENT_ID_COLA = 1, REAGENT_ID_MINT = 1)
-/decl/chemical_reaction/instant/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them
+/datum/decl/chemical_reaction/instant/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them
name = REAGENT_FIREFOAM
id = "firefighting foam"
result = REAGENT_ID_FIREFOAM
@@ -115,7 +115,7 @@
catalysts = list(REAGENT_ID_FLUORINE = 10)
result_amount = 1
-/decl/chemical_reaction/instant/firefightingfoamqol //Please don't abuse this and make us remove it. Seriously.
+/datum/decl/chemical_reaction/instant/firefightingfoamqol //Please don't abuse this and make us remove it. Seriously.
name = "Firefighting Foam EZ"
id = "firefighting foam ez"
result = REAGENT_ID_FIREFOAM
@@ -127,14 +127,14 @@
///////////////////////////////////////////////////////////////////////////////////
/// Vore Drugs
-/decl/chemical_reaction/instant/ickypak
+/datum/decl/chemical_reaction/instant/ickypak
name = REAGENT_ICKYPAK
id = REAGENT_ID_ICKYPAK
result = REAGENT_ID_ICKYPAK
required_reagents = list(REAGENT_ID_HYPERZINE = 4, REAGENT_ID_FLUOROSURFACTANT = 1)
result_amount = 5
-/decl/chemical_reaction/instant/unsorbitol
+/datum/decl/chemical_reaction/instant/unsorbitol
name = REAGENT_UNSORBITOL
id = REAGENT_ID_UNSORBITOL
result = REAGENT_ID_UNSORBITOL
@@ -143,14 +143,14 @@
///////////////////////////////////////////////////////////////////////////////////
/// Other Drugs
-/decl/chemical_reaction/instant/adranol
+/datum/decl/chemical_reaction/instant/adranol
name = REAGENT_ADRANOL
id = REAGENT_ID_ADRANOL
result = REAGENT_ID_ADRANOL
required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/vermicetol
+/datum/decl/chemical_reaction/instant/vermicetol
name = REAGENT_VERMICETOL
id = REAGENT_ID_VERMICETOL
result = REAGENT_ID_VERMICETOL
@@ -158,21 +158,21 @@
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 3
-/decl/chemical_reaction/instant/prussian_blue
+/datum/decl/chemical_reaction/instant/prussian_blue
name = REAGENT_PRUSSIANBLUE
id = REAGENT_ID_PRUSSIANBLUE
result = REAGENT_ID_PRUSSIANBLUE
required_reagents = list(REAGENT_ID_CARBON = 3, REAGENT_ID_IRON = 1, REAGENT_ID_NITROGEN = 3)
result_amount = 7
-/decl/chemical_reaction/instant/lipozilase
+/datum/decl/chemical_reaction/instant/lipozilase
name = REAGENT_LIPOZILASE
id = REAGENT_ID_LIPOZILASE
result = REAGENT_ID_LIPOZILASE
required_reagents = list(REAGENT_ID_LIPOZINE = 1, REAGENT_ID_DIETHYLAMINE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/lipostipo
+/datum/decl/chemical_reaction/instant/lipostipo
name = REAGENT_LIPOSTIPO
id = REAGENT_ID_LIPOSTIPO
result = REAGENT_ID_LIPOSTIPO
@@ -181,14 +181,14 @@
///////////////////////////////////////////////////////////////////////////////////
/// Reagent colonies.
-/decl/chemical_reaction/instant/meatcolony
+/datum/decl/chemical_reaction/instant/meatcolony
name = REAGENT_ID_PROTEIN
id = REAGENT_ID_MEATCOLONY
result = REAGENT_ID_PROTEIN
required_reagents = list(REAGENT_ID_MEATCOLONY = 5, REAGENT_ID_VIRUSFOOD = 5)
result_amount = 60
-/decl/chemical_reaction/instant/plantcolony
+/datum/decl/chemical_reaction/instant/plantcolony
name = REAGENT_ID_NUTRIMENT
id = REAGENT_ID_PLANTCOLONY
result = REAGENT_ID_NUTRIMENT
@@ -197,13 +197,13 @@
///////////////////////////////////////////////////////////////////////////////////
/// Upstream Adjustments
-/decl/chemical_reaction/instant/biomass
+/datum/decl/chemical_reaction/instant/biomass
result_amount = 6 // Roughly 120u per phoron sheet
///////////////////////////////
//SLIME-RELATED BELOW HERE///////
///////////////////////////////
-/decl/chemical_reaction/instant/slimeify
+/datum/decl/chemical_reaction/instant/slimeify
name = REAGENT_ADVMUTATIONTOXIN
id = "advmutationtoxin2"
result = REAGENT_ID_ADVMUTATIONTOXIN
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index bc49ec45bb..609526d2c5 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -1,81 +1,81 @@
-/decl/chemical_reaction/instant/virus_food_mutagen
+/datum/decl/chemical_reaction/instant/virus_food_mutagen
name = REAGENT_MUTAGENVIRUSFOOD
id = REAGENT_ID_MUTAGENVIRUSFOOD
result = REAGENT_ID_MUTAGENVIRUSFOOD
required_reagents = list(REAGENT_ID_MUTAGEN = 1, REAGENT_ID_VIRUSFOOD = 1)
result_amount = 1
-/decl/chemical_reaction/instant/virus_food_adranol
+/datum/decl/chemical_reaction/instant/virus_food_adranol
name = REAGENT_ADRANOLVIRUSFOOD
id = REAGENT_ID_ADRANOLVIRUSFOOD
result = REAGENT_ID_ADRANOLVIRUSFOOD
required_reagents = list(REAGENT_ID_ADRANOL = 1, REAGENT_ID_VIRUSFOOD = 1)
result_amount = 1
-/decl/chemical_reaction/instant/virus_food_phoron
+/datum/decl/chemical_reaction/instant/virus_food_phoron
name = REAGENT_PHORONVIRUSFOOD
id = REAGENT_ID_PHORONVIRUSFOOD
result = REAGENT_ID_PHORONVIRUSFOOD
required_reagents = list(REAGENT_ID_PHORON = 1, REAGENT_ID_VIRUSFOOD = 1)
result_amount = 1
-/decl/chemical_reaction/instant/virus_food_phoron_adranol
+/datum/decl/chemical_reaction/instant/virus_food_phoron_adranol
name = REAGENT_WEAKPHORONVIRUSFOOD
id = REAGENT_ID_WEAKPHORONVIRUSFOOD
result = REAGENT_ID_WEAKPHORONVIRUSFOOD
required_reagents = list(REAGENT_ID_ADRANOL = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
result_amount = 2
-/decl/chemical_reaction/instant/virus_food_mutagen_sugar
+/datum/decl/chemical_reaction/instant/virus_food_mutagen_sugar
name = REAGENT_SUGARVIRUSFOOD
id = REAGENT_ID_SUGARVIRUSFOOD
result = REAGENT_ID_SUGARVIRUSFOOD
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
result_amount = 2
-/decl/chemical_reaction/instant/virus_food_mutagen_inaprovaline
+/datum/decl/chemical_reaction/instant/virus_food_mutagen_inaprovaline
name = REAGENT_SUGARVIRUSFOOD
id = "inaprovalinevirusfood"
result = REAGENT_ID_SUGARVIRUSFOOD
required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
result_amount = 2
-/decl/chemical_reaction/instant/virus_food_uranium
+/datum/decl/chemical_reaction/instant/virus_food_uranium
name = REAGENT_URANIUMVIRUSFOOD
id = REAGENT_ID_URANIUMVIRUSFOOD
result = REAGENT_ID_URANIUMVIRUSFOOD
required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_VIRUSFOOD = 1)
result_amount = 1
-/decl/chemical_reaction/instant/virus_food_uranium_unstable
+/datum/decl/chemical_reaction/instant/virus_food_uranium_unstable
name = REAGENT_UNSTABLEURANIUMVIRUSFOOD
id = REAGENT_ID_UNSTABLEURANIUMVIRUSFOOD
result = REAGENT_ID_UNSTABLEURANIUMVIRUSFOOD
required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
result_amount = 1
-/decl/chemical_reaction/instant/virus_food_uranium_stable
+/datum/decl/chemical_reaction/instant/virus_food_uranium_stable
name = REAGENT_STABLEURANIUMVIRUSFOOD
id = REAGENT_ID_STABLEURANIUMVIRUSFOOD
result = REAGENT_ID_STABLEURANIUMVIRUSFOOD
required_reagents = list(REAGENT_ID_PHORON = 5, REAGENT_ID_URANIUM = 5, REAGENT_ID_SILVER = 5)
result_amount = 1
-/decl/chemical_reaction/instant/virus_food_uranium_stable_alt
+/datum/decl/chemical_reaction/instant/virus_food_uranium_stable_alt
name = REAGENT_STABLEURANIUMVIRUSFOOD_ALT
id = REAGENT_ID_STABLEURANIUMVIRUSFOOD_ALT
result = REAGENT_ID_STABLEURANIUMVIRUSFOOD
required_reagents = list(REAGENT_ID_PHORON = 5, REAGENT_ID_URANIUM = 5, REAGENT_ID_GOLD = 5)
result_amount = 1
-/decl/chemical_reaction/instant/virus_food_size
+/datum/decl/chemical_reaction/instant/virus_food_size
name = REAGENT_SIZEVIRUSFOOD
id = REAGENT_ID_SIZEVIRUSFOOD
result = REAGENT_ID_SIZEVIRUSFOOD
required_reagents = list(REAGENT_ID_SIZEOXADONE = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
result_amount = 2
-/decl/chemical_reaction/instant/mix_virus
+/datum/decl/chemical_reaction/instant/mix_virus
name = "Mix Virus"
id = "mixvirus"
required_reagents = list(REAGENT_ID_VIRUSFOOD = 1)
@@ -83,102 +83,102 @@
var/level_min = 0
var/level_max = 2
-/decl/chemical_reaction/instant/mix_virus/picky
+/datum/decl/chemical_reaction/instant/mix_virus/picky
id = "mixviruspicky"
var/list/datum/symptom/symptoms
-/decl/chemical_reaction/instant/mix_virus/on_reaction(datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/mix_virus/on_reaction(datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
if(D)
D.Evolve(level_min, level_max)
-/decl/chemical_reaction/instant/mix_virus/picky/on_reaction(datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/mix_virus/picky/on_reaction(datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
if(D)
D.PickyEvolve(symptoms)
-/decl/chemical_reaction/instant/mix_virus/mix_virus_2
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_2
name = "Mix Virus 2"
id = "mixvirus2"
required_reagents = list(REAGENT_ID_MUTAGEN = 1)
level_min = 2
level_max = 4
-/decl/chemical_reaction/instant/mix_virus/mix_virus_3
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_3
name = "Mix Virus 3"
id = "mixvirus3"
required_reagents = list(REAGENT_ID_VIRUSFOOD = 1, REAGENT_ID_PHORON = 1)
level_min = 4
level_max = 6
-/decl/chemical_reaction/instant/mix_virus/mix_virus_4
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_4
name = "Mix Virus 4"
id = "mixvirus4"
required_reagents = list(REAGENT_ID_URANIUM = 1)
level_min = 5
level_max = 6
-/decl/chemical_reaction/instant/mix_virus/mix_virus_5
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_5
name = "Mix Virus 5"
id = "mixvirus5"
required_reagents = list(REAGENT_ID_MUTAGENVIRUSFOOD = 1)
level_min = 3
level_max = 3
-/decl/chemical_reaction/instant/mix_virus/mix_virus_6
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_6
name = "Mix Virus 6"
id = "mixvirus6"
required_reagents = list(REAGENT_ID_SUGARVIRUSFOOD = 1)
level_min = 4
level_max = 4
-/decl/chemical_reaction/instant/mix_virus/mix_virus_7
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_7
name = "Mix Virus 7"
id = "mixvirus7"
required_reagents = list(REAGENT_ID_WEAKPHORONVIRUSFOOD = 1)
level_min = 5
level_max = 5
-/decl/chemical_reaction/instant/mix_virus/mix_virus_8
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_8
name = "Mix Virus 8"
id = "mixvirus8"
required_reagents = list(REAGENT_ID_PHORONVIRUSFOOD = 1)
level_min = 6
level_max = 6
-/decl/chemical_reaction/instant/mix_virus/mix_virus_9
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_9
name = "Mix Virus 9"
id = "mixvirus9"
required_reagents = list(REAGENT_ID_ADRANOLVIRUSFOOD = 1)
level_min = 1
level_max = 1
-/decl/chemical_reaction/instant/mix_virus/mix_virus_10
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_10
name = "Mix Virus 10"
id = "mixvirus10"
required_reagents = list(REAGENT_ID_URANIUMVIRUSFOOD = 1)
level_min = 6
level_max = 7
-/decl/chemical_reaction/instant/mix_virus/mix_virus_11
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_11
name = "Mix Virus 11"
id = "mixvirus11"
required_reagents = list(REAGENT_ID_UNSTABLEURANIUMVIRUSFOOD = 1)
level_min = 7
level_max = 7
-/decl/chemical_reaction/instant/mix_virus/mix_virus_12
+/datum/decl/chemical_reaction/instant/mix_virus/mix_virus_12
name = "Mix Virus 12"
id = "mixvirus12"
required_reagents = list(REAGENT_ID_STABLEURANIUMVIRUSFOOD = 1)
level_min = 8
level_max = 8
-/decl/chemical_reaction/instant/mix_virus/picky/size
+/datum/decl/chemical_reaction/instant/mix_virus/picky/size
name = "Mix Virus Size"
id = "mixvirussize"
required_reagents = list(REAGENT_ID_SIZEVIRUSFOOD = 1)
@@ -188,20 +188,20 @@
/datum/symptom/size/shrink
)
-/decl/chemical_reaction/instant/mix_virus/rem_virus
+/datum/decl/chemical_reaction/instant/mix_virus/rem_virus
name = "Devolve Virus"
id = "remvirus"
required_reagents = list(REAGENT_ID_ADRANOL = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
-/decl/chemical_reaction/instant/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
if(D)
D.Devolve()
-/decl/chemical_reaction/instant/antibodies
+/datum/decl/chemical_reaction/instant/antibodies
name = REAGENT_ANTIBODIES
id = "antibodiesmix"
result = REAGENT_ID_ANTIBODIES
@@ -209,26 +209,26 @@
catalysts = list(REAGENT_ID_INAPROVALINE = 0.1)
result_amount = 0.5
-/decl/chemical_reaction/instant/neuter_virus
+/datum/decl/chemical_reaction/instant/neuter_virus
name = "Neuter Virus"
id = "neutervirus"
required_reagents = list(REAGENT_ID_IMMUNOSUPRIZINE = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
-/decl/chemical_reaction/instant/neuter_virus/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/neuter_virus/on_reaction(var/datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
if(D)
D.Neuter()
-/decl/chemical_reaction/instant/falter_virus
+/datum/decl/chemical_reaction/instant/falter_virus
name = "Falter Virus"
id = "faltervirus"
required_reagents = list(REAGENT_ID_SPACEACILLIN = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
-/decl/chemical_reaction/instant/falter_virus/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/falter_virus/on_reaction(var/datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 214b114029..f07573edee 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -28,7 +28,7 @@
if(istype(A, /obj/item/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/closet) || istype(A, /obj/item/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart))
return
- if(istype(A, /spell))
+ if(istype(A, /datum/spell))
return
if(proximity)
diff --git a/code/modules/scripting/AST/AST Nodes.dm b/code/modules/scripting/AST/AST Nodes.dm
index 8a7a9db780..c9cff68b61 100644
--- a/code/modules/scripting/AST/AST Nodes.dm
+++ b/code/modules/scripting/AST/AST Nodes.dm
@@ -30,88 +30,88 @@
/*
Class: node
*/
-/node/proc/ToString()
+/datum/node/proc/ToString()
return "[src.type]"
/*
Class: identifier
*/
-/node/identifier
+/datum/node/identifier
var/id_name
-/node/identifier/New(id)
+/datum/node/identifier/New(id)
.=..()
src.id_name=id
-/node/identifier/ToString()
+/datum/node/identifier/ToString()
return id_name
/*
Class: expression
*/
-/node/expression
+/datum/node/expression
/*
Class: operator
See and for subtypes.
*/
-/node/expression/op
- var/node/expression/exp
+/datum/node/expression/op
+ var/datum/node/expression/exp
var/tmp/name
var/tmp/precedence
-/node/expression/op/New()
+/datum/node/expression/op/New()
.=..()
if(!src.name) src.name="[src.type]"
-/node/expression/op/ToString()
+/datum/node/expression/op/ToString()
return "operator: [name]"
/*
Class: FunctionCall
*/
-/node/expression/FunctionCall
+/datum/node/expression/FunctionCall
//Function calls can also be expressions or statements.
var/func_name
- var/node/identifier/object
+ var/datum/node/identifier/object
var/list/parameters = list()
/*
Class: literal
*/
-/node/expression/value/literal
+/datum/node/expression/value/literal
var/value
-/node/expression/value/literal/New(value)
+/datum/node/expression/value/literal/New(value)
.=..()
src.value=value
-/node/expression/value/literal/ToString()
+/datum/node/expression/value/literal/ToString()
return src.value
/*
Class: variable
*/
-/node/expression/value/variable
- var/node/object //Either a node/identifier or another node/expression/value/variable which points to the object
- var/node/identifier/id
+/datum/node/expression/value/variable
+ var/datum/node/object //Either a node/identifier or another node/expression/value/variable which points to the object
+ var/datum/node/identifier/id
-/node/expression/value/variable/New(ident)
+/datum/node/expression/value/variable/New(ident)
.=..()
id=ident
if(istext(id))id=new(id)
-/node/expression/value/variable/ToString()
+/datum/node/expression/value/variable/ToString()
return src.id.ToString()
/*
Class: reference
*/
-/node/expression/value/reference
+/datum/node/expression/value/reference
var/datum/value
-/node/expression/value/reference/New(value)
+/datum/node/expression/value/reference/New(value)
.=..()
src.value=value
-/node/expression/value/reference/ToString()
+/datum/node/expression/value/reference/ToString()
return "ref: [src.value] ([src.value.type])"
diff --git a/code/modules/scripting/AST/Blocks.dm b/code/modules/scripting/AST/Blocks.dm
index 42d06dcd8b..901c793acc 100644
--- a/code/modules/scripting/AST/Blocks.dm
+++ b/code/modules/scripting/AST/Blocks.dm
@@ -8,7 +8,7 @@
it is possible to have a function definition inside of any type of block (such as in an if statement or another function),
and not just in the global scope as in many languages.
*/
-/node/BlockDefinition
+/datum/node/BlockDefinition
var/list/statements = list()
var/list/functions = list()
var/list/initial_variables = list()
@@ -24,7 +24,7 @@
See Also:
-
*/
-/node/BlockDefinition/proc/SetVar(name, value)
+/datum/node/BlockDefinition/proc/SetVar(name, value)
initial_variables[name]=value
@@ -33,7 +33,7 @@
A block object representing the global scope.
*/
//
-/node/BlockDefinition/GlobalBlock/New()
+/datum/node/BlockDefinition/GlobalBlock/New()
initial_variables["null"]=null
return ..()
@@ -42,4 +42,4 @@
A block representing a function body.
*/
//
-/node/BlockDefinition/FunctionBlock
+/datum/node/BlockDefinition/FunctionBlock
diff --git a/code/modules/scripting/AST/Operators/Binary Operators.dm b/code/modules/scripting/AST/Operators/Binary Operators.dm
index 71d9517197..e00f54847a 100644
--- a/code/modules/scripting/AST/Operators/Binary Operators.dm
+++ b/code/modules/scripting/AST/Operators/Binary Operators.dm
@@ -7,8 +7,8 @@
Class: binary
Represents a binary operator in the AST. A binary operator takes two operands (ie x and y) and returns a value.
*/
-/node/expression/op/binary
- var/node/expression/exp2
+/datum/node/expression/op/binary
+ var/datum/node/expression/exp2
////////// Comparison Operators //////////
/*
@@ -16,7 +16,7 @@
Returns true if x = y.
*/
//
-/node/expression/op/binary/Equal
+/datum/node/expression/op/binary/Equal
precedence=OOP_EQUAL
/*
@@ -24,7 +24,7 @@
Returns true if x and y aren't equal.
*/
//
-/node/expression/op/binary/NotEqual
+/datum/node/expression/op/binary/NotEqual
precedence=OOP_EQUAL
/*
@@ -32,7 +32,7 @@
Returns true if x > y.
*/
//
-/node/expression/op/binary/Greater
+/datum/node/expression/op/binary/Greater
precedence=OOP_COMPARE
/*
@@ -40,7 +40,7 @@
Returns true if x < y.
*/
//
-/node/expression/op/binary/Less
+/datum/node/expression/op/binary/Less
precedence=OOP_COMPARE
/*
@@ -48,7 +48,7 @@
Returns true if x >= y.
*/
//
-/node/expression/op/binary/GreaterOrEqual
+/datum/node/expression/op/binary/GreaterOrEqual
precedence=OOP_COMPARE
/*
@@ -56,7 +56,7 @@
Returns true if x <= y.
*/
//
-/node/expression/op/binary/LessOrEqual
+/datum/node/expression/op/binary/LessOrEqual
precedence=OOP_COMPARE
@@ -67,7 +67,7 @@
Returns true if x and y are true.
*/
//
-/node/expression/op/binary/LogicalAnd
+/datum/node/expression/op/binary/LogicalAnd
precedence=OOP_AND
/*
@@ -75,7 +75,7 @@
Returns true if x, y, or both are true.
*/
//
-/node/expression/op/binary/LogicalOr
+/datum/node/expression/op/binary/LogicalOr
precedence=OOP_OR
/*
@@ -83,7 +83,7 @@
Returns true if either x or y but not both are true.
*/
//
-/node/expression/op/binary/LogicalXor //Not implemented in nS
+/datum/node/expression/op/binary/LogicalXor //Not implemented in nS
precedence=OOP_OR
@@ -97,7 +97,7 @@
011 & 110 = 010
*/
//
-/node/expression/op/binary/BitwiseAnd
+/datum/node/expression/op/binary/BitwiseAnd
precedence=OOP_BIT
/*
@@ -108,7 +108,7 @@
011 | 110 = 111
*/
//
-/node/expression/op/binary/BitwiseOr
+/datum/node/expression/op/binary/BitwiseOr
precedence=OOP_BIT
/*
@@ -119,7 +119,7 @@
011 xor 110 = 101
*/
//
-/node/expression/op/binary/BitwiseXor
+/datum/node/expression/op/binary/BitwiseXor
precedence=OOP_BIT
@@ -130,7 +130,7 @@
Returns the sum of x and y.
*/
//
-/node/expression/op/binary/Add
+/datum/node/expression/op/binary/Add
precedence=OOP_ADD
/*
@@ -138,7 +138,7 @@
Returns the difference of x and y.
*/
//
-/node/expression/op/binary/Subtract
+/datum/node/expression/op/binary/Subtract
precedence=OOP_ADD
/*
@@ -146,7 +146,7 @@
Returns the product of x and y.
*/
//
-/node/expression/op/binary/Multiply
+/datum/node/expression/op/binary/Multiply
precedence=OOP_MULTIPLY
/*
@@ -154,7 +154,7 @@
Returns the quotient of x and y.
*/
//
-/node/expression/op/binary/Divide
+/datum/node/expression/op/binary/Divide
precedence=OOP_MULTIPLY
/*
@@ -162,7 +162,7 @@
Returns x raised to the power of y.
*/
//
-/node/expression/op/binary/Power
+/datum/node/expression/op/binary/Power
precedence=OOP_POW
/*
@@ -170,5 +170,5 @@
Returns the remainder of x / y.
*/
//
-/node/expression/op/binary/Modulo
+/datum/node/expression/op/binary/Modulo
precedence=OOP_MULTIPLY
diff --git a/code/modules/scripting/AST/Operators/Unary Operators.dm b/code/modules/scripting/AST/Operators/Unary Operators.dm
index 07bb79a8c5..daeebbdf9c 100644
--- a/code/modules/scripting/AST/Operators/Unary Operators.dm
+++ b/code/modules/scripting/AST/Operators/Unary Operators.dm
@@ -5,7 +5,7 @@
Class: unary
Represents a unary operator in the AST. Unary operators take a single operand (referred to as x below) and return a value.
*/
-/node/expression/op/unary
+/datum/node/expression/op/unary
precedence=OOP_UNARY
/*
@@ -16,7 +16,7 @@
!true = false and !false = true
*/
//
-/node/expression/op/unary/LogicalNot
+/datum/node/expression/op/unary/LogicalNot
name="logical not"
/*
@@ -27,7 +27,7 @@
~10 (decimal 2) = 01 (decimal 1).
*/
//
-/node/expression/op/unary/BitwiseNot
+/datum/node/expression/op/unary/BitwiseNot
name="bitwise not"
/*
@@ -35,7 +35,7 @@
Returns -x.
*/
//
-/node/expression/op/unary/Minus
+/datum/node/expression/op/unary/Minus
name="minus"
/*
@@ -43,9 +43,9 @@
A special unary operator representing a value in parentheses.
*/
//
-/node/expression/op/unary/group
+/datum/node/expression/op/unary/group
precedence=OOP_GROUP
-/node/expression/op/unary/New(node/expression/exp)
+/datum/node/expression/op/unary/New(datum/node/expression/exp)
src.exp=exp
return ..()
diff --git a/code/modules/scripting/AST/Statements.dm b/code/modules/scripting/AST/Statements.dm
index 2b66c26284..9acfcac6db 100644
--- a/code/modules/scripting/AST/Statements.dm
+++ b/code/modules/scripting/AST/Statements.dm
@@ -5,15 +5,15 @@
Class: statement
An object representing a single instruction run by an interpreter.
*/
-/node/statement
+/datum/node/statement
/*
Class: FunctionCall
Represents a call to a function.
*/
//
-/node/statement/FunctionCall
+/datum/node/statement/FunctionCall
var/func_name
- var/node/identifier/object
+ var/datum/node/identifier/object
var/list/parameters=list()
/*
@@ -21,10 +21,10 @@
Defines a function.
*/
//
-/node/statement/FunctionDefinition
+/datum/node/statement/FunctionDefinition
var/func_name
var/list/parameters=list()
- var/node/BlockDefinition/FunctionBlock/block
+ var/datum/node/BlockDefinition/FunctionBlock/block
/*
Class: VariableAssignment
@@ -38,10 +38,10 @@
-
*/
//
-/node/statement/VariableAssignment
- var/node/identifier/object
- var/node/identifier/var_name
- var/node/expression/value
+/datum/node/statement/VariableAssignment
+ var/datum/node/identifier/object
+ var/datum/node/identifier/var_name
+ var/datum/node/expression/value
/*
Class: VariableDeclaration
@@ -51,56 +51,56 @@
-
*/
//
-/node/statement/VariableDeclaration
- var/node/identifier/object
- var/node/identifier/var_name
+/datum/node/statement/VariableDeclaration
+ var/datum/node/identifier/object
+ var/datum/node/identifier/var_name
/*
Class: IfStatement
*/
//
-/node/statement/IfStatement
- var/node/BlockDefinition/block
- var/node/BlockDefinition/else_block // may be null
- var/node/expression/cond
+/datum/node/statement/IfStatement
+ var/datum/node/BlockDefinition/block
+ var/datum/node/BlockDefinition/else_block // may be null
+ var/datum/node/expression/cond
/*
Class: WhileLoop
Loops while a given condition is true.
*/
//
-/node/statement/WhileLoop
- var/node/BlockDefinition/block
- var/node/expression/cond
+/datum/node/statement/WhileLoop
+ var/datum/node/BlockDefinition/block
+ var/datum/node/expression/cond
/*
Class: ForLoop
Loops while test is true, initializing a variable, increasing the variable
*/
-/node/statement/ForLoop
- var/node/BlockDefinition/block
- var/node/expression/test
- var/node/expression/init
- var/node/expression/increment
+/datum/node/statement/ForLoop
+ var/datum/node/BlockDefinition/block
+ var/datum/node/expression/test
+ var/datum/node/expression/init
+ var/datum/node/expression/increment
/*
Class: BreakStatement
Ends a loop.
*/
//
-/node/statement/BreakStatement
+/datum/node/statement/BreakStatement
/*
Class: ContinueStatement
Skips to the next iteration of a loop.
*/
//
-/node/statement/ContinueStatement
+/datum/node/statement/ContinueStatement
/*
Class: ReturnStatement
Ends the function and returns a value.
*/
//
-/node/statement/ReturnStatement
- var/node/expression/value
+/datum/node/statement/ReturnStatement
+ var/datum/node/expression/value
diff --git a/code/modules/scripting/Errors.dm b/code/modules/scripting/Errors.dm
index 0bcf5cd949..bf1241adf2 100644
--- a/code/modules/scripting/Errors.dm
+++ b/code/modules/scripting/Errors.dm
@@ -5,118 +5,118 @@
Class: scriptError
An error scanning or parsing the source code.
*/
-/scriptError
+/datum/scriptError
var/message /// A message describing the problem.
-/scriptError/New(msg=null)
+/datum/scriptError/New(msg=null)
if(msg)message=msg
-/scriptError/BadToken
+/datum/scriptError/BadToken
message="Unexpected token: "
- var/token/token
-/scriptError/BadToken/New(token/t)
+ var/datum/token/token
+/datum/scriptError/BadToken/New(datum/token/t)
token=t
if(t&&t.line) message="[t.line]: [message]"
if(istype(t))message+="[t.value]"
else message+="[t]"
-/scriptError/InvalidID
- parent_type=/scriptError/BadToken
+/datum/scriptError/InvalidID
+ parent_type=/datum/scriptError/BadToken
message="Invalid identifier name: "
-/scriptError/ReservedWord
- parent_type=/scriptError/BadToken
+/datum/scriptError/ReservedWord
+ parent_type=/datum/scriptError/BadToken
message="Identifer using reserved word: "
-/scriptError/BadNumber
- parent_type=/scriptError/BadToken
+/datum/scriptError/BadNumber
+ parent_type=/datum/scriptError/BadToken
message = "Bad number: "
-/scriptError/BadReturn
- var/token/token
+/datum/scriptError/BadReturn
+ var/datum/token/token
message = "Unexpected return statement outside of a function."
-/scriptError/BadReturn/New(token/t)
+/datum/scriptError/BadReturn/New(datum/token/t)
src.token=t
-/scriptError/EndOfFile
+/datum/scriptError/EndOfFile
message = "Unexpected end of file."
-/scriptError/ExpectedToken
+/datum/scriptError/ExpectedToken
message="Expected: '"
-/scriptError/ExpectedToken/New(id, token/T)
+/datum/scriptError/ExpectedToken/New(id, datum/token/T)
if(T && T.line) message="[T.line]: [message]"
message+="[id]'. "
if(T)message+="Found '[T.value]'."
-/scriptError/UnterminatedComment
+/datum/scriptError/UnterminatedComment
message="Unterminated multi-line comment statement: expected */"
-/scriptError/DuplicateFunction
+/datum/scriptError/DuplicateFunction
message="Function defined twice."
-/scriptError/DuplicateFunction/New(name, token/t)
+/datum/scriptError/DuplicateFunction/New(name, datum/token/t)
message="Function '[name]' defined twice."
/*
Class: runtimeError
An error thrown by the interpreter in running the script.
*/
-/runtimeError
+/datum/runtimeError
var/name
var/message /// A basic description as to what went wrong.
- var/stack/stack
+ var/datum/stack/stack
/**
* Proc: ToString
* Returns a description of the error suitable for showing to the user.
*/
-/runtimeError/proc/ToString()
+/datum/runtimeError/proc/ToString()
. = "[name]: [message]"
if(!stack.Top()) return
.+="\nStack:"
while(stack.Top())
- var/node/statement/FunctionCall/stmt=stack.Pop()
+ var/datum/node/statement/FunctionCall/stmt=stack.Pop()
. += "\n\t [stmt.func_name]()"
-/runtimeError/TypeMismatch
+/datum/runtimeError/TypeMismatch
name="TypeMismatchError"
-/runtimeError/TypeMismatch/New(op, a, b)
+/datum/runtimeError/TypeMismatch/New(op, a, b)
message="Type mismatch: '[a]' [op] '[b]'"
-/runtimeError/UnexpectedReturn
+/datum/runtimeError/UnexpectedReturn
name="UnexpectedReturnError"
message="Unexpected return statement."
-/runtimeError/UnknownInstruction
+/datum/runtimeError/UnknownInstruction
name="UnknownInstructionError"
message="Unknown instruction type. This may be due to incompatible compiler and interpreter versions or a lack of implementation."
-/runtimeError/UndefinedVariable
+/datum/runtimeError/UndefinedVariable
name="UndefinedVariableError"
-/runtimeError/UndefinedVariable/New(variable)
+/datum/runtimeError/UndefinedVariable/New(variable)
message="Variable '[variable]' has not been declared."
-/runtimeError/UndefinedFunction
+/datum/runtimeError/UndefinedFunction
name="UndefinedFunctionError"
-/runtimeError/UndefinedFunction/New(function)
+/datum/runtimeError/UndefinedFunction/New(function)
message="Function '[function]()' has not been defined."
-/runtimeError/DuplicateVariableDeclaration
+/datum/runtimeError/DuplicateVariableDeclaration
name="DuplicateVariableError"
-/runtimeError/DuplicateVariableDeclaration/New(variable)
+/datum/runtimeError/DuplicateVariableDeclaration/New(variable)
message="Variable '[variable]' was already declared."
-/runtimeError/IterationLimitReached
+/datum/runtimeError/IterationLimitReached
name="MaxIterationError"
message="A loop has reached its maximum number of iterations."
-/runtimeError/RecursionLimitReached
+/datum/runtimeError/RecursionLimitReached
name="MaxRecursionError"
message="The maximum amount of recursion has been reached."
-/runtimeError/DivisionByZero
+/datum/runtimeError/DivisionByZero
name="DivideByZeroError"
message="Division by zero attempted."
-/runtimeError/MaxCPU
+/datum/runtimeError/MaxCPU
name="MaxComputationalUse"
message="Maximum amount of computational cycles reached (>= 1000)."
diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm
index a0e43b867a..9b52f0a420 100644
--- a/code/modules/scripting/IDE.dm
+++ b/code/modules/scripting/IDE.dm
@@ -45,7 +45,7 @@
if(compileerrors.len)
src << output(span_bold("Compile Errors"), "tcserror")
- for(var/scriptError/e in compileerrors)
+ for(var/datum/scriptError/e in compileerrors)
src << output(span_red("\t>[e.message]"), "tcserror")
src << output("([compileerrors.len] errors)", "tcserror")
@@ -54,7 +54,7 @@
if(M.client)
M << output(null, "tcserror")
M << output(span_bold("Compile Errors"), "tcserror")
- for(var/scriptError/e in compileerrors)
+ for(var/datum/scriptError/e in compileerrors)
M << output(span_red("\t>[e.message]"), "tcserror")
M << output("([compileerrors.len] errors)", "tcserror")
@@ -97,7 +97,7 @@
if(compileerrors.len)
src << output(span_bold("Compile Errors"), "tcserror")
- for(var/scriptError/e in compileerrors)
+ for(var/datum/scriptError/e in compileerrors)
src << output(span_red("\t>[e.message]"), "tcserror")
src << output("([compileerrors.len] errors)", "tcserror")
@@ -106,7 +106,7 @@
if(M.client)
M << output(null, "tcserror")
M << output(span_bold("Compile Errors"), "tcserror")
- for(var/scriptError/e in compileerrors)
+ for(var/datum/scriptError/e in compileerrors)
M << output(span_red("\t>[e.message]"), "tcserror")
M << output("([compileerrors.len] errors)", "tcserror")
diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm
index 3e08b06baf..3a1dda18c0 100644
--- a/code/modules/scripting/Implementations/Telecomms.dm
+++ b/code/modules/scripting/Implementations/Telecomms.dm
@@ -4,14 +4,14 @@
/* --- Traffic Control Scripting Language --- */
// NanoTrasen TCS Language - Made by Doohl
-/n_Interpreter/TCS_Interpreter
+/datum/n_Interpreter/TCS_Interpreter
var/datum/TCS_Compiler/Compiler
-/n_Interpreter/TCS_Interpreter/HandleError(runtimeError/e)
+/datum/n_Interpreter/TCS_Interpreter/HandleError(datum/runtimeError/e)
Compiler.Holder.add_entry(e.ToString(), "Execution Error")
/datum/TCS_Compiler
- var/n_Interpreter/TCS_Interpreter/interpreter
+ var/datum/n_Interpreter/TCS_Interpreter/interpreter
var/obj/machinery/telecomms/server/Holder // the server that is running the code
var/ready = 1 // 1 if ready to run code
@@ -21,11 +21,11 @@
*/
/datum/TCS_Compiler/proc/Compile(code as message)
- var/n_scriptOptions/nS_Options/options = new()
- var/n_Scanner/nS_Scanner/scanner = new(code, options)
+ var/datum/n_scriptOptions/nS_Options/options = new()
+ var/datum/n_Scanner/nS_Scanner/scanner = new(code, options)
var/list/tokens = scanner.Scan()
- var/n_Parser/nS_Parser/parser = new(tokens, options)
- var/node/BlockDefinition/GlobalBlock/program = parser.Parse()
+ var/datum/n_Parser/nS_Parser/parser = new(tokens, options)
+ var/datum/node/BlockDefinition/GlobalBlock/program = parser.Parse()
var/list/returnerrors = list()
diff --git a/code/modules/scripting/Interpreter/Evaluation.dm b/code/modules/scripting/Interpreter/Evaluation.dm
index be488c9ddb..8a59f07134 100644
--- a/code/modules/scripting/Interpreter/Evaluation.dm
+++ b/code/modules/scripting/Interpreter/Evaluation.dm
@@ -1,24 +1,24 @@
/proc/isobject(x)
return !(isnum(x) || istext(x))
-/n_Interpreter/proc/Eval(node/expression/exp)
- if(istype(exp, /node/expression/FunctionCall))
+/datum/n_Interpreter/proc/Eval(datum/node/expression/exp)
+ if(istype(exp, /datum/node/expression/FunctionCall))
return RunFunction(exp)
- else if(istype(exp, /node/expression/op))
+ else if(istype(exp, /datum/node/expression/op))
return EvalOperator(exp)
- else if(istype(exp, /node/expression/value/literal))
- var/node/expression/value/literal/lit=exp
+ else if(istype(exp, /datum/node/expression/value/literal))
+ var/datum/node/expression/value/literal/lit=exp
return lit.value
- else if(istype(exp, /node/expression/value/reference))
- var/node/expression/value/reference/ref=exp
+ else if(istype(exp, /datum/node/expression/value/reference))
+ var/datum/node/expression/value/reference/ref=exp
return ref.value
- else if(istype(exp, /node/expression/value/variable))
- var/node/expression/value/variable/v=exp
+ else if(istype(exp, /datum/node/expression/value/variable))
+ var/datum/node/expression/value/variable/v=exp
if(!v.object)
return Eval(GetVariable(v.id.id_name))
else
var/datum/D
- if(istype(v.object, /node/identifier))
+ if(istype(v.object, /datum/node/identifier))
D=GetVariable(v.object:id_name)
else
D=v.object
@@ -26,142 +26,142 @@
if(!isobject(D))
return null
if(!D.vars.Find(v.id.id_name))
- RaiseError(new/runtimeError/UndefinedVariable("[v.object.ToString()].[v.id.id_name]"))
+ RaiseError(new/datum/runtimeError/UndefinedVariable("[v.object.ToString()].[v.id.id_name]"))
return null
return Eval(D.vars[v.id.id_name])
- else if(istype(exp, /node/expression))
- RaiseError(new/runtimeError/UnknownInstruction())
+ else if(istype(exp, /datum/node/expression))
+ RaiseError(new/datum/runtimeError/UnknownInstruction())
else
return exp
-/n_Interpreter/proc/EvalOperator(node/expression/op/exp)
- if(istype(exp, /node/expression/op/binary))
- var/node/expression/op/binary/bin=exp
+/datum/n_Interpreter/proc/EvalOperator(datum/node/expression/op/exp)
+ if(istype(exp, /datum/node/expression/op/binary))
+ var/datum/node/expression/op/binary/bin=exp
switch(bin.type)
- if(/node/expression/op/binary/Equal)
+ if(/datum/node/expression/op/binary/Equal)
return Equal(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/NotEqual)
+ if(/datum/node/expression/op/binary/NotEqual)
return NotEqual(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/Greater)
+ if(/datum/node/expression/op/binary/Greater)
return Greater(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/Less)
+ if(/datum/node/expression/op/binary/Less)
return Less(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/GreaterOrEqual)
+ if(/datum/node/expression/op/binary/GreaterOrEqual)
return GreaterOrEqual(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/LessOrEqual)
+ if(/datum/node/expression/op/binary/LessOrEqual)
return LessOrEqual(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/LogicalAnd)
+ if(/datum/node/expression/op/binary/LogicalAnd)
return LogicalAnd(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/LogicalOr)
+ if(/datum/node/expression/op/binary/LogicalOr)
return LogicalOr(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/LogicalXor)
+ if(/datum/node/expression/op/binary/LogicalXor)
return LogicalXor(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/BitwiseAnd)
+ if(/datum/node/expression/op/binary/BitwiseAnd)
return BitwiseAnd(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/BitwiseOr)
+ if(/datum/node/expression/op/binary/BitwiseOr)
return BitwiseOr(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/BitwiseXor)
+ if(/datum/node/expression/op/binary/BitwiseXor)
return BitwiseXor(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/Add)
+ if(/datum/node/expression/op/binary/Add)
return Add(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/Subtract)
+ if(/datum/node/expression/op/binary/Subtract)
return Subtract(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/Multiply)
+ if(/datum/node/expression/op/binary/Multiply)
return Multiply(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/Divide)
+ if(/datum/node/expression/op/binary/Divide)
return Divide(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/Power)
+ if(/datum/node/expression/op/binary/Power)
return Power(Eval(bin.exp), Eval(bin.exp2))
- if(/node/expression/op/binary/Modulo)
+ if(/datum/node/expression/op/binary/Modulo)
return Modulo(Eval(bin.exp), Eval(bin.exp2))
else
- RaiseError(new/runtimeError/UnknownInstruction())
+ RaiseError(new/datum/runtimeError/UnknownInstruction())
return
switch(exp.type)
- if(/node/expression/op/unary/Minus)
+ if(/datum/node/expression/op/unary/Minus)
return Minus(Eval(exp.exp))
- if(/node/expression/op/unary/LogicalNot)
+ if(/datum/node/expression/op/unary/LogicalNot)
return LogicalNot(Eval(exp.exp))
- if(/node/expression/op/unary/BitwiseNot)
+ if(/datum/node/expression/op/unary/BitwiseNot)
return BitwiseNot(Eval(exp.exp))
- if(/node/expression/op/unary/group)
+ if(/datum/node/expression/op/unary/group)
return Eval(exp.exp)
else
- RaiseError(new/runtimeError/UnknownInstruction())
+ RaiseError(new/datum/runtimeError/UnknownInstruction())
//Binary//
//Comparison operators
-/n_Interpreter/proc/Equal(a, b) return a==b
-/n_Interpreter/proc/NotEqual(a, b) return a!=b //LogicalNot(Equal(a, b))
-/n_Interpreter/proc/Greater(a, b) return a>b
-/n_Interpreter/proc/Less(a, b) return a=b
-/n_Interpreter/proc/LessOrEqual(a, b) return a<=b
+/datum/n_Interpreter/proc/Equal(a, b) return a==b
+/datum/n_Interpreter/proc/NotEqual(a, b) return a!=b //LogicalNot(Equal(a, b))
+/datum/n_Interpreter/proc/Greater(a, b) return a>b
+/datum/n_Interpreter/proc/Less(a, b) return a=b
+/datum/n_Interpreter/proc/LessOrEqual(a, b) return a<=b
//Logical Operators
-/n_Interpreter/proc/LogicalAnd(a, b) return a&&b
-/n_Interpreter/proc/LogicalOr(a, b) return a||b
-/n_Interpreter/proc/LogicalXor(a, b) return (a||b) && !(a&&b)
+/datum/n_Interpreter/proc/LogicalAnd(a, b) return a&&b
+/datum/n_Interpreter/proc/LogicalOr(a, b) return a||b
+/datum/n_Interpreter/proc/LogicalXor(a, b) return (a||b) && !(a&&b)
//Bitwise Operators
-/n_Interpreter/proc/BitwiseAnd(a, b) return a&b
-/n_Interpreter/proc/BitwiseOr(a, b) return a|b
-/n_Interpreter/proc/BitwiseXor(a, b) return a^b
+/datum/n_Interpreter/proc/BitwiseAnd(a, b) return a&b
+/datum/n_Interpreter/proc/BitwiseOr(a, b) return a|b
+/datum/n_Interpreter/proc/BitwiseXor(a, b) return a^b
//Arithmetic Operators
-/n_Interpreter/proc/Add(a, b)
+/datum/n_Interpreter/proc/Add(a, b)
if(istext(a)&&!istext(b)) b="[b]"
else if(istext(b)&&!istext(a)) a="[a]"
if(isobject(a) && !isobject(b))
- RaiseError(new/runtimeError/TypeMismatch("+", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("+", a, b))
return null
else if(isobject(b) && !isobject(a))
- RaiseError(new/runtimeError/TypeMismatch("+", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("+", a, b))
return null
return a+b
-/n_Interpreter/proc/Subtract(a, b)
+/datum/n_Interpreter/proc/Subtract(a, b)
if(isobject(a) && !isobject(b))
- RaiseError(new/runtimeError/TypeMismatch("-", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("-", a, b))
return null
else if(isobject(b) && !isobject(a))
- RaiseError(new/runtimeError/TypeMismatch("-", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("-", a, b))
return null
return a-b
-/n_Interpreter/proc/Divide(a, b)
+/datum/n_Interpreter/proc/Divide(a, b)
if(isobject(a) && !isobject(b))
- RaiseError(new/runtimeError/TypeMismatch("/", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("/", a, b))
return null
else if(isobject(b) && !isobject(a))
- RaiseError(new/runtimeError/TypeMismatch("/", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("/", a, b))
return null
if(b==0)
- RaiseError(new/runtimeError/DivisionByZero())
+ RaiseError(new/datum/runtimeError/DivisionByZero())
return null
return a/b
-/n_Interpreter/proc/Multiply(a, b)
+/datum/n_Interpreter/proc/Multiply(a, b)
if(isobject(a) && !isobject(b))
- RaiseError(new/runtimeError/TypeMismatch("*", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("*", a, b))
return null
else if(isobject(b) && !isobject(a))
- RaiseError(new/runtimeError/TypeMismatch("*", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("*", a, b))
return null
return a*b
-/n_Interpreter/proc/Modulo(a, b)
+/datum/n_Interpreter/proc/Modulo(a, b)
if(isobject(a) && !isobject(b))
- RaiseError(new/runtimeError/TypeMismatch("%", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("%", a, b))
return null
else if(isobject(b) && !isobject(a))
- RaiseError(new/runtimeError/TypeMismatch("%", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("%", a, b))
return null
return a%b
-/n_Interpreter/proc/Power(a, b)
+/datum/n_Interpreter/proc/Power(a, b)
if(isobject(a) && !isobject(b))
- RaiseError(new/runtimeError/TypeMismatch("**", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("**", a, b))
return null
else if(isobject(b) && !isobject(a))
- RaiseError(new/runtimeError/TypeMismatch("**", a, b))
+ RaiseError(new/datum/runtimeError/TypeMismatch("**", a, b))
return null
return a**b
//Unary//
-/n_Interpreter/proc/Minus(a) return -a
-/n_Interpreter/proc/LogicalNot(a) return !a
-/n_Interpreter/proc/BitwiseNot(a) return ~a
+/datum/n_Interpreter/proc/Minus(a) return -a
+/datum/n_Interpreter/proc/LogicalNot(a) return !a
+/datum/n_Interpreter/proc/BitwiseNot(a) return ~a
diff --git a/code/modules/scripting/Interpreter/Interaction.dm b/code/modules/scripting/Interpreter/Interaction.dm
index 9894962274..f748113aaa 100644
--- a/code/modules/scripting/Interpreter/Interaction.dm
+++ b/code/modules/scripting/Interpreter/Interaction.dm
@@ -6,7 +6,7 @@
Class: n_Interpreter
Procedures allowing for interaction with the script that is being run by the interpreter object.
*/
-/n_Interpreter
+/datum/n_Interpreter
/*
Proc: Load
@@ -15,7 +15,7 @@
Parameters:
program - A object which represents the script's global scope.
*/
-/n_Interpreter/proc/Load(node/BlockDefinition/GlobalBlock/program)
+/datum/n_Interpreter/proc/Load(datum/node/BlockDefinition/GlobalBlock/program)
ASSERT(program)
src.program = program
CreateGlobalScope()
@@ -24,7 +24,7 @@
Proc: Run
Runs the script.
*/
-/n_Interpreter/proc/Run()
+/datum/n_Interpreter/proc/Run()
cur_recursion = 0 // reset recursion
cur_statements = 0 // reset CPU tracking
alertadmins = 0
@@ -43,7 +43,7 @@
See Also:
-
*/
-/n_Interpreter/proc/SetVar(name, value)
+/datum/n_Interpreter/proc/SetVar(name, value)
if(!istext(name))
//CRASH("Invalid variable name")
return
@@ -59,24 +59,24 @@
object - (Optional) An object which will the be target of a function call.
params - Only required if object is not null, a list of the names of parameters the proc takes.
*/
-/n_Interpreter/proc/SetProc(name, path, object=null, list/params=null)
+/datum/n_Interpreter/proc/SetProc(name, path, object=null, list/params=null)
if(!istext(name))
//CRASH("Invalid function name")
return
if(!object)
globalScope.functions[name] = path
return
- var/node/statement/FunctionDefinition/S = new()
+ var/datum/node/statement/FunctionDefinition/S = new()
S.func_name = name
S.parameters = params
S.block = new()
S.block.SetVar("src", object)
- var/node/expression/FunctionCall/C = new()
+ var/datum/node/expression/FunctionCall/C = new()
C.func_name = path
C.object = new("src")
for(var/p in params)
- C.parameters += new/node/expression/value/variable(p)
- var/node/statement/ReturnStatement/R=new()
+ C.parameters += new/datum/node/expression/value/variable(p)
+ var/datum/node/statement/ReturnStatement/R=new()
R.value=C
S.block.statements += R
globalScope.functions[name] = S
@@ -84,14 +84,14 @@
Proc: VarExists
Checks whether a global variable with the specified name exists.
*/
-/n_Interpreter/proc/VarExists(name)
+/datum/n_Interpreter/proc/VarExists(name)
return globalScope.variables.Find(name) //convert to 1/0 first?
/*
Proc: ProcExists
Checks whether a global function with the specified name exists.
*/
-/n_Interpreter/proc/ProcExists(name)
+/datum/n_Interpreter/proc/ProcExists(name)
return globalScope.functions.Find(name)
/*
@@ -101,7 +101,7 @@
See Also:
-
*/
-/n_Interpreter/proc/GetVar(name)
+/datum/n_Interpreter/proc/GetVar(name)
if(!VarExists(name))
//CRASH("No variable named '[name]'.")
return
@@ -116,13 +116,13 @@
See Also:
-
*/
-/n_Interpreter/proc/CallProc(name, params[]=null)
+/datum/n_Interpreter/proc/CallProc(name, params[]=null)
if(!ProcExists(name))
//CRASH("No function named '[name]'.")
return
- var/node/statement/FunctionDefinition/func = globalScope.functions[name]
+ var/datum/node/statement/FunctionDefinition/func = globalScope.functions[name]
if(istype(func))
- var/node/statement/FunctionCall/stmt = new
+ var/datum/node/statement/FunctionCall/stmt = new
stmt.func_name = func.func_name
stmt.parameters = params
return RunFunction(stmt)
@@ -137,4 +137,4 @@
See Also:
-
*/
-/n_Interpreter/proc/HandleError(runtimeError/e)
+/datum/n_Interpreter/proc/HandleError(datum/runtimeError/e)
diff --git a/code/modules/scripting/Interpreter/Interpreter.dm b/code/modules/scripting/Interpreter/Interpreter.dm
index 8f9ef9b979..74312b690f 100644
--- a/code/modules/scripting/Interpreter/Interpreter.dm
+++ b/code/modules/scripting/Interpreter/Interpreter.dm
@@ -13,13 +13,13 @@
#define RETURNING 1
#define BREAKING 2
#define CONTINUING 4
-/n_Interpreter
- var/scope/curScope
- var/scope/globalScope
- var/node/BlockDefinition/program
- var/node/statement/FunctionDefinition/curFunction
- var/stack/scopes = new()
- var/stack/functions = new()
+/datum/n_Interpreter
+ var/datum/scope/curScope
+ var/datum/scope/globalScope
+ var/datum/node/BlockDefinition/program
+ var/datum/node/statement/FunctionDefinition/curFunction
+ var/datum/stack/scopes = new()
+ var/datum/stack/functions = new()
var/datum/container // associated container for interpeter
/*
@@ -46,7 +46,7 @@
Constructor: New
Calls with the given parameters.
*/
-/n_Interpreter/New(node/BlockDefinition/GlobalBlock/program=null)
+/datum/n_Interpreter/New(datum/node/BlockDefinition/GlobalBlock/program=null)
.=..()
if(program)Load(program)
@@ -54,20 +54,20 @@
Proc: RaiseError
Raises a runtime error.
*/
-/n_Interpreter/proc/RaiseError(runtimeError/e)
+/datum/n_Interpreter/proc/RaiseError(datum/runtimeError/e)
e.stack=functions.Copy()
e.stack.Push(curFunction)
src.HandleError(e)
-/n_Interpreter/proc/CreateScope(node/BlockDefinition/B)
- var/scope/S = new(B, curScope)
+/datum/n_Interpreter/proc/CreateScope(datum/node/BlockDefinition/B)
+ var/datum/scope/S = new(B, curScope)
scopes.Push(curScope)
curScope = S
return S
-/n_Interpreter/proc/CreateGlobalScope()
+/datum/n_Interpreter/proc/CreateGlobalScope()
scopes.Clear()
- var/scope/S = new(program, null)
+ var/datum/scope/S = new(program, null)
globalScope = S
return S
@@ -75,8 +75,8 @@
Proc: RunBlock
Runs each statement in a block of code.
*/
-/n_Interpreter/proc/RunBlock(node/BlockDefinition/Block, scope/scope = null)
- var/is_global = istype(Block, /node/BlockDefinition/GlobalBlock)
+/datum/n_Interpreter/proc/RunBlock(datum/node/BlockDefinition/Block, datum/scope/scope = null)
+ var/is_global = istype(Block, /datum/node/BlockDefinition/GlobalBlock)
if(!is_global)
if(scope)
curScope = scope
@@ -89,12 +89,12 @@ Runs each statement in a block of code.
if(cur_statements < max_statements)
- for(var/node/statement/S in Block.statements)
+ for(var/datum/node/statement/S in Block.statements)
while(paused) sleep(10)
cur_statements++
if(cur_statements >= max_statements)
- RaiseError(new/runtimeError/MaxCPU())
+ RaiseError(new/datum/runtimeError/MaxCPU())
if(container && !alertadmins)
if(istype(container, /datum/TCS_Compiler))
@@ -106,8 +106,8 @@ Runs each statement in a block of code.
message_admins(message, 1)
break
- if(istype(S, /node/statement/VariableAssignment))
- var/node/statement/VariableAssignment/stmt = S
+ if(istype(S, /datum/node/statement/VariableAssignment))
+ var/datum/node/statement/VariableAssignment/stmt = S
var/name = stmt.var_name.id_name
if(!stmt.object)
// Below we assign the variable first to null if it doesn't already exist.
@@ -120,38 +120,38 @@ Runs each statement in a block of code.
var/datum/D = Eval(GetVariable(stmt.object.id_name))
if(!D) return
D.vars[stmt.var_name.id_name] = Eval(stmt.value)
- else if(istype(S, /node/statement/VariableDeclaration))
+ else if(istype(S, /datum/node/statement/VariableDeclaration))
//VariableDeclaration nodes are used to forcibly declare a local variable so that one in a higher scope isn't used by default.
- var/node/statement/VariableDeclaration/dec=S
+ var/datum/node/statement/VariableDeclaration/dec=S
if(!dec.object)
AssignVariable(dec.var_name.id_name, null, curScope)
else
var/datum/D = Eval(GetVariable(dec.object.id_name))
if(!D) return
D.vars[dec.var_name.id_name] = null
- else if(istype(S, /node/statement/FunctionCall))
+ else if(istype(S, /datum/node/statement/FunctionCall))
RunFunction(S)
- else if(istype(S, /node/statement/FunctionDefinition))
+ else if(istype(S, /datum/node/statement/FunctionDefinition))
pass() //do nothing
- else if(istype(S, /node/statement/WhileLoop))
+ else if(istype(S, /datum/node/statement/WhileLoop))
RunWhile(S)
- else if(istype(S, /node/statement/IfStatement))
+ else if(istype(S, /datum/node/statement/IfStatement))
RunIf(S)
- else if(istype(S, /node/statement/ReturnStatement))
+ else if(istype(S, /datum/node/statement/ReturnStatement))
if(!curFunction)
- RaiseError(new/runtimeError/UnexpectedReturn())
+ RaiseError(new/datum/runtimeError/UnexpectedReturn())
continue
status |= RETURNING
returnVal=Eval(S:value)
break
- else if(istype(S, /node/statement/BreakStatement))
+ else if(istype(S, /datum/node/statement/BreakStatement))
status |= BREAKING
break
- else if(istype(S, /node/statement/ContinueStatement))
+ else if(istype(S, /datum/node/statement/ContinueStatement))
status |= CONTINUING
break
else
- RaiseError(new/runtimeError/UnknownInstruction())
+ RaiseError(new/datum/runtimeError/UnknownInstruction())
if(status)
break
@@ -161,15 +161,15 @@ Runs each statement in a block of code.
Proc: RunFunction
Runs a function block or a proc with the arguments specified in the script.
*/
-/n_Interpreter/proc/RunFunction(node/statement/FunctionCall/stmt)
+/datum/n_Interpreter/proc/RunFunction(datum/node/statement/FunctionCall/stmt)
//Note that anywhere /node/statement/FunctionCall/stmt is used so may /node/expression/FunctionCall
// If recursion gets too high (max 50 nested functions) throw an error
if(cur_recursion >= max_recursion)
- RaiseError(new/runtimeError/RecursionLimitReached())
+ RaiseError(new/datum/runtimeError/RecursionLimitReached())
return 0
- var/node/statement/FunctionDefinition/def
+ var/datum/node/statement/FunctionDefinition/def
if(!stmt.object) //A scope's function is being called, stmt.object is null
def = GetFunction(stmt.func_name)
else if(istype(stmt.object)) //A method of an object exposed as a variable is being called, stmt.object is a /node/identifier
@@ -182,14 +182,14 @@ Runs a function block or a proc with the arguments specified in the script.
cur_recursion++ // add recursion
if(istype(def))
if(curFunction) functions.Push(curFunction)
- var/scope/S = CreateScope(def.block)
+ var/datum/scope/S = CreateScope(def.block)
for(var/i=1 to def.parameters.len)
var/val
if(stmt.parameters.len>=i)
val = stmt.parameters[i]
//else
// unspecified param
- AssignVariable(def.parameters[i], new/node/expression/value/literal(Eval(val)), S)
+ AssignVariable(def.parameters[i], new/datum/node/expression/value/literal(Eval(val)), S)
curFunction=stmt
RunBlock(def.block, S)
//Handle return value
@@ -201,11 +201,11 @@ Runs a function block or a proc with the arguments specified in the script.
else
cur_recursion--
var/list/params=new
- for(var/node/expression/P in stmt.parameters)
+ for(var/datum/node/expression/P in stmt.parameters)
params+=list(Eval(P))
if(isobject(def)) //def is an object which is the target of a function call
if( !hascall(def, stmt.func_name) )
- RaiseError(new/runtimeError/UndefinedFunction("[stmt.object.id_name].[stmt.func_name]"))
+ RaiseError(new/datum/runtimeError/UndefinedFunction("[stmt.object.id_name].[stmt.func_name]"))
return
return call(def, stmt.func_name)(arglist(params))
else //def is a path to a global proc
@@ -217,7 +217,7 @@ Runs a function block or a proc with the arguments specified in the script.
Proc: RunIf
Checks a condition and runs either the if block or else block.
*/
-/n_Interpreter/proc/RunIf(node/statement/IfStatement/stmt)
+/datum/n_Interpreter/proc/RunIf(datum/node/statement/IfStatement/stmt)
if(Eval(stmt.cond))
RunBlock(stmt.block)
else if(stmt.else_block)
@@ -227,7 +227,7 @@ Checks a condition and runs either the if block or else block.
Proc: RunWhile
Runs a while loop.
*/
-/n_Interpreter/proc/RunWhile(node/statement/WhileLoop/stmt)
+/datum/n_Interpreter/proc/RunWhile(datum/node/statement/WhileLoop/stmt)
var/i=1
while(Eval(stmt.cond) && Iterate(stmt.block, i++))
continue
@@ -237,10 +237,10 @@ Runs a while loop.
Proc:Iterate
Runs a single iteration of a loop. Returns a value indicating whether or not to continue looping.
*/
-/n_Interpreter/proc/Iterate(node/BlockDefinition/block, count)
+/datum/n_Interpreter/proc/Iterate(datum/node/BlockDefinition/block, count)
RunBlock(block)
if(max_iterations > 0 && count >= max_iterations)
- RaiseError(new/runtimeError/IterationLimitReached())
+ RaiseError(new/datum/runtimeError/IterationLimitReached())
return 0
if(status & (BREAKING|RETURNING))
return 0
@@ -251,36 +251,36 @@ Runs a single iteration of a loop. Returns a value indicating whether or not to
Proc: GetFunction
Finds a function in an accessible scope with the given name. Returns a .
*/
-/n_Interpreter/proc/GetFunction(name)
- var/scope/S = curScope
+/datum/n_Interpreter/proc/GetFunction(name)
+ var/datum/scope/S = curScope
while(S)
if(S.functions.Find(name))
return S.functions[name]
S = S.parent
- RaiseError(new/runtimeError/UndefinedFunction(name))
+ RaiseError(new/datum/runtimeError/UndefinedFunction(name))
/*
Proc: GetVariable
Finds a variable in an accessible scope and returns its value.
*/
-/n_Interpreter/proc/GetVariable(name)
- var/scope/S = curScope
+/datum/n_Interpreter/proc/GetVariable(name)
+ var/datum/scope/S = curScope
while(S)
if(S.variables.Find(name))
return S.variables[name]
S = S.parent
- RaiseError(new/runtimeError/UndefinedVariable(name))
+ RaiseError(new/datum/runtimeError/UndefinedVariable(name))
-/n_Interpreter/proc/GetVariableScope(name) //needed for when you reassign a variable in a higher scope
- var/scope/S = curScope
+/datum/n_Interpreter/proc/GetVariableScope(name) //needed for when you reassign a variable in a higher scope
+ var/datum/scope/S = curScope
while(S)
if(S.variables.Find(name))
return S
S = S.parent
-/n_Interpreter/proc/IsVariableAccessible(name)
- var/scope/S = curScope
+/datum/n_Interpreter/proc/IsVariableAccessible(name)
+ var/datum/scope/S = curScope
while(S)
if(S.variables.Find(name))
return TRUE
@@ -297,13 +297,13 @@ name - The name of the variable to assign.
value - The value to assign to it.
S - The scope the variable resides in. If it is null, a scope with the variable already existing is found. If no scopes have a variable of the given name, the current scope is used.
*/
-/n_Interpreter/proc/AssignVariable(name, node/expression/value, scope/S=null)
+/datum/n_Interpreter/proc/AssignVariable(name, datum/node/expression/value, datum/scope/S=null)
if(!S) S = GetVariableScope(name)
if(!S) S = curScope
if(!S) S = globalScope
ASSERT(istype(S))
- if(istext(value) || isnum(value) || isnull(value)) value = new/node/expression/value/literal(value)
- else if(!istype(value) && isobject(value)) value = new/node/expression/value/reference(value)
+ if(istext(value) || isnum(value) || isnull(value)) value = new/datum/node/expression/value/literal(value)
+ else if(!istype(value) && isobject(value)) value = new/datum/node/expression/value/reference(value)
//TODO: check for invalid name
S.variables["[name]"] = value
diff --git a/code/modules/scripting/Interpreter/Scope.dm b/code/modules/scripting/Interpreter/Scope.dm
index 8cd8dc7a5a..7dcddea344 100644
--- a/code/modules/scripting/Interpreter/Scope.dm
+++ b/code/modules/scripting/Interpreter/Scope.dm
@@ -2,13 +2,13 @@
Class: scope
A runtime instance of a block. Used internally by the interpreter.
*/
-/scope/
- var/scope/parent = null
- var/node/BlockDefinition/block
+/datum/scope
+ var/datum/scope/parent = null
+ var/datum/node/BlockDefinition/block
var/list/functions
var/list/variables
-/scope/New(node/BlockDefinition/B, scope/parent)
+/datum/scope/New(datum/node/BlockDefinition/B, datum/scope/parent)
src.block = B
src.parent = parent
src.variables = B.initial_variables.Copy()
diff --git a/code/modules/scripting/Options.dm b/code/modules/scripting/Options.dm
index 52c63f4f79..64ad26dada 100644
--- a/code/modules/scripting/Options.dm
+++ b/code/modules/scripting/Options.dm
@@ -14,19 +14,19 @@ File: Options
/*
Class: n_scriptOptions
*/
-/n_scriptOptions/proc/CanStartID(char) //returns true if the character can start a variable, function, or keyword name (by default letters or an underscore)
+/datum/n_scriptOptions/proc/CanStartID(char) //returns true if the character can start a variable, function, or keyword name (by default letters or an underscore)
if(!isnum(char))char=text2ascii(char)
return (char in ASCII_A to ASCII_Z) || (char in ASCII_LOWER_A to ASCII_LOWER_Z) || char==ASCII_UNDERSCORE || char==ASCII_DOLLAR
-/n_scriptOptions/proc/IsValidIDChar(char) //returns true if the character can be in the body of a variable, function, or keyword name (by default letters, numbers, and underscore)
+/datum/n_scriptOptions/proc/IsValidIDChar(char) //returns true if the character can be in the body of a variable, function, or keyword name (by default letters, numbers, and underscore)
if(!isnum(char))char=text2ascii(char)
return CanStartID(char) || IsDigit(char)
-/n_scriptOptions/proc/IsDigit(char)
+/datum/n_scriptOptions/proc/IsDigit(char)
if(!isnum(char))char=text2ascii(char)
return char in ASCII_ZERO to ASCII_NINE
-/n_scriptOptions/proc/IsValidID(id) //returns true if all the characters in the string are okay to be in an identifier name
+/datum/n_scriptOptions/proc/IsValidID(id) //returns true if all the characters in the string are okay to be in an identifier name
if(!CanStartID(id)) //don't need to grab first char in id, since text2ascii does it automatically
return 0
if(length(id)==1) return 1
@@ -39,7 +39,7 @@ File: Options
Class: nS_Options
An implementation of for the n_Script language.
*/
-/n_scriptOptions/nS_Options
+/datum/n_scriptOptions/nS_Options
var/list/symbols = list("(", ")", "\[", "]", ";", ",", "{", "}") //scanner - Characters that can be in symbols
/*
Var: keywords
@@ -47,13 +47,13 @@ An associative list used by the parser to parse keywords. Indices are strings wh
associated values are types of which the proc will be called.
*/
var/list/keywords = list(
- "if" = /n_Keyword/nS_Keyword/kwIf,
- "else" = /n_Keyword/nS_Keyword/kwElse,
- "while" = /n_Keyword/nS_Keyword/kwWhile,
- "break" = /n_Keyword/nS_Keyword/kwBreak,
- "continue" = /n_Keyword/nS_Keyword/kwContinue,
- "return" = /n_Keyword/nS_Keyword/kwReturn,
- "def" = /n_Keyword/nS_Keyword/kwDef
+ "if" = /datum/n_Keyword/nS_Keyword/kwIf,
+ "else" = /datum/n_Keyword/nS_Keyword/kwElse,
+ "while" = /datum/n_Keyword/nS_Keyword/kwWhile,
+ "break" = /datum/n_Keyword/nS_Keyword/kwBreak,
+ "continue" = /datum/n_Keyword/nS_Keyword/kwContinue,
+ "return" = /datum/n_Keyword/nS_Keyword/kwReturn,
+ "def" = /datum/n_Keyword/nS_Keyword/kwDef
)
var/list/assign_operators = list(
@@ -70,31 +70,31 @@ associated values are types of which the proc w
)
var/list/unary_operators =list(
- "!" = /node/expression/op/unary/LogicalNot,
- "~" = /node/expression/op/unary/BitwiseNot,
- "-" = /node/expression/op/unary/Minus
+ "!" = /datum/node/expression/op/unary/LogicalNot,
+ "~" = /datum/node/expression/op/unary/BitwiseNot,
+ "-" = /datum/node/expression/op/unary/Minus
)
var/list/binary_operators=list(
- "==" = /node/expression/op/binary/Equal,
- "!=" = /node/expression/op/binary/NotEqual,
- ">" = /node/expression/op/binary/Greater,
- "<" = /node/expression/op/binary/Less,
- ">=" = /node/expression/op/binary/GreaterOrEqual,
- "<=" = /node/expression/op/binary/LessOrEqual,
- "&&" = /node/expression/op/binary/LogicalAnd,
- "||" = /node/expression/op/binary/LogicalOr,
- "&" = /node/expression/op/binary/BitwiseAnd,
- "|" = /node/expression/op/binary/BitwiseOr,
- "`" = /node/expression/op/binary/BitwiseXor,
- "+" = /node/expression/op/binary/Add,
- "-" = /node/expression/op/binary/Subtract,
- "*" = /node/expression/op/binary/Multiply,
- "/" = /node/expression/op/binary/Divide,
- "^" = /node/expression/op/binary/Power,
- "%" = /node/expression/op/binary/Modulo)
+ "==" = /datum/node/expression/op/binary/Equal,
+ "!=" = /datum/node/expression/op/binary/NotEqual,
+ ">" = /datum/node/expression/op/binary/Greater,
+ "<" = /datum/node/expression/op/binary/Less,
+ ">=" = /datum/node/expression/op/binary/GreaterOrEqual,
+ "<=" = /datum/node/expression/op/binary/LessOrEqual,
+ "&&" = /datum/node/expression/op/binary/LogicalAnd,
+ "||" = /datum/node/expression/op/binary/LogicalOr,
+ "&" = /datum/node/expression/op/binary/BitwiseAnd,
+ "|" = /datum/node/expression/op/binary/BitwiseOr,
+ "`" = /datum/node/expression/op/binary/BitwiseXor,
+ "+" = /datum/node/expression/op/binary/Add,
+ "-" = /datum/node/expression/op/binary/Subtract,
+ "*" = /datum/node/expression/op/binary/Multiply,
+ "/" = /datum/node/expression/op/binary/Divide,
+ "^" = /datum/node/expression/op/binary/Power,
+ "%" = /datum/node/expression/op/binary/Modulo)
-/n_scriptOptions/nS_Options/New()
+/datum/n_scriptOptions/nS_Options/New()
.=..()
for(var/O in assign_operators+binary_operators+unary_operators)
if(!symbols.Find(O)) symbols+=O
diff --git a/code/modules/scripting/Parser/Expressions.dm b/code/modules/scripting/Parser/Expressions.dm
index 480b73f5a9..a2c0b0a23e 100644
--- a/code/modules/scripting/Parser/Expressions.dm
+++ b/code/modules/scripting/Parser/Expressions.dm
@@ -18,7 +18,7 @@
/*
Class: nS_Parser
*/
-/n_Parser/nS_Parser
+/datum/n_Parser/nS_Parser
/*
Var: expecting
A variable which keeps track of whether an operator or value is expected. It should be either or . See
@@ -30,7 +30,7 @@
Proc: Precedence
Compares two operators, decides which is higher in the order of operations, and returns or .
*/
-/n_Parser/nS_Parser/proc/Precedence(node/expression/op/top, node/expression/op/input)
+/datum/n_Parser/nS_Parser/proc/Precedence(datum/node/expression/op/top, datum/node/expression/op/input)
if(istype(top))
top=top.precedence
if(istype(input))
@@ -43,35 +43,35 @@
Proc: GetExpression
Takes a token expected to represent a value and returns an node.
*/
-/n_Parser/nS_Parser/proc/GetExpression(token/T)
+/datum/n_Parser/nS_Parser/proc/GetExpression(datum/token/T)
if(!T) return
- if(istype(T, /node/expression))
+ if(istype(T, /datum/node/expression))
return T
switch(T.type)
- if(/token/word)
- return new/node/expression/value/variable(T.value)
- if(/token/accessor)
- var/token/accessor/A=T
- var/node/expression/value/variable/E//=new(A.member)
- var/stack/S=new()
- while(istype(A.object, /token/accessor))
+ if(/datum/token/word)
+ return new/datum/node/expression/value/variable(T.value)
+ if(/datum/token/accessor)
+ var/datum/token/accessor/A=T
+ var/datum/node/expression/value/variable/E//=new(A.member)
+ var/datum/stack/S=new()
+ while(istype(A.object, /datum/token/accessor))
S.Push(A)
A=A.object
ASSERT(istext(A.object))
while(A)
- var/node/expression/value/variable/V=new()
+ var/datum/node/expression/value/variable/V=new()
V.id=new(A.member)
if(E)
V.object=E
else
- V.object=new/node/identifier(A.object)
+ V.object=new/datum/node/identifier(A.object)
E=V
A=S.Pop()
return E
- if(/token/number, /token/string)
- return new/node/expression/value/literal(T.value)
+ if(/datum/token/number, /datum/token/string)
+ return new/datum/node/expression/value/literal(T.value)
/*
Proc: GetOperator
@@ -88,9 +88,9 @@ See Also:
-
-
*/
-/n_Parser/nS_Parser/proc/GetOperator(O, type=/node/expression/op, L[])
+/datum/n_Parser/nS_Parser/proc/GetOperator(O, type=/datum/node/expression/op, L[])
if(istype(O, type)) return O //O is already the desired type
- if(istype(O, /token)) O=O:value //sets O to text
+ if(istype(O, /datum/token)) O=O:value //sets O to text
if(istext(O)) //sets O to path
if(L.Find(O)) O=L[O]
else return null
@@ -107,8 +107,8 @@ See Also:
-
-
*/
-/n_Parser/nS_Parser/proc/GetBinaryOperator(O)
- return GetOperator(O, /node/expression/op/binary, options.binary_operators)
+/datum/n_Parser/nS_Parser/proc/GetBinaryOperator(O)
+ return GetOperator(O, /datum/node/expression/op/binary, options.binary_operators)
/*
Proc: GetUnaryOperator
@@ -119,24 +119,24 @@ See Also:
-
-
*/
-/n_Parser/nS_Parser/proc/GetUnaryOperator(O)
- return GetOperator(O, /node/expression/op/unary, options.unary_operators)
+/datum/n_Parser/nS_Parser/proc/GetUnaryOperator(O)
+ return GetOperator(O, /datum/node/expression/op/unary, options.unary_operators)
/*
Proc: Reduce
Takes the operator on top of the opr stack and assigns its operand(s). Then this proc pushes the value of that operation to the top
of the val stack.
*/
-/n_Parser/nS_Parser/proc/Reduce(stack/opr, stack/val)
- var/node/expression/op/O=opr.Pop()
+/datum/n_Parser/nS_Parser/proc/Reduce(datum/stack/opr, datum/stack/val)
+ var/datum/node/expression/op/O=opr.Pop()
if(!O) return
if(!istype(O))
- errors+=new/scriptError("Error reducing expression - invalid operator.")
+ errors+=new/datum/scriptError("Error reducing expression - invalid operator.")
return
//Take O and assign its operands, popping one or two values from the val stack
//depending on whether O is a binary or unary operator.
- if(istype(O, /node/expression/op/binary))
- var/node/expression/op/binary/B=O
+ if(istype(O, /datum/node/expression/op/binary))
+ var/datum/node/expression/op/binary/B=O
B.exp2=val.Pop()
B.exp =val.Pop()
val.Push(B)
@@ -151,12 +151,12 @@ Returns true if the current token represents the end of an expression.
Parameters:
end - A list of values to compare the current token to.
*/
-/n_Parser/nS_Parser/proc/EndOfExpression(end[])
+/datum/n_Parser/nS_Parser/proc/EndOfExpression(end[])
if(!curToken)
return 1
- if(istype(curToken, /token/symbol) && end.Find(curToken.value))
+ if(istype(curToken, /datum/token/symbol) && end.Find(curToken.value))
return 1
- if(istype(curToken, /token/end) && end.Find(/token/end))
+ if(istype(curToken, /datum/token/end) && end.Find(/datum/token/end))
return 1
return 0
@@ -177,43 +177,43 @@ See Also:
-
-
*/
-/n_Parser/nS_Parser/proc/ParseExpression(list/end=list(/token/end), list/ErrChars=list("{", "}"))
- var/stack/opr=new
- var/stack/val=new
+/datum/n_Parser/nS_Parser/proc/ParseExpression(list/end=list(/datum/token/end), list/ErrChars=list("{", "}"))
+ var/datum/stack/opr=new
+ var/datum/stack/val=new
src.expecting=VALUE
while(TRUE)
if(EndOfExpression(end))
break
- if(istype(curToken, /token/symbol) && ErrChars.Find(curToken.value))
- errors+=new/scriptError/BadToken(curToken)
+ if(istype(curToken, /datum/token/symbol) && ErrChars.Find(curToken.value))
+ errors+=new/datum/scriptError/BadToken(curToken)
break
if(index>tokens.len) //End of File
- errors+=new/scriptError/EndOfFile()
+ errors+=new/datum/scriptError/EndOfFile()
break
- var/token/ntok
+ var/datum/token/ntok
if(index+1<=tokens.len)
ntok=tokens[index+1]
- if(istype(curToken, /token/symbol) && curToken.value=="(") //Parse parentheses expression
+ if(istype(curToken, /datum/token/symbol) && curToken.value=="(") //Parse parentheses expression
if(expecting!=VALUE)
- errors+=new/scriptError/ExpectedToken("operator", curToken)
+ errors+=new/datum/scriptError/ExpectedToken("operator", curToken)
NextToken()
continue
val.Push(ParseParenExpression())
- else if(istype(curToken, /token/symbol)) //Operator found.
- var/node/expression/op/curOperator //Figure out whether it is unary or binary and get a new instance.
+ else if(istype(curToken, /datum/token/symbol)) //Operator found.
+ var/datum/node/expression/op/curOperator //Figure out whether it is unary or binary and get a new instance.
if(src.expecting==OPERATOR)
curOperator=GetBinaryOperator(curToken)
if(!curOperator)
- errors+=new/scriptError/ExpectedToken("operator", curToken)
+ errors+=new/datum/scriptError/ExpectedToken("operator", curToken)
NextToken()
continue
else
curOperator=GetUnaryOperator(curToken)
if(!curOperator) //given symbol isn't a unary operator
- errors+=new/scriptError/ExpectedToken("expression", curToken)
+ errors+=new/datum/scriptError/ExpectedToken("expression", curToken)
NextToken()
continue
@@ -222,31 +222,31 @@ See Also:
continue
opr.Push(curOperator)
src.expecting=VALUE
- else if(ntok && ntok.value=="(" && istype(ntok, /token/symbol)\
- && istype(curToken, /token/word)) //Parse function call
- var/token/preToken=curToken
+ else if(ntok && ntok.value=="(" && istype(ntok, /datum/token/symbol)\
+ && istype(curToken, /datum/token/word)) //Parse function call
+ var/datum/token/preToken=curToken
var/old_expect=src.expecting
var/fex=ParseFunctionExpression()
if(old_expect!=VALUE)
- errors+=new/scriptError/ExpectedToken("operator", preToken)
+ errors+=new/datum/scriptError/ExpectedToken("operator", preToken)
NextToken()
continue
val.Push(fex)
- else if(istype(curToken, /token/keyword)) //inline keywords
- var/n_Keyword/kw=options.keywords[curToken.value]
+ else if(istype(curToken, /datum/token/keyword)) //inline keywords
+ var/datum/n_Keyword/kw=options.keywords[curToken.value]
kw=new kw(inline=1)
if(kw)
if(!kw.Parse(src))
return
else
- errors+=new/scriptError/BadToken(curToken)
- else if(istype(curToken, /token/end)) //semicolon found where it wasn't expected
- errors+=new/scriptError/BadToken(curToken)
+ errors+=new/datum/scriptError/BadToken(curToken)
+ else if(istype(curToken, /datum/token/end)) //semicolon found where it wasn't expected
+ errors+=new/datum/scriptError/BadToken(curToken)
NextToken()
continue
else
if(expecting!=VALUE)
- errors+=new/scriptError/ExpectedToken("operator", curToken)
+ errors+=new/datum/scriptError/ExpectedToken("operator", curToken)
NextToken()
continue
val.Push(GetExpression(curToken))
@@ -256,8 +256,8 @@ See Also:
while(opr.Top()) Reduce(opr, val) //Reduce the value stack completely
.=val.Pop() //Return what should be the last value on the stack
if(val.Top()) //
- var/node/N=val.Pop()
- errors+=new/scriptError("Error parsing expression. Unexpected value left on stack: [N.ToString()].")
+ var/datum/node/N=val.Pop()
+ errors+=new/datum/scriptError("Error parsing expression. Unexpected value left on stack: [N.ToString()].")
return null
/*
@@ -267,8 +267,8 @@ Parses a function call inside of an expression.
See Also:
-
*/
-/n_Parser/nS_Parser/proc/ParseFunctionExpression()
- var/node/expression/FunctionCall/exp=new
+/datum/n_Parser/nS_Parser/proc/ParseFunctionExpression()
+ var/datum/node/expression/FunctionCall/exp=new
exp.func_name=curToken.value
NextToken() //skip function name
NextToken() //skip open parenthesis, already found
@@ -279,12 +279,12 @@ See Also:
if(loops>=1000)
CRASH("Something TERRIBLE has gone wrong in ParseFunctionExpression ;__;")
- if(istype(curToken, /token/symbol) && curToken.value==")")
+ if(istype(curToken, /datum/token/symbol) && curToken.value==")")
return exp
exp.parameters+=ParseParamExpression()
- if(curToken.value==","&&istype(curToken, /token/symbol))NextToken() //skip comma
- if(istype(curToken, /token/end)) //Prevents infinite loop...
- errors+=new/scriptError/ExpectedToken(")")
+ if(curToken.value==","&&istype(curToken, /datum/token/symbol))NextToken() //skip comma
+ if(istype(curToken, /datum/token/end)) //Prevents infinite loop...
+ errors+=new/datum/scriptError/ExpectedToken(")")
return exp
/*
@@ -294,10 +294,10 @@ Parses an expression that ends with a close parenthesis. This is used for parsin
See Also:
-
*/
-/n_Parser/nS_Parser/proc/ParseParenExpression()
- if(!CheckToken("(", /token/symbol))
+/datum/n_Parser/nS_Parser/proc/ParseParenExpression()
+ if(!CheckToken("(", /datum/token/symbol))
return
- return new/node/expression/op/unary/group(ParseExpression(list(")")))
+ return new/datum/node/expression/op/unary/group(ParseExpression(list(")")))
/*
Proc: ParseParamExpression
@@ -306,7 +306,7 @@ Parses an expression that ends with either a comma or close parenthesis. This is
See Also:
-
*/
-/n_Parser/nS_Parser/proc/ParseParamExpression()
+/datum/n_Parser/nS_Parser/proc/ParseParamExpression()
return ParseExpression(list(",", ")"))
#undef OPERATOR
diff --git a/code/modules/scripting/Parser/Keywords.dm b/code/modules/scripting/Parser/Keywords.dm
index dd9bd41fea..f5448e786a 100644
--- a/code/modules/scripting/Parser/Keywords.dm
+++ b/code/modules/scripting/Parser/Keywords.dm
@@ -12,9 +12,9 @@
Var: inline
1 if the keyword is in an expression (e.g. the new keyword in many languages), 0 otherwise (such as the if and else keywords).
*/
-/n_Keyword
+/datum/n_Keyword
var/inline
-/n_Keyword/New(inline=FALSE)
+/datum/n_Keyword/New(inline=FALSE)
src.inline=inline
return ..()
@@ -26,7 +26,7 @@
parser - The parser that created this object. You can use the parameter to manipulate the parser in order to add statements and blocks
to its AST.
*/
-/n_Keyword/proc/Parse(n_Parser/parser)
+/datum/n_Keyword/proc/Parse(datum/n_Parser/parser)
/*
Class: nS_Keyword
@@ -38,118 +38,118 @@
proc.
*/
//
-/n_Keyword/nS_Keyword/New(inline=0)
+/datum/n_Keyword/nS_Keyword/New(inline=0)
if(inline)
qdel(src)
-/n_Keyword/nS_Keyword/kwReturn/Parse(n_Parser/nS_Parser/parser)
+/datum/n_Keyword/nS_Keyword/kwReturn/Parse(datum/n_Parser/nS_Parser/parser)
.=KW_PASS
- if(istype(parser.curBlock, /node/BlockDefinition/GlobalBlock))
- parser.errors+=new/scriptError/BadReturn(parser.curToken)
+ if(istype(parser.curBlock, /datum/node/BlockDefinition/GlobalBlock))
+ parser.errors+=new/datum/scriptError/BadReturn(parser.curToken)
. = KW_WARN
- var/node/statement/ReturnStatement/stmt=new
+ var/datum/node/statement/ReturnStatement/stmt=new
parser.NextToken() //skip 'return' token
stmt.value=parser.ParseExpression()
parser.curBlock.statements+=stmt
-/n_Keyword/nS_Keyword/kwIf/Parse(n_Parser/nS_Parser/parser)
+/datum/n_Keyword/nS_Keyword/kwIf/Parse(datum/n_Parser/nS_Parser/parser)
.=KW_PASS
- var/node/statement/IfStatement/stmt=new
+ var/datum/node/statement/IfStatement/stmt=new
parser.NextToken() //skip 'if' token
stmt.cond=parser.ParseParenExpression()
- if(!parser.CheckToken(")", /token/symbol))
+ if(!parser.CheckToken(")", /datum/token/symbol))
return KW_FAIL
- if(!parser.CheckToken("{", /token/symbol, skip=0)) //Token needs to be preserved for parse loop, so skip=0
+ if(!parser.CheckToken("{", /datum/token/symbol, skip=0)) //Token needs to be preserved for parse loop, so skip=0
return KW_ERR
parser.curBlock.statements+=stmt
stmt.block=new
parser.AddBlock(stmt.block)
-/n_Keyword/nS_Keyword/kwElse/Parse(n_Parser/nS_Parser/parser)
+/datum/n_Keyword/nS_Keyword/kwElse/Parse(datum/n_Parser/nS_Parser/parser)
.=KW_PASS
var/list/L=parser.curBlock.statements
- var/node/statement/IfStatement/stmt
+ var/datum/node/statement/IfStatement/stmt
if(L&&L.len) stmt=L[L.len] //Get the last statement in the current block
if(!stmt || !istype(stmt) || stmt.else_block) //Ensure that it is an if statement
- parser.errors+=new/scriptError/ExpectedToken("if statement",parser.curToken)
+ parser.errors+=new/datum/scriptError/ExpectedToken("if statement",parser.curToken)
return KW_FAIL
parser.NextToken() //skip 'else' token
- if(!parser.CheckToken("{", /token/symbol, skip=0))
+ if(!parser.CheckToken("{", /datum/token/symbol, skip=0))
return KW_ERR
stmt.else_block=new()
parser.AddBlock(stmt.else_block)
-/n_Keyword/nS_Keyword/kwWhile/Parse(n_Parser/nS_Parser/parser)
+/datum/n_Keyword/nS_Keyword/kwWhile/Parse(datum/n_Parser/nS_Parser/parser)
.=KW_PASS
- var/node/statement/WhileLoop/stmt=new
+ var/datum/node/statement/WhileLoop/stmt=new
parser.NextToken() //skip 'while' token
stmt.cond=parser.ParseParenExpression()
- if(!parser.CheckToken(")", /token/symbol))
+ if(!parser.CheckToken(")", /datum/token/symbol))
return KW_FAIL
- if(!parser.CheckToken("{", /token/symbol, skip=0))
+ if(!parser.CheckToken("{", /datum/token/symbol, skip=0))
return KW_ERR
parser.curBlock.statements+=stmt
stmt.block=new
parser.AddBlock(stmt.block)
-/n_Keyword/nS_Keyword/kwBreak/Parse(n_Parser/nS_Parser/parser)
+/datum/n_Keyword/nS_Keyword/kwBreak/Parse(datum/n_Parser/nS_Parser/parser)
.=KW_PASS
- if(istype(parser.curBlock, /node/BlockDefinition/GlobalBlock))
- parser.errors+=new/scriptError/BadToken(parser.curToken)
+ if(istype(parser.curBlock, /datum/node/BlockDefinition/GlobalBlock))
+ parser.errors+=new/datum/scriptError/BadToken(parser.curToken)
. = KW_WARN
- var/node/statement/BreakStatement/stmt=new
+ var/datum/node/statement/BreakStatement/stmt=new
parser.NextToken() //skip 'break' token
parser.curBlock.statements+=stmt
-/n_Keyword/nS_Keyword/kwContinue/Parse(n_Parser/nS_Parser/parser)
+/datum/n_Keyword/nS_Keyword/kwContinue/Parse(datum/n_Parser/nS_Parser/parser)
.=KW_PASS
- if(istype(parser.curBlock, /node/BlockDefinition/GlobalBlock))
- parser.errors+=new/scriptError/BadToken(parser.curToken)
+ if(istype(parser.curBlock, /datum/node/BlockDefinition/GlobalBlock))
+ parser.errors+=new/datum/scriptError/BadToken(parser.curToken)
. = KW_WARN
- var/node/statement/ContinueStatement/stmt=new
+ var/datum/node/statement/ContinueStatement/stmt=new
parser.NextToken() //skip 'break' token
parser.curBlock.statements+=stmt
-/n_Keyword/nS_Keyword/kwDef/Parse(n_Parser/nS_Parser/parser)
+/datum/n_Keyword/nS_Keyword/kwDef/Parse(datum/n_Parser/nS_Parser/parser)
.=KW_PASS
- var/node/statement/FunctionDefinition/def=new
+ var/datum/node/statement/FunctionDefinition/def=new
parser.NextToken() //skip 'def' token
if(!parser.options.IsValidID(parser.curToken.value))
- parser.errors+=new/scriptError/InvalidID(parser.curToken)
+ parser.errors+=new/datum/scriptError/InvalidID(parser.curToken)
return KW_FAIL
def.func_name=parser.curToken.value
parser.NextToken()
- if(!parser.CheckToken("(", /token/symbol))
+ if(!parser.CheckToken("(", /datum/token/symbol))
return KW_FAIL
while(TRUE) //for now parameters can be separated by whitespace - they don't need a comma in between
- if(istype(parser.curToken, /token/symbol))
+ if(istype(parser.curToken, /datum/token/symbol))
switch(parser.curToken.value)
if(",")
parser.NextToken()
if(")")
break
else
- parser.errors+=new/scriptError/BadToken(parser.curToken)
+ parser.errors+=new/datum/scriptError/BadToken(parser.curToken)
return KW_ERR
- else if(istype(parser.curToken, /token/word))
+ else if(istype(parser.curToken, /datum/token/word))
def.parameters+=parser.curToken.value
parser.NextToken()
else
- parser.errors+=new/scriptError/InvalidID(parser.curToken)
+ parser.errors+=new/datum/scriptError/InvalidID(parser.curToken)
return KW_ERR
- if(!parser.CheckToken(")", /token/symbol))
+ if(!parser.CheckToken(")", /datum/token/symbol))
return KW_FAIL
- if(istype(parser.curToken, /token/end)) //Function prototype
+ if(istype(parser.curToken, /datum/token/end)) //Function prototype
parser.curBlock.statements+=def
- else if(parser.curToken.value=="{" && istype(parser.curToken, /token/symbol))
+ else if(parser.curToken.value=="{" && istype(parser.curToken, /datum/token/symbol))
def.block = new
parser.curBlock.statements+=def
parser.curBlock.functions[def.func_name]=def
parser.AddBlock(def.block)
else
- parser.errors+=new/scriptError/BadToken(parser.curToken)
+ parser.errors+=new/datum/scriptError/BadToken(parser.curToken)
return KW_FAIL
#undef KW_FAIL
diff --git a/code/modules/scripting/Parser/Parser.dm b/code/modules/scripting/Parser/Parser.dm
index 29141e7aab..283a3ffe96 100644
--- a/code/modules/scripting/Parser/Parser.dm
+++ b/code/modules/scripting/Parser/Parser.dm
@@ -5,7 +5,7 @@
Class: n_Parser
An object that reads tokens and produces an AST (abstract syntax tree).
*/
-/n_Parser
+/datum/n_Parser
var/index = 1
/*
Var: index
@@ -33,22 +33,22 @@
Var: curToken
The token at in .
*/
- var/token/curToken
- var/stack/blocks=new
- var/node/BlockDefinition/GlobalBlock/global_block=new
- var/node/BlockDefinition/curBlock
+ var/datum/token/curToken
+ var/datum/stack/blocks=new
+ var/datum/node/BlockDefinition/GlobalBlock/global_block=new
+ var/datum/node/BlockDefinition/curBlock
/*
Proc: Parse
Reads the tokens and returns the AST's node. Be sure to populate the tokens list before calling this procedure.
*/
-/n_Parser/proc/Parse()
+/datum/n_Parser/proc/Parse()
/*
Proc: NextToken
Sets to the next token in the list, or null if there are no more tokens.
*/
-/n_Parser/proc/NextToken()
+/datum/n_Parser/proc/NextToken()
if(index>=tokens.len)
curToken=null
else
@@ -59,8 +59,8 @@
Class: nS_Parser
An implmentation of a parser for n_Script.
*/
-/n_Parser/nS_Parser
- var/n_scriptOptions/nS_Options/options
+/datum/n_Parser/nS_Parser
+ var/datum/n_scriptOptions/nS_Options/options
/*
Constructor: New
@@ -68,101 +68,101 @@
tokens - A list of tokens to parse.
options - An object used for configuration.
*/
-/n_Parser/nS_Parser/New(tokens[], n_scriptOptions/options)
+/datum/n_Parser/nS_Parser/New(tokens[], datum/n_scriptOptions/options)
src.tokens=tokens
src.options=options
curBlock=global_block
return ..()
-/n_Parser/nS_Parser/Parse()
+/datum/n_Parser/nS_Parser/Parse()
ASSERT(tokens)
for(,src.index<=src.tokens.len, src.index++)
curToken=tokens[index]
switch(curToken.type)
- if(/token/keyword)
- var/n_Keyword/kw=options.keywords[curToken.value]
+ if(/datum/token/keyword)
+ var/datum/n_Keyword/kw=options.keywords[curToken.value]
kw=new kw()
if(kw)
if(!kw.Parse(src))
return
- if(/token/word)
- var/token/ntok
+ if(/datum/token/word)
+ var/datum/token/ntok
if(index+1>tokens.len)
- errors+=new/scriptError/BadToken(curToken)
+ errors+=new/datum/scriptError/BadToken(curToken)
continue
ntok=tokens[index+1]
- if(!istype(ntok, /token/symbol))
- errors+=new/scriptError/BadToken(ntok)
+ if(!istype(ntok, /datum/token/symbol))
+ errors+=new/datum/scriptError/BadToken(ntok)
continue
if(ntok.value=="(")
ParseFunctionStatement()
else if(options.assign_operators.Find(ntok.value))
ParseAssignment()
else
- errors+=new/scriptError/BadToken(ntok)
+ errors+=new/datum/scriptError/BadToken(ntok)
continue
- if(!istype(curToken, /token/end))
- errors+=new/scriptError/ExpectedToken(";", curToken)
+ if(!istype(curToken, /datum/token/end))
+ errors+=new/datum/scriptError/ExpectedToken(";", curToken)
continue
- if(/token/symbol)
+ if(/datum/token/symbol)
if(curToken.value=="}")
if(!EndBlock())
- errors+=new/scriptError/BadToken(curToken)
+ errors+=new/datum/scriptError/BadToken(curToken)
continue
else
- errors+=new/scriptError/BadToken(curToken)
+ errors+=new/datum/scriptError/BadToken(curToken)
continue
- if(/token/end)
- warnings+=new/scriptError/BadToken(curToken)
+ if(/datum/token/end)
+ warnings+=new/datum/scriptError/BadToken(curToken)
continue
else
- errors+=new/scriptError/BadToken(curToken)
+ errors+=new/datum/scriptError/BadToken(curToken)
return
return global_block
-/n_Parser/nS_Parser/proc/CheckToken(val, type, err=1, skip=1)
+/datum/n_Parser/nS_Parser/proc/CheckToken(val, type, err=1, skip=1)
if(curToken.value!=val || !istype(curToken,type))
if(err)
- errors+=new/scriptError/ExpectedToken(val, curToken)
+ errors+=new/datum/scriptError/ExpectedToken(val, curToken)
return 0
if(skip)NextToken()
return 1
-/n_Parser/nS_Parser/proc/AddBlock(node/BlockDefinition/B)
+/datum/n_Parser/nS_Parser/proc/AddBlock(datum/node/BlockDefinition/B)
blocks.Push(curBlock)
curBlock=B
-/n_Parser/nS_Parser/proc/EndBlock()
+/datum/n_Parser/nS_Parser/proc/EndBlock()
if(curBlock==global_block) return 0
curBlock=blocks.Pop()
return 1
-/n_Parser/nS_Parser/proc/ParseAssignment()
+/datum/n_Parser/nS_Parser/proc/ParseAssignment()
var/name=curToken.value
if(!options.IsValidID(name))
- errors+=new/scriptError/InvalidID(curToken)
+ errors+=new/datum/scriptError/InvalidID(curToken)
return
NextToken()
var/t=options.binary_operators[options.assign_operators[curToken.value]]
- var/node/statement/VariableAssignment/stmt=new()
+ var/datum/node/statement/VariableAssignment/stmt=new()
stmt.var_name=new(name)
NextToken()
if(t)
stmt.value=new t()
- stmt.value:exp=new/node/expression/value/variable(stmt.var_name)
+ stmt.value:exp=new/datum/node/expression/value/variable(stmt.var_name)
stmt.value:exp2=ParseExpression()
else
stmt.value=ParseExpression()
curBlock.statements+=stmt
-/n_Parser/nS_Parser/proc/ParseFunctionStatement()
- if(!istype(curToken, /token/word))
- errors+=new/scriptError("Bad identifier in function call.")
+/datum/n_Parser/nS_Parser/proc/ParseFunctionStatement()
+ if(!istype(curToken, /datum/token/word))
+ errors+=new/datum/scriptError("Bad identifier in function call.")
return
- var/node/statement/FunctionCall/stmt=new
+ var/datum/node/statement/FunctionCall/stmt=new
stmt.func_name=curToken.value
NextToken() //skip function name
- if(!CheckToken("(", /token/symbol)) //Check for and skip open parenthesis
+ if(!CheckToken("(", /datum/token/symbol)) //Check for and skip open parenthesis
return
var/loops = 0
while(TRUE)
@@ -171,12 +171,12 @@
CRASH("Something TERRIBLE has gone wrong in ParseFunctionStatement ;__;")
if(!curToken)
- errors+=new/scriptError/EndOfFile()
+ errors+=new/datum/scriptError/EndOfFile()
return
- if(istype(curToken, /token/symbol) && curToken.value==")")
+ if(istype(curToken, /datum/token/symbol) && curToken.value==")")
curBlock.statements+=stmt
NextToken() //Skip close parenthesis
return
- var/node/expression/P=ParseParamExpression()
+ var/datum/node/expression/P=ParseParamExpression()
stmt.parameters+=P
- if(istype(curToken, /token/symbol) && curToken.value==",") NextToken()
+ if(istype(curToken, /datum/token/symbol) && curToken.value==",") NextToken()
diff --git a/code/modules/scripting/Scanner/Scanner.dm b/code/modules/scripting/Scanner/Scanner.dm
index 572cea3e74..b02f3a6e6f 100644
--- a/code/modules/scripting/Scanner/Scanner.dm
+++ b/code/modules/scripting/Scanner/Scanner.dm
@@ -5,7 +5,7 @@
Class: n_Scanner
An object responsible for breaking up source code into tokens for use by the parser.
*/
-/n_Scanner
+/datum/n_Scanner
var/code
/*
Var: errors
@@ -25,27 +25,27 @@
Proc: LoadCode
Loads source code.
*/
-/n_Scanner/proc/LoadCode(c)
+/datum/n_Scanner/proc/LoadCode(c)
code=c
/*
Proc: LoadCodeFromFile
Gets the code from a file and calls .
*/
-/n_Scanner/proc/LoadCodeFromFile(f)
+/datum/n_Scanner/proc/LoadCodeFromFile(f)
LoadCode(file2text(f))
/*
Proc: Scan
Runs the scanner and returns the resulting list of tokens. Ensure that has been called first.
*/
-/n_Scanner/proc/Scan()
+/datum/n_Scanner/proc/Scan()
/*
Class: nS_Scanner
A scanner implementation for n_Script.
*/
-/n_Scanner/nS_Scanner
+/datum/n_Scanner/nS_Scanner
/*
Variable: codepos
@@ -54,7 +54,7 @@
var/codepos = 1
var/line = 1
var/linepos = 0 //column=codepos-linepos
- var/n_scriptOptions/nS_Options/options
+ var/datum/n_scriptOptions/nS_Options/options
var/commenting = 0 /// 1 is a single-line comment, 2 is a multi-line comment
/*
Variable: ignore
@@ -98,14 +98,14 @@
code - The source code to tokenize.
options - An object used to configure the scanner.
*/
-/n_Scanner/nS_Scanner/New(code, n_scriptOptions/nS_Options/options)
+/datum/n_Scanner/nS_Scanner/New(code, datum/n_scriptOptions/nS_Options/options)
.=..()
ignore+= ascii2text(13) //Carriage return
delim += ignore + options.symbols + end_stmt + string_delim
src.options=options
LoadCode(code)
-/n_Scanner/nS_Scanner/Scan() //Creates a list of tokens from source code
+/datum/n_Scanner/nS_Scanner/Scan() //Creates a list of tokens from source code
var/list/tokens=new
for(, src.codepos<=length(code), src.codepos++)
@@ -119,7 +119,7 @@
else if(char == "/")
ReadComment()
else if(end_stmt.Find(char))
- tokens+=new /token/end(char, line, COL)
+ tokens+=new /datum/token/end(char, line, COL)
else if(string_delim.Find(char))
codepos++ //skip string delimiter
tokens+=ReadString(char)
@@ -143,7 +143,7 @@
Parameters:
start - The character used to start the string.
*/
-/n_Scanner/nS_Scanner/proc/ReadString(start)
+/datum/n_Scanner/nS_Scanner/proc/ReadString(start)
var/buf
for(, codepos <= length(code), codepos++)//codepos to length(code))
var/char=copytext(code, codepos, codepos+1)
@@ -162,8 +162,8 @@
else //Unknown escaped text
buf+=char
if("\n")
- . = new/token/string(buf, line, COL)
- errors+=new/scriptError("Unterminated string. Newline reached.", .)
+ . = new/datum/token/string(buf, line, COL)
+ errors+=new/datum/scriptError("Unterminated string. Newline reached.", .)
line++
linepos=codepos
break
@@ -172,13 +172,13 @@
break
else
buf+=char //Just a normal character in a string
- if(!.) return new/token/string(buf, line, COL)
+ if(!.) return new/datum/token/string(buf, line, COL)
/*
Proc: ReadWord
Reads characters separated by an item in into a token.
*/
-/n_Scanner/nS_Scanner/proc/ReadWord()
+/datum/n_Scanner/nS_Scanner/proc/ReadWord()
var/char=copytext(code, codepos, codepos+1)
var/buf
while(!delim.Find(char) && codepos<=length(code))
@@ -186,15 +186,15 @@ Reads characters separated by an item in into a token.
char=copytext(code, ++codepos, codepos+1)
codepos-- //allow main Scan() proc to read the delimiter
if(options.keywords.Find(buf))
- return new /token/keyword(buf, line, COL)
+ return new /datum/token/keyword(buf, line, COL)
else
- return new /token/word(buf, line, COL)
+ return new /datum/token/word(buf, line, COL)
/*
Proc: ReadSymbol
Reads a symbol into a token.
*/
-/n_Scanner/nS_Scanner/proc/ReadSymbol()
+/datum/n_Scanner/nS_Scanner/proc/ReadSymbol()
var/char=copytext(code, codepos, codepos+1)
var/buf
@@ -204,13 +204,13 @@ Reads a symbol into a token.
char=copytext(code, codepos, codepos+1)
codepos-- //allow main Scan() proc to read the next character
- return new /token/symbol(buf, line, COL)
+ return new /datum/token/symbol(buf, line, COL)
/*
Proc: ReadNumber
Reads a number into a token.
*/
-/n_Scanner/nS_Scanner/proc/ReadNumber()
+/datum/n_Scanner/nS_Scanner/proc/ReadNumber()
var/char=copytext(code, codepos, codepos+1)
var/buf
var/dec=0
@@ -220,9 +220,9 @@ Reads a number into a token.
buf+=char
codepos++
char=copytext(code, codepos, codepos+1)
- var/token/number/T=new(buf, line, COL)
+ var/datum/token/number/T=new(buf, line, COL)
if(isnull(text2num(buf)))
- errors+=new/scriptError("Bad number: ", T)
+ errors+=new/datum/scriptError("Bad number: ", T)
T.value=0
codepos-- //allow main Scan() proc to read the next character
return T
@@ -232,7 +232,7 @@ Proc: ReadComment
Reads a comment and outputs the type of comment
*/
-/n_Scanner/nS_Scanner/proc/ReadComment()
+/datum/n_Scanner/nS_Scanner/proc/ReadComment()
var/char=copytext(code, codepos, codepos+1)
var/nextchar=copytext(code, codepos+1, codepos+2)
var/charstring = char+nextchar
@@ -269,6 +269,6 @@ Reads a comment and outputs the type of comment
if(expectedend) expectedend = 0
if(comm == 2)
- errors+=new/scriptError/UnterminatedComment()
+ errors+=new/datum/scriptError/UnterminatedComment()
#undef COL
diff --git a/code/modules/scripting/Scanner/Tokens.dm b/code/modules/scripting/Scanner/Tokens.dm
index aa0c93742c..12541c1806 100644
--- a/code/modules/scripting/Scanner/Tokens.dm
+++ b/code/modules/scripting/Scanner/Tokens.dm
@@ -4,34 +4,34 @@
Class: Token
Represents an entity and position in the source code.
*/
-/token
+/datum/token
var/value
var/line
var/column
-/token/New(v, l=0, c=0)
+/datum/token/New(v, l=0, c=0)
value=v
line=l
column=c
-/token/string
-/token/symbol
-/token/word
-/token/keyword
-/token/number/New()
+/datum/token/string
+/datum/token/symbol
+/datum/token/word
+/datum/token/keyword
+/datum/token/number/New()
.=..()
if(!isnum(value))
value=text2num(value)
ASSERT(!isnull(value))
-/token/accessor
+/datum/token/accessor
var/object
var/member
-/token/accessor/New(object, member, l=0, c=0)
+/datum/token/accessor/New(object, member, l=0, c=0)
src.object=object
src.member=member
src.value="[object].[member]" //for debugging only
src.line=l
src.column=c
-/token/end
+/datum/token/end
diff --git a/code/modules/scripting/stack.dm b/code/modules/scripting/stack.dm
index ef93a7c821..ea73909c8d 100644
--- a/code/modules/scripting/stack.dm
+++ b/code/modules/scripting/stack.dm
@@ -1,21 +1,21 @@
-/stack
+/datum/stack
var/list/contents=new
-/stack/proc/Push(value)
+/datum/stack/proc/Push(value)
contents+=value
-/stack/proc/Pop()
+/datum/stack/proc/Pop()
if(!contents.len) return null
. = contents[contents.len]
contents.len--
-/stack/proc/Top() //returns the item on the top of the stack without removing it
+/datum/stack/proc/Top() //returns the item on the top of the stack without removing it
if(!contents.len) return null
return contents[contents.len]
-/stack/proc/Copy()
- var/stack/S=new()
+/datum/stack/proc/Copy()
+ var/datum/stack/S=new()
S.contents=src.contents.Copy()
return S
-/stack/proc/Clear()
+/datum/stack/proc/Clear()
contents.Cut()
diff --git a/code/modules/spells/aoe_turf/aoe_turf.dm b/code/modules/spells/aoe_turf/aoe_turf.dm
index f7bd9ccdfe..7335565e8c 100644
--- a/code/modules/spells/aoe_turf/aoe_turf.dm
+++ b/code/modules/spells/aoe_turf/aoe_turf.dm
@@ -4,11 +4,11 @@ This ring has an outer radius (range) and an inner radius (inner_radius)
Aoe turf spells have two useful flags: IGNOREDENSE and IGNORESPACE. These are explained in setup.dm
*/
-/spell/aoe_turf //affects all turfs in view or range (depends)
+/datum/spell/aoe_turf //affects all turfs in view or range (depends)
spell_flags = IGNOREDENSE
var/inner_radius = -1 //for all your ring spell needs
-/spell/aoe_turf/choose_targets(mob/user = usr)
+/datum/spell/aoe_turf/choose_targets(mob/user = usr)
var/list/targets = list()
for(var/turf/target in view_or_range(range, holder, selection_type))
diff --git a/code/modules/spells/aoe_turf/blink.dm b/code/modules/spells/aoe_turf/blink.dm
index 79a70b8df4..23e8ea6d4b 100644
--- a/code/modules/spells/aoe_turf/blink.dm
+++ b/code/modules/spells/aoe_turf/blink.dm
@@ -1,4 +1,4 @@
-/spell/aoe_turf/blink
+/datum/spell/aoe_turf/blink
name = "Blink"
desc = "This spell randomly teleports you a short distance."
@@ -12,7 +12,7 @@
cooldown_min = 5 //4 deciseconds reduction per rank
hud_state = "wiz_blink"
-/spell/aoe_turf/blink/cast(var/list/targets, mob/user)
+/datum/spell/aoe_turf/blink/cast(var/list/targets, mob/user)
if(!targets.len)
return
diff --git a/code/modules/spells/aoe_turf/charge.dm b/code/modules/spells/aoe_turf/charge.dm
index 4eb4530922..15c6d7fd16 100644
--- a/code/modules/spells/aoe_turf/charge.dm
+++ b/code/modules/spells/aoe_turf/charge.dm
@@ -1,4 +1,4 @@
-/spell/aoe_turf/charge
+/datum/spell/aoe_turf/charge
name = "Charge"
desc = "This spell can be used to charge up spent magical artifacts, among other things."
@@ -12,27 +12,27 @@
hud_state = "wiz_charge"
-/spell/aoe_turf/charge/cast(var/list/targets, mob/user)
+/datum/spell/aoe_turf/charge/cast(var/list/targets, mob/user)
for(var/turf/T in targets)
depth_cast(T)
-/spell/aoe_turf/charge/proc/depth_cast(var/list/targets)
+/datum/spell/aoe_turf/charge/proc/depth_cast(var/list/targets)
for(var/atom/A in targets)
if(A.contents.len)
depth_cast(A.contents)
cast_charge(A)
-/spell/aoe_turf/charge/proc/mob_charge(var/mob/living/M)
+/datum/spell/aoe_turf/charge/proc/mob_charge(var/mob/living/M)
if(M.spell_list.len != 0)
- for(var/spell/S in M.spell_list)
- if(!istype(S, /spell/aoe_turf/charge))
+ for(var/datum/spell/S in M.spell_list)
+ if(!istype(S, /datum/spell/aoe_turf/charge))
S.charge_counter = S.charge_max
to_chat(M, span_notice("You feel raw magic flowing through you, it feels good!"))
else
to_chat(M, span_notice("You feel very strange for a moment, but then it passes."))
return M
-/spell/aoe_turf/charge/proc/cast_charge(var/atom/target)
+/datum/spell/aoe_turf/charge/proc/cast_charge(var/atom/target)
var/atom/charged_item
if(isliving(target))
diff --git a/code/modules/spells/aoe_turf/conjure/conjure.dm b/code/modules/spells/aoe_turf/conjure/conjure.dm
index ecb907f5f1..acd4baa6d9 100644
--- a/code/modules/spells/aoe_turf/conjure/conjure.dm
+++ b/code/modules/spells/aoe_turf/conjure/conjure.dm
@@ -3,7 +3,7 @@ Conjure spells spawn things (mobs, objs, turfs) in their summon_type
How they spawn stuff is decided by behaviour vars, which are explained below
*/
-/spell/aoe_turf/conjure
+/datum/spell/aoe_turf/conjure
name = "Conjure"
desc = "This spell conjures objs of the specified types in range."
@@ -24,7 +24,7 @@ How they spawn stuff is decided by behaviour vars, which are explained below
cast_sound = 'sound/items/welder.ogg'
-/spell/aoe_turf/conjure/cast(list/targets, mob/user)
+/datum/spell/aoe_turf/conjure/cast(list/targets, mob/user)
playsound(user, cast_sound, 50, 1)
for(var/i=1,i <= summon_amt,i++)
@@ -71,5 +71,5 @@ How they spawn stuff is decided by behaviour vars, which are explained below
conjure_animation(animation, spawn_place)
return
-/spell/aoe_turf/conjure/proc/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/datum/spell/aoe_turf/conjure/proc/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
qdel(animation)
diff --git a/code/modules/spells/aoe_turf/conjure/forcewall.dm b/code/modules/spells/aoe_turf/conjure/forcewall.dm
index 636e479d1b..47dea6f5da 100644
--- a/code/modules/spells/aoe_turf/conjure/forcewall.dm
+++ b/code/modules/spells/aoe_turf/conjure/forcewall.dm
@@ -1,4 +1,4 @@
-/spell/aoe_turf/conjure/forcewall
+/datum/spell/aoe_turf/conjure/forcewall
name = "Forcewall"
desc = "Create a wall of pure energy at your location."
summon_type = list(/obj/effect/forcefield)
@@ -10,7 +10,7 @@
hud_state = "wiz_shield"
-/spell/aoe_turf/conjure/forcewall/mime
+/datum/spell/aoe_turf/conjure/forcewall/mime
name = "Invisible wall"
desc = "Create an invisible wall on your location."
school = "mime"
diff --git a/code/modules/spells/aoe_turf/disable_tech.dm b/code/modules/spells/aoe_turf/disable_tech.dm
index 0226932681..4204651a6a 100644
--- a/code/modules/spells/aoe_turf/disable_tech.dm
+++ b/code/modules/spells/aoe_turf/disable_tech.dm
@@ -1,4 +1,4 @@
-/spell/aoe_turf/disable_tech
+/datum/spell/aoe_turf/disable_tech
name = "Disable Tech"
desc = "This spell disables all weapons, cameras and most other technology in range."
charge_max = 400
@@ -18,7 +18,7 @@
hud_state = "wiz_tech"
-/spell/aoe_turf/disable_tech/cast(list/targets)
+/datum/spell/aoe_turf/disable_tech/cast(list/targets)
for(var/turf/target in targets)
empulse(get_turf(target), emp_heavy, emp_med, emp_light, emp_long)
diff --git a/code/modules/spells/aoe_turf/knock.dm b/code/modules/spells/aoe_turf/knock.dm
index e65c8d2212..f2dbe100e1 100644
--- a/code/modules/spells/aoe_turf/knock.dm
+++ b/code/modules/spells/aoe_turf/knock.dm
@@ -1,4 +1,4 @@
-/spell/aoe_turf/knock
+/datum/spell/aoe_turf/knock
name = "Knock"
desc = "This spell opens nearby doors and does not require wizard garb."
@@ -12,7 +12,7 @@
hud_state = "wiz_knock"
-/spell/aoe_turf/knock/cast(list/targets)
+/datum/spell/aoe_turf/knock/cast(list/targets)
for(var/turf/T in targets)
for(var/obj/machinery/door/door in T.contents)
spawn(1)
@@ -24,7 +24,7 @@
/* Moved to game/gamemodes/cult/construct_spells.dm.
//Construct version
-/spell/aoe_turf/knock/harvester
+/datum/spell/aoe_turf/knock/harvester
name = "Disintegrate Doors"
desc = "No door shall stop you."
@@ -37,7 +37,7 @@
hud_state = "const_knock"
-/spell/aoe_turf/knock/harvester/cast(list/targets)
+/datum/spell/aoe_turf/knock/harvester/cast(list/targets)
for(var/turf/T in targets)
for(var/obj/machinery/door/door in T.contents)
spawn door.cultify()
diff --git a/code/modules/spells/aoe_turf/smoke.dm b/code/modules/spells/aoe_turf/smoke.dm
index e055fc702f..be5aff99c9 100644
--- a/code/modules/spells/aoe_turf/smoke.dm
+++ b/code/modules/spells/aoe_turf/smoke.dm
@@ -1,4 +1,4 @@
-/spell/aoe_turf/smoke
+/datum/spell/aoe_turf/smoke
name = "Smoke"
desc = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb."
diff --git a/code/modules/spells/aoe_turf/summons.dm b/code/modules/spells/aoe_turf/summons.dm
index 8e813cf04d..ca402f9124 100644
--- a/code/modules/spells/aoe_turf/summons.dm
+++ b/code/modules/spells/aoe_turf/summons.dm
@@ -1,4 +1,4 @@
-/spell/aoe_turf/conjure/summonEdSwarm //test purposes
+/datum/spell/aoe_turf/conjure/summonEdSwarm //test purposes
name = "Dispense Wizard Justice"
desc = "This spell dispenses wizard justice."
@@ -9,7 +9,7 @@
hud_state = "wiz_ed"
-/spell/aoe_turf/conjure/carp
+/datum/spell/aoe_turf/conjure/carp
name = "Summon Carp"
desc = "This spell conjures a simple carp."
@@ -24,7 +24,7 @@
hud_state = "wiz_carp"
-/spell/aoe_turf/conjure/creature
+/datum/spell/aoe_turf/conjure/creature
name = "Summon Creature Swarm"
desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth"
diff --git a/code/modules/spells/general/area_teleport.dm b/code/modules/spells/general/area_teleport.dm
index cb2e250106..a70ccea88d 100644
--- a/code/modules/spells/general/area_teleport.dm
+++ b/code/modules/spells/general/area_teleport.dm
@@ -1,4 +1,4 @@
-/spell/area_teleport
+/datum/spell/area_teleport
name = "Teleport"
desc = "This spell teleports you to a type of area of your selection."
@@ -19,10 +19,10 @@
hud_state = "wiz_tele"
-/spell/area_teleport/before_cast()
+/datum/spell/area_teleport/before_cast()
return
-/spell/area_teleport/choose_targets(mob/user)
+/datum/spell/area_teleport/choose_targets(mob/user)
var/A = null
if(!randomise_selection)
@@ -34,7 +34,7 @@
return list(thearea)
-/spell/area_teleport/cast(area/thearea, mob/user)
+/datum/spell/area_teleport/cast(area/thearea, mob/user)
if(!istype(thearea))
if(istype(thearea, /list))
var/list/area_list = thearea
@@ -73,10 +73,10 @@
return
-/spell/area_teleport/after_cast()
+/datum/spell/area_teleport/after_cast()
return
-/spell/area_teleport/invocation(mob/user, area/chosenarea)
+/datum/spell/area_teleport/invocation(mob/user, area/chosenarea)
if(!istype(chosenarea))
return //can't have that, can we
if(!invocation_area || !chosenarea)
diff --git a/code/modules/spells/general/rune_write.dm b/code/modules/spells/general/rune_write.dm
index 844b1480d6..fb211d399d 100644
--- a/code/modules/spells/general/rune_write.dm
+++ b/code/modules/spells/general/rune_write.dm
@@ -1,4 +1,4 @@
-/spell/rune_write
+/datum/spell/rune_write
name = "Scribe a Rune"
desc = "Let's you instantly manifest a working rune."
@@ -13,10 +13,10 @@
smoke_amt = 1
-/spell/rune_write/choose_targets(mob/user = usr)
+/datum/spell/rune_write/choose_targets(mob/user = usr)
return list(user)
-/spell/rune_write/cast(null, mob/user = usr)
+/datum/spell/rune_write/cast(null, mob/user = usr)
if(!GLOB.cultwords["travel"])
runerandom()
var/list/runes = list("Teleport", "Teleport Other", "Spawn a Tome", "Change Construct Type", "Convert", "EMP", "Drain Blood", "See Invisible", "Resurrect", "Hide Runes", "Reveal Runes", "Astral Journey", "Manifest a Ghost", "Imbue Talisman", "Sacrifice", "Wall", "Free Cultist", "Summon Cultist", "Deafen", "Blind", "BloodBoil", "Communicate", "Stun")
diff --git a/code/modules/spells/no_clothes.dm b/code/modules/spells/no_clothes.dm
index 3974406b4b..1aa055eb48 100644
--- a/code/modules/spells/no_clothes.dm
+++ b/code/modules/spells/no_clothes.dm
@@ -1,4 +1,4 @@
-/spell/noclothes
+/datum/spell/noclothes
name = "No Clothes"
desc = "This is a placeholder for knowing if you dont need clothes for any spell."
diff --git a/code/modules/spells/spell_code.dm b/code/modules/spells/spell_code.dm
index 3d4d720a95..14e0c453b5 100644
--- a/code/modules/spells/spell_code.dm
+++ b/code/modules/spells/spell_code.dm
@@ -1,4 +1,4 @@
-/spell
+/datum/spell
var/name = "Spell"
var/desc = "A spell"
parent_type = /datum
@@ -17,7 +17,7 @@
var/holder_var_type = "bruteloss" //only used if charge_type equals to "holder_var"
var/holder_var_amount = 20 //same. The amount adjusted with the mob's var when the spell is used
- var/spell_flags = NEEDSCLOTHES
+ var/datum/spell_flags = NEEDSCLOTHES
var/invocation = "HURP DURP" //what is uttered when the wizard casts the spell
var/invocation_type = SpI_NONE //can be none, whisper, shout, and emote
var/range = 7 //the range of the spell; outer radius for aoe spells
@@ -56,13 +56,13 @@
///SETUP AND PROCESS///
///////////////////////
-/spell/New()
+/datum/spell/New()
..()
//still_recharging_msg = span_notice("[name] is still recharging.")
charge_counter = charge_max
-/spell/process()
+/datum/spell/process()
spawn while(charge_counter < charge_max)
charge_counter++
sleep(1)
@@ -72,10 +72,10 @@
/////CASTING/////
/////////////////
-/spell/proc/choose_targets(mob/user = usr) //depends on subtype - see targeted.dm, aoe_turf.dm, dumbfire.dm, or code in general folder
+/datum/spell/proc/choose_targets(mob/user = usr) //depends on subtype - see targeted.dm, aoe_turf.dm, dumbfire.dm, or code in general folder
return
-/spell/proc/perform(mob/user = usr, skipcharge = 0) //if recharge is started is important for the trigger spells
+/datum/spell/proc/perform(mob/user = usr, skipcharge = 0) //if recharge is started is important for the trigger spells
if(!holder)
holder = user //just in case
if(!cast_check(skipcharge, user))
@@ -96,13 +96,13 @@
after_cast(targets) //generates the sparks, smoke, target messages etc.
-/spell/proc/cast(list/targets, mob/user) //the actual meat of the spell
+/datum/spell/proc/cast(list/targets, mob/user) //the actual meat of the spell
return
-/spell/proc/critfail(list/targets, mob/user) //the wizman has fucked up somehow
+/datum/spell/proc/critfail(list/targets, mob/user) //the wizman has fucked up somehow
return
-/spell/proc/adjust_var(mob/living/target = usr, type, amount) //handles the adjustment of the var when the spell is used. has some hardcoded types
+/datum/spell/proc/adjust_var(mob/living/target = usr, type, amount) //handles the adjustment of the var when the spell is used. has some hardcoded types
switch(type)
if("bruteloss")
target.adjustBruteLoss(amount)
@@ -126,7 +126,7 @@
/////CASTING WRAPPERS//////
///////////////////////////
-/spell/proc/before_cast(list/targets)
+/datum/spell/proc/before_cast(list/targets)
var/valid_targets[0]
for(var/atom/target in targets)
// Check range again (fixes long-range EI NATH)
@@ -150,7 +150,7 @@
qdel(spell)
return valid_targets
-/spell/proc/after_cast(list/targets)
+/datum/spell/proc/after_cast(list/targets)
for(var/atom/target in targets)
var/location = get_turf(target)
if(isliving(target) && message)
@@ -174,7 +174,7 @@
/////////////////////
/*Checkers, cost takers, message makers, etc*/
-/spell/proc/cast_check(skipcharge = 0,mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
+/datum/spell/proc/cast_check(skipcharge = 0,mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
if(!(src in user.spell_list) && holder == user)
log_world("## ERROR [user] utilized the spell '[src]' without having it.")
@@ -215,14 +215,14 @@
to_chat(user, "Mmmf mrrfff!")
return 0
- var/spell/noclothes/spell = locate() in user.spell_list
+ var/datum/spell/noclothes/spell = locate() in user.spell_list
if((spell_flags & NEEDSCLOTHES) && !(spell && istype(spell)) && holder == user)//clothes check
if(!user.wearing_wiz_garb())
return 0
return 1
-/spell/proc/check_charge(var/skipcharge, mob/user)
+/datum/spell/proc/check_charge(var/skipcharge, mob/user)
if(!skipcharge)
switch(charge_type)
if(Sp_RECHARGE)
@@ -235,7 +235,7 @@
return 0
return 1
-/spell/proc/take_charge(mob/user = user, var/skipcharge)
+/datum/spell/proc/take_charge(mob/user = user, var/skipcharge)
if(!skipcharge)
switch(charge_type)
if(Sp_RECHARGE)
@@ -251,7 +251,7 @@
return 0
return 1
-/spell/proc/invocation(mob/user = usr, var/list/targets) //spelling the spell out and setting it on recharge/reducing charges amount
+/datum/spell/proc/invocation(mob/user = usr, var/list/targets) //datum/spelling the spell out and setting it on recharge/reducing charges amount
switch(invocation_type)
if(SpI_SHOUT)
@@ -271,7 +271,7 @@
///UPGRADING PROCS///
/////////////////////
-/spell/proc/can_improve(var/upgrade_type)
+/datum/spell/proc/can_improve(var/upgrade_type)
if(level_max[Sp_TOTAL] <= ( spell_levels[Sp_SPEED] + spell_levels[Sp_POWER] )) //too many levels, can't do it
return 0
@@ -281,10 +281,10 @@
return 1
-/spell/proc/empower_spell()
+/datum/spell/proc/empower_spell()
return
-/spell/proc/quicken_spell()
+/datum/spell/proc/quicken_spell()
if(!can_improve(Sp_SPEED))
return 0
@@ -321,7 +321,7 @@
return temp
-/spell/proc/spell_do_after(var/mob/user as mob, delay as num, var/numticks = 5)
+/datum/spell/proc/spell_do_after(var/mob/user as mob, delay as num, var/numticks = 5)
if(!user || isnull(user))
return 0
if(numticks == 0)
diff --git a/code/modules/spells/spell_projectile.dm b/code/modules/spells/spell_projectile.dm
index 924553f16f..3881c1e3b6 100644
--- a/code/modules/spells/spell_projectile.dm
+++ b/code/modules/spells/spell_projectile.dm
@@ -4,7 +4,7 @@
nodamage = 1 //Most of the time, anyways
- var/spell/targeted/projectile/carried
+ var/datum/spell/targeted/projectile/carried
penetrating = 0
range = 10 //set by the duration of the spell
diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm
index 8554ba9efb..8e9b1edbb1 100644
--- a/code/modules/spells/spellbook.dm
+++ b/code/modules/spells/spellbook.dm
@@ -125,7 +125,7 @@
*/
var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disabletech = "Disable Tech", smoke = "Smoke", blind = "Blind", subjugation = "Subjugation", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", horseman = "Curse of the Horseman", staffchange = "Staff of Change", mentalfocus = "Mental Focus", soulstone = "Six Soul Stone Shards and the spell Artificer", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation", noclothes = "No Clothes")
var/already_knows = 0
- for(var/spell/aspell in H.spell_list)
+ for(var/datum/spell/aspell in H.spell_list)
if(available_spells[href_list["spell_choice"]] == initial(aspell.name))
already_knows = 1
if(!aspell.can_improve())
@@ -152,64 +152,64 @@
switch(href_list["spell_choice"])
if("noclothes")
feedback_add_details("wizard_spell_learned","NC")
- H.add_spell(new/spell/noclothes)
+ H.add_spell(new/datum/spell/noclothes)
temp = "This teaches you how to use your spells without your magical garb, truely you are the wizardest."
uses--
if("magicmissile")
feedback_add_details("wizard_spell_learned","MM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/targeted/projectile/magic_missile)
+ H.add_spell(new/datum/spell/targeted/projectile/magic_missile)
temp = "You have learned magic missile."
if("fireball")
feedback_add_details("wizard_spell_learned","FB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/targeted/projectile/dumbfire/fireball)
+ H.add_spell(new/datum/spell/targeted/projectile/dumbfire/fireball)
temp = "You have learned fireball."
if("disabletech")
feedback_add_details("wizard_spell_learned","DT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/aoe_turf/disable_tech)
+ H.add_spell(new/datum/spell/aoe_turf/disable_tech)
temp = "You have learned disable technology."
if("smoke")
feedback_add_details("wizard_spell_learned","SM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/aoe_turf/smoke)
+ H.add_spell(new/datum/spell/aoe_turf/smoke)
temp = "You have learned smoke."
if("blind")
feedback_add_details("wizard_spell_learned","BD") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/targeted/genetic/blind)
+ H.add_spell(new/datum/spell/targeted/genetic/blind)
temp = "You have learned blind."
if("subjugation")
feedback_add_details("wizard_spell_learned","SJ") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/targeted/subjugation)
+ H.add_spell(new/datum/spell/targeted/subjugation)
temp = "You have learned subjugate."
// if("mindswap")
// feedback_add_details("wizard_spell_learned","MT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
-// H.add_spell(new/spell/targeted/mind_transfer)
+// H.add_spell(new/datum/spell/targeted/mind_transfer)
// temp = "You have learned mindswap."
if("forcewall")
feedback_add_details("wizard_spell_learned","FW") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/aoe_turf/conjure/forcewall)
+ H.add_spell(new/datum/spell/aoe_turf/conjure/forcewall)
temp = "You have learned forcewall."
if("blink")
feedback_add_details("wizard_spell_learned","BL") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/aoe_turf/blink)
+ H.add_spell(new/datum/spell/aoe_turf/blink)
temp = "You have learned blink."
if("teleport")
feedback_add_details("wizard_spell_learned","TP") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/area_teleport)
+ H.add_spell(new/datum/spell/area_teleport)
temp = "You have learned teleport."
if("mutate")
feedback_add_details("wizard_spell_learned","MU") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/targeted/genetic/mutate)
+ H.add_spell(new/datum/spell/targeted/genetic/mutate)
temp = "You have learned mutate."
if("etherealjaunt")
feedback_add_details("wizard_spell_learned","EJ") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/targeted/ethereal_jaunt)
+ H.add_spell(new/datum/spell/targeted/ethereal_jaunt)
temp = "You have learned ethereal jaunt."
if("knock")
feedback_add_details("wizard_spell_learned","KN") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
- H.add_spell(new/spell/aoe_turf/knock)
+ H.add_spell(new/datum/spell/aoe_turf/knock)
temp = "You have learned knock."
// if("horseman")
// feedback_add_details("wizard_spell_learned","HH") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
-// H.add_spell(new/spell/targeted/equip_item/horsemask)
+// H.add_spell(new/datum/spell/targeted/equip_item/horsemask)
// temp = "You have learned curse of the horseman."
if("mentalfocus")
feedback_add_details("wizard_spell_learned","MF") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
@@ -219,7 +219,7 @@
if("soulstone")
feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
new /obj/item/storage/belt/soulstone/full(get_turf(H))
- H.add_spell(new/spell/aoe_turf/conjure/construct)
+ H.add_spell(new/datum/spell/aoe_turf/conjure/construct)
temp = "You have purchased a belt full of soulstones and have learned the artificer spell."
max_uses--
if("armor")
@@ -251,7 +251,7 @@
//Single Use Spellbooks//
/obj/item/spellbook/oneuse
- var/spell = /spell/targeted/projectile/magic_missile //just a placeholder to avoid runtimes if someone spawned the generic
+ var/spell = /datum/spell/targeted/projectile/magic_missile //just a placeholder to avoid runtimes if someone spawned the generic
var/spellname = "sandbox"
var/used = 0
name = "spellbook of "
@@ -268,8 +268,8 @@
. = ..(user)
if(.)
return TRUE
- var/spell/S = new spell(user)
- for(var/spell/knownspell in user.spell_list)
+ var/datum/spell/S = new spell(user)
+ for(var/datum/spell/knownspell in user.spell_list)
if(knownspell.type == S.type)
if(user.mind)
// TODO: Update to new antagonist system.
@@ -297,7 +297,7 @@
return
/obj/item/spellbook/oneuse/fireball
- spell = /spell/targeted/projectile/dumbfire/fireball
+ spell = /datum/spell/targeted/projectile/dumbfire/fireball
spellname = "fireball"
icon_state ="bookfireball"
desc = "This book feels warm to the touch."
@@ -308,7 +308,7 @@
qdel(src)
/obj/item/spellbook/oneuse/smoke
- spell = /spell/aoe_turf/smoke
+ spell = /datum/spell/aoe_turf/smoke
spellname = "smoke"
icon_state ="booksmoke"
desc = "This book is overflowing with the dank arts."
@@ -320,7 +320,7 @@
user.adjust_nutrition(-200)
/obj/item/spellbook/oneuse/blind
- spell = /spell/targeted/genetic/blind
+ spell = /datum/spell/targeted/genetic/blind
spellname = "blind"
icon_state ="bookblind"
desc = "This book looks blurry, no matter how you look at it."
@@ -331,7 +331,7 @@
user.Blind(10)
/obj/item/spellbook/oneuse/mindswap
- spell = /spell/targeted/mind_transfer
+ spell = /datum/spell/targeted/mind_transfer
spellname = "mindswap"
icon_state ="bookmindswap"
desc = "This book's cover is pristine, though its pages look ragged and torn."
@@ -386,7 +386,7 @@
stored_swap = null
/obj/item/spellbook/oneuse/forcewall
- spell = /spell/aoe_turf/conjure/forcewall
+ spell = /datum/spell/aoe_turf/conjure/forcewall
spellname = "forcewall"
icon_state ="bookforcewall"
desc = "This book has a dedication to mimes everywhere inside the front cover."
@@ -400,7 +400,7 @@
/obj/item/spellbook/oneuse/knock
- spell = /spell/aoe_turf/knock
+ spell = /datum/spell/aoe_turf/knock
spellname = "knock"
icon_state ="bookknock"
desc = "This book is hard to hold closed properly."
@@ -411,7 +411,7 @@
user.Weaken(20)
/obj/item/spellbook/oneuse/horsemask
- spell = /spell/targeted/equip_item/horsemask
+ spell = /datum/spell/targeted/equip_item/horsemask
spellname = "horses"
icon_state ="bookhorses"
desc = "This book is more horse than your mind has room for."
@@ -430,7 +430,7 @@
to_chat(user, span_notice("I say thee neigh"))
/obj/item/spellbook/oneuse/charge
- spell = /spell/aoe_turf/charge
+ spell = /datum/spell/aoe_turf/charge
spellname = "charging"
icon_state ="bookcharge"
desc = "This book is made of 100% post-consumer wizard."
diff --git a/code/modules/spells/spells.dm b/code/modules/spells/spells.dm
index 8af418b1c0..3171f52022 100644
--- a/code/modules/spells/spells.dm
+++ b/code/modules/spells/spells.dm
@@ -29,7 +29,7 @@
// if(Sp_HOLDVAR)
// statpanel(S.panel,"[S.holder_var_type] [S.holder_var_amount]",S.connected_button)
-/mob/proc/add_spell(var/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /atom/movable/screen/movable/spell_master)
+/mob/proc/add_spell(var/datum/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /atom/movable/screen/movable/spell_master)
if(!spell_masters)
spell_masters = list()
@@ -60,7 +60,7 @@
return 1
-/mob/proc/remove_spell(var/spell/spell_to_remove)
+/mob/proc/remove_spell(var/datum/spell/spell_to_remove)
if(!spell_to_remove || !istype(spell_to_remove))
return
diff --git a/code/modules/spells/targeted/equip/equip.dm b/code/modules/spells/targeted/equip/equip.dm
index 429a6321ad..9983c2fcb9 100644
--- a/code/modules/spells/targeted/equip/equip.dm
+++ b/code/modules/spells/targeted/equip/equip.dm
@@ -1,6 +1,6 @@
//You can set duration to 0 to have the items last forever
-/spell/targeted/equip_item
+/datum/spell/targeted/equip_item
name = "equipment spell"
var/list/equipped_summons = list() //assoc list of text ids and paths to spawn
@@ -9,7 +9,7 @@
var/delete_old = 1 //if the item previously in the slot is deleted - otherwise, it's dropped
-/spell/targeted/equip_item/cast(list/targets, mob/user = usr)
+/datum/spell/targeted/equip_item/cast(list/targets, mob/user = usr)
..()
for(var/mob/living/L in targets)
for(var/slot_id in equipped_summons)
@@ -36,5 +36,5 @@
M.remove_from_mob(to_remove)
qdel(to_remove)
-/spell/targeted/equip_item/proc/summon_item(var/newtype)
+/datum/spell/targeted/equip_item/proc/summon_item(var/newtype)
return new newtype
diff --git a/code/modules/spells/targeted/equip/horsemask.dm b/code/modules/spells/targeted/equip/horsemask.dm
index f8b52c5a02..f7e68af2af 100644
--- a/code/modules/spells/targeted/equip/horsemask.dm
+++ b/code/modules/spells/targeted/equip/horsemask.dm
@@ -1,4 +1,4 @@
-/spell/targeted/equip_item/horsemask
+/datum/spell/targeted/equip_item/horsemask
name = "Curse of the Horseman"
desc = "This spell triggers a curse on a target, causing them to wield an unremovable horse head mask. They will speak like a horse! Any masks they are wearing will be disintegrated. This spell does not require robes."
school = "transmutation"
@@ -17,18 +17,18 @@
hud_state = "wiz_horse"
-/spell/targeted/equip_item/horsemask/New()
+/datum/spell/targeted/equip_item/horsemask/New()
..()
equipped_summons = list("[slot_wear_mask]" = /obj/item/clothing/mask/horsehead)
-/spell/targeted/equip_item/horsemask/cast(list/targets, mob/user = usr)
+/datum/spell/targeted/equip_item/horsemask/cast(list/targets, mob/user = usr)
..()
for(var/mob/living/target in targets)
target.visible_message( span_danger("[target]'s face lights up in fire, and after the event a horse's head takes its place!"), \
span_danger("Your face burns up, and shortly after the fire you realise you have the face of a horse!"))
target.flash_eyes()
-/spell/targeted/equip_item/horsemask/summon_item(var/new_type)
+/datum/spell/targeted/equip_item/horsemask/summon_item(var/new_type)
var/obj/item/new_item = new new_type
new_item.canremove = FALSE //curses!
new_item.unacidable = TRUE
diff --git a/code/modules/spells/targeted/ethereal_jaunt.dm b/code/modules/spells/targeted/ethereal_jaunt.dm
index 3c9b04b908..033d31a59e 100644
--- a/code/modules/spells/targeted/ethereal_jaunt.dm
+++ b/code/modules/spells/targeted/ethereal_jaunt.dm
@@ -1,4 +1,4 @@
-/spell/targeted/ethereal_jaunt
+/datum/spell/targeted/ethereal_jaunt
name = "Ethereal Jaunt"
desc = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
@@ -14,7 +14,7 @@
hud_state = "wiz_jaunt"
-/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
+/datum/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
for(var/mob/living/target in targets)
target.transforming = 1 //protects the mob from being transformed (replaced) midjaunt and getting stuck in bluespace
if(target.buckled)
@@ -57,14 +57,14 @@
qdel(animation)
qdel(holder)
-/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/datum/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
animation.icon_state = "liquify"
flick("liquify",animation)
-/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/datum/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target)
flick("reappear",animation)
-/spell/targeted/ethereal_jaunt/proc/jaunt_steam(var/mobloc)
+/datum/spell/targeted/ethereal_jaunt/proc/jaunt_steam(var/mobloc)
var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
steam.set_up(10, 0, mobloc)
steam.start()
diff --git a/code/modules/spells/targeted/genetic.dm b/code/modules/spells/targeted/genetic.dm
index eed2437212..efd0f65c00 100644
--- a/code/modules/spells/targeted/genetic.dm
+++ b/code/modules/spells/targeted/genetic.dm
@@ -4,7 +4,7 @@ code\game\dna\genes\vg_powers.dm //hulk is in this file
code\game\dna\genes\goon_disabilities.dm
code\game\dna\genes\goon_powers.dm
*/
-/spell/targeted/genetic
+/datum/spell/targeted/genetic
name = "Genetic modifier"
desc = "This spell inflicts a set of mutations and disabilities upon the target."
@@ -13,7 +13,7 @@ code\game\dna\genes\goon_powers.dm
duration = 100 //deciseconds
-/spell/targeted/genetic/cast(list/targets)
+/datum/spell/targeted/genetic/cast(list/targets)
..()
for(var/mob/living/target in targets)
for(var/x in mutations)
@@ -27,7 +27,7 @@ code\game\dna\genes\goon_powers.dm
target.update_mutations()
return
-/spell/targeted/genetic/blind
+/datum/spell/targeted/genetic/blind
name = "Blind"
disabilities = 1
duration = 300
@@ -48,7 +48,7 @@ code\game\dna\genes\goon_powers.dm
hud_state = "wiz_blind"
-/spell/targeted/genetic/mutate
+/datum/spell/targeted/genetic/mutate
name = "Mutate"
desc = "This spell causes you to turn into a hulk and gain laser vision for a short while."
diff --git a/code/modules/spells/targeted/mind_transfer.dm b/code/modules/spells/targeted/mind_transfer.dm
index 5a4bcc7233..0327b1d3e0 100644
--- a/code/modules/spells/targeted/mind_transfer.dm
+++ b/code/modules/spells/targeted/mind_transfer.dm
@@ -1,4 +1,4 @@
-/spell/targeted/mind_transfer
+/datum/spell/targeted/mind_transfer
name = "Mind Transfer"
desc = "This spell allows the user to switch bodies with a target."
@@ -19,7 +19,7 @@
hud_state = "wiz_mindswap"
-/spell/targeted/mind_transfer/cast(list/targets, mob/user)
+/datum/spell/targeted/mind_transfer/cast(list/targets, mob/user)
..()
for(var/mob/living/target in targets)
@@ -51,10 +51,10 @@
ghost.spell_list += victim.spell_list//If they have spells, transfer them. Now we basically have a backup mob.
caster.mind.transfer_to(victim)
- for(var/spell/S in victim.spell_list) //get rid of spells the new way
+ for(var/datum/spell/S in victim.spell_list) //get rid of spells the new way
victim.remove_spell(S) //This will make it so that players will not get the HUD and all that spell bugginess that caused copies of spells and stuff of that nature.
- for(var/spell/S in caster.spell_list)
+ for(var/datum/spell/S in caster.spell_list)
victim.add_spell(S) //Now they are inside the victim's body - this also generates the HUD
caster.remove_spell(S) //remove the spells from the caster
@@ -64,7 +64,7 @@
ghost.mind.transfer_to(caster)
caster.key = ghost.key //have to transfer the key since the mind was not active
- for(var/spell/S in ghost.spell_list)
+ for(var/datum/spell/S in ghost.spell_list)
caster.add_spell(S)
ghost.spell_list = list()
diff --git a/code/modules/spells/targeted/projectile/dumbfire.dm b/code/modules/spells/targeted/projectile/dumbfire.dm
index 15a5e3fb52..e24d7e3d81 100644
--- a/code/modules/spells/targeted/projectile/dumbfire.dm
+++ b/code/modules/spells/targeted/projectile/dumbfire.dm
@@ -1,7 +1,7 @@
-/spell/targeted/projectile/dumbfire
+/datum/spell/targeted/projectile/dumbfire
name = "dumbfire spell"
-/spell/targeted/projectile/dumbfire/choose_targets(mob/user = usr)
+/datum/spell/targeted/projectile/dumbfire/choose_targets(mob/user = usr)
var/list/targets = list()
var/starting_dir = user.dir //where are we facing at the time of casting?
diff --git a/code/modules/spells/targeted/projectile/fireball.dm b/code/modules/spells/targeted/projectile/fireball.dm
index 0b2c4ac80c..b38ec16b09 100644
--- a/code/modules/spells/targeted/projectile/fireball.dm
+++ b/code/modules/spells/targeted/projectile/fireball.dm
@@ -1,4 +1,4 @@
-/spell/targeted/projectile/dumbfire/fireball
+/datum/spell/targeted/projectile/dumbfire/fireball
name = "Fireball"
desc = "This spell fires a fireball at a target and does not require wizard garb."
@@ -27,7 +27,7 @@
hud_state = "wiz_fireball"
-/spell/targeted/projectile/dumbfire/fireball/prox_cast(var/list/targets, spell_holder)
+/datum/spell/targeted/projectile/dumbfire/fireball/prox_cast(var/list/targets, spell_holder)
for(var/mob/living/M in targets)
apply_spell_damage(M)
explosion(get_turf(spell_holder), ex_severe, ex_heavy, ex_light, ex_flash)
diff --git a/code/modules/spells/targeted/projectile/magic_missile.dm b/code/modules/spells/targeted/projectile/magic_missile.dm
index 0c1c2d26c8..42a407c5c5 100644
--- a/code/modules/spells/targeted/projectile/magic_missile.dm
+++ b/code/modules/spells/targeted/projectile/magic_missile.dm
@@ -1,4 +1,4 @@
-/spell/targeted/projectile/magic_missile
+/datum/spell/targeted/projectile/magic_missile
name = "Magic Missile"
desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
@@ -23,7 +23,7 @@
amt_dam_fire = 10
-/spell/targeted/projectile/magic_missile/prox_cast(var/list/targets, atom/spell_holder)
+/datum/spell/targeted/projectile/magic_missile/prox_cast(var/list/targets, atom/spell_holder)
spell_holder.visible_message(span_danger("\The [spell_holder] pops with a flash!"))
for(var/mob/living/M in targets)
apply_spell_damage(M)
diff --git a/code/modules/spells/targeted/projectile/projectile.dm b/code/modules/spells/targeted/projectile/projectile.dm
index ce16fa19f7..9c8f25448e 100644
--- a/code/modules/spells/targeted/projectile/projectile.dm
+++ b/code/modules/spells/targeted/projectile/projectile.dm
@@ -5,7 +5,7 @@ spell_projectiles call their spell's (carried) prox_cast when they get in range
If the spell_projectile is seeking, it will update its target every process and follow them
*/
-/spell/targeted/projectile
+/datum/spell/targeted/projectile
name = "projectile spell"
range = 7
@@ -15,7 +15,7 @@ If the spell_projectile is seeking, it will update its target every process and
var/proj_step_delay = 1 //lower = faster
var/cast_prox_range = 1
-/spell/targeted/projectile/cast(list/targets, mob/user = usr, var/target_zone)
+/datum/spell/targeted/projectile/cast(list/targets, mob/user = usr, var/target_zone)
if(istext(proj_type))
proj_type = text2path(proj_type) // sanity filters
@@ -37,7 +37,7 @@ If the spell_projectile is seeking, it will update its target every process and
projectile.old_style_target(target)
projectile.fire()
-/spell/targeted/projectile/proc/choose_prox_targets(mob/user = usr, var/atom/movable/spell_holder)
+/datum/spell/targeted/projectile/proc/choose_prox_targets(mob/user = usr, var/atom/movable/spell_holder)
var/list/targets = list()
for(var/mob/living/M in range(spell_holder, cast_prox_range))
if(M == user && !(spell_flags & INCLUDEUSER))
@@ -45,5 +45,5 @@ If the spell_projectile is seeking, it will update its target every process and
targets += M
return targets
-/spell/targeted/projectile/proc/prox_cast(var/list/targets, var/atom/movable/spell_holder)
+/datum/spell/targeted/projectile/proc/prox_cast(var/list/targets, var/atom/movable/spell_holder)
return targets
diff --git a/code/modules/spells/targeted/subjugate.dm b/code/modules/spells/targeted/subjugate.dm
index 28f6e55fe4..19335df4dd 100644
--- a/code/modules/spells/targeted/subjugate.dm
+++ b/code/modules/spells/targeted/subjugate.dm
@@ -1,4 +1,4 @@
-/spell/targeted/subjugation
+/datum/spell/targeted/subjugation
name = "Subjugation"
desc = "This spell temporarily subjugates a target's mind and does not require wizard garb."
diff --git a/code/modules/spells/targeted/targeted.dm b/code/modules/spells/targeted/targeted.dm
index 6c6312ad90..a0a42e56b0 100644
--- a/code/modules/spells/targeted/targeted.dm
+++ b/code/modules/spells/targeted/targeted.dm
@@ -4,7 +4,7 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
*/
-/spell/targeted //can mean aoe for mobs (limited/unlimited number) or one target mob
+/datum/spell/targeted //can mean aoe for mobs (limited/unlimited number) or one target mob
var/max_targets = 1 //leave 0 for unlimited targets in range, more for limited number of casts (can all target one guy, depends on target_ignore_prev) in range
var/target_ignore_prev = 1 //only important if max_targets > 1, affects if the spell can be cast multiple times at one person from one cast
@@ -29,7 +29,7 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
var/list/compatible_mobs = list()
-/spell/targeted/choose_targets(mob/user = usr)
+/datum/spell/targeted/choose_targets(mob/user = usr)
var/list/targets = list()
if(max_targets == 0) //unlimited
@@ -118,7 +118,7 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
return targets
-/spell/targeted/cast(var/list/targets, mob/user)
+/datum/spell/targeted/cast(var/list/targets, mob/user)
for(var/mob/living/target in targets)
if(range >= 0)
if(!(target in view_or_range(range, holder, selection_type))) //filter at time of casting
@@ -126,7 +126,7 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
continue
apply_spell_damage(target)
-/spell/targeted/proc/apply_spell_damage(mob/living/target)
+/datum/spell/targeted/proc/apply_spell_damage(mob/living/target)
target.adjustBruteLoss(amt_dam_brute)
target.adjustFireLoss(amt_dam_fire)
target.adjustToxLoss(amt_dam_tox)
diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm
index a9ea2f5d58..b3200d9895 100644
--- a/code/modules/tgui/modules/crew_monitor.dm
+++ b/code/modules/tgui/modules/crew_monitor.dm
@@ -58,7 +58,7 @@
var/list/crewmembers = list()
for(var/zlevel in map_levels)
- crewmembers += crew_repository.health_data(zlevel)
+ crewmembers += GLOB.crew_repository.health_data(zlevel)
// This is apparently necessary, because the above loop produces an emergent behavior
// of telling you what coordinates someone is at even without sensors on,
diff --git a/code/modules/unit_tests/decl_tests.dm b/code/modules/unit_tests/decl_tests.dm
index 8883f0f0dd..0eaed65c26 100644
--- a/code/modules/unit_tests/decl_tests.dm
+++ b/code/modules/unit_tests/decl_tests.dm
@@ -4,9 +4,9 @@
var/list/keys = list()
var/list/duplicates = list()
- var/list/all_emotes = decls_repository.get_decls_of_subtype(/decl/emote)
+ var/list/all_emotes = GLOB.decls_repository.get_decls_of_subtype(/datum/decl/emote)
for(var/etype in all_emotes)
- var/decl/emote/emote = all_emotes[etype]
+ var/datum/decl/emote/emote = all_emotes[etype]
if(!emote.key)
continue
if(emote.key in keys)
diff --git a/code/modules/unit_tests/map_tests.dm b/code/modules/unit_tests/map_tests.dm
index 38eb847879..de6fca050b 100644
--- a/code/modules/unit_tests/map_tests.dm
+++ b/code/modules/unit_tests/map_tests.dm
@@ -159,7 +159,7 @@
var/list/edge_log = list()
if(active_edges)
- for(var/connection_edge/E in SSair.active_edges)
+ for(var/datum/connection_edge/E in SSair.active_edges)
var/a_temp = E.A.air.temperature
var/a_moles = E.A.air.total_moles
var/a_vol = E.A.air.volume
@@ -173,8 +173,8 @@
var/b_gas = ""
// Two zones mixing
- if(istype(E, /connection_edge/zone))
- var/connection_edge/zone/Z = E
+ if(istype(E, /datum/connection_edge/zone))
+ var/datum/connection_edge/zone/Z = E
b_temp = Z.B.air.temperature
b_moles = Z.B.air.total_moles
b_vol = Z.B.air.volume
@@ -182,8 +182,8 @@
b_gas += "[gas]=[Z.B.air.gas[gas]]"
// Zone and unsimulated turfs mixing
- if(istype(E, /connection_edge/unsimulated))
- var/connection_edge/unsimulated/U = E
+ if(istype(E, /datum/connection_edge/unsimulated))
+ var/datum/connection_edge/unsimulated/U = E
b_temp = U.B.temperature
b_moles = "Unsim"
b_vol = "Unsim"
diff --git a/code/modules/unit_tests/poster_tests.dm b/code/modules/unit_tests/poster_tests.dm
index f023557fce..097062f381 100644
--- a/code/modules/unit_tests/poster_tests.dm
+++ b/code/modules/unit_tests/poster_tests.dm
@@ -1,11 +1,11 @@
/// converted unit test, maybe should be fully refactored
/datum/unit_test/posters_shall_have_legal_states/Run()
- var/list/all_posters = decls_repository.get_decls_of_type(/decl/poster)
- all_posters -= decls_repository.get_decl(/decl/poster/lewd) // Dumb exclusion for now. This really needs to become a valid poster instead of an illegaly made base type
+ var/list/all_posters = GLOB.decls_repository.get_decls_of_type(/datum/decl/poster)
+ all_posters -= GLOB.decls_repository.get_decl(/datum/decl/poster/lewd) // Dumb exclusion for now. This really needs to become a valid poster instead of an illegaly made base type
for(var/path in all_posters)
- var/decl/poster/D = all_posters[path]
+ var/datum/decl/poster/D = all_posters[path]
var/obj/structure/sign/poster/P = /obj/structure/sign/poster // The base poster shows ALL subtypes except /lewd, so all posters should function here regardless!
var/icon/I = initial(P.icon)
if(D.icon_override)
diff --git a/code/modules/unit_tests/reagent_tests.dm b/code/modules/unit_tests/reagent_tests.dm
index f8a4ea4d9b..e1231e4c12 100644
--- a/code/modules/unit_tests/reagent_tests.dm
+++ b/code/modules/unit_tests/reagent_tests.dm
@@ -48,9 +48,9 @@
/datum/unit_test/chemical_reactions_shall_use_and_produce_valid_reagents/Run()
var/list/collection_id = list()
- var/list/all_reactions = decls_repository.get_decls_of_subtype(/decl/chemical_reaction)
+ var/list/all_reactions = GLOB.decls_repository.get_decls_of_subtype(/datum/decl/chemical_reaction)
for(var/rtype in all_reactions)
- var/decl/chemical_reaction/CR = all_reactions[rtype]
+ var/datum/decl/chemical_reaction/CR = all_reactions[rtype]
if(CR.name == REAGENT_DEVELOPER_WARNING) // Ignore these types as they are meant to be overridden
continue
@@ -123,9 +123,9 @@
RegisterSignal(instant_beaker.reagents, COMSIG_REAGENTS_HOLDER_REACTED, PROC_REF(get_signal_data))
//actual test
- var/list/all_reactions = decls_repository.get_decls_of_subtype(/decl/chemical_reaction)
+ var/list/all_reactions = GLOB.decls_repository.get_decls_of_subtype(/datum/decl/chemical_reaction)
for(var/rtype in all_reactions)
- var/decl/chemical_reaction/CR = all_reactions[rtype]
+ var/datum/decl/chemical_reaction/CR = all_reactions[rtype]
if(CR.name == REAGENT_DEVELOPER_WARNING) // Ignore these types as they are meant to be overridden
continue
@@ -136,15 +136,15 @@
if(!CR.result) // Cannot check for this
continue
- if(istype(CR, /decl/chemical_reaction/instant/slime))
+ if(istype(CR, /datum/decl/chemical_reaction/instant/slime))
// slime time
- var/decl/chemical_reaction/instant/slime/SR = CR
+ var/datum/decl/chemical_reaction/instant/slime/SR = CR
if(!SR.required)
continue
var/obj/item/slime_extract/E = new SR.required()
QDEL_SWAP(fake_beaker, E)
fake_beaker.reagents.maximum_volume = 5000
- else if(istype(CR, /decl/chemical_reaction/distilling))
+ else if(istype(CR, /datum/decl/chemical_reaction/distilling))
// distilling
var/obj/distilling_tester/D = new()
QDEL_SWAP(fake_beaker, D)
@@ -169,9 +169,9 @@
QDEL_NULL(instant_beaker)
if(failed)
- TEST_FAIL("One or more /decl/chemical_reaction subtypes conflict with another reaction.")
+ TEST_FAIL("One or more /datum/decl/chemical_reaction subtypes conflict with another reaction.")
-/datum/unit_test/chemical_reactions_shall_not_conflict/proc/perform_reaction(var/decl/chemical_reaction/CR, var/list/inhib = list())
+/datum/unit_test/chemical_reactions_shall_not_conflict/proc/perform_reaction(var/datum/decl/chemical_reaction/CR, var/list/inhib = list())
var/scale = 10
if(CR.result_amount < 1)
scale = 1 / CR.result_amount // Create at least 1 unit
@@ -195,7 +195,7 @@
for(var/RR in CR.required_reagents)
fake_beaker.reagents.add_reagent(RR, CR.required_reagents[RR] * scale)
- if(!istype(CR, /decl/chemical_reaction/distilling))
+ if(!istype(CR, /datum/decl/chemical_reaction/distilling))
fake_beaker.reagents.handle_reactions()
break // Skip the next section if we're not distilling
@@ -222,11 +222,11 @@
if(!result_reactions.len)
// Nothing to check for inhibitors...
- for(var/decl/chemical_reaction/test_react in result_reactions)
+ for(var/datum/decl/chemical_reaction/test_react in result_reactions)
return RESULT_REACTION_FAILED
// Otherwise we check the resulting reagents and use their inhibitor this time!
- for(var/decl/chemical_reaction/test_react in result_reactions)
+ for(var/datum/decl/chemical_reaction/test_react in result_reactions)
if(!test_react)
continue
if(!test_react.inhibitors.len)
@@ -240,7 +240,7 @@
return RESULT_REACTION_SUCCESS // SUCCESS using all inhibitors!
// No inhibiting reagent worked...
- for(var/decl/chemical_reaction/test_react in result_reactions)
+ for(var/datum/decl/chemical_reaction/test_react in result_reactions)
TEST_NOTICE(src, "[CR.type]: Reagents - Used inhibitor for: [test_react]")
return RESULT_REACTION_FAILED
diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm
index 284fb1acf0..f9cc2ba697 100644
--- a/code/modules/vore/smoleworld/smoleworld_vr.dm
+++ b/code/modules/vore/smoleworld/smoleworld_vr.dm
@@ -40,12 +40,12 @@
icon = 'icons/turf/outdoors.dmi'
name = "grass"
icon_state = "grass0"
- initial_flooring = /decl/flooring/grass/outdoors
+ initial_flooring = /datum/decl/flooring/grass/outdoors
/turf/simulated/floor/smole/desert
icon = 'icons/turf/desert.dmi'
icon_state = "desert"
- initial_flooring = /decl/flooring/sand/desert
+ initial_flooring = /datum/decl/flooring/sand/desert
/turf/simulated/floor/smole/megablocks
name = "block floor"
diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index 090e8c6b13..b0c5f28082 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -41,17 +41,17 @@
else
. += "This extract is inert."
-/decl/chemical_reaction/instant/slime
+/datum/decl/chemical_reaction/instant/slime
var/required = null
-/decl/chemical_reaction/instant/slime/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/can_happen(var/datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, required))
var/obj/item/slime_extract/T = holder.my_atom
if(T.uses > 0)
return ..()
return FALSE
-/decl/chemical_reaction/instant/slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/on_reaction(var/datum/reagents/holder)
var/obj/item/slime_extract/T = holder.my_atom
T.uses--
if(T.uses <= 0)
@@ -69,7 +69,7 @@
icon_state = "grey slime extract"
description_info = "This extract will create a new grey baby slime if injected with phoron, or some new monkey cubes if injected with blood."
-/decl/chemical_reaction/instant/slime/grey_new_slime
+/datum/decl/chemical_reaction/instant/slime/grey_new_slime
name = "Slime Spawn"
id = "m_spawn"
result = null
@@ -77,12 +77,12 @@
result_amount = 1
required = /obj/item/slime_extract/grey
-/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/grey_monkey
+/datum/decl/chemical_reaction/instant/slime/grey_monkey
name = "Slime Monkey"
id = "m_monkey"
result = null
@@ -90,12 +90,12 @@
result_amount = 1
required = /obj/item/slime_extract/grey
-/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 5) //CHOMPedit Increased number of monkey cubes from 4 to 5
new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/grey_slimejelly
+/datum/decl/chemical_reaction/instant/slime/grey_slimejelly
name = REAGENT_SLIMEJELLY
id = "m_jelly"
result = REAGENT_ID_SLIMEJELLY
@@ -125,7 +125,7 @@
color = "#666666"
strength = 20
-/decl/chemical_reaction/instant/slime/metal_metamorphic
+/datum/decl/chemical_reaction/instant/slime/metal_metamorphic
name = "Slime Metal"
id = "m_metal"
required_reagents = list(REAGENT_ID_PHORON = 5)
@@ -134,7 +134,7 @@
required = /obj/item/slime_extract/metal
-/decl/chemical_reaction/instant/metamorphic
+/datum/decl/chemical_reaction/instant/metamorphic
result_amount = REAGENTS_PER_SHEET * 2
@@ -147,42 +147,42 @@
// This is kind of a waste since iron is in the chem dispenser but it would be inconsistent if this wasn't here.
-/decl/chemical_reaction/instant/metamorphic/iron
+/datum/decl/chemical_reaction/instant/metamorphic/iron
name = "Morph into Iron"
id = "morph_iron"
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET)
result = REAGENT_ID_IRON
-/decl/chemical_reaction/instant/metamorphic/silver
+/datum/decl/chemical_reaction/instant/metamorphic/silver
name = "Morph into Silver"
id = "morph_silver"
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
result = REAGENT_ID_SILVER
-/decl/chemical_reaction/instant/metamorphic/gold
+/datum/decl/chemical_reaction/instant/metamorphic/gold
name = "Morph into Gold"
id = "morph_gold"
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
result = REAGENT_ID_GOLD
-/decl/chemical_reaction/instant/metamorphic/platinum
+/datum/decl/chemical_reaction/instant/metamorphic/platinum
name = "Morph into Platinum"
id = "morph_platinum"
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
result = REAGENT_ID_PLATINUM
-/decl/chemical_reaction/instant/metamorphic/uranium
+/datum/decl/chemical_reaction/instant/metamorphic/uranium
name = "Morph into Uranium"
id = "morph_uranium"
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET)
result = REAGENT_ID_URANIUM
-/decl/chemical_reaction/instant/metamorphic/phoron
+/datum/decl/chemical_reaction/instant/metamorphic/phoron
name = "Morph into Phoron"
id = "morph_phoron"
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
@@ -190,7 +190,7 @@
// Creates 'alloys' which can be finalized with frost oil.
-/decl/chemical_reaction/instant/slime/metal_binding
+/datum/decl/chemical_reaction/instant/slime/metal_binding
name = "Slime Binding"
id = "m_binding"
required_reagents = list(REAGENT_ID_WATER = 5)
@@ -217,7 +217,7 @@
prefill = list(REAGENT_ID_BINDING = 60)
-/decl/chemical_reaction/instant/binding
+/datum/decl/chemical_reaction/instant/binding
name = "Bind into Steel"
id = "bind_steel"
result = REAGENT_ID_STEEL
@@ -233,7 +233,7 @@
color = "#888888"
-/decl/chemical_reaction/instant/binding/plasteel // Two parts 'steel', one part platnium matches the smelter alloy recipe.
+/datum/decl/chemical_reaction/instant/binding/plasteel // Two parts 'steel', one part platnium matches the smelter alloy recipe.
name = "Bind into Plasteel"
id = "bind_plasteel"
required_reagents = list(REAGENT_ID_BINDING = REAGENTS_PER_SHEET, REAGENT_ID_STEEL = REAGENTS_PER_SHEET * 2, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
@@ -260,7 +260,7 @@
The extract can also create a slime stability agent when injected with blood, which reduces the odds of newly created slimes mutating into \
a different color when a slime reproduces."
-/decl/chemical_reaction/instant/slime/blue_frostoil
+/datum/decl/chemical_reaction/instant/slime/blue_frostoil
name = "Slime Frost Oil"
id = "m_frostoil"
result = REAGENT_ID_FROSTOIL
@@ -269,14 +269,14 @@
required = /obj/item/slime_extract/blue
-/decl/chemical_reaction/instant/slime/blue_stability
+/datum/decl/chemical_reaction/instant/slime/blue_stability
name = "Slime Stability"
id = "m_stability"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/blue
-/decl/chemical_reaction/instant/slime/blue_stability/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/blue_stability/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/stabilizer(get_turf(holder.my_atom))
..()
@@ -293,14 +293,14 @@
can extract from a slime specimen."
-/decl/chemical_reaction/instant/slime/purple_steroid
+/datum/decl/chemical_reaction/instant/slime/purple_steroid
name = "Slime Steroid"
id = "m_steroid"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
-/decl/chemical_reaction/instant/slime/purple_steroid/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_steroid/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/steroid(get_turf(holder.my_atom))
..()
@@ -315,14 +315,14 @@
icon_state = "orange slime extract"
description_info = "This extract creates a fire when injected with phoron, after a five second delay."
-/decl/chemical_reaction/instant/slime/orange_fire
+/datum/decl/chemical_reaction/instant/slime/orange_fire
name = "Slime Fire"
id = "m_fire"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/orange
-/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -352,14 +352,14 @@
description_info = "This extract will create a special 10k capacity power cell that self recharges slowly over time, when injected with phoron. \
When injected with blood, it will create a glob of slime which glows brightly. If injected with water, it will emit a strong EMP, after a five second delay."
-/decl/chemical_reaction/instant/slime/yellow_emp
+/datum/decl/chemical_reaction/instant/slime/yellow_emp
name = "Slime EMP"
id = "m_emp"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
-/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -370,26 +370,26 @@
..()
-/decl/chemical_reaction/instant/slime/yellow_battery
+/datum/decl/chemical_reaction/instant/slime/yellow_battery
name = "Slime Cell"
id = "m_cell"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
-/decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder)
new /obj/item/cell/slime(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/yellow_flashlight
+/datum/decl/chemical_reaction/instant/slime/yellow_flashlight
name = "Slime Flashlight"
id = "m_flashlight"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
-/decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(var/datum/reagents/holder)
new /obj/item/flashlight/slime(get_turf(holder.my_atom))
..()
@@ -403,7 +403,7 @@
description_info = "This extract will create 5u liquid gold when injected with phoron."
-/decl/chemical_reaction/instant/slime/gold_gold
+/datum/decl/chemical_reaction/instant/slime/gold_gold
name = "Slime Gold"
id = "m_gold"
result = REAGENT_ID_GOLD
@@ -422,7 +422,7 @@
description_info = "This extract will create 5u liquid silver when injected with phoron."
-/decl/chemical_reaction/instant/slime/silver_silver
+/datum/decl/chemical_reaction/instant/slime/silver_silver
name = "Slime Silver"
id = "m_silver"
result = REAGENT_ID_SILVER
@@ -442,7 +442,7 @@
description_info = "This extract will create 40u liquid phoron when injected with water."
-/decl/chemical_reaction/instant/slime/dark_purple_phoron
+/datum/decl/chemical_reaction/instant/slime/dark_purple_phoron
name = "Slime Phoron"
id = "m_phoron_harvest"
result = REAGENT_ID_PHORON
@@ -464,7 +464,7 @@
cold-resistant armor like winter coats can protect from this. Note that the user is not immune to the extract's effects."
-/decl/chemical_reaction/instant/slime/dark_blue_cold_snap
+/datum/decl/chemical_reaction/instant/slime/dark_blue_cold_snap
name = "Slime Cold Snap"
id = "m_cold_snap"
required_reagents = list(REAGENT_ID_PHORON = 5)
@@ -472,7 +472,7 @@
required = /obj/item/slime_extract/dark_blue
// This iterates over a ZAS zone's contents, so that things seperated in other zones aren't subjected to the temperature drop.
-/decl/chemical_reaction/instant/slime/dark_blue_cold_snap/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blue_cold_snap/on_reaction(var/datum/reagents/holder)
var/turf/simulated/T = get_turf(holder.my_atom)
if(!T) // Nullspace lacks zones.
return
@@ -480,7 +480,7 @@
if(!istype(T))
return
- var/zone/Z = T.zone
+ var/datum/zone/Z = T.zone
if(!Z) // Paranoid.
return
@@ -546,14 +546,14 @@
out of control."
-/decl/chemical_reaction/instant/slime/red_enrage
+/datum/decl/chemical_reaction/instant/slime/red_enrage
name = "Slime Enrage"
id = "m_enrage"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/red
-/decl/chemical_reaction/instant/slime/red_enrage/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_enrage/on_reaction(var/datum/reagents/holder)
for(var/mob/living/simple_mob/slime/S in view(get_turf(holder.my_atom)))
if(S.stat)
continue
@@ -582,14 +582,14 @@
-/decl/chemical_reaction/instant/slime/red_mutation
+/datum/decl/chemical_reaction/instant/slime/red_mutation
name = "Slime Mutation"
id = "m_mutation"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/red
-/decl/chemical_reaction/instant/slime/red_mutation/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_mutation/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/mutator(get_turf(holder.my_atom))
..()
@@ -602,7 +602,7 @@
icon_state = "green slime extract"
description_info = "This extract will create 5u of liquid uranium when injected with phoron."
-/decl/chemical_reaction/instant/slime/green_uranium
+/datum/decl/chemical_reaction/instant/slime/green_uranium
name = "Slime Uranium"
id = "m_uranium"
result = REAGENT_ID_URANIUM
@@ -622,7 +622,7 @@
with phoron. When injected with water, it will create an organ-mending agent. The slime medications have a very low threshold for overdosage, however."
-/decl/chemical_reaction/instant/slime/pink_clotting
+/datum/decl/chemical_reaction/instant/slime/pink_clotting
name = "Slime Clotting Med"
id = "m_clotting"
result = REAGENT_ID_SLIMEBLEEDFIXER
@@ -631,7 +631,7 @@
required = /obj/item/slime_extract/pink
-/decl/chemical_reaction/instant/slime/pink_bone_fix
+/datum/decl/chemical_reaction/instant/slime/pink_bone_fix
name = "Slime Bone Med"
id = "m_bone_fixer"
result = REAGENT_ID_SLIMEBONEFIXER
@@ -640,7 +640,7 @@
required = /obj/item/slime_extract/pink
-/decl/chemical_reaction/instant/slime/pink_organ_fix
+/datum/decl/chemical_reaction/instant/slime/pink_organ_fix
name = "Slime Organ Med"
id = "m_organ_fixer"
result = REAGENT_ID_SLIMEORGANFIXER
@@ -685,7 +685,7 @@
increase the power of the explosion instead of allowing for multiple explosions."
-/decl/chemical_reaction/instant/slime/oil_griff
+/datum/decl/chemical_reaction/instant/slime/oil_griff
name = "Slime Explosion"
id = "m_boom"
required_reagents = list(REAGENT_ID_BLOOD = 5)
@@ -693,7 +693,7 @@
required = /obj/item/slime_extract/oil
-/decl/chemical_reaction/instant/slime/oil_griff/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/oil_griff/on_reaction(var/datum/reagents/holder)
..()
var/obj/item/slime_extract/E = holder.my_atom
var/power = 1
@@ -723,26 +723,26 @@
short ranged, random teleporting. When injected with phoron, it creates one 'greater' slime crystal, which allows for a one time precise teleport to \
a specific area."
-/decl/chemical_reaction/instant/slime/bluespace_lesser
+/datum/decl/chemical_reaction/instant/slime/bluespace_lesser
name = "Slime Lesser Tele"
id = "m_tele_lesser"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/decl/chemical_reaction/instant/slime/bluespace_lesser/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_lesser/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 5)
new /obj/item/slime_crystal(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/bluespace_greater
+/datum/decl/chemical_reaction/instant/slime/bluespace_greater
name = "Slime Greater Tele"
id = "m_tele_lesser"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/decl/chemical_reaction/instant/slime/bluespace_greater/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_greater/on_reaction(var/datum/reagents/holder)
new /obj/item/disposable_teleporter/slime(get_turf(holder.my_atom))
..()
@@ -757,14 +757,14 @@
'charges' before it goes inert."
-/decl/chemical_reaction/instant/slime/cerulean_enhancer
+/datum/decl/chemical_reaction/instant/slime/cerulean_enhancer
name = "Slime Enhancer"
id = "m_enhancer"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/decl/chemical_reaction/instant/slime/cerulean_enhancer/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_enhancer/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/enhancer(get_turf(holder.my_atom))
..()
@@ -779,26 +779,26 @@
injected with water, it will create a very delicious and filling product."
-/decl/chemical_reaction/instant/slime/amber_slimefood
+/datum/decl/chemical_reaction/instant/slime/amber_slimefood
name = "Slime Feeding"
id = "m_slime_food"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
-/decl/chemical_reaction/instant/slime/amber_slimefood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_slimefood/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/feeding(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/amber_peoplefood
+/datum/decl/chemical_reaction/instant/slime/amber_peoplefood
name = "Slime Food"
id = "m_people_food"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
-/decl/chemical_reaction/instant/slime/amber_peoplefood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_peoplefood/on_reaction(var/datum/reagents/holder)
new /obj/item/reagent_containers/food/snacks/slime(get_turf(holder.my_atom))
..()
@@ -814,14 +814,14 @@
description_info = "This extract will create one 'slime cube' when injected with phoron. The slime cube is needed to create a Promethean."
-/decl/chemical_reaction/instant/slime/sapphire_promethean
+/datum/decl/chemical_reaction/instant/slime/sapphire_promethean
name = "Slime Promethean"
id = "m_promethean"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/sapphire
-/decl/chemical_reaction/instant/slime/sapphire_promethean/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sapphire_promethean/on_reaction(var/datum/reagents/holder)
new /obj/item/slime_cube(get_turf(holder.my_atom))
..()
@@ -835,14 +835,14 @@
description_info = "This extract will cause all entities close to the extract to become stronger for ten minutes, when injected with phoron. \
When injected with blood, makes a slime loyalty agent which will make the slime fight other dangerous entities but not station crew."
-/decl/chemical_reaction/instant/slime/ruby_swole
+/datum/decl/chemical_reaction/instant/slime/ruby_swole
name = "Slime Strength"
id = "m_strength"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
-/decl/chemical_reaction/instant/slime/ruby_swole/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_swole/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_strength, 10 MINUTES, src)
..()
@@ -863,14 +863,14 @@
incoming_damage_percent = 0.75
-/decl/chemical_reaction/instant/slime/ruby_loyalty
+/datum/decl/chemical_reaction/instant/slime/ruby_loyalty
name = "Slime Loyalty"
id = "m_strength"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
-/decl/chemical_reaction/instant/slime/ruby_loyalty/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_loyalty/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/loyalty(get_turf(holder.my_atom))
..()
@@ -884,14 +884,14 @@
icon_state = "emerald slime extract"
description_info = "This extract will cause all entities close to the extract to become more agile for ten minutes, when injected with phoron."
-/decl/chemical_reaction/instant/slime/emerald_fast
+/datum/decl/chemical_reaction/instant/slime/emerald_fast
name = "Slime Agility"
id = "m_agility"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/emerald
-/decl/chemical_reaction/instant/slime/emerald_fast/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/emerald_fast/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_agility, 10 MINUTES, src)
..()
@@ -921,26 +921,26 @@
When injected with phoron, it instead creates a slime friendship agent, which makes the slime consider the user their ally. The agent \
might be useful on other specimens as well."
-/decl/chemical_reaction/instant/slime/light_pink_docility
+/datum/decl/chemical_reaction/instant/slime/light_pink_docility
name = "Slime Docility"
id = "m_docile"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/decl/chemical_reaction/instant/slime/light_pink_docility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_docility/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/docility(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/light_pink_friendship
+/datum/decl/chemical_reaction/instant/slime/light_pink_friendship
name = "Slime Friendship"
id = "m_friendship"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/decl/chemical_reaction/instant/slime/light_pink_friendship/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_friendship/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/friendship(get_turf(holder.my_atom))
..()
@@ -957,7 +957,7 @@
which makes slimes stop attacking other slime colors."
-/decl/chemical_reaction/instant/slime/rainbow_random_slime
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_slime
name = "Slime Random Slime"
id = "m_rng_slime"
required_reagents = list(REAGENT_ID_PHORON = 5)
@@ -965,7 +965,7 @@
required = /obj/item/slime_extract/rainbow
-/decl/chemical_reaction/instant/slime/rainbow_random_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_slime/on_reaction(var/datum/reagents/holder)
var/mob/living/simple_mob/slime/xenobio/S
var/list/slime_types = typesof(/mob/living/simple_mob/slime/xenobio)
@@ -981,13 +981,13 @@
new S(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/rainbow_unity
+/datum/decl/chemical_reaction/instant/slime/rainbow_unity
name = "Slime Unity"
id = "m_unity"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/unity(get_turf(holder.my_atom))
..()
diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index b78dbf66a1..2f991aa082 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -46,17 +46,17 @@
else
. += "This extract is inert."
-/decl/chemical_reaction/instant/slime
+/datum/decl/chemical_reaction/instant/slime
var/required = null
-/decl/chemical_reaction/instant/slime/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/can_happen(var/datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, required))
var/obj/item/slime_extract/T = holder.my_atom
if(T.uses > 0)
return ..()
return FALSE
-/decl/chemical_reaction/instant/slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/on_reaction(var/datum/reagents/holder)
var/obj/item/slime_extract/T = holder.my_atom
T.uses--
if(T.uses <= 0)
@@ -76,7 +76,7 @@
slime_type = /mob/living/simple_mob/slime/xenobio
-/decl/chemical_reaction/instant/slime/grey_new_slime
+/datum/decl/chemical_reaction/instant/slime/grey_new_slime
name = "Slime Spawn"
id = "m_grey_spawn"
result = null
@@ -84,13 +84,13 @@
result_amount = 1
required = /obj/item/slime_extract/grey
-/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/grey_monkey
+/datum/decl/chemical_reaction/instant/slime/grey_monkey
name = "Slime Monkey"
id = "m_grey_monkey"
result = null
@@ -98,13 +98,13 @@
result_amount = 1
required = /obj/item/slime_extract/grey
-/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 5) //CHOMPedit Increased number of monkey cubes from 4 to 5
new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/grey_slimejelly
+/datum/decl/chemical_reaction/instant/slime/grey_slimejelly
name = REAGENT_SLIMEJELLY
id = "m_grey_jelly"
result = REAGENT_ID_SLIMEJELLY
@@ -124,7 +124,7 @@
slime_type = /mob/living/simple_mob/slime/xenobio/metal
-/decl/chemical_reaction/instant/slime/metal_materials_basic
+/datum/decl/chemical_reaction/instant/slime/metal_materials_basic
name = "Slime Basic Construction Materials"
id = "m_metal_basic"
result = null
@@ -132,49 +132,49 @@
result_amount = 1
required = /obj/item/slime_extract/metal
-/decl/chemical_reaction/instant/slime/metal_materials_basic/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/metal_materials_basic/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 3)
var/type_to_spawn = pickweight(GLOB.xenobio_metal_materials_normal)
new type_to_spawn(get_turf(holder.my_atom), 10)
..()
-/decl/chemical_reaction/instant/slime/metal_materials_adv
+/datum/decl/chemical_reaction/instant/slime/metal_materials_adv
name = "Slime Advanced Construction Materials"
id = "m_metal_adv"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/metal
-/decl/chemical_reaction/instant/slime/metal_materials_adv/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/metal_materials_adv/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 2)
var/type_to_spawn = pickweight(GLOB.xenobio_metal_materials_adv)
new type_to_spawn(get_turf(holder.my_atom), 10)
..()
-/decl/chemical_reaction/instant/slime/metal_materials_weird
+/datum/decl/chemical_reaction/instant/slime/metal_materials_weird
name = "Slime Weird Construction Materials"
id = "m_metal_weird"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/metal
-/decl/chemical_reaction/instant/slime/metal_materials_weird/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/metal_materials_weird/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 3)
var/type_to_spawn = pickweight(GLOB.xenobio_metal_materials_weird)
new type_to_spawn(get_turf(holder.my_atom), 5)
..()
-/decl/chemical_reaction/instant/slime/metal_materials_steel
+/datum/decl/chemical_reaction/instant/slime/metal_materials_steel
name = "Slime Weird Construction Materials"
id = "m_metal_steel"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/metal
-/decl/chemical_reaction/instant/slime/metal_materials_steel/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/metal_materials_steel/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/steel(get_turf(holder.my_atom), 25)
..()
@@ -190,7 +190,7 @@
slime_type = /mob/living/simple_mob/slime/xenobio/blue
-/decl/chemical_reaction/instant/slime/blue_frostoil
+/datum/decl/chemical_reaction/instant/slime/blue_frostoil
name = "Slime Frost Oil"
id = "m_blue_frostoil"
result = REAGENT_ID_FROSTOIL
@@ -199,26 +199,26 @@
required = /obj/item/slime_extract/blue
-/decl/chemical_reaction/instant/slime/blue_stability
+/datum/decl/chemical_reaction/instant/slime/blue_stability
name = "Slime Stability"
id = "m_blue_stability"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/blue
-/decl/chemical_reaction/instant/slime/blue_stability/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/blue_stability/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/stabilizer(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/blue_calm
+/datum/decl/chemical_reaction/instant/slime/blue_calm
name = "Slime Calm"
id = "m_blue_calm"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/blue
-/decl/chemical_reaction/instant/slime/blue_calm/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/blue_calm/on_reaction(var/datum/reagents/holder)
for(var/mob/living/simple_mob/slime/S in view(get_turf(holder.my_atom)))
if(S.stat)
continue
@@ -244,7 +244,7 @@
..()
-/decl/chemical_reaction/instant/slime/blue_cryotoxin
+/datum/decl/chemical_reaction/instant/slime/blue_cryotoxin
name = "Slime Cryotoxin"
id = "m_blue_cryotoxin"
result = REAGENT_ID_CRYOTOXIN
@@ -265,50 +265,50 @@
slime_type = /mob/living/simple_mob/slime/xenobio/purple
-/decl/chemical_reaction/instant/slime/purple_steroid
+/datum/decl/chemical_reaction/instant/slime/purple_steroid
name = "Slime Steroid"
id = "m_purple_steroid"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
-/decl/chemical_reaction/instant/slime/purple_steroid/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_steroid/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/steroid(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/purple_infertility
+/datum/decl/chemical_reaction/instant/slime/purple_infertility
name = "Slime Infetility"
id = "m_purple_infertility"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
-/decl/chemical_reaction/instant/slime/purple_infertility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_infertility/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/infertility(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/purple_shrink
+/datum/decl/chemical_reaction/instant/slime/purple_shrink
name = "Slime Shrink"
id = "m_purple_shrink"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
-/decl/chemical_reaction/instant/slime/purple_shrink/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_shrink/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/shrink(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/purple_fertility
+/datum/decl/chemical_reaction/instant/slime/purple_fertility
name = "Slime Fetility"
id = "m_purple_fertility"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
-/decl/chemical_reaction/instant/slime/purple_fertility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_fertility/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/fertility(get_turf(holder.my_atom))
..()
@@ -324,14 +324,14 @@
slime_type = /mob/living/simple_mob/slime/xenobio/orange
-/decl/chemical_reaction/instant/slime/orange_fire
+/datum/decl/chemical_reaction/instant/slime/orange_fire
name = "Slime Fire"
id = "m_orange_fire"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/orange
-/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -351,14 +351,14 @@
..()
-/decl/chemical_reaction/instant/slime/orange_heatwave
+/datum/decl/chemical_reaction/instant/slime/orange_heatwave
name = "Slime Heat Wave"
id = "m_orange_heatwave"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/orange
-/decl/chemical_reaction/instant/slime/orange_heatwave/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/orange_heatwave/on_reaction(var/datum/reagents/holder)
var/turf/simulated/T = get_turf(holder.my_atom)
if(!T) // Nullspace lacks zones.
return
@@ -366,7 +366,7 @@
if(!istype(T))
return
- var/zone/Z = T.zone
+ var/datum/zone/Z = T.zone
if(!Z) // Paranoid.
return
@@ -407,14 +407,14 @@
..()
-/decl/chemical_reaction/instant/slime/orange_smoke
+/datum/decl/chemical_reaction/instant/slime/orange_smoke
name = "Slime Smoke"
id = "m_orange_smoke"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/orange
-/decl/chemical_reaction/instant/slime/orange_smoke/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/orange_smoke/on_reaction(var/datum/reagents/holder)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
@@ -425,7 +425,7 @@
..()
-/decl/chemical_reaction/instant/slime/orange_pyrotoxin
+/datum/decl/chemical_reaction/instant/slime/orange_pyrotoxin
name = "Slime Pyrotoxin"
id = "m_orange_pyrotoxin"
result = REAGENT_ID_THERMITEV
@@ -445,14 +445,14 @@
slime_type = /mob/living/simple_mob/slime/xenobio/yellow
-/decl/chemical_reaction/instant/slime/yellow_lightning
+/datum/decl/chemical_reaction/instant/slime/yellow_lightning
name = "Slime Lightning"
id = "m_yellow_lightning"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
-/decl/chemical_reaction/instant/slime/yellow_lightning/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_lightning/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (lightning) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -464,26 +464,26 @@
..()
-/decl/chemical_reaction/instant/slime/yellow_flashlight
+/datum/decl/chemical_reaction/instant/slime/yellow_flashlight
name = "Slime Flashlight"
id = "m_yellow_flashlight"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
-/decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(var/datum/reagents/holder)
new /obj/item/flashlight/slime(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/yellow_emp
+/datum/decl/chemical_reaction/instant/slime/yellow_emp
name = "Slime EMP"
id = "m_yellow_emp"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
-/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -494,14 +494,14 @@
..()
-/decl/chemical_reaction/instant/slime/yellow_battery
+/datum/decl/chemical_reaction/instant/slime/yellow_battery
name = "Slime Cell"
id = "m_yellow_cell"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
-/decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder)
new /obj/item/cell/slime(get_turf(holder.my_atom))
..()
@@ -517,14 +517,14 @@
slime_type = /mob/living/simple_mob/slime/xenobio/gold
-/decl/chemical_reaction/instant/slime/gold_random_mobs
+/datum/decl/chemical_reaction/instant/slime/gold_random_mobs
name = "Slime Random Mobs"
id = "m_gold_random_mobs"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/gold
-/decl/chemical_reaction/instant/slime/gold_random_mobs/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/gold_random_mobs/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Gold extract reaction (random mobs) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
var/type_to_spawn
var/list/all_spawnable_types = list()
@@ -543,14 +543,14 @@
..()
-/decl/chemical_reaction/instant/slime/gold_hostile_mob
+/datum/decl/chemical_reaction/instant/slime/gold_hostile_mob
name = "Slime Hostile Mob"
id = "m_gold_hostile_mob"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/gold
-/decl/chemical_reaction/instant/slime/gold_hostile_mob/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/gold_hostile_mob/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Gold extract reaction (dangerous mob) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
var/type_to_spawn = pickweight(GLOB.xenobio_gold_mobs_hostile)
var/mob/living/C = new type_to_spawn(get_turf(holder.my_atom))
@@ -559,14 +559,14 @@
..()
-/decl/chemical_reaction/instant/slime/gold_safe_mob
+/datum/decl/chemical_reaction/instant/slime/gold_safe_mob
name = "Slime Safe Mob"
id = "m_gold_safe_mob"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/gold
-/decl/chemical_reaction/instant/slime/gold_safe_mob/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/gold_safe_mob/on_reaction(var/datum/reagents/holder)
var/type_to_spawn
if(prob(100/(GLOB.xenobio_gold_mobs_safe.len + 1)))
type_to_spawn = pickweight(GLOB.xenobio_gold_mobs_birds)
@@ -578,14 +578,14 @@
..()
-/decl/chemical_reaction/instant/slime/gold_materials_gold
+/datum/decl/chemical_reaction/instant/slime/gold_materials_gold
name = "Slime Gold"
id = "m_gold_gold"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/gold
-/decl/chemical_reaction/instant/slime/gold_materials_gold/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/gold_materials_gold/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/gold(get_turf(holder.my_atom), 10)
..()
@@ -601,41 +601,41 @@
slime_type = /mob/living/simple_mob/slime/xenobio/silver
-/decl/chemical_reaction/instant/slime/silver_materials_basic
+/datum/decl/chemical_reaction/instant/slime/silver_materials_basic
name = "Slime Basic Science Materials"
id = "m_silver_basic"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/silver
-/decl/chemical_reaction/instant/slime/silver_materials_basic/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/silver_materials_basic/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 2)
var/type_to_spawn = pickweight(GLOB.xenobio_silver_materials_basic)
new type_to_spawn(get_turf(holder.my_atom), 5)
..()
-/decl/chemical_reaction/instant/slime/silver_materials_adv
+/datum/decl/chemical_reaction/instant/slime/silver_materials_adv
name = "Slime Advanced Science Materials"
id = "m_silver_adv"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/silver
-/decl/chemical_reaction/instant/slime/silver_materials_adv/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/silver_materials_adv/on_reaction(var/datum/reagents/holder)
var/type_to_spawn = pickweight(GLOB.xenobio_silver_materials_adv)
new type_to_spawn(get_turf(holder.my_atom), 3)
..()
-/decl/chemical_reaction/instant/slime/silver_materials_random
+/datum/decl/chemical_reaction/instant/slime/silver_materials_random
name = "Slime Random Materials"
id = "m_silver_random"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/silver
-/decl/chemical_reaction/instant/slime/silver_materials_random/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/silver_materials_random/on_reaction(var/datum/reagents/holder)
var/type_to_spawn
var/amount = 5
var/all_spawnable_types = list()
@@ -653,14 +653,14 @@
..()
-/decl/chemical_reaction/instant/slime/silver_materials_silver
+/datum/decl/chemical_reaction/instant/slime/silver_materials_silver
name = "Slime Silver"
id = "m_silver_silver"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/silver
-/decl/chemical_reaction/instant/slime/silver_materials_silver/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/silver_materials_silver/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/silver(get_turf(holder.my_atom), 10)
..()
@@ -675,7 +675,7 @@
slime_type = /mob/living/simple_mob/slime/xenobio/dark_purple
-/decl/chemical_reaction/instant/slime/dark_purple_phoron
+/datum/decl/chemical_reaction/instant/slime/dark_purple_phoron
name = "Slime Phoron"
id = "m_darkpurple_phoron"
result = REAGENT_ID_PHORON
@@ -684,7 +684,7 @@
required = /obj/item/slime_extract/dark_purple
-/decl/chemical_reaction/instant/slime/dark_purple_blood
+/datum/decl/chemical_reaction/instant/slime/dark_purple_blood
name = "Slime Blood"
id = "m_darkpurple_blood"
result = REAGENT_ID_BLOOD
@@ -704,7 +704,7 @@
slime_type = /mob/living/simple_mob/slime/xenobio/dark_blue
-/decl/chemical_reaction/instant/slime/dark_blue_cold_snap
+/datum/decl/chemical_reaction/instant/slime/dark_blue_cold_snap
name = "Slime Cold Snap"
id = "m_darkblue_coldsnap"
required_reagents = list(REAGENT_ID_PHORON = 5)
@@ -712,7 +712,7 @@
required = /obj/item/slime_extract/dark_blue
// This iterates over a ZAS zone's contents, so that things seperated in other zones aren't subjected to the temperature drop.
-/decl/chemical_reaction/instant/slime/dark_blue_cold_snap/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blue_cold_snap/on_reaction(var/datum/reagents/holder)
var/turf/simulated/T = get_turf(holder.my_atom)
if(!T) // Nullspace lacks zones.
return
@@ -720,7 +720,7 @@
if(!istype(T))
return
- var/zone/Z = T.zone
+ var/datum/zone/Z = T.zone
if(!Z) // Paranoid.
return
@@ -774,14 +774,14 @@
..()
-/decl/chemical_reaction/instant/slime/dark_blue_temp_resist
+/datum/decl/chemical_reaction/instant/slime/dark_blue_temp_resist
name = "Slime Temperature Resistance"
id = "m_darkblue_temperature_resist"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/dark_blue
-/decl/chemical_reaction/instant/slime/dark_blue_temp_resist/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blue_temp_resist/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_temp_resist, 5 MINUTES, src)
..()
@@ -800,7 +800,7 @@
cold_protection = 1
-/decl/chemical_reaction/instant/slime/dark_blue_ice
+/datum/decl/chemical_reaction/instant/slime/dark_blue_ice
name = "Slime Ice"
id = "m_darkblue_ice"
result = REAGENT_ID_ICE
@@ -809,14 +809,14 @@
required = /obj/item/slime_extract/dark_blue
-/decl/chemical_reaction/instant/slime/dark_blue_death
+/datum/decl/chemical_reaction/instant/slime/dark_blue_death
name = "Slime Death"
id = "m_darkblue_death"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/dark_blue
-/decl/chemical_reaction/instant/slime/dark_blue_death/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blue_death/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/death(get_turf(holder.my_atom))
..()
@@ -833,26 +833,26 @@
slime_type = /mob/living/simple_mob/slime/xenobio/red
-/decl/chemical_reaction/instant/slime/red_mutation
+/datum/decl/chemical_reaction/instant/slime/red_mutation
name = "Slime Mutation"
id = "m_red_mutation"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/red
-/decl/chemical_reaction/instant/slime/red_mutation/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_mutation/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/mutator(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/red_enrage
+/datum/decl/chemical_reaction/instant/slime/red_enrage
name = "Slime Enrage"
id = "m_red_enrage"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/red
-/decl/chemical_reaction/instant/slime/red_enrage/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_enrage/on_reaction(var/datum/reagents/holder)
for(var/mob/living/simple_mob/slime/S in view(get_turf(holder.my_atom)))
if(S.stat)
continue
@@ -880,7 +880,7 @@
..()
-/decl/chemical_reaction/instant/slime/red_hotsauce
+/datum/decl/chemical_reaction/instant/slime/red_hotsauce
name = "Slime Hot Sauce"
id = "m_red_hotsauce"
result = REAGENT_ID_CAPSAICIN
@@ -889,14 +889,14 @@
required = /obj/item/slime_extract/red
-/decl/chemical_reaction/instant/slime/red_ferality
+/datum/decl/chemical_reaction/instant/slime/red_ferality
name = "Slime Ferality"
id = "m_red_ferality"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/red
-/decl/chemical_reaction/instant/slime/red_ferality/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_ferality/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/ferality(get_turf(holder.my_atom))
..()
@@ -912,14 +912,14 @@
slime_type = /mob/living/simple_mob/slime/xenobio/green
-/decl/chemical_reaction/instant/slime/green_radpulse
+/datum/decl/chemical_reaction/instant/slime/green_radpulse
name = "Slime Radiation Pulse"
id = "m_green_radpulse"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/green
-/decl/chemical_reaction/instant/slime/green_radpulse/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/green_radpulse/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation pulse) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!"))
@@ -928,20 +928,20 @@
..()
-/decl/chemical_reaction/instant/slime/green_emitter
+/datum/decl/chemical_reaction/instant/slime/green_emitter
name = "Slime Radiation Emitter"
id = "m_green_emitter"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/green
-/decl/chemical_reaction/instant/slime/green_emitter/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/green_emitter/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation emitter) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
new /obj/item/slime_irradiator(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/green_radium
+/datum/decl/chemical_reaction/instant/slime/green_radium
name = "Slime Radium"
id = "m_green_radium"
result = REAGENT_ID_RADIUM
@@ -950,14 +950,14 @@
required = /obj/item/slime_extract/green
-/decl/chemical_reaction/instant/slime/green_uranium
+/datum/decl/chemical_reaction/instant/slime/green_uranium
name = "Slime Uranium"
id = "m_green_uranium"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/green
-/decl/chemical_reaction/instant/slime/green_uranium/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/green_uranium/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/uranium(get_turf(holder.my_atom), 10)
..()
@@ -973,7 +973,7 @@
slime_type = /mob/living/simple_mob/slime/xenobio/pink
-/decl/chemical_reaction/instant/slime/pink_bone_fix
+/datum/decl/chemical_reaction/instant/slime/pink_bone_fix
name = "Slime Bone Med"
id = "m_pink_bone_fixer"
result = REAGENT_ID_SLIMEBONEFIXER
@@ -982,7 +982,7 @@
required = /obj/item/slime_extract/pink
-/decl/chemical_reaction/instant/slime/pink_clotting
+/datum/decl/chemical_reaction/instant/slime/pink_clotting
name = "Slime Clotting Med"
id = "m_pink_clotting"
result = REAGENT_ID_SLIMEBLEEDFIXER
@@ -991,7 +991,7 @@
required = /obj/item/slime_extract/pink
-/decl/chemical_reaction/instant/slime/pink_organ_fix
+/datum/decl/chemical_reaction/instant/slime/pink_organ_fix
name = "Slime Organ Med"
id = "m_pink_organ_fixer"
result = REAGENT_ID_SLIMEORGANFIXER
@@ -1000,14 +1000,14 @@
required = /obj/item/slime_extract/pink
-/decl/chemical_reaction/instant/slime/pink_heal_pulse
+/datum/decl/chemical_reaction/instant/slime/pink_heal_pulse
name = "Slime Heal Pulse"
id = "m_pink_heal_pulse"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/pink
-/decl/chemical_reaction/instant/slime/pink_heal_pulse/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/pink_heal_pulse/on_reaction(var/datum/reagents/holder)
for(var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null))
to_chat(C, span_notice("A wave of energy suddenly invigorates you."))
C.adjustBruteLoss(-25)
@@ -1031,7 +1031,7 @@
slime_type = /mob/living/simple_mob/slime/xenobio/oil
-/decl/chemical_reaction/instant/slime/oil_fuel
+/datum/decl/chemical_reaction/instant/slime/oil_fuel
name = "Slime Fuel"
id = "m_oil_fuel"
result = REAGENT_ID_FUEL
@@ -1040,7 +1040,7 @@
required = /obj/item/slime_extract/oil
-/decl/chemical_reaction/instant/slime/oil_oil
+/datum/decl/chemical_reaction/instant/slime/oil_oil
name = "Slime Oil"
id = "m_oil_oil"
result = REAGENT_ID_COOKINGOIL
@@ -1049,27 +1049,27 @@
required = /obj/item/slime_extract/oil
-/decl/chemical_reaction/instant/slime/oil_fakesplosion
+/datum/decl/chemical_reaction/instant/slime/oil_fakesplosion
name = "Slime Fake Explosion"
id = "m_oil_fakeboom"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/oil
-/decl/chemical_reaction/instant/slime/oil_fakesplosion/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/oil_fakesplosion/on_reaction(var/datum/reagents/holder)
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
explosion(get_turf(holder.my_atom), 0, 0, 0)
..()
-/decl/chemical_reaction/instant/slime/oil_explosion
+/datum/decl/chemical_reaction/instant/slime/oil_explosion
name = "Slime Explosion"
id = "m_oil_boom"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/oil
-/decl/chemical_reaction/instant/slime/oil_explosion/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/oil_explosion/on_reaction(var/datum/reagents/holder)
..()
var/obj/item/slime_extract/E = holder.my_atom
var/power = 1
@@ -1100,39 +1100,39 @@
slime_type = /mob/living/simple_mob/slime/xenobio/bluespace
-/decl/chemical_reaction/instant/slime/bluespace_crystals
+/datum/decl/chemical_reaction/instant/slime/bluespace_crystals
name = "Slime Bluespace Crystals"
id = "m_bs_crystals"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/decl/chemical_reaction/instant/slime/bluespace_crystals/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_crystals/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 5)
new /obj/item/slime_crystal(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/bluespace_pouch
+/datum/decl/chemical_reaction/instant/slime/bluespace_pouch
name = "Slime Bluespace Pouch"
id = "m_bs_pouch"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/decl/chemical_reaction/instant/slime/bluespace_pouch/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_pouch/on_reaction(var/datum/reagents/holder)
new /obj/item/storage/backpack/holding/slime(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/bluespace_chaotic_tele
+/datum/decl/chemical_reaction/instant/slime/bluespace_chaotic_tele
name = "Slime Bluespace Chaos"
id = "m_bs_chaos"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/decl/chemical_reaction/instant/slime/bluespace_chaotic_tele/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_chaotic_tele/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Bluespace extract reaction (chaos teleport) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
for(var/mob/living/M in range(2,get_turf(holder.my_atom)))
if(M.buckled)
@@ -1150,14 +1150,14 @@
..()
-/decl/chemical_reaction/instant/slime/bluespace_teleporter
+/datum/decl/chemical_reaction/instant/slime/bluespace_teleporter
name = "Slime Bluespace Teleporter"
id = "m_bs_teleporter"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/decl/chemical_reaction/instant/slime/bluespace_teleporter/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_teleporter/on_reaction(var/datum/reagents/holder)
new /obj/item/disposable_teleporter/slime(get_turf(holder.my_atom))
..()
@@ -1174,50 +1174,50 @@
slime_type = /mob/living/simple_mob/slime/xenobio/cerulean
-/decl/chemical_reaction/instant/slime/cerulean_enhancer
+/datum/decl/chemical_reaction/instant/slime/cerulean_enhancer
name = "Slime Enhancer"
id = "m_cerulean_enhancer"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/decl/chemical_reaction/instant/slime/cerulean_enhancer/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_enhancer/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/enhancer(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/cerulean_reinvigoration
+/datum/decl/chemical_reaction/instant/slime/cerulean_reinvigoration
name = "Slime Reinvigoration"
id = "m_cerulean_reinvigoration"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/decl/chemical_reaction/instant/slime/cerulean_reinvigoration/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_reinvigoration/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/reinvigoration(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/cerulean_potion_mimic
+/datum/decl/chemical_reaction/instant/slime/cerulean_potion_mimic
name = "Slime Potion Mimic"
id = "m_cerulean_potion_mimic"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/decl/chemical_reaction/instant/slime/cerulean_potion_mimic/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_potion_mimic/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/mimic(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/cerulean_random_potion
+/datum/decl/chemical_reaction/instant/slime/cerulean_random_potion
name = "Slime Random Potion"
id = "m_cerulean_random_potion"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/decl/chemical_reaction/instant/slime/cerulean_random_potion/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_random_potion/on_reaction(var/datum/reagents/holder)
var/spawn_type = pickweight(GLOB.xenobio_cerulean_potions)
new spawn_type(get_turf(holder.my_atom))
..()
@@ -1234,26 +1234,26 @@
slime_type = /mob/living/simple_mob/slime/xenobio/amber
-/decl/chemical_reaction/instant/slime/amber_slimefood
+/datum/decl/chemical_reaction/instant/slime/amber_slimefood
name = "Slime Feeding"
id = "m_amber_slime_food"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
-/decl/chemical_reaction/instant/slime/amber_slimefood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_slimefood/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/feeding(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/amber_random_food
+/datum/decl/chemical_reaction/instant/slime/amber_random_food
name = "Slime Random Food"
id = "m_amber_random_food"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
-/decl/chemical_reaction/instant/slime/amber_random_food/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_random_food/on_reaction(var/datum/reagents/holder)
var/list/edibles = subtypesof(/obj/item/reagent_containers/food/snacks)
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1)
@@ -1269,20 +1269,20 @@
..()
-/decl/chemical_reaction/instant/slime/amber_snack
+/datum/decl/chemical_reaction/instant/slime/amber_snack
name = "Slime Snack"
id = "m_amber_snack"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
-/decl/chemical_reaction/instant/slime/amber_snack/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_snack/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to rand(3, 5))
new /obj/item/reagent_containers/food/snacks/slime(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/amber_goop
+/datum/decl/chemical_reaction/instant/slime/amber_goop
name = "Slime Goop"
id = "m_amber_goop"
result = "slime_goop"
@@ -1303,19 +1303,19 @@
slime_type = /mob/living/simple_mob/slime/xenobio/sapphire
-/decl/chemical_reaction/instant/slime/sapphire_promethean
+/datum/decl/chemical_reaction/instant/slime/sapphire_promethean
name = "Slime Promethean"
id = "m_sapphire_promethean"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/sapphire
-/decl/chemical_reaction/instant/slime/sapphire_promethean/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sapphire_promethean/on_reaction(var/datum/reagents/holder)
new /obj/item/slime_cube(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/sapphire_mutation
+/datum/decl/chemical_reaction/instant/slime/sapphire_mutation
name = "Slime Mutation Toxins"
id = "m_sapphire_mutation_tox"
result = REAGENT_ID_MUTATIONTOXIN
@@ -1324,14 +1324,14 @@
required = /obj/item/slime_extract/sapphire
-/decl/chemical_reaction/instant/slime/sapphire_plushies
+/datum/decl/chemical_reaction/instant/slime/sapphire_plushies
name = "Slime Plushies"
id = "m_sapphire_plushies"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/sapphire
-/decl/chemical_reaction/instant/slime/sapphire_plushies/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sapphire_plushies/on_reaction(var/datum/reagents/holder)
var/spawn_type
var/list/possible_types = subtypesof(/obj/item/toy/plushie)
possible_types -= subtypesof(/obj/item/toy/plushie/fluff)
@@ -1342,14 +1342,14 @@
..()
-/decl/chemical_reaction/instant/slime/sapphire_sapience
+/datum/decl/chemical_reaction/instant/slime/sapphire_sapience
name = "Slime Sapience"
id = "m_sapphire_sapience"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/sapphire
-/decl/chemical_reaction/instant/slime/sapphire_sapience/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sapphire_sapience/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/sapience(get_turf(holder.my_atom))
..()
@@ -1364,14 +1364,14 @@
this extract creates some brute juice. When injected with slime jelly, this extract creates a pushing force."
slime_type = /mob/living/simple_mob/slime/xenobio/ruby
-/decl/chemical_reaction/instant/slime/ruby_swole
+/datum/decl/chemical_reaction/instant/slime/ruby_swole
name = "Slime Strength"
id = "m_ruby_strength"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
-/decl/chemical_reaction/instant/slime/ruby_swole/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_swole/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_strength, 10 MINUTES, src)
..()
@@ -1391,14 +1391,14 @@
incoming_damage_percent = 0.75
-/decl/chemical_reaction/instant/slime/ruby_pull
+/datum/decl/chemical_reaction/instant/slime/ruby_pull
name = "Slime Pull"
id = "m_ruby_pull"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
-/decl/chemical_reaction/instant/slime/ruby_pull/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_pull/on_reaction(var/datum/reagents/holder)
var/location = get_turf(holder.my_atom)
playsound(location, 'sound/weapons/gauss_shoot.ogg', 50, 1)
var/datum/effect/effect/system/grav_pull/s = new /datum/effect/effect/system/grav_pull
@@ -1407,7 +1407,7 @@
..()
-/decl/chemical_reaction/instant/slime/ruby_brute_juice
+/datum/decl/chemical_reaction/instant/slime/ruby_brute_juice
name = "Slime Brute Juice"
id = "m_ruby_brute_juice"
result = REAGENT_ID_BERSERKMED
@@ -1416,14 +1416,14 @@
required = /obj/item/slime_extract/ruby
-/decl/chemical_reaction/instant/slime/ruby_push
+/datum/decl/chemical_reaction/instant/slime/ruby_push
name = "Slime Push"
id = "m_ruby_push"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
-/decl/chemical_reaction/instant/slime/ruby_push/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_push/on_reaction(var/datum/reagents/holder)
var/location = get_turf(holder.my_atom)
for(var/X in orange(3, location))
var/atom/movable/AM = X
@@ -1453,14 +1453,14 @@
slime_type = /mob/living/simple_mob/slime/xenobio/emerald
-/decl/chemical_reaction/instant/slime/emerald_agility
+/datum/decl/chemical_reaction/instant/slime/emerald_agility
name = "Slime Agility"
id = "m_emerald_agility"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/emerald
-/decl/chemical_reaction/instant/slime/emerald_agility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/emerald_agility/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_agility, 10 MINUTES, src)
..()
@@ -1479,14 +1479,14 @@
disable_duration_percent = 0.5
-/decl/chemical_reaction/instant/slime/emerald_speed
+/datum/decl/chemical_reaction/instant/slime/emerald_speed
name = "Slime Speed"
id = "m_emerald_speed"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/emerald
-/decl/chemical_reaction/instant/slime/emerald_speed/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/emerald_speed/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_speed, 1 MINUTE, src)
..()
@@ -1503,7 +1503,7 @@
slowdown = -3
-/decl/chemical_reaction/instant/slime/emerald_hyperzine
+/datum/decl/chemical_reaction/instant/slime/emerald_hyperzine
name = "Slime Hyperzine"
id = "m_emerald_hyperzine"
result = REAGENT_ID_HYPERZINE
@@ -1512,14 +1512,14 @@
required = /obj/item/slime_extract/emerald
-/decl/chemical_reaction/instant/slime/emerald_hell
+/datum/decl/chemical_reaction/instant/slime/emerald_hell
name = "Slime Hell"
id = "m_emerald_hell"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/emerald
-/decl/chemical_reaction/instant/slime/emerald_hell/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/emerald_hell/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Emerald extract reaction (slip hell) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
for(var/turf/simulated/T in trange(5, get_turf(holder.my_atom)))
if(!istype(T))
@@ -1541,50 +1541,50 @@
slime_type = /mob/living/simple_mob/slime/xenobio/light_pink
-/decl/chemical_reaction/instant/slime/light_pink_friendship
+/datum/decl/chemical_reaction/instant/slime/light_pink_friendship
name = "Slime Friendship"
id = "m_lightpink_friendship"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/decl/chemical_reaction/instant/slime/light_pink_friendship/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_friendship/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/friendship(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/light_pink_loyalty
+/datum/decl/chemical_reaction/instant/slime/light_pink_loyalty
name = "Slime Loyalty"
id = "m_lightpink_loyalty"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/decl/chemical_reaction/instant/slime/light_pink_loyalty/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_loyalty/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/loyalty(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/light_pink_docility
+/datum/decl/chemical_reaction/instant/slime/light_pink_docility
name = "Slime Docility"
id = "m_lightpink_docility"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/decl/chemical_reaction/instant/slime/light_pink_docility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_docility/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/docility(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/light_pink_obedience
+/datum/decl/chemical_reaction/instant/slime/light_pink_obedience
name = "Slime Obedience"
id = "m_lightpink_obedience"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/decl/chemical_reaction/instant/slime/light_pink_obedience/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_obedience/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/obedience(get_turf(holder.my_atom))
..()
@@ -1601,14 +1601,14 @@
slime_type = /mob/living/simple_mob/slime/xenobio/rainbow
-/decl/chemical_reaction/instant/slime/rainbow_random_slime
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_slime
name = "Slime Random Slime"
id = "m_rainow_random_slime"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/decl/chemical_reaction/instant/slime/rainbow_random_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_slime/on_reaction(var/datum/reagents/holder)
var/mob/living/simple_mob/slime/xenobio/S
var/list/slime_types = typesof(/mob/living/simple_mob/slime/xenobio)
@@ -1625,39 +1625,39 @@
..()
-/decl/chemical_reaction/instant/slime/rainbow_random_extract
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_extract
name = "Slime Random Extract"
id = "m_rainow_random_extract"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/decl/chemical_reaction/instant/slime/rainbow_random_extract/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_extract/on_reaction(var/datum/reagents/holder)
var/spawn_type = pickweight(GLOB.xenobio_rainbow_extracts)
new spawn_type(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/rainbow_colors
+/datum/decl/chemical_reaction/instant/slime/rainbow_colors
name = "Slime Colors"
id = "m_rainbow_colors"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/decl/chemical_reaction/instant/slime/rainbow_colors/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_colors/on_reaction(var/datum/reagents/holder)
for(var/mob/living/carbon/human/H in range(3, holder.my_atom))
H.druggy = max(H.druggy, 30)
..()
-/decl/chemical_reaction/instant/slime/rainbow_unity
+/datum/decl/chemical_reaction/instant/slime/rainbow_unity
name = "Slime Unity"
id = "m_rainbow_unity"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/unity(get_turf(holder.my_atom))
..()
diff --git a/code/modules/xgm/xgm_gas_data.dm b/code/modules/xgm/xgm_gas_data.dm
index 2ebb0e0da3..ef3df3a3e0 100644
--- a/code/modules/xgm/xgm_gas_data.dm
+++ b/code/modules/xgm/xgm_gas_data.dm
@@ -18,8 +18,8 @@ GLOBAL_DATUM_INIT(gas_data, /datum/xgm_gas_data, new())
/datum/xgm_gas_data/New()
. = ..()
- for(var/p in subtypesof(/decl/xgm_gas))
- var/decl/xgm_gas/gas = new p //avoid initial() because of potential New() actions
+ for(var/p in subtypesof(/datum/decl/xgm_gas))
+ var/datum/decl/xgm_gas/gas = new p //avoid initial() because of potential New() actions
if(gas.id in gases)
log_world("## ERROR Duplicate gas id `[gas.id]` in `[p]`")
@@ -38,7 +38,7 @@ GLOBAL_DATUM_INIT(gas_data, /datum/xgm_gas_data, new())
return 1
-/decl/xgm_gas
+/datum/decl/xgm_gas
var/id = ""
var/name = "Unnamed Gas"
var/specific_heat = 20 // J/(mol*K)
diff --git a/code/unit_tests/integrated_circuits/prefabs.dm b/code/unit_tests/integrated_circuits/prefabs.dm
index 95d1476364..a844837f08 100644
--- a/code/unit_tests/integrated_circuits/prefabs.dm
+++ b/code/unit_tests/integrated_circuits/prefabs.dm
@@ -3,9 +3,9 @@
/datum/unit_test/integrated_circuit_prefabs_shall_respect_complexity_and_size_contraints/start_test()
var/list/failed_prefabs = list()
- var/list/prefab_types = decls_repository.get_decls_of_subtype(/decl/prefab/ic_assembly)
+ var/list/prefab_types = decls_repository.get_decls_of_subtype(/datum/decl/prefab/ic_assembly)
for(var/prefab_type in prefab_types)
- var/decl/prefab/ic_assembly/prefab = prefab_types[prefab_type]
+ var/datum/decl/prefab/ic_assembly/prefab = prefab_types[prefab_type]
var/obj/item/electronic_assembly/assembly = prefab.assembly_type
var/available_size = initial(assembly.max_components)
@@ -33,9 +33,9 @@
/datum/unit_test/integrated_circuit_prefabs_shall_not_fail_to_create/start_test()
var/list/failed_prefabs = list()
- var/list/prefab_types = decls_repository.get_decls_of_subtype(/decl/prefab/ic_assembly)
+ var/list/prefab_types = decls_repository.get_decls_of_subtype(/datum/decl/prefab/ic_assembly)
for(var/prefab_type in prefab_types)
- var/decl/prefab/ic_assembly/prefab = prefab_types[prefab_type]
+ var/datum/decl/prefab/ic_assembly/prefab = prefab_types[prefab_type]
try
var/built_item = prefab.create(get_standard_turf())
if(built_item)
diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm
index 03b0fbfe82..3cd014b521 100644
--- a/maps/offmap_vr/om_ships/aro2.dmm
+++ b/maps/offmap_vr/om_ships/aro2.dmm
@@ -372,7 +372,7 @@
/obj/structure/sign/poster{
dir = 1;
icon_state = "";
- poster_decl = "/decl/poster/vore_2"
+ poster_decl = "/datum/decl/poster/vore_2"
},
/turf/simulated/wall,
/area/aro2/cockpit)
diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm
index 6e580d10ae..547e80c333 100644
--- a/maps/offmap_vr/talon/talon_v2.dm
+++ b/maps/offmap_vr/talon/talon_v2.dm
@@ -372,7 +372,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_captain
name = "talon captain's locker"
req_access = list(ACCESS_TALON_BRIDGE)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/captain
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/captain
starts_with = list(
/obj/item/storage/backpack/dufflebag/captain,
@@ -390,7 +390,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_guard
name = "talon guard's locker"
req_access = list(ACCESS_TALON_SECURITY)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/guard
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/guard
starts_with = list(
/obj/item/clothing/suit/armor/pcarrier/light,
@@ -417,7 +417,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_doctor
name = "talon doctor's locker"
req_access = list(ACCESS_TALON_MEDICAL)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/doctor
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/doctor
starts_with = list(
/obj/item/clothing/under/rank/medical,
@@ -437,7 +437,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_engineer
name = "talon engineer's locker"
req_access = list(ACCESS_TALON_ENGINEER)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/engineer
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/engineer
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
@@ -459,7 +459,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_pilot
name = "talon pilot's locker"
req_access = list(ACCESS_TALON_PILOT)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/pilot
starts_with = list(
/obj/item/material/knife/tacknife/survival,
@@ -486,7 +486,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_miner
name = "talon miner's locker"
req_access = list(ACCESS_TALON_CARGO)
- closet_appearance = /decl/closet_appearance/secure_closet/talon/miner
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/talon/miner
starts_with = list(
/obj/item/radio/headset/talon,
diff --git a/maps/submaps/pois_vr/debris_field/mining_drones.dmm b/maps/submaps/pois_vr/debris_field/mining_drones.dmm
index 7c07ce2a45..452c326660 100644
--- a/maps/submaps/pois_vr/debris_field/mining_drones.dmm
+++ b/maps/submaps/pois_vr/debris_field/mining_drones.dmm
@@ -84,7 +84,7 @@
"q" = (
/obj/structure/sign/poster{
pixel_y = 32;
- poster_decl = "/decl/poster/bay_50"
+ poster_decl = "/datum/decl/poster/bay_50"
},
/turf/simulated/floor/airless,
/area/submap/debrisfield/mining_outpost)
diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm
index 1d4fdb048e..094fd355f6 100644
--- a/maps/tether/tether_jobs.dm
+++ b/maps/tether/tether_jobs.dm
@@ -16,7 +16,7 @@
departments_managed = list(DEPARTMENT_TALON)
job_description = "The captain's job is to generate profit through trade or other means such as salvage or even privateering."
supervisors = "yourself"
- outfit_type = /decl/hierarchy/outfit/job/talon_captain
+ outfit_type = /datum/decl/hierarchy/outfit/job/talon_captain
offmap_spawn = TRUE
faction = FACTION_STATION //Required for SSjob to allow people to join as it
@@ -43,7 +43,7 @@
department_flag = TALON
job_description = "The doctor's job is to make sure the crew of the ITV Talon remain in good health and to monitor them when away from the ship."
supervisors = "the ITV Talon's captain"
- outfit_type = /decl/hierarchy/outfit/job/talon_doctor
+ outfit_type = /datum/decl/hierarchy/outfit/job/talon_doctor
offmap_spawn = TRUE
faction = FACTION_STATION //Required for SSjob to allow people to join as it
@@ -70,7 +70,7 @@
department_flag = TALON
job_description = "The engineer's job is to ensure the ITV Talon remains in tip-top shape and to repair any damage as well as manage the shields."
supervisors = "the ITV Talon's captain"
- outfit_type = /decl/hierarchy/outfit/job/talon_engineer
+ outfit_type = /datum/decl/hierarchy/outfit/job/talon_engineer
offmap_spawn = TRUE
faction = FACTION_STATION //Required for SSjob to allow people to join as it
@@ -97,7 +97,7 @@
department_flag = TALON
job_description = "The pilot's job is to fly the ITV Talon in the most efficient and profitable way possible."
supervisors = "the ITV Talon's captain"
- outfit_type = /decl/hierarchy/outfit/job/talon_pilot
+ outfit_type = /datum/decl/hierarchy/outfit/job/talon_pilot
offmap_spawn = TRUE
faction = FACTION_STATION //Required for SSjob to allow people to join as it
@@ -124,7 +124,7 @@
department_flag = TALON
job_description = "The guard's job is to keep the crew of the ITV Talon safe and ensure the captain's wishes are carried out."
supervisors = "the ITV Talon's captain"
- outfit_type = /decl/hierarchy/outfit/job/talon_security
+ outfit_type = /datum/decl/hierarchy/outfit/job/talon_security
offmap_spawn = TRUE
faction = FACTION_STATION //Required for SSjob to allow people to join as it
@@ -150,7 +150,7 @@
department_flag = TALON
job_description = "The miner's job is to excavate ores and refine them for the Talon's use, as well as for trading."
supervisors = "the ITV Talon's captain"
- outfit_type = /decl/hierarchy/outfit/job/talon_miner
+ outfit_type = /datum/decl/hierarchy/outfit/job/talon_miner
offmap_spawn = TRUE
faction = FACTION_STATION //Required for SSjob to allow people to join as it
@@ -173,7 +173,7 @@
//////////////////////TALON OUTFITS//////////////////////
-/decl/hierarchy/outfit/job/talon_captain
+/datum/decl/hierarchy/outfit/job/talon_captain
name = OUTFIT_JOB_NAME(JOB_TALON_CAPTAIN)
id_type = /obj/item/card/id/talon/captain
@@ -190,7 +190,7 @@
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
-/decl/hierarchy/outfit/job/talon_pilot
+/datum/decl/hierarchy/outfit/job/talon_pilot
name = OUTFIT_JOB_NAME(JOB_TALON_PILOT)
id_type = /obj/item/card/id/talon/pilot
@@ -213,9 +213,9 @@
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
-/decl/hierarchy/outfit/job/talon_doctor
+/datum/decl/hierarchy/outfit/job/talon_doctor
name = OUTFIT_JOB_NAME(JOB_TALON_DOCTOR)
- hierarchy_type = /decl/hierarchy/outfit/job
+ hierarchy_type = /datum/decl/hierarchy/outfit/job
id_type = /obj/item/card/id/talon/doctor
id_slot = slot_wear_id
@@ -237,9 +237,9 @@
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
-/decl/hierarchy/outfit/job/talon_security
+/datum/decl/hierarchy/outfit/job/talon_security
name = OUTFIT_JOB_NAME(JOB_ALT_TALON_SECURITY)
- hierarchy_type = /decl/hierarchy/outfit/job
+ hierarchy_type = /datum/decl/hierarchy/outfit/job
id_type = /obj/item/card/id/talon/officer
id_slot = slot_wear_id
@@ -261,9 +261,9 @@
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
-/decl/hierarchy/outfit/job/talon_engineer
+/datum/decl/hierarchy/outfit/job/talon_engineer
name = OUTFIT_JOB_NAME(JOB_TALON_ENGINEER)
- hierarchy_type = /decl/hierarchy/outfit/job
+ hierarchy_type = /datum/decl/hierarchy/outfit/job
id_type = /obj/item/card/id/talon/engineer
id_slot = slot_wear_id
@@ -286,9 +286,9 @@
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
-/decl/hierarchy/outfit/job/talon_miner
+/datum/decl/hierarchy/outfit/job/talon_miner
name = OUTFIT_JOB_NAME(JOB_TALON_MINER)
- hierarchy_type = /decl/hierarchy/outfit/job
+ hierarchy_type = /datum/decl/hierarchy/outfit/job
id_type = /obj/item/card/id/talon/miner
id_slot = slot_wear_id
diff --git a/modular_chomp/code/ZAS/Fire.dm b/modular_chomp/code/ZAS/Fire.dm
index 126f33e94c..cccbf6def3 100644
--- a/modular_chomp/code/ZAS/Fire.dm
+++ b/modular_chomp/code/ZAS/Fire.dm
@@ -89,7 +89,7 @@
if(air_contents.temperature < FIRE_MAX_TEMP) // May as well limit this
var/starting_energy = air_contents.temperature * air_contents.heat_capacity()
if(starting_energy > 0)
- air_contents.temperature = min((starting_energy + vsc.fire_fuel_energy_release * (gas_exchange * 1.025)) / air_contents.heat_capacity(), FIRE_MAX_TEMP)
+ air_contents.temperature = min((starting_energy + GLOB.vsc.fire_fuel_energy_release * (gas_exchange * 1.025)) / air_contents.heat_capacity(), FIRE_MAX_TEMP)
air_contents.update_values()
// Affect contents
diff --git a/modular_chomp/code/datums/outfits/jobs/command.dm b/modular_chomp/code/datums/outfits/jobs/command.dm
index b6e16b9583..339f8fa68d 100644
--- a/modular_chomp/code/datums/outfits/jobs/command.dm
+++ b/modular_chomp/code/datums/outfits/jobs/command.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/job/bridge_officer
+/datum/decl/hierarchy/outfit/job/bridge_officer
name = OUTFIT_JOB_NAME("Bridge Officer")
uniform = /obj/item/clothing/under/utility
shoes = /obj/item/clothing/shoes/boots/winter/explorer
diff --git a/modular_chomp/code/datums/outfits/jobs/noncrew.dm b/modular_chomp/code/datums/outfits/jobs/noncrew.dm
index c4479f615f..43694c6ce8 100644
--- a/modular_chomp/code/datums/outfits/jobs/noncrew.dm
+++ b/modular_chomp/code/datums/outfits/jobs/noncrew.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/noncrew
+/datum/decl/hierarchy/outfit/noncrew
name = OUTFIT_JOB_NAME(JOB_OUTSIDER)
//hierarchy_type = /decl/hierarchy/outfit/noncrew
uniform = /obj/item/clothing/under/primitive
@@ -15,14 +15,14 @@
headset_alt = /obj/item/radio/headset/outsider
headset_earbud = /obj/item/radio/headset/outsider
-/decl/hierarchy/outfit/noncrew/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/noncrew/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/spacecash/ewallet/wallet = H.r_store
if(istype(wallet))
wallet.owner_name = H.real_name
wallet.worth = 1000
-/decl/hierarchy/outfit/noncrew/spacefarer
+/datum/decl/hierarchy/outfit/noncrew/spacefarer
name = OUTFIT_JOB_NAME("Spacefarer")
uniform = /obj/item/clothing/under/rank/pilot2
shoes = /obj/item/clothing/shoes/boots/jackboots/
@@ -32,7 +32,7 @@
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
-/decl/hierarchy/outfit/shadekin
+/datum/decl/hierarchy/outfit/shadekin
name = OUTFIT_JOB_NAME(JOB_ANOMALY)
//hierarchy_type = /decl/hierarchy/outfit/noncrew
uniform = /obj/item/clothing/under/primitive
@@ -45,7 +45,7 @@
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
-/decl/hierarchy/outfit/shadekin/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/shadekin/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/spacecash/ewallet/wallet = H.r_store
if(istype(wallet))
diff --git a/modular_chomp/code/datums/outfits/jobs/security.dm b/modular_chomp/code/datums/outfits/jobs/security.dm
index 5727d5fb29..b5d29e7261 100644
--- a/modular_chomp/code/datums/outfits/jobs/security.dm
+++ b/modular_chomp/code/datums/outfits/jobs/security.dm
@@ -1,4 +1,4 @@
-/decl/hierarchy/outfit/job/security/brigphysician
+/datum/decl/hierarchy/outfit/job/security/brigphysician
name = OUTFIT_JOB_NAME(JOB_BRIG_PHYSICIAN)
uniform = /obj/item/clothing/under/rank/brigphys
id_type = /obj/item/card/id/security/brigphysician
diff --git a/modular_chomp/code/game/jobs/job/captain.dm b/modular_chomp/code/game/jobs/job/captain.dm
index 645fbf717d..3526c21529 100644
--- a/modular_chomp/code/game/jobs/job/captain.dm
+++ b/modular_chomp/code/game/jobs/job/captain.dm
@@ -6,4 +6,4 @@
/datum/alt_title/bridge_officer
title = JOB_ALT_BRIDGE_OFFICER
- title_outfit = /decl/hierarchy/outfit/job/bridge_officer
+ title_outfit = /datum/decl/hierarchy/outfit/job/bridge_officer
diff --git a/modular_chomp/code/game/jobs/job/entertainer_alts.dm b/modular_chomp/code/game/jobs/job/entertainer_alts.dm
index 7e7e6ea089..a401e9f7d9 100644
--- a/modular_chomp/code/game/jobs/job/entertainer_alts.dm
+++ b/modular_chomp/code/game/jobs/job/entertainer_alts.dm
@@ -3,7 +3,7 @@
/datum/alt_title/clown
title = JOB_CLOWN
title_blurb = "A " + JOB_CLOWN + " is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!"
- title_outfit = /decl/hierarchy/outfit/job/clown
+ title_outfit = /datum/decl/hierarchy/outfit/job/clown
/datum/alt_title/clown/jester
title = JOB_ALT_JESTER
@@ -14,7 +14,7 @@
/datum/alt_title/mime
title = JOB_MIME
title_blurb = "A " + JOB_MIME + " is there to entertain the crew and keep high morale using unbelievable performances and acting skills!"
- title_outfit = /decl/hierarchy/outfit/job/mime
+ title_outfit = /datum/decl/hierarchy/outfit/job/mime
/datum/alt_title/mime/poseur
title = JOB_ALT_PASEUR
diff --git a/modular_chomp/code/game/jobs/job/noncrew.dm b/modular_chomp/code/game/jobs/job/noncrew.dm
index 837f104ec7..4a3b4e6fda 100644
--- a/modular_chomp/code/game/jobs/job/noncrew.dm
+++ b/modular_chomp/code/game/jobs/job/noncrew.dm
@@ -13,7 +13,7 @@
account_allowed = 0
offmap_spawn = TRUE
- outfit_type = /decl/hierarchy/outfit/noncrew
+ outfit_type = /datum/decl/hierarchy/outfit/noncrew
job_description = {"Players taking a role of an outsider not employed by NT with no special mechanics. One superpose pod is provided.
-----Server rules still apply to the fullest
-----Outsiders are considered unauthorized personnel on Southern Cross.
@@ -28,7 +28,7 @@
/datum/alt_title/spacefarer
title = "Spacefarer"
- title_outfit = /decl/hierarchy/outfit/noncrew/spacefarer
+ title_outfit = /datum/decl/hierarchy/outfit/noncrew/spacefarer
/*seems to be a kin only thing?
/datum/job/noncrew/is_species_banned(species_name, brain_type)
@@ -52,7 +52,7 @@
offmap_spawn = TRUE
camp_protection = TRUE //So far leave this for shadekin
- outfit_type = /decl/hierarchy/outfit/noncrew
+ outfit_type = /datum/decl/hierarchy/outfit/noncrew
job_description = {"Players taking a role of an outsider not employed by NT with no special mechanics. One superpose pod is provided.
-----Server rules still apply to the fullest
-----Outsiders are considered unauthorized personnel on Southern Cross.
diff --git a/modular_chomp/code/game/objects/items/devices/radio/headset.dm b/modular_chomp/code/game/objects/items/devices/radio/headset.dm
index 7ada489dbf..b754428774 100644
--- a/modular_chomp/code/game/objects/items/devices/radio/headset.dm
+++ b/modular_chomp/code/game/objects/items/devices/radio/headset.dm
@@ -37,7 +37,7 @@
H.add_overlay(effect_overlay)
if(spells.len)
for(var/thing in spells)
- var/spell/SP = new thing(H)
+ var/datum/spell/SP = new thing(H)
H.add_spell(SP)
remove_spells += SP
if(slowdown_to_set != 0)
@@ -55,7 +55,7 @@
if(effect_icon)
H.cut_overlay(effect_overlay)
if(remove_spells.len)
- for(var/spell/SP in remove_spells)
+ for(var/datum/spell/SP in remove_spells)
H.remove_spell(SP)
qdel(SP)
if(slowdown_to_set != 0)
diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm b/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
index 25d4914068..cab78bb384 100644
--- a/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
+++ b/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
@@ -11,7 +11,7 @@
desc = "Salty and gritty."
icon_state = "sand0"
edge_blending_priority = 2
- initial_flooring = /decl/flooring/desert_planet/sand
+ initial_flooring = /datum/decl/flooring/desert_planet/sand
// Necessary to get the edges to generate correctly since we use a random-ish icon_state. Inelegant to hard code, but this is a one-off case.
/turf/simulated/floor/outdoors/desert_planet/sand/get_edge_icon_state()
@@ -39,7 +39,7 @@
icon_state = "deep_sand0"
edge_blending_priority = 1
movement_cost = 3
- initial_flooring = /decl/flooring/desert_planet/deep_sand
+ initial_flooring = /datum/decl/flooring/desert_planet/deep_sand
/turf/simulated/floor/outdoors/desert_planet/deep_sand/Initialize(mapload)
. = ..()
@@ -50,28 +50,28 @@
desc = "Lively green grass, soft to walk on."
icon_state = "grass"
edge_blending_priority = 5
- initial_flooring = /decl/flooring/desert_planet/grass
+ initial_flooring = /datum/decl/flooring/desert_planet/grass
/turf/simulated/floor/outdoors/desert_planet/deep_grass
name = "dense grass"
desc = "Dense patch of grass, seems like a soft spot to lay on."
icon_state = "deep_grass"
edge_blending_priority = 6
- initial_flooring = /decl/flooring/desert_planet/deep_grass
+ initial_flooring = /datum/decl/flooring/desert_planet/deep_grass
/turf/simulated/floor/outdoors/desert_planet/gravel
name = "gravel"
desc = "Mix of dirt and sand, it crumbles in your hand."
icon_state = "gravel"
edge_blending_priority = 3
- initial_flooring = /decl/flooring/desert_planet/gravel
+ initial_flooring = /datum/decl/flooring/desert_planet/gravel
/turf/simulated/floor/outdoors/desert_planet/mud
name = "mud"
desc = "Squishy damp dirt, smells muddy."
icon_state = "mud"
edge_blending_priority = 4
- initial_flooring = /decl/flooring/desert_planet/mud
+ initial_flooring = /datum/decl/flooring/desert_planet/mud
// At last we've come full circle, a floor which is actually a wall.
/turf/simulated/floor/outdoors/desert_planet/stonewall
@@ -81,7 +81,7 @@
density = TRUE
opacity = TRUE
edge_blending_priority = 7
- initial_flooring = /decl/flooring/desert_planet/stonewall
+ initial_flooring = /datum/decl/flooring/desert_planet/stonewall
//turf_layers = list(/turf/simulated/floor/outdoors/rocks)
demote_to = /turf/simulated/floor/outdoors/rocks
var/last_act = 0
@@ -119,53 +119,53 @@
icon_state = "sandrock"
density = TRUE
opacity = TRUE
- initial_flooring = /decl/flooring/desert_planet/sandrock
+ initial_flooring = /datum/decl/flooring/desert_planet/sandrock
// Declarations (for initial_flooring)
-/decl/flooring/desert_planet // Yeah don't use this one, it's a parent just for setting icon.
+/datum/decl/flooring/desert_planet // Yeah don't use this one, it's a parent just for setting icon.
name = "desert stuff"
desc = "If you see this, this turf is using the wrong decl."
icon = 'modular_chomp/icons/turf/desert_tiles.dmi'
icon_base = null
-/decl/flooring/desert_planet/sand
+/datum/decl/flooring/desert_planet/sand
name = "sand"
desc = "Salty and gritty."
icon_base = "sand"
has_base_range = 2
-/decl/flooring/desert_planet/deep_sand
+/datum/decl/flooring/desert_planet/deep_sand
name = "sand"
desc = "Really gets everywhere."
icon_base = "deep_sand"
has_base_range = 2
-/decl/flooring/desert_planet/grass
+/datum/decl/flooring/desert_planet/grass
name = "grass"
desc = "Lively green grass, soft to walk on."
icon_base = "grass"
-/decl/flooring/desert_planet/deep_grass
+/datum/decl/flooring/desert_planet/deep_grass
name = "dense grass"
desc = "Dense patch of grass, seems like a soft spot to lay on."
icon_base = "deep_grass"
-/decl/flooring/desert_planet/gravel
+/datum/decl/flooring/desert_planet/gravel
name = "gravel"
desc = "Mix of dirt and sand, it crumbles in your hand."
icon_base = "gravel"
-/decl/flooring/desert_planet/mud
+/datum/decl/flooring/desert_planet/mud
name = "mud"
desc = "Squishy damp dirt, smells muddy."
icon_base = "mud"
-/decl/flooring/desert_planet/stonewall
+/datum/decl/flooring/desert_planet/stonewall
name = "sandstone"
desc = "Rough sandstone."
icon_base = "stonewall"
-/decl/flooring/desert_planet/sandrock
+/datum/decl/flooring/desert_planet/sandrock
name = "sandstone tiles"
desc = "Tightly joined in a mesmerizing lattice."
icon_base = "sandrock"
diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm
index 9a6668277a..920ce0a9ba 100644
--- a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm
+++ b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm
@@ -18,7 +18,7 @@
density = TRUE
opacity = TRUE
edge_blending_priority = 7
- initial_flooring = /decl/flooring/lavaland/ashrock
+ initial_flooring = /datum/decl/flooring/lavaland/ashrock
//turf_layers = list(/turf/simulated/floor/outdoors/lavaland/ash)
demote_to = /turf/simulated/floor/outdoors/lavaland/ash
var/last_act = 0
@@ -49,7 +49,7 @@
demote() // Converts the turf to the next layer in turf_layers.
..()
-/decl/flooring/lavaland/ashrock
+/datum/decl/flooring/lavaland/ashrock
name = "ash covered stone"
desc = "Stone that's covered in a thin layer of ash."
icon_base = "ashrock"
@@ -58,13 +58,13 @@
/turf/simulated/floor/outdoors/lavaland/basalt
icon_state = "basalt0"
edge_blending_priority = 3
- initial_flooring = /decl/flooring/basalt
+ initial_flooring = /datum/decl/flooring/basalt
//turf_layers = list(/turf/simulated/floor/outdoors/lavaland/ash)
demote_to = /turf/simulated/floor/outdoors/lavaland/ash
/turf/simulated/floor/outdoors/lavaland/basalt/get_edge_icon_state()
return "basalt0"
-/decl/flooring/basalt
+/datum/decl/flooring/basalt
name = "basalt"
desc = "A hard cracked black rock formed from rapidly cooling lava."
icon = 'modular_chomp/icons/turf/lava_land.dmi'
diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/valley.dm b/modular_chomp/code/game/turfs/simulated/outdoors/valley.dm
index 3e94c34372..504bb3f854 100644
--- a/modular_chomp/code/game/turfs/simulated/outdoors/valley.dm
+++ b/modular_chomp/code/game/turfs/simulated/outdoors/valley.dm
@@ -7,7 +7,7 @@
grass_chance = 3
- initial_flooring = /decl/flooring/grass/sif
+ initial_flooring = /datum/decl/flooring/grass/sif
animals = "valley"
@@ -22,7 +22,7 @@
grass_chance = 3
- initial_flooring = /decl/flooring/dirt
+ initial_flooring = /datum/decl/flooring/dirt
animals = "valleyedge"
@@ -40,20 +40,20 @@
grass_chance = 15
- initial_flooring = /decl/flooring/dirt
+ initial_flooring = /datum/decl/flooring/dirt
animals = "sifcave"
grass = "sifcave"
/*
-/decl/flooring/grass/sif/valleycave
+/datum/decl/flooring/grass/sif/valleycave
icon = ""
icon_state = "bordercolorcee"
-/decl/flooring/grass/sif/valleyedge
+/datum/decl/flooring/grass/sif/valleyedge
-/decl/flooring/grass/sif/valley
+/datum/decl/flooring/grass/sif/valley
*/
diff --git a/modular_chomp/code/modules/emotes/definitions/audiable.dm b/modular_chomp/code/modules/emotes/definitions/audiable.dm
index 4efa2d06f9..f7482c6e21 100644
--- a/modular_chomp/code/modules/emotes/definitions/audiable.dm
+++ b/modular_chomp/code/modules/emotes/definitions/audiable.dm
@@ -1,7 +1,7 @@
-/decl/emote/audible/wheeze
+/datum/decl/emote/audible/wheeze
emote_sound = 'sound/voice/wheeze.ogg'
-/decl/emote/audible/prbt2
+/datum/decl/emote/audible/prbt2
key = "prbt2"
emote_message_1p = "You prbt."
emote_message_3p = "prbts."
@@ -9,7 +9,7 @@
emote_message_3p_target = "prbts at TARGET."
emote_sound = 'sound/voice/prbt2.ogg'
-/decl/emote/audible/gasp/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/gasp/get_emote_sound(var/atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -27,7 +27,7 @@
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
)
-/decl/emote/audible/mgeow
+/datum/decl/emote/audible/mgeow
key = "mgeow"
emote_message_1p = "You mgeow."
emote_message_3p = "mgeows."
@@ -35,7 +35,7 @@
emote_message_3p_target = "mgeow at TARGET."
emote_sound = 'sound/voice/mgeow.ogg'
-/decl/emote/audible/xenogrowl
+/datum/decl/emote/audible/xenogrowl
key = "xenogrowl"
emote_message_1p = "You growl unnervingly."
emote_message_3p = "growls unnervingly."
@@ -43,7 +43,7 @@
emote_message_3p_target = "growls unnervingly at TARGET."
emote_sound = 'sound/voice/emotes/xenogrowl.ogg'
-/decl/emote/audible/xenohiss
+/datum/decl/emote/audible/xenohiss
key = "xenohiss"
emote_message_1p = "You hiss unnervingly."
emote_message_3p = "hisses unnervingly."
@@ -51,7 +51,7 @@
emote_message_3p_target = "hisses unnervingly at TARGET."
emote_sound = 'sound/voice/emotes/xenohiss.ogg'
-/decl/emote/audible/xenopurr
+/datum/decl/emote/audible/xenopurr
key = "xenopurr"
emote_message_1p = "You purr unnervingly."
emote_message_3p = "purrs unnervingly."
@@ -59,7 +59,7 @@
emote_message_3p_target = "purrs unnervingly at TARGET."
emote_sound = 'sound/voice/emotes/xenopurr.ogg'
-/decl/emote/audible/gwah
+/datum/decl/emote/audible/gwah
key = "gwah"
emote_message_1p = "You gwah."
emote_message_3p = "gwahs."
@@ -67,7 +67,7 @@
emote_message_3p_target = "gwahs at TARGET."
emote_sound = 'sound/voice/emotes/gwah.ogg'
-/decl/emote/audible/wawa
+/datum/decl/emote/audible/wawa
key = "wawa"
emote_message_1p = "You wawa."
emote_message_3p = "wawas."
@@ -75,11 +75,11 @@
emote_message_3p_target = "wawas at TARGET."
emote_sound = 'sound/voice/emotes/wawa.ogg'
-/decl/emote/audible/scientist //placeholder, do not use in anything
+/datum/decl/emote/audible/scientist //placeholder, do not use in anything
key = "hlscientist"
emote_message_3p = "does science."
-/decl/emote/audible/scientist/scream
+/datum/decl/emote/audible/scientist/scream
key = "hlscream"
emote_message_1p = "You scream."
emote_message_3p = "screams."
@@ -93,7 +93,7 @@
'sound/voice/scream/scientist/scream25.ogg',
)
-/decl/emote/audible/scientist/pain
+/datum/decl/emote/audible/scientist/pain
key = "hlpain"
emote_message_1p = "You shout in pain."
emote_message_3p = "shouts in pain."
@@ -105,11 +105,11 @@
'sound/voice/pain/scientist/sci_pain5.ogg',
)
-/decl/emote/audible/scientist/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/scientist/get_emote_sound(var/atom/user)
. = ..()
.["vol"] *= 0.4 //these boys are pretty loud on their own lol
-/decl/emote/audible/yip // sounds sourced from: https://introdile.itch.io/kobold-generator with permission from the creator
+/datum/decl/emote/audible/yip // sounds sourced from: https://introdile.itch.io/kobold-generator with permission from the creator
key = "yip"
emote_message_1p = "You yip."
emote_message_3p = "yips!"
@@ -121,7 +121,7 @@
'sound/voice/emotes/yip3.ogg',
)
-/decl/emote/audible/squeal // Sound sourced from: https://github.com/Baystation12/Baystation12/blob/bd2f0bd5e38cf2bb0888e3ae879708bed20243b4/sound/voice/LizardSqueal.ogg, licensed Creative Commons 3.0 BY-SA.
+/datum/decl/emote/audible/squeal // Sound sourced from: https://github.com/Baystation12/Baystation12/blob/bd2f0bd5e38cf2bb0888e3ae879708bed20243b4/sound/voice/LizardSqueal.ogg, licensed Creative Commons 3.0 BY-SA.
key = "squeal"
emote_message_1p = "You squeal."
emote_message_3p = "squeals."
@@ -129,7 +129,7 @@
emote_message_3p_target = "squeals at TARGET."
emote_sound = 'sound/voice/emotes/squealemote.ogg'
-/decl/emote/audible/tailthump // Sound sourced from https://freesound.org/s/389665/ Licensed Creative Commons 0
+/datum/decl/emote/audible/tailthump // Sound sourced from https://freesound.org/s/389665/ Licensed Creative Commons 0
key = "tailthump"
emote_message_1p = "You thump your tail."
emote_message_3p = "thumps their tail."
diff --git a/modular_chomp/code/modules/emotes/definitions/audible_pain.dm b/modular_chomp/code/modules/emotes/definitions/audible_pain.dm
index 6a9ef0f319..2735f2ee08 100644
--- a/modular_chomp/code/modules/emotes/definitions/audible_pain.dm
+++ b/modular_chomp/code/modules/emotes/definitions/audible_pain.dm
@@ -1,9 +1,9 @@
-/decl/emote/audible/pain
+/datum/decl/emote/audible/pain
key = "pain"
emote_message_1p = "You yell in pain!"
emote_message_3p = "yells in pain!"
-/decl/emote/audible/pain/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/pain/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "You [pick(H.species.pain_verb_1p)] in pain!"
@@ -13,7 +13,7 @@
return "You [pick(M.pain_emote_1p)]!"
. = ..()
-/decl/emote/audible/pain/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/pain/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "[pick(H.species.pain_verb_3p)] in pain!"
@@ -23,7 +23,7 @@
return "[pick(M.pain_emote_3p)]!"
. = ..()
-/decl/emote/audible/pain/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/pain/get_emote_sound(var/atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/catslug.dm b/modular_chomp/code/modules/mob/living/simple_mob/catslug.dm
index ce986522ca..bfc31f18e0 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/catslug.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/catslug.dm
@@ -1,4 +1,4 @@
//Scug go wawa
/mob/living/simple_mob/vore/alienanimals/catslug/get_available_emotes()
. = ..()
- . |= /decl/emote/audible/wawa
+ . |= /datum/decl/emote/audible/wawa
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm
index 1761c86885..0143988d17 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm
@@ -23,7 +23,7 @@
description_info = "Who knows what will happen."
slime_type = /mob/living/simple_mob/slime/xenobio/sepia
-/decl/chemical_reaction/instant/slime/senseenhancer
+/datum/decl/chemical_reaction/instant/slime/senseenhancer
name = "Slime Sense Enhancer"
id = "sepia_sh"
result = REAGENT_ID_SENSEENHANCER
@@ -31,7 +31,7 @@
result_amount = 30
required = /obj/item/slime_extract/sepia
-/decl/chemical_reaction/instant/slime/secertslime
+/datum/decl/chemical_reaction/instant/slime/secertslime
name = "Secert Slime "
id = "sepia_swapm"
result = null
@@ -39,12 +39,12 @@
result_amount = 1
required = /obj/item/slime_extract/sepia
-/decl/chemical_reaction/instant/slime/secertslime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/secertslime/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with the mixture, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/redspace(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/sepia_new_slime
+/datum/decl/chemical_reaction/instant/slime/sepia_new_slime
name = "Slime Spawn"
id = "m_sepia_spawn"
result = null
@@ -52,7 +52,7 @@
result_amount = 1
required = /obj/item/slime_extract/sepia
-/decl/chemical_reaction/instant/slime/sepia_new_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sepia_new_slime/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with slime jelly, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/sepia(get_turf(holder.my_atom))
..()
@@ -82,7 +82,7 @@
slime_type = /mob/living/simple_mob/slime/xenobio/redspace
-/decl/chemical_reaction/instant/slime/redspace_fire
+/datum/decl/chemical_reaction/instant/slime/redspace_fire
name = "Slime Living Fire"
id = "m_liquid_fire"
result = REAGENT_ID_NEOLIQUIDFIRE
@@ -90,25 +90,25 @@
result_amount = 30
required = /obj/item/slime_extract/redspace
-/decl/chemical_reaction/instant/slime/soulstone
+/datum/decl/chemical_reaction/instant/slime/soulstone
name = "Slime Soulstone"
id = "m_redspace_soulstone"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/redspace
-/decl/chemical_reaction/instant/slime/soulstone/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soulstone/on_reaction(var/datum/reagents/holder)
new /obj/item/soulstone(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/obj/item/slime_extract/redspace_smoke
+/datum/decl/chemical_reaction/instant/slime/obj/item/slime_extract/redspace_smoke
name = "Slime Smoke"
id = "m_redspace_smoke"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/redspace
-/decl/chemical_reaction/instant/slime/redspace_smoke/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/redspace_smoke/on_reaction(var/datum/reagents/holder)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
@@ -119,7 +119,7 @@
..()
-/decl/chemical_reaction/instant/slime/slime_mindbreaker
+/datum/decl/chemical_reaction/instant/slime/slime_mindbreaker
name = "Slime Pyrotoxin"
id = "m_redspace_mindbreaker"
result = REAGENT_ID_MINDBREAKER
@@ -150,7 +150,7 @@
description_info = "A strange extract, seems inert. Maybe something strange can be done one day"
slime_type = /mob/living/simple_mob/slime/xenobio/dark
-/decl/chemical_reaction/instant/slime/dark_neofire
+/datum/decl/chemical_reaction/instant/slime/dark_neofire
name = "Slime Healing Liquid"
id = "m_liquid_healing"
result = REAGENT_ID_HEALINGNANITES
@@ -158,7 +158,7 @@
result_amount = 30
required = /obj/item/slime_extract/dark
-/decl/chemical_reaction/instant/slime/dark_liquidfire
+/datum/decl/chemical_reaction/instant/slime/dark_liquidfire
name = "Slime Secert Guard"
id = "m_slime_guardian"
required_reagents = list(REAGENT_ID_LIQUIDFIRE = 5)
@@ -166,66 +166,66 @@
required = /obj/item/slime_extract/dark
-/decl/chemical_reaction/instant/slime/dark_liquidfire/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_liquidfire/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/feysight, 10 MINUTES, src)
..()
-/decl/chemical_reaction/instant/slime/dark_deathblood
+/datum/decl/chemical_reaction/instant/slime/dark_deathblood
name = "Slime Secert Painite"
id = "m_slime_painite"
required_reagents = list(REAGENT_ID_DEATHBLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/dark
-/decl/chemical_reaction/instant/slime/dark_deathblood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_deathblood/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/painite(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/dark_liquidlife
+/datum/decl/chemical_reaction/instant/slime/dark_liquidlife
name = "Slime Secert Overcharge"
id = "m_slime_darkspeed"
required_reagents = list(REAGENT_ID_LIQUIDLIFE = 5)
result_amount = 1
required = /obj/item/slime_extract/dark
-/decl/chemical_reaction/instant/slime/dark_liquidfire/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_liquidfire/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(49, holder.my_atom))
L.add_modifier(/datum/modifier/sprinting, 5 MINUTES, src)
..()
-/decl/chemical_reaction/instant/slime/dark_carpotoxin
+/datum/decl/chemical_reaction/instant/slime/dark_carpotoxin
name = "Slime Dark Secert "
id = "m_fish_slime"
required_reagents = list(REAGENT_ID_CARPOTOXIN = 5)
result_amount = 1
required = /obj/item/slime_extract/dark
-/decl/chemical_reaction/instant/slime/dark_carpotoxin/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_carpotoxin/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with slime jelly, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/oceanic(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/dark_spidertoxin
+/datum/decl/chemical_reaction/instant/slime/dark_spidertoxin
name = "Slime Secert Dark Spooder"
id = "m_slime_darkspooder"
required_reagents = list(REAGENT_ID_SPIDERTOXIN = 5)
result_amount = 1
required = /obj/item/slime_extract/dark
-/decl/chemical_reaction/instant/slime/dark_deathblood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_deathblood/on_reaction(var/datum/reagents/holder)
new /obj/effect/spider/eggcluster/royal/space(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/dark_blood
+/datum/decl/chemical_reaction/instant/slime/dark_blood
name = "Slime Secert Void Opal"
id = "m_slime_voidopal"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/dark
-/decl/chemical_reaction/instant/slime/dark_blood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blood/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/void_opal(get_turf(holder.my_atom))
..()
@@ -250,7 +250,7 @@
description_info = "Who knows what will happen."
slime_type = /mob/living/simple_mob/slime/xenobio/plague
-/decl/chemical_reaction/instant/slime/plague_toxin
+/datum/decl/chemical_reaction/instant/slime/plague_toxin
name = "Slime Living Fire"
id = "m_plague_toxin"
result = REAGENT_ID_NEUROPHAGENANITES
@@ -259,18 +259,18 @@
required = /obj/item/slime_extract/plague
-/decl/chemical_reaction/instant/slime/virusdish
+/datum/decl/chemical_reaction/instant/slime/virusdish
name = "Virus dish"
id = "m_plague_dish"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/plague
-/decl/chemical_reaction/instant/slime/virusdish/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/virusdish/on_reaction(var/datum/reagents/holder)
// new /obj/item/virusdish(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/obj/item/slime_extract/plague_jelly
+/datum/decl/chemical_reaction/instant/slime/obj/item/slime_extract/plague_jelly
name = "Slime Smoke"
id = "m_slimejelly_alt"
result = REAGENT_ID_SLIMEJELLY
@@ -327,18 +327,18 @@
description_info = "Who knows what will happen."
slime_type = /mob/living/simple_mob/slime/xenobio/oceanic
-/decl/chemical_reaction/instant/slime/carpfren
+/datum/decl/chemical_reaction/instant/slime/carpfren
name = "Carp Friend"
id = "m_carp_friends"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/oceanic
-/decl/chemical_reaction/instant/slime/carpfren/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/carpfren/on_reaction(var/datum/reagents/holder)
new /mob/living/simple_mob/animal/space/carp/station(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/oceancarp
+/datum/decl/chemical_reaction/instant/slime/oceancarp
name = "Slime Carptoxi"
id = "m_slime_carptox"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
@@ -346,7 +346,7 @@
result_amount = 30
required = /obj/item/slime_extract/oceanic
-/decl/chemical_reaction/instant/slime/waterdupe
+/datum/decl/chemical_reaction/instant/slime/waterdupe
name = "Water Duplication"
id = "m_slime_water"
required_reagents = list(REAGENT_ID_WATER = 5)
@@ -354,26 +354,26 @@
result_amount = 30
required = /obj/item/slime_extract/oceanic
-/decl/chemical_reaction/instant/slime/oceanboon
+/datum/decl/chemical_reaction/instant/slime/oceanboon
name = "Carp Boon"
id = "m_carp_boon"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/oceanic
-/decl/chemical_reaction/instant/slime/oceanboon/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/oceanboon/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(21, holder.my_atom))
L.add_modifier(/datum/modifier/healingtide, 10 MINUTES, src)
..()
-/decl/chemical_reaction/instant/slime/warplague
+/datum/decl/chemical_reaction/instant/slime/warplague
name = "Nuclear Slime Summon"
id = "m_nuclear_slime"
required_reagents = list(REAGENT_ID_MINDBREAKER = 5)
result_amount = 1
required = /obj/item/slime_extract/plague
-/decl/chemical_reaction/instant/slime/warplague/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/warplague/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with slime jelly, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/nuclear(get_turf(holder.my_atom))
..()
@@ -425,14 +425,14 @@
description_info = "Who knows what will happen."
slime_type = /mob/living/simple_mob/slime/xenobio/nuclear
-/decl/chemical_reaction/instant/slime/nuclear_radpulse
+/datum/decl/chemical_reaction/instant/slime/nuclear_radpulse
name = "Slime Radiation Pulse"
id = "m_green_radpulse2"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/nuclear
-/decl/chemical_reaction/instant/slime/nuclear_radpulse/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nuclear_radpulse/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation pulse) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!"))
@@ -441,20 +441,20 @@
..()
-/decl/chemical_reaction/instant/slime/nuclear_emitter
+/datum/decl/chemical_reaction/instant/slime/nuclear_emitter
name = "Slime Radiation Emitter"
id = "m_green_emitter2"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/green
-/decl/chemical_reaction/instant/slime/green_emitter/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/green_emitter/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation emitter) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
new /obj/item/slime_irradiator(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/nuclear_radium
+/datum/decl/chemical_reaction/instant/slime/nuclear_radium
name = "Slime Radium"
id = "m_green_radium2"
result = REAGENT_ID_RADIUM
@@ -463,14 +463,14 @@
required = /obj/item/slime_extract/green
-/decl/chemical_reaction/instant/slime/nuclear_uranium
+/datum/decl/chemical_reaction/instant/slime/nuclear_uranium
name = "Slime Uranium"
id = "m_green_uranium2"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/green
-/decl/chemical_reaction/instant/slime/nuclear_uranium/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nuclear_uranium/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/uranium(get_turf(holder.my_atom), 10)
..()
@@ -494,25 +494,25 @@
description_info = "Who knows what will happen."
slime_type = /mob/living/simple_mob/slime/xenobio/dream
-/decl/chemical_reaction/instant/slime/dreamscale
+/datum/decl/chemical_reaction/instant/slime/dreamscale
name = "dream scale creation "
id = "m_dreamscale_slime"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/dream
-/decl/chemical_reaction/instant/slime/dreamscale/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dreamscale/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/dreamscale(get_turf(holder.my_atom), 10)
..()
-/decl/chemical_reaction/instant/slime/nightmareslime
+/datum/decl/chemical_reaction/instant/slime/nightmareslime
name = "Nightmare Slime Summon "
id = "m_nightmare_slime"
required_reagents = list(REAGENT_ID_BLOOD = 5, REAGENT_ID_PHORON = 5, REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/dream
-/decl/chemical_reaction/instant/slime/nightmareslime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmareslime/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with slime jelly, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/nightmare(get_turf(holder.my_atom))
..()
@@ -571,50 +571,50 @@
description_info = "Who knows what will happen."
slime_type = /mob/living/simple_mob/slime/xenobio/nightmare
-/decl/chemical_reaction/instant/slime/nightmarewater
+/datum/decl/chemical_reaction/instant/slime/nightmarewater
name = "nightmare water"
id = "m_nightmare_water"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/nightmare
-/decl/chemical_reaction/instant/slime/nightmarewater/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmarewater/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(3, holder.my_atom))
L.add_modifier(/datum/modifier/faraday, 1 MINUTES, src)
L.add_modifier(/datum/modifier/blastshield, 1 MINUTES, src)
..()
-/decl/chemical_reaction/instant/slime/nightmarejelly
+/datum/decl/chemical_reaction/instant/slime/nightmarejelly
name = "nightmare jelly"
id = "m_nightmare_jelly"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/nightmare
-/decl/chemical_reaction/instant/slime/nightmarejelly/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmarejelly/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(14, holder.my_atom))
L.add_modifier(/datum/modifier/poisoned/strong, 3 MINUTES, src)
..()
-/decl/chemical_reaction/instant/slime/nightmareblood
+/datum/decl/chemical_reaction/instant/slime/nightmareblood
name = "nightmare blood"
id = "m_nightmare_blood"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/nightmare
-/decl/chemical_reaction/instant/slime/nightmareblood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmareblood/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/valhollide(get_turf(holder.my_atom), 5)
..()
-/decl/chemical_reaction/instant/slime/nightmarephoron
+/datum/decl/chemical_reaction/instant/slime/nightmarephoron
name = "nightmare phoron"
id = "m_nightmare_phoron"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/nightmare
-/decl/chemical_reaction/instant/slime/nightmarephoron/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmarephoron/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(14, holder.my_atom))
L.add_modifier(/datum/modifier/berserk_exhaustion, 1 MINUTES, src)
..()
@@ -622,14 +622,14 @@
-/decl/chemical_reaction/instant/slime/redspace_sound
+/datum/decl/chemical_reaction/instant/slime/redspace_sound
name = "Slime Sound Creation"
id = "m_make_sound"
required_reagents = list(REAGENT_ID_MINDBREAKER = 5)
result_amount = 1
required = /obj/item/slime_extract/redspace
-/decl/chemical_reaction/instant/slime/redspace_sound/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/redspace_sound/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with the mixture, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/sound(get_turf(holder.my_atom))
..()
@@ -678,48 +678,48 @@
description_info = "Who knows what will happen."
slime_type = /mob/living/simple_mob/slime/xenobio/sound
-/decl/chemical_reaction/instant/slime/soundblood
+/datum/decl/chemical_reaction/instant/slime/soundblood
name = "sound blood"
id = "m_sound_blood"
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/sound
-/decl/chemical_reaction/instant/slime/soundblood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soundblood/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/quartz(get_turf(holder.my_atom), 5)
..()
-/decl/chemical_reaction/instant/slime/soundphoron
+/datum/decl/chemical_reaction/instant/slime/soundphoron
name = "sound phoron"
id = "m_sound_phoron"
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/sound
-/decl/chemical_reaction/instant/slime/soundphoron/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soundphoron/on_reaction(var/datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/aura/soothingsong, 10 MINUTES, src)
..()
-/decl/chemical_reaction/instant/slime/soundwater
+/datum/decl/chemical_reaction/instant/slime/soundwater
name = "sound water"
id = "m_sound_water"
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/sound
-/decl/chemical_reaction/instant/slime/soundwater/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soundwater/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with the mixture, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/sound(get_turf(holder.my_atom))
..()
-/decl/chemical_reaction/instant/slime/soundjelly
+/datum/decl/chemical_reaction/instant/slime/soundjelly
name = "sound slimejelly"
id = "m_sound_slimejelly"
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/sound
-/decl/chemical_reaction/instant/slime/soundjelly/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soundjelly/on_reaction(var/datum/reagents/holder)
new /obj/item/stack/material/glass/plastitanium(get_turf(holder.my_atom), 5)
..()
diff --git a/modular_chomp/code/modules/reagents/reactions/distilling/distilling.dm b/modular_chomp/code/modules/reagents/reactions/distilling/distilling.dm
index df860f261e..46ae840273 100644
--- a/modular_chomp/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/modular_chomp/code/modules/reagents/reactions/distilling/distilling.dm
@@ -4,7 +4,7 @@
//Meteroid
//Deathclaw
-/decl/chemical_reaction/distilling/energybooster
+/datum/decl/chemical_reaction/distilling/energybooster
name = "Distilling Energy Booster"
id = "distill_energybooster"
result = REAGENT_ID_ENERGYBOOSTER
@@ -15,7 +15,7 @@
temp_range = list(T0C + 180, T0C + 200)
-/decl/chemical_reaction/distilling/oceaniccure
+/datum/decl/chemical_reaction/distilling/oceaniccure
name = "Distilling Oceanic Cure"
id = "distill_oceaniccure"
result = REAGENT_ID_OCEANICCURE
@@ -26,7 +26,7 @@
temp_range = list(T0C + 130, T0C + 150)
-/decl/chemical_reaction/distilling/deathclawmutagen
+/datum/decl/chemical_reaction/distilling/deathclawmutagen
name = "Distilling Deathclaw Mutagen"
id = "distill_deathclawmutagen"
result = REAGENT_ID_DEATHCLAWMUTAGEN
@@ -37,7 +37,7 @@
temp_range = list(T0C + 100, T0C + 120)
-/decl/chemical_reaction/distilling/senseenhancer
+/datum/decl/chemical_reaction/distilling/senseenhancer
name = "Distilling Sense Enhancer"
id = "distill_senseenhancer"
result = REAGENT_ID_SENSEENHANCER
@@ -48,7 +48,7 @@
temp_range = list(T0C + 50, T0C + 70)
-/decl/chemical_reaction/distilling/heatnullifer
+/datum/decl/chemical_reaction/distilling/heatnullifer
name = "Distilling heatnullifer"
id = "distill_heatnullifer"
result = REAGENT_ID_HEATNULLIFER
@@ -59,7 +59,7 @@
temp_range = list(T0C + 230, T0C + 250)
-/decl/chemical_reaction/distilling/juggernog
+/datum/decl/chemical_reaction/distilling/juggernog
name = "juggernog"
id = "distill_juggernog"
result = REAGENT_ID_JUGGERNOG
@@ -71,7 +71,7 @@
temp_range = list(T0C + 180, T0C + 200)
-/decl/chemical_reaction/distilling/phoenixbreath
+/datum/decl/chemical_reaction/distilling/phoenixbreath
name = REAGENT_PHOENIXBREATH
id = REAGENT_ID_PHOENIXBREATH
result = REAGENT_ID_PHOENIXBREATH
diff --git a/modular_chomp/code/modules/reagents/reactions/distilling/hot_drinks.dm b/modular_chomp/code/modules/reagents/reactions/distilling/hot_drinks.dm
index ec470bc64f..d22143d136 100644
--- a/modular_chomp/code/modules/reagents/reactions/distilling/hot_drinks.dm
+++ b/modular_chomp/code/modules/reagents/reactions/distilling/hot_drinks.dm
@@ -1,31 +1,31 @@
-/decl/chemical_reaction/distilling/drinks/cherrytea
+/datum/decl/chemical_reaction/distilling/drinks/cherrytea
name = REAGENT_CHERRYTEA
id = REAGENT_ID_CHERRYTEA
result = REAGENT_ID_CHERRYTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_CHERRYJELLY = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/watermelontea
+/datum/decl/chemical_reaction/distilling/drinks/watermelontea
name = REAGENT_WATERMELONTEA
id = REAGENT_ID_WATERMELONTEA
result = REAGENT_ID_WATERMELONTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_WATERMELONJUICE = 1)
result_amount = 6
-/decl/chemical_reaction/distilling/drinks/matcha_latte
+/datum/decl/chemical_reaction/distilling/drinks/matcha_latte
name = REAGENT_MATCHALATTE
id = REAGENT_ID_MATCHALATTE
result = REAGENT_ID_MATCHALATTE
required_reagents = list (REAGENT_ID_MATCHAPOWDER = 1, REAGENT_ID_MILK = 5)
result_amount = 5
-/decl/chemical_reaction/distilling/drinks/greenteafresh
+/datum/decl/chemical_reaction/distilling/drinks/greenteafresh
id = REAGENT_ID_FRESHTEAGREEN
result = REAGENT_ID_FRESHTEAGREEN
required_reagents = list (REAGENT_ID_TEALEAVESGREEN = 1, REAGENT_ID_WATER = 9)
result_amount = 10
-/decl/chemical_reaction/distilling/drinks/matcha
+/datum/decl/chemical_reaction/distilling/drinks/matcha
id = REAGENT_ID_MATCHA
result = REAGENT_ID_MATCHA
required_reagents = list (REAGENT_ID_MATCHAPOWDER = 1, REAGENT_ID_WATER = 2)
diff --git a/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm b/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm
index 9a2ff98a59..4d9e7eab6d 100644
--- a/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm
+++ b/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm
@@ -1,128 +1,128 @@
-/decl/chemical_reaction/instant/instantteapowder/green
+/datum/decl/chemical_reaction/instant/instantteapowder/green
id = REAGENT_ID_INSTANTTEAPOWDERGREEN
result = REAGENT_ID_INSTANTTEAPOWDERGREEN
required_reagents = list (REAGENT_ID_TEAMUSH = 10, REAGENT_ID_FROSTOIL = 1)
result_amount = 10
-/decl/chemical_reaction/instant/instanttea/green
+/datum/decl/chemical_reaction/instant/instanttea/green
id = REAGENT_ID_INSTANTTEAGREEN
result = REAGENT_ID_INSTANTTEAGREEN
required_reagents = list (REAGENT_ID_INSTANTTEAPOWDERGREEN = 1, REAGENT_ID_WATER = 9)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/spiderdrink
+/datum/decl/chemical_reaction/instant/drinks/spiderdrink
name = REAGENT_SPIDERDRINK
id = REAGENT_ID_SPIDERDRINK
result = REAGENT_ID_SPIDERDRINK
required_reagents = list(REAGENT_ID_SPIDERTOXIN = 1, REAGENT_ID_CLONEXADONE = 5, REAGENT_ID_ABSINTHE = 4)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/bubbleteawatermelon
+/datum/decl/chemical_reaction/instant/drinks/bubbleteawatermelon
name = REAGENT_BUBBLETEAWATERMELON
id = REAGENT_ID_BUBBLETEAWATERMELON
result = REAGENT_ID_BUBBLETEAWATERMELON
required_reagents = list(REAGENT_ID_GELATIN = 2, REAGENT_ID_WATERMELONTEA = 6, REAGENT_ID_MILK = 2)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/bubbleteastrawberry
+/datum/decl/chemical_reaction/instant/drinks/bubbleteastrawberry
name = REAGENT_BUBBLETEASTRAWBERRY
id = REAGENT_ID_BUBBLETEASTRAWBERRY
result = REAGENT_ID_BUBBLETEASTRAWBERRY
required_reagents = list(REAGENT_ID_GELATIN = 2, REAGENT_ID_BERRYTEA = 6, REAGENT_ID_MILK = 2)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/bubbleteacherry
+/datum/decl/chemical_reaction/instant/drinks/bubbleteacherry
name = REAGENT_BUBBLETEACHERRY
id = REAGENT_ID_BUBBLETEACHERRY
result = REAGENT_ID_BUBBLETEACHERRY
required_reagents = list(REAGENT_ID_GELATIN = 2, REAGENT_ID_CHERRYTEA = 6, REAGENT_ID_MILK = 2)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/bubbleteacoffee
+/datum/decl/chemical_reaction/instant/drinks/bubbleteacoffee
name = REAGENT_BUBBLETEACOFFEE
id = REAGENT_ID_BUBBLETEACOFFEE
result = REAGENT_ID_BUBBLETEACOFFEE
required_reagents = list(REAGENT_ID_GELATIN = 2, REAGENT_ID_TEA = 5, REAGENT_ID_CAFELATTE = 3)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/bubbleteabanana
+/datum/decl/chemical_reaction/instant/drinks/bubbleteabanana
name = REAGENT_BUBBLETEABANANA
id = REAGENT_ID_BUBBLETEABANANA
result = REAGENT_ID_BUBBLETEABANANA
required_reagents = list(REAGENT_ID_GELATIN = 2, REAGENT_ID_TEA = 5, REAGENT_ID_BANANA = 1, REAGENT_ID_MILK = 2)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/horchata
+/datum/decl/chemical_reaction/instant/drinks/horchata
name = REAGENT_HORCHATA
id = REAGENT_ID_HORCHATA
result = REAGENT_ID_HORCHATA
required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_SUGAR = 2, REAGENT_ID_RICE = 2)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/bluetrain
+/datum/decl/chemical_reaction/instant/drinks/bluetrain
name = "Blue train"
id = REAGENT_ID_BLUETRAIN
result = REAGENT_ID_BLUETRAIN
required_reagents = list(REAGENT_ID_COOLANT = 2, REAGENT_ID_ETHANOL = 2, REAGENT_ID_NUTRIMENT = 1)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/lowpower
+/datum/decl/chemical_reaction/instant/drinks/lowpower
name = REAGENT_LOWPOWER
id = REAGENT_ID_LOWPOWER
result = REAGENT_ID_LOWPOWER
required_reagents = list(REAGENT_ID_LEMONADE = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/jackbrew
+/datum/decl/chemical_reaction/instant/drinks/jackbrew
name = "Jack's brew"
id = REAGENT_ID_JACKBREW
result = REAGENT_ID_JACKBREW
required_reagents = list(REAGENT_ID_IRISHCOFFEE = 1, REAGENT_ID_HYPERZINE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/bookwyrm
+/datum/decl/chemical_reaction/instant/drinks/bookwyrm
name = REAGENT_BOOKWYRM
id = REAGENT_ID_BOOKWYRM
result = REAGENT_ID_BOOKWYRM
required_reagents = list(REAGENT_ID_COLDFRONT = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_STOXIN = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/highpower
+/datum/decl/chemical_reaction/instant/drinks/highpower
name = "The high power"
id = REAGENT_ID_HIGHPOWER
result = REAGENT_ID_HIGHPOWER
required_reagents = list(REAGENT_ID_LOWPOWER = 1, REAGENT_ID_IRON = 1, REAGENT_ID_URANIUM = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/flapper
+/datum/decl/chemical_reaction/instant/drinks/flapper
name = REAGENT_FLAPPER
id = REAGENT_ID_FLAPPER
result = REAGENT_ID_FLAPPER
required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_ICE = 1)
result_amount = 3
-/decl/chemical_reaction/instant/toxin/oilslide
+/datum/decl/chemical_reaction/instant/toxin/oilslide
name = REAGENT_OILSLIDE
id = REAGENT_ID_OILSLIDE
result = REAGENT_ID_OILSLIDE
required_reagents = list(REAGENT_ID_MOONSHINE = 1, REAGENT_ID_LUBE = 1, REAGENT_ID_FUEL = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/sitonmyface
+/datum/decl/chemical_reaction/instant/drinks/sitonmyface
name = REAGENT_SITONMYFACE
id = REAGENT_ID_SITONMYFACE
result = REAGENT_ID_SITONMYFACE
required_reagents = list(REAGENT_ID_KAHLUA = 1, REAGENT_ID_IRISHCREAM = 1, REAGENT_ID_PEANUTBUTTER = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/hachi
+/datum/decl/chemical_reaction/instant/drinks/hachi
name = REAGENT_HACHI
id = REAGENT_ID_HACHI
result = REAGENT_ID_HACHI
required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_SAKE = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_PSILOCYBIN = 1) //Whoever coded this never made a mushroom reagent so this can't be created.
result_amount = 5
-/decl/chemical_reaction/instant/drinks/narsour
+/datum/decl/chemical_reaction/instant/drinks/narsour
name = "Nar'sour"
id = REAGENT_ID_NARSOUR
result = REAGENT_ID_NARSOUR
@@ -131,7 +131,7 @@
reaction_sound = 'sound/effects/singlebeat.ogg'
result_amount = 3
-/decl/chemical_reaction/instant/drinks/cogchamp
+/datum/decl/chemical_reaction/instant/drinks/cogchamp
name = REAGENT_COGCHAMP
id = REAGENT_ID_COGCHAMP
result = REAGENT_ID_COGCHAMP
@@ -142,7 +142,7 @@
//thirteen loko possible to make now, so easier to make arachnid slammer - Jack
-/decl/chemical_reaction/instant/drinks/thirteenloko
+/datum/decl/chemical_reaction/instant/drinks/thirteenloko
name = REAGENT_THIRTEENLOKO
id = REAGENT_ID_THIRTEENLOKO
result = REAGENT_ID_THIRTEENLOKO
@@ -151,7 +151,7 @@
//Arachnid slammer reactions - Jack
-/decl/chemical_reaction/instant/drinks/arachnidslammer
+/datum/decl/chemical_reaction/instant/drinks/arachnidslammer
name = REAGENT_ARACHNIDSLAMMER
id = REAGENT_ID_ARACHNIDSLAMMER
result = REAGENT_ID_ARACHNIDSLAMMER
@@ -159,7 +159,7 @@
mix_message = "The concortion of ale, energy drink and stimulants starts to heavily foam and fizzle, even sparkle a little."
result_amount = 3
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
@@ -167,77 +167,77 @@
mix_message = "The dormant Arachnid Slammer bubbles and fizzles loudly as it gets enraged by the spider toxin and breaks it down!"
result_amount = 5
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer1
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer1
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "1"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_CYANIDE = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer2
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer2
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "2"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_CHLORALHYDRATE = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer3
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer3
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "3"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_STIMM = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer4
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer4
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "4"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_CRYOTOXIN = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer5
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer5
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "5"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_CRYPTOBIOLIN = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer6
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer6
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "6"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_STOXIN = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer7
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer7
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "7"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_CONDENSEDCAPSAICINV = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer8
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer8
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "8"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_PHORON = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer9
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer9
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "9"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_THERMITEV = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/enragedarachnidslammer10
+/datum/decl/chemical_reaction/instant/drinks/enragedarachnidslammer10
name = REAGENT_ENRAGEDARACHNIDSLAMMER
id = REAGENT_ID_ENRAGEDARACHNIDSLAMMER + "10"
required_reagents = list(REAGENT_ID_ENRAGEDARACHNIDSLAMMER = 1, REAGENT_ID_SEROTROTIUMV = 1)
result = REAGENT_ID_ENRAGEDARACHNIDSLAMMER
result_amount = 0.1
-/decl/chemical_reaction/instant/drinks/pilk
+/datum/decl/chemical_reaction/instant/drinks/pilk
name = REAGENT_PILK
id = REAGENT_ID_PILK
result = REAGENT_ID_PILK
@@ -246,35 +246,35 @@
// Drinks from Horizon
-/decl/chemical_reaction/instant/drinks/alliescocktail
+/datum/decl/chemical_reaction/instant/drinks/alliescocktail
name = REAGENT_ALLIESCOCKTAIL
id = REAGENT_ID_ALLIESCOCKTAIL
result = REAGENT_ID_ALLIESCOCKTAIL
required_reagents = list(REAGENT_ID_MARTINI = 1, REAGENT_ID_VODKA = 1)
result_amount = 2
-/decl/chemical_reaction/instant/drinks/fetching_fizz
+/datum/decl/chemical_reaction/instant/drinks/fetching_fizz
name = REAGENT_FETCHINGFIZZ
id = REAGENT_ID_FETCHINGFIZZ
result = REAGENT_ID_FETCHINGFIZZ
required_reagents = list(REAGENT_ID_NUKACOLA = 1, REAGENT_ID_IRON = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/hearty_punch
+/datum/decl/chemical_reaction/instant/drinks/hearty_punch
name = REAGENT_HEARTYPUNCH
id = REAGENT_ID_HEARTYPUNCH
result = REAGENT_ID_HEARTYPUNCH
required_reagents = list(REAGENT_ID_BRAVEBULL = 5, REAGENT_ID_SYNDICATEBOMB = 5, REAGENT_ID_ABSINTHE = 5)
result_amount = 1
-/decl/chemical_reaction/instant/drinks/squirt_cider
+/datum/decl/chemical_reaction/instant/drinks/squirt_cider
name = REAGENT_SQUIRTCIDER
id = REAGENT_ID_SQUIRTCIDER
result = REAGENT_ID_SQUIRTCIDER
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_TOMATOJUICE = 1, REAGENT_ID_NUTRIMENT = 1)
result_amount = 3
-/decl/chemical_reaction/instant/drinks/fringe_weaver
+/datum/decl/chemical_reaction/instant/drinks/fringe_weaver
name = REAGENT_FRINGEWEAVER
id = REAGENT_ID_FRINGEWEAVER
result = REAGENT_ID_FRINGEWEAVER
@@ -282,35 +282,35 @@
inhibitors = list(REAGENT_ID_FUEL = 1)
result_amount = 10
-/decl/chemical_reaction/instant/drinks/crevice_spike
+/datum/decl/chemical_reaction/instant/drinks/crevice_spike
name = REAGENT_CREVICESPIKE
id = REAGENT_ID_CREVICESPIKE
result = REAGENT_ID_CREVICESPIKE
required_reagents = list(REAGENT_ID_LIMEJUICE = 2, REAGENT_ID_CAPSAICIN = 4)
result_amount = 6
-/decl/chemical_reaction/instant/drinks/duplex
+/datum/decl/chemical_reaction/instant/drinks/duplex
name = REAGENT_DUPLEX
id = REAGENT_ID_DUPLEX
result = REAGENT_ID_DUPLEX
required_reagents = list(REAGENT_ID_CIDER = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_BERRYJUICE = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/mauna_loa
+/datum/decl/chemical_reaction/instant/drinks/mauna_loa
name = REAGENT_MAUNALOA
id = REAGENT_ID_MAUNALOA
result = REAGENT_ID_MAUNALOA
required_reagents = list(REAGENT_ID_CAPSAICIN = 2, REAGENT_ID_KAHLUA = 1, REAGENT_ID_BAHAMAMAMA = 2)
result_amount = 5
-/decl/chemical_reaction/instant/drinks/hiveminderaser
+/datum/decl/chemical_reaction/instant/drinks/hiveminderaser
name = REAGENT_HIVEMINDERASER
id = REAGENT_ID_HIVEMINDERASER
result = REAGENT_ID_HIVEMINDERASER
required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 2, REAGENT_ID_THIRTEENLOKO = 1, REAGENT_ID_GRENADINE = 1)
result_amount = 4
-/decl/chemical_reaction/instant/drinks/erikasurprise
+/datum/decl/chemical_reaction/instant/drinks/erikasurprise
name = REAGENT_ERIKASURPRISE
id = REAGENT_ID_ERIKASURPRISE
result = REAGENT_ID_ERIKASURPRISE
@@ -318,7 +318,7 @@
result_amount = 6
//YW drinks
-/decl/chemical_reaction/instant/drinks/wormblood
+/datum/decl/chemical_reaction/instant/drinks/wormblood
name = "Wormblood"
id = REAGENT_ID_WORMBLOOD
result = REAGENT_ID_WORMBLOOD
diff --git a/modular_chomp/code/modules/reagents/reactions/instant/instant.dm b/modular_chomp/code/modules/reagents/reactions/instant/instant.dm
index d62d790a6c..feb21ac275 100644
--- a/modular_chomp/code/modules/reagents/reactions/instant/instant.dm
+++ b/modular_chomp/code/modules/reagents/reactions/instant/instant.dm
@@ -1,54 +1,54 @@
//Chemist update
-/decl/chemical_reaction/instant/livingagent
+/datum/decl/chemical_reaction/instant/livingagent
name = REAGENT_LIVINGAGENT
id = REAGENT_ID_LIVINGAGENT
result = REAGENT_ID_LIVINGAGENT
required_reagents = list(REAGENT_ID_TRICORDRAZINE = 1, REAGENT_ID_LIQUIDLIFE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 2
-/decl/chemical_reaction/instant/performancepeaker
+/datum/decl/chemical_reaction/instant/performancepeaker
name = REAGENT_PERFORMANCEPEAKER
id = REAGENT_ID_PERFORMANCEPEAKER
result = REAGENT_ID_PERFORMANCEPEAKER
required_reagents = list(REAGENT_ID_HYPERZINE = 1, REAGENT_ID_LIQUIDLIFE = 1, REAGENT_ID_INAPROVALINE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/burncard
+/datum/decl/chemical_reaction/instant/burncard
name = "Burning Bicard"
id = REAGENT_ID_BURNCARD
result = REAGENT_ID_BURNCARD
required_reagents = list(REAGENT_ID_LIQUIDFIRE = 1, REAGENT_ID_BICARIDINE = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/flamecure
+/datum/decl/chemical_reaction/instant/flamecure
name = REAGENT_FLAMECURE
id = REAGENT_ID_FLAMECURE
result = REAGENT_ID_FLAMECURE
required_reagents = list(REAGENT_ID_LIQUIDFIRE = 1, REAGENT_ID_MYELAMINE = 1, REAGENT_ID_KELOTANE = 1)
result_amount = 2
-/decl/chemical_reaction/instant/neotane
+/datum/decl/chemical_reaction/instant/neotane
name = REAGENT_NEOTANE
id = REAGENT_ID_NEOTANE
result = REAGENT_ID_NEOTANE
required_reagents = list(REAGENT_ID_LIQUIDFIRE = 1, REAGENT_ID_KELOTANE = 1, REAGENT_ID_IRON = 1)
result_amount = 2
-/decl/chemical_reaction/instant/bloodsealer
+/datum/decl/chemical_reaction/instant/bloodsealer
name = REAGENT_BLOODSEALER
id = REAGENT_ID_BLOODSEALER
result = REAGENT_ID_BLOODSEALER
required_reagents = list(REAGENT_ID_NEOLIQUIDFIRE = 1, REAGENT_ID_GLUCOSE = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/purifyingagent
+/datum/decl/chemical_reaction/instant/purifyingagent
name = REAGENT_PURIFYINGAGENT
id = REAGENT_ID_PURIFYINGAGENT
result = REAGENT_ID_PURIFYINGAGENT
required_reagents = list(REAGENT_ID_DEATHBLOOD = 1, REAGENT_ID_CARTHATOLINE = 1, REAGENT_ID_HYRONALIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/cleansingagent
+/datum/decl/chemical_reaction/instant/cleansingagent
name = REAGENT_CLEANSINGAGENT
id = REAGENT_ID_CLEANSINGAGENT
result = REAGENT_ID_CLEANSINGAGENT
@@ -56,14 +56,14 @@
result_amount = 2
//tier 1
-/decl/chemical_reaction/instant/souldew
+/datum/decl/chemical_reaction/instant/souldew
name = REAGENT_ID_SOULDEW
id = REAGENT_ID_SOULDEW
result = REAGENT_ID_SOULDEW
required_reagents = list(REAGENT_ID_ALKYSINE = 1, REAGENT_ID_TRICORDRAZINE = 1, REAGENT_ID_SULFUR = 1)
result_amount = 3
-/decl/chemical_reaction/instant/quadcord
+/datum/decl/chemical_reaction/instant/quadcord
name = REAGENT_QUADCORD
id = REAGENT_ID_QUADCORD
result = REAGENT_ID_QUADCORD
@@ -72,7 +72,7 @@
//tier 2
/*
-/decl/chemical_reaction/instant/juggernog
+/datum/decl/chemical_reaction/instant/juggernog
name = REAGENT_JUGGERNOG
id = REAGENT_ID_JUGGERNOG
result = REAGENT_ID_JUGGERNOG
@@ -80,7 +80,7 @@
result_amount = 4
*/
-/decl/chemical_reaction/instant/curea
+/datum/decl/chemical_reaction/instant/curea
name = REAGENT_CUREA
id = REAGENT_ID_CUREA
result = REAGENT_ID_CUREA
@@ -88,21 +88,21 @@
result_amount = 4
//tier 3
-/decl/chemical_reaction/instant/liquidhealer
+/datum/decl/chemical_reaction/instant/liquidhealer
name = REAGENT_LIQUIDHEALER
id = REAGENT_ID_LIQUIDHEALER
result = REAGENT_ID_LIQUIDHEALER
required_reagents = list(REAGENT_ID_BICARIDINE = 1, REAGENT_ID_KELOTANE = 1, REAGENT_ID_LIQUIDLIFE = 1, REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_QUADCORD = 1, REAGENT_ID_CRYPTOBIOLIN = 1)
result_amount = 6
/*
-/decl/chemical_reaction/instant/phoenixbreath
+/datum/decl/chemical_reaction/instant/phoenixbreath
name = REAGENT_PHOENIXBREATH
id = REAGENT_ID_PHOENIXBREATH
result = REAGENT_ID_PHOENIXBREATH
required_reagents = list(REAGENT_ID_VERMICETOL = 1, REAGENT_ID_LIQUIDLIFE = 1, REAGENT_ID_NEOLIQUIDFIRE = 1, REAGENT_ID_SOULDEW = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_DERMALINE = 1)
result_amount = 6
*/
-/decl/chemical_reaction/instant/dryagent
+/datum/decl/chemical_reaction/instant/dryagent
name = REAGENT_DRYAGENT
id = REAGENT_ID_DRYAGENT
result = REAGENT_ID_DRYAGENT
@@ -111,7 +111,7 @@
result_amount = 4
//Xenobotany update
-/decl/chemical_reaction/instant/neoliquidfire
+/datum/decl/chemical_reaction/instant/neoliquidfire
name = REAGENT_ID_NEOLIQUIDFIRE //distil phoron dragon blood from basic dragon blood
id = REAGENT_ID_NEOLIQUIDFIRE
result = REAGENT_ID_NEOLIQUIDFIRE
@@ -120,21 +120,21 @@
result_amount = 1
//Some extra metal solidification reactions
-/decl/chemical_reaction/instant/solidification/deuterium
+/datum/decl/chemical_reaction/instant/solidification/deuterium
name = "Solid Deuterium"
id = "soliddeuterium"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_DEUTERIUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/deuterium
//Injectable toxin reactions
-/decl/chemical_reaction/instant/succubi_paralize
+/datum/decl/chemical_reaction/instant/succubi_paralize
name = "paralyzingfluid"
id = "paralyzingfluid"
result = "succubi_paralize"
required_reagents = list(REAGENT_ID_BENZILATE = 1, REAGENT_ID_CRYPTOBIOLIN = 1)
result_amount = 2
-/decl/chemical_reaction/instant/numbingenzyme
+/datum/decl/chemical_reaction/instant/numbingenzyme
name = "numbingenzyme"
id = "numbingenzyme"
result = REAGENT_ID_NUMBENZYME
diff --git a/modular_chomp/code/modules/spells/spells.dm b/modular_chomp/code/modules/spells/spells.dm
index 6c466fe084..ef8775b069 100644
--- a/modular_chomp/code/modules/spells/spells.dm
+++ b/modular_chomp/code/modules/spells/spells.dm
@@ -1,6 +1,6 @@
//This is pretty much just copied from construct_spells but adjusted so anyone can use them
-/spell/targeted/unrestricted
+/datum/spell/targeted/unrestricted
name = "Base Unrestricted Spell"
desc = "If you see this, you should probably remind coders to refactor spell code."
@@ -18,7 +18,7 @@
var/obj/item/spell/unrestricted/spell_obj = null //This is the var that determines what Technomancer-style spell is put into their hands.
-/spell/targeted/unrestricted/cast(list/targets, mob/living/user)
+/datum/spell/targeted/unrestricted/cast(list/targets, mob/living/user)
user.place_spell_in_hand(spell_obj)
/obj/item/spell/unrestricted
@@ -127,7 +127,7 @@
// The actual spells
//
-/spell/targeted/unrestricted/plasmastun
+/datum/spell/targeted/unrestricted/plasmastun
name = "Plasma Snare"
desc = "Fire a debillitating slowing projectile."
@@ -144,7 +144,7 @@
cooldown = 5
fire_sound = 'sound/weapons/weaponsounds_laserstrong.ogg'
-/spell/targeted/unrestricted/mend
+/datum/spell/targeted/unrestricted/mend
name = "Mend Target"
desc = "Mend a target over time."
diff --git a/modular_chomp/maps/common/common_outfits.dm b/modular_chomp/maps/common/common_outfits.dm
index 0d511b730f..64c1b542dd 100644
--- a/modular_chomp/maps/common/common_outfits.dm
+++ b/modular_chomp/maps/common/common_outfits.dm
@@ -4,7 +4,7 @@
SOUTHERN CROSS OUTFITS
Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead goes in lockers. Keep this in mind if editing.
*/
-/decl/hierarchy/outfit/job/explorer2
+/datum/decl/hierarchy/outfit/job/explorer2
name = OUTFIT_JOB_NAME("Explorer")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
@@ -20,24 +20,24 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/explorer
headset_earbud = /obj/item/radio/headset/explorer
-/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
+/datum/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
permit.set_name(H.real_name)
-/decl/hierarchy/outfit/job/explorer2/technician
+/datum/decl/hierarchy/outfit/job/explorer2/technician
name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORERE_TECHNICIAN)
belt = /obj/item/storage/belt/utility/full
pda_slot = slot_l_store
id_pda_assignment = JOB_ALT_EXPLORERE_TECHNICIAN
-/decl/hierarchy/outfit/job/explorer2/medic
+/datum/decl/hierarchy/outfit/job/explorer2/medic
name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORER_MEDIC)
l_hand = /obj/item/storage/firstaid/regular
pda_slot = slot_l_store
id_pda_assignment = JOB_ALT_EXPLORER_MEDIC
-/decl/hierarchy/outfit/job/pilot
+/datum/decl/hierarchy/outfit/job/pilot
name = OUTFIT_JOB_NAME(JOB_PILOT)
shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/rank/pilot1/no_webbing
@@ -56,7 +56,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/pilot
-/decl/hierarchy/outfit/job/medical/sar
+/datum/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
diff --git a/modular_chomp/maps/common/common_turfs.dm b/modular_chomp/maps/common/common_turfs.dm
index 2e776822b9..c6290dcf9e 100644
--- a/modular_chomp/maps/common/common_turfs.dm
+++ b/modular_chomp/maps/common/common_turfs.dm
@@ -88,10 +88,10 @@
oxygen = MOLES_O2STANDARD
nitrogen = MOLES_N2STANDARD
temperature = T20C
- initial_flooring = /decl/flooring/rock/cetus
+ initial_flooring = /datum/decl/flooring/rock/cetus
flags = TURF_UNSHIELDABLE
-/decl/flooring/rock/cetus
+/datum/decl/flooring/rock/cetus
icon_base = "rock_brown"
/turf/simulated/mineral/cetus/edge
@@ -150,9 +150,9 @@
desc = "A dusty, gray carpeted floor."
icon = 'modular_chomp/icons/turf/flooring/carpet.dmi'
icon_state = "gcarpet"
- initial_flooring = /decl/flooring/carpet/gray
+ initial_flooring = /datum/decl/flooring/carpet/gray
-/decl/flooring/carpet/gray
+/datum/decl/flooring/carpet/gray
name = "gray carpet"
desc = "A dusty, gray carpeted floor."
icon = 'modular_chomp/icons/turf/flooring/carpet.dmi'
diff --git a/modular_chomp/maps/common_submaps/gateway/snowfield.dmm b/modular_chomp/maps/common_submaps/gateway/snowfield.dmm
index 7d56b9f232..97d7e3a944 100644
--- a/modular_chomp/maps/common_submaps/gateway/snowfield.dmm
+++ b/modular_chomp/maps/common_submaps/gateway/snowfield.dmm
@@ -150,7 +150,7 @@
/area/awaymission/snowfield/medical/patients)
"ahY" = (
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet";
opened = 1
},
@@ -1822,7 +1822,7 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet"
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -5630,7 +5630,7 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet"
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -8246,7 +8246,7 @@
/area/awaymission/snowfield/medical/surgery)
"hzx" = (
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet";
opened = 1
},
@@ -9200,7 +9200,7 @@
dir = 1
},
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/oxygen/fire;
+ closet_appearance = /datum/decl/closet_appearance/oxygen/fire;
name = "fire-safety closet";
opened = 1
},
@@ -9967,7 +9967,7 @@
dir = 8
},
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet";
opened = 1
},
@@ -10695,7 +10695,7 @@
/area/awaymission/snowfield/dorms/dorm10)
"jGT" = (
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet";
opened = 1
},
@@ -10961,7 +10961,7 @@
/area/awaymission/snowfield/hallway/southhallway)
"jRr" = (
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet";
opened = 1
},
@@ -13494,7 +13494,7 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/clothing/suit/bio_suit/general,
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet";
opened = 1
},
@@ -16056,7 +16056,7 @@
/obj/effect/floor_decal/industrial/outline,
/obj/structure/window/reinforced,
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/oxygen/fire;
+ closet_appearance = /datum/decl/closet_appearance/oxygen/fire;
name = "fire-safety closet";
opened = 1
},
@@ -20361,7 +20361,7 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet"
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -24169,7 +24169,7 @@
},
/obj/effect/floor_decal/industrial/outline,
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/oxygen/fire;
+ closet_appearance = /datum/decl/closet_appearance/oxygen/fire;
name = "fire-safety closet";
opened = 1
},
@@ -25583,7 +25583,7 @@
dir = 4
},
/obj/structure/closet{
- closet_appearance = /decl/closet_appearance/bio;
+ closet_appearance = /datum/decl/closet_appearance/bio;
name = "Level-3 Biohazard Closet";
opened = 1
},
diff --git a/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm b/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
index 0a8cfedeb4..468b1bb0aa 100644
--- a/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
+++ b/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
@@ -300,7 +300,7 @@
. = ..()
/turf/simulated/floor/outdoors/grass/heavy/randomgen
- initial_flooring = /decl/flooring/grass/heavy
+ initial_flooring = /datum/decl/flooring/grass/heavy
name = "heavy grass"
icon_state = "grass-heavy0"
edge_blending_priority = 4
@@ -318,7 +318,7 @@
icon_state = "snow"
edge_blending_priority = 6
movement_cost = 2
- initial_flooring = /decl/flooring/snow
+ initial_flooring = /datum/decl/flooring/snow
demote_to = /turf/simulated/floor/outdoors/dirt
/turf/simulated/floor/outdoors/snow/thor/planetuse/Entered(atom/A)
diff --git a/modular_chomp/maps/southern_cross/structures/closets/engineering.dm b/modular_chomp/maps/southern_cross/structures/closets/engineering.dm
index 766e1ad5c2..78504dcac4 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/engineering.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/engineering.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/engineering_chief_wardrobe
name = "chief engineer's wardrobe"
req_access = list(ACCESS_CE)
- closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
/obj/item/clothing/under/rank/chief_engineer,
diff --git a/modular_chomp/maps/southern_cross/structures/closets/medical.dm b/modular_chomp/maps/southern_cross/structures/closets/medical.dm
index 284fdafdeb..65085c223d 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/medical.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/medical.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/CMO_wardrobe
name = "chief medical officer's locker"
req_access = list(ACCESS_CMO)
- closet_appearance = /decl/closet_appearance/secure_closet/cmo
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/cmo
starts_with = list(
/obj/item/clothing/under/rank/chief_medical_officer,
diff --git a/modular_chomp/maps/southern_cross/structures/closets/misc.dm b/modular_chomp/maps/southern_cross/structures/closets/misc.dm
index 6b08f18925..1661ec8c15 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/misc.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/misc.dm
@@ -78,7 +78,7 @@
name = "search and rescue locker"
desc = "Supplies for a wilderness first responder."
req_access = list(ACCESS_MEDICAL_EQUIP)
- closet_appearance = /decl/closet_appearance/secure_closet/medical
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/medical
starts_with = list(
/obj/item/storage/backpack/dufflebag/emt,
diff --git a/modular_chomp/maps/southern_cross/structures/closets/research.dm b/modular_chomp/maps/southern_cross/structures/closets/research.dm
index 9e53887578..2f5df6c4c8 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/research.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/research.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/RD_wardrobe
name = "research director's locker"
req_access = list(ACCESS_RD)
- closet_appearance = /decl/closet_appearance/secure_closet/science/rd
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/science/rd
starts_with = list(
/obj/item/clothing/under/rank/research_director,
diff --git a/modular_chomp/maps/southern_cross/structures/closets/security.dm b/modular_chomp/maps/southern_cross/structures/closets/security.dm
index a05afdc65f..3ccfbcbfd0 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/security.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/security.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/hos_wardrobe
name = "head of security's locker"
req_access = list(ACCESS_HOS)
- closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+ closet_appearance = /datum/decl/closet_appearance/secure_closet/security/hos
starts_with = list(
/obj/item/clothing/head/helmet/HoS,
diff --git a/vorestation.dme b/vorestation.dme
index 465ca89bd6..7310376137 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -24,7 +24,6 @@
#include "code\_compile_options.dm"
#include "code\_macros.dm"
#include "code\coalesce.dm"
-#include "code\global_init.dm"
#include "code\world.dm"
#include "code\__defines\__globals.dm"
#include "code\__defines\_ast.dm"