Commit Graph

2276 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
a748a0dabd Merge pull request #3744 from Citadel-Station-13/upstream-merge-32257
[MIRROR] Abscond and rifts return servants directly to the Ark
2017-11-04 22:30:57 -05:00
Mercenaryblue
a1532818bc Frog masks [Feature] [ready] 2017-11-04 15:17:31 -05:00
Leo
0af8cf0329 Merge pull request #32381 from AnturK/ridingdatumsneveragain
Restores buckling sanity.
2017-11-04 13:08:19 -05:00
YPOQ
b5cdfe5070 Fixes using RPDs on catwalks and allows using on lattices (#32378) 2017-11-04 10:10:00 -05:00
nicbn
46c62b6293 overhaul (#32316) 2017-11-03 23:40:27 -05:00
Jordan Brown
a4665bc7cd Fixed required images being in the config folder 2017-11-03 23:35:06 -05:00
Michiyamenotehifunana
6446b7f126 Security Skirts and more! 2017-11-04 10:22:45 +08:00
MoreRobustThanYou
4e6435e4b7 You can no longer disturb the floor with visions of madness (#32339)
* You can no longer disturb the floor with visions of madness

* Add failure message

* Deletes uneeded line
2017-11-03 18:54:49 -05:00
AnturK
bd42e162c5 Fixes golem shells breaking spawners menu (#32342) 2017-11-03 17:37:20 -05:00
kevinz000
afca7f1d09 [READY]Helps address atmospherics nullspace runtimes (#32281)
* Helps fix atmospherics nullspace runtimes, adds debugging to pipe caches and makes the list accessible.

* I can spell properly guys

* Ok ok ok no global!

* Update construction.dm
2017-11-03 15:54:52 -05:00
ShizCalev
6e90fd9f6d fixes pie cannon bug (#32360) 2017-11-03 15:54:11 -05:00
Qustinnus
d100d044e1 you failed loser try again (#32356) 2017-11-03 15:53:51 -05:00
KorPhaeron
7b46801c35 Prints out cultist names at round end (#32355) 2017-11-03 15:53:42 -05:00
Qustinnus
d475149e8d Adds around 30 new ambience sounds, and changes ambience code a little bit 2017-11-03 15:53:09 -05:00
LetterJay
73f54f340f Merge pull request #3770 from Citadel-Station-13/upstream-merge-32328
[MIRROR] Refactors the RCD code a tiny bit. One minor balance change
2017-11-03 00:14:58 -05:00
LetterJay
f2ff0e1ad3 Merge pull request #3769 from Citadel-Station-13/upstream-merge-32313
[MIRROR] Hotel Security spellchecked
2017-11-03 00:14:43 -05:00
LetterJay
02a0da9c38 Merge pull request #3765 from Citadel-Station-13/upstream-merge-31640
[MIRROR] [Ready]Ghosts can now Health Scan
2017-11-03 00:13:58 -05:00
LetterJay
8d1a80d047 Merge pull request #3763 from Citadel-Station-13/upstream-merge-32270
[MIRROR] You can now use banhammers as a weapon
2017-11-03 00:13:17 -05:00
LetterJay
8006c60784 Merge pull request #3762 from Citadel-Station-13/upstream-merge-32284
[MIRROR] Fix a few syntactic aberrations
2017-11-03 00:13:00 -05:00
LetterJay
57655dfd60 Merge pull request #3760 from Citadel-Station-13/upstream-merge-32290
[MIRROR] fixes being able to recharge an object with an inducer while inside the object
2017-11-03 00:12:22 -05:00
LetterJay
9b61dabb67 Merge pull request #3759 from Citadel-Station-13/upstream-merge-32303
[MIRROR] Spamming runes / battlecries / etc will no longer trigger spam prevention
2017-11-03 00:12:12 -05:00
LetterJay
443b49f7f2 Merge pull request #3758 from Citadel-Station-13/upstream-merge-32306
[MIRROR] Fix double progress bars when digging basalt
2017-11-03 00:11:51 -05:00
LetterJay
dea89c9e01 Merge pull request #3756 from Citadel-Station-13/upstream-merge-32309
[MIRROR] Makes walls call parent
2017-11-03 00:11:29 -05:00
LetterJay
05e71b2987 Merge pull request #3748 from Citadel-Station-13/upstream-merge-32273
[MIRROR] [s] Adds admin logging to clockwork ark activation
2017-11-02 23:51:39 -05:00
LetterJay
5b890dc8a6 Merge pull request #3749 from Citadel-Station-13/upstream-merge-32288
[MIRROR] Fixes hand tele adjacent attacks teleporting you
2017-11-02 23:50:38 -05:00
Jalleo
76bce07100 Refactors the RCD code a tiny bit. One minor balance change (#32328)
* Refactors the RCD code a tad to remove a variable from all RCD's and instead get the reinf_walls.dm checks to be a compiled check with a istype.

* Reverts back to variables for the reinforced walls check. Still reduced the amount of nessecary lines for it though
2017-11-02 13:55:46 -05:00
Mercenaryblue
67a91aaf41 Hotel Security spellchecked (#32313)
* spellcheck

interests

* spellcheck
2017-11-02 13:29:15 -05:00
XDTM
d04b5cbeef Ghosts can now Health Scan (#31640)
* Ghosts can now Health Scan

* cyberbossing

* Update observer.dm
2017-11-02 08:46:42 -05:00