* Adds Welding Hardhat variants to the engidrobe + other tweaks
Also fixes/adds missing sprites cuz honk
* whoop
bad comment a
* CONFLICTS
ababababa
* comments
aaaaaaaaaaaaaaaaa
* OCD sorting
colr with color
* Adds two new cargo uniforms
Honestly should have had this in the original Utility port but they weren't in the right files h
* gorkajacket
gorkagorkagorka
* fuckin conflicts
AAAAAAAAAAA
* CONFLICT AA
aaaaaaaaaaaaaaaaaaaaa
* aaaaaaaaaaaa
fucking CONFLICTS
* Modifies SecTech ad from beating capitalists to communists (#58083)
* Modifies SecTech ad from beating capitalists to communists
Co-authored-by: Swept <sweptwastaken@protonmail.com>
* changes most uses of SSvis_overlays.add_vis_overlay() inside of update_overlays() to true overlays (#57985)
* changes most uses of SSvis_overlays.add_vis_overlay() inside of update_overlays() to true overlays
Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
* Layer overhaul (#57915)
## About The Pull Request
Changes up some layer and plane defines for no particular reason lol
## Why It's Good For The Game
Planes actually override layers, and layers control ordering within planes. A lot of the usage of plane and layer was wholly unnecessary. This refactor helps future maintainability while also being needed staging for _future features._
* Layer overhaul
* aaaaaaaaa
a
Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
* You can now put food on plates, and plate no longer materialize out of nowhere as you cook
* Update dish_drive.dm
* aaaaaaaaaaaaaaa
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
* adds the jumpsuit variants of skirts to the curadrobe (#57472)
* adds the jumpsuit variants of skirts to the curadrobe
Co-authored-by: Fikou <piotrbryla@onet.pl>
* Finish "Utility Port"
Ports the rest of the paired items with those in the Utility Port, including departmental jackets. Also tweaks a few of the uniforms in the Utility port (such as making chem-haz uniforms actually acid-proof)
* ABRBR NEWLINES
/Insert swearwords here/
* N E W L I NE
i swear to fuck
* fix armor value formatting
whooops
* If I fix a holobug before its reported do i gain? no! money down. 🤔 Fixes issue with holodeck items being accepted into custom vendors (#57092)
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* If I fix a holobug before its reported do i gain? no! money down. 🤔 Fixes issue with holodeck items being accepted into custom vendors
Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* Add Wiz-Off: An Arcane Battle for the Fate of the Universe! (#56980)
Adds Wiz-Off, a new and extremely simple card game to the Fun Vendor.
* Wiz-Off: An Arcane Battle for the Fate of the Universe!
Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Surgery-compatible gown to let patients stay modest. Available in protolathes for plastic, the medidrobe, and pre-spawned in surgery duffel bags - fast equip times onto others. Sprites made by Kroto
* Add Loincloths
Adds leather and cloth loincloths, craftable with their namesake materials; also adds a sensor variant in the Autodrobe and Loadout.
* what the fuck
oh no its broken
* feck
changes defines to be correct, fixes female sprites borking, lets you fix your wedgie, and adds cloth crafting. basically fixes everything.
* Adds Cyber-P.I. Costume
Adds a Cyberpunk P.I. costume using sprites from a23605c9fd - The helmet is only available in the Autodrobe, while the coats are also available in the loadout.
* Descriptions are fun
Changed the coat description to have fancy neo-laminated fiber lining
* ack
changes the outfit to be a detective outfit rather than a costume, and edits the sprite credits
* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#56754)
* Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent.
* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols
* Update maint_loot_common.dm
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
* Ports Utility Outfits +
Ports several outfits from oldbase, with the focus being Utility Uniforms
* SPACES
im dummy forgot line spacing
* IM NEW OK
auto-indentation has cursed me. NOW there's newlines at the ends.
* Why was this pushed
everything is falling apart
* Fucking OCD
capitalized a file path that shouldn't have been capitalized
* Winter coats (#56854)
add: Thirteen more winter coats covering all departments and most jobs.
* Winter coats
Co-authored-by: Tom <tomforde4@gmail.com>
* Adds Laborer Overalls to the Engidrobe
They were in the vendor on oldbase, and variety in the outfits doesn't hurt.
* Adds Laborer Overalls to the Engidrobe
The Engidrobe in oldbase could vend Laborer Overalls, and a small variety of looks doesn't hurt.
-now with one less misleading code comment
* Update wardrobes.dm
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
* renames metal sheets to iron sheets
* Merge branch 'master' into upstream-merge-56643
* yay metal
* Update DeltaStation2_skyrat.dmm
* a
* Update CentCom_skyrat_z2.dmm
* a
* a
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
* disables godmode for some vendors and adds missing refills (#56570)
* disables godmode for some vendors and adds missing refills
Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
* A Big Hydroponics Update: A Rose by any other name (2 new plants, 4 new traits, new genes, and more!)
* Update grafts.dm
* Update grafts.dm
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
* reverts Adds Neon Carpet (#55782), it appears to have been causing massive amounts of maptick (#56496)
It appears to have been causing massive amounts of maptick, this'll need a testmerge so we can test my hypothesis
* Reverts Adds Neon Carpet (#55782)
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
* Adds missing duffelbags for some jobs and update their respective vendors and closets.
* Update roboticist.dm
Co-authored-by: Tristrian <Tiago.A.C.9@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
* Vending machines use slow throws (#56003)
quickstart acts by ticking the first throw right away, but this can lead to stack overflows if this throw happens to trigger another throw. it should really be moved to a default off argument, as only user initiated throws should use it, but throws that themselves can be triggered by throws (like this) should definitely not use it.
* Vending machines use slow throws
Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
* Reworks the brand intelligence event with AI controller datums (#55778)
These felt like another good test-case for ai controllers that someone could easily grasp, this makes it so that we can use the actual vending machine instead of a fake mimic mob. In theory you could even still use the vending machine, if you like living on the edge ofcourse.
The vendors now try to move towards you, and try to dive on top of you to squish you.
* Reworks the brand intelligence event with AI controller datums
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* More Kilo fixes and Pubby cleanup (#55516)
* Pubby cleanup and Kilo Fixes
Remove pubbystation subtypes of boozeomat
Remove pubby specific subtype of wallmed
Replaces pubby wallmed subtypes in use elsewhere with standard wallmeds
Added some missing solar panel wires
Adds Centcomm access to ERT dock to allow Centcomm guests to board the station
Tweaks some siding decals
* Supposed to be in the first commit
* Gets rid of some stray scaffolding
Gets rid of some stray scaffolding
* Missing grille
* Remove spawn points from solars
Remove xeno spawn points from Kilo solars - spiders use this spawn locations and are not vacuum proof
* More Kilo fixes and Pubby cleanup
Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
* Assign correct payment department to the NanoDrug (#55406)
## About The Pull Request
The NanoDrug was created by splitting the drugs off from the tools in the NanoMed in #55069. When this was done a payment_dept variable was not given to the new machine. The default value for this is the engineering department, so payments taken in by the machine went to the engineering budget, not medical. This also resulted in engineering getting a discount at medical's vendors, while medical staff were charged full price.
## Why It's Good For The Game
The NanoDrug belongs to the medical department, not engineering.
* Assign correct payment department to the NanoDrug
Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
* fixes nanodrug unused sprite (#55300)
NanoDrug Plus has a distinct sprite to NanoMed Plus. It isn't used. This uses it.
* Fixes NanoDrug Plus unused sprite
Co-authored-by: Tom <tomforde4@gmail.com>
