Commit Graph

20646 Commits

Author SHA1 Message Date
variableundefined fad3294c3b Merge pull request #12145 from Fox-McCloud/lazaraus-capsule-refactor
Refactors Lazarus Capsules
2019-08-30 01:29:51 -04:00
Fox McCloud 35bb8d069d Merge pull request #12147 from KasparoVy/light_gone_out
Fix Incorrect Eye-Colour for Races Without Shiny Eyes
2019-08-30 01:10:57 -04:00
KasparoVy 49b3aa415a Rationale
Commenting
2019-08-30 00:58:28 -04:00
KasparoVy abfbe21daa Fix a Broken Fix
Overlays don't carry over from organ get_icon() and have to be blended if we want to use them in that way - currently eyes are the only thing update_icons() doesn't have its own way of rendering so eyes are the only thing here that get blended AND overlayed
2019-08-30 00:37:35 -04:00
Fox McCloud bdd17ee978 Fixes Strange Reagent Revival Case 2019-08-29 23:59:45 -04:00
Fox McCloud 9c8905f9ca Refactors Lazarus Capsules 2019-08-29 23:34:19 -04:00
variableundefined a316d5e09b Merge pull request #12139 from Fox-McCloud/fix-lavaland-hardsuits
Fixes Lavaland Hardsuits
2019-08-29 22:38:21 -04:00
variableundefined e636c8e80a Merge pull request #12142 from Fox-McCloud/blood-drunk
Fixes Blooddrunk Buff
2019-08-29 22:30:24 -04:00
Fox McCloud 2bdb6f448f Fixes Blooddrunk Buff 2019-08-29 22:12:02 -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
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
Shadow 82860bc875 MFW I FORGET TO UNEMBIGGEN 2019-08-29 19:34:43 -05:00
Shadow a4b3030e4a mfw I forget to anchor 2019-08-29 19:14:21 -05:00
variableundefined 87fb73def7 Merge pull request #12112 from Fox-McCloud/gps-location
GPS Location Status
2019-08-29 19:50:54 -04:00
Shadow f47716bf5e EMBIGGENED! 2019-08-29 18:31:32 -05:00
Shadow 91a0e50673 removal 2019-08-29 18:15:24 -05:00
Shadow 6cffcac0da the anchorening 2019-08-29 18:04:32 -05:00
Fox McCloud 3fdd146316 Fixes Lavaland Hardsuits 2019-08-29 18:26:40 -04:00
Fox McCloud 93c04d79f9 Merge pull request #12114 from KasparoVy/light_gone_out
Fixes Bugs with Shining Eyes, Disembodied Heads and Admin-Reviving Beheaded Humanoids
2019-08-29 16:40:22 -04:00
Shadow-Quill ec387261f9 Stop it! Get some help. 2019-08-29 07:56:21 -05:00
KasparoVy f30cfd850d Fix Some Bugs With Admin-Reviving Headless Dudes
Admin-reviving a decapitated body will now regrow the head with the ears organ and all the appearance features (hair, eyes, etc.) it used to have according to the mob's DNA.
2019-08-29 00:34:17 -04:00
SteelSlayer da534b2df1 Round start delay works properly again 2019-08-28 19:20:44 -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 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
KasparoVy 5b20a67ed2 Fixes Bugs Darkening Glowing Eyes & Preventing Full Rendering of Disembodied Heads, Cleanup
By correcting the plane the eye shine is rendered on. By sharing the same plane as the lighting, the eye shine was getting dimmed slightly (somehow). Referred to Polaris codebase, where this was originally ported from.

Lumps in an update/write-up for get_icon_difference()
Cleans up organ_icon.dm and resolves an issue preventing appearance overlays (hair, eyes, etc.) from remaining on disembodied heads to reduce unnecessary icon operations.
2019-08-28 06:08: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 a04e253f9c Merge pull request #12100 from Couls/fix-shuttle-timers
Fix shuttle timers
2019-08-28 02:13:51 -04:00
Fox McCloud d74e5288f3 refactor health sensors 2019-08-28 01:47:50 -04:00
Fox McCloud 1f47292d34 GPS Location Status 2019-08-28 01:38:00 -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
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 a70084a63f makes it so you can actually get the items 2019-08-27 18:49:25 -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
variableundefined 7b7ff0f4af Merge pull request #12092 from Fox-McCloud/loadout-tweaks
Loadout Updates
2019-08-27 16:07:15 -04:00
Fox McCloud a4f187ac38 Adds Book of Babel and Jacob's Ladder 2019-08-27 16:04:54 -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 ffd73c75ec Merge branch 'master' into slimegenocide 2019-08-27 17:40:20 +02: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
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