Commit Graph
37556 Commits
Author SHA1 Message Date
Fox McCloud f28285e16f further checks 2018-04-30 04:42:57 -04:00
Fox McCloud e649a72923 Emptying Stop-gap 2018-04-30 03:53:49 -04:00
ParadiseSS13-Bot 008e903993 Automatic changelog compile, [ci skip] 2018-04-30 03:45:11 +00:00
ParadiseSS13-Bot 2c97883b68 Automatic changelog generation for PR #8938 [ci skip] 2018-04-29 23:28:52 -04:00
tigercat2000andGitHub 3c1fbf9cc5 Merge pull request #8938 from Fox-McCloud/guillotine
Ports Guillotine
2018-04-29 20:28:50 -07:00
ParadiseSS13-Bot 89b8d9d5ad Automatic changelog generation for PR #8836 [ci skip] 2018-04-29 23:15:38 -04:00
Fox McCloudandGitHub 691fe8bcf5 Merge pull request #8836 from FreeStylaLT/medbay_tweak
Changes Medbay's treatment center, Virology hallway entrance
2018-04-29 23:15:37 -04:00
FreeStylaLT 59db4e83ad fixes conflicts 2018-04-30 12:07:05 +09:00
Fox McCloud bc6f664b51 tweak 2018-04-29 22:58:18 -04:00
tigercat2000andGitHub 44deafe987 Merge pull request #8907 from Bram961/Window-placement
Window placement revert
2018-04-29 19:40:32 -07:00
tigercat2000andGitHub 64660aee33 Merge pull request #8946 from Fox-McCloud/timer-subsystem
Ports over Timer Subsystem
2018-04-29 19:23:28 -07:00
Fox McCloud 6ab3ec48ed change these timers 2018-04-29 21:15:42 -04:00
Fox McCloud 63e2a175fd Merge remote-tracking branch 'upstream/master' into timer-subsystem 2018-04-29 21:14:11 -04:00
ParadiseSS13-Bot a72a2ca963 Automatic changelog generation for PR #8936 [ci skip] 2018-04-29 21:13:18 -04:00
tigercat2000andGitHub 4f39ee73c8 Merge pull request #8936 from Fox-McCloud/tg-blast-cannon
Ports TG's Blastcannon
2018-04-29 18:13:16 -07:00
ParadiseSS13-Bot 9225f1bad6 Automatic changelog compile, [ci skip] 2018-04-30 01:11:52 +00:00
ParadiseSS13-Bot cb691a627d Automatic changelog generation for PR #8933 [ci skip] 2018-04-29 21:05:48 -04:00
tigercat2000andGitHub c70f238511 Merge pull request #8933 from Fox-McCloud/ports-looping-sounds
Ports Looping Sounds
2018-04-29 18:05:47 -07:00
ParadiseSS13-Bot 3a7a230075 Automatic changelog generation for PR #8957 [ci skip] 2018-04-29 21:03:46 -04:00
tigercat2000andGitHub 2163e43b53 Merge pull request #8957 from Fox-McCloud/fix-plastic
Fixes Plastic Recipe
2018-04-29 18:03:41 -07:00
Fox McCloud c73a6b237d logging 2018-04-29 21:03:31 -04:00
ParadiseSS13-Bot e8a9c98e52 Automatic changelog generation for PR #8941 [ci skip] 2018-04-29 20:56:20 -04:00
tigercat2000andGitHub 49195e4f3e Merge pull request #8941 from Anasari/kittyears
Add kitty ears to load out
2018-04-29 17:56:19 -07:00
tigercat2000andGitHub cf73c81433 Merge pull request #8948 from Kyep/syndi_officer_fix
Small syndi officer fix
2018-04-29 17:55:55 -07:00
tigercat2000andGitHub 3271a6270c Merge pull request #8956 from Fox-McCloud/oh-noooo
Does Surgery on Surgery to Fix Surgery
2018-04-29 17:55:47 -07:00
Fox McCloud cd8c38bb40 Fixes Plastic Recipe 2018-04-29 20:54:18 -04:00
Fox McCloud f7181df136 Does Surgery on Surgery to Fix Surgery 2018-04-29 20:41:37 -04:00
Fox McCloud 0c39cb11e4 tweak 2018-04-29 20:15:46 -04:00
tigercat2000andGitHub 8241badf77 Merge pull request #8950 from FalseIncarnate/fluff
E.L.O. Fluff Item
2018-04-29 16:55:34 -07:00
Fox McCloud 4474757e14 edge case 2018-04-29 19:16:04 -04:00
FalseIncarnate 94aa18ceda E.L.O. Fluff Item
Adds E.L.O.'s fluff item: a personalized medical beret.

Ckey: `V-Force_Bomber`
Character Name: `E.L.O.`
2018-04-29 12:32:26 -04:00
Kyep e5ab0981f1 Small syndi officer fix 2018-04-29 00:04:12 -07:00
Fox McCloud 278e6a7c25 the last of the TIMER_STOPPABLE 2018-04-29 01:12:57 -04:00
Fox McCloud 510c5b4268 fixes 2018-04-29 00:53:13 -04:00
Fox McCloud cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
ParadiseSS13-Bot f07033d380 Automatic changelog compile, [ci skip] 2018-04-28 07:07:09 +00:00
ParadiseSS13-Bot a4ae564361 Automatic changelog generation for PR #8939 [ci skip] 2018-04-28 01:37:37 -04:00
tigercat2000andGitHub 0fbbe22318 Merge pull request #8939 from MINIMAN10000/developer-quickstart
Added developer express start
2018-04-27 22:37:35 -07:00
Ansari cf307b6217 Add kitty ears to load out 2018-04-28 12:07:35 +08:00
MINIMAN10000 6534d82bf7 Added developer express start 2018-04-27 17:38:28 -07:00
tigercat2000andGitHub dabdbd4426 Merge pull request #8929 from Aurorablade/MagicalPlasma
Tries to fix plasma wizards
2018-04-27 17:06:49 -07:00
Fox McCloud 8f5f57dd0b adds clapping 2018-04-27 19:27:47 -04:00
Fox McCloud b238dfc581 Ports Guillotine 2018-04-27 18:58:23 -04:00
Fox McCloud 3dd1a8861d Ports TG's Blastcannon 2018-04-27 07:22:55 -04:00
Fox McCloud c93559c6ee nitpick 2018-04-26 21:23:44 -04:00
Fox McCloud 9266789511 stop this now 2018-04-26 19:51:22 -04:00
Fox McCloud cb423dfb1b Ports Looping Sounds 2018-04-26 19:18:24 -04:00
ParadiseSS13-Bot 580d5b353d Automatic changelog compile, [ci skip] 2018-04-26 23:04:38 +00:00
Aurorablade 21aa88ca59 missing thing 2018-04-26 18:55:55 -04:00
ParadiseSS13-Bot 3c7d9af182 Automatic changelog generation for PR #8924 [ci skip] 2018-04-26 17:55:28 -04:00