Commit Graph

306 Commits

Author SHA1 Message Date
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
Velcroboy f831b475f4
Remove Hive maxpop (#938)
Co-authored-by: Velcroboy <>
2024-03-07 21:03:16 -06:00
Rainfey b9d2f5a409
Refactor antag rule code (#23445)
* Initial Pass, Rev, Thief

* Zombie initial pass

* Rebase, Traitor

* Nukeops, More overloads

* Revert RevolutionaryRuleComponent

* Use TryRoundStartAttempt, Rewrite nukie spawning

* Comments, Add task scheduler to GameRuleSystem

* Zombie initial testing done

* Sort methods, rework GameRuleTask

* Add CCVar, Initial testing continues

* Might as well get rid of the obsolete logging

* Oops, i dont know how to log apparently

* Suggested formatting fixes

* Suggested changes

* Fix merge issues

* Minor optimisation

* Allowed thief to choose other antags

* Review changes

* Spawn items on floor first, then inserting

* minor tweaks

* Shift as much as possible to ProtoId<>

* Remove unneeded

* Add exclusive antag attribute

* Fix merge issues

* Minor formatting fix

* Convert to struct

* Cleanup

* Review cleanup (need to test a lot)

* Some fixes, (mostly) tested

* oop

* Pass tests (for real)

---------

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>

(cherry picked from commit 4e6c59cfe51211064d79a727cc2d37c2a2f55a2c)
2024-03-07 01:06:59 +01:00
UnicornOnLSD b06e894014
Pebble minor update (#922)
* catch up to recent additions (+ psych office, better med, EPI cams, cryo)

* Fixed more cams, named APCs, colored distro and waste

* named ALL apcs after testing

* more cams fix, betterer cryosleepTM
2024-03-04 12:09:55 -06:00
Adrian16199 a8701ca682
Expands Shoukou's medical (#898)
* Expands Shoukou's medical

Everything from the right of medical,
From the right of medical up to the bridge needs to be checked because I moved ALL OF IT.

* Update shoukou.yml

* Update shoukou.yml
2024-02-28 09:26:55 -06:00
Debug a0511fcfc0
Merge pull request #878 from DebugOk/25394
Early merge
2024-02-21 04:28:15 +01:00
Ed c2995bb848
Train station (#24927)
* some content

* some next content

* fixes

* remove stained window

* return bot message?

* woah! Full map added!

* map update

* big update

* camera server

* Corvax playtest feedback

* add mail system and 30$ meteor shield

* update

* updatik

* hardwork

* pipip

* update

* remove from mappool

* fixes

* sentipode

* e

(cherry picked from commit f64a32990a27cec5bd958180eb833b9efffeb565)
2024-02-21 04:06:36 +01:00
rosieposie fd9a5d04cc
Temporarily De-list Sub (#877)
de-list
2024-02-20 19:15:08 -06:00
Debug 330e0e37d9
*Properly* fix salvage strings (#840)
Me when the maps
2024-02-17 01:48:04 +01:00
Velcroboy 6aada9251d
Move/update new salvage map (#798)
Co-authored-by: Velcroboy <>
2024-02-08 21:06:38 +00:00
Velcroboy 86883b4ad5
Map Edits: Submarine (#797)
Co-authored-by: Velcroboy <>
2024-02-08 19:21:16 +00:00
Velcroboy d13687490e
Replace NTES_Box with NTES_Delta (#794)
Co-authored-by: Velcroboy <>
2024-02-08 17:50:25 +00:00
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 2e1c7ce84f.

* 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