Commit Graph

27974 Commits

Author SHA1 Message Date
Kyep a6d06ea397 Fixes #8271 - rare borg runtimes 2018-05-06 22:21:35 -07:00
tigercat2000 f0f540b839 Merge pull request #8978 from TravellingMerchant/Fluffupdate
Changes Merchants Fluff item.
2018-05-06 12:37:29 -07:00
tigercat2000 c78075414c Merge pull request #8488 from Kyep/ds_tweaks
Tweaks Deathsquad
2018-05-04 19:03:54 -07:00
Kyep 05e0901967 removes anti-drop implants 2018-05-04 18:36:56 -07:00
Tayyyyyyy 917c4cb4d4 Fix ERT cloning incorrectly 2018-05-04 15:47:22 -05:00
tigercat2000 662d7f34e2 Merge pull request #8949 from Kyep/tsf_marines
Solar Federation Outfit Fixes/Tweaks
2018-05-04 12:50:38 -07:00
ryansmake 6e846018cd Performs inquisition on ATMs 2018-05-04 19:36:54 +02:00
TravellingMerchant e812cae73f Updates Merchants Fluff item. 2018-05-04 16:33:00 +01:00
Kyep ee538b25d5 Monkey business logging 2018-05-02 17:02:24 -07:00
Fox McCloud 31a2687fb6 Merge pull request #8958 from Tayyyyyyy/abduction_surgery_fix
Abduction surgery fix
2018-05-02 03:41:50 -04:00
Tayyyyyyy 7d40da6a0e Fix TRUE/FALSE 2018-05-02 02:26:15 -05:00
Fox McCloud 1a00cbdcf9 Actually Fixes Chem Smoke 2018-05-02 00:14:32 -04:00
Tayyyyyyy 6d0ca94ce9 Make extract organ and gland insert failable 2018-05-01 20:38:04 -05:00
tigercat2000 a834129ba7 Merge pull request #8966 from Fox-McCloud/indestructible-bomb-range
Makes Bomb Range Multi-Use
2018-05-01 15:14:02 -07:00
tigercat2000 0c6cbbc5c3 Merge pull request #8959 from Fox-McCloud/remove-things
Removes Programmable Unloaders and a Few Unused Files
2018-05-01 14:07:12 -07:00
Fox McCloud 4fc8a93a37 Makes Bomb Range Multi-Use 2018-05-01 16:46:33 -04:00
Alffd bd14d58627 Graceful shutdown 2018-04-30 23:42:03 -04:00
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
Fox McCloud ee6a156ca2 Removes Programmable Unloaders and a Few Unused Files 2018-04-30 00:41:26 -04:00
tigercat2000 3c1fbf9cc5 Merge pull request #8938 from Fox-McCloud/guillotine
Ports Guillotine
2018-04-29 20:28:50 -07:00
Fox McCloud bc6f664b51 tweak 2018-04-29 22:58:18 -04:00
tigercat2000 44deafe987 Merge pull request #8907 from Bram961/Window-placement
Window placement revert
2018-04-29 19:40:32 -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
tigercat2000 4f39ee73c8 Merge pull request #8936 from Fox-McCloud/tg-blast-cannon
Ports TG's Blastcannon
2018-04-29 18:13:16 -07:00
Tayyyyyyy 1cc34cac4a Make extract organ and insert gland always succeed 2018-04-29 20:12:47 -05:00
tigercat2000 c70f238511 Merge pull request #8933 from Fox-McCloud/ports-looping-sounds
Ports Looping Sounds
2018-04-29 18:05:47 -07:00
tigercat2000 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
tigercat2000 49195e4f3e Merge pull request #8941 from Anasari/kittyears
Add kitty ears to load out
2018-04-29 17:56:19 -07:00
tigercat2000 cf73c81433 Merge pull request #8948 from Kyep/syndi_officer_fix
Small syndi officer fix
2018-04-29 17:55:55 -07:00
tigercat2000 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
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 9f556d4ce6 pistols 2018-04-29 02:25:56 -07:00
Kyep da2122626a TSF marine update 2018-04-29 01:45:13 -07: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
tigercat2000 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
tigercat2000 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