Commit Graph

1612 Commits

Author SHA1 Message Date
Velcroboy 82d700ffe8
Map Edits (#997)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-22 19:47:53 -05:00
rosieposie 5e32b2f6f6
Subpatch 3/20/24 (#987)
* fixed a bunch of issues

* fixes

* bar power

* remove ghost role slimes
2024-03-21 01:10:41 -05:00
rosieposie d78050be8a
Submarine Itty Bitty Baby Patch (#981)
* initial commit

* more fixes

* forgot a cable

* minor fixes

* Update submarine.yml

* fuck that one cable

* we're so back

* its so over

* more wires fix & clown pie
2024-03-20 00:07:35 -05: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
UnicornOnLSD 627e535e37
pebble minor patch 3² (#977)
fixed beacons, BS, cryo and moved east solars at tad
2024-03-18 13:35:38 -05:00
Debug e1c1a7e805
SlowContacts is SpeedModifierContacts 2024-03-17 18:00:27 +01:00
wafehling 17ca360528
Trading Outpost now has half buy-only and half sell-only pallets (#25955)
* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c0bbbc33c19eafcc8defaa7f1ec2df42e485b435)
2024-03-17 15:06:02 +01:00
Emisse 6a4763ef4c
infiltrator update (#25923)
(cherry picked from commit 463817056e9c57f70171f155de61d2b0f4cf861e)
2024-03-17 14:43:51 +01:00
Alzore 55483dca32
Vegan Meatball (#24650)
* veganmeatball

* testedthis

* moreplant

(cherry picked from commit 5f61380209146a83be27270372c4c54d62b007b2)
2024-03-17 14:41:35 +01:00
Velcroboy a719ee0a79
Map Edits: Arena (#964)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-03-14 14:09:09 -05: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
Colin-Tel fc1fb86973
Fix Edge Boxer room access (#960)
Fixes the Boxer room's access so that a boxer can actually enter it, also slight changes to the dojo.
2024-03-13 17:26:41 -05:00
Debug f2a4a9cfbe
Merge pull request #941 from DebugOk/2024/03/08-Trading-posts
Implmement trading post and finish shuttle refactor cherry-pick
2024-03-11 16:56:45 +01:00
VMSolidus dfd5e60367
Update DV-pirateradio.yml (#951) 2024-03-11 10:43:59 -05:00
Adrian16199 c2d30906be
Shoukou's security revamp. (#923)
* Update shoukou.yml

* Update shoukou.yml

* Update shoukou.yml

* Update shoukou.yml
2024-03-08 13:57:01 -06:00
metalgearsloth f102e8ff75
Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup

(cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082)
2024-03-08 12:54:53 +01:00
metalgearsloth 5c7b5ac280
Resave trading outpost (#24536)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit 6ae45378715b9f8fc843a28b762f8b785330f28d)
2024-03-08 12:54:51 +01:00
Ubaser 0f85467949
Update Trade Station (#24295)
add

(cherry picked from commit 00e770d4dc68f98ecc8a3ef1605277fc2c59fb8f)
2024-03-08 12:54:51 +01:00
Ubaser b3304295f6
Update Trading Outpost (#24281)
* add

* yes

(cherry picked from commit 83640863699720bce708af20ae0bc37ce2a9ff54)
2024-03-08 12:54:50 +01:00
metalgearsloth 8246734283
Run fixgridatmos on trading outpost (#24264)
(cherry picked from commit 129892f1442fa0873b907aaf822a9a6d617d2ecf)
2024-03-08 12:54:50 +01:00
metalgearsloth fa61952f51
Add trade stations (#23863) 2024-03-08 09:52:50 +01:00
Danger Revolution! 2a195a6eda
Listening Post 2.0 (#639)
* updates map, lowers server volume

* Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml

* Update DV-pirateradio.yml

* changes fax machine to *not* alert admins; and start with emagged by default instead of using VV

* Revert "changes fax machine to *not* alert admins; and start with emagged by default instead of using VV"

This reverts commit 05bb5f402d.

* Revert "Update DV-pirateradio.yml"

This reverts commit e77fb34e86.

* Revert "Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml"

This reverts commit 2000e2c147.

* Revert "updates map, lowers server volume"

This reverts commit d99cab6f36.

* adds new syndicate fax, maps it in as well as other QOL changes

* adds cybersun pen to Syndicate PDA's

* Update DV-pirateradio.yml

* adds blacklist to CC Fax + quieter server

* Update PirateRadioSpawnRule.cs

* unfinished scuttling system

* Adding colorblind quality of life.

* Tweaks to map and guards, no more self destruct system

* added guard flavor text

* The reasons for these are now gone

* DONE

* Update events.yml

* Update PirateRadioSpawnRule.cs

* Update DV-pirateradio.yml

* fixes crew monitor server not working at *extreme* ranges

* adds delta-v comment where needed

* Small code optimization and tons of documentation

* Update outpost visuals! Guards have a PDA now

* Update DV-pirateradio.yml

* Update DV-pirateradio.yml

* Goodbye crab. Hello Content.Shared migration

* Cleaning up pirateradio spawn

* Update DV-pirateradio.yml

* reverts pen changes to upstream PDA's

* adds new PDA

* adds new PDA to loadouts.

* Update Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* Maintainer requested changes

* Update salvage.yml

* Update syndicateNPCs.yml

* Cleaning up unneeded stuff

* more code cleanup

* Update PirateRadioSpawnRule.cs

* Update computers.yml

* Revert "Update computers.yml"

This reverts commit cbd0c583d4.

* Last fixes to the math

* Update PirateRadioSpawnRule.cs

* update license.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-03-07 22:35:45 -05:00
Debug 0dc9fe6bd0
Some drone tags 2024-03-07 17:51:51 +01:00
Ed 56f5304511
Frozen hydroponic dungeon (#25837)
+dungen

(cherry picked from commit bdcf1444423cffdb88e3398077ad7b770a224341)
2024-03-07 01:24:50 +01:00
Ed da5758ba4e
Mineshaft (#25733)
* content

* catwalks

* fix fucking icons

* finish PR

* +1 room

* fix

(cherry picked from commit ace82854406631bad58cd731899fc8e20ef21e65)
2024-03-07 01:24:40 +01:00
Flareguy 71c14d9701
New Space Ruin: Syndicate Dropship (from /tg/) (also adds plastitanium windows) (#25723)
* adds a new syndie space shuttle ruin + plastitanium windows

* the green goomba gaming

* fixe

* visor > gloves

(cherry picked from commit 7b9346d2a8f3ab7e62c19b207ba5091cbddd6ecd)
2024-03-07 01:10:09 +01: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
Flareguy da76efaaf1
fixes the old ai sat ruin's lights (#25615)
(cherry picked from commit 4bf2364f5fbf79d87c9ea819a57beac73823a1cf)
2024-03-07 00:57:43 +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
Velcroboy 4f85c05568
Hurve (#927)
* Map Hotfix: The Hive

* yeet cloning board

* Whatever

---------

Co-authored-by: Velcroboy <>
2024-03-04 17:19:16 +00:00
Velcroboy bc9ee3f925
Map Hotfixes (#920)
Co-authored-by: Velcroboy <>
2024-02-29 17:42:51 -06:00
Adrian16199 896732946b
A quick patch for shoukou. (#917)
Gives a cell charger to medical with 2 rollerbeds
Also gave a medical locker to the break room in medical aswell as a small treat.
2024-02-29 11:56:08 -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
Velcroboy 45d69b072f
Map Edits (#911)
Co-authored-by: Velcroboy <>
2024-02-27 18:11:40 -06:00
Velcroboy dd3560eca7
Map Hotfix: The Hive (#910)
Co-authored-by: Velcroboy <>
2024-02-27 01:47:10 -06:00
Velcroboy 7b95d4b0d2
Replaces romerol pill w/ ambuzol (#906)
Co-authored-by: Velcroboy <>
2024-02-26 16:39:41 -06:00
Velcroboy b1320811a9
Map Hotfix: Asterisk (#904)
Map Edits: Asterisk

Co-authored-by: Velcroboy <>
2024-02-26 16:05:07 -06:00
Velcroboy fffa106287
Map Edits: Hive (#903)
Co-authored-by: Velcroboy <>
2024-02-26 15:53:05 -06:00
UnicornOnLSD 468dde7019
Hive minor tweaks (#896)
fixed cryo piping, fixed spare AA ID cab
2024-02-24 13:39:16 -06:00
Velcroboy b2d2d3c5e2
Map Edits: The Hive (#895)
* Map Edits: The Hive

* re-add cryo, remove invalid

---------

Co-authored-by: Velcroboy <>
2024-02-24 00:38:02 -06:00
Velcroboy 8545c2ffec
Map Edits: The Hive (#894)
* Map Edits: The Hive

* fixgridatmos

---------

Co-authored-by: Velcroboy <>
2024-02-23 18:34:16 -06:00
BriBrooo 2d42379e2e
Pebble maintenance (#881)
* Pebble maintenance

added metempsychosis machine, tropico in the detective's room, the 3 new machines for chems, dressers for heads

* Update pebble.yml

Actually added the metempsychosis machine this time (look at the screenshot I originally posted...), added the pride-o-mat and beacons!
2024-02-21 16:45:38 -06:00
Adrian16199 dd675b594e
Updates shoukou up to date. (#872)
Again

This time at the least, I noticed that the lights were changed so at the least the map was updated properly before i touched it.

Changes cloning to metem.
Redo captain's quarters to include all his gear.
Added a noticeboard to kitchen.
2024-02-20 16:43:18 -06:00
Colin-Tel 45d867abac
Update Asterisk and Edge (#870)
Added Captain's glass box for the antique laser pistol, added missing captain dresser, named wireless cameras and added cameras to courtrooms, gave Edge hydroponics a free hydro tray board, replaced cloning pods with metempsychotic machines (I hope I did the wiring right, oh well they get multitools anyways).

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-02-19 19:47:40 -06:00
Velcroboy 92d99e5cd5
Map Edits (#866)
* Map Edits

* bad links

* No more soapy water every one dirty now

---------

Co-authored-by: Velcroboy <>
2024-02-19 16:48:04 -06:00
Velcroboy de0917200f
Map Edits: Shoukou (#833)
Co-authored-by: Velcroboy <>
2024-02-13 23:29:18 +00:00
Adrian16199 0798ea3ec3
Shoukou small patch (#816)
* Shoukou small patch

Deletes plasma miner
Deletes command cryo
Replaces cryo in prison with cryo with prisoners included edition
Ensures techmaints are under robotics and cryo
Fixes shutters in robotics
Provides medical with a singular cryo

* gets rid of invalid

* Update shoukou.yml

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-02-13 17:17:22 -06: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