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

26721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
aae4be5e7c Merge branch 'master' into ed-17-07-2024-dungenagain 2024-07-20 17:12:04 +03:00
Ed
a7f1dfaec4 Merge pull request #338 from crystallpunk-14/ed-19-07-2024-upstream-walls 
Ed 19 07 2024 upstream walls
 2024-07-19 11:35:48 +03: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
Ed
c8a90a74c0 Update ContentLocalizationManager.cs 2024-07-19 11:20:34 +03:00
Ed
d6e0114126 randomize iconSmoothing (#28158) 
* randomize iconSmoothing

* Revert "randomize iconSmoothing"

This reverts commit 094356f975737c0af24ce39d849aec7852b9af6e.

* try 2

* trying work with client-server communication

* still dont work

* Tayrtahn good suggestion

* remove outdated code

* Fix!

* move data to Appearance

* Update RandomIconSmoothComponent.cs
 2024-07-19 18:13:35 +10:00
metalgearsloth
6005a9f4cb Fix door access in mapping mode (#30030) 
Fix shouldn't break anythingTM.
 2024-07-19 16:19:15 +10:00
PJBot
56ee4da535 Automatic changelog update 2024-07-19 01:10:01 +00:00
Plykiya
6d18dff33d Fix for thrown items dealing damage twice to first target (#30115) 
* FUCK YOU

* fine

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-18 21:08:52 -04:00
Cojoke
b57174007c Remove all Assigned Values that are Never Used (#30110) 
Remove all Assigned Values that are never used
 2024-07-18 20:22:23 -04:00
Plykiya
84fe6bcde4 Fix arrow pointing animation (#30134) 
Fixa the arrows

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-18 20:21:01 -04:00
PJBot
d30b45f23f Automatic changelog update 2024-07-18 22:37:59 +00:00
portfiend
3ef5f521e2 fix: give reptilians species mask sprites in lobby (#30095) 2024-07-19 01:36:53 +03:00
PJBot
0c2b569622 Automatic changelog update 2024-07-18 22:35:26 +00:00
Smirnov Peter
2fb2cde125 Add item checking for moth food (#30019) 
* Add ContainerContainer component checking for moth food

* Use ItemSlotsComponent checking on food item
 2024-07-19 01:34:18 +03:00
Ed
2bf17fdc35 Content pack (#337) 
* added rope

* black shirt replace

* Update migration.yml

* more berets

* loadout update

* captain role and jacket

* bruhh captain cap

* add one-handed sword

* shield!

* Update entities.ftl
 2024-07-19 00:03:08 +03:00
Ed
dec6a1c2ca Ru localization update (#335) 
* Update entities.ftl

* Update ContentLocalizationManager.cs

* Update ContentLocalizationManager.cs

* Update entities.ftl
 2024-07-18 23:40:06 +03:00
Ed
437fc936a2 LatheSystem independently of energy (#30148) 
* Update LatheSystem.cs

* Emo
 2024-07-18 22:29:20 +03:00
slarticodefast
a94f1f0fe0 Correct .editorconfig to use no space after casting (#30132) 2024-07-18 10:43:20 -08:00
Jaraten
77b1113d5d Walls upd (#333) 
* wewe

* oops

* oooopsss 2
 2024-07-18 16:11:59 +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
PJBot
58a2a4c932 Automatic changelog update 2024-07-18 00:49:15 +00:00
Plykiya
961a553fa2 Fix stun batons using excess charges when thrown (#30136) 
Fix stun batons

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-18 10:48:08 +10:00
PJBot
d7b2e72882 Automatic changelog update 2024-07-18 00:42:02 +00:00
slarticodefast
3f014e84eb minor SharedInteractionSystem cleanup (#30139) 
cleanup SharedInteractionSystem
 2024-07-18 10:41:15 +10:00
Cojoke
95b56ad4ce Prevent Quantum Spin Inverter from Teleporting Things into Microwaves (#29200) 
* Prevent Quantum Spin Inverter from Teleporting Things into Microwaves

* Simplifies code, GetTeleportingEntity instead of TryGet, adds failed teleport message

* remove using Linguini.Syntax.Ast;

* capital...

* re-add CanInsert and Fixes microwave issue

* beb

* beeb
 2024-07-18 10:40:54 +10:00
kbailey-git
c7ea0490a6 Updated slime storage capacity text in guidebook (#30121) 2024-07-17 15:54:08 -07:00
Ed
e1f429b6b3 DungeonSystem.Rooms bugfix (#30125) 
Update DungeonSystem.Rooms.cs
 2024-07-17 18:37:03 -04:00
PJBot
2d5bb92f46 Automatic changelog update 2024-07-17 22:05:58 +00:00
Errant
ef02f8c18c Temporarily remove Vox from space ninja and Unknown Shuttle ghostroles (#30099) 
* no vox ninjas

* blacklist vox from UnknownShuttleEvent
 2024-07-18 01:04:51 +03:00
Ed
0a82d35c0f Merge branch 'ed-17-07-2024-dungenagain' of https://github.com/crystallpunk-14/crystall-punk-14 into ed-17-07-2024-dungenagain 2024-07-17 23:48:34 +03:00
Ed
f94d3d9689 Update xandria.yml 2024-07-17 23:48:15 +03:00
Ed
8c41c9c565 Merge branch 'master' into ed-17-07-2024-dungenagain 2024-07-17 23:46:15 +03:00
Ed
eba7d2de0d Merge pull request #331 from crystallpunk-14/ed-17-07-2024-upstream 
Ed 17 07 2024 upstream
 2024-07-17 23:46:05 +03:00
Ed
fb7ca28b9a update locales 2024-07-17 23:35:22 +03:00
Ed
02275a0237 Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream 2024-07-17 23:25:31 +03:00
Ed
d3955a4400 bruh 2024-07-17 23:21:00 +03:00
Ed
66495b368d Update CP14RoomSpawnerComponent.cs 2024-07-17 23:01:42 +03:00
Ed
8df640b693 move ignore tiles to roomProto 2024-07-17 21:29:24 +03:00
Ed
7511c8177b add spawner probability 2024-07-17 21:27:15 +03:00
slarticodefast
6f5077803b Fix formatting warnings (#30122) 2024-07-17 10:25:19 -08:00
Ed
f774c62792 remove nesting 2024-07-17 21:20:52 +03:00
Ed
4049907b7f Update CP14RoomSpawnerSystem.cs 2024-07-17 18:32:43 +03:00
Ed
ef460cb59c mask tile filtering 2024-07-17 18:30:28 +03:00
Ed
5ede8bb0a6 add xandria atlas 2024-07-17 18:11:08 +03:00
Ed
7c0c8c5b33 polishing, bugfixing 2024-07-17 17:38:00 +03:00
PJBot
be9acaea35 Automatic changelog update 2024-07-17 13:51:32 +00:00
Winkarst
ba2c5fcded Make the super door remote to be able to control Syndicate doors (#30033) 
* Make the super door remote to be able to control Syndicate doors

* Fix
 2024-07-17 09:50:24 -04:00
Ed
951e553926 room spawner 2024-07-17 16:33:28 +03:00
Ed
0a42834dbe move biomespawners 2024-07-17 16:32:58 +03:00
Flareguy
b20fd4fbd0 Vox displacement updates (#29824) 
* more vox displacement maps

* A

* remove vox insuls sprites

* sci magboots

* Update vox.yml

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-17 10:43:11 +03:00