Commit Graph

2897 Commits

Author SHA1 Message Date
Nim
41f33bf005 Potions pouch (#1026)
* pouch

* loadout

* fix

* fix name

* fix name duo

* loadouts2
2025-03-15 16:30:40 +02:00
Ed
f989980df3 Carcats species [Draft] (#1023)
* body parts

* proto setup

* inhand displacements

* carcat cloak

* eyes

* gloves

* pants carcat

* pants

* shirt

* markings nose + ears

* Update 5.png

* shoes + naming

* helmet adapt

* carcat sounds

* Update sewing_table.yml

* s

* Update comoss.yml

* Update factoria.yml

* s
2025-03-14 14:11:41 +03:00
Ed
93ed28d34c Trading content (#1010)
* reroll positions

* more trading content

* bugfixes

* more content

* guidebook uodate

* Update buy.yml
2025-03-12 00:51:58 +03:00
Link
0168dbabbb Separated mana modifiers (#1001)
* brainrot

* Update test_armor.yml
2025-03-11 10:23:09 +03:00
Nim
74fa1251c7 Modular armour 1 (#936)
* armor

* fix

* fix color

* migra

* + *

* balance

* caustic

* presets

* migr2

* plate

* chainmail

* fix speed

* ehh

* ehh2

* ehh3

* fix layers

* mask craft

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-03-10 16:24:10 +03:00
Nim
391cc8e7a5 Green salad (#999)
* green salad

* maxvol

* duplicate
2025-03-10 15:18:36 +03:00
Ed
10b38f04ce 129 Dinazewwr hairstyles (#717)
* first pass

* Sync new sprites

* ru loc

* chatgpt moment

* clean up

* Update human-hair.ftl
2025-03-10 13:06:18 +03:00
Ed
0b5712ce97 Vampire antag (#988)
* new blood types

* vampire systems setup

* death under sun

* vampire blood nutrition

* alerts

* autolearn skills

* base bite actions

* suck blood spell

* polish

* Update blood.yml

* unshitcode

* vampire hunger visual

* nerf speed

* hypnosis + map update

* darkness demiplane warning
2025-03-07 14:52:43 +03:00
Nim
cea7d93d12 Fixes (#975)
* fixs

* not
2025-03-06 16:33:10 +03:00
Ed
c1acf81541 NewTrade (#969)
* trading portal replace traveling storeship

* clean up content

* clean up content 2

* seel and buy realization

* fixes

* Update migration.yml

* Update migration.yml

* Update dev_map.yml

* Update dev_map.yml

* thats work correctly now

* bugfies and visual

* factions

* faction restruct + name reduce

* unnesting sell cargo positions

* unnesting cargo positions

* more cargo content

* Update buy.yml

* improve tradeportal visual

* Update migration.yml

* Bank ad Commandant removal

* merchant objectives

* finish

* clean up content

* Update migration.yml

* fix goal calculation

* Update comoss.yml

* Update dev_map.yml
2025-03-06 12:01:43 +03:00
Nim
e54e8a95ee Sheep (#972)
* sheep

* demi mod
2025-03-05 17:30:06 +03:00
creamybag
d9a5869504 Merge pull request #973 from creamybag/GuildmasterHat
Guildmaster hat
2025-03-05 17:28:41 +03:00
Ed
acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
2025-03-03 23:23:40 +03:00
Nim
2855cc906b Мелкий фикс перевода (#966)
* fix

* a

* ehh

* yep
2025-03-03 23:17:00 +03:00
Nim
9ea547d8be Перевод на RU (#949)
* translate

* fix

* yee

* qwerty

* fix

* Signal

* Skeleton

* arrow

* fix
2025-03-03 09:38:09 +03:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955)
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
2025-03-02 13:28:13 +03:00
Ed
b8c2d662b6 English OBT setup (#956)
* fix

* Update Dev.toml
2025-02-28 20:18:28 +03:00
Ed
3fd47443ae Essence collector (#952)
* collector attract essence

* collector

* Update magic-essence.yml

* Update essence_collelctor.yml
2025-02-28 15:55:47 +03:00
SlamBamActionman
41c51e2905 Implanter draw rework (#32136)
* Initial commit

* Clean-up

* Fix ftl, new damage

* ftl fix for real

* Updates based on feedback

* Child implant fix

* Make the UI only open when implanter is in draw mode

* Review fixes

* shunting
2025-02-27 18:57:28 +01:00
deltanedas
7520d8a2c8 add button to print logprobe logs (#32255)
* add EntityName at the bottom of LogProbe

* pass User into CartridgeMessageEvent

* add button to print logprobe logs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-27 14:47:16 +01:00
āda
f80f305d1d Add filters to uniform printer (#34316)
* uniform

* missing category

* lint

* bedsheets

* carpets

* typo

* indent
2025-02-27 13:44:10 +01:00
kosticia
a5aab8b8a1 Fire resist now can be examined. (#35183) 2025-02-27 23:39:55 +11:00
Ed
3d398e89ab integration whistler poison into alchemy (#950) 2025-02-27 15:12:30 +03:00
Dora
53dc27cb1e Adding sorting to chem master (#34763)
* Adding sorting to chem master

* Chem Master can now sort based on following categories
 - Alphabetical
 - Quantity
 - Time Added to Machine

* Sorting is disabled by default and persist in the machine for everyone

* Removed some pointless code from Chem Master's UI

* Changed None and Time Added's text to reflect what they do better

* Minor adjustments to the code requested by maintainers
2025-02-27 12:19:52 +01:00
Nim
15d9657139 Invisible whistler (#941)
* invisible whistler

* Parts

* spike

* flavor

* flavor

* filter

* sprite

* demiplan
2025-02-27 14:02:30 +03:00
Ed
5524e029f4 Essence splitter (#948)
* disable rotting

* pipipi

* essence storage

* energy splitter

* Update essence_splitter.yml

* Update impact.png

* visual fixes

* sound fix

* Update twoHandedStaffs.yml

* unhardcode

* Update meta.json

* fix
2025-02-27 13:48:38 +03:00
Brassica Prime
f850b69e89 Wizard Stamp (#35552)
* First go around adds everything necessary to work

* fixes issues with attribution and a whitespace

* Update Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update Resources/Textures/Objects/Misc/stamps.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: Pumkin69 <judeb@DESKTOP-M4B8G5D>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-02-27 11:26:30 +03:00
Errant
c698b163b6 Admin Options tab (#35543)
* admin options tab initial

* make admin tab only visible to admins
2025-02-26 23:32:42 +01:00
SpeltIncorrectyl
e86770f5a0 Mime can no longer write on paper without breaking their vow (#35043)
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
2025-02-26 10:11:59 +01:00
Ed
aed7e0994a pax bard (#943) 2025-02-26 12:01:14 +03:00
keronshb
68de58eb66 THE WIZARD (#35406)
* Adds Survivor Antag

* Adds Survivor Role

* Adds Survivor Rule ECS, adds a survivor role event, adds make antagonist to  random global spawn spell

* Moves Survivor Ensurecomp to event handler. Makes Add Survivor Role a broadcast. Adds Survivor Component. Removes redundant briefing.

* Adds Survivor Antagonist role type for admins to keep track of this easier, adds it to Survivor.

* Adds access to survivor game rule system

* Adds Survivor Rule

* Adds end of round survivor text

* Adds end of round reporting logic. Adds logic to start the survivor rule.

* Changes desc from centcomm to shuttle

* survivor (S)

* Checks if they're alive on the shuttle instead of centcomm.

* ftl text selection based on number of survivors.

* Removed Survivor Antagonist, replaced it with Free Agent.

* Adds InvalidForGlobalSpawnSpell tag, checks for it on spawnspell, and adds it to a zombified person.

* Changes logic so we launch the game rule if it hasnt launched yet. Moves rule logic starting to server. Moved survivor rule logic out of event and into Start method.

* Fixes invalid entity issue

* Descs for Survivor Rule and Survivor comps

* Moves Survivor Rule to its own yml

* Checks for dead survivors, changes survivor checks for mind. Adds survivor comp to mind to fix any mindswap issues. Same for invalid survivor tag

* Changes shuttle xform call to just mapid

* Protoid fix

* THE WIZARD

* Wizard spawner

* adds the correct state

* Wizard preset and weight

* Fixes wizard rule

* Weight back to 100%

* Adds Random Metadata

* Wizard locs

* Puts requirements in the right place

* Adds wiz ghost spawner and mob

* wizard spawnpoint fix + shuttle mapping

* wizard loadout + fix wizard spawning + wizard random name

* comment

* Adds Wizard testing

* FIXES SHUTTLE ISSUE BASED REI

* THE WIZARD LOBBY SONG. Special thanks to song creator Chris Remo for allowing us to use this.

* Free Objective ECS + Base Free Objective

* Space Wizard Federation for Wiz Obj issuer.

* Wizard Objectives

* Moves wizard shuttle to base wizard rule. Gives Wizard their objectives. Removes WizardRule

* Renames midround to subgamemodes. Adds wizard sub game mode.

* Adds SubWizard to SubGameModesRule. Adds a SubGameMode with no wizard. Adds No SubGamemodeRule for Wizard preset

* Wizard midround event

* Fixes wizard midround

* Wizard Guidebook

* Removes todo

* Fixes text

* Removes wizard rule ECS, not needed

* Wizard jetpack

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-02-25 22:34:07 -07:00
Ed
ba901d5e0e Crystals Update (#925)
* portal frame

* resprited sharpening stone

* portal frame entity

* darkness -> dimension magic type

* thaumaturgy platforms, some refactor

* magic energy refactor

* Update AirlockPryingTest.cs

* transfering tweaks

* fixed magic manipulation
2025-02-25 23:37:05 +03:00
noirogen
263f915671 Adds new speech bubble opacity sliders to the accessibility menu. (#35346)
* Adds new accessibility slider for speech bubble text opacity.
Adds new accessibility slider for speech bubble background opacity.
Adds new Cvars to track speech bubble text and background opacity settings.

* Adds a separate option slider for the opacity of the speaker's name on speech bubbles.

* Changes text and speaker default opacity to 100%, as it was before.

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-25 17:00:12 +01:00
creamybag
ba6ceac7ef DismasHair (#939)
* DismasHair

* new rsi, new meta, new name
2025-02-25 17:32:45 +03:00
Ed
3e26334c53 healing bard spell (#938) 2025-02-25 15:44:22 +03:00
lzk
237df1c9a1 fix ion storm code readability (#35337)
fix ion storm readability
2025-02-25 08:36:56 +11:00
Schrödinger
2958706e04 [ADMIN minor update] Add Autocompletion for Player Usernames in SetMind Command (#35477)
* add(src): Add getCompletion player for setmind command

* tweak(src): Fulfilling review requirements. used CompletionHelper.SessionNames()

* tweak(loc): Add localization

* fix(srs): smail
2025-02-24 22:29:05 +01:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
keronshb
3192914fc5 Fix/Addition - Wizard Survivor Antag Status (#35226) 2025-02-23 12:24:36 -05:00
pathetic meowmeow
b7414d85b4 Add microwave recipes to the guidebook (#34105) 2025-02-23 16:24:44 +01:00
keronshb
c922b4f843 Wizard: Smoke Spell (#35403)
* Adds smoke spell for wizard

* Adds the actual sprites oops

* Removes repulse attract change

* Removes change again?
2025-02-22 15:04:42 -08:00
Winkarst
b912dedbfc New Feature: Admin Only messages in AHelp (#35283)
* Feature

* Update

* Update

* Update

* Update Resources/Locale/en-US/administration/bwoink.ftl

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Yes

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2025-02-22 09:45:50 -08:00
keronshb
ee31a1f293 Wizard: Repulse Spell (#35377) 2025-02-22 10:56:54 -05:00
Ed
1020288d12 Epic alchemy buff (#931)
* alchemy update

* damage heat
2025-02-22 12:45:55 +03:00
KittenColony
93350c80e8 Alchemy Remaster - Foundation (T0 / T1) (#827)
* Ported from broken repo

* Missed something

* Unfucks the port

* RU locale + EN typo fixes

* Simple solvent & Dye temperature / orgnization

* cleansing salt + reactions

* Healing solution stems bleeding

* Removed biological.yml duplicate

* Guidebook updating

* Update dye_brewing.yml

* Single character typos

* missed typos

* Salt dehydrating

* Dye now needs water (catalyst) to form

* Biological > Organic, Archaic > Arcane / Alchemized,+ RU Locale

* Adjusting & patches

* Chromium in Arcane

* Removed 0.1u empty from purification

* Update chromium_slime.yml

* test commenting out

* Uncommenting InverseEffect

* Revert "Uncommenting InverseEffect"

This reverts commit 19aaaa9246.

* Potential solution

* Revert Potential solution

* This might fix it.

* Suffering

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-02-21 17:58:40 +03:00
keronshb
a9054c5e9c Mjollnir and Singularity Hammer for Wizard (#34446) 2025-02-20 18:38:52 -05:00
nikthechampiongr
09f75394be Require hwid (#35331)
* Make cvar to require that the client has a modern hwid

* Ignore guests and don't disable cvar on dev

* Rename and add docs
2025-02-20 19:04:45 +01:00
Deserty0
b8cc4c8c20 Fix (#922) 2025-02-20 19:22:29 +03:00
Nim
88462e5a1b Modular arrows (#906)
* arrow

* sprite

* slots

* migration

* fix

* fix2

* del

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-02-19 22:36:21 +03:00
robinthedragon
22254a14e6 ports two barsigns from frontier (#35296)
* adds two new barsigns

* webedit to fix a typo

* the typo was in two locations

* reformatted meta.json and added attribution links
2025-02-19 20:25:17 +01:00