Commit Graph

3442 Commits

Author SHA1 Message Date
LetterJay 1b6b8a7c00 Update cleanable.dm 2017-12-19 17:46:15 -06:00
LetterJay a0a4acbc2c Update nuclear.dm 2017-12-19 17:33:55 -06:00
LetterJay 0a05b499fd Update cleanable.dm 2017-12-19 17:14:57 -06:00
LetterJay 7d193a5303 Update wizard.dm 2017-12-19 15:35:57 -06:00
LetterJay a30de42820 Update traitor.dm 2017-12-19 15:35:45 -06:00
LetterJay 2d65e0df49 Update nuclear.dm 2017-12-19 15:35:29 -06:00
LetterJay 61c7080c34 Update game_mode.dm 2017-12-19 15:34:59 -06:00
LetterJay cb8c6cd5e2 Update changeling.dm 2017-12-19 15:34:38 -06:00
LetterJay 98d752fe21 Update traitor_bro.dm 2017-12-19 15:34:27 -06:00
LetterJay a8db6dc9c2 Update mop_bucket.dm 2017-12-19 15:29:36 -06:00
LetterJay d59e85e214 Update weldingtool.dm 2017-12-19 15:20:39 -06:00
Jordan Brown 30e8b2a12d Merge pull request #33683 from AnturK/getcommandfix
Fixes get admin command
2017-12-19 14:30:27 -06:00
duncathan salt 0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
Leo 4e5671960d Merge pull request #33651 from coiax/absorb-language
Changelings learn languages from people they absorb
2017-12-19 07:55:57 -06:00
ACCount 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
Shadowlight213 ffb04fd070 Removes syndicate door access from Captain's PDA cartridge. (#33635) 2017-12-18 21:22:21 -06:00
kevinz000 8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -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 0b75557816 Update shields.dm 2017-12-18 17:24:28 -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 06617159b7 Merge pull request #4428 from Citadel-Station-13/upstream-merge-33419
[MIRROR] Lollipop dispensers can push lollipops into people's hands
2017-12-18 15:27:03 -06:00
LetterJay da58957c23 Merge pull request #4425 from Citadel-Station-13/upstream-merge-33607
[MIRROR] Dance Machine now obeys instrument preference
2017-12-18 15:26:33 -06:00
LetterJay 4a835b47ce Merge pull request #4417 from Citadel-Station-13/upstream-merge-33586
[MIRROR] Disables clockcult power alerts to ghosts when it's not clockcult
2017-12-18 15:25:46 -06:00
LetterJay 97a321bc82 Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553
[MIRROR] Rebalances Marauder shields
2017-12-18 15:21:07 -06:00
XDTM 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -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
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 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
LetterJay eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -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
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
Jordan Brown a834287d65 Fixes cross comms 2017-12-17 15:05:43 -06:00
oranges ac95eb06e8 Dance Machine now obeys instrument preference (#33607) 2017-12-17 15:02:31 -06:00
Evsey Antonovich 3b1c537bb4 changes one letter (#33591) 2017-12-17 11:30:37 -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 e71fa098ae Shield balance (#33553)
Rebalances Marauder shields
2017-12-17 04:11:24 -06:00
Ashe Higgs cde0266c99 Removes the visible messages from vitality matrices (#33549) 2017-12-17 04:11:09 -06:00
Jordie 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
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
MoreRobustThanYou 2f8d49de91 [READY] Monkey mode overhaul 2017-12-15 18:35:52 -06:00
deathride58 b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08: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