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

5103 Commits

Author SHA1 Message Date
LetterJay 992416a9b4 Update carp.dm 2017-10-12 02:56:03 -05:00
LetterJay 7390bd82fd Update rightandwrong.dm 2017-10-12 02:55:28 -05:00
LetterJay 21f7e7d9e5 Update _compile_options.dm 2017-10-12 02:55:10 -05:00
LetterJay 6ed7f455b7 Update modifyvariables.dm 2017-10-12 02:54:26 -05:00
duncathan salt e61b6aecd7 unfucks filters 2017-10-12 01:07:52 -05:00
duncathan salt c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Jordan Brown acdc5c1380 Server maint logs when nulls enter the clients list (#31544) 2017-10-12 00:29:50 -05:00
Dax Dupont 856b6ba853 Allows sillicons to use vending machines. (#31541) 
* Allows borgs to use vending machines.

* Allows AI to use vending machines.
 2017-10-12 00:29:43 -05:00
Jordan Brown 061ddd3a29 Fixes init times 2017-10-12 00:29:36 -05:00
Jordan Brown 24a85f97ab Make SStgui actually read the html from the disk at runtime (#31464) 
* Make SStgui actually read the html from the disk at runtime

* Remove the comment

* Back to "
 2017-10-12 00:29:28 -05:00
Armhulen c269b062b9 Mega Carp Re-Carpening: Carpatastrophe! 2017-10-12 00:29:21 -05:00
oranges 9bd56416f8 Merge pull request #31500 from Armhulen/patch-7 
sleeping carp grabs now put out a message
 2017-10-12 00:29:14 -05:00
Incoming5643 5711f562f0 when cleanbot cleans a tile, it will now fully cleans the tile (#31548) 
As opposed to taking out one stain at a time
 2017-10-12 00:29:07 -05:00
PKPenguin321 33afe4f0ca Removes unwelding a singletank (#31550) 
Fixes #27341
 2017-10-12 00:28:58 -05:00
Mercenaryblue 17795f04c8 Added Banana Peels Inhand Sprites (#31551) 
Added in-hand Banana Peels sprites.
Default, Mime, and Bluespace.
 2017-10-12 00:28:51 -05:00
Jordan Brown 976797afb3 Adds round id to the banning panel (#31545) 2017-10-12 00:28:44 -05:00
Jordan Brown 1604f8b1d3 Datumizes world/Topic (#31543) 
* Datumizes world/Topic

* active_players requires comms_key
 2017-10-12 00:28:27 -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
deathride58 2a46696e55 cleans up comments 2017-10-11 18:26:10 -04:00
deathride58 1a3b0c6528 applies optimizations to miscreants 2017-10-11 18:07:08 -04:00
deathride58 bd18903e13 eh it works 2017-10-11 18:03:58 -04:00
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
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
Kyle Spier-Swenson 4c10fe270f Fixes VVing associated values in lists when the value was a number. 2017-10-10 22:17:56 -05:00
kingofkosmos abcc74b327 Allows the snore-emote while unconscious. (#31530) 2017-10-10 22:15:33 -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
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 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 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 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
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 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
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
deathride58 c163176e5d Adds Slappers (#31406) 
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
 2017-10-10 19:54:30 -05:00
Leo a1ccf4adda Merge pull request #31513 from ShizCalev/file-cleanup 
Cleans up empty file
 2017-10-10 17:48:31 -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
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
kevinz000 3d0f0dd7f0 Fixes pandemic no beaker UI runtime (#31443) 2017-10-10 13:51:37 -05:00
MoreRobustThanYou 5eb76bb6e1 Removes spawns from assembly code 2017-10-10 13:30:59 -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
AnturK 724b0d24fe Fixes headrev TP (#31462) 
* Fixes headrev TP

* Mhm
 2017-10-10 13:20:12 -05:00