Commit Graph

2459 Commits

Author SHA1 Message Date
Ed
f989980df3 Carcats species [Draft] (#1023)
* body parts

* proto setup

* inhand displacements

* carcat cloak

* eyes

* gloves

* pants carcat

* pants

* shirt

* markings nose + ears

* Update 5.png

* shoes + naming

* helmet adapt

* carcat sounds

* Update sewing_table.yml

* s

* Update comoss.yml

* Update factoria.yml

* s
2025-03-14 14:11:41 +03:00
Ed
dcacd8f8da bugfixes and ENG OBT preparation (#1015)
* bugfixes and OBT preparation

* Update CP14CargoSystem.cs
2025-03-12 20:14:50 +03:00
Ed
93ed28d34c Trading content (#1010)
* reroll positions

* more trading content

* bugfixes

* more content

* guidebook uodate

* Update buy.yml
2025-03-12 00:51:58 +03:00
Ed
56f4012a49 Lava + Chest resprite (#1007)
* simple lava

* add into demiplanes

* Update meta.json

* wooden chest update

* Update migration.yml

* Update dev_map.yml

* manual migration

* Update factoria.yml
2025-03-11 17:39:46 +03:00
Viator-MV
d6a2c5f9f6 Commos upate 8.03.25 (#994)
* personal house fix comoss.yml

* Update comoss.yml

* Update comoss_d.yml

* MaGiC sPlItInG
2025-03-08 23:26:14 +03:00
Ed
0b5712ce97 Vampire antag (#988)
* new blood types

* vampire systems setup

* death under sun

* vampire blood nutrition

* alerts

* autolearn skills

* base bite actions

* suck blood spell

* polish

* Update blood.yml

* unshitcode

* vampire hunger visual

* nerf speed

* hypnosis + map update

* darkness demiplane warning
2025-03-07 14:52:43 +03:00
Ed
c1acf81541 NewTrade (#969)
* trading portal replace traveling storeship

* clean up content

* clean up content 2

* seel and buy realization

* fixes

* Update migration.yml

* Update migration.yml

* Update dev_map.yml

* Update dev_map.yml

* thats work correctly now

* bugfies and visual

* factions

* faction restruct + name reduce

* unnesting sell cargo positions

* unnesting cargo positions

* more cargo content

* Update buy.yml

* improve tradeportal visual

* Update migration.yml

* Bank ad Commandant removal

* merchant objectives

* finish

* clean up content

* Update migration.yml

* fix goal calculation

* Update comoss.yml

* Update dev_map.yml
2025-03-06 12:01:43 +03:00
Ed
acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
2025-03-03 23:23:40 +03:00
Ed
81b9cdfff7 Alchemy integration test (#967)
* Update TryAllReactionsTest.cs

* test drive

* fix traveling ship roundremove

* Update CP14RoundRemoveShuttleSystem.cs

* Dev map update
2025-03-03 23:15:40 +03:00
Ed
8652e71b39 Essence nodes (#961)
* essence nodes

* Update essence_nodes.yml
2025-03-02 15:13:21 +03:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955)
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
2025-03-02 13:28:13 +03:00
Emisse
16c377a05b bagel update (#35550) 2025-02-26 20:48:47 -07:00
Emisse
9d62e8c0e7 centcomm update (#35549) 2025-02-26 20:41:51 -07:00
Ed
1542459864 Books and bookshelf (#944)
* guidebooks

* guard spawns

* books restruct

* bookshelf

* Update crates.yml
2025-02-26 14:38:22 +03:00
keronshb
68de58eb66 THE WIZARD (#35406)
* Adds Survivor Antag

* Adds Survivor Role

* Adds Survivor Rule ECS, adds a survivor role event, adds make antagonist to  random global spawn spell

* Moves Survivor Ensurecomp to event handler. Makes Add Survivor Role a broadcast. Adds Survivor Component. Removes redundant briefing.

* Adds Survivor Antagonist role type for admins to keep track of this easier, adds it to Survivor.

* Adds access to survivor game rule system

* Adds Survivor Rule

* Adds end of round survivor text

* Adds end of round reporting logic. Adds logic to start the survivor rule.

* Changes desc from centcomm to shuttle

* survivor (S)

* Checks if they're alive on the shuttle instead of centcomm.

* ftl text selection based on number of survivors.

* Removed Survivor Antagonist, replaced it with Free Agent.

* Adds InvalidForGlobalSpawnSpell tag, checks for it on spawnspell, and adds it to a zombified person.

* Changes logic so we launch the game rule if it hasnt launched yet. Moves rule logic starting to server. Moved survivor rule logic out of event and into Start method.

* Fixes invalid entity issue

* Descs for Survivor Rule and Survivor comps

* Moves Survivor Rule to its own yml

* Checks for dead survivors, changes survivor checks for mind. Adds survivor comp to mind to fix any mindswap issues. Same for invalid survivor tag

* Changes shuttle xform call to just mapid

* Protoid fix

* THE WIZARD

* Wizard spawner

* adds the correct state

* Wizard preset and weight

* Fixes wizard rule

* Weight back to 100%

* Adds Random Metadata

* Wizard locs

* Puts requirements in the right place

* Adds wiz ghost spawner and mob

* wizard spawnpoint fix + shuttle mapping

* wizard loadout + fix wizard spawning + wizard random name

* comment

* Adds Wizard testing

* FIXES SHUTTLE ISSUE BASED REI

* THE WIZARD LOBBY SONG. Special thanks to song creator Chris Remo for allowing us to use this.

* Free Objective ECS + Base Free Objective

* Space Wizard Federation for Wiz Obj issuer.

* Wizard Objectives

* Moves wizard shuttle to base wizard rule. Gives Wizard their objectives. Removes WizardRule

* Renames midround to subgamemodes. Adds wizard sub game mode.

* Adds SubWizard to SubGameModesRule. Adds a SubGameMode with no wizard. Adds No SubGamemodeRule for Wizard preset

* Wizard midround event

* Fixes wizard midround

* Wizard Guidebook

* Removes todo

* Fixes text

* Removes wizard rule ECS, not needed

* Wizard jetpack

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-02-25 22:34:07 -07:00
Spessmann
6ea742d4b4 Convex update (#35513) 2025-02-25 20:20:03 -07:00
Vortebo
52df2dbe15 Custom arrivals shuttle for Relic (#35194)
* Custom arrivals shuttle for Relic.

* Added shuttle APU

* Saved it as a grid the way I now see the mapping guide said I was supposed to do it

* Relic arrivals hallway more historically accurate.

* Removed invalid configurator
2025-02-24 14:35:41 -07:00
Ed
a847b9be71 Merge branch 'master' into Comoss_update_22.02.25 2025-02-24 00:55:25 +03:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
Viator-MV
aace9aafd1 Update comoss_d.yml
Atmos fix
2025-02-23 19:55:19 +03:00
Deerstop
f65183edb9 Elkridge Science 2.0 + misc fixes (#35392)
* added radationblockercontainer component to pacman fuel crate so it doesnt leak rads, also more rad suits

* reworked science, misc fixes and changes
2025-02-23 01:35:36 -07:00
Southbridge
f9c9ffadcc Amber Station Improvements (#35384)
* Redid TEG, minor fixes around

* Ran fixgridatmos, variantize, fixrotations, tileswalls
2025-02-23 01:31:04 -07:00
Viator-MV
79967a0ad3 Update comoss_d.yml 2025-02-22 17:21:33 +03:00
Viator-MV
05042d3bf3 Update comoss.yml 2025-02-22 17:20:28 +03:00
Ed
224d96bd34 Sociopath delete (#917)
* fuck sociopath and grass seel position

* Update PostMapInitTest.cs

* fix
2025-02-19 21:56:29 +03:00
Emisse
60306ddc40 centcomm update (#35293) 2025-02-18 21:38:12 -07:00
TytosB
eefed62828 loop latejoin hotfix (#35260)
latejoin
2025-02-18 21:38:04 -07:00
Emisse
fc673967ee Centcomm 3: Beyond Thunderdome Update (#35251)
* centcomm update

* eef freef
2025-02-17 06:50:27 -07:00
Ed
ce93413a17 Merge branch 'master' into ed-16-02-2025-planet-light-upstream 2025-02-17 14:51:41 +03:00
Viator-MV
2d6b39868f Comoss update 17.02.25 (#911)
* Update comoss.yml

* Update comoss_d.yml
2025-02-17 14:50:53 +03:00
Emisse
183438c182 centcomm fix (#35244) 2025-02-17 03:09:39 -07:00
Ed
596d9e808b arenas fix 2025-02-17 11:57:01 +03:00
Emisse
4118e7010a Centcomm 3: Beyond Thunderdome (#35240)
centcomm update
2025-02-17 01:51:44 -07:00
Ed
82d6fe07fe roof adapt 2025-02-16 22:56:10 +03:00
Ed
01900bf2ec Update comoss_d.yml 2025-02-16 18:06:20 +03:00
Ed
bc53ed4aa5 Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/centcomm.yml
2025-02-16 16:39:26 +03:00
Viator-MV
5f107d176e Comoss update for obt 16.02.25 (#904)
* Update comoss.yml

* Update comoss_d.yml
2025-02-16 14:10:00 +03:00
Ed
7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml
2025-02-16 11:58:47 +03:00
ElectroJr
e3a636a98e fix relic 2025-02-16 17:16:57 +13:00
Ed
6a3ea22543 Update comoss_d.yml 2025-02-14 17:51:23 +03:00
Ed
c038c021f8 Bank returns (#898)
* cursed

* update
2025-02-14 14:09:04 +03:00
Viator-MV
4caef5ac74 Factoria added (#893)
* Add files via upload

* Create Factoria.yml

* Update factoria.yml

variantize

* fix

* Update Factoria.yml

* Update Factoria.yml

* fix gravity and atmos

* guards spawnpoints

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-02-13 18:48:26 +03:00
Ed
007249b675 Master fix + Bank removal (#888)
* bugfix

* bank removal

* red and blue carpet

* Update carpets.yml
2025-02-12 22:36:19 +03:00
Ed
47cb8a0b08 RoomSpawner mask (#33110)
* RoolFill can now spaw rooms with any size

* tile ignoring

* upgrade interior

* simplify

* Update DungeonSystem.Rooms.cs

* center rooms

* Update RoomFillComponent.cs

* Update RoomFillComponent.cs

* Update DungeonSystem.Rooms.cs

* Remove roomfillcoponent from integration test

* Update EntityTest.cs

* remove nullable size, replaced with minsize and maxsize

* clear existing logic refactor

* delete this one
2025-02-12 15:47:48 +03:00
Spessmann
bf20b6bb6e Convex update (#35086)
convex update #5
2025-02-11 14:44:18 -07:00
Nox
4b58d7a09f Fland Armory Restock (#35044)
* Upped cyborgs from 2 to 5, updated armory stock, did some button QOL, gave warden a enforcer.

* Fixed a few more buttons
2025-02-10 13:45:42 -07:00
ToxicSonicFan04
dc1edbe3b5 Amber Armory Restock (#35045) 2025-02-10 13:45:32 -07:00
Deerstop
2e2a3a9cb1 Elkridge Tweaks 2 (#34757)
* bigger TEG, moved EVA, moved engi and med substations, maints loot, increased pop to 15-45

* tweaked some job numbers around for higher pop

* holy shit i forgot the o2 and n2 miners

* fixed unwired substation

* made the TEG worse >:)

* added southbridge's pride-o-mat cos i kept forgetting

* fixed evac timer display, resolves #34850

* removed pridevend for testing

* nvm it was the shuttle, not the pridevend, oops
2025-02-09 18:07:10 -07:00
Spessmann
eeb689261b Convex update (#35023)
convex update
2025-02-09 18:06:32 -07:00
ArtisticRoomba
e1aff4dd98 Rebalance Relic station power + misc fixes (#35022)
Rebalance Relic station power
2025-02-09 17:51:29 -07:00