Commit Graph

20 Commits

Author SHA1 Message Date
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
deathride58
380556dde4 Merge pull request #5330 from Citadel-Station-13/upstream-merge-35156
[MIRROR] Slaughter demon, Morph, ERT / Deathsquad antag datums.
2018-02-06 17:54:05 +00:00
Poojawa
1d4e0d3511 Oops, copy paste fail 2018-02-06 09:56:36 -06:00
Poojawa
1bf0cdac64 Update slaughterevent.dm 2018-02-06 09:56:10 -06:00
Poojawa
35dcf5dce1 Update slaughter.dm 2018-02-06 09:50:12 -06:00
Poojawa
79cb10f8ec Update morph.dm 2018-02-06 09:49:46 -06:00
Poojawa
1cea674509 Update antag_spawner.dm 2018-02-05 21:35:15 -06:00
deathride58
156fa1da1a Update antag_spawner.dm 2018-02-05 21:47:53 -05:00
deathride58
5357d4bd69 Merge pull request #5328 from Citadel-Station-13/upstream-merge-35322
[MIRROR] Adds missing wrapper for abductor roundend report.
2018-02-06 02:46:05 +00:00
AnturK
f9666ab6c9 Slaughter demon, Morph, ERT / Deathsquad antag datums. 2018-02-05 17:00:09 -06:00
vuonojenmustaturska
ef986731ab Merge pull request #35322 from AnturK/missing-wrapper
Adds missing wrapper for abductor roundend report.
2018-02-05 15:47:36 -06:00
XDTM
bdd791f307 Eggs from the abductor egg gland now have a random reagent instead of acid 2018-02-05 09:14:08 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBot
6db855ad4c [MIRROR] Doubles cog power generation, and allows them to generate power at half efficiency in uncharged APCs (#5292)
* Doubles cog power generation, and allows them to generate power at half efficiency in uncharged APCs

* Update integration_cog.dm
2018-02-05 03:28:24 -06:00
CitadelStationBot
afb0b08837 [MIRROR] Fixes servant cyborgs with the Standard module not having Abscond (#5266)
* Fixes servant cyborgs with the Standard module not having Abscond

* Update clockwork_slab.dm

* Update clockwork_slab.dm
2018-02-05 01:39:36 -06:00
CitadelStationBot
584fc7151b [MIRROR] makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#5256)
* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)

* traps patch

* flags!

* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things
2018-02-05 00:57:31 -06:00
CitadelStationBot
fb03783346 [MIRROR] Fixes changelings retaining fake brains on de-changelining (#5248)
* Merge pull request #34872 from AnturK/theresabraininymyhead

Fixes changelings retaining fake brains on de-changelining

* Fixes changelings retaining fake brains on de-changelining
2018-02-05 00:56:51 -06:00
Poojawa
aa04e62b29 cult lol xd 2018-01-31 08:07:22 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00