shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,426 Commits 5 Branches 0 Tags
8d307b00a22932754aef67a53519c3d4b2e18dac
Commit Graph

1119 Commits

Author SHA1 Message Date
Ghommie 8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
kevinz000 3365522bdf Merge pull request #9654 from Putnam3145/dynamic-config-2 
Adds dynamic antag injection to config
 2019-11-03 06:21:24 -07:00
kevinz000 6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
Putnam cb88fd1a44 added dynamic antag injection to config 2019-10-28 22:58:35 -07:00
Ghommie e688d37390 Fixing nuke ops / adminspawn combat mechs having tracking beacons. 2019-10-28 18:33:39 +01:00
kevinz000 d5041b7dde Merge pull request #9582 from Putnam3145/dynamic-config 
Adding dynamic rules to the game config
 2019-10-24 18:55:29 -07:00
Ghommie a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Putnam 67662d1d69 everything works now 2019-10-22 21:39:28 -07:00
Putnam bacc875524 added actual game configs to all the dynamic modes 2019-10-22 19:12:54 -07:00
deathride58 68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Poojawa 394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000 f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45 
Virtual reality componentization.
 2019-10-10 02:09:51 -07:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
Ghommie cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Ghommie 32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Sishen fbaa8d355f Update dynamic.dm 2019-10-02 02:39:58 -04:00
Poojawa fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -05:00
Poojawa f0afc9c490 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 12:59:15 -05:00
Poojawa 53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Sishen dab0829da8 normalizes head roles not rolling the more common antags (wiz is kept) 2019-09-06 04:50:20 -04:00
Sishen 8fdb1c59d5 Update dynamic_rulesets_roundstart.dm 2019-08-18 21:16:07 -04:00
Sishen 2ad94dccac Update dynamic_rulesets_roundstart.dm 2019-08-18 21:11:16 -04:00
Sishen d74b46c7f7 some updates thanks to thechosenevilone 2019-08-17 11:10:09 -04:00
Poojawa d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 19:14:41 -05:00
Sishen 4ba3d851ed IT JUST WORKS 2019-08-09 00:46:14 -04:00
Poojawa 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
kevinz000 9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142 
Fixes Zelus flasks a bit.
 2019-08-05 00:54:43 -07:00
kevinz000 a105ba4bb6 Merge pull request #8774 from Sishen1542/monkeycult 
Removes the human check from cap/chap mind on cult conversion.
 2019-08-05 00:47:04 -07:00
Poojawa 1893a8f319 correctly copy/pasta's the chaplain stuff 2019-08-01 11:14:50 -05:00
Poojawa 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Poojawa 218cbe2dbc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-31 19:09:35 -05:00
Poojawa 8c63ea7b6d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-26 17:36:46 -05:00
Trilbyspaceclone 712790ba5b Update objective_items.dm 2019-07-25 04:15:57 -04:00
kevinz000 8c93e48a01 Merge pull request #8896 from Bapldap/patch-1 
Updates Blood Brother
 2019-07-20 11:51:54 -07:00
Ghommie 75a8cbcc39 Makes Zelus flasks a subtype of bottle. 2019-07-16 15:39:30 +02:00
Bapldap 2fec4a51b0 Update traitor_bro.dm 2019-07-15 13:26:21 -05:00
Ghommie fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
kevinz000 da8b43f054 Merge pull request #8785 from Trilbyspaceclone/Just_Smile! 
Makes Clowns and HonkMother Chaplins smile!
 2019-07-14 14:11:09 -07:00
kevinz000 2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
Bapldap bd3f9bddf7 Updates Blood Brother 
Restricts jobs such as captain and security at roundstart for bloodbrother.
 2019-07-14 13:54:32 -05:00
kevinz000 b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127 
Refactoring underwear to allow custom color preferences.
 2019-07-14 03:38:45 -07:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Trilbyspaceclone d53d11de6b Apply suggestions from code review 
Grammer and such

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-07-10 18:21:03 -04:00
TrilbySpaceClone 54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Ghommie ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Sishen 05a55bcb30 Update clock_cult.dm 2019-07-02 17:24:46 -04:00
TrilbySpaceClone 688fabfffc Honk 2019-06-29 21:03:38 -04:00
Sishen ccf64fe9c9 fix per ghoms request 2019-06-28 13:16:52 -04:00
Poojawa f19a3541a3 cleans up runtimes 2019-06-16 19:30:14 -05:00