Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
245 commits
Select commit Hold shift + click to select a range
588db2e
TGUI Preferences Menu + total rewrite of the preferences backend (#17…
ThatLing Jan 6, 2023
c98134e
Automatic changelog generation #17368 [ci skip]
Yogbot-13 Jan 6, 2023
d4859dc
AHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
JamieD1 Jan 7, 2023
4ec50a2
e
JamieD1 Jan 7, 2023
7f4c2bd
Fix some TS stuff
ThatLing Jan 7, 2023
7c6bd6e
Sort quirks starting from good
ThatLing Jan 7, 2023
f98183a
Fix skin tone selector
ThatLing Jan 7, 2023
5569ecf
Jamie Fixes
JamieD1 Jan 7, 2023
a0fc8f6
Update moth.dm
Bibby0110 Jan 7, 2023
1616def
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
Bibby0110 Jan 7, 2023
b596130
Fix latejoin menu + tweaks
ThatLing Jan 7, 2023
33e5046
Merge remote-tracking branch 'yogstation13/preferences' into preferences
ThatLing Jan 7, 2023
e434157
Some fixes
JamieD1 Jan 8, 2023
4358a0d
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 8, 2023
61f9725
Merge branch 'master' into preferences
JamieD1 Jan 8, 2023
7b6b309
Finally fix job selection
ThatLing Jan 8, 2023
05065b6
e
JamieD1 Jan 8, 2023
efa6dd4
Ling
JamieD1 Jan 8, 2023
3a36453
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 8, 2023
c675bd8
MORE
JamieD1 Jan 8, 2023
51e2808
Merge branch 'master' into preferences
ThatLing Jan 11, 2023
1e39425
config
ThatLing Jan 12, 2023
f5a3e61
Convert pref: ooccolor
ThatLing Jan 12, 2023
ae59af7
Convert pref: asay color
ThatLing Jan 12, 2023
699eb4b
Convert pref: tooltips
ThatLing Jan 12, 2023
fbfecf5
Convert pref: ui style
ThatLing Jan 12, 2023
366f441
Convert pref: buttons locked
ThatLing Jan 12, 2023
5380278
Convert pref: hotkeys
ThatLing Jan 12, 2023
464891e
Convert pref: tgui stuff
ThatLing Jan 12, 2023
edfc3fc
Convert pref: windowflashing
ThatLing Jan 12, 2023
238e6f3
Convert pref: ghost stuff
ThatLing Jan 12, 2023
3bf11c2
Convert pref: map & antag
ThatLing Jan 12, 2023
e85c888
Convert pref: PDA stuff
ThatLing Jan 12, 2023
27145fe
Convert pref: credits & glasses
ThatLing Jan 12, 2023
43bbfc0
Convert pref: name
ThatLing Jan 12, 2023
9ce3c7f
Merge branch 'master' into preferences
ThatLing Jan 12, 2023
264cf4d
Convert pref: appearances 1
ThatLing Jan 12, 2023
3c3e5b1
Convert pref: appearances 2
ThatLing Jan 12, 2023
2a953ef
Convert pref: jobless role
ThatLing Jan 12, 2023
4f2b68a
Convert pref: runechat
ThatLing Jan 12, 2023
041e1ee
Convert pref: yogtoggles + tail wagging
ThatLing Jan 12, 2023
98e4c4e
Convert pref: client fps
ThatLing Jan 12, 2023
0c529d0
Convert pref: graphic settings
ThatLing Jan 12, 2023
8e1670d
Convert pref: pda uplink & menuoptions
ThatLing Jan 12, 2023
66e3b38
Convert pref: map & flare
ThatLing Jan 12, 2023
6a45f0b
Convert pref: Bar choice
ThatLing Jan 12, 2023
8a03a67
Fix setup character button
ThatLing Jan 12, 2023
9f7818b
Convert pref: alt announcer
ThatLing Jan 12, 2023
0591b55
Fix
ThatLing Jan 12, 2023
25b49d0
Add cycle background button
ThatLing Jan 12, 2023
f3cd58d
Convert pref: disable balloon alert
ThatLing Jan 12, 2023
4de85e9
fix
ThatLing Jan 12, 2023
5ae1cc4
Clean savefile
ThatLing Jan 12, 2023
54c905d
Fix backpack pref
ThatLing Jan 12, 2023
6f7a21e
Fix underwear selection
ThatLing Jan 13, 2023
b340172
Fixes some shit
JamieD1 Jan 13, 2023
c2726e4
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 13, 2023
ac2ac43
Updates
JamieD1 Jan 13, 2023
d07f7c9
Fix computer runtime
ThatLing Jan 13, 2023
6f72da9
Fix pref names
ThatLing Jan 13, 2023
77031e6
Convert pref: donor item & hat
ThatLing Jan 13, 2023
7c812a9
More computer fixes
ThatLing Jan 13, 2023
fa3218b
Convert pref: borg hat
ThatLing Jan 13, 2023
2dac0fc
Convert pref: donor pda (broken)
ThatLing Jan 13, 2023
3d76aa4
Convert pref: purrbation
ThatLing Jan 13, 2023
8f0f673
Convert pref: afreeze
ThatLing Jan 13, 2023
9e5c9d9
Convert pref: accent
ThatLing Jan 13, 2023
00fd01d
Various savefile improvements
ThatLing Jan 13, 2023
e8381de
Convert pref: persistent scars
ThatLing Jan 13, 2023
94512e2
A few pref fixes
ThatLing Jan 13, 2023
78867ea
Some more fixes
ThatLing Jan 13, 2023
2bd0490
Various SSoverlays improvements
ThatLing Jan 13, 2023
db0b738
Add IPC appearances
ThatLing Jan 14, 2023
edf47a4
Add polysmorph appearances
ThatLing Jan 14, 2023
cd49b46
No icons for ipc and polysmorph
ThatLing Jan 14, 2023
cb13413
Podpeople deserve death
ThatLing Jan 14, 2023
81890fe
Add plasmaman appearance
ThatLing Jan 15, 2023
5e59a9b
Merge remote-tracking branch 'yogstation13/master' into preferences
ThatLing Jan 15, 2023
e503fdb
h
ThatLing Jan 15, 2023
ec76002
fix
ThatLing Jan 15, 2023
634acbf
fix2
ThatLing Jan 15, 2023
81a40de
asdf
ThatLing Jan 15, 2023
fc94577
fsdf
ThatLing Jan 15, 2023
4d27fa6
aaaaa
ThatLing Jan 15, 2023
9ca70d1
FUCK MOTHS
JamieD1 Jan 15, 2023
f2111b7
Preternis color
ThatLing Jan 15, 2023
0a31141
e
JamieD1 Jan 15, 2023
ab78af6
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 15, 2023
e9a8c63
e
JamieD1 Jan 15, 2023
2111d4a
Update human.dmi
JamieD1 Jan 15, 2023
528d3a1
icon fix
ThatLing Jan 15, 2023
1c5acce
Merge remote-tracking branch 'yogstation13/preferences' into preferences
ThatLing Jan 15, 2023
57babca
un snowflake
ThatLing Jan 15, 2023
ede55a1
fix underwear icon
ThatLing Jan 15, 2023
d0dcc4e
remove color from here
ThatLing Jan 15, 2023
fc7efd6
donor ree
ThatLing Jan 15, 2023
3cdee9c
aa
ThatLing Jan 15, 2023
ba037d1
maybe
ThatLing Jan 16, 2023
d99a1c1
Restore a bunch of TGUI files
ThatLing Jan 16, 2023
9682a6a
More TGUI fixes
ThatLing Jan 16, 2023
b43f41a
test
ThatLing Jan 16, 2023
cdcab2e
Fix more errors
ThatLing Jan 16, 2023
9b7822f
a
ThatLing Jan 16, 2023
bb3e7ce
test
JamieD1 Jan 16, 2023
6d06922
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 16, 2023
714a515
e?
ThatLing Jan 16, 2023
6356180
Merge remote-tracking branch 'yogstation13/preferences' into preferences
ThatLing Jan 16, 2023
e0b7c96
a;lso this
ThatLing Jan 16, 2023
14d044a
maybe
ThatLing Jan 16, 2023
d8583e0
Fix
JamieD1 Jan 16, 2023
c72ae56
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 16, 2023
e763626
Revert "maybe"
JamieD1 Jan 16, 2023
dda23ee
fuck off m8
JamieD1 Jan 16, 2023
c5c3f4e
e
JamieD1 Jan 16, 2023
de33cfc
fak off m8
JamieD1 Jan 16, 2023
a723583
e2?
JamieD1 Jan 16, 2023
ad2d23e
AHHH
JamieD1 Jan 16, 2023
a7f8f52
AHA
JamieD1 Jan 16, 2023
a1926df
AHHH
JamieD1 Jan 16, 2023
5c8fac4
fix linter 2
ThatLing Jan 16, 2023
1868143
debug
JamieD1 Jan 16, 2023
8d4a4fb
fix runtime
ThatLing Jan 16, 2023
49da67a
Update dynamic.json
JamieD1 Jan 16, 2023
997aaeb
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 16, 2023
9c2a376
Revert "debug"
JamieD1 Jan 16, 2023
cf22c80
2
ThatLing Jan 16, 2023
7135ad1
Merge remote-tracking branch 'yogstation13/preferences' into preferences
ThatLing Jan 16, 2023
cd029b1
who sleeps in an async?
ThatLing Jan 16, 2023
f76c5e3
Hack
JamieD1 Jan 16, 2023
89f13ce
e
JamieD1 Jan 16, 2023
574087f
Fix a few blocking calls
ThatLing Jan 16, 2023
73534f9
Oh bother
ThatLing Jan 16, 2023
0dac786
Stay dead
ThatLing Jan 16, 2023
88d852a
Merge remote-tracking branch 'yogstation13/preferences' into preferences
ThatLing Jan 16, 2023
b54ef7a
fuck
ThatLing Jan 16, 2023
cdc1910
Update jobs.dm
JamieD1 Jan 16, 2023
8c38541
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 16, 2023
3bcf057
move debugging
JamieD1 Jan 16, 2023
24c50ef
Update jobs.dm
JamieD1 Jan 16, 2023
6e8e539
Test
JamieD1 Jan 16, 2023
4082e3b
YEET
JamieD1 Jan 16, 2023
743b3f0
Revert "YEET"
JamieD1 Jan 16, 2023
247aa85
Update jobs.dm
JamieD1 Jan 16, 2023
4cc331d
Update jobs.dm
JamieD1 Jan 16, 2023
80ce4f8
e
JamieD1 Jan 16, 2023
f7448cc
Fix sechailer runtime
ThatLing Jan 16, 2023
89105ea
Fix human hair color
ThatLing Jan 16, 2023
2f2adff
d
ThatLing Jan 16, 2023
5b4def7
Ports part of that job refactor
ThatLing Jan 16, 2023
86e1e92
Convert latejoin to new departments
ThatLing Jan 16, 2023
3350a3e
Fix ghost form
ThatLing Jan 16, 2023
e261abc
Quirk validation
ThatLing Jan 16, 2023
774d323
Hopefully pod color fix
ThatLing Jan 16, 2023
63eb203
oops
ThatLing Jan 16, 2023
d235cca
Prayge job fix
ThatLing Jan 17, 2023
c3954cf
test
ThatLing Jan 17, 2023
7d9eb77
Better unit test asset loading
ThatLing Jan 17, 2023
05d3c55
Remove print
ThatLing Jan 17, 2023
394170c
Add error just in case
ThatLing Jan 17, 2023
c61b9b6
Remove brief outfit and bypass centcom deadmin
ThatLing Jan 17, 2023
3ded2bc
Remove broadcast login/logout
ThatLing Jan 17, 2023
f96c214
Remove darkened flash
ThatLing Jan 17, 2023
143fa8a
Remove fov darkness
ThatLing Jan 17, 2023
9857cf5
Remove ghost lighting
ThatLing Jan 17, 2023
9d70842
Remove some tgui prefs
ThatLing Jan 17, 2023
1f781e8
Typo fix
ThatLing Jan 17, 2023
84ca3df
Small fixes
ThatLing Jan 17, 2023
67721f6
IPC name fix
ThatLing Jan 17, 2023
3a91fae
IPC and pod colors
ThatLing Jan 17, 2023
3386e8a
Jobless fix
ThatLing Jan 17, 2023
980a14a
Donor item fix
ThatLing Jan 17, 2023
7db4ac2
Oopsie
ThatLing Jan 17, 2023
5899843
Quirk bandaid
ThatLing Jan 17, 2023
276cc73
Misc
ThatLing Jan 17, 2023
b77038c
Merge remote-tracking branch 'yogstation13/master' into preferences
ThatLing Jan 19, 2023
c1bdfa7
Move new prefs to Preferences tab for now
ThatLing Jan 19, 2023
24580b3
Add skillcape
ThatLing Jan 19, 2023
3c8ed1e
FUCK THIS SHIT
JamieD1 Jan 19, 2023
867e23d
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 19, 2023
3f30221
Merge remote-tracking branch 'yogstation13/master' into preferences
ThatLing Jan 21, 2023
b11b6db
Remove /tg/ gamer cloak
ThatLing Jan 21, 2023
2031f43
Restrict some job related preferences to clean up UI
ThatLing Jan 21, 2023
ba1781d
Remove useless client var
ThatLing Jan 21, 2023
f365093
e
JamieD1 Jan 21, 2023
55e9011
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 21, 2023
9dbafd7
Merge remote-tracking branch 'yogstation13/preferences' into preferences
ThatLing Jan 21, 2023
438cf4a
Small tweaks
ThatLing Jan 21, 2023
382e23c
Dont allow selecting mood quirks if mood is disabled
ThatLing Jan 21, 2023
875a694
AHHH
JamieD1 Jan 21, 2023
3a0f22e
Filter ckey-locked donor items
ThatLing Jan 21, 2023
e5747be
stupid jamie
ThatLing Jan 21, 2023
185bd0f
AI core display fix
ThatLing Jan 21, 2023
3c3598c
Move donor stuff back to the top
ThatLing Jan 21, 2023
4325899
Merge remote-tracking branch 'yogstation13/master' into preferences
ThatLing Jan 21, 2023
5480402
Remove TODOs
ThatLing Jan 22, 2023
d7a4981
Clean up perks
ThatLing Jan 22, 2023
740ad18
Linter fixes
ThatLing Jan 22, 2023
ebfae95
e
JamieD1 Jan 22, 2023
a80d164
WORKS
JamieD1 Jan 22, 2023
7d02286
LORE
JamieD1 Jan 22, 2023
2113e74
Fix skillcape list
ThatLing Jan 22, 2023
8f69beb
Backpack why
ThatLing Jan 22, 2023
a589da1
Merge remote-tracking branch 'yogstation13/preferences' into preferences
ThatLing Jan 22, 2023
8434445
Fixes
JamieD1 Jan 22, 2023
9eca1fb
Fix cargo console
ThatLing Jan 22, 2023
4637d3d
Remove these
ThatLing Jan 22, 2023
10cab4d
Add horns, frills and mark
ThatLing Jan 22, 2023
80f2e57
Fix not applying all features
ThatLing Jan 22, 2023
f9388b4
Add some missing mutant bodyparts
ThatLing Jan 22, 2023
188d347
Update numberinput
ThatLing Jan 22, 2023
42b2dbb
Makes animatednumber cooler
ThatLing Jan 22, 2023
d5799b1
Oops
ThatLing Jan 23, 2023
eb89483
Add default ghost orbit
ThatLing Jan 23, 2023
646fd84
Default to normal backpack
ThatLing Jan 23, 2023
fbd8f7e
Fixes skillcapes not being filtered
adamsong Jan 23, 2023
78ad1b8
Donor fix prayge
ThatLing Jan 23, 2023
ff2815a
yep
ThatLing Jan 23, 2023
20d436b
Adds fallback latejoin menu
ThatLing Jan 24, 2023
5330be4
Rework donor stuff a bit
ThatLing Jan 24, 2023
885c4ed
Fix donor tgui logic
ThatLing Jan 24, 2023
97cc1ee
Delete unused proc
ThatLing Jan 24, 2023
778f240
Update FA
ThatLing Jan 24, 2023
40b8f07
Un-yogify quirks
ThatLing Jan 24, 2023
ba03ade
Better checking of quirks
ThatLing Jan 24, 2023
5a5d2c1
Update tgfont
ThatLing Jan 24, 2023
334f1d2
Fix quirk icons
ThatLing Jan 24, 2023
ed93f74
Fix backup name
ThatLing Jan 26, 2023
882394c
Fix donor stuff
ThatLing Jan 26, 2023
c5b6706
Merge remote-tracking branch 'yogstation13/master' into preferences
ThatLing Jan 26, 2023
b0eb297
A few runtime fixes
ThatLing Jan 27, 2023
aa13ad4
Fix another runtime
ThatLing Jan 27, 2023
b24e024
Give fallback latejoin verb upon connecting
ThatLing Jan 27, 2023
7e240e8
Update AirAlarm interface
ThatLing Jan 27, 2023
bd48442
maybe this works
ThatLing Jan 27, 2023
7f48e13
Test
JamieD1 Jan 28, 2023
e7cafff
Merge branch 'master' into preferences
JamieD1 Jan 28, 2023
5fe7aae
Sentient
JamieD1 Jan 28, 2023
873ec87
Merge branch 'preferences' of https://github.com/yogstation13/Yogstat…
JamieD1 Jan 28, 2023
6374c58
Remove AI core display preview icons
ThatLing Jan 28, 2023
137e301
Fix resetting plasmaman helmet style
ThatLing Jan 28, 2023
28a7093
Equip plasman in preview
ThatLing Jan 28, 2023
02d1507
Fix plasmaman preview icon
ThatLing Jan 28, 2023
7346466
Merge remote-tracking branch 'yogstation13/preferences' into preferences
ThatLing Jan 28, 2023
0276e80
fuck keybind fix
ThatLing Jan 28, 2023
b5698e8
Extra keybind sanity
ThatLing Jan 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -216,5 +216,4 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
/_maps/templates.dm

#KDIFF3 files
*.orig
tgui/public/
*.orig
16 changes: 16 additions & 0 deletions code/__DEFINES/DNA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,19 @@
#define G_MALE 1
#define G_FEMALE 2
#define G_PLURAL 3

// Defines for used in creating "perks" for the species preference pages.
/// A key that designates UI icon displayed on the perk.
#define SPECIES_PERK_ICON "ui_icon"
/// A key that designates the name of the perk.
#define SPECIES_PERK_NAME "name"
/// A key that designates the description of the perk.
#define SPECIES_PERK_DESC "description"
/// A key that designates what type of perk it is (see below).
#define SPECIES_PERK_TYPE "perk_type"

// The possible types each perk can be.
// Positive perks are shown in green, negative in red, and neutral in grey.
#define SPECIES_POSITIVE_PERK "positive"
#define SPECIES_NEGATIVE_PERK "negative"
#define SPECIES_NEUTRAL_PERK "neutral"
3 changes: 3 additions & 0 deletions code/__DEFINES/antagonists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
#define BLOB_RANDOM_PLACEMENT 1


/// The dimensions of the antagonist preview icon. Will be scaled to this size.
#define ANTAGONIST_PREVIEW_ICON_SIZE 96

/// How many telecrystals a normal traitor starts with
#define TELECRYSTALS_DEFAULT 20
/// How many telecrystals mapper/admin only "precharged" uplink implant
Expand Down
6 changes: 6 additions & 0 deletions code/__DEFINES/colors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define COLOR_ALMOST_BLACK "#333333"
#define COLOR_BLACK "#000000"
#define COLOR_RED "#FF0000"
#define COLOR_MOSTLY_PURE_RED "#FF3300"
#define COLOR_RED_LIGHT "#FF3333"
#define COLOR_MAROON "#800000"
#define COLOR_YELLOW "#FFFF00"
Expand All @@ -29,6 +30,7 @@
#define COLOR_PINK "#FFC0CB"
#define COLOR_MAGENTA "#FF00FF"
#define COLOR_PURPLE "#800080"
#define COLOR_STRONG_VIOLET "#6927c5"
#define COLOR_ORANGE "#FF9900"
#define COLOR_PALE_ORANGE "#FFBE9D"
#define COLOR_BEIGE "#CEB689"
Expand All @@ -43,6 +45,7 @@
#define COLOR_PALE_RED_GRAY "#D59998"
#define COLOR_PALE_PURPLE_GRAY "#CBB1CA"
#define COLOR_PURPLE_GRAY "#AE8CA8"
#define COLOR_VIBRANT_LIME "#00FF00"

//Color defines used by the assembly detailer.
#define COLOR_ASSEMBLY_BLACK "#545454"
Expand All @@ -60,3 +63,6 @@
#define COLOR_ASSEMBLY_LBLUE "#5D99BE"
#define COLOR_ASSEMBLY_BLUE "#38559E"
#define COLOR_ASSEMBLY_PURPLE "#6F6192"

/// The default color for admin say, used as a fallback when the preference is not enabled
#define DEFAULT_ASAY_COLOR "#996600"
20 changes: 9 additions & 11 deletions code/__DEFINES/flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,23 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define CONDUCT_1 (1<<5)
/// For machines and structures that should not break into parts, eg, holodeck stuff
#define NODECONSTRUCT_1 (1<<7)
/// atom queued to SSoverlay
#define OVERLAY_QUEUED_1 (1<<8)
/// item has priority to check when entering or leaving
#define ON_BORDER_1 (1<<9)
#define ON_BORDER_1 (1<<8)
/// Prevent clicking things below it on the same turf eg. doors/ fulltile windows
#define PREVENT_CLICK_UNDER_1 (1<<11)
#define HOLOGRAM_1 (1<<12)
#define PREVENT_CLICK_UNDER_1 (1<<9)
#define HOLOGRAM_1 (1<<10)
/// TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
#define TESLA_IGNORE_1 (1<<13)
#define TESLA_IGNORE_1 (1<<11)
///Whether /atom/Initialize() has already run for the object
#define INITIALIZED_1 (1<<14)
#define INITIALIZED_1 (1<<12)
/// was this spawned by an admin? used for stat tracking stuff.
#define ADMIN_SPAWNED_1 (1<<15)
#define ADMIN_SPAWNED_1 (1<<13)
/// should not get harmed if this gets caught by an explosion?
#define PREVENT_CONTENTS_EXPLOSION_1 (1<<16)
#define PREVENT_CONTENTS_EXPLOSION_1 (1<<14)
/// should the contents of this atom be acted upon
#define RAD_PROTECT_CONTENTS_1 (1 << 17)
#define RAD_PROTECT_CONTENTS_1 (1 << 15)
/// should this object be allowed to be contaminated
#define RAD_NO_CONTAMINATE_1 (1 << 18)
#define RAD_NO_CONTAMINATE_1 (1 << 16)

//turf-only flags
#define NOJAUNT_1 (1<<0)
Expand Down
19 changes: 19 additions & 0 deletions code/__DEFINES/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,25 @@
#define MICE (1<<19) //disliked/liked by anything that dislikes/likes any of RAW, MEAT, or GROSS, except felinids
#define NUTS (1<<20)

/// A list of food type names, in order of their flags
#define FOOD_FLAGS list( \
"MEAT", \
"VEGETABLES", \
"RAW", \
"JUNKFOOD", \
"GRAIN", \
"FRUIT", \
"DAIRY", \
"FRIED", \
"ALCOHOL", \
"SUGAR", \
"GROSS", \
"TOXIC", \
"PINEAPPLE", \
"BREAKFAST", \
"CLOTH", \
)

#define DRINK_NICE 1
#define DRINK_GOOD 2
#define DRINK_VERYGOOD 3
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isipc(A) (is_species(A, /datum/species/ipc))
#define issnail(A) (is_species(A, /datum/species/snail))
#define isandroid(A) (is_species(A, /datum/species/android))
#define isdummy(A) (istype(A, /mob/living/carbon/human/dummy))

//more carbon mobs
#define ismonkey(A) (istype(A, /mob/living/carbon/monkey))
Expand Down
23 changes: 21 additions & 2 deletions code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,27 @@
#define JOB_DISPLAY_ORDER_CLERK 39
#define JOB_DISPLAY_ORDER_CHAPLAIN 40

#define DEPARTMENT_UNASSIGNED "No Department"
#define DEPARTMENT_BITFLAG_SECURITY (1<<0)
#define DEPARTMENT_SECURITY "Security"
#define DEPARTMENT_BITFLAG_COMMAND (1<<1)
#define DEPARTMENT_COMMAND "Command"
#define DEPARTMENT_BITFLAG_SERVICE (1<<2)
#define DEPARTMENT_SERVICE "Service"
#define DEPARTMENT_BITFLAG_CARGO (1<<3)
#define DEPARTMENT_CARGO "Cargo"
#define DEPARTMENT_BITFLAG_ENGINEERING (1<<4)
#define DEPARTMENT_ENGINEERING "Engineering"
#define DEPARTMENT_BITFLAG_SCIENCE (1<<5)
#define DEPARTMENT_SCIENCE "Science"
#define DEPARTMENT_BITFLAG_MEDICAL (1<<6)
#define DEPARTMENT_MEDICAL "Medical"
#define DEPARTMENT_BITFLAG_SILICON (1<<7)
#define DEPARTMENT_SILICON "Silicon"
#define DEPARTMENT_BITFLAG_ASSISTANT (1<<8)
#define DEPARTMENT_ASSISTANT "Assistant"
#define DEPARTMENT_BITFLAG_CAPTAIN (1<<9)
#define DEPARTMENT_CAPTAIN "Captain"

/proc/find_job(target)
//Get the job from the mind
Expand All @@ -126,5 +147,3 @@
#define IS_SCIENCE(target) (find_job(target) in GLOB.science_positions)
#define IS_CARGO(target) (find_job(target) in GLOB.supply_positions)
#define IS_SECURITY(target) (find_job(target) in GLOB.security_positions)

#define DEPARTMENT_UNASSIGNED "No Department"
49 changes: 23 additions & 26 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,42 +192,40 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
#define GHOST_ORBIT_SQUARE "square"
#define GHOST_ORBIT_PENTAGON "pentagon"

//Ghost showing preferences:
#define GHOST_ACCS_NONE 1
#define GHOST_ACCS_DIR 50
#define GHOST_ACCS_FULL 100

#define GHOST_ACCS_NONE_NAME "default sprites"
#define GHOST_ACCS_DIR_NAME "only directional sprites"
#define GHOST_ACCS_FULL_NAME "full accessories"
#define GHOST_ORBIT_DEFAULT_OPTION GHOST_ORBIT_CIRCLE

#define GHOST_ACCS_DEFAULT_OPTION GHOST_ACCS_FULL

GLOBAL_LIST_INIT(ghost_accs_options, list(GHOST_ACCS_NONE, GHOST_ACCS_DIR, GHOST_ACCS_FULL)) //So save files can be sanitized properly.
//Ghost showing preferences:
#define GHOST_ACCS_NONE "Default sprites"
#define GHOST_ACCS_DIR "Only directional sprites"
#define GHOST_ACCS_FULL "Full accessories"

#define GHOST_OTHERS_SIMPLE 1
#define GHOST_OTHERS_DEFAULT_SPRITE 50
#define GHOST_OTHERS_THEIR_SETTING 100
#define GHOST_ACCS_DEFAULT_OPTION GHOST_ACCS_FULL

#define GHOST_OTHERS_SIMPLE_NAME "white ghost"
#define GHOST_OTHERS_DEFAULT_SPRITE_NAME "default sprites"
#define GHOST_OTHERS_THEIR_SETTING_NAME "their setting"
#define GHOST_OTHERS_SIMPLE "White ghosts"
#define GHOST_OTHERS_DEFAULT_SPRITE "Default sprites"
#define GHOST_OTHERS_THEIR_SETTING "Their sprites"

#define GHOST_OTHERS_DEFAULT_OPTION GHOST_OTHERS_THEIR_SETTING
#define GHOST_OTHERS_DEFAULT_OPTION GHOST_OTHERS_THEIR_SETTING

#define GHOST_MAX_VIEW_RANGE_DEFAULT 10
#define GHOST_MAX_VIEW_RANGE_MEMBER 14


GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DEFAULT_SPRITE, GHOST_OTHERS_THEIR_SETTING)) //Same as ghost_accs_options.

//pda fonts
#define MONO "Monospaced"
#define VT "VT323"
#define ORBITRON "Orbitron"
#define SHARE "Share Tech Mono"
#define PDA_FONT_MONO "Monospaced"
#define PDA_FONT_VT "VT323"
#define PDA_FONT_ORBITRON "Orbitron"
#define PDA_FONT_SHARE "Share Tech Mono"

GLOBAL_LIST_INIT(pda_styles, list(PDA_FONT_MONO, PDA_FONT_VT, PDA_FONT_ORBITRON, PDA_FONT_SHARE))

//pda colours
#define PDA_COLOR_NORMAL "Normal"
#define PDA_COLOR_TRANSPARENT "Transparent"
#define PDA_COLOR_PIPBOY "Pip Boy"
#define PDA_COLOR_RAINBOW "Rainbow"

GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_COLOR_PIPBOY, PDA_COLOR_RAINBOW))

/////////////////////////////////////
// atom.appearence_flags shortcuts //
Expand Down Expand Up @@ -373,7 +371,6 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
#define SECURITY_TRUSTED 3

//Dummy mob reserve slots
#define DUMMY_HUMAN_SLOT_PREFERENCES "dummy_preference_preview"
#define DUMMY_HUMAN_SLOT_ADMIN "admintools"
#define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation"

Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,5 @@

///Swarmer flags
#define SWARMER_LIGHT_ON (1<<0)

#define ACCENT_NONE "None"
71 changes: 59 additions & 12 deletions code/__DEFINES/preferences.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@

//Preference toggles
// Legacy preference toggles.
// !!! DO NOT ADD ANY NEW ONES HERE !!!
// Use `/datum/preference/toggle` instead.
#define SOUND_ADMINHELP (1<<0)
#define SOUND_MIDI (1<<1)
#define SOUND_AMBIENCE (1<<2)
Expand Down Expand Up @@ -50,22 +52,16 @@

#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD)

#define PARALLAX_INSANE -1 //for show offs
#define PARALLAX_HIGH 0 //default.
#define PARALLAX_MED 1
#define PARALLAX_LOW 2
#define PARALLAX_DISABLE 3 //this option must be the highest number
#define PARALLAX_INSANE "Insane"
#define PARALLAX_HIGH "High"
#define PARALLAX_MED "Medium"
#define PARALLAX_LOW "Low"
#define PARALLAX_DISABLE "Disabled"

#define PARALLAX_DELAY_DEFAULT world.tick_lag
#define PARALLAX_DELAY_MED 1
#define PARALLAX_DELAY_LOW 2

#define PIXEL_SCALING_AUTO 0
#define PIXEL_SCALING_1X 1
#define PIXEL_SCALING_1_2X 1.5
#define PIXEL_SCALING_2X 2
#define PIXEL_SCALING_3X 3

#define SCALING_METHOD_NORMAL "normal"
#define SCALING_METHOD_DISTORT "distort"
#define SCALING_METHOD_BLUR "blur"
Expand Down Expand Up @@ -112,3 +108,54 @@
#define JP_LOW 1
#define JP_MEDIUM 2
#define JP_HIGH 3


//recommened client FPS
#define RECOMMENDED_FPS 100


// randomise_appearance_prefs() and randomize_human_appearance() proc flags
#define RANDOMIZE_SPECIES (1<<0)
#define RANDOMIZE_NAME (1<<1)


//randomised elements
#define RANDOM_ANTAG_ONLY 1
#define RANDOM_DISABLED 2
#define RANDOM_ENABLED 3


// Values for /datum/preference/savefile_identifier
/// This preference is character specific.
#define PREFERENCE_CHARACTER "character"
/// This preference is account specific.
#define PREFERENCE_PLAYER "player"

// Values for /datum/preferences/current_tab
/// Open the character preference window
#define PREFERENCE_TAB_CHARACTER_PREFERENCES 0

/// Open the game preferences window
#define PREFERENCE_TAB_GAME_PREFERENCES 1

/// Open the keybindings window
#define PREFERENCE_TAB_KEYBINDINGS 2

/// These will be shown in the character sidebar, but at the bottom.
#define PREFERENCE_CATEGORY_FEATURES "features"

/// Any preferences that will show to the sides of the character in the setup menu.
#define PREFERENCE_CATEGORY_CLOTHING "clothing"

/// Preferences that will be put into the 3rd list, and are not contextual.
#define PREFERENCE_CATEGORY_NON_CONTEXTUAL "non_contextual"

/// Will be put under the game preferences window.
#define PREFERENCE_CATEGORY_GAME_PREFERENCES "game_preferences"

/// These will show in the list to the right of the character preview.
#define PREFERENCE_CATEGORY_SECONDARY_FEATURES "secondary_features"

/// These are preferences that are supplementary for main features,
/// such as hair color being affixed to hair.
#define PREFERENCE_CATEGORY_SUPPLEMENTAL_FEATURES "supplemental_features"
Loading