Ed
862df73ff2
Demiplane modifiers groups & tiers ( #678 )
...
* data setup
* demiplanes modficators combine refactor
* generationProb
* demiplane tiers setup
* migration, and t2 loots
* t2 balance tweaks
* retags
* weather modifiers group
* maplight modifiers
* more passed checks
* wanderer buy positions localization fix
* fixes
2024-12-16 00:38:29 +03:00
Viator-MV
35c45e70f6
Christmas map ( #681 )
...
* Update comoss.yml
* Update comoss_d.yml
2024-12-15 22:11:38 +03:00
Ed
c42b77d0c9
Merge pull request #658 from crystallpunk-14/ed-11-12-2024-upstream
...
Upstream sync
2024-12-11 21:18:17 +03:00
Ed
cd736e4fd4
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Shared/Lock/LockSystem.cs
# Resources/Maps/oasis.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/audio.yml
2024-12-11 14:49:02 +03:00
Ed
576bbe91d0
Roofs ( #657 )
...
* simple roo system
* tweaks
* roof sprite update
* transparent roof
* wooden roof sprite
* remove weather: false from all tiles
* stone roof + roofs crafting
* final shtrix, maps update
* fuck
* fix checks
* reagent auto vaporize tweaks
* Update base.yml
2024-12-11 14:44:16 +03:00
Ed
e4b60b31c0
Ed 10 12 2024 aah ( #656 )
...
* fix ghost zlevel moving
* stairways autorotation
* ladders sprite update
* slow space swimming
* fix wrong wood spawn
* deadly ocean
* Update zLevels.yml
2024-12-10 21:24:06 +03:00
Ed
99786342fb
Comoss sewers (zlevels added) ( #655 )
...
* comoss zlevel sewers
* Update biome_template_caves.yml
* Update GhostSystem.cs
* Update GhostSystem.cs
2024-12-10 00:43:30 +03:00
Ed
c2b7c5146d
second blacksmith
2024-12-08 14:43:12 +03:00
Ed
61454e351c
Another blacksmith minor update ( #648 )
...
* modular golden sickle
* anvil and furnace resprite
* Update comoss.yml
2024-12-08 14:17:48 +03:00
Ed
0662299120
Aftertest tweaks ( #647 )
...
* fix #641
* fix #639
* add copper, bloodflowers and wild sage into comoss island
* remove additional alchemist and blacksmithes roles
* more roundstart resources for alchemist and blacksmith
* disable footprints system
* cryo shuttle mechanic
* update cargo ship
* veryy magical
* tips update
* fix #635
* green cloak
* Update T0_cure_poison.yml
2024-12-08 00:52:35 +03:00
Ed
52a0f44aa1
Bank progression mechanic ( #633 )
...
* bank progression mechanic
* loc fix
* minor random fixes
* minor tweaks
* lighthouse
* Vladimirs Alerts!
* offset alerts
* lighthouse
2024-12-07 00:39:05 +03:00
Southbridge
623a35b3fe
Amber Station - Added Evac Shuttle ( #33743 )
...
* Added evac shuttle and fixed various issues brought up during playtests
* Updated Amber with playtest feedback, removed waste loop and firelocks from evac shuttle
2024-12-06 01:39:25 -07:00
Spessmann
59bce41390
Cog vox box removal ( #33730 )
...
removed vox box ggggggggggggg
2024-12-04 20:01:56 -07:00
Southbridge
bcf2b9afeb
Box Station - Removed Vox Box ( #33729 )
...
* Removed vox box and removed nearby fuel tank as well
* made all dirt decals consistent
2024-12-04 19:54:59 -07:00
Emisse
90c8776a60
bagel update ( #33726 )
...
* bagel update
* remove invalid
* remove invalid
2024-12-04 19:54:45 -07:00
Southbridge
da68ae94c1
Amber Station - Removed Vox Box ( #33725 )
...
Removed Vox Box
2024-12-04 17:02:36 -07:00
Ed
304e1a268a
Balance pack ( #628 )
...
* map fixes, move crystalls from houses into startgear
* fix lock types
* fix item throwing, reduce lock powers, add lockpick into anvil
* new store positions
* restruct swords
* nerf skeleton, bone halberd
2024-12-05 00:29:14 +03:00
A.Ne.
e6a6900719
Prototypes for Guard ( #616 )
...
* Prototypes for Guard
* imperial laws
* merge
* yml clean up
* flags + change in imperial laws
* map update
* guard clothing resprite
* cool guard helmet
* guards grip and halberd
* fill cabinets, add guard commander stamp
* key and keyring fix
* Update arenas.yml
* Update migration.yml
* tapestry fix
* guidebook spacing
* Update meta.json
* add bold tags
* Update flags_wallmount.yml
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2024-12-04 18:11:33 +03:00
Southbridge
87182635b6
Amber Improvements ( #33707 )
...
* Various changes (see PR)
* variantized, fixedgridatmos, tiledwalls
2024-12-03 16:59:16 -07:00
Ed
0e88b6dc6f
Table fences ( #626 )
...
* collision fucks
* map update
2024-12-03 16:21:07 +03:00
Ed
f6630e1ec9
Key distribution system ( #625 )
...
* data restruct
* yay
* Update arenas.yml
* fixes
* auto labeling
* shuffle
2024-12-03 12:34:07 +03:00
Southbridge
2c2a435dbd
Amber Station Seasonal Update ( #33698 )
...
Made some modifications requested by reviewers prior to and after map merge, also added holiday decorations!
2024-12-02 21:58:02 -07:00
Southbridge
e4e84aea74
New Low-Mid Pop Station - Amber Station ( #33441 )
...
* Initial Commit with two departments done
* Checkpointing work
* Added most of service and science
* Started work on medbay
* Modified TEG setup and set up atmos pipes for engineering
* Re-added medbay, added chapel and janitorial, started routing disposals and generally the final layout of the map is coming together
* Plenty of additions, too many to list in a commit message
* Major update
* Nearly done with the map, just have to do decals and emergency lights
* Added all decals, only thing missing is department signs
* Toned back the dirt decals a bunch, added hallway signs and other decorations
* Finishing touches on the map before testing.
* Fixed invalids
* Renamed the station to Amber, and made a couple adjustments
* Completely redid cargo, added maints around sec
* Added Amber to the map post init integration test
* Many small updates addressing issues.
* Ran a script to update all the camera names, also ran fixgridatmos, fixrotations, tilewalls, and variantize
* Started addressing some of the issues brough up by Emisse and others
* Addressed all issues mentioned by reviewers. Added mail system.
* Wrapped up meeting all the issues raised by reviewers, also did a bunch of testing and resolved issues found during those tests
* Addressed additional requested changes, and nabbed some ship designs from Frontier. Redesigned south east maints and surrounding meteor nets based off of those designs
* Making a couple more requested changes
* Reduced the amount of Nitrogen Closets, made several small adjustments. Ready for review again!
* Removed invalids!
* web edit lmao
---------
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com >
2024-12-02 19:24:37 -07:00
dylanstrategie
7f966ab9b1
Touching up Bagel Security Brig ( #33680 )
...
* Touching up Bagel Security Brig
* Added a few missing door names
* Last door name I promise
* Address feedback
* Forgot to delete old shutter button
---------
Co-authored-by: dylanstrategie <188926747+dylanstrategie@users.noreply.github.com ~>
2024-12-02 04:29:45 -07:00
IProduceWidgets
bf312f2306
Update Snowasis ( #33364 )
...
* Update Snowasis
* Appease test gods
* Woops had the leftward animation backwards. Fixed.
* add santa suits and envelopes to chapel
* It looks worse unscaled but whatever.
* fix ghost role
* examines
2024-11-30 23:30:01 -07:00
Ed
bb43b37fd8
Bugfixes ( #619 )
...
* clean up
* Update empire_orders.yml
2024-11-30 14:16:48 +03:00
compilatron
08db47cb28
Cog/Marathon: Airlock fixes ( #33621 )
...
* Fixes the TEG airlock on marathon
* Fixes the atmos external airlock on cog
2024-11-29 23:23:50 -07:00
Ed
373d3a892b
New Comoss island map ( #618 )
...
* Create island_new.yml
* first map state
2024-11-30 01:08:44 +03:00
dylanstrategie
ab7221efad
Added two N2 lockers to Reach ( #33409 )
...
Co-authored-by: dylanstrategie <188926747+dylanstrategie@users.noreply.github.com ~>
2024-11-26 13:04:34 -07:00
Ed
191112a8a8
Tampestry ( #607 )
...
* Update T0_cure_heat.yml
* tampestry
* palisade wip
2024-11-24 18:27:18 +03:00
IProduceWidgets
fab9993a3b
babyproof arrivals shuttle ( #33284 )
...
* babyproof arrivals shuttle
* always powered lights
* uncuttable cables from terminal PR.
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-11-23 16:14:13 +01:00
IProduceWidgets
a28adf4ae4
baby proof the terminal ( #33281 )
...
* baby proof the terminal
* Make a couple exceptions for items that you might take with you.
* alwayspoweredlights
* Uncuttable cables since cablecomp is a snowflake construction system
* chairs and vendors
* rerun heisentests
* rerun tests again
2024-11-22 23:50:41 +01:00
Ed
677e5194d6
Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync
...
# Conflicts:
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Server/Traits/TraitSystem.cs
# Content.Shared/CCVar/CCVars.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Resources/Maps/box.yml
# Resources/Maps/core.yml
2024-11-23 01:48:24 +03:00
Ed
ed638c94a8
Merge remote-tracking branch 'upstream/stable' into ed-20-11-2024-upstream-sync
...
# Conflicts:
# Resources/Maps/cog.yml
2024-11-20 00:34:51 +03:00
Spessmann
dffece473a
Cog update ( #33410 )
...
removed fun
2024-11-18 19:17:57 -07:00
Spanky
c7f83523ef
Packed Update (Christmas Edition) ( #33356 )
...
Christmasified Packed station.
2024-11-16 23:35:57 -07:00
Spanky
f484118e2d
Omega Update (Christmas Edition) ( #33357 )
...
* Christmasift Omega station.
* Add cryosleeper to bridge.
2024-11-16 23:35:41 -07:00
Emisse
bdab41248d
bagel christmas update ( #33347 )
2024-11-16 01:42:33 -07:00
Southbridge
f071bf65e0
Marathon holiday update ( #33335 )
...
* Added holiday decorations, and modified emergency lights to have a better layout.
* Added a couple more emergency lights after finding a couple spots that were wway too dark during testing, also gave the warden a crew monitor
2024-11-15 23:35:23 -07:00
Southbridge
f5b63b8393
Box Holiday Update ( #33340 )
...
Added holiday decorations with presents and various fixes
2024-11-15 23:29:23 -07:00
Spessmann
d9a5ffbef4
Cog christmas update ( #33344 )
...
christmas updoot
2024-11-15 23:29:09 -07:00
Ubaser
cf96679d0b
New ruin variant ( #33332 )
...
add
2024-11-15 12:18:44 -07:00
Ubaser
b4e0362ed4
Update Core ( #33325 )
...
add
2024-11-14 21:59:35 -07:00
scrivoy
d205d17ba3
Meta Station: Add a fully functional TEG room ( #32941 )
...
* initial commit
* delete WIP-marker.md
* add TEG room, move gas chambers up
* remove outside burn chamber button, add naming to APC, SMES, Substation
* add HV below TEG Substation
* removed invalids
2024-11-14 18:04:14 -07:00
scrivoy
2c9f2279d6
Marathon Station: Added air alarms to CMO, Surgery, Security Checkpoint ( #33213 )
...
* add air alarms to sec checkpoint, cmo and western surgery
* decals and cleanup
2024-11-14 14:30:16 -07:00
Ed
5bcc378bbe
Clean up, increase build stability ( #583 )
...
* Update base.yml
* bandit -> sociopath
* some fixes
* syringe
* vaults
* Update ContentAudioSystem.CP14AmbientLoop.cs
2024-11-13 17:56:07 +03:00
Spessmann
99b4604d50
Cog fixes ( #33285 )
...
fixed the map (for real this time)
2024-11-12 20:07:47 -07:00
Ed
b106554cfe
Prototypes work ( #579 )
...
* wrench
* station crates
* bottles
* barrel openable
* Update crates.yml
* mop fix
* broom fix
* crossbolt size fix
* bottles fix
* Update closets.yml
* Update anvil.yml
* Update crates.yml
2024-11-12 12:42:45 +03:00
scrivoy
9b7200607b
Omega Station: Fix Air Alarm in CMO office ( #33216 )
...
move air alarm and link devices
2024-11-10 04:40:02 -07:00
Emisse
6a1d631b14
fix invalids core ( #33215 )
...
fix invalids
2024-11-07 16:23:28 -07:00
