shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,688 Commits 5 Branches 0 Tags
ddb49cd1ca37199a57d91d7138549299cc01c19a
Commit Graph
66 Commits
Author SHA1 Message Date
kevinz000 b193d77c1c hm 2017-09-01 03:36:18 -07:00
kevinz000 41318e715c Merge branch 'master' into custom_roundstart_items 2017-08-31 18:23:56 -07:00
kevinz000 f5689b656a Merge pull request #2509 2017-08-29 22:40:08 -07:00
kevinz000 fa9f1ce956 remove cere from configs 2017-08-29 20:10:29 -07:00
kevinz000 0d104b2cd4 update to master 2017-08-29 20:09:18 -07:00
CitadelStationBot 6882163ef6 Moves comms settings into a new config file 2017-08-29 17:01:16 -05:00
kevinz000 62a358574c sync 2017-08-29 02:37:34 -07:00
CitadelStationBotandkevinz000 65d4c6f938 Delete access levels.txt (#2507) 2017-08-27 06:42:40 -07:00
CitadelStationBot 26890c6f81 Pulls the plug on Cerestation (for real this time) 2017-08-26 14:08:30 -05:00
kevinz000 f91d7799f4 Merge branch 'master' into custom_roundstart_items 2017-08-09 09:46:52 -07:00
kevinz000 97f6bf4410 character separation wip 2017-07-24 04:12:17 -07:00
CitadelStationBot 956f10f2d2 [s]Fixes panic bunker 2017-07-17 07:13:45 -05:00
kevinz000 df590fd8c1 Merge remote-tracking branch 'Citadel-Station-13/master' into Citadel-Station-13/custom_roundstart_items 2017-07-16 20:30:27 -07:00
LetterJayandGitHub 53afc150f9 Merge pull request #1581 from Citadel-Station-13/upstream-merge-28398 
[MIRROR] Changes config tag for secret extended
 2017-06-26 02:30:58 -05:00
LetterJay 12055144e4 fix it 2017-06-19 16:09:16 -05:00
LetterJayandGitHub 2ff24e70a5 Merge pull request #1218 from Citadel-Station-13/upstream-merge-27686 
[MIRROR] No more erros
 2017-06-14 08:16:02 -05:00
CitadelStationBot d079026d26 Changes config tag for secret extended 2017-06-13 17:17:18 -05:00
CitadelStationBot c178552114 Changes Animal Movement Delay to Match Live 2017-06-11 20:45:50 -05:00
LetterJayandGitHub dfe99653fa Rename server_to_bridge_port.txt to server_to_tool_bridge_port.txt 2017-06-05 07:43:33 -05:00
LetterJay d12546ef35 Improper mirror 2017-06-05 07:25:02 -05:00
LetterJayandkevinz000 976c1244dd Config shit for cards (#1310) 2017-06-02 21:56:08 -07:00
CitadelStationBot ab39ece501 No more erros 2017-05-26 23:53:24 -05:00
LetterJay 73dea85b15 commit/rej cleanup 2017-05-22 11:24:17 -05:00
kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items 
# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm
 2017-05-21 18:17:42 -07:00
CitadelStationBotandPoojawa b8cbf1a056 [MIRROR] Makes some game options which should be flags flags (#910) 
* Makes some game options which should be flags flags

* Update configuration.dm

* Delete configuration.dm.rej
 2017-05-18 07:50:43 -05:00
LetterJayandGitHub 4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
kevinz000 99297bb544 Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items 2017-05-14 20:54:47 -07:00
kevinz000 da615b1440 h 2017-05-14 20:19:26 -07:00
kevinz000 e7c41603f0 new and improved 2017-05-14 19:22:52 -07:00
kevinz000 9e0866871e lists and stuff 2017-05-13 11:26:07 -07:00
LetterJayandGitHub 6a1cac4e1e Merge branch 'master' into upstream-merge-26425 2017-05-12 00:08:32 -04:00
LetterJayandGitHub 3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645 
[MIRROR] Persistent investigate and game logs separated by round ID
 2017-05-10 21:12:08 -04:00
kevinz000andGitHub ce7b714ada Merge pull request #730 from Citadel-Station-13/upstream-merge-26862 
[MIRROR] If you're gonna rename a job, do it right!
 2017-05-07 23:16:21 -07:00
CitadelStationBot f85a44ed52 2017 Cult Overhaul P1: Cult Master and Datum Cult 2017-05-06 11:56:16 -05:00
CitadelStationBot 3b84fcb9c2 Playar byound accunt age storid in db 2017-05-04 18:14:23 -05:00
CitadelStationBot ee99534085 If you're gonna rename a job, do it right! 2017-05-03 22:21:50 -05:00
CitadelStationBot 49990d0c05 Persistent investigate and game logs separated by round ID 2017-05-02 18:47:58 -05:00
CitadelStationBot 529125d3dd Moves tips from config to strings tree 2017-05-01 11:51:27 -05:00
LetterJayandGitHub 86ea3efeef Merge pull request #659 from Citadel-Station-13/upstream-merge-26687 
[MIRROR] Moves config/names to strings/names
 2017-05-01 08:01:41 -05:00
LetterJayandGitHub 954b035868 Merge pull request #644 from Citadel-Station-13/upstream-merge-26651 
[MIRROR] Replaces Double Agents with Internal Affairs
 2017-05-01 07:56:17 -05:00
CitadelStationBot d696954cd5 Moves config/names to strings/names 2017-04-29 19:49:29 -05:00
CitadelStationBot bd4c8dc6c3 Replaces Double Agents with Internal Affairs 2017-04-28 21:08:24 -05:00
CitadelStationBot 3fa6f63608 Replaces Mending Motor with Mending Mantra 2017-04-28 20:57:31 -05:00
CitadelStationBot 2a18042160 Grammar edit for flashbangs tip 2017-04-22 21:41:28 -05:00
CitadelStationBot 849dd5cb76 Updates travis and the config to require byond 511 2017-04-19 16:42:24 -05:00
TalkingCactusandGitHub 6f0aa809df Patches for 4/18/17 (#454) 
* fixes modular receiver sprites

* fixes legs rendering for taurs

* fixes shoes not rendering in UI for nagas

* typo fix in preferences.dm

* crewsimov

* Revert "fixes legs rendering for taurs"

This reverts commit 8a64c0c80af8a6798639bb151d1448eeb454ac5d.

* fixes looc logging

* fixes gamemode voting

* admin respawn bypass

* thanks GitHub Desktop

totally wanted to omit the very important if()

* proc tweak

* savefile sanitizing
 2017-04-18 18:38:23 -04:00
CitadelStationBotandTalkingCactus 2373e2e485 Afk fixup (#412) 2017-04-15 15:45:29 -04:00
PoojawaandGitHub 7e9b96a00f April sync (#360) 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
 2017-04-13 23:37:00 -05:00
LetterJay e07580413f fuck 2017-03-24 02:08:02 -05:00
LetterJay 1d518bb4dd updates maploader, fixes a few things 2017-03-24 01:39:11 -05:00