shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,522 Commits 5 Branches 0 Tags
80e0be6d1e02ea7c1d605455aff42bbc16a94120
Commit Graph
84 Commits
Author SHA1 Message Date
LetterJayandGitHub 80e0be6d1e Merge pull request #6326 from Citadel-Station-13/upstream-merge-37072 
[MIRROR] Fix an error message grammer
 2018-04-09 16:39:28 -05:00
Jordan BrownandCitadelStationBot f2717989c9 Fix an error message grammer 2018-04-09 12:48:58 -05:00
KorPhaeronandCitadelStationBot 46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
vuonojenmustaturskaandCitadelStationBot ae61521e67 Merge pull request #36829 from MrStonedOne/onclick_rework 
[s]Minor Refactor of click code, anti-auto clicker protection
 2018-04-01 08:24:12 -05:00
Jordan BrownandCitadelStationBot 4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
CitadelStationBotandPoojawa a58a8cdefb [MIRROR] Fixes client version config not working (#5935) 
* Merge pull request #36350 from MrStonedOne/patch-490

Fixes client version config not working

* Fixes client version config not working
 2018-03-13 05:45:34 -05:00
Jordan BrownandCitadelStationBot ad6a3e810f Fix config loading exploit (#36286) 2018-03-10 14:52:18 -06:00
deathride58 936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
QustinnusandCitadelStationBot a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Poojawa 95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
Jordan BrownandCitadelStationBot c87455f5a3 Prevents history from repeating itself (#36110) 
* Prevents history from repeating itself

* It persisteh
 2018-03-04 15:00:48 -06:00
CitadelStationBotandPoojawa d3905c723f [MIRROR] Add support for auto admin when ran in single user mode (#5762) 
* Add support for auto admin when ran in single user mode

* Update client_procs.dm

* fixes compile issues, also adds in some legacy mentor code
 2018-03-04 13:06:42 -06:00
LetterJayandGitHub f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485 
[MIRROR] Antagonist reputation system
 2018-03-04 00:31:41 -06:00
LetterJayandGitHub 863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440 
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
 2018-03-02 23:37:41 -06:00
CitadelStationBotandPoojawa 7d9dbcd0c3 [MIRROR] [s] Where were you, the day cyberboss exposed the database password to all admins with a holder (#5761) 
* Merge pull request #36104 from MrStonedOne/blamecyberboss

[s] Where were you, the day cyberboss exposed the database password to all admins with a holder

* [s] Where were you, the day cyberboss exposed the database password to all admins with a holder
 2018-03-02 20:03:17 -06:00
SirenfalandCitadelStationBot 44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Ashe HiggsandCitadelStationBot 0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
Jordan BrownandCitadelStationBot bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
deathride58andGitHub d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339 
[MIRROR] Support stations with multiple z-levels
 2018-02-17 21:24:48 +00:00
LeoandCitadelStationBot a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
Tad HardestyandCitadelStationBot 5b30b29a4b Support stations with multiple z-levels (#35339) 
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
 2018-02-15 10:39:08 -06:00
Kyle Spier-SwensonandCitadelStationBot ca9ac1bdc1 Fixes map configuration values for nonexistent maps applying to box 
This caused box'es min pop to get set to 50 because all of the servers still had cere defined with that limitation.
 2018-02-09 18:13:12 -06:00
CitadelStationBotandPoojawa 60292af57f [MIRROR] Disentangles Command Reports from Metagame (#5294) 
* Disentangles Command Reports from Metagame (#35192)

* False report fix

* Less Accurate Command Report

* Disentangles Command Reports from Metagame
 2018-02-04 23:11:32 -06:00
deathride58andPoojawa 142e96a2dd [READY] Adds night shifts (#4281) 
* initial commit - adds night shifts

* fixes lighting not updating when nightshift is triggered and fixes compiling issues

* makes red alert override nightshift

* Update lighting.dm

* adds announcements for nightshift changes

* fixes nightshift flip-flopping during the night, adjusts night message a little, moves from minor_announce to priority_announce

* Update cit_nightshift.dm

* fixes compiling errors
 2018-02-04 21:28:41 -06:00
Jordan BrownandCitadelStationBot 3b0a00d53c Rename /datum/config_entry/var/value to config_entry_value (#34699) 
This works around some vv-fu you can use to pass in a config_entry to a proc that reads the value var of some other datum. Byond is stupid enough to actually read it, so it must be uniquely named.
 2018-01-24 15:41:19 -06:00
Jordan BrownandCitadelStationBot e84617f17b Datum var cleanup (#34314) 
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
 2018-01-21 21:39:46 -06:00
Jordan BrownandCitadelStationBot 8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
orangesandCitadelStationBot 2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd 
Moves load_motd to config controller
 2018-01-16 14:28:07 -06:00
LetterJayandGitHub 4ac9269cdf Update configuration.dm 2018-01-11 15:15:50 -06:00
LeoandCitadelStationBot f9309d4716 Fixes configuration not loading 2018-01-11 07:39:59 -06:00
deathride58 1acdd3ce5c controllers sync 2018-01-03 23:23:11 -05:00
LetterJayandGitHub 06c309fb0c Merge branch 'master' into upstream-merge-33562 2017-12-21 11:30:58 -06:00
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
deathride58andGitHub 65412db421 Update game_options.dm 2017-12-19 14:34:06 -05:00
LetterJayandGitHub 26543ea97f Update configuration.dm 2017-12-17 17:50:43 -06:00
LetterJayandGitHub 9cbe879b51 Update comms.dm 2017-12-17 17:47:12 -06:00
Emmett GainesandCitadelStationBot f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
JordieandCitadelStationBot 4727d8f73c Fixes LoadEntries return value 2017-12-15 10:01:46 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Jordan BrownandCitadelStationBot d45b668a39 Adds config inclusion system 2017-12-14 17:24:13 -06:00
orangesandCitadelStationBot 4dbac00348 Merge pull request #33279 from Robustin/Reported 
Standardizes false report weighting
 2017-12-10 14:15:50 -06:00
deathride58andGitHub 53ab4feb2f Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324 
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 18:47:56 +00:00
Jordan BrownandCitadelStationBot 8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00
orangesandCitadelStationBot c5a61bbca5 Merge pull request #33350 from Cyberboss/FixConfig 
panic_address -> panic_server_address
 2017-12-08 10:33:46 -06:00
orangesandCitadelStationBot 193879529c Merge pull request #33308 from tgstation/Cyberboss-patch-3 
Fixes every config flag updating world.sleep_offline
 2017-12-06 16:26:49 -06:00
Jordan BrownandCitadelStationBot dc0310eb5d Adds a config to optionally hard reboot DD (#33006) 2017-11-24 13:00:02 -06:00
Emmett GainesandCitadelStationBot ab21f8d5ed 511 client fix and a config to make the version warning a popup 2017-11-15 04:39:36 -06:00
arsserpentariumandCitadelStationBot d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00