Commit Graph

7077 Commits

Author SHA1 Message Date
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
oranges
ac95eb06e8 Dance Machine now obeys instrument preference (#33607) 2017-12-17 15:02:31 -06:00
duncathan salt
3d375e0be9 properly disables fusion (#33632) 2017-12-17 14:37:58 -06:00
XDTM
962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
Leo
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
Robustin
7d1485643e Fixes race swap (#33566) 2017-12-17 04:11:40 -06:00
Robustin
be6a0e82ff Slightly faster, more stunnable (#33568) 2017-12-17 04:11:32 -06:00
Robustin
e71fa098ae Shield balance (#33553)
Rebalances Marauder shields
2017-12-17 04:11:24 -06:00
vuonojenmustaturska
3fc98677a0 Fixes a brain login runtime (#33569)
* Fixes a silly brain meme

* better
2017-12-17 04:11:17 -06:00
Armhulen
8a0aa32335 Mi-go 2017-12-17 04:11:01 -06:00
Emmett Gaines
e038319ba2 Quick access hotkeys for backpack and belt 2017-12-17 04:10:20 -06:00
Jordan Brown
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
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
AnturK
ce22210b47 Fixes mecha drifting. (#33542)
* Fixes mecha drifting.
2017-12-16 04:09:03 -06:00
deathride58
b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
KomradeSpectre
1cd746ba67 Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter. (#33433)
* Added two new components, HSV to Hex RGB and RGB to Hex RGB, along with icons.

* Added valid input ranges to the extended_desc of the new converter components.
2017-12-15 17:13:20 -06:00
oranges
b1ca28ef3c Merge pull request #33513 from tgstation/Cyberboss-patch-2
ahelp chat command is silent on success
2017-12-15 17:00:58 -06:00
Jordan Brown
9adb77c5e3 Merge pull request #33530 from AutomaticFrenzy/patch/autocall
Fix shuttle autocalls when the round is already over
2017-12-15 14:53:30 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Kyle Spier-Swenson
2152bc7121 Adds some permission checks to admin/topic (#33527) 2017-12-15 03:27:46 -06:00
Trevor Serpas
f7a943575d Removed drone light in favor of night vision 2017-12-15 03:26:35 -06:00
Michiyamenotehifunana
e77c1a8a07 Consolidates NEB code into a modular package 2017-12-15 16:57:22 +08:00
oranges
05db439c1e SSinput tweaks to address server side lag 2017-12-14 23:11:52 -06:00
Jordan Brown
a3ee534eb8 Merge pull request #33512 from AnturK/exiledmob
Fixes gateway ignoring exile implants in simple mobs
2017-12-14 22:34:55 -06:00
deathride58
ebf0817c76 Merge pull request #4338 from Citadel-Station-13/upstream-merge-33468
[MIRROR] Designs now default to department flag ALL instead of NONE
2017-12-15 04:21:56 +00:00
deathride58
fdb9de488e Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-15 04:21:34 +00:00
deathride58
5c4d9576db Merge pull request #4383 from Citadel-Station-13/upstream-merge-33216
[MIRROR] Player Z-tracking, again
2017-12-15 04:20:50 +00:00
deathride58
c4b7b940d2 Merge pull request #4345 from Citadel-Station-13/upstream-merge-33475
[MIRROR] Antag spawner fixes
2017-12-15 04:20:27 +00:00
EtheoBoxxman
c2153eb279 Update ash_walker_den.dm 2017-12-14 19:38:14 -06:00
deathride58
d2d9cd7fc2 Update logout.dm 2017-12-14 19:12:27 -05:00
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
Jordan Brown
d45b668a39 Adds config inclusion system 2017-12-14 17:24:13 -06:00