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

26062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
02b7fe5933 marking update (#254) 
* new horny horns

* fuck this horns

* horns and hairs

* glasses resprite

* наращивание волос

* больше наращивания

* Update braid.png
 2024-06-17 22:11:22 +03:00
Ed
a6ccb25b4b Merge pull request #252 from crystallpunk-14/ed-17-06-2024-upstream 
Ed 17 06 2024 upstream
 2024-06-17 16:44:01 +03:00
Ed
4ecdb6f296 Update lube.ftl 2024-06-17 16:32:55 +03:00
Ed
917f2de69e Update glue.ftl 2024-06-17 16:16:09 +03:00
Ed
ac3a7a5c1b Update cluwne.ftl 2024-06-17 15:06:46 +03:00
Ed
f1c4e9e382 Update transformable-container-component.ftl 2024-06-17 14:48:40 +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
PJBot
efbcce21bd Automatic changelog update 2024-06-17 10:54:53 +00:00
Ubaser
5038012b67 Add new lizard horns, Demonic (#29022) 
add
 2024-06-17 13:53:47 +03:00
PJBot
b02e838926 Automatic changelog update 2024-06-17 05:21:53 +00:00
Nemanja
4aa74c5e1d improve meteor spawning (#29057) 2024-06-17 01:20:47 -04:00
PJBot
ffcaf61ffa Automatic changelog update 2024-06-17 03:31:16 +00:00
deltanedas
c332677971 remove robotics console emag checking, make it a bit fairer (#27876) 2024-06-16 23:30:10 -04:00
PJBot
7ff557d1ef Automatic changelog update 2024-06-17 03:22:36 +00:00
Cojoke
390f8d19d1 Makes Eyepatches Flippable (#26277) 2024-06-16 23:21:29 -04:00
deltanedas
f7aca6b15f nuke actions from map files (#28589) 2024-06-16 23:03:01 -04:00
PJBot
72665eb6e0 Automatic changelog update 2024-06-17 01:14:39 +00:00
Partmedia
388d372ee8 Fix incorrect use of atmos dt (#29112) 2024-06-16 21:13:32 -04:00
PJBot
8a199a882b Automatic changelog update 2024-06-16 23:25:39 +00:00
Futuristic-OK
1482345330 Delete RandomSentience event (#28982) 2024-06-17 02:24:29 +03:00
Jaraten
2b577ebfbe resprite glasses (#251) 2024-06-17 00:46:02 +03:00
Jaraten
f79c6de912 fix cardboard wall sprites (#250) 
* fix cardboard wall sprites

* То что лень делать тебе, придется делать мне.

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-17 00:40:35 +03:00
Tayrtahn
89a9f07c3a Add a system for modifying entity names without causing conflicts (#27863) 2024-06-16 15:38:53 -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
Nemanja
5e50bd83d6 Missing meteor presets (#29044) 
* add meteors into missing game presets

* changes for real

* implement code

* this too
 2024-06-16 21:37:43 +02: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
metalgearsloth
6829630d0c Update submodule to 226.0.0 (#29100) 2024-06-17 01:51:08 +10:00
Leon Friedrich
14cd55e765 Remove ServerAlertsComponentTests (#29027) 2024-06-17 01:46:59 +10:00
Ed
e4678dc66e Nails, Hammer tool and construction recipe update (#249) 
* foundation resprite

* stone material, stack

* nails!

* mini hammer resprite

* hammer tool

* wall building update

* table crafting update

* bonfire craft update

* add wooden wall craft

* chest craft update

* Update attributions.yml

* Update tables.yml

* Update simple.yml
 2024-06-16 18:31:47 +03:00
PJBot
c9540db6b4 Automatic changelog update 2024-06-16 11:59:03 +00:00
deltanedas
1cb9f5dbed add carp hardsuit for traitors (#25155) 
* FactionClothing

* swtich carp to the Dragon faction

* add carp hardsuit

* add carp hardsuit to uplink

* fixes

* webedit ops 1

* why did i name it that wtf

* among

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-16 21:57:57 +10:00
Jaraten
f0c3d99706 repsite hammer (#248) 2024-06-16 14:40:58 +03:00
PJBot
22efc2b4ac Automatic changelog update 2024-06-16 11:31:41 +00:00
Leon Friedrich
f121946b12 Fix RotateWhilePulling not working (#29032) 2024-06-16 21:30:35 +10:00
PJBot
ac979640bf Automatic changelog update 2024-06-16 11:28:41 +00:00
Cojoke
26f809aebf Instruments for Musician lodouts (#29059) 
* Musician Instruments to Musician lodouts

* Move instruments to their own file, fix instruments spawning on the floor, Found bug of Loadout dropping items on the floor rather than sorting inventory

* Whoops, I removed bagpipes for some reason
 2024-06-16 21:27:35 +10:00
deltanedas
f730d120c7 give spiders unique venom reagent (#29066) 
* add mechanotoxin

* make tarantulas use mechanotoxin

* trolled

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-16 21:26:59 +10:00
DrSmugleaf
4954b6d79e Add cvar to disable ghosting killing your crit mob (#28945) 
* Add cvar to disable ghosting killing your crit mob

* Update Content.Shared/CCVar/CCVars.cs

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-06-16 21:21:16 +10:00
DrSmugleaf
32e1d1a3b5 Use EntityQuery for mob state system resolves (#29021) 2024-06-16 21:20:54 +10:00
Nemanja
9348a5cea6 Apc & Substation resprite (#28998) 
* substation

* apcs

* top pixels

* new screens
 2024-06-16 05:43:22 -05:00
PJBot
732576b518 Automatic changelog update 2024-06-16 03:39:23 +00:00
Nemanja
3644602fb8 Fix magboots not needing a grid to work (#29034) 
* Fix magboots not needing a grid to work

* ok fix it for realsies
 2024-06-16 13:38:17 +10:00
PJBot
a341c3a1e9 Automatic changelog update 2024-06-16 02:07:18 +00:00
Keer-Sar
65af00afc4 Fixes capitalization mistake when non-humanoids insert things into machines: Fixes #28997 (#29071) 
add CAPITALIZE()
 2024-06-15 22:06:12 -04:00