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
f3390aee98
Merge branch 'master' into NEB-consolidation
2017-12-17 20:37:34 -06:00
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
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
2578484644
Merge pull request #33613 from Armhulen/patch-32
...
deep fryers are quieter now...
2017-12-17 20:22:00 -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
69930a192d
Update networks.dm
2017-12-17 17:51:28 -06:00
1412836201
Update orbit.dm
2017-12-17 17:51:20 -06:00
26543ea97f
Update configuration.dm
2017-12-17 17:50:43 -06:00
1c380e3ed4
Update verbs.dm
2017-12-17 17:50:05 -06:00
9cbe879b51
Update comms.dm
2017-12-17 17:47:12 -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
eb9260c8bf
Update implantcase.dm
2017-12-17 17:38:09 -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
a2dbbac703
Lollipop dispensers can push lollipops into people's hands ( #33419 )
...
* Lollipop dispensers can push lollipops into people's hands
🆑 coiax
add: A lollipop dispenser in "dispense lollipops" mode can push the
lollipop straight into the targets hand, rather than getting it dirty on
the floor first.
/🆑
Also tidied up and around the robot_items.dm file.
This is a good idea because then you can give people lollipops as a
cyborg that has the lollipop dispenser module.
* Integers instead of numbers
2017-12-17 16:17:28 -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
e6aaad1921
Update disease_outbreak.dm
2017-12-17 15:58:06 -06:00
2a7b168e0b
Update client_procs.dm
2017-12-17 15:57:57 -06:00
28dfbc7ccc
Update volume_pump.dm
2017-12-17 15:57:46 -06:00
2771fe55e4
Update pump.dm
2017-12-17 15:57:33 -06:00
4bf535f808
Update weldingtool.dm
2017-12-17 15:57:23 -06:00
75ccc3b354
Update anomalies.dm
2017-12-17 15:57:02 -06:00
f377aa441f
Update telecrystalconsoles.dm
2017-12-17 15:56:54 -06:00
d384941d5c
Update robot.dm
2017-12-17 15:56:44 -06:00
420bebf36f
Update radio.dm
2017-12-17 15:56:29 -06:00
99a173b187
Update stat.dm
2017-12-17 15:54:52 -06:00
245545c134
Update adminhelp.dm
2017-12-17 15:53:13 -06:00
a834287d65
Fixes cross comms
2017-12-17 15:05:43 -06:00
ac95eb06e8
Dance Machine now obeys instrument preference ( #33607 )
2017-12-17 15:02:31 -06:00
3d375e0be9
properly disables fusion ( #33632 )
2017-12-17 14:37:58 -06:00
3b1c537bb4
changes one letter ( #33591 )
2017-12-17 11:30:37 -06:00
962f135957
[Ready]Brain Trauma additions
2017-12-17 11:11:10 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
a536831bbb
Merge pull request #33586 from Xhuis/power_alerts
...
Disables clockcult power alerts to ghosts when it's not clockcult
2017-12-17 07:36:10 -06:00
7d1485643e
Fixes race swap ( #33566 )
2017-12-17 04:11:40 -06:00
be6a0e82ff
Slightly faster, more stunnable ( #33568 )
2017-12-17 04:11:32 -06:00
e71fa098ae
Shield balance ( #33553 )
...
Rebalances Marauder shields
2017-12-17 04:11:24 -06:00
3fc98677a0
Fixes a brain login runtime ( #33569 )
...
* Fixes a silly brain meme
* better
2017-12-17 04:11:17 -06:00
cde0266c99
Removes the visible messages from vitality matrices ( #33549 )
2017-12-17 04:11:09 -06:00
8a0aa32335
Mi-go
2017-12-17 04:11:01 -06:00
e038319ba2
Quick access hotkeys for backpack and belt
2017-12-17 04:10:20 -06:00
0a4c557336
Db schema version check by simplification ( #33582 )
...
* db schema version check by concatenation
* lets just use actual floats
* simplifies schema check and some more logging
2017-12-17 04:10:05 -06:00
6a09d5c981
Merge pull request #33578 from lzimann/job
...
Changes manage job slots to use a browser datum, also lets it be used before roundstart
2017-12-17 04:09:45 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
LetterJay