9710f0f842
Merge pull request #4439 from Citadel-Station-13/ServerAPI
...
Updates server API to preoper version
2017-12-18 19:30:26 -06:00
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
cfeea088e8
Update genetic.dm
2017-12-18 17:27:12 -06:00
8fef308d0a
Update living_defense.dm
2017-12-18 17:27:04 -06:00
64f003d3b1
Update living.dm
2017-12-18 17:26:25 -06:00
0d137f82d4
Update life.dm
2017-12-18 17:26:10 -06:00
8b56d1ccdd
Update combat.dm
2017-12-18 17:26:01 -06:00
078c8744e0
Update species.dm
2017-12-18 17:25:47 -06:00
e4d6f4110f
Update human_defense.dm
2017-12-18 17:25:33 -06:00
10eaeed06b
Update carbon.dm
2017-12-18 17:25:09 -06:00
fa0bcde791
Update disease_outbreak.dm
2017-12-18 17:24:49 -06:00
f650d8bb5e
Update mousetrap.dm
2017-12-18 17:24:42 -06:00
c9e131883d
Merge branch 'master' into ServerAPI
2017-12-18 17:22:10 -06:00
13dd125e28
[HIGH PRIORITY]Hotfix for the monkeylike disability
2017-12-18 16:11:27 -06:00
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
7c282037ba
Non movement keys pressed while moving no longer stop movement
2017-12-18 15:31:35 -06:00
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
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
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
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
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
15adc5d0b0
Update st_interface.dm
2017-12-18 15:24:23 -06:00
7510667932
Update st_commands.dm
2017-12-18 15:22:55 -06:00
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
8662e4a53c
Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050
...
[MIRROR] Mi-go
2017-12-18 15:20:00 -06:00
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
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
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
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
8fde63e016
Update simple_animal.dm
2017-12-18 15:15:34 -06:00
da25df9329
Makes the chemical smoke machine use stock parts for things
2017-12-18 15:15:33 -06:00
1c142356ff
Gun sounds ( #33615 )
2017-12-18 15:15:25 -06:00
50bd078b43
Merge pull request #33636 from duncathan/max_reqs
...
restores reaction max_reqs checking code
2017-12-18 15:15:09 -06:00
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
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
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
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
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
1319ba6a21
Merge pull request #4386 from Citadel-Station-13/upstream-merge-33512
...
[MIRROR] Fixes gateway ignoring exile implants in simple mobs
2017-12-17 20:36:55 -06:00
4fe21eb44d
Merge pull request #4384 from EtheoBoxxman/Bhijnbutt
...
Ash walker tendril no longer spawns chasm on death
2017-12-17 20:36:17 -06:00
3895eb9eac
Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
...
[MIRROR] Finishes the forceMove port
2017-12-17 20:28:07 -06:00
8cbad06f35
Advanced mob laziness
2017-12-17 19:36:04 -06:00
e93bb49994
Spinning resin or laying eggs on vents prompts the user if they're sure ( #33302 )
...
add: Aliens (and humans with alien organs) are unable to create resin
structures or lay eggs atop vents or scrubbers.
This stops stupid aliens from obscuring entrances to the very helpful
and useful atmospheric piping system.
2017-12-17 19:27:45 -06:00
86cfa46c9b
Update browserOutput.css
2017-12-17 17:53:11 -06:00
1c380e3ed4
Update verbs.dm
2017-12-17 17:50:05 -06:00
3c5632bad2
Update pill.dm
2017-12-17 17:38:51 -06:00
67e7f62416
Update shock_kit.dm
2017-12-17 17:38:17 -06:00
5c3b500ba9
Update camera.dm
2017-12-17 17:38:00 -06:00
8d6d561950
Update beebox.dm
2017-12-17 17:37:53 -06:00
5b107f3922
Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking ( #33598 )
...
* Stops microwave sound loops when it should
* rogue sound!
2017-12-17 16:16:17 -06:00
LetterJay