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

8226 Commits

Author SHA1 Message Date
Ed
8c41c9c565 Merge branch 'master' into ed-17-07-2024-dungenagain 2024-07-17 23:46:15 +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
f774c62792 remove nesting 2024-07-17 21:20:52 +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
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
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
lzk
6443c53a8c Little saw debuff (#29995) 2024-07-17 09:26:10 +03:00
lzk
1fd8369a9c Add examine for caustic and cold damage (#29989) 
* Examinable cold damage

* lightblue

* update grammar

* caustic
 2024-07-17 09:19:13 +03:00
Ed
d8ab4982ad Character menu issuer localization (#29840) 
* Update CharacterUIController.cs

* TODO Burn this shit

* huh?

* huh!

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-07-17 08:47:50 +03:00
Nemanja
13bec7a0e9 Sign Resprite (#29806) 
* Redone signage

* Signs

* ok this thing now

* alright ig?

* big data

* cryo sign

* new sign
 2024-07-17 14:35:18 +10:00
K-Dynamic
8db252e7dc Nerf & standardised slip times (#27879) 
* standardised slip times

* puddle and gib soap

* banana peels

* cleaned yaml by shifting to component

* error slip

* error slip intersect

* intersect ratio return

* error and omega soap changes

* SlipocalypseClusterSoap 2 tc cost
 2024-07-17 09:26:02 +10:00
Jezithyr
93e4bfcfb3 Remove Geras from Slimes to address combat balance (#29731) 
Removed Geras

Removed Geras
 2024-07-16 15:50:17 -07:00
Nemanja
2e3d2db97e Revert "Change wristwatch meta description" (#30070) 
Revert "Change wristwatch meta description (#30036)"

This reverts commit 919b3ac9e6.
 2024-07-17 00:27:37 +10:00
Ed
8cbd26ae2f Farming WIP (#269) 
* setup planting doafter

* spawn plants after use seed

* some work

* move comps to separate folder

* public check daylight

* daylight plant energy regeneration

* some fixes

* bruh, im thinking

* added ingame soil

* added hoe

* attaching plants

* hoe system

* block plant dublicating

* some planting refactor

* shovel as pant + soil remover

* plant growing visualizer

* soil resprite

* split farming system to second partial class

* update throught event refactor

* tring sync update plant with update visuals

* finish visual sync

* plants growing

* more partial splitting, naming work, clean up

* Update FARMINGTEST.yml

* Update FARMINGTEST.yml

* fix typo

* prototype value validating

* Оно бухает воду!

* solution visualizer in soil

* forgot some fix

* part of Tornado review fix

* destroy RemovePlantComponent

* more fixes

* simple harvesting

* refactor plant component values changing

* harvest redo

* gather on destroyByTool

* sickle resprite

* plant fading

* fading per minute!

* wheat sprites

* YML restruct

* fixes

* auto root plants

* add comments

* move sprites

* split structures from object textures

* wheat farming!

* Update CP14FarmingSystem.Interactions.cs

* seedbed (#297)

seedbed :^)

* a

* Update soil.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-15 23:58:03 +03:00
Ed
2de26baebd Ambient loops (#323) 
* ambient loop systems

* audio content

* Update ContentAudioSystem.CP14AmbientLoop.cs

* Update attributions.yml

* limit frequency

* Update CP14AmbientLoopPrototype.cs

* Create IsDaylight.cs

* fix problem
 2024-07-15 23:18:14 +03:00
Ed
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03:00
lzk
3b85b1e43e make scarves eatable again (#29959) 2024-07-15 01:12:25 +10:00
deltanedas
35cd013e88 make ninja shoes magboots (#28586) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-15 01:11:40 +10:00
CookieMasterT
b6115b672a Add petting cyborgs (#30037) 
added petting borgs, adjusted interactions
 2024-07-15 00:09:41 +10:00
themias
a0052c5b09 Prevent virtual item storage and popups (#30020) 
* Prevent virtual item storage and popups

* fix typo

* add comment
 2024-07-15 00:08:39 +10:00
Winkarst
07535e8ecf Clumsy proof grappling gun (#29904) 
Make grappling gun clumsy proof
 2024-07-14 20:26:56 +10:00
SlamBamActionman
4f479b6c85 Fix RGB toys color when worn/in-hand (#30023) 
rgbeeeeeeee
 2024-07-14 20:26:34 +10:00
lzk
919b3ac9e6 Change wristwatch meta description (#30036) 2024-07-14 20:25:57 +10:00
Luiz Costa
87467a358b Fix lizards losing snouts when equipping a head bandana (#29979) 
* say goodbye to no-snout lizards

* remove snout from plague doctor hat HideLayerClothing component
 2024-07-14 12:59:45 +10:00
Ed
dcb3443b35 Vgroid diamonds hotfix (#29999) 
vgroid diamonds
 2024-07-13 15:45:35 +03:00
Ed
1b0c434a9f Shiny Diamonds (#25750) 
* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
 2024-07-13 15:15:57 +03:00
deltanedas
87f7ea8aa9 make cargo balance ui updating its own component (#28295) 
* add BankClientComponent and event

* query BankClient instead of hardcoded CargoOrderConsole for updating

* add BankClient to all ordering consoles

* :trollface:

* add Balance field to BankClient

* forgor

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

* m

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-07-13 16:11:14 +10:00
Nemanja
49096cf14f Watches (#29550) 
* watches

* rename

* add it into loot pools
 2024-07-13 16:09:19 +10:00
Errant
361ec59412 Dummy vox deserves a proper vox name (#29789) 
SKREEEEEeeeeeeee
 2024-07-13 16:05:57 +10:00
deltanedas
7b590122b6 fire extinguisher using item toggle (#29906) 
* move SprayAttemptEvent to shared

* add SolutionTransferredEvent

* replace FireExtinguisher with SpraySafety

* update fire extinguisher yml

* invert visuals

* always handle event in solution transfer, it makes popups

* instantly fill it

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-13 14:17:10 +10:00
lzk
55a50d0426 Use reinforced glass damage modifier for secure windoors (#29941) 
* Use Rglass damage modifier for reinforced windoors

* i actually can remove this line since inherited
 2024-07-13 14:03:16 +10:00
themias
a314a967c2 Fix timer deconstruction (#29917) 
Fix deconstruction for timers
 2024-07-12 21:38:58 +10:00
lzk
7ce3a1f27f Fix supplybot movement state (#29944) 
Fix supplybot movement sprite
 2024-07-12 21:36:40 +10:00
Ed
4f24b30b22 Update base.yml 2024-07-12 13:10:02 +03:00
Ed
2ef4402068 Update base.yml 2024-07-12 12:57:02 +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
slarticodefast
f125dda677 Make stun batons be thrown like a throwing weapon (#29883) 
* make stun batons be thrown like a throwing weapon

* stun prods too

* pies too
 2024-07-12 19:19:24 +10:00
themias
3a9b1eaa16 Allow notice boards to be built on walls (#29851) 2024-07-12 12:18:32 +03:00
Jonathan Argo
00a2c6a234 Made musket wieldable. (#29910) 
* Made musket wieldable.

* Updated musket rsi meta.json copyright.

* Copyright adjustment again.
 2024-07-12 12:16:21 +03:00
Ed
e87994ae40 Localization clean up + temp eng switch (#325) 
* Update ContentLocalizationManager.cs

* Update battle_royale_temp.yml

* Update basic-effect-reagent.ftl
 2024-07-12 08:34:08 +03:00
lzk
e3bb2771d6 Update cluster evac (#29885) 
* Update cluster evac

* forgot tiny fans

* the change
 2024-07-11 15:03:51 -06:00
deltanedas
02636386b5 item toggling giga rework + full ninja refactor (#28039) 
* item toggle refactoring and some new systems

* add ToggleClothing component/system

* unhardcode magboots gravity logic

* make magboots and speedboots use ItemToggle and stuff

* remove now useless clothing components

* update client/server magboots systems

* add note to use ItemToggledEvent in ToggleActionEvent doc

* refactor PowerCellDraw to use ItemToggle for ui open/close control

* add TryUseCharges, refactor charges system

* update magboot trigger code

* make borg use ItemToggle, network SelectedModule instead of now removed Activated

* add AccessToggle for borg

* the giga ninja refactor

* update ninja yml

* update ItemToggle usage for some stuff

* fix activatableui requires power

* random fixing

* yaml fixing

* nuke ItemToggleDisarmMalus

* make defib use ItemToggle

* make things that use power not turn on if missing use charge

* pro

* fix sound prediction

* bruh

* proximity detector use ItemToggle

* oop

* big idiot syndrome

* fix ninja spawn rule and make it generic

* fix ninja spawn rule yml

* move loading profiles into AntagLoadProfileRule

* more ninja refactor

* ninja yml fixes

* the dreaded copy paste ops

* remove useless NinjaRuleComponent and ue AntagSelection for greeting

* fix invisibility

* move IsCompleted to SharedObjectivesSystem

* ability fixes

* oop fix powercell instantly draining itself

* sentient speedboots gaming

* make reflect use ItemToggle

* fix other test

* loadprofilerule moved into its own pr

* remove conflict with dragon refactor

* remove all GenericAntag code from ninja

* )

* probably

* remove old enabled

* great language bravo vince

* GREAT LANGUAGE

* who made this language

* because it stinks

* reparent blood-red magboots to magboots probbbly works

* most of the review stuff

* hasGrav doesnt mean what i thought it did

* make health analyzer use itemtoggle, not fail test

* fix mag/speed boots being wacky

* UNTROLL

* add ItemToggle to the random health analyzers

* a

* remove unused obsolete borg func

* untrolling

* :trollface:

* fix test

* fix

* g

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-11 15:55:56 +10:00
Cojoke
eae04129cf Glass Airlocks In Spray Painter (#29869) 2024-07-11 15:33:20 +10:00
saga3152
a5ec01792b Crafting pizza boxes. (#29680) 
* We can now craft pizza boxes

* Fixing errors
 2024-07-10 15:52:33 +10:00
Ghagliiarghii
56fb8c832e books bag tabletop (#29863) 
* books bag tabletop

* Update Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-10 15:51:01 +10:00
Ivan
a0165773a4 Add scarf to warm clothing bounty (#29779) 
* Add scarf to warm clothing bounty

* Added ClothingScarfBase prototype and assigned to all of the scarves
 2024-07-10 15:26:33 +10:00
Boaz1111
d3495fc51c made the guitars be able to be worn on suitstorage (#29048) 
* made the guitars be able to be worn on suitstorage

* minor fix
 2024-07-10 09:28:10 +10:00