Commit Graph

5793 Commits

Author SHA1 Message Date
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
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
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
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
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
tortellinitony
3772d722e2 Some improvements on the holiday system (#32329) 2017-11-03 23:37:16 -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
Leo
5ca11c1db3 Merge pull request #32362 from tgstation/Cyberboss-patch-2
Improves hotspot code
2017-11-03 17:39:30 -05:00
AnturK
bd42e162c5 Fixes golem shells breaking spawners menu (#32342) 2017-11-03 17:37:20 -05:00
Leo
1db88cecb2 Merge pull request #32367 from tgstation/Cyberboss-patch-3
Adds 'round' chat command
2017-11-03 17:36:09 -05:00
Armhulen
056594114f Woody golems get woody names. (#32354)
* ya, that'll do em.

* we all make mistakes

* heat signature is a great game

* it's aliiiiive

* caving: the commit
2017-11-03 17:01:24 -05:00
swindly
4f04256e46 Allows cyborgs to perform limb augmentation (#32233)
* allows organ storage bags to be used to augment limbs

* replaces hardcoded stuff with intiial()
2017-11-03 15:55:12 -05:00
Tad Hardesty
2ad20f9a27 Add off switch to holodeck (#32327)
"Holodeck - Offline" is now a selectable program and correctly reverts
the holodeck and uses no power.
2017-11-03 15:55:03 -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
imsxz
a509a99b52 crusher loot fix (#32346) 2017-11-03 15:54:44 -05:00
Jordan Brown
b3bf2276ff Merge pull request #32384 from McBawbaggings/tgfix
Hopefully fixes guest accounts being able to log in
2017-11-03 15:54:36 -05:00
KorPhaeron
8f1d81f816 Dullahan Fixes (#32358)
* Dullahan

* Fixes cyborg issue

* Fixes hearing issues
2017-11-03 15:54:19 -05:00
ShizCalev
6e90fd9f6d fixes pie cannon bug (#32360) 2017-11-03 15:54:11 -05:00
oranges
1c60983624 Merge pull request #32338 from AnturK/hotspotfix
Fixes hotspot runtime
2017-11-03 15:54:02 -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
Emmett Gaines
b97e1741df fixes shuttle parallax again (#32350) 2017-11-03 15:53:34 -05:00
Leo
ada8ad0ead Proper and improper macros are removed before sending to irc (#32347)
* Proper and improper macros are removed before sending to irc

* Removes leftover check
2017-11-03 15:53:26 -05:00
Jordan Brown
03e7e0e58c Cleans up signal redirector (#32368) 2017-11-03 15:53:18 -05:00
LetterJay
33d861608a Merge pull request #3771 from Citadel-Station-13/upstream-merge-32219
[MIRROR] Adds new canister sprites
2017-11-03 00:16:08 -05:00
LetterJay
9ebe95158c Merge pull request #3772 from Citadel-Station-13/upstream-merge-32298
[MIRROR] Signal redirection component
2017-11-03 00:15:56 -05:00
LetterJay
1ea62f4343 Merge pull request #3774 from Citadel-Station-13/upstream-merge-32332
[MIRROR] Fixes directional character previews (And probably other things, too)
2017-11-03 00:15:38 -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
2fe152fcf4 Merge pull request #3766 from Citadel-Station-13/upstream-merge-32353
[MIRROR] Fixes atmos.
2017-11-03 00:14:16 -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
e43e73c0c1 Merge pull request #3764 from Citadel-Station-13/upstream-merge-32243
[MIRROR] [s] New blob overminds off the station Z level are moved to the station
2017-11-03 00:13:37 -05:00