Commit Graph

8481 Commits

Author SHA1 Message Date
Ashe Higgs
31dfd7e8fb Plush Ratvar can now fight plush Nar-Sie (#32046)
* Plush Ratvar can fight plush Nar-Sie

* Maintainer review

* Qdeleted checks
2017-11-06 14:44:25 -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
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
CitadelStationBot
45bd77f11a Automatic changelog generation for PR #3795 [ci skip] 2017-11-04 22:49:16 -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
CitadelStationBot
30f2862525 Automatic changelog generation for PR #3789 [ci skip] 2017-11-04 22:46:47 -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
CitadelStationBot
f65e5e8825 Automatic changelog generation for PR #3788 [ci skip] 2017-11-04 22:46:11 -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
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
6490ac4472 Merge pull request #3781 from Citadel-Station-13/upstream-merge-32338
[MIRROR] Fixes hotspot runtime
2017-11-04 22:41:42 -05:00
CitadelStationBot
8226b3ac33 Automatic changelog generation for PR #3780 [ci skip] 2017-11-04 22:41:33 -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
CitadelStationBot
b0c621e1c5 Automatic changelog generation for PR #3779 [ci skip] 2017-11-04 22:41:01 -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
CitadelStationBot
83e497542a Automatic changelog generation for PR #3778 [ci skip] 2017-11-04 22:33:33 -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
CitadelStationBot
98a0440c79 Automatic changelog generation for PR #3745 [ci skip] 2017-11-04 22:31:20 -05:00
LetterJay
1c131962d4 Merge pull request #3745 from Citadel-Station-13/upstream-merge-32269
[MIRROR] Makes enterTransit check canMove and sets mode to idle
2017-11-04 22:31:17 -05:00
CitadelStationBot
1930a341f0 Automatic changelog generation for PR #3744 [ci skip] 2017-11-04 22:30:59 -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