Commit Graph

20703 Commits

Author SHA1 Message Date
Fox McCloud e5cc59bfca ensures sleepy pens work 2019-09-03 23:42:34 -04:00
Fox McCloud 614f768639 forgot this 2019-09-03 23:24:11 -04:00
Fox McCloud 8b72c3b64a Fixes Romerol--Comments it Out Until Refactor 2019-09-03 23:16:32 -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
Couls 7ad4479f58 description not message 2019-09-03 20:39:31 -04:00
variableundefined 8b7ffdd7ce Merge pull request #12198 from Fox-McCloud/personal-crafting-update
Updates/Refactors Personal Crafting
2019-09-03 19:01:47 -04:00
Fox McCloud 1698d93e5c Snowman Crafting 2019-09-03 18:09:47 -04:00
Fox McCloud 91fffcc076 Updates/Refactors Personal Crafting 2019-09-03 17:58:33 -04:00
Coul ba269fdf79 give high functoning zombies the zombie language too 2019-09-03 15:53:04 -04:00
Coul 6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
Coul 2014d57332 override apply_damage, revert set_species changes, allow admemes to convert living people 2019-09-03 15:42:31 -04:00
variableundefined 41a390269e Merge pull request #12168 from Fox-McCloud/ashwalker-tweak
Ashwalker Map Tweaks--Wooden Tools
2019-09-03 08:41:10 -04:00
Fox McCloud c4824315cc Fixes Endless Deletes Overwhelming the GC 2019-09-03 05:21:01 -04:00
Fox McCloud a81b52f834 Merge remote-tracking branch 'upstream/master' into ashwalker-tweak 2019-09-03 01:16:36 -04:00
variableundefined 4ff30be09e Merge pull request #12118 from datlo/cursedoutfits
Add the Banana Touch and Mime Malaise wizard spells
2019-09-02 23:38:26 -04:00
Fox McCloud 2897c6f67f Merge pull request #12190 from farie82/shake-log-move
Moves the admin "Shake" log to the actual waking up people part of the code
2019-09-02 17:36:27 -04:00
joep van der velden 2676f53e9b Moved the admin shaked log to the actual waking up people 2019-09-02 22:48:42 +02:00
Shadow 1095bdae86 :fox: 2019-09-02 14:47:49 -05:00
Coul 5045980323 review changes 2019-09-02 05:32:15 -04:00
variableundefined f4e8a7cb70 Merge pull request #12174 from Shadow-Quill/ATM-Fox
Fixes ATM withdrawals
2019-09-01 21:58:24 -04:00
variableundefined ed10609b72 Merge pull request #11888 from florkeger/deltasiren
[READY] Delta code alarm sound added
2019-09-01 20:43:10 -04:00
Fox McCloud 94cd248b20 Fixes Some Null Tastes and Fruit Wine 2019-09-01 18:59:13 -04:00
kazboo 5931fb5642 Final change of sound 2019-09-02 00:33:39 +02:00
Shadow bf61690858 Foxes ATM withdrawls 2019-09-01 12:43:29 -05:00
Fox McCloud 34683b5744 Ashwalker Map Tweaks--Wooden Tools 2019-08-31 21:21:58 -04:00
Fox McCloud 1d59bfe8ff Merge pull request #11962 from variableundefined/TasteOfVictory
TG Taste System Port continued
2019-08-31 20:28:36 -04:00
variableundefined 95afbe55a5 Merge pull request #12144 from Fox-McCloud/the-refactor-to-end-all-refactors
The Most Important Refactor Ever
2019-08-31 20:15:13 -04:00
variableundefined 0cdca3b08e Merge pull request #12138 from Fox-McCloud/ahhh-the-smell-of-adminbus-in-the-morning
Refactors Gloves of the North Star. Adds Gloves of Headpats
2019-08-31 20:01:34 -04:00
variableundefined 3dca5d09ec Code styling + Vitamin 2019-08-31 20:00:52 -04:00
Fox McCloud 07788252a9 Merge pull request #11143 from farie82/hoodies
Refactored hoodies to work without antidrop
2019-08-31 18:59:27 -04:00
Fox McCloud 3c874640f2 NO THE OPEN TURFS 2019-08-31 18:28:22 -04:00
variableundefined a5c0138dda Deconflict and revert an accidental iconstate name change 2019-08-31 09:18:36 -04:00
farie82 9d58af6ec5 Merge branch 'master' into hoodies 2019-08-30 22:57:07 +02:00
joep van der velden fb968787f8 merge de maste 2019-08-30 20:02:32 +02:00
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
Fox McCloud 7a61ecb637 The Most Important Refactor Ever 2019-08-29 23:12:59 -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