[EVENT] GAMESHOW (ACTUAL) TESTMERGE #59825
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Adds an eventmode define Fast acting planetary atmos on all turfs, with breathablea tmosphere deletes all cleanables power to all areas, default gas mixes on everything free vending machines everywhere economy doesn't tick breathing and diseases in life disabled to prevent some life stuff * No nightshift either tbh * Diseases auto deleted themselves * Disable rot component from acting * corpses too * whops * Give it more time * More changes * You can no longer cut down a tree * Disable event picks * Disable breeding in event mode fix phpism * Disable smugglers satchels in event mode * changes map to more tasteful placeholder * removes runechat, adds the ability for areas to become normal atmos, unbreaks planetary atmos. Co-authored-by: oranges <email@oranges.net.nz> Co-authored-by: Citrus <a_anakin96@hotmail.com>
* disables pointing for nonadmins * eventmode define * cheaper check
* Toolbox Slam Content * Fine, take the webedit
* disables pointing for nonadmins * eventmode define * cheaper check
* Add patient spawner for Medical Challenge The /obj/item/patient_spawner is an item, which when activated in hand will create and pod drop in a variety of different people who need medical aid. Currently: - A chef with stage 3 appendicitis - A deathsquad member with a growing xeno infection - A wizard who has taken too much bone hurting juice and has every bone in their body broken. * Add forgotten organ decay patient Whoops, we forgot this miner we found on the Mining Asteroid. Yep, that's how long they've been dead, thus all their organs are rotted.
* Initial commit. Added crates. Fixed god damn adds the file for what might actually eventually be the spawner please work Lootcrates but working this time gets the filepath right maybe I think maybe does the spawner? at least, maybe it works changes weight of crates so it's not just basic crates Loot tables improved Fix Ticked rare lootcrate spawner yes Doubled mob health, lootcrates table finished e edits deltastation to have lootcrates and no sec gear if this works on my first try I'm actually going to be proud of myself yeets every job Moreee Map JSON updated. Added drop pods (credits to @Fikou) Armhulen moment storm cleanup ARRRRRMMMMMMMMMMMMMMMM pulling more cimika work storm done SPACE MOMENT *scream Reworked the storm * e * makes it so that essentially there's no bolas, bats, or stunprods it's lazy but if it runs, it runs * more crates, less flashes i never realized how many delta had until I tried to remove them all, also I have no idea how to remove wall flashes help * makes basic crates more common, also adds melee loot table I realized that I don't actually know that many melee weapons so I basically just added various knives, I'm getting into knives * Wounds be gone * removes belts on assistants, puts wounds and health back to normal, adds back recipes, changes up battle royale storm. Co-authored-by: Kathy <kathyryals@outlook.com> Co-authored-by: Clyde <clydethunderpants@gmail.com> Co-authored-by: Citrus <a_anakin96@hotmail.com>
…ght, adds battle royal spawn.
* maptext portals * maptext font
…, makes maptext probably work for portals
…to main station, adds new comms for contestants to use, areas no longer will look for event area air (probably a bad idea orginally, and error viewer cannot be linear.
* SSlag_switch wip * pogress * little touches * beep boop * define comments * fix logs * garbage day * examine icons * MouseEntered tips * late join spawns * fix reenter notice, add notice to admin job panel * bookkeeping * init order not needed * dunsel toggles begone * less log spam * ic chat slowmode * panel UI tweaks for thine sanity * fix trait and 'not sent' message
tgstation-server
added
the
Config Update
…l walls having the wrong baseturfs (#155)
* good stuff * let them spawn!
github-actions
bot
added
the
Merge Conflict
…gives scrying orbs.
# Conflicts: # _maps/map_files/debug/runtimestation.dmm
tgstation-server
removed
the
Merge Conflict
* Makes Dreathtil's suggested changes * Blue team is now green also added spray cans
# Conflicts: # code/game/turfs/turf.dm Co-authored-by: L <rohesie@gmail.com>
github-actions
bot
added
the
Merge Conflict
|
of fucking course |
tgstation-server
removed
the
Merge Conflict
|
ok |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
RIGHT ABOUT DONE, THIS IS THE LAST TEST MERGE, WILL SHUT OFF AFTER TOURNAMENT.
Last one was made since we had to merge two branches into one, but this will be the final test merge.
DO NOT MERGE