Alexsey Bezyuk
a73f8e3113
Seed sack and craft ( #1287 )
...
* seed_sack
* full seed sack
* seed sack sprite
* name and description
2025-05-21 12:41:22 +03:00
Ed
fd6965efe0
skimimimi
2025-05-18 15:36:28 +03:00
Ed
1cd20edecf
Workshop resprite pack ( #1279 )
...
* Jaraten resprite pack
* stamina TTomattT
* shrooms jaraten
* cloak fix
* passport resprite
2025-05-18 01:24:07 +03:00
Ed
132d1db37b
search of life spell ( #1273 )
2025-05-16 00:58:48 +03:00
Ed
e0a4f5592f
Blood moon ( #1270 )
...
* some setup
* fix dayccle events, add basic gamerules
* carcat guidebook update
* pfpf
* wawa
* fnish
2025-05-15 17:32:26 +03:00
Viator-MV
80d668361c
Mana trance ( #1216 )
...
* That's it, Ed.
* skill
* CleanDisposed.
* now heal
* remake
* bruh rechek
* slowing
* Update metamagic.yml
* some ingame test and balance
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-05-14 14:56:27 +03:00
creamybag
edecdc3701
PackOmsoyk ( #1267 )
2025-05-14 13:53:56 +03:00
Ed
be495f274c
Skill progression system ( #1263 )
...
* delete skill trees
* Revert "delete skill trees"
This reverts commit 9d7fae73c4😢
* skimitar gaming
* skimidi
* blacksmithing branch
* remove research restrictions
* remove species magic buff
* fix loc
* Update thaumaturgy.yml
* pip
* Delete skill_tree.yml
2025-05-14 12:43:43 +03:00
Nim
abd69892c5
Myconide ( #1265 )
2025-05-11 17:04:52 +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
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
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
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
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
e792440c19
Gob hairs ( #1250 )
...
* renorma
* gobhairs
2025-04-30 22:14:13 +03:00
Ed
ef6d973301
Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
...
# Conflicts:
# Content.Client/Parallax/ParallaxControl.cs
# Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
# Content.Server/Labels/Label/LabelSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Fluids/Components/EvaporationComponent.cs
# Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/Pools/deathmatch.yml
# Resources/Prototypes/Maps/arenas.yml
2025-04-30 20:31:50 +03:00
Ed
2358bc46d6
Torches + Cotton ( #1246 )
...
* torches add, wallmount crystals deletion
* cotton
* Update buy.yml
* craftis
* delete elemental quartz
* energy crystal resprite and rewamp
* fix
* Update misc.yml
* а
* delete rituals
* riat
* Update migration.yml
* Delete CP14ClientRitualSystem.cs
* Update statues.yml
* fix
* Update wallmount_lamp.yml
* fix
2025-04-30 17:28:38 +03:00
Tornado Tech
ad2fc18356
Dimensional ( #1140 )
...
* add: Temporamancy tree with new shadow swap spell
* feat: Increased tempo loadout to 2
* feat: Remove most popups from swap spell
* fix: Swap with no mob entities
* feat: Add CanCast to spell effect
* fix: Handeling cancaled event & swap state
* feat: Add UseCustomCastConditions
* feat: Add swap to magic shadow staff
* feat: Add tempo essence & magic type
* feat: Add Tempo type to all dimension spells
* fix: Magic shadow staff tempo manacost modify
* fix: Spell type local
* feat: Add touhou lore
* fix: Review
* feat: Add target dead block component
* feat: Remove checking access
* feat: Add RequireCanInteract
* feat: Remove essence
* fix: Review
* fuck
* fuck part 2
* Update Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs
* Update dimension.png
* minor nitpick
* fix
---------
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2025-04-30 17:25:10 +03:00
Ed
c3b6938388
unicorns
2025-04-29 17:14:05 +03:00
Nemanja
d4e40ae44b
Revert "Add new color turtlenecks in WinterDrobe" ( #36983 )
...
Revert "Add new color turtlenecks in WinterDrobe (#32920 )"
This reverts commit 34cc49c175
2025-04-28 19:38:43 +02:00
Nemanja
4509821f0e
[HOTFIX] Revert "Updated air scrubber and air vent sprites." ( #36992 )
...
Revert "Updated air scrubber and air vent sprites. (#34223 )"
This reverts commit 3957bbb97d
2025-04-28 11:45:19 +02:00
Ed
a1153843a2
Storage durability rebalance + Fuck nails ( #1225 )
...
* fix storage
* bye nails
* Update target.yml
* f
* Update migration.yml
* Update migration.yml
2025-04-26 17:20:52 +03:00
Ed
cff9dc6fcf
Wendigo renamed to Lurker ( #1213 )
...
* Добавлены изменения для создания пулл реквеста
* Update Step.yml
* rename!
* fix
* interrupting toggleable spells
2025-04-26 16:38:54 +03:00
Ed
7941be4490
dungeon walls resprite, fix TOSTRING problem from C4viwlle
2025-04-26 13:29:23 +03:00
creamybag
72d8767a6d
recoloring ( #1221 )
2025-04-25 18:27:07 +03:00
Ed
a8b1b0ed37
sphere of light redesign
2025-04-25 14:11:36 +03:00
Nemanja
dc9844edd1
Genpop Closets & IDs ( #36392 )
...
* Genpop IDs and Lockers
* placeholder generation, no ui yet.
* UI
* Fix time offset
* fix meta.jsons
* big speller
* Scarkyo review
* Add turnstile prototypes
* make IDs recyclable
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
2025-04-24 16:32:11 +02:00
Ed
4bb614981f
Keys & Locks crafting ( #1207 )
...
* keeye
* random locks for demiplanes
* blank keys, material keys
* craft blank keys
* key file
* fix skill tree UIScaling
* fix audio and sounds and prediction
* delete crowbar, merge its into pickaxe
* QoL key shaping
* lock introdusing
* QoL progress lockpicking
* examinable lock
* lock insert
* mithril lockkpick
* Update wall_dirt.yml
2025-04-24 17:10:52 +03:00
Nemanja
712954f1c4
Turnstiles ( #36313 )
...
* construction rotation fix
* Turnstiles
* renaming
* review-slarticodefast-1
* mild attempts to fix (sorry sloth)
* move some more shit
* Remove engine dependency
* grid agnostic
* remove debug string
* fix json
* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* remove pass delay for mispredict reasons.
* most minor of changes
* Give directional indicator on examine
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-04-24 13:39:40 +02:00
SG6732
b0edf7106f
Meat Patty ( #34896 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-04-23 20:45:27 -07:00
Smith
8478125fe8
Cotton Grilled Cheese Sandwich ( #36135 )
...
* Working entity.
* New sprite by MadeOfHeartAndStone
* Removed deadspace, changed attribution in meta.json
* review
---------
Co-authored-by: Milon <milonpl.git@proton.me >
2025-04-24 05:24:37 +02:00
No Elka
a8f05f5547
Make toy sword less obvious ( #34199 )
...
* YAML fuckery
* Remove toy_sword.rsi
Not a webedit btw
2025-04-24 03:21:35 +02:00
Winkarst
3ac8bc71f1
Cleanup: Move folders out of bureaucracy.rsi and paper.yml ( #35108 )
...
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-04-22 23:31:42 -07:00
kosticia
2076e8b02d
Moth-pockets ( #34517 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-04-22 22:36:54 -07:00
Hanz
bd1f2af691
Ashtray Resprite and Fix ( #31643 )
...
* The meat and potatoes
Yup
* Stupid recycler
bruh
* guh
guh
2025-04-22 15:34:39 -04:00
Golden Can
106a31410f
Command uniform ( #32103 )
...
* Added generic command jumpskirt, jumpsuit and cap, and made them available in the HoP's clothing printer.
* fixed generic command jumpskirt and jumpsuit.
* Updated generic command jumpskirt/-suit textures, added generic command beret.
* Fixed game-breaking bug in previous commit relating to the command beret.
* altered generic command soft cap/baseball cap sprites.
* Update Resources/Prototypes/Entities/Clothing/Head/hats.yml
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
* review
* whoopsie
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Milon <milonpl.git@proton.me >
2025-04-22 14:35:43 -04:00
Nim
b70af8848c
Modular helmet ( #1206 )
...
* modular helmet
* fix
* del Bascinet
2025-04-22 14:12:41 +03:00
Ed
0996413d72
Structure Durability rebalance - Part 1 ( #1205 )
...
* walls rebalance pass
* windows and fence fix
* doors rebalance
* doors tweaks
* door construction rebalance
* Update WallWood.yml
* Update WallDirt.yml
* stone wall sfx
* ore rebalance
* Я не удержался и снес половину репы
* fix rsi
* Update windows.yml
* stonebrick constructions
* Update stonebrick.yml
* Update migration.yml
* Delete cargo_shuttle.yml
* Delete wall_marble.yml
* fix
* Update wooden.yml
2025-04-22 13:22:28 +03:00
Ghagliiarghii
5b18f99b8d
Fix Animal Versions of Captain Uniform ( #36804 )
...
* scienceevasuit
* update money uniforms
* update meta.json files and hamster hats
* revert scienceevasuit
* revert accidental prisoner eva change
2025-04-21 21:03:36 -04:00
ShadowCommander
1bfa303f36
Firelock temperature and pressure warning lights ( #28339 )
...
* Add temperature and pressure lights to firelocks
* Replace sprites with new pressure and temperature light versions
* Remove obsolete deny and locked sprites
* Add SpriteSync for warning light animation synchronization
* Teal lights
* Partial animation implementation
* fixup! Teal lights
* Temperature lights
* Adjusted firelock light heights and added final warning light sprites
* Fix colors
* Testing colors
* Update light sprites
* updated sprites
---------
Co-authored-by: EmoGarbage404 <retron404@gmail.com >
2025-04-21 18:39:28 -04:00
T
cc80f8d782
Added a semi-functional genderfluid pin. ( #35854 )
...
* Added a semi-function GenderfluidPin
* Update pins.yml
fix bug
* Fix meta.json under the newly merged "fix as you go" policy
* Update pin description
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
2025-04-21 13:46:33 -04:00
Hrosts
ae8b5c6097
Add rehydratable mop bucket cube, refactor the rehydratable yml ( #34586 )
...
* Refactor rehydratable items
* Finish main refactor
* Add mop bucket cube
* Move cube sprite and item size to RehydratableAnimalCube
* Fix sprite attribution
* Make it follow the conventions
* Refactor wrapped cube, leave MonkeyCube tag only on the cube and the Syndie Sponge
* Fix DehydratedSpaceCarp inheritance overwriting needed components
* no need for this comment
* remove whitespace
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* indentation
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Restore lost description
* reorder stuff
* line
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-04-21 13:16:25 -04:00
ScarKy0
2fdfb4b14a
Reworked Mail Spawning ( #36774 )
...
* init
* stuff
2025-04-21 11:32:18 +02:00
Nim
5bbf0df340
Bell ( #1185 )
...
* bell
* soundCollection
* sound
* bell sound
* bell short
* surrendering
2025-04-21 11:46:58 +03:00
Entvari
dee1db4113
Wizard Headset ( #35732 )
...
* wizardcomms
* wizheadset
* Addressed requested changes and axed wizard channel due to redundancy.
* oops overlooked this, dont tell anyone
* another mistake fixed
* removed wiz encryption key due to redundancy
* accidentally left some punctuation in a now unrelated meta.json
2025-04-20 17:38:30 -04:00
uhbg
94b46a9edc
The Bartender can now make Eggnog ( #34065 )
...
* Preliminary eggnog changes (egg in shaker crashes?)
* Fixed eggnog reagent name and description
* added - to flavor
* deleted a space
* Added eggnog glass sprite
* changed fill levels to match rsi
* Added two more fill levels to eggnog
* Removed fizziness, changed physical description, and fixed rsi
---------
Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
2025-04-20 17:27:35 -04:00
