shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,807 Commits 5 Branches 0 Tags
206e3185aabae56558bc22cf3dbdeff6498518d3
Commit Graph
1807 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
CitadelStationBotandPoojawa 47fa8353eb [MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710) 
* Moves playsound_local() to mob and gets rid of a useless proc.

* Fixes compile errors
 2017-05-18 01:39:16 -05:00
CitadelStationBot fd778d9810 Automatic changelog generation for PR #834 [ci skip] 2017-05-18 01:12:56 -05:00
CitadelStationBotandPoojawa ae5897cd82 Ash walkers speak Draconic by default, but still know common (#834) 2017-05-18 01:12:55 -05:00
CitadelStationBot dfcb4feca2 Automatic changelog generation for PR #837 [ci skip] 2017-05-18 01:12:32 -05:00
CitadelStationBotandPoojawa cb03dd5d0d [MIRROR] Smartfridges only come preloaded at map start (#837) 
* Smartfridges only come preloaded at map start

* update CitadelStation-1.2.1.dmm
 2017-05-18 01:12:31 -05:00
CitadelStationBot aedec34c54 Automatic changelog generation for PR #849 [ci skip] 2017-05-18 01:11:59 -05:00
CitadelStationBotandPoojawa d2be6cfeb5 Refactors leather & Crafting with Bigenerator (#849) 2017-05-18 01:11:58 -05:00
PoojawaandGitHub 4370b5285a Delete runes.dm.rej 2017-05-18 01:05:03 -05:00
CitadelStationBotandPoojawa 257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
CitadelStationBotandPoojawa cd122501fc Refactors blood regeneration from nutriment (#839) 
* Refactors blood regeneration from nutriment

* Update blood.dm

* Delete blood.dm.rej

* Update blood.dm
 2017-05-18 00:03:51 -05:00
CitadelStationBot 4740d2fd67 Automatic changelog generation for PR #975 [ci skip] 2017-05-17 23:36:52 -05:00
PoojawaandGitHub 3dbbdc4476 Cryo icon state and Wizard tweaks (#975) 
* tweaks

* typing habits are bad.

* Update spellbook.dm

* Update rod_form.dm
 2017-05-17 23:36:50 -05:00
CitadelStationBot 806980cf01 Automatic changelog generation for PR #818 [ci skip] 2017-05-17 10:41:58 -05:00
LetterJayandGitHub 3e02ce98c0 Merge pull request #818 from Citadel-Station-13/upstream-merge-26952 
[MIRROR] Cultists of Nar-sie have their own language
 2017-05-17 11:41:57 -04:00
LetterJay 6c4e6d9e4b language holder for constructs 2017-05-17 10:20:12 -05:00
LetterJay ac4e4ab39a honk 2017-05-17 10:16:54 -05:00
LetterJay 00b14017c0 ook ook language 2017-05-17 10:15:30 -05:00
LetterJay 5da8c5d520 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952 2017-05-17 10:12:36 -05:00
CitadelStationBot 99e0c82a92 Automatic changelog generation for PR #810 [ci skip] 2017-05-17 10:05:13 -05:00
LetterJayandGitHub 5b1fc3194d Merge pull request #810 from Citadel-Station-13/upstream-merge-26991 
[MIRROR] Follow links on adamantine vocal cords now work
 2017-05-17 11:05:10 -04:00