juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,390 Commits 57 Branches 0 Tags
SpellStorage-Update
Commit Graph

2211 Commits

Author SHA1 Message Date
Ed
191112a8a8 Tampestry (#607) 
* Update T0_cure_heat.yml

* tampestry

* palisade wip
 2024-11-24 18:27:18 +03: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
scrivoy
9ee47b927b Core Station: Telecoms air alarm connection to atmos devices (#33214) 
link air alarm in coms room
 2024-11-07 16:18:12 -07:00
PopGamer46
d13765fa5c Fixes Lambordeere bolt buttons not being connected (#33065) 
* fix

* oops, used savemap instead of savegrid
 2024-11-07 15:02:24 -07:00
K-Dynamic
8257dc87de Meta map: remove arrivals chair, changed maints shotgun to beanbag rounds (#32981) 
remove chair + changed maints db to rubber
 2024-11-07 15:01:57 -07:00
Spessmann
fc0d85b487 Cog update (fixes) (#33202) 
fixed cog again
 2024-11-07 15:01:35 -07:00
Ed
87dc3f9fa5 Order board (#546) 
* orders board! work for the Witcher

* stamps

* wtf

* Update closets.yml
 2024-11-08 00:10:59 +03:00
Ed
ab7296ff4a Demiplan ruins (#544) 
* ruins

* Update spawners.yml
 2024-11-07 17:45:21 +03:00
Ed
955145a9a5 Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream 
# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
 2024-11-06 16:53:24 +03:00
Ed
ae27cf7e08 Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream" 
This reverts commit 1579da881a, reversing
changes made to a9bdab0705.
 2024-11-06 16:52:08 +03:00
Ed
1579da881a Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream 2024-11-06 16:51:42 +03:00
Ed
54c7a40967 Blacksmith role (#534) 
* disable crowbar door prying

* blacksmith role

* finish role

* map update

* more recipes to anvil

* Update arenas.yml

* glass!

* ores rebalance
 2024-11-04 16:25:19 +03:00
Preston Smith
146ae8a6a6 Give Nukies a Hand Labeler (#33053) 
* Add hand-labeler to nukie planet

* Rearrange nukie chem table
 2024-11-02 01:44:15 +01:00
Ed
2b9d949eea Demiplan polishing 2 (#528) 
* wizden PR copy

* starter rooms

* grass geode location, new modifiers
 2024-11-02 00:59:55 +03:00
Ed
5c4b5d1572 Demiplans expeditions (#523) 
* simple expedition generation

* add simple test key

* expedition map component

* some funny procedural testing

* refactor expeditions from planetbiome to islanddungeons

* some work

* fix: grid dungeon, not map planet dungeon

* unhardcode map components

* finish T1 expedition generation

* Update preset.yml

* indestructable stone

* mob water occlusion

* caves T1 expedition

* Update CP14SpawnExpeditionJob.cs

* Delete shared MissionParams

* rename to demiplans

* pass mapid into job

* demiplan connections

* demiplan exits

* random entry points

* Update config.yml

* some cleanup and renaming

* radius one-time teleport

* rename connections to exitPoint

* merge entry and exit point into rift component

* demipan closing - all rifts deletion

* demiplanEEEEEE

* fixes

* delete floating visuals

* Update CP14DemiplaneTravelingSystem.cs

* intro and outro demiplan music

* rift cores and flashing

* pulling support

* pulling fix + generatordata fix?

* auto destrot demiplans??
 2024-10-31 19:13:44 +03:00
Ed
16e23098db Merge pull request #520 from crystallpunk-14/ed-29-10-2024-upstream 
Stable upstream sync
 2024-10-29 15:15:14 +03:00
Ed
df53f9a01f remove ship target point 2024-10-29 14:18:27 +03:00
Ed
817c53d98f Merge branch 'master' into ed-29-10-2024-upstream 2024-10-29 11:51:03 +03:00
Ed
cc80518d2f World minor changes (#519) 
* x2 weather time

* remove alchemy test and battle royale maps, add simple island map

* island map + ocean parallax

* map floor occluder sys

* undercliff test

* update sand and ocean sprite

* Revert "undercliff test"

This reverts commit c484fe630a.

* more experiments

* Revert "more experiments"

This reverts commit a7f30fd608.

* Update default.yml

* Update debug.yml
 2024-10-29 11:48:52 +03:00
Ed
ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
 2024-10-29 11:16:56 +03:00
joshepvodka
7ac2d9a8bd Adds beacon to core station's vox box (#33004) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon

* fixes messed up diff
 2024-10-28 16:05:01 -06:00
joshepvodka
dbef6cbecc Adds beacon to oasis station's vox box (#33003) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:04:49 -06:00
joshepvodka
e900ad7742 Adds beacon to bagel station's vox box (#33002) 
* added vox beacon

* changed name to vox break room

* added voxbox station beacon
 2024-10-28 16:04:37 -06:00
joshepvodka
93315d4695 Adds beacon to box station's vox box (#33001) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:04:10 -06:00
joshepvodka
30017bc2d8 Adds beacon to cog station vox box (#33000) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:03:13 -06:00
Ed
2850665e33 Tavern map update (#516) 
* recursive currency calculation

* map update

* fix
 2024-10-27 17:09:06 +03:00
Ed
08a4c4340d Bank implementation (#512) 
* get currency refactor

* bank work

* finish vault markers

* add bank doors

* map update

* loadouts

* Update CP14StationTravelingStoreShipTargetComponent.cs

* oopsie
 2024-10-26 18:18:30 +03:00
Ilya246
5a10bf0954 add atmosia to devmap (#32460) 
change
 2024-10-25 22:04:27 -05:00
Spanky
92c49afcf2 Packed Update (#32971) 
Packed map update, significantly changes arrivals, perma, AI core, and misc other QOL.
 2024-10-23 16:19:35 -06:00
Spessmann
8142ac007f Cog sec maints updated (#32948) 
updated sec maints
 2024-10-22 00:30:31 -06:00
Southbridge
a227c3bb42 Box Station - Resolved #32771, #32949, and #32921 (#32950) 
* Resolved #32771, #32949,  and #32921

* Resolved build issue
 2024-10-21 23:39:34 -06:00
Ed
85463d380f Bank preparation (#499) 
* TownSend condition

* personal objectives update

* add common objectives

* add common objectives

* tweaks

* quartermaster and merchant

* job spawner icons

* add merchants to tavern map
 2024-10-20 21:20:16 +03:00
Spessmann
4c3fd3130d Cog small update (#32922) 
based sigma
 2024-10-19 22:17:10 -06:00