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

1896 Commits

Author SHA1 Message Date
Ed
f94d3d9689 Update xandria.yml 2024-07-17 23:48:15 +03:00
Ed
5ede8bb0a6 add xandria atlas 2024-07-17 18:11:08 +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
Brandon Hu
e8a4808f16 fix(atlas): Replace mindshield crate with implanter crate (#29184) 2024-06-23 02:04:31 -06:00
Brandon Hu
93eded4803 fix: Adds a missing defribilator to nukie planet (#28362) 
* fix: Adds a missing defribilator to nukie planet

* Fix: unpause nukie map

* What changes?
 2024-06-23 02:04:09 -06:00
Brandon Hu
7399c758d3 fix(oasis): Replace mindshield crate with implanter crate (#29181) 2024-06-23 02:02:21 -06:00
Brandon Hu
33baf418cd fix(cluster): Replace mindshield crate with implanter crate (#29182) 2024-06-23 02:02:08 -06:00
Brandon Hu
8573eda852 fix(origin): Replace mindshield crate with implanter crate (#29183) 2024-06-23 02:01:54 -06:00
Brandon Hu
00e7aa4976 tweak(marathon): Fix some stuff (#29256) 
* tweak(marathon): Add cargo request computer to bridge

* fix everything else
 2024-06-23 02:01:11 -06:00
Brandon Hu
32e2a4e9ce tweak(meta): Swap around some of the computers in bridge (#29263) 
* tweak(meta): Swap around some of the computers in bridge

* tweak(meta): unpause map
 2024-06-23 02:00:42 -06:00
Brandon Hu
6ba2df7fa4 tweak(fland): Add radiation shutters to front of PA (#29265) 2024-06-23 02:00:13 -06:00
Brandon Hu
9455d0da7f tweak(emergency_box): Swap out Salvage Material crate with Engineering crate (#29269) 2024-06-23 01:59:57 -06:00
Brandon Hu
b1955f72d7 tweat(emergency_delta): Add screens around the evacuation shuttle (#29267) 2024-06-23 01:59:37 -06:00
Brandon Hu
252a3e6be4 tweak(saltern): Place a red phone in bridge meeting room, add another artifact spawn (#29359) 
* tweak(saltern): Place a red phone in bridge meeting room

* add artifact spawn
 2024-06-23 01:59:07 -06:00
Brandon Hu
bada3bc75b fix(omega): Connect the disposal unit in medbay to the disposal "network" (#29305) 
fix(omega): Connect the disposal unit in medbay to the disposal pipe system
 2024-06-23 01:57:20 -06:00
Brandon Hu
de22f659e8 fix(packed): Fill the medical lockers in medbay (#29319) 2024-06-23 01:57:04 -06:00
Ed
3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
 2024-06-21 18:30:31 +03:00
Leon Friedrich
20544b0c76 Rejig device link sink & source startup & shutdown (#29035) 
* Fix DeviceLinkSinkComponent not updating sources on shutdown

* Log error

* Misc link changes & fixes

* Fix core
 2024-06-20 01:03:32 +10:00
metalgearsloth
65821c96f4 Fix conveyor mispredicts (#28157) 
* Fix conveyor mispredicts

Instead of tracking active conveyors we instead track the conveyed entities. This also handles things like stacking conveyors more gracely.

* Fix ActiveConveyor

* Fix lerping
 2024-06-18 22:11:36 +10:00
Ed
4c12b6e7c6 cool hat, delete cave arena (#256) 
* hat and glasses

* delete cave arena

* Update default.yml
 2024-06-17 23:48:42 +03:00
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
 2024-06-17 14:20:38 +03:00
deltanedas
f7aca6b15f nuke actions from map files (#28589) 2024-06-16 23:03:01 -04:00
deltanedas
ee2769ed9f atlas update (#28514) 
* atlas update

* unkill previous changes

* fix lawyer room

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-16 13:38:00 -06:00
lzk
31d155dfe0 Update box (#28348) 
* Update box

robotics console

* Morgue airlock

* update
 2024-06-16 13:37:37 -06:00
lzk
ce5641036c Update fland (#28347) 
robotics console
 2024-06-16 13:37:26 -06:00
lzk
92e6e10c0a Update train (#28345) 
robotics console
 2024-06-16 13:37:17 -06:00
lzk
93ea4c07ff Update packed (#28346) 
robotics console
 2024-06-16 13:37:08 -06:00
lzk
99358e8d4d Update marathon (#28344) 
* Update marathon

robotics console

* morgue door
 2024-06-16 13:36:54 -06:00
lzk
771c34c304 Update omega (#28343) 
* Update omega

robotics console

* morgue door
 2024-06-16 13:36:38 -06:00
lzk
fdb487ccfe Update origin (#28342) 
robotics console
 2024-06-16 13:36:11 -06:00
Ed
c5a8e96dca Skills system (#247) 
* init basic skill system

* add skill requirement to advanced melee weapon

* working hard

* more hard work

* shot skill issue

* Now the skills give you the components

* add job special autolearning skills

* traits recreating

* some tweaks

* remove bg and components for now

* sharpening now require skills

* add alchemist role on maps

* pestle skill issue
 2024-06-15 16:55:04 +03:00
Flareguy
7afbe3c98e Adds 2 new space ruins (#28971) 
adds 2 new space ruins
 2024-06-15 00:02:56 -06:00
deltanedas
65424e0253 saltern update (#29001) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-15 00:01:13 -06:00