Commit Graph

313 Commits

Author SHA1 Message Date
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
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
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