shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,930 Commits 5 Branches 0 Tags
5b4e26cb06811b2a5c849c077eb6ca25b16dfdaf
Commit Graph

6930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
5b4e26cb06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-11 08:06:03 -05:00
LetterJay
a75362cecc COLLAR 2017-10-11 08:05:49 -05:00
CitadelStationBot
6b10a53724 Automatic changelog generation for PR #3300 [ci skip] 2017-10-10 21:34:30 -05:00
LetterJay
3f6596dc17 Merge pull request #3300 from Citadel-Station-13/upstream-merge-31406 
[MIRROR] Adds Slappers
 2017-10-10 22:34:28 -04: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
6e155be9fe Merge pull request #3298 from Citadel-Station-13/upstream-merge-31474 
[MIRROR] Removes some spawns from explosion effects
 2017-10-10 22:34:12 -04:00
CitadelStationBot
e8b717848e Automatic changelog generation for PR #3297 [ci skip] 2017-10-10 21:33:54 -05: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
CitadelStationBot
9b264f1b37 Automatic changelog generation for PR #3296 [ci skip] 2017-10-10 21:33:35 -05:00
LetterJay
56f7bcddcc Merge pull request #3296 from Citadel-Station-13/upstream-merge-31443 
[MIRROR] Fixes pandemic no beaker UI runtime
 2017-10-10 22:33:33 -04:00
LetterJay
0a10785ac5 Merge pull request #3295 from Citadel-Station-13/upstream-merge-31508 
[MIRROR] Cleans up leftover palette
 2017-10-10 22:33:25 -04:00
LetterJay
06bfc02357 Merge pull request #3293 from Citadel-Station-13/upstream-merge-31507 
[MIRROR] Cleans up warning line varedits
 2017-10-10 22:33:06 -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
ca521a4ea2 Merge pull request #3291 from Citadel-Station-13/upstream-merge-31506 
[MIRROR] Fixes missing texture on pubbystation
 2017-10-10 22:32:36 -04:00
LetterJay
8d604a3922 Merge pull request #3290 from Citadel-Station-13/upstream-merge-31462 
[MIRROR] Fixes headrev TP
 2017-10-10 22:32:12 -04:00
LetterJay
41ef0500ac Merge pull request #3289 from Citadel-Station-13/upstream-merge-31444 
[MIRROR] Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done.
 2017-10-10 22:32:02 -04:00
LetterJay
1a35063877 Merge pull request #3288 from Citadel-Station-13/upstream-merge-31477 
[MIRROR] Fix a bug in the new lobby music system
 2017-10-10 22:31:43 -04:00
CitadelStationBot
36498f3a47 Automatic changelog generation for PR #3287 [ci skip] 2017-10-10 21:31:28 -05:00
LetterJay
5e99ad27e5 Merge pull request #3287 from Citadel-Station-13/upstream-merge-30920 
[MIRROR] Adds the Chemistry Smoke Machine
 2017-10-10 22:31:27 -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
LetterJay
1191ccf9de Merge pull request #3285 from Citadel-Station-13/upstream-merge-31505 
[MIRROR] Fixes crashed ship runtime
 2017-10-10 22:30:42 -04:00
CitadelStationBot
930cc9a219 Automatic changelog generation for PR #3284 [ci skip] 2017-10-10 21:30:00 -05:00
LetterJay
74fbde6801 Merge pull request #3284 from Citadel-Station-13/upstream-merge-31495 
[MIRROR] Diseases will now cure if species is changed
 2017-10-10 22:29:58 -04:00
CitadelStationBot
15066973cd Automatic changelog generation for PR #3283 [ci skip] 2017-10-10 21:28:38 -05:00
LetterJay
e494f5cc8b Merge pull request #3283 from Citadel-Station-13/upstream-merge-31504 
[MIRROR] Fixes Clock Cult ending with dead cultists
 2017-10-10 22:28:36 -04:00
LetterJay
f1124cf376 Merge pull request #3282 from Citadel-Station-13/upstream-merge-31356 
[MIRROR] Cleans up atmos unary machinery code
 2017-10-10 22:28:29 -04:00
LetterJay
ad3b59c247 Merge pull request #3281 from Citadel-Station-13/upstream-merge-31498 
[MIRROR] Fixes emote runtimes
 2017-10-10 22:28:14 -04:00
LetterJay
f15db182fe Merge pull request #3280 from Citadel-Station-13/upstream-merge-31497 
[MIRROR] Fixes some tempremoves
 2017-10-10 22:28:03 -04:00
LetterJay
b7470ce4d8 Merge pull request #3279 from Citadel-Station-13/upstream-merge-31484 
[MIRROR] Removes portable chem dispenser from xenobio
 2017-10-10 22:27:41 -04:00
CitadelStationBot
0be725f2d6 Adds Slappers 2017-10-10 19:54:30 -05:00
deathride58
c163176e5d Adds Slappers (#31406) 
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
 2017-10-10 19:54:30 -05:00
CitadelStationBot
34861fb71c Cleans up empty file 2017-10-10 17:48:31 -05:00
Leo
a1ccf4adda Merge pull request #31513 from ShizCalev/file-cleanup 
Cleans up empty file
 2017-10-10 17:48:31 -05:00
CitadelStationBot
6b663ac3f7 Removes some spawns from explosion effects 2017-10-10 15:41:24 -05:00
MoreRobustThanYou
3e8d51d871 Removes some spawns from explosion effects (#31474) 
* Update effects_explosion.dm

* god damn it

* Update effects_explosion.dm

* Update effects_explosion.dm

* THANK YOU KEVINZ FOR THE WRAPPER

* Update effects_explosion.dm

* Update effects_explosion.dm

* clean my ass
 2017-10-10 15:41:24 -05:00
CitadelStationBot
35213d438a The shuttle can no longer leave during clockcult rounds 2017-10-10 13:57:51 -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
CitadelStationBot
d119bad8ac Fixes pandemic no beaker UI runtime 2017-10-10 13:51:37 -05:00
kevinz000
3d0f0dd7f0 Fixes pandemic no beaker UI runtime (#31443) 2017-10-10 13:51:37 -05:00
CitadelStationBot
bc64abb390 Cleans up leftover palette 2017-10-10 13:45:23 -05:00
Jordan Brown
b9c94a59f7 Merge pull request #31508 from ShizCalev/palette-cleanup 
Cleans up leftover palette
 2017-10-10 13:45:23 -05:00
CitadelStationBot
62ad091a54 Cleans up warning line varedits 2017-10-10 13:29:48 -05:00
Jordan Brown
b1c26daf8b Merge pull request #31507 from ShizCalev/varedit-cleanup 
Cleans up warning line varedits
 2017-10-10 13:29:48 -05:00
CitadelStationBot
70c36c638f In which the stoner one gets stoned and tries to address tick contention... again 2017-10-10 13:28:38 -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
CitadelStationBot
3ab99de184 Fixes missing texture on pubbystation 2017-10-10 13:24:25 -05:00
Jordan Brown
2234fa95de Merge pull request #31506 from ShizCalev/pubby-texture-fix 
Fixes missing texture on pubbystation
 2017-10-10 13:24:24 -05:00
CitadelStationBot
3ccdcc07ad Fixes headrev TP 2017-10-10 13:20:12 -05:00
AnturK
724b0d24fe Fixes headrev TP (#31462) 
* Fixes headrev TP

* Mhm
 2017-10-10 13:20:12 -05:00
CitadelStationBot
a2c5ce2234 Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done. 2017-10-10 13:19:03 -05:00