shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,009 Commits 5 Branches 0 Tags
58b8a028023df9ccca74ddf0c2d456474d7a22af
Commit Graph

612 Commits

Author SHA1 Message Date
LetterJay f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528 
[MIRROR] Minor refactor of how gas IDs are handled
 2017-10-12 07:19:30 -04:00
LetterJay 05100a0c6a Merge pull request #3310 from Citadel-Station-13/upstream-merge-31282 
[MIRROR] Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds
 2017-10-12 07:16:35 -04:00
LetterJay e15c337851 Merge pull request #3306 from Citadel-Station-13/upstream-merge-31449 
[MIRROR] Datum antag wizard.
 2017-10-12 07:15:53 -04:00
duncathan salt c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Ashe Higgs fa0aaa9870 Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds (#31282) 
* During non-clock rounds, scarabs get more stuff

* Actually, admins might want to make scarabs...

* That's a thing
 2017-10-12 00:28:20 -05:00
AnturK 5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
MoreRobustThanYou 0b86f2befe Jungle Fever carriers now hear the proper antag sound (#31517) 
* Jungle Fever carriers now here the proper antag sound

* less whitespace
 2017-10-10 22:18:05 -05:00
LetterJay 1330fdcdd7 Merge pull request #3299 from Citadel-Station-13/upstream-merge-31513 
[MIRROR] Cleans up empty file
 2017-10-10 22:34:20 -04:00
LetterJay be2d504b2b Merge pull request #3297 from Citadel-Station-13/upstream-merge-31327 
[MIRROR] The shuttle can no longer leave during clockcult rounds
 2017-10-10 22:33:52 -04:00
LetterJay 822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494 
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 22:32:52 -04:00
LetterJay b358324c09 Merge pull request #3286 from Citadel-Station-13/upstream-merge-31481 
[MIRROR] Removes spawn from meteors.
 2017-10-10 22:30:58 -04:00
Leo a1ccf4adda Merge pull request #31513 from ShizCalev/file-cleanup 
Cleans up empty file
 2017-10-10 17:48:31 -05:00
Ashe Higgs 3c50cacc6c The shuttle can no longer leave during clockcult rounds (#31327) 
* Servants now win if the shuttle leaves

* Some more round feedback, a missed thing too

* Hostile environment!

* now it compiles!
 2017-10-10 13:57:51 -05:00
Jordan Brown 7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
kevinz000 e5c87a8868 Removes spawn from meteors. (#31481) 
* Update meteors.dm

* Update meteors.dm

* Update meteors.dm

* Update meteors.dm

* Update meteors.dm

* Update meteors.dm
 2017-10-10 12:46:05 -05:00
Robustin 0f61a5a5ee Fixes Clock Cult ending with dead cultists (#31504) 
* Probably fixes premature CC ending

* I should make this commit into a 2nd PR for GBP
 2017-10-10 12:38:31 -05:00
LetterJay 5c88efd838 Merge pull request #3276 from Citadel-Station-13/upstream-merge-31482 
[MIRROR] Removes a spawn from revolution gamemode code
 2017-10-10 05:55:56 -04:00
LetterJay f53d0844fc Merge pull request #3275 from Citadel-Station-13/upstream-merge-31483 
[MIRROR] Removes a spawn from nukeop gamemode code
 2017-10-10 05:55:48 -04:00
oranges 260ec3364b Merge pull request #31482 from kevinz000/patch-328 
Removes a spawn from revolution gamemode code
 2017-10-10 03:23:20 -05:00
oranges 1843738e7c Merge pull request #31483 from kevinz000/patch-329 
Removes a spawn from nukeop gamemode code
 2017-10-10 03:23:14 -05:00
Tad Hardesty 01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
LetterJay e0f9167153 Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066 
[MIRROR] Refactors virus spreading
 2017-10-10 02:46:04 -04:00
LetterJay 3ee08632d2 Update traitor.dm 2017-10-09 21:37:24 -05:00
MoreRobustThanYou af2d5e4a26 Removes a spawn from traitor code 2017-10-09 19:03:05 -05:00
XDTM 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
oranges 3beab07be2 Merge pull request #31421 from Xhuis/wardens_vs_revenants 
Prevents ocular wardens from targeting dead revenants
 2017-10-08 15:32:51 -05:00
LetterJay 89e4088b86 Merge pull request #3229 from Citadel-Station-13/upstream-merge-31329 
[MIRROR] Clockwork scripture now uses one progress bar instead of multiple
 2017-10-08 16:23:25 -04:00
LetterJay a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386 
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
 2017-10-08 16:18:18 -04:00
Ashe Higgs ef57f560ed Clockwork scripture now uses one progress bar instead of multiple (#31329) 
* Clockcult scripture now uses one progress bar

* why do you code for a server you're banned from

* Checks for QDELETED of scripture and slab
 2017-10-08 10:10:23 -05:00
LetterJay 4cc8703a93 Merge pull request #3199 from Citadel-Station-13/upstream-merge-31375 
[MIRROR] Fixes clockcult runtime
 2017-10-07 23:42:57 -04:00
Neri 4bc4ab7fc5 Oh. That's what was missing. (#3143) 
Boop.
 2017-10-07 14:01:43 -07:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
AnturK 84490f919e Fixes clockcult runtime 2017-10-07 07:46:52 -05:00
deathride58 7ca2bd48a5 Crew objectives no longer count towards antags greentexting 2017-10-06 09:56:42 -04:00
Joan Lung 4d06415a4b Makes Ocular Wardens effective again (#31325) 
* Makes Ocular Wardens effective again

* get that, too
 2017-10-05 19:22:29 -05:00
LetterJay 929b67a61a Merge pull request #3148 from Citadel-Station-13/upstream-merge-31244 
[MIRROR] Lizzers and plasmamen can now be servants of Ratvar
 2017-10-05 09:11:38 -04:00
LetterJay 29aafaf42d Merge pull request #3140 from Citadel-Station-13/upstream-merge-31286 
[MIRROR] ismachinery define
 2017-10-05 08:32:10 -04:00
LetterJay b374f2c22d Merge pull request #3139 from Citadel-Station-13/upstream-merge-31287 
[MIRROR] Correctly applies wizard names
 2017-10-05 08:31:56 -04:00
Ashe Higgs 682269ab63 Lizzers and plasmamen can now be servants of Ratvar (#31244) 
* Removes racial discrimination from Ratvar's servants

* Activates plasma internals; thank you Y0SH1M4S73R!

* Update clock_cult.dm
 2017-10-05 03:01:01 -05:00
LetterJay c2d8f048f8 Update cult_items.dm 2017-10-04 21:49:46 -05:00
LetterJay 7c4373c1fe Update cult_items.dm 2017-10-04 21:15:11 -05:00
LetterJay 365adf852c Merge branch 'master' into upstream-merge-31222 2017-10-04 21:50:07 -04:00
Leo 39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 19:26:38 -05:00
Leo dec28eabfc Merge pull request #31287 from ShizCalev/wizard-name 
Correctly applies wizard names
 2017-10-04 19:26:31 -05:00
LetterJay 13cf0696e0 Merge branch 'master' into upstream-merge-31198 2017-10-04 19:06:42 -04:00
LetterJay 1a70aa0227 Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887 
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
 2017-10-04 19:06:02 -04:00
LetterJay b2184c1a78 Update cult_structures.dm 2017-10-04 17:38:01 -05:00
oranges 5c49bab3c5 Merge pull request #31135 from KorPhaeron/unconvertable 
Adds a var to minds that makes them immune to conversion
 2017-10-03 18:15:20 -05:00
KorPhaeron 4e648765db Ports dash weapons to the dash datum 2017-10-03 18:11:42 -05:00
CitadelStationBot 99d57a7f19 [MIRROR] Swarmers work with multiz stations (#3083) 
* Merge pull request #31225 from KorPhaeron/multiz_swarmers

Swarmers work with multiz stations

* Swarmers work with multiz stations
 2017-10-02 23:20:37 -07:00