Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
e0f15d4
Fix
silicons Dec 26, 2025
261472d
drivers
silicons Dec 26, 2025
b01df50
grr
silicons Dec 26, 2025
1979bac
unit test this shit
silicons Dec 26, 2025
0d1a4aa
sigh
silicons Dec 26, 2025
cf54a1b
changes
silicons Dec 26, 2025
2f36f20
rename death procs
silicons Dec 26, 2025
03d6d6f
Fixes
silicons Dec 26, 2025
7ed0374
wow, organs rewrite not soon enough, fuck this shit
silicons Dec 26, 2025
37f208c
sigh
silicons Dec 26, 2025
1272e9c
um
silicons Dec 27, 2025
69d9f32
are you fucking kidding me
silicons Dec 27, 2025
d39bf9f
move
silicons Dec 27, 2025
14c0f02
just trash the old code
silicons Dec 27, 2025
3f5e8fa
more
silicons Dec 27, 2025
b488201
agh
silicons Dec 27, 2025
0b13b4f
Fix
silicons Dec 27, 2025
87a1a95
Merge remote-tracking branch 'upstream/master' into mirrors
silicons Dec 29, 2025
1ec9435
adjust variable name
silicons Dec 30, 2025
7a4f911
reorg
silicons Jan 2, 2026
4cfce2e
t
silicons Jan 2, 2026
e691395
that
Jan 2, 2026
4ad4ee5
repath
Jan 2, 2026
39de006
update
Jan 2, 2026
532f146
hm
Jan 2, 2026
ea01482
mov
Jan 2, 2026
02e61fc
t
silicons Jan 3, 2026
ea06911
Merge branch 'mirrors' of github-silicons:silicons/Citadel-Station-13…
silicons Jan 3, 2026
3c60d07
Merge remote-tracking branch 'upstream/master' into mirrors
silicons Jan 12, 2026
ededed1
changE
silicons Jan 12, 2026
e650968
Merge remote-tracking branch 'upstream/master' into mirrors
silicons Jan 13, 2026
6578a56
update
silicons Jan 24, 2026
8f9052d
Throw more old code
silicons Jan 26, 2026
9a4beb3
erm
silicons Jan 28, 2026
c0c4c9f
Merge remote-tracking branch 'upstream/master' into mirrors
silicons Jan 28, 2026
9fbb2ed
hook everything
silicons Jan 28, 2026
11b550b
that
silicons Jan 28, 2026
99b1b3b
update
silicons Jan 28, 2026
929229f
this shit
silicons Jan 28, 2026
52c3c78
update
silicons Jan 28, 2026
34d292b
that
silicons Jan 28, 2026
f738000
Merge remote-tracking branch 'upstream/master' into mirrors
silicons Jan 28, 2026
e7cea2f
ui serial
silicons Jan 29, 2026
0ee424a
update
silicons Jan 31, 2026
aac0724
update
silicons Feb 2, 2026
96f74d5
update
silicons Feb 2, 2026
c75a073
T
silicons Feb 2, 2026
75193b9
update
silicons Feb 2, 2026
50afdc2
update
silicons Feb 2, 2026
abca340
update
silicons Feb 4, 2026
5a1a4fe
That
silicons Feb 4, 2026
d68b147
update
silicons Feb 4, 2026
586a187
now just mirrortool and ui
silicons Feb 5, 2026
707557f
Console
silicons Feb 5, 2026
83b88b1
progress
silicons Feb 5, 2026
06f2544
Merge remote-tracking branch 'upstream/master' into mirrors
silicons Feb 5, 2026
182f1ed
changes
silicons Feb 7, 2026
f219b86
update
silicons Feb 7, 2026
e9edf8a
mirrortool ui
silicons Feb 7, 2026
abd0e5b
Tsdk
silicons Feb 7, 2026
a6adb3e
t
silicons Feb 7, 2026
b3df95f
ui
silicons Feb 7, 2026
805c615
that
silicons Feb 7, 2026
d4db4dd
update
silicons Feb 8, 2026
7919bf3
console
silicons Feb 8, 2026
2c55cc0
nightmare
silicons Feb 8, 2026
cc56c45
update
silicons Feb 8, 2026
dcde33d
that
silicons Feb 8, 2026
6064488
update
silicons Feb 9, 2026
737acfe
fix
silicons Feb 9, 2026
4d9bf7c
fix
silicons Feb 9, 2026
c853c98
update
silicons Feb 9, 2026
f2ebd9a
update
silicons Feb 9, 2026
107d8ad
update
silicons Feb 9, 2026
11efbed
update
silicons Feb 10, 2026
0c728ec
update
silicons Feb 11, 2026
8b45406
Goodbye virgo
silicons Feb 12, 2026
fbe86ee
That
silicons Feb 12, 2026
e27a234
purge
silicons Feb 12, 2026
f0ab7a9
fix
silicons Feb 12, 2026
e30abc8
fix
silicons Feb 12, 2026
7e7be7d
Fix
silicons Feb 12, 2026
3813ddc
update maps
silicons Feb 12, 2026
e4da321
datumize
silicons Feb 12, 2026
e0e584a
fix
silicons Feb 12, 2026
fc1a7fd
Fix
silicons Feb 12, 2026
30cbe90
hm
silicons Feb 12, 2026
ba45b67
fix
silicons Feb 12, 2026
0f1a8d8
god fuckng fdjcdsdfg
silicons Feb 12, 2026
b4e0154
SIGH
silicons Feb 12, 2026
6ed8e38
ok just run the fucking unit tests gawd damn who care saboutw arnings…
silicons Feb 13, 2026
d30ad81
TOTAL PROTEAN DEATH
silicons Feb 13, 2026
171f290
fix
silicons Feb 13, 2026
d813a8e
fix
silicons Feb 13, 2026
901787d
Merge branch 'emergency-fix' into fancy-typ
silicons Feb 13, 2026
7525367
fix
silicons Feb 13, 2026
05ea598
fuck
silicons Feb 13, 2026
df16e71
update
silicons Feb 13, 2026
2fa2e3b
oops
silicons Feb 13, 2026
046836b
fix
silicons Feb 13, 2026
17e62b5
that
silicons Feb 13, 2026
ae76a6e
fix
silicons Feb 13, 2026
8758cbc
Merge branch 'fancy-typ' into mirrors
silicons Feb 13, 2026
9c12ed2
That
silicons Feb 13, 2026
a8ef86e
lmao
silicons Feb 13, 2026
19c0c97
Fix
silicons Feb 13, 2026
417ac73
fix
silicons Feb 13, 2026
cb623fd
that
silicons Feb 13, 2026
a967cf2
that
silicons Feb 13, 2026
0ca6226
update
silicons Feb 13, 2026
09898fe
FUCK OFF
silicons Feb 13, 2026
43c4470
new test
silicons Feb 13, 2026
bfc58bc
more tests
silicons Feb 13, 2026
a9df02a
Sigh
silicons Feb 13, 2026
4204890
update
silicons Feb 13, 2026
374ccf7
update
silicons Feb 13, 2026
6897ad6
sigh
silicons Feb 13, 2026
c4e8092
i hate vore
silicons Feb 13, 2026
346d9a9
fix
silicons Feb 14, 2026
042a6ec
sigh
silicons Feb 14, 2026
6393fd6
Merge remote-tracking branch 'upstream/master' into mirrors
silicons Feb 14, 2026
3a2068f
sigh
silicons Feb 14, 2026
c791a85
i hate this 'fix' but we'll deal with this later anyways
silicons Feb 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
"editor.codeActionsOnSave": {
"source.fixAll.biome": "explicit"
},
"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"typescript.tsserver.experimental.enableProjectDiagnostics": true,
"files.eol": "\n",
"files.insertFinalNewline": true,
"files.trimTrailingWhitespace": true,
"editor.insertSpaces": false,
"editor.formatOnSave": true,
"git.branchProtection": ["master"],
"gitlens.advanced.blame.customArguments": ["-w"],
"tgstationTestExplorer.project.resultsType": "json",
Expand Down
47 changes: 26 additions & 21 deletions citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,7 @@
#include "code\controllers\subsystem\preferences.dm"
#include "code\controllers\subsystem\radiation.dm"
#include "code\controllers\subsystem\repository.dm"
#include "code\controllers\subsystem\resleeving.dm"
#include "code\controllers\subsystem\server_maint.dm"
#include "code\controllers\subsystem\shuttles.dm"
#include "code\controllers\subsystem\simple_networks.dm"
Expand All @@ -676,7 +677,6 @@
#include "code\controllers\subsystem\time_track.dm"
#include "code\controllers\subsystem\timer.dm"
#include "code\controllers\subsystem\titlescreen.dm"
#include "code\controllers\subsystem\transcore_vr.dm"
#include "code\controllers\subsystem\transfer.dm"
#include "code\controllers\subsystem\turbolift.dm"
#include "code\controllers\subsystem\vis_overlays.dm"
Expand Down Expand Up @@ -772,6 +772,7 @@
#include "code\datums\is_abstract.dm"
#include "code\datums\material_container.dm"
#include "code\datums\mind.dm"
#include "code\datums\mind_ref.dm"
#include "code\datums\mixed.dm"
#include "code\datums\movement_detector.dm"
#include "code\datums\mutable_appearance.dm"
Expand Down Expand Up @@ -1589,7 +1590,6 @@
#include "code\game\machinery\computer\atmos_alert.dm"
#include "code\game\machinery\computer\atmos_control.dm"
#include "code\game\machinery\computer\camera.dm"
#include "code\game\machinery\computer\cloning.dm"
#include "code\game\machinery\computer\communications.dm"
#include "code\game\machinery\computer\computer.dm"
#include "code\game\machinery\computer\crew.dm"
Expand Down Expand Up @@ -1671,6 +1671,8 @@
#include "code\game\machinery\suit_storage\suit_storage_massive.dm"
#include "code\game\machinery\suit_storage\suit_storage_prepared.dm"
#include "code\game\machinery\suit_storage\suit_storage_unit.dm"
#include "code\game\machinery\systems\_system.dm"
#include "code\game\machinery\systems\occupant_pod.dm"
#include "code\game\machinery\telecomms\_telecomms.dm"
#include "code\game\machinery\telecomms\allinone.dm"
#include "code\game\machinery\telecomms\blackbox.dm"
Expand Down Expand Up @@ -1804,6 +1806,7 @@
#include "code\game\objects\items\blueprints.dm"
#include "code\game\objects\items\bodybag.dm"
#include "code\game\objects\items\contraband.dm"
#include "code\game\objects\items\disk.dm"
#include "code\game\objects\items\falling_object.dm"
#include "code\game\objects\items\gifts.dm"
#include "code\game\objects\items\glassjar.dm"
Expand Down Expand Up @@ -1883,7 +1886,6 @@
#include "code\game\objects\items\devices\paicard.dm"
#include "code\game\objects\items\devices\pipe_painter.dm"
#include "code\game\objects\items\devices\powersink.dm"
#include "code\game\objects\items\devices\scanners_vr.dm"
#include "code\game\objects\items\devices\spy_bug.dm"
#include "code\game\objects\items\devices\suit_cooling.dm"
#include "code\game\objects\items\devices\t_scanner.dm"
Expand Down Expand Up @@ -3881,6 +3883,7 @@
#include "code\modules\mob\mob-melee_attack_chain.dm"
#include "code\modules\mob\mob-movement.dm"
#include "code\modules\mob\mob-movespeed.dm"
#include "code\modules\mob\mob-resleeving.dm"
#include "code\modules\mob\mob-say-legacy.dm"
#include "code\modules\mob\mob-say-triggers.dm"
#include "code\modules\mob\mob-say.dm"
Expand Down Expand Up @@ -3913,14 +3916,14 @@
#include "code\modules\mob\_modifiers\traits.dm"
#include "code\modules\mob\_modifiers\traits_phobias.dm"
#include "code\modules\mob\_modifiers\unholy.dm"
#include "code\modules\mob\characteristics\characteristic_holder-ui.dm"
#include "code\modules\mob\characteristics\characteristic_holder.dm"
#include "code\modules\mob\characteristics\characteristic_skill.dm"
#include "code\modules\mob\characteristics\characteristic_stat.dm"
#include "code\modules\mob\characteristics\characteristic_talent.dm"
#include "code\modules\mob\characteristics\helpers.dm"
#include "code\modules\mob\characteristics\holder.dm"
#include "code\modules\mob\characteristics\mob.dm"
#include "code\modules\mob\characteristics\presets.dm"
#include "code\modules\mob\characteristics\skill.dm"
#include "code\modules\mob\characteristics\stat.dm"
#include "code\modules\mob\characteristics\talent.dm"
#include "code\modules\mob\characteristics\ui.dm"
#include "code\modules\mob\characteristics\skills\engineering.dm"
#include "code\modules\mob\characteristics\skills\logistics.dm"
#include "code\modules\mob\characteristics\skills\medical.dm"
Expand Down Expand Up @@ -4008,6 +4011,7 @@
#include "code\modules\mob\living\carbon\carbon-blood.dm"
#include "code\modules\mob\living\carbon\carbon-cpr.dm"
#include "code\modules\mob\living\carbon\carbon-damage.dm"
#include "code\modules\mob\living\carbon\carbon-death.dm"
#include "code\modules\mob\living\carbon\carbon-defense.dm"
#include "code\modules\mob\living\carbon\carbon-emote.dm"
#include "code\modules\mob\living\carbon\carbon-hands.dm"
Expand All @@ -4020,6 +4024,7 @@
#include "code\modules\mob\living\carbon\carbon_movement.dm"
#include "code\modules\mob\living\carbon\carbon_powers.dm"
#include "code\modules\mob\living\carbon\damage_procs.dm"
#include "code\modules\mob\living\carbon\death.dm"
#include "code\modules\mob\living\carbon\give.dm"
#include "code\modules\mob\living\carbon\health.dm"
#include "code\modules\mob\living\carbon\inventory.dm"
Expand Down Expand Up @@ -4072,6 +4077,7 @@
#include "code\modules\mob\living\carbon\human\human-defense.dm"
#include "code\modules\mob\living\carbon\human\human-interaction.dm"
#include "code\modules\mob\living\carbon\human\human-melee_attack_chain.dm"
#include "code\modules\mob\living\carbon\human\human-resleeving.dm"
#include "code\modules\mob\living\carbon\human\human.dm"
#include "code\modules\mob\living\carbon\human\human_attackhand.dm"
#include "code\modules\mob\living\carbon\human\human_defines.dm"
Expand Down Expand Up @@ -4298,7 +4304,6 @@
#include "code\modules\mob\living\silicon\robot\items\robot_upgrade.dm"
#include "code\modules\mob\living\silicon\robot\items\robot_builtin\dog_boop_module.dm"
#include "code\modules\mob\living\silicon\robot\items\robot_builtin\dog_jaws.dm"
#include "code\modules\mob\living\silicon\robot\items\robot_builtin\dog_mirrortool.dm"
#include "code\modules\mob\living\silicon\robot\items\robot_builtin\dog_pounce.dm"
#include "code\modules\mob\living\silicon\robot\items\robot_builtin\dog_sleeper.dm"
#include "code\modules\mob\living\silicon\robot\items\robot_builtin\dog_swordtail.dm"
Expand Down Expand Up @@ -4557,14 +4562,12 @@
#include "code\modules\mob\new_player\new_player.dm"
#include "code\modules\mob\new_player\poll.dm"
#include "code\modules\mob\new_player\skill.dm"
#include "code\modules\mob\observer\death.dm"
#include "code\modules\mob\observer\mobility.dm"
#include "code\modules\mob\observer\observer.dm"
#include "code\modules\mob\observer\perspective.dm"
#include "code\modules\mob\observer\dead\dead-emote.dm"
#include "code\modules\mob\observer\dead\dead-emote_custom.dm"
#include "code\modules\mob\observer\dead\dead.dm"
#include "code\modules\mob\observer\dead\free_vr.dm"
#include "code\modules\mob\observer\dead\logout.dm"
#include "code\modules\mob\observer\dead\observer_movement.dm"
#include "code\modules\mob\observer\dead\orbit.dm"
Expand Down Expand Up @@ -4959,7 +4962,6 @@
#include "code\modules\preferences\preference_setup\vore\01_ears.dm"
#include "code\modules\preferences\preference_setup\vore\02_size.dm"
#include "code\modules\preferences\preference_setup\vore\04_autohiss.dm"
#include "code\modules\preferences\preference_setup\vore\05_resleeving.dm"
#include "code\modules\preferences\preference_setup\vore\06_persistence.dm"
#include "code\modules\preferences\preference_setup\vore\08_traits.dm"
#include "code\modules\preferences\preference_setup\vore\09_nif.dm"
Expand Down Expand Up @@ -5309,15 +5311,17 @@
#include "code\modules\research\machinery\rdmachines.dm"
#include "code\modules\research\machinery\server.dm"
#include "code\modules\resleeving\circuitboards.dm"
#include "code\modules\resleeving\computers.dm"
#include "code\modules\resleeving\documents.dm"
#include "code\modules\resleeving\implant.dm"
#include "code\modules\resleeving\infocore_records.dm"
#include "code\modules\resleeving\infomorph.dm"
#include "code\modules\resleeving\infomorph_software.dm"
#include "code\modules\resleeving\machines.dm"
#include "code\modules\resleeving\mirror.dm"
#include "code\modules\resleeving\sleevecard.dm"
#include "code\modules\resleeving\datums\resleeving_body_backup.dm"
#include "code\modules\resleeving\datums\resleeving_mind_backup.dm"
#include "code\modules\resleeving\items\books.dm"
#include "code\modules\resleeving\items\mirror.dm"
#include "code\modules\resleeving\items\mirrortool.dm"
#include "code\modules\resleeving\machines\body_printer.dm"
#include "code\modules\resleeving\machines\grower_pod.dm"
#include "code\modules\resleeving\machines\resleeving.dm"
#include "code\modules\resleeving\machines\resleeving_console.dm"
#include "code\modules\resleeving\machines\resleeving_pod.dm"
#include "code\modules\resleeving\machines\synth_fab.dm"
#include "code\modules\rogueminer_vr\asteroid.dm"
#include "code\modules\rogueminer_vr\controller.dm"
#include "code\modules\rogueminer_vr\debug.dm"
Expand Down Expand Up @@ -6043,6 +6047,7 @@
#include "code\modules\xenobio\items\weapons.dm"
#include "code\modules\xenobio\machinery\processor.dm"
#include "code\unit_tests\_unit_tests.dm"
#include "code\unit_tests\unit_test_way_of_killing_someone.dm"
#include "fluff\donator\legacy.dm"
#include "fluff\donator\djkouta\donator_cloak.dm"
#include "fluff\donator\timothytea\donator_bedsheet.dm"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,8 @@ GLOBAL_LIST_EMPTY(##LIST_NAME);\
//name for blank icon states for clothing
#define CLOTHING_BLANK_ICON_STATE "blank"

#define CLONE_BIOMASS 30

#define BUTTON_SLIDE_IN (1<<0)
#define BUTTON_FADE_IN (1<<1)
#define BUTTON_FADE_OUT (1<<2)
3 changes: 3 additions & 0 deletions code/__DEFINES/mobs/organs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
O_STOMACH, \
O_INTESTINE)

// REWORK ON ORGAN REFACTOR!
// Organ tag for mirrors.
#define ORGAN_TAG_MIRROR "mirror"

//* AUGMENTS *//
#define O_AUG_EYES "occular augment"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/traits/sources.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

/// cryotube
#define CRYO_TUBE_TRAIT "cryotube"
/// resleeving body grower
#define TRAIT_SOURCE_MACHINE_BODY_GROWER "machine-body-grower"

//? Mob Sources

Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/_logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
#define testing_profile_local_output(NAME) testing_profile_output(NAME, _timer_system)
#define testing_profile_local_output_all testing_profile_output_all(_timer_system)

#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM)
#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) || defined(COMPILE_UNIT_TESTS)
/proc/log_test(text)
WRITE_LOG(GLOB.test_log, text)
SEND_TEXT(world.log, text)
Expand Down
56 changes: 28 additions & 28 deletions code/__HELPERS/type_processing.dm
Original file line number Diff line number Diff line change
@@ -1,55 +1,52 @@
// Longer paths should come after shorter ones
/**
* List of fancy type replacements.
* * Longer paths should come after shorter ones.
* * Unfortunately, all paths must be included in some way, hence 'DATUM' existing. Otherwise shit breaks.
*/
GLOBAL_LIST_INIT(fancy_type_replacements, list(
/datum = "DATUM",
/area = "AREA",

/atom = "ATOM",
/atom/movable = "MOVABLE",
/obj = "OBJ",

/turf = "TURF",
/turf/simulated = "SIMULATED",
/turf/simulated/floor = "FLOOR",

/mob = "MOB",
/mob/living = "LIVING",
/mob/living/carbon = "CARBON",
/mob/living/carbon/human = "HUMANOID",
/mob/living/simple_mob = "SIMPLE",
/mob/living/carbon/human = "HUMAN",
/mob/living/simple_mob = "SIMPLE_MOB",
/mob/living/silicon = "SILICON",
/mob/living/silicon/robot = "CYBORG",
/mob/living/silicon/robot = "ROBOT",

/obj = "OBJ",

/obj/item = "ITEM",
/obj/item/organ = "ORGAN",
/obj/item/gun = "GUN",
/obj/item/gun/projectile/ballistic = "GUN_BALLISTIC",
/obj/item/gun/projectile/energy = "GUN_ENERGY",
/obj/item/gun/projectile/magnetic = "GUN_MAGNETIC",
/obj/item/ammo_casing = "AMMO",
/obj/item/ammo_magazine = "MAGAZINE",
/obj/item/gun_attachment = "GUN_ATTATCHMENT",
/obj/item/ammo_casing = "AMMO_CASING",
/obj/item/ammo_magazine = "AMMO_MAGAZINE",
/obj/item/gun_attachment = "GUN_ATTACHMENT",
/obj/item/gun_component = "GUN_COMPONENT",
/obj/item/stack/material = "MATERIAL",
/obj/item/stack/ore = "ORE",
/obj/item/aiModule = "AI_LAW_MODULE",
/obj/item/aiModule = "AIMODULE",
/obj/item/circuitboard = "CIRCUITBOARD",
/obj/item/circuitboard/machine = "MACHINE_BOARD",
/obj/item/circuitboard/computer = "COMPUTER_BOARD",
/obj/item/circuitboard/machine = "MACHINE-BOARD",
/obj/item/circuitboard/computer = "COMPUTER-BOARD",
/obj/item/reagent_containers = "REAGENT_CONTAINERS",
/obj/item/reagent_containers/pill = "PILL",
/obj/item/reagent_containers/pill/patch = "MEDPATCH",
/obj/item/reagent_containers/pill/patch = "PATCH",
/obj/item/reagent_containers/food = "FOOD",
/obj/item/reagent_containers/food/drinks = "DRINK",
/obj/effect/decal/cleanable = "CLEANABLE",
/obj/item/reagent_containers/food/drinks = "DRINKS",
/obj/item/radio/headset = "HEADSET",
/obj/item/clothing = "CLOTHING",
/obj/item/clothing/accessory = "ACCESSORY",
/obj/item/clothing/mask/gas = "GASMASK",
/obj/item/clothing/mask = "MASK",
/obj/item/clothing/gloves = "GLOVES",
/obj/item/clothing/shoes = "SHOES",
/obj/item/clothing/under = "JUMPSUIT",
/obj/item/clothing/suit/armor = "ARMOR",
/obj/item/clothing/suit = "SUIT",
/obj/item/clothing/head/helmet = "HELMET",
/obj/item/clothing/head = "HEAD",
/obj/item/storage = "STORAGE",
/obj/item/storage/backpack = "BACKPACK",
/obj/item/storage/belt = "BELT",
/obj/item/storage/pill_bottle = "PILL_BOTTLE",
Expand All @@ -66,8 +63,6 @@ GLOBAL_LIST_INIT(fancy_type_replacements, list(
/obj/structure = "STRUCTURE",
/obj/structure/closet = "CLOSET",
/obj/structure/closet/crate = "CRATE",
/obj/structure/closet/crate/secure = "LOCKED_CRATE",
/obj/structure/closet/secure_closet = "LOCKED_CLOSET",

/obj/machinery = "MACHINERY",
/obj/machinery/atmospherics = "ATMOS_MECH",
Expand All @@ -78,8 +73,13 @@ GLOBAL_LIST_INIT(fancy_type_replacements, list(
/obj/machinery/vending = "VENDING",

/obj/effect = "EFFECT",
/obj/effect/decal/cleanable = "CLEANABLE",
/obj/effect/debris = "DEBRIS",
/obj/projectile = "PROJECTILE",

/obj/overmap = "OVERMAP",
/obj/overmap/entity = "OVERMAP-ENTITY",
/obj/overmap/tiled = "OVERMAP-TILE",
))

/proc/make_types_fancy(list/types)
Expand All @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(fancy_type_replacements, list(
if(!types_to_replacement)
// ignore_root_path so we can draw the root normally
var/list/fancy_type_cache = GLOB.fancy_type_replacements
var/list/local_replacements = zebra_typecacheof(fancy_type_cache, ignore_root_path = TRUE)
var/list/local_replacements = zebra_typecacheof(fancy_type_cache)
var/list/local_texts = list()
for(var/key in fancy_type_cache)
local_texts[local_replacements[key]] = "[key]"
Expand Down
4 changes: 3 additions & 1 deletion code/___compile_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@
#endif // REFERENCE_TRACKING_STANDARD

// If this is uncommented, we do a single run though of the game setup and tear down process with unit tests in between
//#define UNIT_TESTS
// #define UNIT_TESTS
// If this is uncommented, we compile in unit tests.
// #define COMPILE_UNIT_TESTS

// If this is uncommented, will attempt to load and initialize prof.dll/libprof.so by default.
// Even if it's not defined, you can pass "tracy" via -params in order to try to load it.
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/configuration/entries/skills.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/config_entry/flag/characteristics_enabled
/datum/config_entry/flag/characteristic_enabled
config_entry_value = TRUE

/datum/config_entry/flag/characteristics_active
/datum/config_entry/flag/characteristic_active
config_entry_value = FALSE
7 changes: 0 additions & 7 deletions code/controllers/legacy-hook-defs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@
*/
/legacy_hook/death

/**
* Cloning hook.
* Called in cloning.dm when someone is brought back by the wonders of modern science.
* Parameters: var/mob/living/carbon/human
*/
/legacy_hook/clone

/**
* Debrained hook.
* Called in brain_item.dm when someone gets debrained.
Expand Down
Loading
Loading