* Give bone keys to arena shuttle victors (#56376)
Now that necropolis crates require bone keys to open, the Arena Shuttle
will give any survivors from the arena a bone key to open a crate with.
* disabled DLC only content on arena shuttle
Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
* repaths plasteel tiles to iron
* Update robot_modules.dm
* a
* fuck me
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.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>
* Add the PubbyStation Monastery as a purchasable shuttle (#56234)
This commit will add a slightly modified version of Pubbystation's
Monastery to the list of available emergency shuttles, becoming the
most expensive shuttle to buy at 250 times the crate price (Defaults
around 50,000cr)
This shuttle will cause significant damage and fully showcase the
absurdity of the Monastery's size by providing an up close and
personal, interactive comparison. PubbyStation's monastery will be
forever preserved.
* Adds the PubbyStation Monastery as a purchasable shuttle
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
* Adds database tracking to maintenance pills (#56179)
I originally added maintenance pills, and while already perfect, I felt like polishing them a bit. I didn't do much, just:
- Maintenance pills now track a players score. Gotta eat em all to get that leaderboard highscore!
- More names and decriptions for maintenance pills, most of them suggestions from the old PR
- Renamed floorpill to pill/maintenance in code because that's what they are, no idea why I didn't originally do it
I've also polished the sprite a little bit, because it always looked a bit _too_ shady
(Below is old sprite, above is new sprite)
* Adds database tracking to maintenance pills
Co-authored-by: Time-Green <timkoster1@hotmail.com>
* Area-based escape condition checking (#55677)
It turns out that checking if a traitor is in custody for their objectives checks if they're on a red plasteel or plastitanium floortile. This is pretty unintuitive, and one of our newer shuttles (the nature emergency shuttle) didn't have these floortiles in their brig. This changes the checking of a traitor's turf to their area.
I've also gone through all of our existing shuttles that have clear brigs (didn't touch things like the hyperfractal and disco inferno) and changed their areas to this new one.
* Area-based escape condition checking
Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
* Merge pull request #55932 from Cartographer-D/KiloWhiteShipFix
Fixes door names on Kilo Whiteship
* Fixes door names on Kilo Whiteship
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
* Adds "cut ai wire" helper; Adds them to the Pirate Shuttle (#55799)
Stops silicons from interacting with the Space Pirate Shuttle's airlocks by cutting the AI wires on the airlocks of the shuttle by default using a new "cut ai wire" helper. Borgs are able to regain control by physically mending the wire of the airlocks.
Note that this does not stop borgs from interacting with other machinery on the pirate shuttle.
The meta to deal with space pirates is for a single borg to cuck pirates by shocking and bolting all of the doors on the pirate ship. This does not entirely get rid of the meta, as any smart borg can simply mend the wires back, but it means borgs will not longer be able to magically shock doors from windows.
* Adds "cut ai wire" helper; Adds them to the Pirate Shuttle
Co-authored-by: iwishforducks <65363339+iwishforducks@users.noreply.github.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>
* removes all dirty map var edits from the codebase and reverts pixel_x/y grep (#55256)
* Revert "grep for pixelx/y = 0 varedits (#54845)"
This reverts commit 311b9da86b.
* part1
* part2
* part3
* Delete PubbyStation.dmm
* removes all dirty map var edits from the codebase and reverts pixel_x/y grep
Co-authored-by: Fikou <piotrbryla@onet.pl>
* Fixed some misaligned pipes in the kilo mining shuttle (#55536)
* fixed some wonky pipes in the kilo mining shuttle
* the files got switched around again
* fixing unnecessary changes
* e
* last one
* Fixed some misaligned pipes in the kilo mining shuttle
Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
* grep for pixelx/y = 0 varedits (#54845)
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>
* grep for pixelx/y = 0 varedits
Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>
* Moves grown food to newfood (#55040)
Moves grown food to newfood
Gives trash element support for callbacks for item creation override
* Moves grown food to newfood
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* moves misc food to newfood code (#54788)
misc food is now using newfood code
* moves misc food to newfood code
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* Converts Pizza to use the new food component. (#53641)
pizzas now use processing component
* Converts Pizza to use the new food component.
Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
* Brings back the Disco Inferno shuttle, but as an admin-only shuttle (#54003)
* Brings back the Disco Inferno shuttle, but as an admin-only shuttle
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
* Adds Shuttle 667 as a buyable shuttle for dispelling a cult rune (#53975)
* Adds Shuttle 667 as a buyable shuttle for dispelling a cult rune
* Add stasis beds
* Fix forcefields going away, leading to hull breaches
* Use set instead of list
* Use subtype for forcefield walls
* Adds Shuttle 667 as a buyable shuttle for dispelling a cult rune
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
* Adds Uncle Pete's Rollerdome, a replacement for Disco Inferno (#54145)
* Adds Uncle Pete's Rollerdome, a replacement for Disco Inferno
* Adds Uncle Pete's Rollerdome, a replacement for Disco Inferno
Co-authored-by: TheVekter <TheVekter@users.noreply.github.com>
* Fixes mapstart and random arcade machines (#53958)
Randomly generated arcade machines were getting random boards and initing properly, but they weren't re-built as the appropriate subtype.
This oversight has been remedied. A new subtype has been created for random arcade machines which exists purely to pick a random circuit then create a machine from that circuit's build path before returning that it should be qdel'd.
This new subtype has been appropriately regex find-and-replaced into all maps.
* Objectify
* Fixes mapstart and random arcade machines
Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
* Rebalances space loot and space exploration (#53916)
* Rebalances space loot and space exploration
Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
* Custom statues and sculpting changes. (#53154)
### Gameplay changes:
- Spacemen lose their ability to sculpt all minerals into statues barehanded, you need a chisel now.
- You can now create carving blocks out of 5 sheets of most materials.
- Using a chisel on the blocks you can designate what to carve in it (including the preset statues from before).
- Chisels can be printed at autolathe, there's also one in art storage.
### Code changes:
- Squeak component now squeaks on attack_hand for structures.
- Radials now accept atom paths automatically extracting the name with initial.
- Base and rigid stack recipes renamed appropriately.
- Statues now use custom materials.
* Custom statues and sculpting changes.
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
* Random ruins map templates fixes (#53848)
* fix golem ship propulsion dir
* vaporwave tweak
replace space to noop, anchor statues
* spacehotel tweak
replace area to noop, place lattice under grille
* creahedship tweak
replace space to noop, remove asteroid area from space
* vaporwave replace to noop
* replace turf space to noop
* replace space area and turf on shuttles
* replace space area and turf on teplates
* Random ruins map templates fixes
Co-authored-by: Dennok <Deneles@yandex.ru>
* s-s-s-spaghetti to newfood (#53574)
🆑 Qustinnus
code: Moves spaghetti to new food
fix: Fixes some more size problems on food
fix: Fixes organs having wrong params
/🆑fixes#53482fixes#53572
* s-s-s-spaghetti to newfood
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* [READY] Overhauls Pubby Cargo (#53614)
This PR completely redoes the layout for PubbyStation's Cargo department, adding plenty of quality of life improvements and significantly changing cargo gameplay compared to every other map through the addition of a cargo docking arm instead of direct docking.
The primary features are thus:
1.The QM gets a corner office that allows him to act as a foreman.
2.The Cargo Bay's layout is drastically changed, repurposing the warehouse as a loading bay and making the main bay as the primary storage area.
3. The docking arm allows for maintenance to run through a small portion of cargo for sabotage opportunities and creates diverse scenarios for unloading and loading cargo.
4.The cargo bay has a way to directly distribute ordered crates to the delivery office.
5.The disposal room (taken from Delta) now shoots trash away from the station and potentially loops around to arrivals.
* [READY] Overhauls Pubby Cargo
Co-authored-by: Cartographer-D <63861499+Cartographer-D@users.noreply.github.com>
* Fixes shuttle call text (#53474)
Shuttle call text for Mother Russia Bleeds read as the Box Emergency Shuttle, this fixes it by making it read properly.
* Fixes shuttle call text
Co-authored-by: Coffee <63162339+CoffeeDragon16@users.noreply.github.com>
* Fixes the arena shuttle (#53458)
This splits the actual arena of the arena shuttle into its own map file that is loaded onto it's own z-level. The old method of including a non-shuttle area in the shuttle map file doesn't work with the current shuttle loader. It also fixes shuttles being loaded twice when purchased which created problems with landmarks being left behind in the reserved z-level.
* Fixes the arena shuttle
Co-authored-by: YPOQ <30683121+YPOQ@users.noreply.github.com>
* Moves over cakes to newfood and transfers reagents when crafting (#53316)
* Moves over cakes to newfood and transfers reagents when crafting
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* Fixes#53290, puddles are now infinite again. (#53311)
Fixes#53290
A code oversight of #52865 that also applied plumbing changes to puddles.
Avoided snow flaking by creating a new object type called water_source. Can be used in the future instead of the sink type.
* Fixes#53290, puddles are now infinite again.
Co-authored-by: Jack7D1 <59462654+Jack7D1@users.noreply.github.com>
