Commit Graph

8313 Commits

Author SHA1 Message Date
Fox McCloud
4162226cb1 Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split 2019-09-08 02:07:06 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Fox McCloud
0119d350b4 Lavaland Update Part 2: Mobs 2019-09-07 02:26:31 -04:00
Fox McCloud
0854f75f7b Fixes Pugs 2019-09-06 19:06:41 -04:00
variableundefined
854e5de97f Merge pull request #12206 from Fox-McCloud/refactors-corgis
Refactors Corgis and Other Doggos
2019-09-05 21:17:53 -04:00
Fox McCloud
a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud
b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Coul
c6c1b1ce36 fix runtime 2019-09-04 22:20:28 -04:00
Coul
2986205dfa another blood fix 2019-09-04 21:32:28 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
variableundefined
5d813dce6c Merge pull request #12157 from Fox-McCloud/simple-mob-update
TG Simple Mob Update
2019-09-03 21:50:24 -04:00
variableundefined
271c62dbef Merge pull request #11535 from Couls/zombies
[Ready for review] Romerol Virus, Zombies!
2019-09-03 20:58:53 -04:00
Fox McCloud
91fffcc076 Updates/Refactors Personal Crafting 2019-09-03 17:58:33 -04:00
Coul
6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
Fox McCloud
9fad53a5ac Merge pull request #12167 from Couls/fix-blood-stacking
Fix blood stacking
2019-09-03 03:46:29 -04:00
Fox McCloud
473850ff92 Merge remote-tracking branch 'upstream/master' into simple-mob-update 2019-09-02 22:32:08 -04:00
Fox McCloud
ca72a04023 Fixes Who Knows How Many Runtimes 2019-09-01 21:22:37 -04:00
Couls
d258c91c7f use qdels instead of initialize hint 2019-08-31 20:34:50 -04:00
Fox McCloud
1197ed0738 less admin annoyance 2019-08-31 19:43:59 -04:00
Fox McCloud
2b615b7b10 blood drunk update 2019-08-31 18:23:59 -04:00
Fox McCloud
86dfb4c823 Simple Mob Update 2019-08-30 20:32:08 -04:00
Fox McCloud
7a61ecb637 The Most Important Refactor Ever 2019-08-29 23:12:59 -04:00
variableundefined
4255fb62a6 Merge pull request #12140 from Fox-McCloud/youre-not-batting-a-thousand
Fixes Baseball Bats Throwing Anchored Things
2019-08-29 22:18:47 -04:00
Fox McCloud
20b35033f7 Merge pull request #12135 from Shadow-Quill/Ooh-Ahh-Push-It
Fixes pushing necropolis tendrils
2019-08-29 21:03:31 -04:00
Fox McCloud
6b8140d9ff Fixes Baseball Bats Throwing Anchored Things 2019-08-29 20:58:53 -04:00
Fox McCloud
4716bdd272 Merge pull request #12053 from Couls/boxing-in-the-90s
Fix cardboard box walldash
2019-08-29 20:54:07 -04:00
Shadow
4da4257756 whoops, spilled my meme 2019-08-29 19:51:10 -05:00
variableundefined
549e6ee72e Merge pull request #12105 from Fox-McCloud/ports-tendril-loot
Adds Book of Babel and Jacob's Ladder
2019-08-29 20:43:18 -04:00
Couls
b1dd4d5496 use fox's code 2019-08-29 20:41:12 -04:00
Shadow
a4b3030e4a mfw I forget to anchor 2019-08-29 19:14:21 -05:00
Shadow
aab72a5d5c 3 big 5 me 2019-08-29 18:22:04 -05:00
Fox McCloud
4502b1fead Fixes Blood, Grafitti, and Fungus not Showing Up 2019-08-28 18:05:51 -04:00
variableundefined
b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
Fox McCloud
a413b1f007 Merge pull request #11994 from Markolie/slimegenocide
Improve water handling for slimes, Grey mask/head water protection tweak
2019-08-28 03:14:50 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
Fox McCloud
1b10495f7d fix 2019-08-27 18:08:43 -04:00
variableundefined
e6a190ae72 Merge pull request #12093 from Fox-McCloud/sandbags-and-barricades
Adds Sandbags Reworks Security Barricades
2019-08-27 18:01:20 -04:00
variableundefined
722df75be4 Merge pull request #12090 from Fox-McCloud/jetpack-upgrade
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-27 17:39:19 -04:00
Fox McCloud
a4f187ac38 Adds Book of Babel and Jacob's Ladder 2019-08-27 16:04:54 -04:00
Mark van Alphen
ffd73c75ec Merge branch 'master' into slimegenocide 2019-08-27 17:40:20 +02:00
datlo
9ec6c795d1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into add-biodomes 2019-08-27 11:02:49 +02:00
Fox McCloud
0b46603e38 Merge pull request #12078 from SteelSlayer/paramedic-hand-defib
Adds a handheld defibrillator to the paramedic EVA closet
2019-08-27 02:40:31 -04:00
Fox McCloud
727be7d03f WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?! 2019-08-26 18:23:09 -04:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
variableundefined
97654f5d52 Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle
Ports VG's false briefcase
2019-08-26 08:53:14 -04:00
variableundefined
e702c2ef53 Merge pull request #11797 from Couls/blood-changes
Blood is now less annoying
2019-08-26 06:41:39 -04:00
variableundefined
289b890e76 Merge pull request #12087 from KasparoVy/skrekked_myself_up
Fixes Bug with Species-fitted Inhand Icons
2019-08-26 06:40:35 -04:00
Fox McCloud
1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
Fox McCloud
899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00
Couls
dfe9752da7 Merge remote-tracking branch 'upstream/master' into blood-changes 2019-08-25 22:37:25 -04:00