Commit Graph

8518 Commits

Author SHA1 Message Date
CitadelStationBot cb8fbacee8 Automatic changelog generation for PR #3824 [ci skip] 2017-11-07 04:41:58 -06:00
LetterJay 2d07daca49 Merge pull request #3824 from Citadel-Station-13/upstream-merge-32417
[MIRROR] Fixes EMP wire pulsing
2017-11-07 04:41:55 -06:00
CitadelStationBot c102833d2d Automatic changelog generation for PR #3821 [ci skip] 2017-11-07 04:41:26 -06:00
LetterJay 48dfeb5f7a Merge pull request #3821 from Citadel-Station-13/upstream-merge-32406
[MIRROR] Refactors and improvements to xenobio slime processor
2017-11-07 04:41:23 -06:00
LetterJay 890ed4b2ba Merge pull request #3820 from Citadel-Station-13/upstream-merge-32276
[MIRROR] PKborgs can no longer activate projectile fields if someone is buckled
2017-11-07 04:41:04 -06:00
LetterJay e420734e3a Merge pull request #3819 from Citadel-Station-13/upstream-merge-32397
[MIRROR] Fixes Ark examine
2017-11-07 04:40:48 -06:00
LetterJay 78f8c4650c Merge pull request #3817 from Citadel-Station-13/upstream-merge-32402
[MIRROR] Increased gas filter UI size
2017-11-07 04:39:50 -06:00
LetterJay 472576dd1f Merge pull request #3816 from Citadel-Station-13/upstream-merge-32401
[MIRROR] Fixes flamethrower icon not updating on plasma tank removal
2017-11-07 04:39:37 -06:00
LetterJay 5b819699a2 Merge pull request #3815 from Citadel-Station-13/upstream-merge-32415
[MIRROR] Removes the Cerestation minimap
2017-11-07 04:39:27 -06:00
LetterJay f3ffc7434a Merge pull request #3814 from Citadel-Station-13/upstream-merge-32411
[MIRROR] removes search_contents_for proc
2017-11-07 04:39:16 -06:00
LetterJay b11ae3b119 Merge pull request #3796 from Citadel-Station-13/upstream-merge-32375
[MIRROR] Fixed required images being in the config folder
2017-11-07 03:50:16 -06:00
CitadelStationBot 70f3993f72 Automatic changelog generation for PR #3784 [ci skip] 2017-11-07 03:50:08 -06:00
LetterJay 1489019399 Merge pull request #3784 from Citadel-Station-13/upstream-merge-32260
[MIRROR] Shapeshift tweaks.
2017-11-07 03:50:05 -06:00
CitadelStationBot c614059143 Automatic changelog generation for PR #3775 [ci skip] 2017-11-07 03:49:48 -06:00
LetterJay 9e28d79b8c Merge pull request #3775 from Citadel-Station-13/upstream-merge-32334
[MIRROR] Adds around 30 new ambience sounds, and changes ambience code a little bit
2017-11-07 03:49:46 -06:00
LetterJay 83c6690721 Update closed.dm 2017-11-07 03:24:50 -06:00
LetterJay 6a1c0f6683 Update screen_objects.dm 2017-11-07 03:24:40 -06:00
CitadelStationBot fd00954241 Fixes EMP wire pulsing 2017-11-05 12:03:42 -06:00
Jordan Brown bd69a59bad Merge pull request #32417 from YPOQ/empwirefix
Fixes EMP wire pulsing
2017-11-05 12:03:42 -06:00
CitadelStationBot f26e7c217d Refactors and improvements to xenobio slime processor 2017-11-05 04:32:07 -06:00
vuonojenmustaturska cc438ea9b4 Refactors and improvements to xenobio slime processor (#32406)
* Do not let your memes be dreams

* static lists for great justice

* Local man forgets to capitalize a word

* Slime processor no longer runtimes when processing food
2017-11-05 04:32:07 -06:00
CitadelStationBot 745d75a82a PKborgs can no longer activate projectile fields if someone is buckled 2017-11-05 04:28:51 -06:00
kevinz000 044384d0b1 1# This is a combination of 2 commits. (#32276)
can no longer turn on projectile dampener with buckled mobs
2017-11-05 04:28:51 -06:00
CitadelStationBot 5d3aa207b2 Fixes Ark examine 2017-11-05 02:11:06 -06:00
MoreRobustThanYou 0f5f748bf5 Fixes Ark examine (#32397)
* Fixes Ark examine

Fixes my own problem!

* WOOPS

* Update ark_of_the_clockwork_justicar.dm

* SECONDS!

* That looks a bit cleaner tbh

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm
2017-11-05 02:11:06 -06:00
CitadelStationBot 88003adacb Increased gas filter UI size 2017-11-05 02:08:43 -06:00
ACCount ab7e8a96a3 Increased gas filter UI size (#32402) 2017-11-05 02:08:43 -06:00
CitadelStationBot 512d99815b Fixes flamethrower icon not updating on plasma tank removal 2017-11-05 02:08:36 -06:00
ACCount ceece097bf Fixes flamethrower icon not updating on plasma tank removal (#32401) 2017-11-05 02:08:36 -06:00
CitadelStationBot 5e8c82f9d6 Removes the Cerestation minimap 2017-11-05 02:07:27 -06:00
FrozenGuy5 ed1e82ac63 Removes the Cerestation minimap (#32415)
Removes the CereStation minimap
2017-11-05 02:07:27 -06:00
CitadelStationBot 4d27421892 removes search_contents_for proc 2017-11-05 02:07:16 -06:00
Emmett Gaines 5bcc90d3c1 removes search_contents_for proc (#32411) 2017-11-05 02:07:16 -06:00
LetterJay 326d0bd29b Merge pull request #3813 from Citadel-Station-13/upstream-merge-32407
[MIRROR] Removes old freon blob hint
2017-11-04 22:54:53 -05:00
LetterJay c9a160ccc0 Merge pull request #3812 from Citadel-Station-13/upstream-merge-32377
[MIRROR] Fixes energy katana dash toggle
2017-11-04 22:54:44 -05:00
LetterJay f1d3fb0334 Merge pull request #3811 from Citadel-Station-13/upstream-merge-32396
[MIRROR] Hide already-downloaded programs from NTNet downloader
2017-11-04 22:54:35 -05:00
CitadelStationBot dda3e6524a Automatic changelog generation for PR #3809 [ci skip] 2017-11-04 22:54:25 -05:00
LetterJay 52f45b998b Merge pull request #3809 from Citadel-Station-13/upstream-merge-32322
[MIRROR] Frog masks [Feature] [ready]
2017-11-04 22:54:23 -05:00
LetterJay 5113a71cff Merge pull request #3807 from Citadel-Station-13/upstream-merge-32403
[MIRROR] Removes Freon preset gas filters from all maps
2017-11-04 22:54:06 -05:00
LetterJay 065dcb6eab Merge pull request #3806 from Citadel-Station-13/upstream-merge-32381
[MIRROR] Restores buckling sanity.
2017-11-04 22:53:54 -05:00
CitadelStationBot 31e1d277c6 Automatic changelog generation for PR #3802 [ci skip] 2017-11-04 22:53:42 -05:00
LetterJay 098806129e Merge pull request #3802 from Citadel-Station-13/upstream-merge-32380
[MIRROR] Makes the shuttle beacon refuse to be placed over the map edge
2017-11-04 22:53:40 -05:00
LetterJay f81f3b7262 Merge pull request #3805 from Citadel-Station-13/upstream-merge-32390
[MIRROR] Fixes wrong locker IDs in pubby security cells
2017-11-04 22:53:09 -05:00
LetterJay 23c5e043e7 Merge pull request #3804 from Citadel-Station-13/upstream-merge-32341
[MIRROR] Fixes a bug in single tank bomb assembly
2017-11-04 22:52:59 -05:00
CitadelStationBot 860322608e Automatic changelog generation for PR #3803 [ci skip] 2017-11-04 22:51:58 -05:00
LetterJay 1aa42f1490 Merge pull request #3803 from Citadel-Station-13/upstream-merge-32391
[MIRROR] Expands ancient station map areas.
2017-11-04 22:51:56 -05:00
LetterJay 290daedf9a Merge pull request #3801 from Citadel-Station-13/upstream-merge-32378
[MIRROR] Fixes using RPDs on catwalks and allows using on lattices
2017-11-04 22:51:33 -05:00
CitadelStationBot c9b2f86721 Automatic changelog generation for PR #3800 [ci skip] 2017-11-04 22:51:24 -05:00
LetterJay 9e08e5a64e Merge pull request #3800 from Michiyamenotehifunana/doggy-medkit
Adds Cameron's Medkits
2017-11-04 22:51:22 -05:00
CitadelStationBot 85b4652e46 Automatic changelog generation for PR #3799 [ci skip] 2017-11-04 22:51:01 -05:00