Commit Graph

2269 Commits

Author SHA1 Message Date
Spessmann
bf20b6bb6e Convex update (#35086)
convex update #5
2025-02-11 14:44:18 -07:00
Nox
4b58d7a09f Fland Armory Restock (#35044)
* Upped cyborgs from 2 to 5, updated armory stock, did some button QOL, gave warden a enforcer.

* Fixed a few more buttons
2025-02-10 13:45:42 -07:00
ToxicSonicFan04
dc1edbe3b5 Amber Armory Restock (#35045) 2025-02-10 13:45:32 -07:00
Deerstop
2e2a3a9cb1 Elkridge Tweaks 2 (#34757)
* bigger TEG, moved EVA, moved engi and med substations, maints loot, increased pop to 15-45

* tweaked some job numbers around for higher pop

* holy shit i forgot the o2 and n2 miners

* fixed unwired substation

* made the TEG worse >:)

* added southbridge's pride-o-mat cos i kept forgetting

* fixed evac timer display, resolves #34850

* removed pridevend for testing

* nvm it was the shuttle, not the pridevend, oops
2025-02-09 18:07:10 -07:00
Spessmann
eeb689261b Convex update (#35023)
convex update
2025-02-09 18:06:32 -07:00
ArtisticRoomba
e1aff4dd98 Rebalance Relic station power + misc fixes (#35022)
Rebalance Relic station power
2025-02-09 17:51:29 -07:00
compilatron
21b3f23938 Plasma fixes 3 (#35021)
Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
2025-02-09 17:47:21 -07:00
ArtisticRoomba
27e54832d9 Misc Loop improvements (#34997)
* misc loop improvements

* fixgridatmos

* god help me
2025-02-09 16:41:13 -07:00
Vortebo
3ab1db99c1 Relic station (#34988)
* General structure mostly complete.

* I thiiiiiink I am done with air alarms. And pipes. Maybe.

* Decals, shuttle, rust.

* Small fixes.

* Shuttle more or less where I want it.

* Security is prettier, spawns are more fun.

* Shuttle done. Almost done with one checklist.

* Map renders now.

* Checklists done.

* Adjusted min player count.

* Should pass the Build & Test Debug check now.
2025-02-09 16:24:13 -07:00
Spessmann
afede7d4d0 Removes Cog station (#34996)
freedom!!!
2025-02-09 14:01:31 -07:00
TytosB
b4b4db73d1 Loop station i added a paper tray and brb sign to hop and tinyfans to the freezer (#34872)
* small fixes

* eee

* let me get uhhh
2025-02-09 01:24:18 -07:00
ArtisticRoomba
a8c32aba88 Misc Cog Station fixes (#34993)
* misc cog fixes

* added air alarm stuff to botany gearroom

* fix unlinked atmos devices in botany

* fortify botany against le meteors at emisse request
2025-02-09 01:00:14 -07:00
ArtisticRoomba
a7690843dc Add screens to oasis evac shuttle (#34995)
add screens to oasis evac
2025-02-09 00:44:53 -07:00
ArtisticRoomba
a5c76324e2 Misc Marathon fixes (#34990)
misc marathon fixes
2025-02-09 00:26:16 -07:00
ArtisticRoomba
4a479d7bb0 Misc Bagel station fixes (#34989)
* fix meta

* fix that one door in ready room that had the wrong access
2025-02-09 00:24:54 -07:00
Nox
9ed7fab2d3 Bagel Armory Restock (V2) (#34917)
* Updated armory fills, fixed a few connection errors, and removed the original sin

* Added a box of .35 magazines, corrected the starting state of the switches
2025-02-08 15:42:01 -07:00
Nox
3d34b8e752 Meta tweaks (#34957)
* Added back warden's enforcer, added spare mk58 magazines to blue armory.

* Various QOL.
2025-02-08 15:37:30 -07:00
ScarKy0
f6c0e6d3d2 Wizard shuttle preperation (#34932)
FIREBALL MOTHERF-
2025-02-08 16:37:46 +01:00
compilatron
d7d77ff3d4 Plasma fixes 2 (#34962)
Update plasma.yml

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
2025-02-07 17:31:37 -07:00
Spessmann
14d96e0716 Convex fixes (#34934)
fixed
2025-02-06 18:31:06 -07:00
Emisse
4cc5b5bec1 bagel fix hos locker (#34919)
bagel update
2025-02-06 01:38:08 -07:00
Spessmann
26d9f222c4 Adds randomized maintenance rooms to convex station (#34866)
added maints
2025-02-04 15:58:30 -07:00
ToxicSonicFan04
8482767109 Omega Armory Restock (#34810) 2025-02-04 15:57:47 -07:00
Dinner
d9d451d3d8 Fix Oasis evac timer (#34849)
fix oasis evac timer
2025-02-04 15:57:13 -07:00
compilatron
26cff2c980 Plasma evac shuttle timer fix (#34847)
Update emergency_plasma.yml

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
2025-02-04 15:56:57 -07:00
ToxicSonicFan04
763136f09e Armory Packed update. (#34808) 2025-02-01 14:19:28 -07:00
Spessmann
6beb8e4d35 Randomized maints rooms (#33619)
* became real

* should fix it

* added moar
2025-02-01 17:52:32 +01:00
ToxicSonicFan04
59e53dc025 Box Chemistry change (#34803) 2025-01-31 23:35:36 -07:00
Nox
9e9c9b94eb Marathon Armory Restock (#34798)
* Initial commit

* fixed a issue

* finished
2025-01-31 23:32:41 -07:00
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