Commit Graph
13149 Commits
Author SHA1 Message Date
CitadelStationBot ded35f585d Automatic changelog generation for PR #5266 [ci skip] 2018-02-05 01:39:39 -06:00
CitadelStationBotandPoojawa 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 921e149cf6 Automatic changelog generation for PR #5293 [ci skip] 2018-02-05 01:31:18 -06:00
CitadelStationBotandPoojawa b16d2148e4 [MIRROR] Steampunk Watches! (#5293)
* Steampunk Watches! (#35187)

* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!

* Steampunk Watches!
2018-02-05 01:31:16 -06:00
CitadelStationBot 0f39cda70d Automatic changelog generation for PR #5264 [ci skip] 2018-02-05 01:30:44 -06:00
CitadelStationBotandPoojawa 88fdac3579 [MIRROR] Removes ketrazine (#5264)
* Removes ketrazine

* Update medicine_reagents.dm
2018-02-05 01:30:42 -06:00
CitadelStationBotandPoojawa 64c43ee5bc Morgue Trays now provide correct light-indication (#5262) 2018-02-05 01:26:36 -06:00
CitadelStationBot 9165aa72da Automatic changelog generation for PR #5263 [ci skip] 2018-02-05 01:26:22 -06:00
NickandPoojawa aebeaa35ae aghh (#5263) 2018-02-05 01:26:20 -06:00
CitadelStationBot 05142a3d2a Automatic changelog generation for PR #5243 [ci skip] 2018-02-05 01:23:48 -06:00
Zna12andPoojawa a89e9f20aa Foam-Force Assault Machines. (#5243)
* REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

i HAVE NO IDEA WHAT I'M DOING

* Wew. Managed to add the AM4 to the thingy.

WYSIWYG

* ALMOST DONEEEE

Wew. Just a few more tweaks

* To be reverted.

This is just adding a file of the sprite for the mag so I can work at work

* AM4B Complete, Moving to AM4C

And also I need to make the magazines.

* One step forward two steps back.

Magazine sprites are in. still need to test it.

* Forgot to save a file.

Woops.

* AM4 Finished.

Adds two weapons, the AM4-B and the AM4-C. Yes they're supposed to look like the MA5.

* Reverted those last couple things.

Deleted some loose files that I didn't actually need. Whoops.
2018-02-05 01:23:46 -06:00
CitadelStationBot b5c6ef3648 Automatic changelog generation for PR #5261 [ci skip] 2018-02-05 01:10:31 -06:00
CitadelStationBotandPoojawa 0c74a7eede [MIRROR] Holorays! (#5261)
* Holorays!

* adding missing .dmi
2018-02-05 01:10:29 -06:00
CitadelStationBot b877d3f18e Automatic changelog generation for PR #5256 [ci skip] 2018-02-05 00:57:33 -06:00
CitadelStationBotandPoojawa 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 b872c7c728 Automatic changelog generation for PR #5255 [ci skip] 2018-02-05 00:57:20 -06:00
CitadelStationBotandPoojawa 417cd16239 [MIRROR] Fixes white "eye" pixels appearing on races with custom eyes on their sprite (#5255)
* Merge pull request #35185 from Xhuis/eyesontheinsideofourbrains

Fixes white "eye" pixels appearing on races with custom eyes on their sprite

* Fixes white "eye" pixels appearing on races with custom eyes on their sprite
2018-02-05 00:57:18 -06:00
CitadelStationBotandPoojawa 7c56b53aab [MIRROR] Ports telecoms to Initialize (#5249)
* Ports telecoms to Initialize

* Update telecomunications.dm
2018-02-05 00:57:04 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 662f1904aa [MIRROR] Lavaland bomb runtime fix (#5246)
* Lavaland bomb runtime fix

* Update cleanable.dm
2018-02-05 00:56:37 -06:00
CitadelStationBot 4082bcedbc Automatic changelog generation for PR #5298 [ci skip] 2018-02-05 00:54:24 -06:00
CitadelStationBotandPoojawa 0d01cb1f56 [MIRROR] Adds a log out button to record screen of the security records and allows you to print photos that are on file (#5298)
* Adds a log out button to record screen of the security records and also allows you to print photos (#35160)

* Adds a log out button to record screen of the security records and allows you to print photos that are on file
2018-02-05 00:54:22 -06:00
CitadelStationBot 895637a486 Automatic changelog generation for PR #5299 [ci skip] 2018-02-05 00:53:54 -06:00
CitadelStationBotandPoojawa 17ccbb4a53 [MIRROR] Adds tiny shards (#5299)
* Adds tiny shards (#35070)

* Adds tiny shards

* .

* .

* .

* .

* .

* .

* Adds tiny shards
2018-02-05 00:53:52 -06:00
CitadelStationBotandPoojawa de1d277b65 [MIRROR] Buffs Clogged Vents (#5301)
* Buffs Clogged Vents (#34949)

* Buffs Clogged Vents

🆑 Iamgoofball
feature: Clogged Vents now has some teeth
/🆑

This was the only part of GoofEvents players liked

* Update effects_foam.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Buffs Clogged Vents
2018-02-05 00:52:06 -06:00
CitadelStationBotandPoojawa 18932a5d31 [MIRROR] [s] Fixes clogged vents delamming the supermatter (#5303)
* [s] Fixes clogged vents delamming the supermatter (#35300)

wow forgot to commit thiss to the PR lmao

* [s] Fixes clogged vents delamming the supermatter
2018-02-05 00:51:34 -06:00
CitadelStationBot e209bef392 Automatic changelog generation for PR #5305 [ci skip] 2018-02-05 00:49:55 -06:00
CitadelStationBotandPoojawa cae09efd79 [MIRROR] Romerol works on dead people (#5305)
* Romerol works on dead people (#34870)

🆑 coiax
balance: Romerol is now effective on dead bodies, not just ones that are
still alive.
/🆑

Why? Because it seems silly that a zombie virus requires someone to be
alive, and zombie claws work on dead bodies.

* Romerol works on dead people
2018-02-05 00:49:53 -06:00
CitadelStationBot 38a7ee3db3 Automatic changelog generation for PR #5309 [ci skip] 2018-02-05 00:49:36 -06:00
CitadelStationBotandPoojawa 15be2b9579 [MIRROR] Intelligence potions won't override previously known mob languages (#5309)
* Intelligence potions won't override previously known mob languages

* Intelligence potions won't override previously known mob languages
2018-02-05 00:49:34 -06:00
CitadelStationBot 49ddf91cf6 Automatic changelog generation for PR #5310 [ci skip] 2018-02-05 00:49:19 -06:00
CitadelStationBotandPoojawa fcff80df09 [MIRROR] Fix research investigate logs (#5310)
* Merge pull request #35283 from AutomaticFrenzy/patch/research-logs

Fix research investigate logs

* Fix research investigate logs
2018-02-05 00:49:17 -06:00
CitadelStationBotandPoojawa e95269398c [MIRROR] Fixes sending cross station messages during wait period. (#5311)
* Merge pull request #35286 from DaxDupont/commsfix

Fixes sending cross station messages during wait period.

* Fixes sending cross station messages during wait period.
2018-02-05 00:49:03 -06:00
CitadelStationBotandPoojawa e45aa5aa68 [MIRROR] Makes flick_overlay use client time (#5312)
* Makes flick_overlay use client time (#35271)

* Makes flick_overlay use client time
2018-02-05 00:48:30 -06:00
CitadelStationBotandPoojawa a5d1cae1ac [MIRROR] Fixes smugglers satchels being able to refresh items forever (#5313)
* Fixes smugglers satchels being able to refresh items forever (#35270)

* Fixes smugglers satchels being able to refresh items forever
2018-02-05 00:48:12 -06:00
CitadelStationBot 600f1a7b84 Automatic changelog generation for PR #5315 [ci skip] 2018-02-05 00:47:41 -06:00
CitadelStationBotandPoojawa b25bcbbfab [MIRROR] Fixes power cell name and makes borgs use a standard high capacity cell. (#5315)
* Fixes power cell name and makes borgs use a standard high capacity cell. (#35265)

* Fixes name for upgraded power cell

* Harmonizes battery for cyborgs

* Remove duplicate battery code

* Fixes power cell name and makes borgs use a standard high capacity cell.
2018-02-05 00:47:39 -06:00
CitadelStationBot ca3136d056 Automatic changelog generation for PR #5314 [ci skip] 2018-02-05 00:46:54 -06:00
CitadelStationBotandPoojawa 298b37cacb [MIRROR] Makes slime scanning more readable (#5314)
* Merge pull request #35274 from XDTM/SlimeScan

Makes slime scanning more readable

* Makes slime scanning more readable
2018-02-05 00:46:52 -06:00
CitadelStationBot 1f369dce8a Automatic changelog generation for PR #5300 [ci skip] 2018-02-05 00:46:37 -06:00
CitadelStationBotandPoojawa 330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
PoojawaandGitHub 004309eaed Update README.md 2018-02-04 23:45:47 -06:00
cebutrisandPoojawa 53ce73528a Buffs tablepushing (#5222)
* Buffs tablepushing

* review
2018-02-04 23:26:43 -06:00
CitadelStationBotandPoojawa 7b7674d0ef [MIRROR] Fixes ancient goliathes tentacle attack continuing after death (#5285)
* Fixes ancient goliathes tentacle attack (#35243)

* Fixes ancient goliathes tentacle attack continuing after death
2018-02-04 23:18:51 -06:00
CitadelStationBotandPoojawa 23085154ab [MIRROR] Fixes animal spawners spawning mobs after death (#5284)
* Fixes ancient goliathes (#35242)

* Fixes animal spawners spawning mobs after death
2018-02-04 23:18:34 -06:00
CitadelStationBot 520b51c696 Automatic changelog generation for PR #5283 [ci skip] 2018-02-04 23:18:20 -06:00
CitadelStationBotandPoojawa cc2d5bfc07 [MIRROR] Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#5283)
* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249)

* yaga

* node change

* okay cobby

* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs
2018-02-04 23:18:18 -06:00
CitadelStationBotandPoojawa cb9c2b6124 [MIRROR] battery rig fix (#5282)
* battery rig fix (#35254)

* fix

* oops

* Auto stash before rebase of "tgstation/master"

* remove double notification

* battery rig fix
2018-02-04 23:17:54 -06:00
CitadelStationBot b29cec7f41 Automatic changelog generation for PR #5281 [ci skip] 2018-02-04 23:17:18 -06:00
CitadelStationBotandPoojawa caadbaf887 [MIRROR] Fixes mecha grav catapult not being available in techwebs (#5281)
* Merge pull request #35248 from KorPhaeron/gravity2

Fixes mecha grav catapult not being available in techwebs

* Fixes mecha grav catapult not being available in techwebs
2018-02-04 23:17:16 -06:00