Commit Graph
61 Commits
Author SHA1 Message Date
BongaTheProto e3d1286cb8 Merge remote-tracking branch 'upstream/master' 2023-11-23 17:23:16 -05:00
SandPoot c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
SandPoot 1dc38c46d6 poosh 2023-11-02 23:17:49 -03:00
BongaTheProto 6e6bce8772 Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-18 22:02:48 -05:00
SandPoot 45a94856c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-18 18:24:11 -03:00
SandPoot 297ee64977 push 2023-10-12 15:45:35 -03:00
BongaTheProto f8b2fdc38b Update flavor_text.dm 2023-09-16 15:25:35 -05:00
756c166f4f Update to show if pref is on or off.
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
2023-08-28 06:55:20 -07:00
Zattarra c186b9daae Switches the pref to be a boolean, switches the checks to be booleans, adds stomptext to even display the thing, and also hopefully saves the pref. 2023-07-29 18:39:00 -07:00
Zattarra 8475e0cfec Merge branch 'STOMPSHIELDING' of https://github.com/Zattarra/DATASTREAM into STOMPSHIELDING
UH OH.
2023-07-01 19:51:56 -07:00
BongaTheProto 92365973ea Merge branch 'master' into prefs-update 2022-05-21 03:18:18 -05:00
BongaTheProto 85ab43e734 Merge remote-tracking branch 'upstream/master' 2022-05-21 03:00:06 -05:00
SandPoot 89fa5c0bfe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-21 00:13:59 -03:00
SandPoot 73da7b6e03 flavor_Text != flavor_text 2022-05-20 00:00:42 -03:00
SandPoot da1f58f297 Update files 2022-05-19 13:23:17 -03:00
BongaTheProto 603a3fbe9b Merge branch 'master' into prefs-update 2022-05-16 15:00:20 -05:00
Yawet330andGitHub 3175a2bc16 Should allow ghosts to bypass most flavortext hiding. 2022-05-14 01:18:19 +01:00
BongaTheProto 275eee6c7c headshots
I'll modularize this when I wake up
2022-05-09 02:40:18 -05:00
Iosyf 4e2945bf5a ignore this
Redundancy fix
2022-04-26 00:26:45 +03:00
Iosyf 847472486d Runtime Ironing out (mostly null checks)
checking for nulls in:
flavor_text.dm
new_player.dm
coiling.dm
tgyu,dm
lewd_shoes.dm
storage.dm
milking_machine.dm - for some reason tried calling /obj/effect/decal/cleanable/semen/getorganslot() (line 81)
2022-04-23 19:47:52 +03:00
BongaTheProto 479b497b00 ok 2022-04-19 01:30:44 -05:00
nullfag a4c5fa6912 "modularity" fix 2022-04-15 00:37:05 +02:00
nullfag ea17a468a8 naked flavor text 2022-04-15 00:37:05 +02:00
James f110d806b4 Adds antag hud, a game pref to show willingness to be kidnapped. 2022-01-30 05:50:24 +00:00
BongaTheProto 65696e53c7 aaaaaaa
aaaaaaaaaa
2021-12-13 01:30:47 -05:00
SandPoot f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot 492044724d Please stop runtiming 2021-10-03 12:09:30 -03:00
SandPootandGitHub 05f545aa3a Fixes flavor texts (#182) 2021-09-14 22:07:57 -03:00
SandPoot 0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
silicons ec2df686c3 maybe 2020-12-27 05:31:58 -08:00
silicons 3535916fd8 fix 2020-12-26 22:02:56 -08:00
silicons 1c06dd92c2 fix 2020-12-26 21:55:17 -08:00
silicons fa6537a092 fix 2020-12-26 21:53:38 -08:00
silicons 5bd20acc1d fix 2020-12-26 21:44:37 -08:00
silicons 0cd0770549 fix 2020-12-26 21:32:12 -08:00
Artur 3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Sneakyrat6 538e7c62cd Fixes seeing real name in OOC Notes 2020-07-15 13:32:56 -05:00
deathride58andGitHub 513ed1ab47 Fixes a major HTML injection vulnerability with flavortext by making flavortext store itself as encoded html instead of decoded html (#12513) 2020-06-12 15:17:32 -07:00
f292d4047c Adds OOC notes (#12067)
* ooc notes

* fixes

* repath

* ok

* This SHOULD compile, or else...

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-11 01:35:48 +02:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Ghommie 1642903ab3 Spares the official because they don't have their name replaced. 2020-03-25 23:46:27 +01:00
Ghommie 4a01e59623 Signals things. 2020-03-25 23:36:31 +01:00
Ghommie 36d5d5e141 Antagonists such as wizard and nuke ops are now more anonymous. 2020-03-25 23:33:50 +01:00
Ghommie 8ccd0d2cbc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 2020-03-12 20:31:14 +01:00
GhomandGitHub 77bdb9afe8 Update flavor_text.dm 2020-03-11 17:15:04 +01:00
GhomandGitHub ddc7d5cf12 Update flavor_text.dm 2020-03-10 17:28:31 +01:00
Ghommie 7578d60436 flavor texts unset on randomize, yay. 2020-03-10 15:11:16 +01:00