Commit Graph

290 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
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
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
Colin-Tel
075915c458 Changes Asterisk's evac shuttle to the NTES Kaeri (#757)
Kaeri, my beloved.
2024-02-01 20:06:26 +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
Debug
814446fb36 Remove last remaining way of getting tesla generator (#752)
Update salvage.yml

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-01 00:29:50 +01:00
Velcroboy
3dd7d8a56c Re-add evac shuttles Box & Lox (#737)
Co-authored-by: Velcroboy <>
2024-01-30 21:55:15 +00: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
7d657e700b Remove wizden evac shuttles 2024-01-27 23:18:55 +01:00
Debug
b466fc84a7 More fixes 2024-01-27 00:00:42 +01:00
Ubaser
94c664e956 Add 6 new small salvage wrecks (#24179)
* add

* updat

(cherry picked from commit b293bf4fd868c47112d6d1a822b2dca7414fcdaa)
2024-01-26 22:58:23 +01:00
Ubaser
be014dc5da Hauling shuttle wreck (#24152)
add

(cherry picked from commit eaee9b6896dc3cd3fd56d7738d12e9ad7fcd8035)
2024-01-26 22:56:53 +01:00
metalgearsloth
f128143d13 Salvage magnet revamp (#23119)
* Generic offering window

* More work

* weh

* Parity

* Progression meter

* magnet

* rona

* PG asteroid work

* code red

* Asteroid spawnings

* clams

* a

* Marker fixes

* More fixes

* Workings of biome asteroids

* A

* Fix this loading code

* a

* Fix masking

* weh

* Fixes

* Magnet claiming

* toe

* petogue

* magnet

* Bunch of fixes

* Fix default

* Fixes

* asteroids

* Fix offerings

* Localisation and a bunch of fixes

* a

* Fixes

* Preliminary draft

* Announcement fixes

* Fixes and bump spawn rate

* Fix asteroid spawns and UI

* More fixes

* Expeditions fix

* fix

* Gravity

* Fix announcement rounding

* a

* Offset tweak

* sus

* jankass

* Fix merge

(cherry picked from commit bf79acd127483d64f96dc23f2e64c74ceb84303d)
2024-01-26 21:35:22 +01:00
Velcroboy
a4e79cc521 Evac shuttle updates (#720)
Co-authored-by: Velcroboy <>
2024-01-24 23:06:31 +01:00
Debug
18f0af1f68 Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
Velcroboy
3b842b6fae Map Edits: Hammurabi (#694)
Co-authored-by: Velcroboy <>
2024-01-19 02:24:37 +00:00
Velcroboy
fe40f3365f Map Edits: Hammurabi (#689)
* Map Edits: Hammurabi

* add psionic mantis

---------

Co-authored-by: Velcroboy <>
2024-01-18 07:34:51 +00:00
Velcroboy
81a4890686 Hammurabi Rebase (#686)
Co-authored-by: IamVelcroboy<>
2024-01-16 21:53:35 -06:00
Alzore
0e31c6ba79 Engineering Chunk Salvage (#22529)
* Engineering Chunk

* lessmob

* shavedasteroid

* wronglockerlol
2023-12-22 22:50:41 +01:00
Velcroboy
a265402212 Adds laundromat chunk to salvage pool (#550)
Co-authored-by: Jeff <>
2023-12-13 14:16:01 -06:00
Velcroboy
f7cc9660b6 Remove non-salvage testing map from pool (#555)
* Remove non-salvage testing map from pool

* Revert "Remove non-salvage testing map from pool"

This reverts commit 2e1c7ce84f86a2c57810f0ca48cbcbf37e9f2b85.

* Remove non-salvage testing map from pool

---------

Co-authored-by: Jeff <>
2023-12-13 14:14:25 -06:00
Velcroboy
0d434cd8f5 Open roundstart corpsman on The Hive (#524)
Co-authored-by: Jeff <>
2023-12-06 16:38:06 +00:00
Bakke
003f262562 Bring back the prisoner role (#511)
* Revert "Removes Prisoner selection from maps (#262)"

This reverts commit d73f485fa2.

* Fix alwaysUseSpawner, add DesiredSpawnPointType

Prisoners are now forced to spawn in the prison again.

* Updated map prototypes for prisoner

Yaaay, we love confinement!

* Update asterisk.yml

Add a drain to the cell area :trollface:

---------

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-12-06 16:54:36 +01:00
Velcroboy
7d1c965a59 Map Edits (#483)
Co-authored-by: Jeff <>
2023-11-27 16:48:22 -06:00
Velcroboy
2c1fef7abc Salvage Map Rebase (#453)
* Salvage Map Rebase

* Fix file path

---------

Co-authored-by: Jeff <>
2023-11-22 10:13:12 -06:00
Colin-Tel
19af5445c0 Update Asterisk & map protos (#459)
asterisk qol changes, made asterisk and shoukou 60 player maps
2023-11-19 00:10:32 -06:00
Adrian16199
bf341228c3 Shoukou from Nyanotrasen. (#310)
* Shoukou from Nyanotrasen.

Adds Shoko to the rebase.

TO-DO: Ensure that everything is actualy in order in the uh... (reads paper) 79.... thousand lines of yml.
Make it work.

* Updating it to the "acceptable state"

Incase i need to go back if i frick it up.

* Updated the map a bit.

* Changed Shoko further.

* Final changes to departments.

* Final changes to Shoukou, ready to be reviewed.

* Whoops, Now its done~

* Changed the requested things.

* Gave logistics working telecoms.

* Update shoukou.yml

* .

* Added finer details.

* Adjusted alot.

Adjusted pipes in new department places.
Adjusted fire alarms.
Adjusted mistakes of mine.
Fixed the the ingame map.

* Added shutters to lawyers office for private talks.

* Updates

* Adjustments (check desc)

Adjusted cables in salvage's room so they are not under the damn wall while also chaging normal wall for reinforced one.
Added tiles under cargo's substation, LO's office, CE's office.
Got rid of tiny fan in salvage's airlock and atmo's TEG burn chamber.
Added airlocks to cargo.
Made more room in cargo's loading bay.
Expanded doors and added blast doors for cargo shuttle's entrance.
Exchanged some windows in LO's office to reinforced walls and added shutters.
Changed switche's location of detective's office shutters
Added MV cables in security so prisoners have actual power.
Fire alarm has been moved 2 tiles to right and reconnected in command's meeting room.
Moved some engineering hardsuits to the back
The atmos fax should have been named.... hopefully.
Did the obligatory tilewindows, tilewalls, fixrotations,fixgridatmos commands

* Adjustments part 2

Added light at the end of extension of shuttle.
Repaired conveyor belts in cargo.
Exchanged corpsman locker filled to corpsman filled with hardsuit.
Added tiny fan and reversed airlocks in cargo to actualy be able to dock.
Changed the entire area which used to be a side kitchen with eating area and flipping it. Added a window where now resides eating area that looks upon cargo's shuttle.
Changed food in command to be more consistent
Adjusted arrival docks to be more closer aka 5 tiles between eachother instead of 7 so that shuttle can dock properly incase the evac gets destroyed.

* Added mystagogue hardsuit locker.

A quick fix.

* Adjustments to adjustments.

Shady cigs instead of vendomat in the new eating area.
Removed a light on a window.
Added a glass firelock in the new side kitchen and linked it.
Readjusted docking in cargo for cargo's shuttle.
Changed location of the salvage shuttle CONSOLE to be nearby of the magnet.
Got rid of the conveyor belt since there really is no point for it to be there anymore, replaced the airtight with an another door and firelock that was linked.
Adjusted LV cable so it doesnt go thro a wall and reaches the autolathe and airlock doors that have been placed for cargo shuttle
Changed location of the magnet.
(God im tired and depressed, not specificly from this. Hope you are having a fantastic day whoever is reading this)

* Updated SMES's and Substations names.

Updated name of substations near service, in engineering, nearby of epistemics., in command, both security substations, Camera's one, medicals, logistics, upper solars.
Updated SMES's name in engineering of AME, in TEG, on both solars.
Removed 6 MV cables in security because they were causin 2 substations to be connected to eachother

* Anchored the station

Any bump will be meaningless as the station holds still as the big station it is.

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-14 19:00:27 -06:00
Alzore
8b7c15337a Security Chunk Salvage (#21403)
* Security Chunk

* More fish, less bullets.
2023-11-12 20:32:19 +01:00
Velcroboy
ef89695780 Hive five (#435)
* The Hive Rebase

* Remove un-merged maps from files

---------

Co-authored-by: Jeff <>
2023-11-11 10:37:11 -06:00
Velcroboy
9103743e8e Arena Rebase (#397)
* Arena Rebase

* Updates proto file

---------

Co-authored-by: Jeff <>
2023-11-07 13:31:54 -06:00
Colin-Tel
50278a97c4 Update asterisk.yml (#381)
* Update asterisk.yml

Added Prisoner spawns (no job in the prototype yet)
Added random food/drink spawners at kitchen/bar
Added intercoms to all departments and other areas of interest
removed one of the 4 radiators on the cool loop of the TEG

* Added atmos tech and other map changes

changed to Angle's parallax
changes to secondary evac and its nearby maints
added atmos tech slot and their drobe
minor fixes
2023-11-02 15:38:50 -05:00
Colin-Tel
3d1648f6c0 Asterisk hotfix (#378)
* Updated Asterisk

Made atmos waste pipe more obvious
added a couple drink vending machines
fixed gravity access
fixed missing link on the artifact pad
removed interrogator lamp

* Update asterisk.yml

I hate wallmount nanomeds

* Update asterisk.yml

Security changes
2023-11-02 00:45:09 +00:00
Colin-Tel
19dd012857 Adds Asterisk Station (#374)
* Adds Asterisk Station

The map renderer is a bitch ass motherfucker.

* Update default.yml

added Asterisk to pool, and alphabetized the list.

* Update PostMapInitTest.cs

forgot I had to do this shit

* Update asterisk.yml

I forgot the cool role

* Update asterisk.yml

Added station maps

* Update asterisk.yml

Added JobSpawns for salvage and made some other adjustments

* Update asterisk.yml

Changes made after Velcro's review
2023-11-01 11:32:48 -05:00
Carolyn3114
b74a8769d8 pebble fixes 2.0 (#294)
* Update pebble.yml

* Update pebble.yml

* Update pebble.yml

* Update pebble.yml

* Update pebble.yml

* pebble

---------

Signed-off-by: Carolyn3114 <136143032+Carolyn3114@users.noreply.github.com>
2023-10-26 09:51:27 -05:00
Velcroboy
49c711b869 Fixes Tortuga evac being unpowered AND ADDS ARENA STATION! (#311)
* Fixes Tortuga evac being unpowered

* Adds Arena Station

---------

Co-authored-by: Jeff <>
2023-10-25 20:16:52 +00:00
Velcroboy
06458944c8 Wd 1984 (#307)
* Removes WD maps

* Sneaky bugggers

* swap pebble in for bagel map test

---------

Co-authored-by: Jeff <>
2023-10-25 18:07:25 +02:00
Colin-Tel
d73f485fa2 Removes Prisoner selection from maps (#262)
And comments out the requirement for playtime from warden.
2023-10-23 23:12:40 +00:00
Colin-Tel
c992863685 Update Edge (#212)
* Update Edge

* Update edge.yml
2023-10-23 00:08:58 +00:00
Velcroboy
9e281cb5f8 Adds Tortuga Station (#214)
* Adds Tortuga Station

* Add evac shuttle

* Update proto file :)

* ...

* remove med borg

* NTES Seal light/airlock fix

* Add chem spawn

---------

Co-authored-by: Jeff <>
2023-10-22 01:24:03 +02:00
Fluffiest Floofers
6e9a672a23 Removes borgmedical spawn role (#204)
* Removes borgmedical spawn role

* null

* delete
2023-10-20 15:12:46 -05:00
Carolyn3114
db7842a570 Pebble Rebased (#124)
* Pebble rebased

* Update PostMapInitTest.cs

* Update PostMapInitTest.cs

* Update PostMapInitTest.cs

Signed-off-by: Carolyn3114 <136143032+Carolyn3114@users.noreply.github.com>

* Update pebble.yml

* Update pebble.yml

* add salv shuttle console

* Update pebble.yml

* Update pebble.yml

* Update pebble.yml

* Update pebble.yml

* map pool

* Update pebble.yml

* Update pebble.yml

* Update edge.yml

Made Pebble the small-pop map

---------

Signed-off-by: Carolyn3114 <136143032+Carolyn3114@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-10-12 15:48:30 +00:00
Colin-Tel
f940115a35 Update barratry.yml 2023-10-09 16:19:23 -05:00
TsjipTsjip
cd10208ba7 Kettle update (#20808)
* Kettle map upload

* Kettle map proto upload
2023-10-08 19:58:57 +02:00
TsjipTsjip
13e0b86601 Barratry seniors (#20720)
* Update barratry proto to accomodate senior roles

* Add senior role spawnpoints to barratry
2023-10-08 19:58:48 +02:00
Colin-Tel
8ff4853877 Adds Edge (#121)
* Adds Edge

Also modifies the map pool file.

* Added Salvage arm

also corrected job prototypes in the map yaml.

* I accidentally the atmos

:trollface:

* adjusts test

also obligatory post-"I'm done mapping" map edits

* Update PostMapInitTest.cs

mfw I missed a comma 😱

* Update edge.yml

Say it with me: "It's never done"

* Update edge.yml

added roboisseur
2023-10-07 05:12:57 +00:00
Fluffiest Floofers
d4d2c7a8ec Removes Senior Roles (#25)
* comment out seniors

This commit name sounds extremely wrong.

* Senior role can be late join

* comment out seniors in maps proto

* Update comments

* Europa lost its seniors

---------

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-09-28 16:55:32 +00:00
Moony
195b091bef Derotate Core pending improvement. (#20262)
Lot of long-standing problems with the map at this time. Derotating until resolved.
2023-09-27 21:59:12 +02:00
Ubaser
9ecef1b313 Add map "Europa" (#19930)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-27 21:59:12 +02:00
lzk
85de6ffcf4 Sort jobs in map prototypes (#19910)
* Update aspid.yml

* Update barratry.yml

* Update cluster.yml

* Update kettle.yml

* Update saltern.yml

* Update origin.yml
2023-09-08 13:43:19 -06:00