juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,094 Commits 57 Branches 0 Tags
34131cd70e56d60b07daaf77d665e6c8e1dedfcf
Commit Graph

10544 Commits

Author SHA1 Message Date
Ed
59e6435fe2 Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
#	Resources/Prototypes/Procedural/vgroid.yml
 2025-05-12 14:25:42 +03:00
Nim
abd69892c5 Myconide (#1265) 2025-05-11 17:04:52 +03:00
Nim
3164cb5b94 Fixing issues (#1258) 
* fix

* gib frog

* zombie

* not damage
 2025-05-10 21:45:11 +03:00
paige404
ebaa57133f Slime Crown (#1257) 
* Add slime crown, an admin-spawn artifact hat that makes all slimes friendly with the wearer.

* Add slime crown sprites
 2025-05-10 14:11:09 +03:00
Viator-MV
44f1c03e34 Spells extension (#1202) 
* fire

* trance_compression_distoration

* scroll loot

* fix

* myeh

* again mb?

* compression fix

* crystal fix

* disorion debuff

* delete all it

* final?

* nah

* not mine

* fix

* fix

* mmmm

* mana trance rebalance

* relocate trance

* fix

* blyat

* no compression

* delete all

* fix

* Update modifier_sets.yml

* Update heat.yml

* Update heat.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-10 13:28:33 +03:00
Nim
6e86a54a88 meat cooked (#1261) 2025-05-10 12:21:55 +03:00
Militore
aa2e080e31 Guard bell (#1242) 
* add Guard Bell

* revert vanila changes, add same functionality

* revert more vanila changes, replace .ogg, fix locale and locale usage

* Update GuardBell.yml

* Update base.yml

* add attributions.yml for alerts

* try changing to proper license

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-09 15:07:05 +03:00
Myra
8d4b3c0fdc Revert "Traumoxadone" (#37284) 2025-05-08 19:08:27 +02:00
Thinbug
0c6be8bb0d Tweaks to the push horn so its less of a shitter tool (#37281) 
* Empty commit

* tweaks to the push horn

* forgor to change the delay

* keeping the speed the same for now
 2025-05-08 18:49:58 +02:00
ScarKy0
9e582157ac Revert "Traumoxadone (#37126)" 
This reverts commit efc8d8600d.
 2025-05-08 18:13:33 +02:00
SlamBamActionman
90c3ba8f36 Add 3 new Exomorph posters (#37260) 
Initial commit
 2025-05-07 19:26:48 -04:00
themias
8edc8c7596 Genpop closet cargo orders (#37237) 
* Genpop closet cargo orders

* change icon to locker base
 2025-05-07 22:28:28 +02:00
Zalycon
31ce616c25 Raises max chest markings for all species (except Reptilian) to 2 (#37065) 
* Update arachnid.yml

* Update diona.yml

* Update human.yml

* Update moth.yml

* Update slime.yml

* Update vox.yml
 2025-05-07 14:44:53 +02:00
K-Dynamic
ae6f96fa87 Four-way pipe junction, swapping junction construction fix (#37092) 
* pipe x-junction assets, yml, construction

* remove duplicate asset

* attribution

* x junction instead of junctioncross for utilities.yml
 2025-05-07 13:37:59 +02:00
Flareguy
cdcc57e467 Moth displacement maps (#37231) 
moth displacement maps
 2025-05-07 13:06:42 +03:00
Archee
012eeb3158 Cryotube draw-depth (#37240) 
* removes changing draw depth when occupied

* changes collision to square

* small texture changes
fixes slight perspective size when comparing side columns to the direct column facing the camera
removes the baked in pipe exit (the yml's sprite adds it anyway)
 2025-05-06 22:01:09 -04:00
Ghagliiarghii
bcdb17597a Fix borg soap (#36961) 
* Create SoapBorg and replace SoapNT with SoapBorg in BorgModuleCustodial

* Reparent SoapBorg

No longer a container so the soap reagent cannot be extracted from the soap, no longer a food, no longer slippery since it can't be removed from the borg to be placed on the ground

* Move SoapBorg to end of soap.yml

* correct comp order

* fix failing tests
 2025-05-06 15:10:10 -04:00
pathetic meowmeow
cfba56c2b4 Make departmental orders consoles print slips (#36944) 
* Make departmental orders consoles print slips

* feed back cycle
 2025-05-06 15:04:18 -04:00
OnyxTheBrave
e527adea92 Fixed holy water metabolism rate (#37106) 
* Fixed holy water metabolizing at 1u instead of .5u a second

* Update Resources/Prototypes/Reagents/medicine.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-05-06 14:31:23 -04:00
Princess Cheeseballs
64f7fe10cc Ichor double-metabolize fix + Very minor cleanup (#37107) 
Not a yaml vacation apparently
 2025-05-06 14:16:13 -04:00
Prole
6cdc436f5f Water bottle dispenser fix & Bottle Yaml Organizing (#37108) 
* A New Parent/Category For The Soda & Tonic Water Bottle

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* New Parent For water bottle & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* More Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Details

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Organizing For Additions

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Streamlining waterbottle to be compatible with DrinkBottleVisualsAll Parent

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Replacing/Renaming Parents

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* New Tonic/Soda Water Bottle Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Misc Fixes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* New Parent for Small Glass Bottles & Organizing

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Organizing & uSize Parity.

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* File Parity

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Merged Categories & Misc Fixes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Removed Silly

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Parent Name Parity & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Large Glass Bottles Category & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
 2025-05-06 14:13:33 -04:00
lzk
740ce0e8ad Port fancy speech bubbles (#29349) 2025-05-06 20:49:42 +03:00
Ed
448cd605c4 bye frigid 2025-05-06 20:36:08 +03:00
YoungThug
c0935e5b59 AI Law Board File Clean Up (#37195) 2025-05-06 12:51:32 -04:00
archee1
ef881fe655 Removing redundant trash tags on medipens (#37215) 
removes redundant tag components
 2025-05-06 12:24:52 -04:00
Nim
d8e360367e Well and new bed, aristocratic cloak (#1228) 
* well and bed

* aristocratic cloak

* fix

* GuardCommander

* fix2

* nop merchant

* bed resp

* fix well visual

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-05-06 09:47:46 +03:00
Nim
89c737f37d Перевод на RU (#1231) 
* translated

* end

* review desert

* review 2

* fix
 2025-05-06 09:46:46 +03:00
Nim
6dca95de7b Ребаланс выпадения руды (#1244) 
* ore

* revert
 2025-05-06 09:46:04 +03:00
Viator-MV
95471fcb51 yeah.... (#1255) 2025-05-06 09:45:27 +03:00
Ed
0fc9e28637 Demiplane maps aftertest tweaks (#1256) 
* admin info panel in demiplane map

* fix core chasm destruction

* dimensit resource, more resources in demiplanes

* more fixes
 2025-05-06 08:29:09 +03:00
Ed
aeedff5caa Demiplane exploration map (#1251) 
* dehardcode nodeTreeControl part 1

* finish

* demiplane map system setup

* link map entity with station data!

* random demiplane map generation

* redesign demiplane map node tree

* center

* map generate v2

* location generation

* modifier generation

* missing location icons

* ui polish

* data refactor

* fix line color

* ejectabling

* split demiplane component into two

* blocker attempt

* revoking

* fix frontier calculation

* dimensit

* demiplane core room spawning

* demiplane cool destruction

* Update round_end.yml

* progression works now!

* Update CP14NodeTree.cs

* Update CP14NodeTree.cs

* documentation pass

* fix abusing, some balance pass

* demiplane naming fix

* см

* location names

* delete old keys

* Update buy.yml

* Update migration.yml

* fix guidebook

* Update misc.yml

* Update misc.yml
 2025-05-05 15:19:44 +03:00
brainfood1183
d7f5dac0b8 Fix for Whoopie Cushions (Fixes #32028) (#36984) 
* Fixes whoopie cushions so they no longer launch you into oblivion when stacked in a large pile.

* Update Resources/Prototypes/Entities/Objects/Fun/toys.yml

* streamlined the components for the prototype

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-05-05 01:01:27 +02:00
Perry Fraser
61d524a983 Allow shelves to be placed rotated when built by hand (#37186) 
fix: shelves can be placed rotated when built by hand
 2025-05-05 00:42:21 +02:00
4g10w
63a2248201 Medieval Screwdriver (#1253) 
* Medieval Screwdriver
Prototye & Texture

Added: screwdriver.rsi
- in hand textures
- main texture (with major help from omsoyk, tysm!)
- meta file
As opposed to vanilla SS14 screwdriver, this one only has one main texture.

Changed: screwdriver.yml prototype
- added all components from vanilla SS14 screwdriver (can be found in tools.yml prototype),
except for RandomSprite component that gives random color
- changed parent attribute from Screwdriver to BaseItem since we're making brand new screwdriver
- all components from initial prototype remained

* removed unused components

* Screwdriver recipe

Removed:
- Screwdriver recipe from anvil (iron bar)
Added:
- Screwdriver recipe to workbench (wooden grip + iron bolt)

To fit more with updated screwdriver visuals, recipe is updated too.
 2025-05-04 22:29:34 +03:00
J
7b352643d5 Refactor magic speak system to be a component added to actions (#36328) 2025-05-04 13:34:19 -04:00
Nemanja
f1a17f360d Revert "add material composition to some salv treasure" (#37149) 
* Revert "add material composition to some salv treasure (#31970)"

This reverts commit 125258ea48.

* Remove ring materials as well
 2025-05-04 04:39:19 +02:00
Nemanja
9afa15ab41 Salvage Threat: Gibtonite (#37160) 2025-05-03 17:38:47 -07:00
Minemoder5000
42a5b03743 Replace uplink thieving gloves with chameleon thieving gloves (#36369) 
* replace thieving gloves with chameleon thieving gloves

* increase TC cost by one

* add a TODO comment
 2025-05-03 15:28:47 -04:00
Nemanja
0c8c757a42 Revert "Resprited the Chief Engineer's mantle/manica" (#37060) 
Revert "Resprited the Chief Engineer's mantle/manica (#36697)"

This reverts commit d0c2a64436.
 2025-05-03 14:28:59 -04:00
Ghagliiarghii
885eb7bc35 ClothingOuterEVASuitSyndicate (#36738) 
* ClothingOuterEVASuitSyndicate

* Update migration.yml

* Resolve merge conflict in migration.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-05-03 12:06:35 -04:00
Radezolid
aaa4c75341 Fix some maintenance doors not using wires configuration + cleanup + minor changes (#36735) 
* Kill useless maints doors + general fixes

* Migrate the common maints airlock

* Fix parenting

* Service Theatre

* migrate out the other removed airlock

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-05-03 11:07:57 -04:00
Viator-MV
3bbf692da5 Ultraskeletom Revmech Update (#1145) 
* help me

* reinforced swords

* skill tree

* fix

* T2 fix

* components

* fix 2

* fix

* halberd fix

* other variant

* recheck it please

* fix

* deskill

* deslikk++

* skel physical buffs

* bad fix

* fix

* extended life time

* fix

* fix

* fix

* heal from death

* sword fix

* fix

* try to fix

* valid crashout?

idk

* It's not my fault.

* fix

* fix

* fix

* review fix

* forgot

* fix

* ашч

* meh

* reequipment

* wrong agony

* fix

* gripfix

* fix

* looking for result

* coment remove

* some fixes

* ok

* aaaaaaaaaaaaaaaaa

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-03 16:51:25 +03:00
Ed
0b994d2e1f en 2025-05-03 16:37:09 +03:00
Errant
79187cecb9 randomize names for mindshielded eventhumanoids (#37143) 2025-05-03 08:10:43 -04:00
3nderall
213a9ef36d Renders reagent grinders over lights (#31218) 
* Adds a new layer to DrawDepth.cs for use with objects similar to the reagent grinder and properly summarises its uses

* applies new layer in DrawDepth.cs to reagent_grinder.yml

* Fix merge conflict

* oops
 2025-05-03 14:27:20 +10:00
Unkn0wn_Gh0st
11096ad9bf New Weapon: Knuckle Dusters (#33470) 
* New Weapon: Knuckle Dusters

* Tag YAML Error Fix

* Crafting Graph Node Error

(Thank you slarticodefast)

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Crafting Node Error Part 2 Electric Boogaloo

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Contraban & QM Dusters Nerf

* Stun Knuckledusters (Unfinished)

* Typo

* Fix test fails

* The dastardly maintainer balance webedit

* Fix contraband parenting

* Fix construction failure

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-05-03 00:18:08 -04:00
ScarKy0
efc8d8600d Traumoxadone (#37126) 
* init

* salicylic acid
 2025-05-03 00:56:47 +02:00
Prole
c153f84e42 noRot on 2-way lever (#37125) 2025-05-02 13:07:20 -07:00
Vladislav Suchkov
b4ad372ca7 Clarify that PA crate order includes boards (#37109) 
init
 2025-05-02 14:31:49 -04:00
Errant
2b2bfbfebd Fix for vox dropping all bodyparts when gibbed (#37111) 
vox parts cleanup
 2025-05-02 13:12:23 -04:00