shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,362 Commits 5 Branches 0 Tags
29d4b023f09d8774b45ea4df1adc7562ca2f66d3
Commit Graph
3636 Commits
Author SHA1 Message Date
LetterJayandGitHub 7aea98f749 Update meat.dm 2017-11-14 13:40:58 -06:00
JalleoandCitadelStationBot 23983c48bf Old debug objects which one has been replaced and another nobody needs at the moment. Also removal of comments that I forgot to removal at _machinery.dm (#32685) 2017-11-14 05:01:25 -06:00
Jordan BrownandCitadelStationBot c3a4d0d06a Makes cryoxadone heal clone damage again 2017-11-14 05:01:17 -06:00
arsserpentariumandCitadelStationBot d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJayandGitHub 4afc4f5b39 Merge pull request #3922 from deathride58/earlygoonchatfixmirror 
Early mirror of https://github.com/tgstation/tgstation/pull/32705
 2017-11-13 23:23:03 -06:00
deathride58 2f4c556ad8 reeeeEEEEEEEEEEEEEEE 2017-11-13 22:55:18 -05:00
deathride58 1d4ae5196c it works 👍 2017-11-13 17:00:26 -05:00
LetterJayandGitHub ab42a6242f Merge pull request #3920 from Citadel-Station-13/LetterJay-patch-2 
Fixes flavor text on examine
 2017-11-13 13:14:25 -06:00
LetterJayandGitHub d983c7d928 Update examine.dm 2017-11-13 11:54:18 -06:00
LetterJayandGitHub 304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
LetterJayandGitHub 07cb443ba0 Merge pull request #3913 from Citadel-Station-13/upstream-merge-32553 
[MIRROR] Xrays go through walls but stop on mobs/blob
 2017-11-13 11:51:59 -06:00
LetterJayandGitHub f0a852ef1e Merge pull request #3911 from Citadel-Station-13/upstream-merge-32658 
[MIRROR] Fixes latejoin chaplains not getting their weapon on spawn
 2017-11-13 11:51:38 -06:00
LetterJayandGitHub a4c2084404 Merge pull request #3910 from Citadel-Station-13/upstream-merge-32557 
[MIRROR] Adds Extended Drill Hair
 2017-11-13 11:51:30 -06:00
LetterJayandGitHub bc23305ef9 Merge pull request #3907 from Citadel-Station-13/upstream-merge-32613 
[MIRROR]  Fixes cryo overlay system
 2017-11-13 11:50:23 -06:00
LetterJayandGitHub f46db62f48 Update examine.dm 2017-11-13 11:49:47 -06:00
LetterJayandGitHub f610a6110b Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597 
[MIRROR] Fixes stimulum decay
 2017-11-13 11:45:00 -06:00
LetterJayandGitHub 228aed8b35 Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546 
[MIRROR] Refactor of base machinery a tiny bit more. DONE
 2017-11-13 11:44:46 -06:00
LetterJayandGitHub 6e3e6ef6b8 Merge pull request #3900 from Citadel-Station-13/upstream-merge-32585 
[MIRROR] adjusted default internet song volume to 25
 2017-11-13 11:44:25 -06:00
LetterJayandGitHub 4142105fe6 Merge pull request #3895 from Citadel-Station-13/upstream-merge-32435 
[MIRROR] Disposal pipes and pipe dispensers refactor
 2017-11-13 11:44:04 -06:00
LetterJayandGitHub 97757d2c87 Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559 
[MIRROR] Makes false alarm use more explicit in event code.
 2017-11-13 11:42:53 -06:00
LetterJayandGitHub 9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582 
[MIRROR] Fixes 512 compile reminders
 2017-11-13 11:42:40 -06:00
LetterJayandGitHub 09f2c19f0f Update admin_verbs.dm 2017-11-13 11:40:22 -06:00
LetterJayandGitHub 9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
Emmett GainesandCitadelStationBot 3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -06:00
orangesandCitadelStationBot 43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
orangesandCitadelStationBot 033f336ed1 Merge pull request #32553 from ExcessiveUseOfCobblestone/ihategoofxray 
Xrays go through walls but stop on mobs/blob
 2017-11-13 03:17:24 -06:00
Ashe HiggsandCitadelStationBot 9dff28b50d Improves the deep fryer 2017-11-13 03:16:11 -06:00
KorPhaeronandCitadelStationBot 3f297ccb79 Fixes chaplain not getting his weapon on spawn (#32658) 2017-11-13 03:16:01 -06:00
orangesandCitadelStationBot 7c45ae5cb7 Adds Extended Drill Hair 2017-11-13 03:12:44 -06:00
LetterJayandGitHub 14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJayandGitHub 9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJayandGitHub 3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161 
[MIRROR] 512 forward compatibility merge
 2017-11-12 23:06:55 -06:00
nicbnandCitadelStationBot 9ac530dac9 Fixes cryo overlay system (#32613) 
* Fixes cryo overlay system

* oops
 2017-11-12 19:28:14 -06:00
LetterJayandGitHub 768e80544e Update autolathe_designs.dm 2017-11-12 15:41:25 -06:00
AnturKandCitadelStationBot d987dcdda8 Fixes stimulum decay (#32597) 
* Fixes stimulum decay

* Nitryl too

* This too.

* Makes stimulum actually apply it's anti-stun changes.
 2017-11-12 15:33:20 -06:00
LetterJayandGitHub f812be1ee0 Update autolathe_designs.dm 2017-11-12 14:46:18 -06:00
LetterJayandGitHub e97bc1028e Update examine.dm 2017-11-12 14:09:20 -06:00
JalleoandCitadelStationBot 300c471da9 Refactor of base machinery a tiny bit more. DONE (#32546) 
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
 2017-11-12 13:19:23 -06:00
LetterJayandGitHub fa6b955dcf Update tgui.dm 2017-11-12 13:18:42 -06:00
LetterJayandGitHub 5ca3389cc2 Update clipboard.dm 2017-11-12 13:17:59 -06:00
LetterJayandGitHub 8d78a999e1 Update jellypeople.dm 2017-11-12 13:17:41 -06:00
LetterJayandGitHub 6da7d8e8b5 Update posibrain.dm 2017-11-12 13:17:08 -06:00
Jordan BrownandCitadelStationBot de54b1cdd8 Merge pull request #32585 from Qbopper/turnitdown 
adjusted default internet song volume to 25
 2017-11-12 12:52:31 -06:00
LetterJayandGitHub 439723caff Update adminhelp.dm 2017-11-12 11:18:11 -06:00
LetterJayandGitHub d8c25f656b Update admin_investigate.dm 2017-11-12 08:56:53 -06:00
LetterJayandGitHub 94578d2f37 Merge pull request #3897 from Citadel-Station-13/upstream-merge-32621 
[MIRROR] Fixes colossus projectiles only shooting north
 2017-11-12 08:21:39 -06:00
LetterJayandGitHub 9b406f88a7 Merge pull request #3879 from Citadel-Station-13/upstream-merge-32400 
[MIRROR] Assmos tweaks/minor additions.
 2017-11-12 08:21:09 -06:00
LetterJayandGitHub f2ef581114 Merge pull request #3878 from Citadel-Station-13/upstream-merge-32545 
[MIRROR] clamps view range and add view range to a minimum of 7
 2017-11-12 08:20:58 -06:00
LetterJayandGitHub 94bdcb6848 Merge pull request #3876 from Citadel-Station-13/upstream-merge-32556 
[MIRROR] Fixed teleporting food out of the deep fryer
 2017-11-12 08:20:10 -06:00
LetterJayandGitHub 1c8ae63808 Merge pull request #3836 from Citadel-Station-13/upstream-merge-32453 
[MIRROR] Little change. More the same
 2017-11-12 08:20:01 -06:00