juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,981 Commits 57 Branches 0 Tags
f70e3051ed3e7202ff2ccd545dfd7e77f396ff3a
Commit Graph

1926 Commits

Author SHA1 Message Date
Ed
1f4b7f68bf Playtest polishing (#383) 
* fix predicting sharpening

* finish shadow step

* tweak ice dagger

* shadow grab test

* fireball spell

* ice shards spell

* battle royale crates

* loot tables

* remove expedition ship

* dev update

* br map update

* spells tweak

* tips update

* some fixes

* biome forest spawner

* give keys to orgs

* mobs and aura spawners

* expedition update: goal, new ship, new map

* fix doors layers

* add new map proto

* translate keys

* Update crates.yml

* Update PostMapInitTest.cs

* fix spawning on expedition ship

* Fuck you, Randy. Remove nails

* fix lock systems

* localize tips

* some tweaks

* update ship, remove shrooms.

* fixes

* Update StationSystem.cs

* Revert "Update StationSystem.cs"

This reverts commit f632241324.

* Update expedition_test.yml
 2024-08-05 15:22:14 +03:00
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
 2024-07-28 20:58:48 +03:00
Ed
0d345c33b9 Update dev_map.yml (#361) 
* Update dev_map.yml

* Disable FTL test

* DisableEvacTest
 2024-07-28 20:56:05 +03:00
IProduceWidgets
b9090e84f7 Update Evac-Accordia (#30389) 
Update accordia atmos systems
 2024-07-26 23:40:39 -06:00
IProduceWidgets
45a481de47 Oasis updoot (#30388) 
updoot!
 2024-07-26 23:39:43 -06:00
Brandon Hu
44199991bf twek(BoxStation): Reorganize atmos TEG room to be more user friendly. (#30368) 
ugh
 2024-07-25 23:06:31 -06:00
lzk
818f43b005 Update Meta (#30348) 
fans
hardsuits
 2024-07-25 15:58:39 -06:00
lzk
d1663cade4 Update Omega (#30356) 
* Update Omega

fans
external airlocks
tree escape pods

* remove invalid
 2024-07-25 13:48:06 -06:00
lzk
769967ac36 Update Packed (#30358) 
fans
external airlocks
 2024-07-25 13:15:50 -06:00
lzk
6f7719011a Update Saltern (#30357) 
fans
 2024-07-25 13:15:28 -06:00
Brandon Hu
2d124c5c29 fix(train): Anchor botany machine, add second artifact spawner. (#30309) 
https://www.peoplesworld.org/article/free-college-was-once-the-norm-all-over-america/
 2024-07-24 23:29:50 -06:00
lzk
f210325460 Update Atlas (#30331) 
* Update Atlas

connect missed atmos devices (part of #29025)
replace fans in fridge

* remove invalid
 2024-07-24 14:52:34 -06:00
lzk
9def96d762 Update Box (#30329) 
* Update Box

replace missed tiny fans with directional

* add two more security hardsuits
 2024-07-24 14:17:29 -06:00
lzk
687e2c5844 Update Fland (#30330) 
replace tiny fans with directional
connect missed external airlocks
 2024-07-24 14:12:55 -06:00
lzk
bd4020bdfc Update Cluster (#30327) 
replace tiny fans in fridge
 2024-07-24 14:12:28 -06:00
lzk
ee641c2dff Update Marathon (#30328) 
fans
external airlocks
one escape pod
more airlocks in arrivals
 2024-07-24 14:12:21 -06:00
lzk
4536a527df Update Bagel (#30326) 
replace tiny fans
fix #29482
 2024-07-24 14:11:42 -06:00
Brandon Hu
492fb529df fix(Meta): Resolve every issue. (#30308) 
* https://www.ncbi.nlm.nih.gov/pmc/articles/PMC4369587/

* https://www.epa.gov/indoor-air-quality-iaq/what-epas-position-childrens-exposure-secondhand-smokeaerosol
 2024-07-24 14:01:24 -06:00
Ed
08f1aa9fa1 Crew goals update (#355) 
* randomization goals support

* maps update
 2024-07-24 20:52:05 +03:00
Ed
9c84ce9be0 Currency collect goal (#352) 
* simple currency comp

* stack support + weapon cost dnd port

* add collect currency objective conditions

* clean up
 2024-07-24 13:28:27 +03:00
Ed
2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml
 2024-07-23 12:24:42 +03:00
GrandApothecary19
fee5cc25ce Deleting all CP14 guns proto (#346) 
* Deleting all CP14 guns proto

* sprites deleting to
 2024-07-22 19:11:07 +03:00
Ed
c407f7c473 Train map fix (#30145) 
* train fix

* Update train.yml

* Update train.yml

* Add files via upload

* Revert "Add files via upload"

This reverts commit 9c6c2caae32899e7bef9c45db1ff4317a0dae529.

* Update train.yml
 2024-07-21 01:44:18 -06:00
lzk
ddc3e3110e Update Bagel (#30191) 
replace tiny fans with derectional fans
link not linked external airlocks to bolting and closing
 2024-07-21 01:43:16 -06:00
IProduceWidgets
c7ff647cb3 Nukie Outpost is no longer a station map (#30090) 
* I dunno, break shit I guess.

* Actually fix some shit for once.

* test flakey or me flakey?

* Test were not flakey, they just didnt make any sense anymore.

* more stationy tests

* undo abuncha shit I can set in yml instead

* forgor an assert

* unneeded usings

* 1984

* I made github angy

* yoink

* the end is never the end is never the end is never the end is never the end is never the end is never the

* Im going to commit sudoku
 2024-07-21 01:26:30 -06:00
IProduceWidgets
ac53e1d0a0 add an arabian lamp. (#27270) 
* add an arabian lamp

* yoink solutionitemstatus since it already displays fuel remaining.

* add comments

* fix containerception?

* Yeah sure, pray- I mean rubable.

* fix one flame frame

* Fixed emag behavior

* me when lexidysia.

* limit capacity of entitystorage and add some more comments about why it be the way it do.

* test fake?

* Holy fuck its a bug fix now? Based.
 2024-07-21 01:24:28 -06:00
lzk
673cd8accd Update Cluster and evac (#30003) 
* Update Cluster

replace dirty tiles with dirt decals
less visual noise in xenoarch
less visual noise in kitchen
less visual noise in botany
give one more table in kitchen
add screens
close cow crate in kitchen
better floor in cargo
changed floor in bridge conf room
remove few stacked pipes

* Update Cluster Evac

white steel tile under med airlock

* Update Cluster

replace tiny fans with derectional fans
link not linked external airlocks to bolting
 2024-07-21 01:23:01 -06:00
lzk
354228c4b9 Update Atlas (#30192) 
replace tiny fans with derectional fans
link not linked external airlocks to bolting
 2024-07-21 01:20:54 -06:00
lzk
40a73db91f Update Box (#30190) 
replace tiny fans with derectional fans
link not linked external airlocks to bolting and closing
 2024-07-21 01:20:43 -06:00
IProduceWidgets
3a30eea640 Update oasis (#30182) 
* Update oasis

* unpause map. We really need a test for that.

* lv cables

* magic or gate airlock
 2024-07-20 00:22:47 -06:00
Ed
ca843bd84a Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
 2024-07-19 11:23:38 +03:00
Brandon Hu
73111b5170 fix(dev_map): resave dev map (#30098) 
fix(dev_map): Resave devmap

Co-authored-by: 4llv07e <igor@c4llv07e.xyz>
 2024-07-18 10:17:57 +03:00
Ed
0931c9e7d1 Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
 2024-07-12 12:53:42 +03:00
lzk
e3bb2771d6 Update cluster evac (#29885) 
* Update cluster evac

* forgot tiny fans

* the change
 2024-07-11 15:03:51 -06:00
Ubaser
b014d4d0e0 Update Core (#29880) 
add
 2024-07-10 11:42:45 -06:00
Ed
f42546e0c6 Some round beginning preparation (#317) 
* gamepresets filter

* addgamerule cp14 filter

* shuttle dropping

* long time FTL

* FTL map tweaks

* Update ShuttleSystem.FasterThanLight.cs

* handle player ship spawning (not tested yet)

* typo

* test elemental shit (ship)

* player spawn handling (real this time)

* FTL map gravity

* clean up 1

* clean up 2

* instant FTL

* Update CP14ExpeditionSystem.cs
 2024-07-08 17:39:04 +03:00
JIPDawg
5cd7cf182a Added cryosleep UnitSpawner and UnitSpawnerLate to the map Origin (#29761) 
Added cryosleep UnitSpawner and UnitSpawnerLate

Co-authored-by: JIP <jipdawg93@gmail.com>
 2024-07-06 11:33:20 -06:00
Ed
f8b6bc7243 Update battle_royale.yml 2024-07-06 11:27:38 +03:00
Ed
205aae364c Battle royale playtest map (#309) 
* setup balance

* more preparation

* Update arenas.yml

* Update battle_royale.yml

* pop

* Update arenas.yml
 2024-07-06 11:22:36 +03:00
Ed
b1a2aaf1f5 remove vox 2024-07-04 18:25:23 +03:00
Ed
bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml
 2024-07-04 18:14:21 +03:00
Brandon Hu
96ff998d18 fix(packed): Fix a couple of issues (#29422) 
* fix(packed): Fix a couple of issues

* Name the signal button for bar
 2024-07-04 03:02:02 -06:00
Brandon Hu
fb9c03186c fix(marathon): Fixing more issues (#29411) 2024-07-04 03:01:31 -06:00
Ed
7477b7c869 Cloud shadows (#298) 
* not worked

* fix

* Update CP14CloudShadowsComponent.cs

* more params in component
 2024-07-03 17:33:38 +03:00
Ed
e9aab2b722 World borders (#296) 
* world edge mechanic

* visual fog
 2024-07-03 14:06:32 +03:00
eoineoineoin
a05d05088e Make artifact analyzer obey laws of physics (#28117) 2024-07-03 01:27:33 -04:00
Ed
dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-30 11:18:30 +03:00
IProduceWidgets
3e7c0a086b Oasis Atmos department rework (#29549) 
* Atmos department rework

* move paperwork back to library

* Would you believe I forgot a valve?

* camer and fore extinguisher wallmounts in new room.
 2024-06-28 23:35:14 -06:00
Brandon Hu
21a93eb6e8 tweak(oasis): Swap floppa and paperwork spawns (#29495) 
tweak(oasis): Swap floppa and paperworkspawns
 2024-06-28 19:24:46 -06:00
IProduceWidgets
d2eff3efa3 Oasis update (#29440) 
* very minor things, mostly issue resolutions.

* purge invalids
 2024-06-25 00:44:09 -06:00