6cffcac0da
the anchorening
2019-08-29 18:04:32 -05:00
ec387261f9
Stop it! Get some help.
2019-08-29 07:56:21 -05:00
da534b2df1
Round start delay works properly again
2019-08-28 19:20:44 -04:00
b75db54b1f
Merge pull request #12015 from SteelSlayer/atmos-QoL
...
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
74a981d8c2
Merge pull request #11895 from MarsM0nd/no_dance
...
Dance machine preference
2019-08-28 08:46:26 -04:00
c59006ec5f
Merge pull request #12004 from datlo/golemtweaks
...
Mineral golems fixes and features
2019-08-28 07:59:43 -04:00
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
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
a04e253f9c
Merge pull request #12100 from Couls/fix-shuttle-timers
...
Fix shuttle timers
2019-08-28 02:13:51 -04:00
37f18891a1
Merge pull request #12097 from Fox-McCloud/ports-tailoring
...
Implements Tailoring
2019-08-27 21:58:50 -04:00
0cdacbc5ee
Merge pull request #11882 from Couls/dual-wielding
...
Dual wielding!
2019-08-27 20:44:38 -04:00
1f3762facb
Use add timer instead of a spawn
2019-08-27 20:11:29 -04:00
977433af5f
Merge remote-tracking branch 'upstream/master' into dual-wielding
2019-08-27 20:11:08 -04:00
9f2f9cfa6c
Merge remote-tracking branch 'upstream/master' into ports-tailoring
2019-08-27 18:23:11 -04:00
f7470ae23a
Merge pull request #12107 from Fox-McCloud/fox-jacket-refactor
...
Refactors My Jackets
2019-08-27 18:08:47 -04:00
b488d9d27e
Merge pull request #11989 from Fox-McCloud/diona-refactor
...
Diona Rework
2019-08-27 18:03:47 -04:00
e6a190ae72
Merge pull request #12093 from Fox-McCloud/sandbags-and-barricades
...
Adds Sandbags Reworks Security Barricades
2019-08-27 18:01:20 -04:00
9554e49a39
Refactors My Jackets
2019-08-27 17:53:02 -04:00
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
7b7ff0f4af
Merge pull request #12092 from Fox-McCloud/loadout-tweaks
...
Loadout Updates
2019-08-27 16:07:15 -04:00
d277e0c78d
Merge pull request #11673 from Arkatos1/Magic-With-Style
...
Wizard Update - Magic with style
2019-08-27 16:04:52 -04:00
ffd73c75ec
Merge branch 'master' into slimegenocide
2019-08-27 17:40:20 +02:00
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
f4925482e8
Merge pull request #12075 from SteelSlayer/IV-para-defib
...
IV bag tweaks
2019-08-27 08:52:11 -04:00
708e591365
Add lubed floors, skeletons
2019-08-27 12:54:53 +02:00
9ec6c795d1
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into add-biodomes
2019-08-27 11:02:49 +02:00
15ea543566
Fix shuttle timers
2019-08-27 00:28:10 -04:00
63149d6de5
Fixes Jackets Not Keeping You Warm
2019-08-27 00:12:59 -04:00
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
eef0bc919d
Implements Tailoring
2019-08-26 17:41:39 -04:00
26d836f70f
drask shoe sprites enabled, added sprites, and fixed minor issues noticed in uniforms
2019-08-26 13:50:49 -07:00
6b2add6eb9
Deconflict
2019-08-26 18:53:55 +02:00
97654f5d52
Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle
...
Ports VG's false briefcase
2019-08-26 08:53:14 -04:00
ed157b56e3
Merge pull request #11868 from SteelSlayer/smes-fix
...
Fixes bugs/exploits related to SMES. Reorganizes parts of the SMES file
2019-08-26 08:43:02 -04:00
e702c2ef53
Merge pull request #11797 from Couls/blood-changes
...
Blood is now less annoying
2019-08-26 06:41:39 -04:00
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
872837a691
Merge pull request #12094 from Fox-McCloud/plasmaman-atmos-tech-fix
...
Fixes Plasmamen Atmos Techs Not Getting Proper Suit
2019-08-26 06:39:49 -04:00
a1c07f20b6
Fixes Plasmamen Atmos Techs Not Getting Proper Suit
2019-08-26 06:16:39 -04:00
0af85ab71d
here we go
2019-08-26 06:07:35 -04:00
1befa092be
Adds Sandbags Reworks Security Barricades
2019-08-26 03:21:45 -04:00
d0b4c61129
Loadout Updates
2019-08-26 01:36:47 -04:00
3140255fc8
Reverts "Fixes Grid Check"
2019-08-26 00:44:46 -04:00
899eb9c948
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-26 00:11:42 -04:00
dfe9752da7
Merge remote-tracking branch 'upstream/master' into blood-changes
2019-08-25 22:37:25 -04:00
285df0d994
Fixes Inhand Sprite Sheeting Bug
...
Caused by #11978 , the bug presented where a species that was in the sprite_sheets of an item but didn't have a custom inhand item for it picked up an item like a uniform and suddenly a grey jumpsuit was rendered on them. Happened for Vox when picking up regular uniforms because they have species-specific uniform sprites but not species-specific inhands, so it triggered the conditional and caused silly issues.
2019-08-25 22:29:16 -04:00
a42f638b73
spessing
2019-08-25 22:22:05 -04:00
cb3cb84f23
Merge pull request #12037 from Couls/buckle-your-pants
...
Mining shuttle launch delay and warning message
2019-08-25 21:43:17 -04:00
320a63288b
Merge pull request #12086 from Fox-McCloud/fix-plasmaman-karma-displayed
...
Fixes Plasmaman Karma Displayed Cost
2019-08-25 19:08:13 -04:00
8dce28d3e5
Merge pull request #12073 from Fox-McCloud/hardsuit-helmet
...
Hardsuit helmet
2019-08-25 19:06:37 -04:00
cedbaaa80d
Fixes Plasmaman Karma Displayed Cost
2019-08-25 18:49:11 -04:00
Shadow