Commit Graph

17988 Commits

Author SHA1 Message Date
deathride58 8d8035950e Fixes centcom titlescreen resolution, finally 2018-07-05 04:23:12 -04:00
deathride58 759dddb821 Fixes signals 2018-07-05 01:42:05 -04:00
deathride58 816257ae7d fuck 2018-07-05 01:38:46 -04:00
deathride58 ff8a90b880 DME 2018-07-05 01:37:57 -04:00
deathride58 b2ec8f89e0 missed files 2018-07-05 01:27:07 -04:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot e92379e360 Automatic changelog generation for PR #7327 [ci skip] 2018-07-04 20:38:56 -05:00
CitadelStationBot 06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327)
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852)

* a commit message

* reviews addressed?

* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
2018-07-04 18:38:53 -07:00
CitadelStationBot 7673384890 [MIRROR] [s] Fixes announcement XSS (#7324)
* [s] Fixes announcement XSS

* Merge pull request #38892 from ThatLing/robots-are-very-delicate

[s] Fixes announcement XSS
2018-07-04 17:40:10 -07:00
deathride58 cc628a905e two major fixes - fixes flavortext and right click exploit 2018-07-04 16:41:55 -04:00
Letter N abc32ed0df adds "cap's female formal outfit" (#7307)
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
2018-07-04 05:37:01 -07:00
CitadelStationBot 22e56253d0 [MIRROR] Fixes gravity gun runtimes. (#7310)
* Merge pull request #38867 from AnturK/gravgun

Fixes gravity gun runtimes.

* Fixes gravity gun runtimes.
2018-07-03 09:14:26 -07:00
CitadelStationBot 7f0c82b0ba [MIRROR] SDQL where filter message is now correct (#7309)
* Merge pull request #38853 from optimumtact/seequeuedeeall

SDQL where filter message is now correct

* SDQL where filter message is now correct
2018-07-03 09:14:00 -07:00
deathride58 f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58 6873a7c065 DME and dockerfile 2018-07-02 13:04:33 -04:00
CitadelStationBot 0500be9b35 [MIRROR] Fixes some shard harddel stuff. (#7299)
* Fixes some shard harddel stuff. (#38799)

* Fixes some shard harddel stuff.
2018-07-02 06:44:50 -07:00
CitadelStationBot 028c3105b9 Automatic changelog generation for PR #7294 [ci skip] 2018-07-02 05:23:54 -05:00
CitadelStationBot 6b0e597553 [MIRROR] Fix circuit printer printing finished TEG machinery (#7294)
* Merge pull request #38844 from AutomaticFrenzy/patch/circuits

Fix circuit printer printing finished TEG machinery

* Fix circuit printer printing finished TEG machinery
2018-07-02 03:23:49 -07:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
deathride58 63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
LetterJay 74f7e56f4e Merge pull request #7284 from Citadel-Station-13/upstream-merge-38797
[MIRROR] Fixes TGUI runtime
2018-07-01 09:41:03 -05:00
LetterJay ee0bef443e Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796
[MIRROR] Fixes emitter runtime
2018-07-01 09:39:43 -05:00
LetterJay af5a250ce4 Merge pull request #7282 from Citadel-Station-13/upstream-merge-38779
[MIRROR] Fixes arrivals shuttle damage message runtime
2018-07-01 09:39:28 -05:00
LetterJay 42c322ca2c Merge pull request #7281 from Citadel-Station-13/upstream-merge-38789
[MIRROR] Cleans up leftover telesci teleporter code
2018-07-01 09:39:08 -05:00
CitadelStationBot 0b33ea727f Automatic changelog generation for PR #7280 [ci skip] 2018-07-01 09:38:19 -05:00
LetterJay b5b8ce5337 Merge pull request #7280 from Citadel-Station-13/upstream-merge-38751
[MIRROR] Updates plastic flaps icon and cleans up its code
2018-07-01 09:38:16 -05:00
LetterJay 2b9aca8143 Merge pull request #7279 from Citadel-Station-13/upstream-merge-38795
[MIRROR] [s] Fixes PDA ID teleporting
2018-07-01 09:37:45 -05:00
LetterJay 2303e23f2c Merge pull request #7278 from Citadel-Station-13/upstream-merge-38776
[MIRROR] Potentially fixes monkey fever runtiming on infection
2018-07-01 09:37:24 -05:00
CitadelStationBot 3c6749d326 Automatic changelog generation for PR #7277 [ci skip] 2018-07-01 09:37:08 -05:00
LetterJay be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656
[MIRROR] Makes the deconstructable TEG working
2018-07-01 09:36:57 -05:00
LetterJay c7b830d2c6 Merge pull request #7276 from Citadel-Station-13/upstream-merge-38834
[MIRROR] Add welded shut message to vent scrubber
2018-07-01 09:36:33 -05:00
LetterJay e1d6ee593b Merge pull request #7275 from Citadel-Station-13/upstream-merge-38800
[MIRROR] Adds missing armor to accessories
2018-07-01 09:36:13 -05:00
CitadelStationBot 3b5264b2f7 Automatic changelog generation for PR #7273 [ci skip] 2018-07-01 09:35:56 -05:00
LetterJay f7fef5f1ed Merge pull request #7273 from Citadel-Station-13/upstream-merge-38804
[MIRROR] Adds a colour picker component for circuits
2018-07-01 09:35:51 -05:00
LetterJay 172c8cab04 Merge pull request #7272 from Citadel-Station-13/upstream-merge-38816
[MIRROR] Make travis use -verbose to get all the runtimes without limit
2018-07-01 09:35:33 -05:00
LetterJay 96fcd9275f Merge pull request #7268 from Citadel-Station-13/kevinz000-patch-9
boh fix mirror broke
2018-07-01 09:33:53 -05:00
CitadelStationBot 3090813add Automatic changelog generation for PR #7267 [ci skip] 2018-07-01 09:33:38 -05:00
LetterJay 389faab2a5 Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728
[MIRROR] Gives honey antibiotic properties
2018-07-01 09:33:36 -05:00
CitadelStationBot c970bc259e Automatic changelog generation for PR #7265 [ci skip] 2018-07-01 09:32:41 -05:00
LetterJay 727aa6b2a9 Merge pull request #7265 from Citadel-Station-13/upstream-merge-38745
[MIRROR] Fixes not receiving AI destroy objective during IAA
2018-07-01 09:32:39 -05:00
CitadelStationBot 5062fcd60e Automatic changelog generation for PR #7264 [ci skip] 2018-07-01 09:32:15 -05:00
LetterJay 16eefdd1e6 Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646
[MIRROR] [Ready]Expands the list of borg-wearable hats
2018-07-01 09:32:08 -05:00
CitadelStationBot b58718625a Automatic changelog generation for PR #7262 [ci skip] 2018-07-01 09:31:15 -05:00
LetterJay 18b8aad8cb Merge pull request #7262 from Citadel-Station-13/upstream-merge-38690
[MIRROR] Destructive analyzers can now destroy anything again, even if it has no materials
2018-07-01 09:31:12 -05:00
CitadelStationBot fc76c6c496 Automatic changelog generation for PR #7259 [ci skip] 2018-07-01 09:30:49 -05:00
LetterJay 7100ae3a7b Merge pull request #7259 from Citadel-Station-13/upstream-merge-38727
[MIRROR] Prevents reagents being transferred to a bucket while its worn on a head
2018-07-01 09:30:46 -05:00
LetterJay 74730261b0 Merge pull request #7258 from Citadel-Station-13/upstream-merge-38689
[MIRROR] Move throwforce up to atom/movable
2018-07-01 09:30:09 -05:00