Commit Graph

351 Commits

Author SHA1 Message Date
Velcroboy fdbbe8186f
Map Edits: Arena/Hive (#1645)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-08-23 16:28:38 +00:00
deltanedas abec67b797 remove deltav comments now 2024-08-21 17:20:37 +01:00
deltanedas 6a52fec684 nuke salvage_modified.yml 2024-08-21 16:46:54 +01:00
Nemanja 8ae072e4ae anonymize salvage wrecks (#31087)
* anonymize salvage wrecks

* display wreck size
2024-08-21 15:27:03 +01:00
Colin-Tel ea30eb9ccc
Map updates (#1604)
* Map updates

directional fans, N2 closets, etc

* Update asterisk.yml

prisoner-no-more
2024-08-14 22:20:29 +00:00
IProduceWidgets 396e0ed171 Nukie Outpost is no longer a station map (#30090)
* I dunno, break shit I guess.

* Actually fix some shit for once.

* test flakey or me flakey?

* Test were not flakey, they just didnt make any sense anymore.

* more stationy tests

* undo abuncha shit I can set in yml instead

* forgor an assert

* unneeded usings

* 1984

* I made github angy

* yoink

* the end is never the end is never the end is never the end is never the end is never the end is never the

* Im going to commit sudoku
2024-08-09 17:53:06 +01:00
Colin-Tel 10c6c9ce9d
Set Shoukou's minimum population to 5 (#1562)
Update shoukou.yml
2024-07-30 17:19:08 +00:00
Colin-Tel 5ad3e029f0
Adds Chibi Station (#1495)
* Adds Chibi Station

* Made changes based on feedback

also added slot for CE

* botany changes

* Added traitor objective items

also bolted open the front of engineering, and dirtied up Salvage some more.

* Added evac

* :trollface:

* Added Autodrobe

* Update chibi.yml

moves a wall over and makes a maintenance shaft a little bigger

* Update chibi.yml

galoshes, brig timer, atmos airlock stuff, logistics door remote, the spare ID cabinet unlock thing in the vault, vault being doublethick on the exterior, medibot/cleanbot spawns, uhhh yeah

* Update chibi.yml

intercoms

* added the oracle

* Update chibi.yml

added screens and soap, fixrotations, tilewindows, variantized

* Update chibi.yml

fugitive spawn points, circuit imprinter, added the shitter to the prison cell

* invalids

:trollface:

* Added the paper

* Update chibi.yml

linked disposals conveyor/recycler to lever, added animal spawners, moved/added some beacons

* Update chibi.yml

Named SMESs, added library beacon

* Update chibi.yml

added more posters

* Update chibi.yml

Post-Velcro review changes; EVA suit in epi, replaced arrivals screens, unlinked air sensor in cargo, removed nuke disk from jail /j
2024-07-30 16:06:49 +00:00
Velcroboy 09666ca8a1
Map Edits: All Access Edition (#1557)
* Map Edits: All Access Edition

* remove duplicate canister

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-07-30 18:02:59 +02:00
therealDLondon 7b4b3130b7
Edge Rebuild Phases 2 and 3 (#1439)
* Update Map File

* Updates YML

* post test fixes

* update YML

* makes requested map changes

* update YML

* DAMN YOU
2024-07-27 10:09:36 -05:00
Colin-Tel 215bf5de6c
Update Asterisk & Micro (#1484)
* Asterisk & Micro changes

* Update micro.yml

This thing has been a locator for this long??

* Upped min player count to 5
2024-07-22 11:32:49 -05:00
deltanedas 98b13d0f56
make glacier use vertex evac (#1510)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-19 19:32:00 +00:00
deltanedas da8b3c4cfc
add glacier to default pool (#1503)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-18 14:17:17 +00:00
deltanedas 8588bb0e0d
glacier real (#1169)
* glacier real

* troll

* atmosia tweaks

* 1 less can of plasma not too op

* replace troll generator with solar crate

* add StationSurface to glacier

* add surface map

* biome stuff upstream #28017

* unpause after loading

* fix no terrain

* comment out the surface spawning

* shipyard

* glacier justiceroid

* updateprototype and cleanup

* fix random shit

* untroll

* courier

* add to test :trollface:

* fix

* futureproofing

* hot loop inlet lmao

* tweak some pumps in atmosia

* carpy and make salv locker lighting better

* Edit lights, move salv dock, add justice maints, edit entity names for casing consistency, other minor edits

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-07-17 11:39:09 -05:00
Velcroboy 1d2c4a44b5
Add evac shuttle: NTES Fishbowl (#1417)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-06-20 12:32:27 -05:00
deltanedas b7b41b38bb
Centcomm justice update (#1352)
* centcom legal update

* centcom beacons maps vendis update

* put centcomm in DeltaV folder

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-19 16:48:59 +02:00
therealDLondon 460b4217e9
Edge Station Rebuild: Phase 1 (#1330)
* Update map

* Fixgridatmos

* Adjust job slots

* Update spawns

* Corpsman slot

* Removes invalid configs

* trolled by a capital M

* Trolled by the detective

* Trolled by configuators again

* Adds clerks things

* troll prevention

* Cloning 1984

* troll prevention yet again
2024-06-19 00:02:56 -05:00
Velcroboy a20cf5a861
Map Edits: Hive Justice (#1409)
* Map Edits: Hive Justice

* secpoint shutters and reagents

* Spawns and Renault

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-06-18 07:58:42 +00:00
Null 21cd750ff4
Merge pull request #1331 from NullWanderer/2024/06/06-upstream-merge
Upstream merge
2024-06-11 17:12:03 +02:00
therealDLondon 091550f9d2
Pebble Update (#1342)
* Changes Map

* Update YML

* trolled by a space

* Trolled by spawns

* Troll prevention

* Map changes

* Update YML
2024-06-10 21:22:45 -05:00
deltanedas b1ad9858a4
lighthouse justice dept (#1322)
* lighthouse justice dept

* fixy

* update prototype

* changes

* 1 of them somehow got locked real

* justice hallway, id computer, yml cleanup

* add cj to the round table

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-10 20:33:35 -05:00
Adeinitas a5648c598c
Brings Justice to Shoukou (#1321)
* Brings Justice to Shoukou Station

* adds a space in the map prototype yml

* Adei leaves a spot between "Chief" and "Justice" like a fucking dingus

* Map Error Fixes

reroutes pipes by the robo lab, adds maint door by reporter's office so it's still accessible, 1984s heads spawning in their rooms. adds scrubber in the vault so ratcliff the mouse doesn't choke on their own breath and die. adds tiny fans on the command dock, labels clerk fax and allows clerk to breathe air. takes away the warden's cannabis butter and replaces it with a sec encryption server.
2024-06-08 14:39:20 -05:00
null 5ab73ea298
Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/06/06-upstream-merge
# Conflicts:
#	Resources/Prototypes/Maps/submarine.yml
2024-06-08 21:03:00 +02:00
Leon Friedrich e0ea8adb9a
Add Job preference tests (#28625)
* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a
2024-06-08 20:19:39 +02:00
Velcroboy 48cd95083f
Map Edits: Justice Dept. (#1312)
* Map Edits: Justice Dept

* Fix invalids

* Update with beacons/e-keys

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: null <56081759+NullWanderer@users.noreply.github.com>
2024-06-08 13:41:48 +02:00
therealDLondon cdec0aa1c1
Bring justice to Pebble (#1309)
* Change the map!

* Adds da roles!!

* Fix invalid entries

* Trolled by pipes

* trolled by configurators

* Fix invalid configurators

---------

Co-authored-by: null <56081759+NullWanderer@users.noreply.github.com>
2024-06-07 16:20:44 -05:00
therealDLondon 5ffb46bc44
Brings Justice to Edge (#1318)
* Update Edge Station Map

* Adjust YAML

* Fixes an oopsie

* Fix a couple map fuckups

* Fix invalids

* Trolled by lights

* Trolled by configurators

* Invalid configurator troll

---------

Co-authored-by: null <56081759+NullWanderer@users.noreply.github.com>
2024-06-07 16:19:24 -05:00
Colin-Tel d25726b858
Micro with justice (#1310)
* Micro w/ Justice

* Update micro.yml

added gavel block, really, that's it.
2024-06-07 12:46:43 -05:00
Colin-Tel 3a891bf4e6
Justice asterisk (#1315)
* Brought law to Asterisk

so to speak

* Update asterisk.yml

Added trial timer and gavel block, moved the judge equipment over to a closet
2024-06-07 12:45:48 -05:00
rosieposie 71733f3705
Subpatch 1984 (#1307)
* derotate sub

* Update PostMapInitTest.cs

* Delete submarine.yml
2024-06-07 16:37:29 +02:00
Colin-Tel 60ead04654
Colin map updates (#1299)
* Colin map updates

Minor quality checking of all maps.

* adjusted some population min/maxes
2024-06-04 00:55:57 -05:00
Colin-Tel 646aa4820b
Quick Micro changes (#1280)
* Quick Micro changes

Upped max pop to 45
Added decals around cryo, added tiny fans for evac, gave mime a microphone (lol)

* Linked medical exit button

it just works

* oops lol
2024-06-02 01:50:05 -05:00
Colin-Tel 1f6d6e41f6
Update micro.yml (#1274)
* Update micro.yml

Added southeast solar array, making it easier to obtain power, it's even got another hardsuit!

* Update micro.yml

added empty light outside the new solars, also gave engie front desk some spare light tubes

* Update micro.yml

made evac default, as it fits the station better and is more likely to dock at the alternate evac location

* Update micro.yml

new arrivals (not arrivals)

* Update micro.yml

added hydro public table

* Update micro.yml

more hydro changes

* Add chef, other map updates

adds one chef role just because
double-checked firelocks in medbay
added little table in maints by epi
2024-05-31 18:15:41 -05:00
Colin-Tel f72da319a0
Micro station (#1251)
* Adds Micro

* Update micro.yml

Added parallax, warp points, and several minor changes.

* Update micro.yml

Added intercoms, folders, a fax, and other stuff

* Update micro.yml

Added notes, defib cabinets, a little lighting, uh yeah I think it's ready.

* Update micro.yml

named all faxes & added one to epi, changed an air can to CO2, gave atmos a Plasma can, added emergency lights, added perma cryosleep, added DOG beds for CATs

* Update micro.yml

added detdrobe and repdrobe

* Update micro.yml

medbay curtains!!1

* Update micro.yml

invalid configurators removal

* Thanks Velcro!

lighting changes, added sec and med camera routers and telecoms.

* the classic last minute change

service telecoms and camera router
2024-05-28 23:10:40 -05:00
Colin-Tel 03f9f668e9
Merge branch 'master' into 2024/04/21-loadouts
Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2024-05-14 09:56:07 -05:00
Colin-Tel 9bbf4cf89a
Updated Asterisk (#1193)
* Updated Asterisk

* additional changes
2024-05-14 14:45:39 +00:00
Azzy 7c4d38b804
Merge branch 'master' into 2024/04/21-loadouts 2024-05-06 14:08:45 -05:00
Colin-Tel ac38b4a6e3
Edge Station - Returned box evac & small changes (#1136)
* Returned box evac & small changes

Small adjustments made to the map, in addition to resolving issue with improperly docking evac shuttle.

* Removed prior box shuttle

* Added criminal records computer
2024-04-25 11:27:41 -05:00
NullWanderer 990a3f54d1
Adjust map prototypes for courier change
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
2024-04-22 22:16:11 +02:00
deltanedas 3fcc86601f
lighthouse proto update (#1103)
* increase lighthouse pop

* pro ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-21 15:18:29 -05:00
Velcroboy 817c365be1
Map Edits (#1106)
* Map Edits

* Adjust prefixes

* Fix invalids and reagent nulls

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-19 03:36:06 +00:00
rosieposie 1df11f210c
Submarine Patch 11 (#1075)
initial commit

- removed unsuls
- fixed maints access at bridge entrance
- added instruments to perma, books, altered visitation window
- removed secglasses from ward & hos office since theyre roundstart anyway
- removed the random spawn pill canisters because they can have ambuzol -_-
- connected toilets in perma to disposals
- perma windows made only reinforced glass since the damage from electrocution is changed
- gave sec some labellers for evidence lockers; evidence lockers added just outside brig
- door'd the entrance to sec so it was less wildly open every time the power went out; doors are now all lawyers also in the hall; gave them a generator
- adjusted role numbers slightly (less interns, more even dept counts)
2024-04-11 21:14:54 -05:00
deltanedas 520fab78b9
lighthouse mini fix (#1066)
* lighthouse mini fix

* trolled

* more fixy

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-08 22:54:52 -05:00
deltanedas 52bfd9143d
lighthouse fixes (#1063)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-07 14:53:01 -05:00
deltanedas 37c0bc8795
port lighthouse real (#883)
* port lighthouse and dosome work

* fix evil things

* add to pool and test

* most of the logi rework, replace viro with some cryo beds

* more reworks

* fixes

* updatey

* more fix

* techie spawn and more suit storage

* actually add the techie spawns

* name every door

* gaming

* mostly fix/add cameras

* warp point gaming

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-06 18:38:40 -05:00
Velcroboy a14b7c5e23
Add Submarine to map pool :) (#984)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-20 22:49:58 +00:00
rosieposie bc19445e42
Submarine Patches 2/10 (#809)
* various retooling

- moved bar & arcade to food court
- retooled west wing of hospital
- fixed atmos markers in gas area
- fixed some misc emergency lights, lowered overall emergency light amount in maints
- removed barbershop, laundry made smaller and slid over a bit
- epi gets their maints back for real
- SIX SMES's. power problems better be fixed or im eating my hat
- removed any labyrinth loot of value pending a full labyrinth redo out of scope for this patch
- WIP supply room for the big hole left by the old bar & arcade/cafe area

* minor touchups

* Update submarine.yml

- added a park substation
- minor tweaks & cleanup

* remove unnecessary extra SMESs

* fix erroneous tiles

* fixgridatmos & variantize

* Update submarine.yml

- added a central hospital substation
- retooled the sec & engi outposts
- labyrinth REMOVED.
- made the robotics room """bigger"""

* sorry prototypes file

* Update submarine.yml

- bingus room
- ai containment room
- minor tweaks & cleanup

* minor fixes again

* cave time

* further refinement of cave area

* old xenobio lab

* decal'd up

* 1 more light

* glass airlocks in xenolab

* ICU door & cave prison

* Update submarine.yml

- added some railings / line stuff
- borg chargers at logi lobby
- fixed some tiles
- retooled ICU a little

* signage babeyyyyy

* Update submarine.yml

removed laika, added SOME stalagmites but not all

* Update submarine.yml

stalagmites, sec main area rejiggering, detailing

* button fixes

- made all buttons directional
- named janitor service light buttons
- added some missing jani lights

* stuff

- moved brigmedics room into sec
- moved detective out of sec
- prettified more substations
- added martial artist, tweaked some crew numbers

* custom escape pod

* custom evac shuttle - NTES Propeller

* fix some wiring on evac shuttle

* rotate some items & telecomms added

also intercomms

* more room at arrivals in case evac shuttle flips

* swap to metem machines

* strengthen armory

* armory touch-ups

* a treat for the warden

* fix stinky decals

* added laser box

and fixed armory more and also apparently never added the metem machine ??????? i swear i did this, must have not saved it

* add secondary sec entrance

also added some posters

* swap armory & wardens room

* armory touchups

* Update submarine.yml

- added blast doors to holding cells
- fixed corpsman door
- added some more cameras
- stuck some secret doors around
- added ninja bombing targets
- minor touchups

* fix some connections

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* sec checkpoint 2

* minor fixes + panopticon

* fix power near arrivals

* missed two wires fuck

* Update submarine.yml

* atmos maint changes

* more external access points

* camera monitor fixes

* fix area around camera router a bit

power, etc

* fix test failure

PROTIP: dont throw darts

* inconsistent windows at bars

* Update submarine.yml

* Update submarine.yml

* retool cargo dock significantly

* single tile that was gonna annoy me

* forgot lights oops

* Update submarine.yml

* improved ICU way more

* Update submarine.yml

- contraband crate
- minor ICU touchups

* minor fixes

* cloning room tweaks

* decal'd up the bar
2024-03-19 18:50:02 -05:00
Velcroboy 1f6cb805d6
Change map prefix to DV (#979)
Co-authored-by: Velcroboy
2024-03-19 02:19:47 +00:00
Alzore 55483dca32
Vegan Meatball (#24650)
* veganmeatball

* testedthis

* moreplant

(cherry picked from commit 5f61380209146a83be27270372c4c54d62b007b2)
2024-03-17 14:41:35 +01:00
UnicornOnLSD f53daf1acb
pebble hotfix two, eletric boogaloo (#943)
* fix warp points, bombing sites, added mcgriff, paramed job.

* fix solution smh

* added screens and service lights, cargo docks less narrow
2024-03-13 17:27:44 -05:00