Commit Graph

2240 Commits

Author SHA1 Message Date
Nox
ef238200f5 Box Armory Restock (#34750)
* initial commit

* Initial commit

* fixed some things

* Finished changes
2025-01-31 00:23:03 -07:00
Nox
aa71ace43f Meta Station - Armory restock + fixes (#34717)
* Initial commit

* Updated

* Finished changes

* made the minefield signs outside sec much more visible to stop your skill issue.
2025-01-31 00:22:52 -07:00
TytosB
036bf9e857 Loop station minor tweaks (#34758)
* small fixes

* eee
2025-01-30 00:12:30 -07:00
Spessmann
a07df05858 New Highpop map: Convex recreational complex (#33346)
* start ig

* command work +AI

* finished bridge, added signs to departments

* engi partly done

* finish engi + atmos except for cams

* added med yippie

* carGODO

* nerd department finished

* se(x)c finish

* courtroom + service power

* man im tweaking out

* service propa done

* hallways

* added cams everywhere and named all the doors :pain:

* arrivals maints + exterior catwalk

* more maints

* voxob

* draft done

* holopadpilled + gaspipesensor based

* added convex name everywhere it needed to be

* nvm i guess we dont do oxford comma

* redid ALL THE HGOLOPADS FAAAAAAAAAAAAAAAAAAAAA

* Fix conflicts?

* ok let me try something

* this works right?

* atmos updated + jani lights

* uniform hallway tiles +roundstart TEG

* fixed some hidden atmos stuff

* Update map_attributions.txt

* :finnadie: no map review ...

* the fog is coming

* maints theater redone

* light dirt and the murder of most trims

* 💔

* decal based and tileoverlay pilled

* updated arrivals/library

* bungus

* yvgh

* 6 hours later...

* finished for real?
2025-01-29 19:44:45 -07:00
TytosB
9319e09984 reworking chem and adding psychology to loop (#34749)
* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

* aaa

* psychology real

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>
2025-01-29 15:07:46 -07:00
TytosB
bb99ff2f9d Buff savlage vault-medium-1's loot (#34732)
* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

* aaa

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>
2025-01-28 23:26:56 -07:00
TytosB
565ba4ad85 New salvage ruin: the ruined prison ship (#34651)
* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>
2025-01-28 22:14:39 -07:00
compilatron
67812cefad Removes radioactive suppermatter from Plasma Station (#34726)
Removes radioactive suppermatter

Literally 1984 can't have shit on SS14 e.t.c. e.t.c.

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
2025-01-28 19:21:02 -07:00
Orange-Winds
d1c98b0399 Oasis: add some emergency O2/N2 lockers (#34715)
Added O2, N2, and Fire lockers to Oasis station as per discussions in the issue thread

Co-authored-by: Orange-Winds <sebastian.pelka@hotmail.com>
2025-01-28 13:48:56 -07:00
Alfred Baumann
afb884b407 Add disposal units to marathon chapelroid (#34709)
add disposal units to marathon chapelroid
2025-01-28 13:44:57 -07:00
Emisse
6287cd86af bagel update (#34690)
* bagel update

* fixe

* move tesla gen
2025-01-27 22:00:57 -07:00
Emisse
7594ed5ae2 loop update (#34688)
loop loot gone
2025-01-27 20:30:14 -07:00
TytosB
3d3b95a1eb reworking the chunked telecomms salv ruin (#34529)
* aaa

* bbb

* ccc

* ddd

* switched to grid

* pain

---------

Co-authored-by: TytosB <duanlaintytos@yahoo.com>
2025-01-27 19:48:06 -07:00
Southbridge
c212273301 Amber Station Stuff (#34686)
* Removed salv upper docking airlock, gave south west solars some uranium glass.

* Routed HV wire through maints more, gave disposal blast doors a lever, added beacons and signs to escape pods
2025-01-27 17:54:48 -07:00
Alfred Baumann
69eccc4e92 Add more escape pods on Packed (#34628)
* add escape pods north and south of station

* move south escape pod a bit to the east
2025-01-27 16:03:40 -07:00
NakataRin
cab98717ed Omega: fix cryo pipe (#34663)
fixed the freezer pipe in cryo room
2025-01-27 16:02:45 -07:00
ArtisticRoomba
c1456e0508 add a chem dispenser to the nukie planet (#34674)
* add a chem dispenser to the nukie planet

* begone test fail
2025-01-27 00:10:22 -07:00
compilatron
8ba419320f Plasma station patch 1 (#34602)
* Plasma Station initial commit

* Map fixes 1

Expanded science's SMES array
Added advanced SMES
Redone stamped documents with custom stamps
Expanded atmospherics with more storage tanks
Added status displays
Add missing beacons to solars
Replaced the passive gates in science with valves
Removed protolathe in engineering
Added guitar to CE office
Replaced throngler plushie with weh cloak
Add a lattice tile outside the atmos burn chamber and storange tanks
Added atmos network monitor in bridge

* Add cargo and emergency shuttle

* Updated maps

* Add plasma to map testing list

* Map fixes 2

Reworked pipenets to not go under walls
Redid salvage and disposals
Reworked the bar to include a new bar extension facing the pool
Replaced arrivals cryo with an arcade
Replaced the toilets in the service plaza with cryo
Removed the cryo in dorms
Added more details to hallways
Redid tools room to include a front desk for the janitor closet
Reconnected sci to power roundstart
Removed some unideal spawns
Expanded the TEG airlock to be 2x3 instead of 1x3
Reduced the size of the SMES bank from 10 to 6
Disabled the plasma miners (downstreams or admins can re-enable them)
Replaced illegal maint items

* Fixes a 6 pack destroying the universe

Ok maybe cracking a cold one with the boys wasn't a great idea.

* Map fixes 3

* Quick research assistant fix

* Map fixes 4

* Map fixes 5

* webedit go brrrt

* Map fixes 6

* Map fixes 7

* Map fixes 8

* Fixes non-existent object

It's amazing this game runs at all

* Map fixes 9

* update pools

* Map fixes 10

* forgot to clear my multitool

I love mapping I love mapping I love mapping I love mapping I love mapping

* Tweaked player counts

* Update population caps

Removed population cap of 60 players to make plasma into a highpop map - it's that easy!

* Map fixes 11

* Map fixes 12

* Map fixes 13

* Map fixes 14

Now it's personal

* Map fixes 15

---------

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2025-01-27 00:07:44 -07:00
Southbridge
61cd1f6880 Box Station Changes (#34655)
* Various changes

* Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well

* Added reporter to prototype, and fixed dirt

* Resolved outstanding issues

* Fixed a floating camera

* Added cameras to TEG, and some minor changes
2025-01-26 23:30:36 -07:00
Southbridge
cc4f9dd4b0 Amber Station Changes (#34656)
* various changes

* Increased player limit

* slight modification

* Followed proper yaml formatting, increased lawyers
2025-01-26 23:30:25 -07:00
ArtisticRoomba
65fb71e53a Reroute Meta station power, engineering cosmetic changes, minor fixes (#34669)
* reroute meta power plus cosmetic fixes

* fix a lot of other things

* make changes from conflict
2025-01-26 23:30:12 -07:00
SlimSlam
e464736ae6 Fland Fix (#34670)
Update fland.yml
2025-01-26 23:29:45 -07:00
Deerstop
e1291d035f Elkridge Depot fixes and changes (#34539)
* fixed grav gen room, gave atmos room to branch off, replaced AME controller crate with AME controller

* added rust to maints, expanded atmos, expanded bar, expanded cap bedroom, fixed some tiles under doors, removed some gamer loot

* removed interrogator lamp and some more gamer loot

* fixed some more tiles under doors, replaced intercomall with intercomcommand in bridge and vault

* added clothing drobes to arrivals, added bin to HoP, more stuff i forgot

* i forgot to move the file from /bin to /resources...
2025-01-24 13:24:46 -07:00
Nox
5e7cc99555 Small fixes for Meta station (#34613)
* Fixed a few minor things, removed salvage's shuttle parts (sorry), added more equipment to armory.

* Added back salvage shuttle equipment, now in a crate

* Fix
2025-01-23 16:26:48 -07:00
Southbridge
9944076227 Box Station - Update (#34605)
* Various changes

* Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well

* Added reporter to prototype, and fixed dirt

* Resolved outstanding issues

* Fixed a floating camera
2025-01-23 02:12:22 -07:00
Errant
ee7f98a1a7 remove tropico from devmap (#34585) 2025-01-22 20:20:08 +01:00
Emisse
3499b47465 bagel update (#34572)
* bagel update

* Decal fault tolerance

* Also fix writes

* fix mv cable, decal issues, yar

* fix a floor tile and some other shit

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2025-01-21 22:48:41 -07:00
Southbridge
6361a121d5 Plasma Dirt Fix (#34534)
did the dirt thing
2025-01-20 03:10:51 -07:00
Leon Friedrich
ef50219455 Fix emergency_elkridge being saved as a map (#34496)
Save `emergency_elkridge` as a grid
2025-01-20 10:59:42 +11:00
TytosB
c917bcc2a9 Cog power setup fix (#34188)
* many changes

* contentingregrationtests

* serialized invalid removed

* blank

* "Changes and fixes as suggested"

* blank

* blank

* added desk bells

* engi rework rework rework

* added gate to content integration

* tweaks

* aaa

* bbb

* added holopads

* ccc

* Update default.yml

* hotfix

* aaa

* bbb

* many many tweaks and fixes

* aaa

* decals and maints

* aaa

* bbb

* ccc

* cog power setup was bad

* made it artsy

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2025-01-18 22:39:02 -07:00
War Pigeon
b471c1094d CentComm Map Updates (#34475)
* Bandage fix denied animations playing on devices without them

* CentComm blast door prototype

* CentComm button

* CentComm window shutters

* CC Updates

* Save as grid

* Remove an extra detective figurine

I like them better in the interrogation room

* Remove paramed locker, let pumps shut off

* Fix wrong HOP locker prototype
2025-01-18 22:32:33 -07:00
Minemoder5000
50bb5e0c13 Replace the djstation intercoms with freelance intercoms (#34478)
* Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys

* removed a new line
2025-01-17 14:01:06 +01:00
compilatron
d0b2e46c7c Plasma Station (#33991)
* Plasma Station initial commit

* Map fixes 1

Expanded science's SMES array
Added advanced SMES
Redone stamped documents with custom stamps
Expanded atmospherics with more storage tanks
Added status displays
Add missing beacons to solars
Replaced the passive gates in science with valves
Removed protolathe in engineering
Added guitar to CE office
Replaced throngler plushie with weh cloak
Add a lattice tile outside the atmos burn chamber and storange tanks
Added atmos network monitor in bridge

* Add cargo and emergency shuttle

* Updated maps

* Add plasma to map testing list

* Map fixes 2

Reworked pipenets to not go under walls
Redid salvage and disposals
Reworked the bar to include a new bar extension facing the pool
Replaced arrivals cryo with an arcade
Replaced the toilets in the service plaza with cryo
Removed the cryo in dorms
Added more details to hallways
Redid tools room to include a front desk for the janitor closet
Reconnected sci to power roundstart
Removed some unideal spawns
Expanded the TEG airlock to be 2x3 instead of 1x3
Reduced the size of the SMES bank from 10 to 6
Disabled the plasma miners (downstreams or admins can re-enable them)
Replaced illegal maint items

* Fixes a 6 pack destroying the universe

Ok maybe cracking a cold one with the boys wasn't a great idea.

* Map fixes 3

* Quick research assistant fix

* Map fixes 4

* Map fixes 5

* webedit go brrrt

* Map fixes 6

* Map fixes 7

* Map fixes 8

* Fixes non-existent object

It's amazing this game runs at all

* Map fixes 9

* update pools

* Map fixes 10

* forgot to clear my multitool

I love mapping I love mapping I love mapping I love mapping I love mapping

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2025-01-16 00:02:14 -07:00
SlimSlam
0c1608d2f0 Space Ruins Variant (#34445)
* Space Ruins Variant

* Updated File

* Added Goliaths/Removed some mobs
2025-01-15 23:14:40 -07:00
Deerstop
d0a2d7b232 Elkridge Depot Fixes Again (#34461)
fixes evac shuttle, fix north solars, fix vents and scrubbers
2025-01-15 21:48:54 -07:00
ScarKy0
33c421bd6b Merge Meta hotfix (#34306) into master (#34451) 2025-01-15 18:43:57 +01:00
Nox
d86bf0652a Meta hotfix (#34306)
* Fixed major issues with power, cargo shuttle docking, etc.

* remove serialized invalids

* Finished fixing the critical issues, ready for merge?

* Empty commit

* Added new break room to sci (they deserve it)

* Fixed up other minor issues

* if this map isnt PERFECT Emisse has permission to gib me and turn me into a cyborg

* added Roomba's changes

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-01-15 18:24:34 +01:00
ArtisticRoomba
8e7f440243 Oasis Power Rebalance + Misc fixes (#34425)
* balance oasis power as a stopgap

* change waste color to proper waste color
2025-01-14 00:59:15 -07:00
TytosB
9cf4cba346 loop station door access fixes and air sink (#34414)
small fixes
2025-01-13 00:17:08 -07:00
Southbridge
5fff6bb1d2 Amber Station - Moved Vents Around (#34410)
* Moved all vents around, made some small changes

* Finished work

* Removed insuls spawner since they're not merged yet
2025-01-12 17:49:44 -07:00
Booblesnoot42
606e452433 Add a high-capacity water tank to the janitor's closet of Oasis (#34366)
added high capacity water tank
2025-01-12 16:40:22 -07:00
SlimSlam
72ddc50142 Fland Reporters Room (#34408)
changed the command checkpoint to a reporters room.
2025-01-12 16:32:50 -07:00
Deerstop
d9e4ed2056 Elkridge Depot Improvements (#34377)
* updates decals

* more decal work, more dinginess in certain areas

* added decals under doors
2025-01-11 23:34:52 -07:00
Southbridge
dff9abfe74 Packed Station - Dirt Fix (#34351)
* packed

* Rerunning tests
2025-01-10 02:07:53 -07:00
Southbridge
1c2fcf0e26 Bagel Station - Dirt Fix (#34357)
Bagel
2025-01-10 01:35:26 -07:00
Southbridge
65655e7eff Box Station - Dirt Fix (#34356)
Box
2025-01-10 01:35:17 -07:00
Southbridge
915234a043 Cog Station - Dirt Fix (#34355)
Cog
2025-01-10 01:35:09 -07:00
Southbridge
ad59eea64e Marathon Station - Dirt Fix (#34354)
* Marathon

* Rerunning tests
2025-01-10 01:35:00 -07:00
Southbridge
4b1b4c0114 Omega Station - Dirt Fix (#34353)
omega
2025-01-10 01:34:53 -07:00
Southbridge
869ecb2923 Fland Station - Dirt Fix (#34352)
Fland
2025-01-10 01:34:43 -07:00