Commit Graph

1560 Commits

Author SHA1 Message Date
CrigCrag f4cfa192c3
Overrun Outpost Arm (#24656)
* add every

* remove 2 crusher spawns

(cherry picked from commit 572347af5d1dc7a0a25d5afeafa823ac5ea8ace7)
2024-02-08 11:59:13 +01:00
Velcroboy 3b05ca6cf1
Map Edits: Submarine (#788)
Co-authored-by: Velcroboy <>
2024-02-07 02:44:32 +00:00
UnicornOnLSD 7c088176cb
Submarine update no. I forgot (#783)
* tweaks done put in the PR changelog

* more tweaks, enough for PR, all good.

* fixed solution

* fixed few fucked up station beacons

* FIX: cams, some accesses, more jobs, more lockers, perma prepped.

* brought more jobs slots to service, and borgs

* buncha changes

moved comms, made the hospital a little less prone to maints shenanigans, connected the psychologist offices directly to the main hall, added another exit to urgent care, gave perma a visitation area and moved the brigmedics room, made perma less prone to escapes, turned the cafe into an arcade, turned the rightmost mall kitchen into a laundromat, removed the halloween stuff

* raise pop to fifty

* fix hos safe & cleaned up salv a little

also hid a few aloe and galaxythistle around the maze just to help the caustic issues

* siobhan for epi

* PR commit, merged atmosia update, upgraded comms, fixed a few power issues

* ran important mapping CMDs, yeepee

* merging fuck file

* redone the changes, removed tiny fans, fixed robotics

* fixed solution smh

* added more priso slots

* terminated TEG, put wood corner instead

---------

Co-authored-by: rosieposie <roseknight9999@gmail.com>
2024-02-06 20:32:33 -06:00
Velcroboy e6cda61070
Map Edits: Evac Shuttles (#786)
Co-authored-by: Velcroboy <>
2024-02-05 22:10:04 +00:00
Colin-Tel a518b776e8
Asterisk 2.1 (#782)
* Asterisk 2.1

Adjusted TEG loop based on player feedback.

* Update asterisk.yml

additional changes
2024-02-05 15:22:18 -06:00
Velcroboy ae155021b5
Moves ruins maps to DV folder and updates with some changes and dangers (#785)
Co-authored-by: Velcroboy <>
2024-02-05 21:11:50 +00:00
deltanedas 069bc99c43
submarine atmosia update (#778)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-05 09:53:35 -06:00
UnicornOnLSD 86fae6c1b8
Submarine day two patch (#772)
* tweaks done put in the PR changelog

* more tweaks, enough for PR, all good.

* fixed solution

* fixed few fucked up station beacons
2024-02-03 20:31:24 -06:00
Colin-Tel 69e7fc589e
Edge 2.0 (#769)
* Modernized Edge

Made Edge up-to-date with beacons, chem dispensers, dressers, cryosleep, and fixes.

Also corrected an erroneous APC name on Asterisk Station.

* Update edge.yml

Added Prisoner cryosleep chamber
2024-02-03 20:30:44 -06:00
Velcroboy 1e416a7b3c
Another small lighting update for Submarine (#766)
Co-authored-by: Velcroboy <>
2024-02-03 07:11:28 +00:00
UnicornOnLSD 23ddab53e4
Submarine station day one patch note (#762)
* day 1 patch, yeepee

* fixes, cargo shuttle can dock now, hoepfully, fixed some escape shuttle accesses, cloning computer board.

* better chapel

* wawa mapped pride vend in chapel by accident, station already has one, whoops

* escape pods are all now AA, should be last commit for this patch.
2024-02-03 00:50:49 -06:00
Velcroboy 4c7a384058
Re-save and add DV salvage maps (#765)
Co-authored-by: Velcroboy <>
2024-02-03 06:50:10 +00:00
Velcroboy 17c6535d81
Map Edits (#761)
Co-authored-by: Velcroboy <>
2024-02-02 18:54:54 +00:00
Velcroboy daa122423f
Add warp points to evac shuttles (#758)
Co-authored-by: Velcroboy <>
2024-02-02 04:09:20 +00:00
Velcroboy e4e50c1ca6
Submarine lighting overhaul (#756)
Co-authored-by: Velcroboy <>
2024-02-01 19:46:27 +00:00
UnicornOnLSD 469bf66aa4
Submarine Station (#704)
* wawa

* A LOT of changes, will write a proper commit

* Final tweaks for Submarine station.

* Finaler tweaks, fixed power on a few places etc etc.

* edits 4 map

* fix sln file

* woopsies, fix !

* removed mediborg from available jobs

* Fixed musician spawn point lacking

* tweaked submarine: fixed evac screens, added material reclaimer in disposals

* submarine update:
-resorted chemistry
-drippy closets up
-THE CRYO IS REAAAAAAL
-beacons, they're here
-stuff

* fixed shuttel, now it's hammurabi's because it's sick and I can't be bothered to build a whole ass evac shuttle meself

* oopsy woopsie wrong file directory uwu

* emergency fixes, weewoo now it's good

* last changes, on god:
-adjusted maints
-new 3R#0!/ beacon somewhere
-AME has enough cores to power station properly roundstart

* fix cryopod, FULLY READY NOW.

* Final commit, changes the shuttle, added perma cryopod, all clean and good to go.

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-02-01 13:30:23 -06:00
Velcroboy 77c8df0367
Adds Nyano Evac shuttles (#753)
Co-authored-by: Velcroboy <>
2024-02-01 02:55:25 +00:00
Velcroboy 267cfa8990
Map Edits (#747)
Co-authored-by: Velcroboy <>
2024-01-31 15:50:46 +00:00
Adrian16199 d2da769e62
Shoukou's cryo update. (#746)
* Shoukou's cryo update.

Head of security's locker was replaced with HoS's locker with hardsuit to fit in a new furniture that has the clothing for them.
Head of personal's plant was removed for a dresser with his clothing.
Captain's hardsuit is now located in their locker, locker was placed where the hardsuit locker was and the dresser was placed where the locker was previously.
CMO had same treatment as HoS. Same goes for Mystagogue, chief engineer,warden and logistics officer
Added cryo to command/prison/arrivals
Added more screens
Named APCs. God there is alot of them.
Added Tropico to detective's office. (Aparently thief objective)

* DIE INVALID
2024-01-31 09:34:32 -06:00
Debug 1b783d231e
Revert "Map Hotfix" (#744)
Revert "Map Hotfix (#740)"

This reverts commit 6fc39d5d94.
2024-01-31 09:45:21 +00:00
Velcroboy a80ed207c4
Map Edits: The Hive (#742)
Co-authored-by: Velcroboy <>
2024-01-31 08:32:36 +00:00
Velcroboy 6fc39d5d94
Map Hotfix (#740)
Replace latejoin cryosleepers w/ standard

Co-authored-by: Velcroboy <>
2024-01-30 23:34:13 +00:00
Velcroboy 3dd7d8a56c
Re-add evac shuttles Box & Lox (#737)
Co-authored-by: Velcroboy <>
2024-01-30 21:55:15 +00:00
Colin-Tel c09883775c
Asterisk 2.0 (#736)
Modernized Asterisk
2024-01-30 15:09:41 -06:00
Velcroboy 8357dbea87
Map Edits: Tortuga (#735)
* Map Edits: Tortuga

* Update folders and paper bins

---------

Co-authored-by: Velcroboy <>
2024-01-30 17:36:49 +00:00
Velcroboy 2d2c2dbacd
Map Edits: Hammurabi (#734)
Co-authored-by: Velcroboy <>
2024-01-30 02:40:29 +00:00
Velcroboy 2b08f3d225
Map Edits: Arena (#732)
* Map Edits: Arena

* Updates paper bins and dirt->cleanable

---------

Co-authored-by: Velcroboy <>
2024-01-29 23:43:33 +00:00
Adrian16199 666194bd9c
Shoukou maintenance update.... again. (#695)
* Shoukou maintenance update.... again.

Fixes camera in cryo
Added a techmaint floor under Armoury level 2 door.
Adds mirror to cloning.
Adds maintenance behind robotics, giving access to atmos if someone wanted to break in.
Adds a TV in bar.

* Update shoukou.yml

* Second patch.

* Just going to see how this will go.

* Revertin the previous commit.

---------

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-28 10:42:01 -06:00
Debug fd28a4853c
Merge remote-tracking branch 'upstream/master' into Wizmerge-22/01
# Conflicts:
#	Resources/Maps/hammurabi.yml
2024-01-28 01:27:11 +01:00
Debug 2fe44470e7
Fix Hammurabi 2024-01-28 01:25:27 +01:00
Debug e1de8b3d36
Reset Hammurabi 2024-01-28 01:24:36 +01:00
Ubaser 831762e9e7
Biodome satellite ruin (#24608)
* add

* yea

(cherry picked from commit eca3d0b27358e928556ff898c12b3996ac460a9c)
2024-01-28 00:33:33 +01:00
Debug acfbdc267b
Resave Delta maps 2024-01-28 00:25:21 +01:00
metalgearsloth 6bcaf0cdb1
Resave escape pod (#24527)
(cherry picked from commit ba419f0db4920e70044e577a12380a83a7a7ecbd)
2024-01-27 23:57:21 +01:00
metalgearsloth ba59d03d2d
Resave ruins (#24543)
Last one, they're probably not getting touched for a hot minute.

(cherry picked from commit 875e0f462f88cd5fd5f1b1cccdfea4f361954e01)
2024-01-27 23:57:20 +01:00
metalgearsloth b4222b85ad
Resave dev map (#24538)
Also applies migrations so I stop getting warnings every time I launch the game.

Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit f787bb15ffdd7547416cae28bca7152e31a1f6da)
2024-01-27 23:57:11 +01:00
metalgearsloth d193c22847
Resave centcomm (#24539)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit f6da7093636332132de05bcefd33c7f3bc85fcbf)
2024-01-27 23:57:10 +01:00
metalgearsloth df8dacbd2f
Resave admin test arena (#24537)
Another oldie.

Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit e2a8ba48d6e58b6ee185507c2a1e6e74b17b720b)
2024-01-27 23:57:09 +01:00
metalgearsloth 20a3a85ee2
Resave salvage maps (#24519)
Removes metadata merge alongside

(cherry picked from commit 480ac18172348febacfa6cf3bb6a2e627d663bb7)
2024-01-27 23:56:50 +01:00
metalgearsloth bdeaa1393c
Resave test maps (#24535)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit de4fbbe80beecf488d93670878e0221683d9b6a8)
2024-01-27 23:55:57 +01:00
metalgearsloth afd160c378
Resave mining shuttle (#24534)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

This one looked skub.

(cherry picked from commit 2e6e845d4858667a9f091972308c70c6be7af2cd)
2024-01-27 23:55:56 +01:00
metalgearsloth a13ebf34c5
Resave event shuttles (#24528)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit c1c13086e92210a6d24426789e509b89a18e687f)
2024-01-27 23:55:55 +01:00
metalgearsloth fb55e8bc19
Resave emergency shuttles (#24526)
Listen I'll split the other PRs but I'm not splitting 10 custom eshuttles.

Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit faf3b1b4273a6491eb987e32fcfba18ed241eb58)
2024-01-27 23:55:38 +01:00
metalgearsloth 15f7b78c10
Resave infiltrator (#24529)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit fae17e3351e3f4a8883080cdf8c249c82a85f643)
2024-01-27 23:55:10 +01:00
metalgearsloth 4771eaefcb
Resave cargo shuttle (#24525)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit e83e8bc0e117d0c70cab451e70364ab4a904bf56)
2024-01-27 23:55:09 +01:00
metalgearsloth f0bad294d0
Resave dungeons (#24521)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit 1eabf582766b3b1f7655b680273480a309a026df)
2024-01-27 23:55:08 +01:00
metalgearsloth c53d3383b6
Resave arrivals shuttle (#24523)
Resave arrivals

Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit 28de53eed75e00e5d0a2522174170fdd7f085988)
2024-01-27 23:55:07 +01:00
metalgearsloth cc3fe9c31c
Resave meteor arena (#24522)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit 6c8173f78c89992c896355e59a1ddebb3143638b)
2024-01-27 23:55:06 +01:00
metalgearsloth 4eddaccfff
Resave dungeon templates (#24520)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit d0255c8006dbdb9ec35755593d3be048b05275fa)
2024-01-27 23:55:05 +01:00
Nemanja 7573dba496
Rip out remaining machine upgrades (#24413)
* Rip out remaining machine upgrades

* eek

(cherry picked from commit a9e89ab37221c4f5eff5a9e1d42e97c6f3e0753b)
2024-01-27 23:43:49 +01:00