shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,829 Commits 5 Branches 0 Tags
e1729434d1344c8670ddbacd671da3f937fab1c1
Commit Graph
1829 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBotandPoojawa e1729434d1 [MIRROR] Adds some antag alerts (#926) 
* Adds some antag alerts

* Add files via upload

* Delete ClockCult.ogg
 2017-05-18 11:27:52 -05:00
CitadelStationBotandPoojawa c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00
CitadelStationBot 620b756025 Automatic changelog generation for PR #924 [ci skip] 2017-05-18 11:13:30 -05:00
CitadelStationBotandPoojawa a681b306a6 [MIRROR] Buffs plasma and nerfs snow (#924) 
* Buffs plasma and nerfs snow

* Update mineral.dm

* Delete mineral.dm.rej
 2017-05-18 11:13:28 -05:00
CitadelStationBot 547f10967a Automatic changelog generation for PR #925 [ci skip] 2017-05-18 10:36:53 -05:00
CitadelStationBotandPoojawa 7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
PoojawaandGitHub 431b0801c4 QUIT FUCKING MAILING ME TRAVIS 2017-05-18 10:34:44 -05:00
CitadelStationBotandPoojawa 33941c29c8 [MIRROR] People can be cloned from heads or brains (#919) 
* People can be cloned from heads or brains

* .rej fixes

* Update cloning.dm
 2017-05-18 09:49:26 -05:00
CitadelStationBot f957d20e09 Automatic changelog generation for PR #916 [ci skip] 2017-05-18 09:37:32 -05:00
CitadelStationBotandPoojawa a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBotandPoojawa 30279b7f55 [MIRROR] Logs the round ID (#920) 
* Logs the round ID

* commit

* Update world.dm

* Delete world.dm.rej
 2017-05-18 09:06:25 -05:00
CitadelStationBot b07bfb1760 Automatic changelog generation for PR #887 [ci skip] 2017-05-18 09:06:03 -05:00
CitadelStationBotandPoojawa c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
PoojawaandGitHub 59b8cfbc93 Update cit_arousal.dm (#1027) 2017-05-18 08:38:46 -05:00
CitadelStationBotandPoojawa e6c4c1f730 [MIRROR] Adds some more badges to the readme. (#918) 
* Adds some more badges to the readme.

* Update README.md

* Update README.md

* Update README.md

* Delete README.md.rej
 2017-05-18 08:20:38 -05:00
CitadelStationBot 5397f13791 Automatic changelog generation for PR #906 [ci skip] 2017-05-18 08:08:36 -05:00
CitadelStationBotandPoojawa 4022281599 [MIRROR] Plasma golem tweaks (#906) 
* Plasma golem tweaks

* Update golems.dm

* Delete golems.dm.rej
 2017-05-18 08:08:34 -05:00
PoojawaandGitHub 7a2560ee76 Delete gang_items.dm.rej 2017-05-18 08:07:48 -05:00
PoojawaandGitHub 285bd5c9ff Delete dominator.dm.rej 2017-05-18 08:07:38 -05:00
LetterJayandGitHub 0336b8c82f Merge pull request #922 from Citadel-Station-13/upstream-merge-27183 
[MIRROR] Dominators require an open space, except it works this time
 2017-05-18 09:02:54 -04:00
CitadelStationBot 206e3185aa Automatic changelog generation for PR #901 [ci skip] 2017-05-18 07:55:28 -05:00
CitadelStationBotandPoojawa 423ce5ffbd [MIRROR] Canisters only notify admins if they contain a meaningful amount of dangerous gas when opened (#901) 
* Canisters only notify admins if they contain a meaningful amount of dangerous gas when opened

* Update canister.dm

* Delete canister.dm.rej
 2017-05-18 07:55:27 -05: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
CitadelStationBotandPoojawa 4a9ef49cf3 [MIRROR] Fixes SSShuttle not checking for missing arrivals (#908) 
* Fixes SSShuttle not checking for missing arrivals

* Update shuttle.dm

* Delete shuttle.dm.rej
 2017-05-18 07:34:31 -05:00
CitadelStationBot a808bffe80 Automatic changelog generation for PR #894 [ci skip] 2017-05-18 07:12:30 -05:00
CitadelStationBotandPoojawa 6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot 593a784583 Automatic changelog generation for PR #879 [ci skip] 2017-05-18 07:12:15 -05:00
CitadelStationBotandPoojawa 6a2916a171 [MIRROR] Bluespace Launchpads (#879) 
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
 2017-05-18 07:12:13 -05:00
CitadelStationBotandPoojawa 30e18146e5 [MIRROR] Makes a thing use the right proc (#881) 
* Makes a thing use the right proc

* Delete IsBanned.dm.rej

* Update IsBanned.dm

* Update IsBanned.dm
 2017-05-18 06:51:42 -05:00
CitadelStationBotandPoojawa eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBotandPoojawa ad65636014 [MIRROR] Fixes saying nothing when you have no language (#861) 
* Fixes saying nothing when you have no language

* fix .rej

* Update say.dm
 2017-05-18 06:12:39 -05:00
CitadelStationBotandPoojawa 43c05ad3da [MIRROR] Fixes status stat panel (#878) 
* Fixes status stat panel

* Update mob.dm

* Delete mob.dm.rej
 2017-05-18 06:12:18 -05:00
CitadelStationBotandPoojawa 2eea01f671 [MIRROR] Refactor of modular PC UIs (#874) 
* Refactor of modular PC UIs

* .rej fix
 2017-05-18 05:22:34 -05:00
CitadelStationBotandPoojawa 663fd8e671 [MIRROR] Fix a rogue proc declaration (#872) 
* Fix a rogue proc declaration

* Update admin_investigate.dm
 2017-05-18 05:16:57 -05:00
CitadelStationBotandPoojawa 6ec7f5c3e0 [MIRROR] Ports gibbers to Initialize (#870) 
* Ports gibbers to Initialize

* Update gibber.dm

* Delete gibber.dm.rej
 2017-05-18 05:16:36 -05:00
CitadelStationBot 3930c75351 Automatic changelog generation for PR #859 [ci skip] 2017-05-18 05:05:20 -05:00
CitadelStationBotandPoojawa f345d6a3ca [MIRROR] You can no longer bypass language restrictions with default language (#859) 
* You can no longer bypass language restrictions with default language

* resolve rej files

* Update language_menu.dm
 2017-05-18 05:05:19 -05:00
LetterJayandGitHub d40c2224c3 Merge pull request #624 from Citadel-Station-13/upstream-merge-26492 
[MIRROR] Adds new debug verb for highlighting roundstart ATs
 2017-05-18 05:51:54 -04:00
CitadelStationBotandPoojawa ff9928fdd7 [MIRROR] Makes it clear whether (in)complete golem shells are free or servant (#857) 
* Makes it clear whether (in)complete golem shells are free or servant

* resolves rej file
 2017-05-18 04:40:12 -05:00
CitadelStationBotandPoojawa 2ee5ff82a2 [MIRROR] Adds a way to check related accounts by CID or IP in game (#863) 
* Adds a way to check related accounts by CID or IP in game

* resolve rej
 2017-05-18 04:20:49 -05:00
CitadelStationBot 70bc9e0e17 Automatic changelog generation for PR #858 [ci skip] 2017-05-18 04:13:58 -05:00
CitadelStationBotandPoojawa 8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBot e84191b5c3 Automatic changelog generation for PR #784 [ci skip] 2017-05-18 03:53:16 -05:00
CitadelStationBotandPoojawa 4f971be3a9 [MIRROR] Golems do not have underclothing (#784) 
* Golems do not have underclothing

* Resolves .rej

* Update golems.dm

* Update golems.dm
 2017-05-18 03:53:14 -05:00
CitadelStationBot e66e3744f5 Automatic changelog generation for PR #853 [ci skip] 2017-05-18 03:21:09 -05:00
CitadelStationBotandPoojawa 626959d96e [MIRROR] Fixes a bunch more cult bugs (#853) 
* Fixes a bunch more cult bugs

* Resolves .rejs and icons
 2017-05-18 03:21:07 -05:00
LetterJayandGitHub b9f42bc3ad Merge pull request #972 from Citadel-Station-13/upstream-merge-27219 
[MIRROR] Fixes role polls
 2017-05-18 04:07:05 -04:00
LetterJay 61f8819286 oops 2017-05-18 02:37:12 -05:00
LetterJay a8a862411d commit 2017-05-18 02:31:07 -05:00
LetterJay 6fe8d4fc9c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27219 2017-05-18 02:27:50 -05:00