Commit Graph

33297 Commits

Author SHA1 Message Date
Shadow
6cffcac0da the anchorening 2019-08-29 18:04:32 -05:00
Shadow-Quill
ec387261f9 Stop it! Get some help. 2019-08-29 07:56:21 -05:00
variableundefined
c32d777d5b Merge pull request #12110 from datlo/updateclingstring
Clarify changeling error message
2019-08-28 21:15:54 -04:00
variableundefined
716b4515c5 Merge pull request #12121 from SteelSlayer/roundstart-delay-fix
Round start delay works properly again
2019-08-28 21:12:04 -04:00
SteelSlayer
da534b2df1 Round start delay works properly again 2019-08-28 19:20:44 -04: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
variableundefined
4e12040433 Merge pull request #12103 from Fox-McCloud/close-quarters-cooking
Close Quarters Cooking
2019-08-28 11:12:51 -04:00
variableundefined
74a981d8c2 Merge pull request #11895 from MarsM0nd/no_dance
Dance machine preference
2019-08-28 08:46:26 -04:00
variableundefined
c59006ec5f Merge pull request #12004 from datlo/golemtweaks
Mineral golems fixes and features
2019-08-28 07:59:43 -04:00
variableundefined
b77bee2874 Merge pull request #12084 from TheSardele/no-vore
Removes the ability of obese and matter eater to swallow people
2019-08-28 07:36:23 -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
Mark van Alphen
0a1a59bfd0 Add empty water definition 2019-08-28 00:27:13 -06:00
Fox McCloud
a04e253f9c Merge pull request #12100 from Couls/fix-shuttle-timers
Fix shuttle timers
2019-08-28 02:13:51 -04:00
variableundefined
37f18891a1 Merge pull request #12097 from Fox-McCloud/ports-tailoring
Implements Tailoring
2019-08-27 21:58:50 -04:00
variableundefined
0cdacbc5ee Merge pull request #11882 from Couls/dual-wielding
Dual wielding!
2019-08-27 20:44:38 -04:00
datlo
4b46f9f449 Clarify changeling error message 2019-08-28 02:15:00 +02:00
Couls
1f3762facb Use add timer instead of a spawn 2019-08-27 20:11:29 -04:00
Couls
977433af5f Merge remote-tracking branch 'upstream/master' into dual-wielding 2019-08-27 20:11:08 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
variableundefined
f7470ae23a Merge pull request #12107 from Fox-McCloud/fox-jacket-refactor
Refactors My Jackets
2019-08-27 18:08:47 -04:00
variableundefined
b488d9d27e Merge pull request #11989 from Fox-McCloud/diona-refactor
Diona Rework
2019-08-27 18:03:47 -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
Fox McCloud
9554e49a39 Refactors My Jackets 2019-08-27 17:53:02 -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
88a868fd91 proper wood wall construction 2019-08-27 16:53:46 -04:00
Fox McCloud
e51df13922 Merge pull request #12106 from variableundefined/Spellcheck
Rename the proc IsAvailible() to IsSpellAvailable()
2019-08-27 16:27:59 -04:00
variableundefined
d9a673574c Rename a proc because availible 2019-08-27 16:11:10 -04:00
variableundefined
7b7ff0f4af Merge pull request #12092 from Fox-McCloud/loadout-tweaks
Loadout Updates
2019-08-27 16:07:15 -04:00
variableundefined
d277e0c78d Merge pull request #11673 from Arkatos1/Magic-With-Style
Wizard Update - Magic with style
2019-08-27 16:04:52 -04:00
Mark van Alphen
131f0db120 Remove unused proc 2019-08-27 11:37:48 -06:00
Mark van Alphen
ffd73c75ec Merge branch 'master' into slimegenocide 2019-08-27 17:40:20 +02:00
Fox McCloud
c7a2eed319 Close Quarters Cooking 2019-08-27 11:20:24 -04:00
Fox McCloud
f8ad0147bf Merge pull request #12030 from datlo/add-biodomes
Port the winter and clown biodomes for Lavaland
2019-08-27 10:48:37 -04:00
variableundefined
f4925482e8 Merge pull request #12075 from SteelSlayer/IV-para-defib
IV bag tweaks
2019-08-27 08:52:11 -04:00
variableundefined
6dfe6b03cb Merge pull request #12099 from Fox-McCloud/jackets-cold-yes
Fixes Jackets Not Keeping You Warm
2019-08-27 08:51:11 -04:00
datlo
068b997eb6 Final
Add cabin area to avoid the alarm locking the entire biodome
Prevent crowbarring lubed tiles in clown planet
Added a few walls to prevent the disposal entrance immediately throwing
you into lava
2019-08-27 14:34:27 +02:00
datlo
708e591365 Add lubed floors, skeletons 2019-08-27 12:54:53 +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
Couls
15ea543566 Fix shuttle timers 2019-08-27 00:28:10 -04:00
Fox McCloud
63149d6de5 Fixes Jackets Not Keeping You Warm 2019-08-27 00:12:59 -04:00
variableundefined
f9e348b735 Merge pull request #12095 from Ionward/Drask-Shoes-Uniform
Drask shoe sprite fix and uniform fixes
2019-08-26 20:20:21 -04:00
variableundefined
33804e27c2 Merge pull request #12098 from Fox-McCloud/WHY-WHY-WHYYYYYYYYYYYYYYYYYYYYYYY
WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?!
2019-08-26 19:06:05 -04:00
Fox McCloud
cd4734e047 Merge pull request #12088 from Shadow-Quill/OOC-Admemery
Prevents OOCing after OOC is disabled
2019-08-26 19:05:55 -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
Ionward
26d836f70f drask shoe sprites enabled, added sprites, and fixed minor issues noticed in uniforms 2019-08-26 13:50:49 -07:00
Arkatos1
6b2add6eb9 Deconflict 2019-08-26 18:53:55 +02:00
variableundefined
97654f5d52 Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle
Ports VG's false briefcase
2019-08-26 08:53:14 -04:00