Commit Graph

386 Commits

Author SHA1 Message Date
SandPoot
a105852042 the stuff
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
2023-10-05 21:15:11 -03:00
SandPoot
217e23fc7f push 2023-07-18 15:22:24 -03:00
SandPoot
cc8d385371 sanity 2023-02-24 01:11:12 -03:00
SandPoot
e6d471ef0d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into screentips-update 2023-02-24 01:07:49 -03:00
SandPoot
09ebd0fddf lizard content 2023-02-19 03:46:36 -03:00
Darius
12f3f9781a Sanitize screentip colors
Sanitize screentip colors as hexcolor when saving, to prevent possible cases of null values that could break the interaction screentips.

Solution provided by SandPoot, in response to an issue posted by BongaTheProto.
2023-02-18 22:48:21 -05:00
SandPoot
ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
Hatterhat
05178784d4 sanitize 2022-12-26 01:38:44 -06:00
Hatterhat
55826b9eb8 oops 2022-12-20 20:02:28 -06:00
Lin
7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Darius
f5cf485321 Separate max age from max age input
The maximum character age a user can manually input is now defined by AGE_MAX_INPUT instead of AGE_MAX. These values are identical by default.

Also reverts the change to dialog box text.
2022-12-09 08:00:19 -05:00
Darius
7321d42ea5 Reduce max age from INFINITY to SHORT_REAL_LIMIT
This effectively reduces the cap to 16777216.
2022-12-08 05:38:47 -05:00
Darius
0924175001 Remove maximum age
Allows characters to be any age above the minimum. Does not remove or change AGE_MAX definition.
2022-12-08 03:46:32 -05:00
Putnam3145
139bcaa1b5 whoops forgot a bit of migration 2022-08-21 16:47:39 -07:00
Putnam3145
3700b9bbe5 Allows setting antags to "low" 2022-08-21 16:42:39 -07:00
Timothy Teakettle
b4330b2f3d GOODBYE SPECIES, HELLO COMPONENT 2022-08-05 18:19:22 +01:00
Timothy Teakettle
b05f6e221d MIGRATIONS DELETIONS AND QUIRKS OH MY 2022-08-05 18:06:49 +01:00
deathride58
512a8c783c basic code cleanup and limits 2022-06-09 23:37:49 -04:00
deathride58
f30c9406cc randomization! 2022-06-09 15:29:48 -04:00
deathride58
2a720ce054 vocal barks - Fully customizable noises for talking! 2022-06-09 03:59:17 -04:00
SandPoot
da1f58f297 Update files 2022-05-19 13:23:17 -03:00
silicons
73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
SandPoot
64d18a3050 Update preferences_savefile.dm 2022-04-08 21:09:29 -03:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
SandPoot
e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
SandPoot
45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401)
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
2021-12-30 07:40:15 +01:00
LetterN
eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
SandPoot
80dce37eb4 Upload files 2021-11-06 15:38:13 -03:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
silicons
ead04910c2 Update preferences_savefile.dm (#15108) 2021-09-09 18:23:01 +02:00
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
SandPoot
b2ef076043 Upload files 2021-08-26 16:44:36 -03:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
SandPoot
3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
Timothy Teakettle
022003dc7c funny comment 2021-05-08 02:05:20 +01:00
Timothy Teakettle
42d8d83ca2 Update preferences_savefile.dm 2021-05-08 01:52:55 +01:00
Timothy Teakettle
149cdeb9fd Update preferences_savefile.dm 2021-05-08 01:34:43 +01:00
Timothy Teakettle
5e271c239f conflict resolving caused runtimes 2021-05-08 01:31:44 +01:00
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
Timothy Teakettle
108ff3d2f4 Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two 2021-05-08 01:27:22 +01:00
timothyteakettle
0fb72497ff color fix 2021-05-07 16:46:40 +01:00
timothyteakettle
bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
timothyteakettle
3b07164fb4 Update preferences_savefile.dm 2021-05-07 00:56:27 +01:00
timothyteakettle
f5e2d3de2c Update preferences_savefile.dm 2021-05-07 00:44:44 +01:00
timothyteakettle
eab47bb6ae Update preferences_savefile.dm 2021-05-07 00:43:33 +01:00