Commit Graph

5835 Commits

Author SHA1 Message Date
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
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
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
LetterJay
1489019399 Merge pull request #3784 from Citadel-Station-13/upstream-merge-32260
[MIRROR] Shapeshift tweaks.
2017-11-07 03:50:05 -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
Jordan Brown
bd69a59bad Merge pull request #32417 from YPOQ/empwirefix
Fixes EMP wire pulsing
2017-11-05 12:03:42 -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
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
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
ACCount
ab7e8a96a3 Increased gas filter UI size (#32402) 2017-11-05 02:08:43 -06:00
ACCount
ceece097bf Fixes flamethrower icon not updating on plasma tank removal (#32401) 2017-11-05 02:08:36 -06:00
Emmett Gaines
5bcc90d3c1 removes search_contents_for proc (#32411) 2017-11-05 02:07:16 -06: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
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
065dcb6eab Merge pull request #3806 from Citadel-Station-13/upstream-merge-32381
[MIRROR] Restores buckling sanity.
2017-11-04 22:53:54 -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
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
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
LetterJay
cd9bab3052 Merge pull request #3799 from deathride58/furtherboxedits
Boxstation Edits: Legless Warden edition
2017-11-04 22:50:58 -05:00
LetterJay
7d0ac85ec6 Merge pull request #3798 from Citadel-Station-13/upstream-merge-32316
[MIRROR] Wall damage decal overhaul
2017-11-04 22:50:29 -05:00
LetterJay
cf83d3410b Merge pull request #3797 from Citadel-Station-13/upstream-merge-32329
[MIRROR] Some improvements on the holiday system
2017-11-04 22:49:49 -05:00
LetterJay
3f1d478c27 Merge pull request #3795 from Michiyamenotehifunana/secskirt
Security Skirts and more!
2017-11-04 22:49:14 -05:00
LetterJay
c0293df7e0 Merge pull request #3794 from Citadel-Station-13/upstream-merge-32339
[MIRROR] You can no longer disturb the floor with visions of madness
2017-11-04 22:48:50 -05:00
LetterJay
4bf6f81fd9 Merge pull request #3793 from Citadel-Station-13/upstream-merge-32362
[MIRROR] Improves hotspot code
2017-11-04 22:48:34 -05:00
LetterJay
6c1347366a Merge pull request #3792 from Citadel-Station-13/upstream-merge-32342
[MIRROR] Fixes golem shells breaking spawners menu
2017-11-04 22:47:59 -05:00
LetterJay
74706b1eea Merge pull request #3791 from Citadel-Station-13/upstream-merge-32367
[MIRROR] Adds 'round' chat command
2017-11-04 22:47:48 -05:00
LetterJay
39692c6134 Merge pull request #3790 from Citadel-Station-13/upstream-merge-32354
[MIRROR] Woody golems get woody names.
2017-11-04 22:47:34 -05:00
LetterJay
9b9aa323c5 Merge pull request #3789 from Citadel-Station-13/upstream-merge-32233
[MIRROR] Allows cyborgs to perform limb augmentation
2017-11-04 22:46:45 -05:00
LetterJay
b1c859b988 Merge pull request #3788 from Citadel-Station-13/upstream-merge-32327
[MIRROR] Add off switch to holodeck
2017-11-04 22:46:09 -05:00
LetterJay
4426e2f4be Merge pull request #3787 from Citadel-Station-13/upstream-merge-32281
[MIRROR] [READY]Helps address atmospherics nullspace runtimes
2017-11-04 22:45:37 -05:00
LetterJay
dd32227946 Merge pull request #3786 from Citadel-Station-13/upstream-merge-32346
[MIRROR] removes lesser drake crusher loot
2017-11-04 22:45:17 -05:00
LetterJay
03a0057609 Merge pull request #3785 from Citadel-Station-13/upstream-merge-32384
[MIRROR] Hopefully fixes guest accounts being able to log in
2017-11-04 22:45:00 -05:00
LetterJay
110b0e0615 Update shapeshift.dm 2017-11-04 22:44:56 -05:00
LetterJay
113e3a5b53 Merge pull request #3783 from Citadel-Station-13/upstream-merge-32358
[MIRROR] Dullahan Fixes
2017-11-04 22:44:23 -05:00
LetterJay
6c3fdbd5d5 Merge pull request #3782 from Citadel-Station-13/upstream-merge-32360
[MIRROR] fixes pie cannon bug
2017-11-04 22:44:08 -05:00
LetterJay
23d6ccb27a Update sound.dm 2017-11-04 22:44:01 -05:00
LetterJay
6490ac4472 Merge pull request #3781 from Citadel-Station-13/upstream-merge-32338
[MIRROR] Fixes hotspot runtime
2017-11-04 22:41:42 -05:00
LetterJay
c472b92fd1 Merge pull request #3780 from Citadel-Station-13/upstream-merge-32356
[MIRROR] Redtexting as a traitor now gets you some depressing music played to you
2017-11-04 22:41:30 -05:00
LetterJay
f6d9f3411c Merge pull request #3779 from Citadel-Station-13/upstream-merge-32355
[MIRROR] Prints out cultist names at round end
2017-11-04 22:40:58 -05:00
LetterJay
c3aa4c5929 Merge pull request #3778 from Citadel-Station-13/upstream-merge-32350
[MIRROR] Fixes shuttle parallax again
2017-11-04 22:33:30 -05:00
LetterJay
9c6a165de6 Merge pull request #3777 from Citadel-Station-13/upstream-merge-32347
[MIRROR] Proper and improper macros are removed before sending to irc
2017-11-04 22:32:15 -05:00
LetterJay
b5dc1d5c45 Merge pull request #3776 from Citadel-Station-13/upstream-merge-32368
[MIRROR] Cleans up signal redirector
2017-11-04 22:31:53 -05:00