Commit Graph
797 Commits
Author SHA1 Message Date
Ghommie a91464bf64 Fixing escaped characters in flavor texts. 2020-02-27 02:29:44 +01:00
GhomandGitHub 485241a361 cleanup detail 2020-02-23 13:32:46 +01:00
Ghommie 0d67e81ad5 Yo. 2020-02-23 13:18:16 +01:00
Ghommie 2b740f9bad [s] Fixing an issue with slot machines crashing the server. 2020-02-23 13:09:21 +01:00
GhomandGitHub b7fab93209 Merge pull request #11186 from Putnam3145/fixed-flavor
Fixed temp flavor text (for real)
2020-02-22 15:09:58 +01:00
Putnam d328d554ba Reduced copypasta 2020-02-22 02:38:57 -08:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Putnam 146b2a35f2 fixed temp flavor text (for real) 2020-02-21 00:26:42 -08:00
kevinz000andGitHub 2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
kevinz000andGitHub 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000andGitHub 6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576
Doubled halved flavor text max length and removed crappy code.
2020-02-15 11:46:00 -07:00
GhomandGitHub 1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
2020-02-14 19:21:48 +01:00
Ghommie c5b4cf0e6b Ok. 2020-02-13 14:06:05 +01:00
Ghommie 315b0a9645 Fixes halved flavor text max length and removing some crappy code. 2020-02-13 14:05:40 +01:00
kevinz000andGitHub 4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
2020-02-13 04:11:01 -07:00
kevinz000andGitHub 4e419eed03 Merge pull request #10987 from Ghommie/Ghommie-cit567
Something about missing privates sprites and bad code.
2020-02-12 23:56:53 -07:00
GhomandGitHub 2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
Ghommie 0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
kevinz000 276f4b5fae Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:32:01 -07:00
kevinz000 690c14a716 Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:29:22 -07:00
Artur 816f94bd61 pandemic fixes 2020-02-10 10:20:57 +02:00
Ghommie c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
ArturlangandGitHub 29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
Ghommie f6adce72fb Something about missing private sprites and their bad code. 2020-02-09 06:51:57 +01:00
kevinz000andGitHub 62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
Artur c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
kevinz000 38536cd02d repath that 2020-02-06 00:05:07 -07:00
kevinz000andGitHub cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
2020-02-05 23:45:30 -07:00
GhomandGitHub 4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
2020-02-05 07:19:37 +01:00
Ghommie 5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
ancientpower dd521ef009 i swear it compiled locally 2020-02-04 17:18:13 -06:00
ancientpower a85f05a628 requested changes 2020-02-04 16:58:24 -06:00
kevinz000andGitHub b34d6cba0c Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1
Hello subtler roleplayers, I see you.
2020-02-04 03:33:14 -07:00
GhomandGitHub cc3955ecc7 Fixes pitch black characters 2020-02-04 06:04:43 +01:00
Ghommie 26d8d9387a ok 2020-02-04 05:06:59 +01:00
Ghommie a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Putnam 53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
GhomandGitHub f1e3261566 Update _logging.dm 2020-02-02 23:26:03 +01:00
ancientpower 937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06:00
Artur e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000andGitHub 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
Putnam e812844c70 Revert "</span>"
This reverts commit d6d01d848c.
2020-02-01 21:05:27 -08:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Putnam d6d01d848c </span> 2020-02-01 06:01:54 -08:00
Putnam3145andGitHub 33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
Putnam 3d9e84a3f8 Tweaks and fixes 2020-02-01 00:23:45 -08:00
GhomandGitHub 5257ab2e00 Merge pull request #10559 from Seris02/custompie
custom reagent pie smite
2020-02-01 01:46:15 +01:00
Putnam 29e0ac52c4 fuzzy objectives 2020-01-31 11:52:05 -08:00
Seris02 70c41e5bd7 happy now 2020-01-31 15:08:16 +08:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00