shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,489 Commits 5 Branches 0 Tags
b11e600cff1cf8d2e73f2f110a787dba4df8756a
Commit Graph

151 Commits

Author SHA1 Message Date
Jordan Brown
d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER 
H.O.G.A.N. lawset
 2018-05-01 15:40:09 -05:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
Poojawa
95b78a4a77 misc 2018-04-22 23:46:15 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix 
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-18 11:34:06 -05:00
KorPhaeron
46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
Jordan Brown
4bd86b8c72 Merge pull request #36906 from tgstation/KorPhaeron-patch-1 
Adds missing mood config option
 2018-04-02 08:37:23 -05:00
LetterJay
5dbb046757 Merge pull request #6131 from deathride58/gearIDwhitelists 
Adds support for manipulating gear entries via config
 2018-04-02 05:50:10 -05:00
KorPhaeron
01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files 2018-04-01 09:42:14 -05:00
vuonojenmustaturska
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 Brown
4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
deathride58
3323a5e284 adds the ability to define gear entry whitelists via config 2018-03-27 01:33:02 -04:00
Poojawa
acfee53a98 :HELP: MAINT 2018-03-18 11:26:00 -05:00
Cruix
b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
CitadelStationBot
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
CitadelStationBot
d3515a93c1 [MIRROR] Disables night shifts and random shift times in the config (#5784) 
* Disables night shifts and random shift times in the config

Both of these are rather disruptive when you are debugging/testing.

The Config *file* should default to debugging best defaults, and the config *code* should default to production best defaults.

One day we will make a seperate production default config file

* Disables night shifts and random shift times in the config
 2018-03-04 05:27:04 -06:00
LetterJay
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485 
[MIRROR] Antagonist reputation system
 2018-03-04 00:31:41 -06:00
deathride58
b185b97906 Update game_options.txt 2018-03-02 21:33:57 -05:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
deathride58
036e7536fc Update game_options.txt 2018-02-21 13:07:18 -05:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
Chayse Ramsay
482c21b296 Slimepeople Rework 2018-02-16 12:44:23 +00:00
Poojawa
03b33075e5 Mentor System (#5235) 
* reworked mentor system, again. wew

* Update admin.txt

* uhg
 2018-02-05 04:09:56 -06:00
CitadelStationBot
afb0b08837 [MIRROR] Fixes servant cyborgs with the Standard module not having Abscond (#5266) 
* Fixes servant cyborgs with the Standard module not having Abscond

* Update clockwork_slab.dm

* Update clockwork_slab.dm
 2018-02-05 01:39:36 -06:00
deathride58
30ab115665 Makes Cit widescreen by default (#4374) 
* updates title screen to be WIDESCREEN

* increase default size of view window

* widescreen fullscreen overlays

* and finally, the switch can be hit

* Update skin.dmf

* readds splitter=75, the main screen breaks without it
 2018-02-04 21:29:48 -06:00
deathride58
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
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
vuonojenmustaturska
456f08001a Merge pull request #34955 from praisenarsie/patch-22 
changes a link in the config
 2018-01-26 18:05:16 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Jordan Brown
ab71f0293b Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 07:39:29 -06:00
deathride58
d4cf5d2eba Merge branch 'master' into upstream-merge-34067 2018-01-08 20:01:59 +00:00
Jordan Brown
065b616af8 Removes standard resources from config tree 2018-01-07 20:32:08 -06:00
Shadowlight213
7f9725c2ae Updates the exp config default override hours and clarifies it a bit. (#34132) 2018-01-07 18:45:35 -06:00
deathride58
d39b0204fa Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307 
[MIRROR] Adds config inclusion system
 2017-12-19 19:49:32 +00:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Jordan Brown
d45b668a39 Adds config inclusion system 2017-12-14 17:24:13 -06:00
deathride58
91530e2747 Update admin_ranks.txt 2017-12-14 14:34:03 -05:00
Kyle Spier-Swenson
55247e9bdf Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. 2017-12-13 21:04:00 -06:00
Jordan Brown
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
Dax Dupont
91cc5b1024 Adds disco inferno shuttle. (#33230) 
* Adds disco inferno shuttle

* step be gone

* Minor wall replacement

* Add no diagonal walls

* Made the dance machine all access

* Makes the statues work as I originally intended in this shuttle

* Fixes a chair

* Changed door and made it to keep fire inside.
 2017-12-05 03:22:40 -06:00
Jordan Brown
dc0310eb5d Adds a config to optionally hard reboot DD (#33006) 2017-11-24 13:00:02 -06:00
Emmett Gaines
ab21f8d5ed 511 client fix and a config to make the version warning a popup 2017-11-15 04:39:36 -06:00
LetterJay
851c862ddf Update game_options.txt 2017-11-14 13:08:07 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
0d3aa9d07b Update config.txt 2017-11-09 03:17:00 -06:00
Jordan Brown
146dfe33ea Adds a config option to change world.sleep_offline 2017-11-09 00:45:48 -06:00
LetterJay
6e17d42c33 updating the roundstart config for ref on master 2017-10-28 02:24:26 -05:00