shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

163 Commits

Author SHA1 Message Date
kevinz000
d976dd016a Merge remote-tracking branch 'origin/master' into trait_blacklisting 2019-07-25 15:20:46 -07:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114 
Ports the toggleable dark mode to the game!
 2019-07-20 11:57:13 -07:00
kevinz000
628244c0ba Merge pull request #8869 from Ghommie/Ghommie-cit129 
Ports "Show codewords on round end screen"
 2019-07-14 14:49:11 -07:00
kevinz000
570fa0cd3b fix 2019-07-14 03:53:15 -07:00
Poojawa
245bd3e650 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics 2019-07-13 10:18:13 -05:00
Poojawa
4d895ae6c0 Gang victory news report and last words for discord bot 
also slight improvement to gangster greetings
 2019-07-13 08:38:19 -05:00
Ghommie
bef0027287 In a haste, we forget thousand things. 2019-07-11 08:50:47 +02:00
kevinz000
30a006e42f additions, and it now nulls out. 2019-07-08 18:21:04 -07:00
Ghommie
3ca31617aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114 2019-07-05 23:06:57 +02:00
Ghommie
03315d1cbb Ports a toggleable darkmode to the game! 2019-07-05 22:29:50 +02:00
unknown
b90d344afc It works. It just works. 2019-06-12 01:10:21 +03:00
Poojawa
55c85175e7 I can english to potatoe 2019-04-29 02:41:15 -05:00
Poojawa
29af85a0ae Brings NTPR to the nice discord bot 2019-04-29 02:37:01 -05:00
deathride58
23fb3cb940 Merge pull request #8131 from Citadel-Station-13/kevinz000-patch-23 
Shift autocall is now accurate to real time rather than game time (you will no longer have 4 hour rounds due to lag)
 2019-03-31 21:41:37 -04:00
Ragolution
b874662323 Enables new sound. 
Why the fuck is this in the ticker subsystem?
 2019-03-18 08:54:04 -04:00
kevinz000
461d42ae6b Update ticker.dm 2019-03-17 22:18:13 -07:00
kevinz000
5e96cc492e Update ticker.dm 2018-12-04 20:30:15 -08:00
deathride58
a93751bc03 adds the ability to actually vote for maps instead of using tg's biased preference-based voting system (#7743) 2018-11-19 20:10:25 -08:00
deathride58
a71cd5a87b Makes game setup failures send messages to admin irc and ingame admin chat for debug purposes (#7451) 2018-10-21 00:34:58 -07:00
Poojawa
09512a6001 Controllers 2018-09-11 02:04:10 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
LetterJay
de44ac926e Merge branch 'master' into upstream-merge-37665 2018-05-23 10:14:10 -05:00
deathride58
649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429 
[MIRROR] Update DMAPI to version 3.2.1.0
 2018-05-17 18:14:54 +00:00
Jordie
68fcab96a5 Splits up round table initialize, start, end and shutdown 2018-05-15 02:12:50 -05:00
Jordan Brown
1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
oranges
e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
deathride58
862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276) 
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
 2018-04-27 07:40:45 -07:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
Poojawa
95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
CitadelStationBot
b7015c379a [MIRROR] Cleans up some time stuff with DisplayTimeText (#5685) 
* Cleans up some time stuff with DisplayTimeText

* Update hot_potato.dm
 2018-02-24 07:02:45 -06:00
CitadelStationBot
952dfb4be3 [MIRROR] Changes station time to real time rate multiplier from 24 to 12 (#5667) 
* Changes station time to real time rate multiplier from 24 to 12

* Update ticker.dm
 2018-02-24 06:04:47 -06:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
Jordie
b031f73ef4 Removes duplicate first death log (#35832) 
* Update blackbox.dm

* Update death.dm

* Update ticker.dm
 2018-02-20 18:58:48 -06:00
Ashe Higgs
7496feb40f The end-round report now shows the name, area, ckey, damage taken, and last words of the first person to die that round (#35582) 
* Adds a "first death" feature to the roundend

* no clogging up with antag-rollers

* fixes red text color

* Maintainer review (finally, sorry)
 2018-02-19 22:08:52 -06:00
AnturK
38145c93c7 Greentext antag datum and OnRoundend hook. (#35584) 
* Greentext antag datum and OnRoundend hook.

* review stuff
 2018-02-13 19:43:54 -06:00
deathride58
7b46f951cc Re-enables round autoend 2018-02-05 14:17:14 -05:00
Poojawa
8c48f46dd0 tump buckets and force the failsafe to trigger 2018-02-04 04:58:43 -06:00
deathride58
ab1c75edbb Temporarily disables autocall 2018-02-02 23:17:31 -05:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
deathride58
7b5b354e9d Update ticker.dm 2018-01-19 08:47:49 -05:00
Leo
a0f815c5c4 Revert "Fix config_dir usage (#34469)" 2018-01-18 19:38:40 -06:00
deathride58
1acdd3ce5c controllers sync 2018-01-03 23:23:11 -05:00
LetterJay
d3f6cf4dd8 Merge branch 'master' into upstream-merge-33537 2017-12-30 13:14:48 -06:00
LetterJay
678762209a Update ticker.dm 2017-12-19 15:33:31 -06:00
oranges
75753a4dfd Defines all subsystem priority values 2017-12-15 17:00:50 -06:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00