Commit Graph

9021 Commits

Author SHA1 Message Date
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
LetterJay 8fde63e016 Update simple_animal.dm 2017-12-18 15:15:34 -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 2205500863 Update idlenpcpool.dm 2017-12-18 15:15:21 -06:00
Jordan Brown 50bd078b43 Merge pull request #33636 from duncathan/max_reqs
restores reaction max_reqs checking code
2017-12-18 15:15:09 -06:00
LetterJay ed91ccdeff Update decal.dm 2017-12-18 15:14:55 -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
Emmett Gaines e026115045 Decal rotation fix 2017-12-17 20:49:51 -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
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
Leo 2578484644 Merge pull request #33613 from Armhulen/patch-32
deep fryers are quieter now...
2017-12-17 20:22:00 -06:00
vuonojenmustaturska 8cbad06f35 Advanced mob laziness 2017-12-17 19:36:04 -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 86cfa46c9b Update browserOutput.css 2017-12-17 17:53:11 -06:00
LetterJay 69930a192d Update networks.dm 2017-12-17 17:51:28 -06:00
LetterJay 1412836201 Update orbit.dm 2017-12-17 17:51:20 -06:00
LetterJay 26543ea97f Update configuration.dm 2017-12-17 17:50:43 -06:00
LetterJay 1c380e3ed4 Update verbs.dm 2017-12-17 17:50:05 -06:00
LetterJay 9cbe879b51 Update comms.dm 2017-12-17 17:47:12 -06:00
LetterJay 3c5632bad2 Update pill.dm 2017-12-17 17:38:51 -06:00
LetterJay 67e7f62416 Update shock_kit.dm 2017-12-17 17:38:17 -06:00
LetterJay eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
LetterJay 5c3b500ba9 Update camera.dm 2017-12-17 17:38:00 -06:00
LetterJay 8d6d561950 Update beebox.dm 2017-12-17 17:37:53 -06:00
coiax 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
Ashe Higgs 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 e6aaad1921 Update disease_outbreak.dm 2017-12-17 15:58:06 -06:00
LetterJay 2a7b168e0b Update client_procs.dm 2017-12-17 15:57:57 -06:00
LetterJay 28dfbc7ccc Update volume_pump.dm 2017-12-17 15:57:46 -06:00
LetterJay 2771fe55e4 Update pump.dm 2017-12-17 15:57:33 -06:00
LetterJay 4bf535f808 Update weldingtool.dm 2017-12-17 15:57:23 -06:00
LetterJay 75ccc3b354 Update anomalies.dm 2017-12-17 15:57:02 -06:00
LetterJay f377aa441f Update telecrystalconsoles.dm 2017-12-17 15:56:54 -06:00
LetterJay d384941d5c Update robot.dm 2017-12-17 15:56:44 -06:00
LetterJay 420bebf36f Update radio.dm 2017-12-17 15:56:29 -06:00
LetterJay 99a173b187 Update stat.dm 2017-12-17 15:54:52 -06:00
LetterJay 245545c134 Update adminhelp.dm 2017-12-17 15:53:13 -06:00