Commit Graph

5765 Commits

Author SHA1 Message Date
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
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
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
eca7f03c94 Merge pull request #3757 from Citadel-Station-13/upstream-merge-32312
[MIRROR] nerfs flightsuit zoom
2017-11-03 00:11:37 -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
deathride58
3f9e54703a fixes character preview icon directions in ONE LINE (#32332) 2017-11-02 20:24:03 -05:00
Emmett Gaines
ec597c411e Signal redirection component (#32298)
* redirection component

* makes register signal accept callbacks

* this is a very lightweight component
2017-11-02 16:05:04 -05:00
nicbn
065957c0e5 Adds new canister sprites (#32219)
* Gas rename

* and this

* and the comments

* nonitrous

* reverts ren

* really reverts it

* reverts some whitespace

* Update airalarm.dm

* Update canister.dm

* come on travis recompile
2017-11-02 15:01:54 -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
AnturK
b2e37c8799 Fixes atmos. 2017-11-02 11:46:14 -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
MoreRobustThanYou
07efcb0425 [s] New blob overminds off the station Z level are moved to the station (#32243)
* [s] New blob overminds are now placed at normal blob spawn points

* Update transform_procs.dm
2017-11-02 04:30:18 -05:00
MoreRobustThanYou
4c857e446a You can now use banhammers as a weapon (#32270)
* You can now use banhammers as a weapon

* Update weaponry.dm
2017-11-02 04:26:06 -05:00
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
LetterJay
18e4c1c6a0 Merge pull request #3754 from Citadel-Station-13/upstream-merge-32282
[MIRROR] Fix ghosts causing portals to spark
2017-11-02 04:20:43 -05:00
LetterJay
4af81f0a3a Merge pull request #3750 from Citadel-Station-13/upstream-merge-32289
[MIRROR] Fix quick-create nuke team
2017-11-02 04:17:46 -05:00
LetterJay
98801925d0 Merge pull request #3746 from Citadel-Station-13/upstream-merge-32266
[MIRROR] Fixes hallucination alerts not clearing up properly.
2017-11-02 04:17:30 -05:00
kevinz000
82e1d1ac35 fixes inducers working from inside things (#32290) 2017-11-02 04:15:29 -05:00
MoreRobustThanYou
41893fc147 Spamming runes / battlecries / etc will no longer trigger spam prevention (#32303)
* Update say.dm

* Update runes.dm

* Update standard.dm

* Update ratvarian_language.dm
2017-11-02 04:13:18 -05:00
Tad Hardesty
6f06e690a4 Fix double progress bars when digging basalt (#32306) 2017-11-02 04:11:07 -05:00
kevinz000
f7c5196954 nerf flight vision (#32312) 2017-11-02 04:08:51 -05:00
Emmett Gaines
eb52a61437 makes walls call parent (#32309) 2017-11-02 04:08:44 -05:00
CitadelStationBot
0796b5d503 Merge pull request #3742 from Citadel-Station-13/upstream-merge-31939
[MIRROR] Adds customizable sound emitters for admin use
2017-11-02 04:07:57 -05:00