shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,482 Commits 5 Branches 0 Tags
bcbb4102bfd039f18a334129e293a38c28ecfff9
Commit Graph

7030 Commits

Author SHA1 Message Date
LetterJay
bcbb4102bf Update disease_outbreak.dm 2017-12-19 18:50:43 -06:00
LetterJay
63b1b1df88 Update disease_outbreak.dm 2017-12-19 18:40:20 -06:00
LetterJay
f3e031fe2f Update telecrystalconsoles.dm 2017-12-19 18:02:16 -06:00
LetterJay
56737f32de Update disease_outbreak.dm 2017-12-19 17:59:55 -06:00
LetterJay
6c39e94bba Update observer.dm 2017-12-19 17:56:52 -06:00
LetterJay
30796ad342 Update cit_arousal.dm 2017-12-19 17:56:06 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay
a98178251d Merge pull request #4444 from Citadel-Station-13/upstream-merge-33531 
[MIRROR] [READY]Cyborg jousting with spears!
 2017-12-19 17:31:26 -06:00
LetterJay
516db4851f Update disease_outbreak.dm 2017-12-19 16:53:21 -06:00
LetterJay
16f1a07b92 diseases 2017-12-19 16:41:09 -06:00
deathride58
d39b0204fa Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307 
[MIRROR] Adds config inclusion system
 2017-12-19 19:49:32 +00:00
deathride58
65412db421 Update game_options.dm 2017-12-19 14:34:06 -05:00
kevinz000
8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -06:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
LetterJay
9710f0f842 Merge pull request #4439 from Citadel-Station-13/ServerAPI 
Updates server API to preoper version
 2017-12-18 19:30:26 -06:00
LetterJay
76e6cb4e48 Update server_tools.dm 2017-12-18 17:31:07 -06:00
LetterJay
c9a47bc6f4 Merge pull request #4437 from Citadel-Station-13/upstream-merge-33510 
[MIRROR] Makes the chemical smoke machine use stock parts for things
 2017-12-18 17:28:26 -06:00
LetterJay
c9e131883d Merge branch 'master' into ServerAPI 2017-12-18 17:22:10 -06:00
LetterJay
390c24b3fd Create server_tools.config.dm 2017-12-18 16:42:17 -06:00
LetterJay
5f237c595b Merge pull request #4436 from Citadel-Station-13/upstream-merge-33615 
[MIRROR] Adds reloading sounds to guns
 2017-12-18 15:51:06 -06:00
LetterJay
f8efa8fe9e Merge pull request #4432 from Citadel-Station-13/upstream-merge-33605 
[MIRROR] Adds repeated message squashing to chat.
 2017-12-18 15:28:17 -06:00
LetterJay
7f75b114b4 Merge pull request #4431 from Citadel-Station-13/upstream-merge-33613 
[MIRROR] deep fryers are quieter now...
 2017-12-18 15:27:57 -06:00
LetterJay
e933d69a22 Merge pull request #4429 from Citadel-Station-13/upstream-merge-33302 
[MIRROR] Spinning resin or laying eggs on vents prompts the user if they're sure
 2017-12-18 15:27:12 -06:00
LetterJay
06617159b7 Merge pull request #4428 from Citadel-Station-13/upstream-merge-33419 
[MIRROR] Lollipop dispensers can push lollipops into people's hands
 2017-12-18 15:27:03 -06:00
LetterJay
6e5bd180fa Merge pull request #4427 from Citadel-Station-13/upstream-merge-33598 
[MIRROR] Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking
 2017-12-18 15:26:42 -06:00
LetterJay
da58957c23 Merge pull request #4425 from Citadel-Station-13/upstream-merge-33607 
[MIRROR] Dance Machine now obeys instrument preference
 2017-12-18 15:26:33 -06:00
LetterJay
4a835b47ce Merge pull request #4417 from Citadel-Station-13/upstream-merge-33586 
[MIRROR] Disables clockcult power alerts to ghosts when it's not clockcult
 2017-12-18 15:25:46 -06:00
LetterJay
7df9c3b5fc Merge pull request #4416 from Citadel-Station-13/upstream-merge-33566 
[MIRROR] Fixes race swap ruining rounds
 2017-12-18 15:25:33 -06:00
LetterJay
ba5306c8fe Merge pull request #4415 from Citadel-Station-13/upstream-merge-33568 
[MIRROR] Fixes zombie stun immunity, more pep in their step
 2017-12-18 15:25:13 -06:00
LetterJay
15adc5d0b0 Update st_interface.dm 2017-12-18 15:24:23 -06:00
LetterJay
a85f5eea6b Update server_tools.dm 2017-12-18 15:23:55 -06:00
LetterJay
7510667932 Update st_commands.dm 2017-12-18 15:22:55 -06:00
LetterJay
97a321bc82 Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553 
[MIRROR] Rebalances Marauder shields
 2017-12-18 15:21:07 -06:00
LetterJay
3df26e3be6 Merge pull request #4413 from Citadel-Station-13/upstream-merge-33569 
[MIRROR] Fixes a brain login runtime
 2017-12-18 15:20:48 -06:00
LetterJay
8662e4a53c Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050 
[MIRROR] Mi-go
 2017-12-18 15:20:00 -06:00
LetterJay
629c0de334 Merge pull request #4406 from Citadel-Station-13/upstream-merge-33501 
[MIRROR] Quick access hotkeys for backpack and belt
 2017-12-18 15:19:33 -06:00
LetterJay
75fe7bfa65 Merge pull request #4402 from Citadel-Station-13/upstream-merge-33578 
[MIRROR] Changes manage job slots to use a browser datum, also lets it be used before roundstart
 2017-12-18 15:19:22 -06:00
LetterJay
0643aa4fc0 Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542 
[MIRROR] Fixes mecha drifting.
 2017-12-18 15:19:13 -06:00
LetterJay
5636d9dad3 Merge pull request #4397 from Citadel-Station-13/upstream-merge-33433 
[MIRROR] Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter.
 2017-12-18 15:17:49 -06:00
nicbn
da25df9329 Makes the chemical smoke machine use stock parts for things 2017-12-18 15:15:33 -06:00
ShizCalev
1c142356ff Gun sounds (#33615) 2017-12-18 15:15:25 -06:00
LetterJay
bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181 
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
 2017-12-17 21:26:08 -06:00
LetterJay
21a9b09bf5 Merge pull request #4389 from Michiyamenotehifunana/NEB-consolidation 
Consolidates NEB code into a modular package
 2017-12-17 21:25:42 -06:00
LetterJay
91a26e66cf Merge pull request #4396 from Citadel-Station-13/upstream-merge-33513 
[MIRROR] ahelp chat command is silent on success
 2017-12-17 21:24:24 -06:00
LetterJay
781f40926c Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530 
[MIRROR] Fix shuttle autocalls when the round is already over
 2017-12-17 21:24:12 -06:00
LetterJay
78dcad12e4 Merge pull request #4391 from Citadel-Station-13/upstream-merge-33527 
[MIRROR] Adds some permission checks to admin/topic
 2017-12-17 21:23:42 -06:00
AnturK
ea47d74997 Adds repeated message squashing to chat. (#33605) 
* Adds repeated message squashing to chat.

* Forgot to actually use the pref

* Drops some unnecessary css

* No trimming same thing three times

* Increases size of repeats up to 24px, fixes scrolling
 2017-12-17 20:45:37 -06:00
LetterJay
6aa1a86f88 Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529 
[MIRROR] Removed drone light in favor of night vision
 2017-12-17 20:37:39 -06:00
LetterJay
f3390aee98 Merge branch 'master' into NEB-consolidation 2017-12-17 20:37:34 -06:00
LetterJay
52701ebfee Merge pull request #4388 from Citadel-Station-13/upstream-merge-33517 
[MIRROR] SSinput tweaks to address server side lag
 2017-12-17 20:37:17 -06:00