* Refactors pay stands + custom vendors (#63889)
I am disgruntled by the way pay stations work. They're not intuitive, they're a pain to build and have no interface. Basically: They don't get made, and the potential is lost.
Pay stands => Holopay
Summoned by right clicking your ID
Disappears if the card is out of range.
New TGUI window that offers more customization
Other bundled fixes:
Custom vendors become more user friendly
Code improvement
Lots of documentation + refactoring
New bundled number input will likely take place of animated number in tgui input number
Why It's Good For The Game
More RP opportunity for players, plus bug fixes. It's now much easier for players to start their own in game business selling substances clown shoes.
Changelog
cl
code: Created a new input component that accepts only integers. More usage to come.
refactor: Pay stands are now holographic. It's 2562! Create one by right-clicking your ID.
del: Circuit boards for pay stands.
refactor: Pay stands now have their own TGUI.
fix: Custom vendors now alert you when someone makes a purchase.
fix: Custom vendors now place items in your hand when you make a purchase.
/cl
* Refactors pay stands + custom vendors
* I edited these maps in a text editor
Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
* Adds blue shoes to the MediDrobe. #64492
About The Pull Request
Adds the blue shoes, which paramedics start with but are seemingly otherwise unobtainable, to the wardrobe that has the rest of their starting outfit in it.
Why It's Good For The Game
Currently, paramedics have no way to replace their shoes, or get them if they change their job to paramedic, other than making fake ones using a washing machine and crayon. Also, they look a hundred times better than white shoes when I'm wearing blue medical scrubs as a doctor, which is the main reason I made this PR.
Changelog
🆑
add: Added blue shoes to the MediDrobe.
/🆑
* Adds blue shoes to the MediDrobe.
Co-authored-by: Donpedrito <pedro.storch@gmail.com>
* Boritos: Now with different flavors and available at vendors + Ready Donkmeal Trash Sprite uplift (#64238)
Boritos finally decided to start supplying the station with their cornchips. This PR comes with 4 flavors of boritos that can be bought from vendors as well as a slight uplift for the sprite of Ready Donkmeal's trash variant, making it actually look like trash rather then a pristine box.
Also hey if you walk on boritos packages they pop! Thats cool right?
* Boritos: Now with different flavors and available at vendors + Ready Donkmeal Trash Sprite uplift
Co-authored-by: ErdinyoBarboza <erdinyobarboza@gmail.com>
* Vending Machine no gravity fix (#64379)
Vending machines will no longer tilt onto people if there is currently no gravity experienced by it.
* Vending Machine no gravity fix
Co-authored-by: SMOSMOSMOSMOSMO <95004236+SmoSmoSmoSmok@users.noreply.github.com>
* Semkis and Pistachios! Come get your snacks + Snack Items Name Fixes (#64276)
Snack time
* Semkis and Pistachios! Come get your snacks + Snack Items Name Fixes
* Fix (#10960)
Co-authored-by: ErdinyoBarboza <erdinyobarboza@gmail.com>
* Fixes + expands vending machine returned purchases (#64314)
Fixes vending machine returns, also makes it so you can return anything to (nearly) any vending machine. New stuff vends first. Secondhand stuff last.
* Fixes + expands vending machine returned purchases
Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
* Fixes cyborgs being able to right a vending machine from any distance #63887
* Fixes cyborgs being able to right a vending machine from any distance
Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
* adds the three missing (non-cursed) animal masks to the autodrobe, reenables speech modification for most animal masks (#63824)
* adds the three missing (non-cursed) animal masks to the autodrobe, reenables speech modification for most animal masks
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
* Adds a new toy: The Captain's Aid (#63833)
Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>
Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* Adds a new toy: The Captain's Aid
Co-authored-by: FernandoJ8 <80640114+FernandoJ8@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>
Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* Adds moth seeds to seedvend and various moth food fixes (#63352)
* Eob you dork. Thanks for the moth drinks.
* this too.
* Update megaseed.dm
* Cooked pasta sheets instead of raw.
* Pepper
* Update misc.dm
* mmmh webedit :drooling:
* Update megaseed.dm
* Adds moth seeds to seedvend and various moth food fixes
Co-authored-by: carshalash <carshalash@gmail.com>
* TGUI input box conversions 2 (#63395)
More text inputs converted to tgui, TGUI text and number input now more sanely handles ENTER key being pressed, you can now press anywhere in the window to enter the input. TGUI text input now considers placeholder text for the default valid state. IE, if there is default text you can press enter immediately without having to rewrite it just to recheck validity. Fixes: useSharedState => useLocalState. not only was sharedstate not needed but it opened up the ui to vulnerabilities
* TGUI input box conversions 2
Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
* Paintings improvements. (#63170)
About The Pull Request
Paintings can now do stroke painting.
Added painting management panel for admins.
Paintings now display author's character name, year of painting, medium and patron when hung on wall.
You can become new patron by paying more than the previous one.
Added painter's palettes to library vendor. (Sprites by @ Mickyan )
Backend changes:
Images are now stored in /data/paintings/images/*.png instead of /data/paintings/[category]/*.png
Old categories are now just tags
Screens & Video
Changelog
cl
add: You can now become patron of your favorite painting by buying sponsorship from Nanotrasen Trust Foundation.
add: Painter's palettes are now available at library vendor.
qol: Can use strokes in paintings now
/cl
* Paintings improvements.
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
* Re-paths and changes the layer of GAR glasses (#63009)
Re-paths GAR glasses to make them subtypes of each other, where applicable.
Re-names some of the icon states, to make it clearer as to what they are.
Changes the alternate_worn_layer to make them show over hair, rather than under. (Muh reference)
Subtypes good. Being able to see what you're wearing properly also good.
* Re-paths and changes the worn layer of GAR glasses
* Feex
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Donuts found in sec vendors and boxes can now be used to make glazed donuts (#62910)
* Donuts found in sec vendors and boxes can now be used to make glazed donuts
* Hopefully fixes CI
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Da plate update: New plate sizes and breakable plates (#62804)
About The Pull Request
This PR adds small and large plates and allows you to break plates by throwing them.
bild
bild
Why It's Good For The Game
Having larger plates allows you to more easily run the buffet gimmick as you can fit more items on the large plates.
Having large plates also allows for more space for creative food plating.
The small plates lets the chef serve small food items such individual cake slices without the plate looking mismatched.
Plate breaking improves immersion and allows unsavoury characters such as mimes and syndicates to stir up trouble.
Changelog
cl
expansion: Small and large plates have been added to the kitchen vend.
expansion: Plates will now break when thrown.
/cl
* Da plate update: New plate sizes and breakable plates.
Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
* [MDB IGNORE] dir sanity, primarily on WALLITEMs (#62601)
About The Pull Request
Wall items mostly use the direction from the floor to the wall in the named mapping helper. Wall items mostly use the direction from the wall to the floor for the internal dir variable.
This leads to a headache when it comes to working out what conflicts with what, and what needs placing where.
Wall frames provided a member, inverse, which specified whether or not to invert the direction of the item when looking for conflicts. It was also used to specify whether to look for conflicts outside of the wall (cameras and lights appear external to the wall) or inside the wall (most wall items). This flag was set for Intercoms, APCs, and Lights. Since APCs and Lights expect a floor-to-wall direction, and Intercoms expect a wall-to-floor direction, this means that APCs and Lights were getting the correct direction, and Intercoms were getting the wrong direction.
Some implications of this setup were:
You could build an APC on top of another wall item, provided there was nothing external attached to the wall and the area didn't have an APC.
You could stack Intercoms indefinitely on top of the same wall, provided you weren't in a one-tile wide corridor with something on the opposite wall.
Or both! Here's twenty Intercoms placed on the wall, and a freshly placed APC frame after placing all Intercoms and deconstructing the old APC:
endless-stack-of-intercoms
Not everything used this inverse variable to adjust to the correct direction. For example, /obj/machinery/defibrillator_mount just used a negative pixel_offset to be visually placed in the correct direction, even though the internal direction was wrong, and never set! This also let you stack an indefinite number of defib mounts on the same wall, provided it wasn't a northern wall... except you could do this to northern walls too, since defibs weren't considered a wall item for the purposes of checking collisions at all!
Ultimately, every constructable interior wall item either used this inverse variable to adjust to the correct placement, set a negative pixel_offset variable to have its offset adjusted to the correct placement, or overrode New or Initialize to run its own checks and assignment to pixel_x and pixel_y!
Inventory: Table of various paths, related paths, and the adjustments they used
Unfortunately, untangling /obj/structure/sign is going to be another major headache, and this has already exploded in scope enough already, so we can't get rid of the get_turf_pixel call just yet. This also doesn't fix problems with the special 2x1 /obj/structure/sign/barsign.
Some non-wall items have been made to use the new MAPPING_DIRECTIONAL_HELPERS as part of the directional cleanup.
tl;dr: All wall mounted items and some directional objects now use the same direction that they were labelled as. More consistent directional types everywhere.
Why It's Good For The Game
fml
Changelog
cl
refactor: Wall mounted and directional objects have undergone major internal simplification. Please report anything unusual!
fix: You can no longer stack an indefinite amount of Intercoms on the same wall.
fix: Defibrillator Mounts, Bluespace Gas Vendors, Turret Controlers, and Ticket Machines are now considered wall items.
fix: Wall mounted items on top of the wall now consistently check against other items on top of the wall, and items coming out of the wall now consistently check against other items coming out of the wall.
fix: The various directional pixel offsets within an APC, Fire Extinguisher Cabinet, Intercom, or Newscaster have been made consistent with each other.
fix: The pixel offsets of Intercoms, Fire Alarms, Fire Extinguisher Cabinets, Flashers, and Newscasters have been made consistent between roundstart and constructed instances.
fix: Constructed Turret Controls will no longer oddly overhang the wall they were placed on.
qol: Defibrillator mounts now better indicate which side of the wall they are on.
fix: Some instances where there were multiple identical lights on the same tile have been fixed to only have one.
/cl
* [MDB IGNORE] dir sanity, primarily on WALLITEMs
* apc directionals
* bluespace vendor fix
* defib fix
Co-authored-by: esainane <esainane+github@gmail.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
* Fixes emissive appearances of vending machines being removed when the wire panel is opened/closed (#62592)
Replaces a cut_overlays() call with cut_overlay(panel_type) EDIT: moved the panel overlay to the update_overlays proc
* Fixes emissive appearances of vending machines being removed when the wire panel is opened/closed
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
* Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed
* Fixing conflicts
* Makes it compile, yeet all the RAD armor from everywhere (thanks RegEx!)
* Removing more lingering rad armor (woo)
* Damnit powerarmors
* Bye bye rad collectors!
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* removes double spaces before symbols (#62397)
This can apparently cause some bugs on occasions, so I thought I might as well try to kill them all.
* removes double spaces before symbols
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
* Moves vending prices from /atom to /obj/item (#62243)
* Moves 3 vars related to vending machines, from /atom to /obj/item
* Lazily removes some lines in a funky IDE of my choosing.
Removes all instances of custom_price and custom_premium_price within maps to prevent compilation errors due to invalid vars.
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Kat <evesovereign@hotmail.co.uk>
* Adds art stuff to the library games vendor (#62253)
* added game vendor art stuff
* spaces, ai canvas to premium
* Adds art stuff to the library games vendor
Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
* Oh hi Mark.
* hand dryer 4000
* E
* fur dyer
* actually makes it work
* Update fur_dyer.dm
* Update fur_dyer.dm
* Final touches!
* Update jobs.txt
* le straight razor
* f
* Update hhmirror.dm
* updoot
* Update IceBoxStation_skyrat.dmm
* E
* No more failure penalties, it's bad.
* logic errors
* actual hairdye
* Update barber.dm
* Rebases to newer map versions
Fixes multiple issues with the original map changes in this PR, which are as follows but not limited to:
• Trapping Lawyers in their office on Blueshift
• Incorrect curtain types
• Awkward atmos
• Broken disposals
• Missing wallmounts
• Missing firelocks
* camera on meta
* Update jobs.dm
* more dyesprays
Co-authored-by: Kat <evesovereign@hotmail.co.uk>
* Disco Elysium suits (#62113)
Re-opening goof's PR that was closed earlier this week: #61401 that ports Disco Elysium sprites from Fulp's old repo: TheSwain#306 but with fixes to armhole issue on the under/jobs/security sprites and minor punctuation corrections on some item descriptions.
* Disco Elysium suits
Co-authored-by: Horatio22 <69338705+Horatio22@users.noreply.github.com>
* memories are no longer added if the target isn't aware of them. (#61375)
Fixing an oversight with the memories system. Memories shouldn't be added to people who aren't possibly aware of them.
* memories are no longer added if the target isn't aware of them.
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
