deathride58
17dda62a93
Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622
...
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-21 03:28:14 +00:00
deathride58
58f5069180
Merge pull request #4463 from Citadel-Station-13/upstream-merge-33664
...
[MIRROR] Halve gun empty sound level
2017-12-21 03:27:50 +00:00
deathride58
a30bcfa77f
Merge pull request #4465 from Citadel-Station-13/upstream-merge-33669
...
[MIRROR] Makes tails stop wagging when unconscious or stunned
2017-12-21 03:26:00 +00:00
deathride58
2de3b12364
Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594
...
[MIRROR] Adds knock off component
2017-12-21 03:25:41 +00:00
jughu
2c4e5bae9e
Fixes grammer issue ( #33679 )
2017-12-20 12:02:25 -06:00
ShizCalev
b83dd93309
lizard stuff ( #33669 )
2017-12-20 05:55:45 -06:00
Jordan Brown
25d5e5b6b4
Merge pull request #33594 from AnturK/knockoff
...
Adds knock off component
2017-12-20 00:14:36 -06:00
Jordan Brown
b305f1bb26
Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears
...
Halve gun empty sound level
2017-12-20 00:14:28 -06:00
oranges
d960c45e77
Merge pull request #33622 from duncathan/assert_gas
...
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 00:14:13 -06:00
LetterJay
efc41a15d3
Update mob_helpers.dm
2017-12-19 19:36:03 -06:00
LetterJay
9ab75d37b7
Update operative.dm
2017-12-19 19:35:41 -06:00
LetterJay
2148eb021b
Update randomverbs.dm
2017-12-19 19:34:44 -06:00
LetterJay
da2bf6293f
Update one_click_antag.dm
2017-12-19 19:34:02 -06:00
LetterJay
80412ae3b9
Update player_panel.dm
2017-12-19 19:32:18 -06:00
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
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
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -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
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
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
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
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
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
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
7510667932
Update st_commands.dm
2017-12-18 15:22:55 -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
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
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
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
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
LetterJay
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
LetterJay
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
coiax
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
LetterJay
1c380e3ed4
Update verbs.dm
2017-12-17 17:50:05 -06:00
