* More Food Sorting (#58649)
* Organizing
Moves the following:
Enchiladas, from MEAT, to MEXICAN
Meat Bun, from PASTRIES, to MEAT
Hotdog, from PASTRIES, to SANDWICHES
Melon Bowl, from MISC, to SALADS
Oatmeal, from SALAD, to SOUPS (And changes the object path to match.)
Does the traitorous task of adding the GRAIN tag to Enchiladas. May god have mercy on my soul.
* Adds a trailing new line
Co-authored-by: Winter Flare <7543955+Owai-Seek@ users.noreply.github.com>
* More Food Sorting
Co-authored-by: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
Co-authored-by: Winter Flare <7543955+Owai-Seek@ users.noreply.github.com>
* Emissive system refactor (#58130)
The emissives system is the system that both lets computer screens and vendors glow in the dark and lets mobs and items block those glows. The current implementation relies on using filters to let mobs and items mask out the glow in the dark overlays on some structures. This is difficult to extend properly without massively increasing maptick. This PR changes the emissives system to use BYONDs native image layering to mask emissive overlays. This should prove to be a more extensible option.
tldr; There exists a system that lets computer screens glow on the dark and lets mobs and items block the glow. It isn't very extensible and this PR attempts to make it more extensible.
How emissive overlays used to work
Currently emissive overlays and the emissive blockers that mask those overlays are handled using a system of inter-masking planes. The emissive overlays and the emissive blockers are placed on separate, hidden plane masters. These are essentially rendering layers and groups. The emissive blocker plane is then used to mask the emissive overlay plane which effectively allows the emissive blockers to block the emissive overlays from being seen. After is has been masked the emissive overlay plane is used to mask the lighting plane, essentially creating holes in the shadows wherever an unblocked glowing thing exists.
Why this is a potential problem
This system works fine. In fact it works great! The computer screens glow, any person or item that winds up on a computer blocks the glow, and everything just works. However, this system runs into some issues when you try to extend it to work on things other than structures. Namely, the current system only supports emissive overlays on structures and emissive overlays that are completely unblockable by any means. As a result, several interesting uses to the system require extending the system.
As a result, if you want to apply emissive overlays to items (which exist between structures and mobs) or emissive overlays to turfs (which exist below structures) you must extend the emissives system to get the emissive overlays and emissive blockers to properly function. Doing this naively, by adding extra emissive overlay and emissive blocker planes and applying all of the relevant masking filters, is not exactly performant.
Maptick is a major contributor to lag and the higher the maptick the more free lag you, the player, get delivered fresh to your client. Trying the naive method resulted in #55782 (1f1b58bb26), an attempt to add glowing carpet to the game. Since the PR revolved around adding glowing carpet it had to extend the emissives system to allow for emissive turfs and emissive blocking structures. Extending the system was done naively as described above and you can see the results. 1.5 times the maptick across the board. Ouch.
So, we know that extending the system in it's current form is impractical. At least if done naively. Thus we are stuck.
tldr; The emissive system currently uses inter-plane masking to allow for emissive blockers to function. This is difficult to reasonably extend without murdering maptick. See #56496 (1f1b58bb26) for the results of naively extending this system.
How emissive overlays are going to work
Alright, so we know that the current system of using planes to let the emissive blockers mask the emissive overlays is difficult to extend in it's current form. The solution is to change how the system works so that it can be extended in a more efficient manner. What we want is a system that allows one set of images to be out masked by another set of images and for the first set of images to be capable of masking the light plane. Preferably, we would also like the ability to interleave the masking effect between emissives and emissive blockers with almost arbitrary layering.
Conveniently, this layering and masking is something BYOND already does to normal items and objects. If we put the emissive overlays and the emissive blockers on the same plane we can use their layers to interleave them almost arbitrarily like any normal structures and items! All we need is a way to mask away the emissive blockers from the resulting rendered plane and we can mask the lighting plane with the remaining emissive overlays.
Luckily, BYOND has provided a single filter that is capable of this task. The color matrix filter. This filter can be used to apply a color matrix to an image! Provided that the emissive overlays and the emissive blockers are different colors we can use a color matrix filter to effectively mask out the emissive blockers from the plane! The resulting emissive plane can be applied as an alpha mask to the lighting plane as it used to, to the same effect. The best part is, we get layering practically for free!
This is exactly what this PR does. It converts the emissives system from the old plane and masking based blocking to a new layer-based system which uses BYONDs native layer handling to mask the emissive overlays.
* Emissive system refactor
Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
* mail fixes 😎 (#58716)
now mail doesn't get sent to... BAD recipients. (Antags arm, just say antags)
fixes incorrect unwrapping message (bad usage of a visible message)
mail recipients wasn't shuffling either. I'm fairly certain this was leading to some people always getting mail and some never getting it.
* Fixes incorrect unwrapping message, and now mail doesn't get sent to... BAD recipients.
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
* screwdrivers no longer randomize their pixel_y on initialize (#58707)
removes the 75% chance on screwdrivers initialize to have a random pixel_y between 0 and 16
it looks bad now that the screwdriver is centered on the tile
* screwdrivers no longer randomize their pixel_y on initialize
Co-authored-by: Fikou <piotrbryla@onet.pl>
* Stops hangover station trait from making bottles spawn in the walls/windows/dense objects (#58681)
* Stops hangover station trait from making bottles spawn in the walls/windows/dense objects
Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
* Fixes Chameleon Projector Dummies escaping containers (#58683)
You can see why this is bad from the issue, but it applies a lot of other places you can cram the projector into. Like transit tubes! Or vehicles! Or free escapes from welded lockers! Spooky.
* Fixes Chameleon Projector Dummies escaping containers
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
* Fixes full unrestrained interaction while buckled to a xeno nest. (#58617)
* Fixes full unrestrained interaction while buckled to a xeno nest.
Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
* Mexican Food Tab, Food Tagging Tweaks (#58622)
* Tagging Fixes, Food Moves
Fixes Food Tags on a bunch of burritos. (3/4 don't use MEAT. They were tagged with MEAT.)
Fixes Food Tag and renames Egg Wrap (It doesn't use Tortillas. No GRAIN)
Moves Scotch Egg and Egg Wrap to EGG foods.
Makes a Mexican Food Tab, and moves burritos, tacos, and nachos into it.
* Mexican Food Tab, Food Tagging Tweaks
Co-authored-by: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
* Fixes a bunch of invalid icon states. There's more, but my brain isn't fried enough for that. (#58608)
gibup1 and gibdown1 don't exist
items_and_weapons.dmi doesn't have an icon state called his_grace_ascended, in fact nothing does
items_cyborg.dmi doesn't have an icon state called laser, it does however have an icon state called
laser_cyborg
no porta_turret has an icon state with the _unpowered suffix, in fact I'm convinced none of them ever have
* Fixes a bunch of invalid icon states
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
* Allows you to repair trophy cases (the ones found in the library) (#58588)
Apparently you haven't been able to repair these for the last four years.
Fixes#27926 (Trophy cases being perma broken)
All other display cases can be repaired, why shouldnt this one be able to.
* Allows you to repair trophy cases (the ones found in the library)
Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
* Tank holders can be anchored and have better examine descriptions. (#58348)
* Tank holders can be anchored
* Better description
* One word
* Requested change
* Tank holders can be anchored and have better examine descriptions.
Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
* Exorcises shitcode demons out of an unobtainable piece of farm equipment (#58568)
* Removes code that does nothing
* Adds comments
Co-authored-by: Your mother <mothmilk666666666666@ tfwno.gf>
* Exorcises shitcode demons out of an unobtainable piece of farm equipment
Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
Co-authored-by: Your mother <mothmilk666666666666@ tfwno.gf>
* Adds comments to handcuffs.dm (#58478)
* update
* Adding changes made to file in #58456
* Comments handcuffs in handcuffs.dm
* Comments for legcuffs stuff
* Final touches
* Adds two newlines that make the code a bit prettier
* Changed handcuff subtype comments
Mostly removing useless extended descriptions from cablecuff subtypes
* Alien handcuffs comment now actually states what they are
* IT'S BLAND YOU SAY?
* Removes bloat
Co-authored-by: BuildTools <unconfigured@ null.spigotmc.org>
Co-authored-by: MothMilk666 <mothmilk666666666666@ tfwno.gf>
* Adds comments to handcuffs.dm
Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
Co-authored-by: BuildTools <unconfigured@ null.spigotmc.org>
Co-authored-by: MothMilk666 <mothmilk666666666666@ tfwno.gf>
* Converts screwdrivers to GAS (#58453)
* Basic GAS setup
* Compile fix
* Fixes, inhands, belt icons
* New procs
* New version of GAGS
* Inhand for subtypes
* Typo fix
* Converts screwdrivers to GAS
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
* Fixes some typos in frozen.dm descriptions (#58539)
* Fixes some typos in frozen.dm descriptions
Co-authored-by: Swept <sweptwastaken@protonmail.com>
* Fixes chicken and exotic meats not processing into meatballs (#58509)
* Fixes chicken and exotic meats not processing into meatballs.
Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
* toggleable eyepatch side
the day we've been waiting for.,
* HAHAHAHHA WHOOPS
I FORGOT A CHECK TO MAKE SURE THAT ALL EYEWEAR SPRITES DIDNT TRY TO ADD _R TO THE END
* Completely removes unused caution sign from code (#58532)
Tiny atomic pr that zaps the old unused caution sign out of both its icon file, the code, that one random map file it was still in, metastation, and rearranged metastation. You can now properly wear caution signs from all sources!
* Completely removes unused caution sign from code
* removes obj/item/caution
Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
Co-authored-by: KathrinBailey <evesovereign@hotmail.co.uk>
* Scrolling layers for RPD is more snappy. It is also no longer flipped. (#58493)
* Scrolling layers for RPD is more snappy. It is also no longer flipped.
Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
* Hollowpoints and similar attacks/weapons double existing armor, not add total armor, to the their targets (#58114)
* Hollowpoints and similar attacks/weapons double existing armor, not add total armor, to the their targets
* a
* Update tools.dmi
* Update tools.dmi
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
* Minor code readability improvement to default values of the breakouttime var (#58456)
Replaces time expressed in deciseconds with time expressed in deciseconds but with use of the MINUTES and SECONDS defines for readability.
* Minor code readability improvement to default values of the breakouttime var
Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
