upstream merge 7/12 #2389
upstream merge 7/12 #2389
Conversation
Co-authored-by: RedBookcase <[email protected]>
* Add succumb action 10 sec delay * add somthing * add delay to last words as well --------- Co-authored-by: slarticodefast <[email protected]>
* Adds storage sprite for gorilla gauntlet * Specifies a heavier hitsound for gorilla gauntlet * Modifies gauntlet icon and storage sprite * Updates credit to my new username
* First commit * Fixes * Added the noise * Renames * Timespan * Fixed space * entity -> ent * This shouldn't work * opps.... * Datafield name change * Better comments * small comment * Personal skill issue * Event renames and stuff * Couple fixes * Defib ref fixes (Silly me) * Added clumsy back! * no hard code clumsy! * Identity fix * Event name change * Comment change * Function name change * opp * Update names * Damage stuff! * Fixes! * Fixes * opps * This was hidden away!! * negative diff feeds me
* Improve crayon UI to not be stuck in 1996 * Make a horrifying crayon spaghetti * Crayon * Undeprecate the crayon, describe the crayon
Added the brb sign to the Bureaucracy Crate
handle event when using seed extractor Co-authored-by: slarticodefast <[email protected]>
* more flatpacks + glass * solar crate price increase * price increase * 1250 spesos * Update Resources/Prototypes/Catalog/Fills/Crates/engines.yml --------- Co-authored-by: slarticodefast <[email protected]>
changed description
* Modifies label sprites and adds label visuals to closets * Removes redundant GenericVisualizer component
* mostly done but there's a bug with spawning * RandomGlobalSpawnSpellEvent now actually works * Summon Guns/Magic is working * Added sound, cap gun, and auto pick up * Added all requested changes/fixes from reviews * Halving cooldowns
* butcherable surgery caps * readded cardboard box * butcherable now? * butcherable now? * one day ill figure this out * changed label of hyperzine syringe * removed the thing in hats.yml that wasn't supposed to be here * Update Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml --------- Co-authored-by: slarticodefast <[email protected]>
* Organize Sandbox Panel * Map Editing -> Editing * Unset ToggleMode on Suicide button. Can hardly un-suicide, no? * Remove 'Link machines' button that has done nothing for 3 years * Remember Sandbox window's position instead of forcing to center * Shows Spawns -> Show Spawns * Remove SandboxSystem.MachineLinking
|
bolts random doors open, probably bad so disabled it |
|
Greytide virus is a /TG/ event and it fucking SUCKS but an AI can fix it easy if they're on the ball and people call out bolted doors |
|
Oh weird. I thought it was gonna be like some thing that turns people bald and sticks a gas mask on their face lol |
|
Direction reviewing, will have feedback in a day on greytide. Im also dubious on this
so im getting some feedback. thoughts? |
supposed to make singuloosing as an antag roundstart harder, you can emag it to bypass it |
|
Wasn't it to prevent non antags from singuloosing shift start? |
|
yes that's what i meant i woke up 10 minutes ago (since antags can just emag it) |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
There was a problem hiding this comment.
singulo generator wont work without containment field
We are split down the middle on this one, we don't mind it but also don't really care
Greytide virus is fine, but please relabel to something like
"Rogue subroutine detected in door servos. Check all door bolts for malfunction"
deltanedas
force-pushed
the
upstream-ops
branch
from
f8ad577 to
8f2587e
Compare
|
bruh i squashed again |
This reverts commit 9c408f6.
| <GridContainer | ||
| Rows="2" | ||
| HSeparationOverride="5" | ||
| VSeparationOverride="5" | ||
| HorizontalExpand="True"> |
There was a problem hiding this comment.
Is the bulging buttons taking up the chat window intentional?
There was a problem hiding this comment.
thats how it used to be just less wide, can be reverted
Notable changes
Notable exclusions
Changelog
🆑