Dmitry
b1861ffb69
merge remote wizden/master
2026-09-30 12:42:28 +07:00
AftrLite
42729fe109
Add support for dialogue variation for SpeakOnActionSystem ( #46106 )
...
* add support for dialogue variation for SpeakOnAction
* Requested Changes - replace random with PredictedRandom
* Requested Changes - use ProtoMan instead of dependency on IprototypeManager
* adjust field name, un-nullify speakchance, add the system's functionality to Fireball
* Update Content.Shared/Speech/EntitySystems/SpeakOnActionSystem.cs
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
---------
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
2026-09-22 01:35:19 +00:00
Dmitry
73ffef2ac0
merge remote wizden/master
2026-09-17 23:33:06 +07:00
Whatstone
a023e5784c
Cleanup: Remove byte order markers from most files ( #45796 )
2026-09-17 23:23:54 +10:00
Dmitry
405afc5d46
merge remote wizden/master
2026-08-10 16:50:32 +07:00
Connor Huffine
8b48748048
Give mobs amusing name prefixes ( #44977 )
...
* Functional product
* Bugfix
* Handle empty case gracefully
* Fix inserting bad values
* First set of tests
* Don't need this
* Dont add empty modifers to names
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Typo and [SubscribeLocalEvent]
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Refactor GenerateUniqueName to GenerateUniqueNameModifier
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Fix returning name when empty
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Docs
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Tests
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Fix comment
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Fix FTL test
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Add adjectives
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Amateur hour
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Simplify spawning
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Even more streamlined
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Improve comment
Signed-off-by: Connor Huffine <chuffine@gmail.com>
* Apply suggestions from code review
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
---------
Signed-off-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
2026-08-09 00:22:15 +00:00
Dmitry
9bf158f936
merge remote wizden/master
2026-08-04 18:46:40 +07:00
Keer-Sar
3aa6d7bf21
Revert - Remove throngler lottery mention from Tips - #28073 ( #45023 )
...
Add tip message and increases tip dataset to 140
2026-07-29 21:13:06 -04:00
Miguel4387
8f92040155
Coin tossing ( #44622 )
...
* Ported all I did inside forky to wizden
* Added new weighted coin to the uplink
* fixed the attributions license
* fixed the attributions license but this time for real
* fixed the attributions license but this time for real 2: electric boogaloo
* Changed diamond and gold tail sprites because I was dissatisfied with them
* dice bikeshed
* Changed gold coin tails sprite again, this time to one that makes more sense since I found out THAT ITS A HEAD WHAT THE HELL
* Minor review changes
* Oops All Yaml
* Removed the weighted coin from the uplink
* Fixed that fucking license that I hate
* Added attributions for the tails sprites
* Submodule
* Submodule for real
* Performed requested changes
---------
Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
2026-07-28 19:03:57 +00:00
Dmitry
816b7825ba
merge remote wizden/master
2026-07-19 16:10:56 +07:00
Hitlinemoss
a63a9ae085
Expand and tweak several random-name datasets ( #44251 )
...
* More AI and Cyborg names
* Removed 'Head of Robots' from borg names
* Removed 'FINO' from regular borg names
* Misc. borg name touches
* 'Death Commando' name table is now split into first and last names
* Fixed deathcommando last names not working
* Added 'Biff' to deathcommando firstnames
* Added new dragon titles
* These don't need to be separate files
* Comment update (confused XINU for WINE)
* tweaks to AI/borg name lists
* More death commando names
* Tweaked AI/Borg names
* Added and organized borg names
* Added to and reorganized xenoborg names
* Operative Yankee has been hired
* More deathcommando names
* Few more deathcommando names
* xenoborg capitalization fixes
* I found Karl
* AINU wasn't in the right spot
* Deathcommando name updates
* Minor capitalization fix
* deathcommando names
* New deathcommando name
2026-07-18 21:37:55 +00:00
Dmitry
d795bad2e9
merge origin/master
2026-03-23 05:29:21 +07:00
Dmitry
8000a279c0
Исправления ( #3532 )
...
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
2026-03-12 07:11:22 +07:00
MetalSage
72e8d72310
Глобальное реформатирование локализации ( #3515 )
...
Co-authored-by: MetalSage <metalsage.official@gmail.com>
2026-03-12 05:56:28 +07:00
Dmitry
1a975ebdbe
merge remote wizden/stable
2026-03-07 03:16:30 +07:00
Samuka
7cba448845
More xenoborg names ( #42984 )
...
* more names
* update count
* ops
* whitespace
---------
Co-authored-by: beck-thompson <beck314159@hotmail.com>
2026-02-21 23:41:34 +00:00
Dmitry
e4ceb37dd6
merge remote wizden/master
2026-01-21 12:43:50 +07:00
Thinbug
9dd31220b7
Magic 9 Ball ( #42189 )
...
* hoping i didnt forget anythin
* thingiess i forgor
* fixies
* first half of fixies
* other half
* sprite changes
* more proper outline on the sprites
* making the outline a tad more visible again
* making it tiny
* readding the yaml for the magic 9 ball
* sprite update so its less flat and more shapey
2026-01-18 23:01:28 +00:00
Dmitry
4f4b71e8de
merge remote wizden stable
2025-12-22 00:33:29 +07:00
āda
594ec9acff
All Figurines Entity Table ( #41775 )
...
* ai talks
* kill cheepo
* mech figures
* finished
* touchup
* wider net
* final changes
* never final
* fix test fail
* review
---------
Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-12-13 19:19:42 +00:00
Hitlinemoss
080ab214c6
New figurine voicelines ( #41723 )
2025-12-05 12:24:22 +00:00
Stefano Pigozzi
4c4f004f54
Fix typo in Ion Storm lawsets ( #41574 )
...
Pizzaria → Pizzeria
2025-11-25 03:20:31 +00:00
Dmitry
c682eb80b4
merge remote master, upstream
2025-10-26 22:31:58 +07:00
YoungThug
3ac4816723
Resprites and keeping consistency for forgotten figurines ( #40889 )
...
* Resprites and keeping consistency for forgotten figurines
* Slarti Requests
* fixed sus
2025-10-15 10:28:54 +00:00
Dmitry
ab54bb2609
loc & ftl fix
...
blyat
2025-10-14 00:18:48 +07:00
Dmitry
76e987c7b3
merge mini-upstream
2025-10-05 03:20:56 +07:00
MilenVolf
3dacdc03c6
Localize space villain arcade ( #40641 )
2025-10-03 11:08:36 +00:00
Dmitry
133e2e6228
remote merge upstream
2025-09-23 01:32:33 +07:00
Dmitry
eb194cd4a1
basebugfix
...
pelmeni
2025-09-18 17:09:40 +07:00
Dmitry
f01a60f5c7
upstream 9.1
2025-09-17 06:41:33 +07:00
IProduceWidgets
a4b7cd73c5
+1 Spam mail ( #40310 )
...
* 2nd edition
* remove OOC
* oop
* double oops
2025-09-13 09:15:10 +02:00
ScarKy0
b2c9106839
Vulpkanin Species ( #37539 )
...
* [April Fools] Elf species (#35353 )
elf
* [April Fools] Juice that makes me go insane (#35370 )
* kill me
* MAKE IT STOP
* is it finally over?
* web edit
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* webedit
* WEBEDIT PLEASE
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* vulpkanin species
the ultimate april fools joke
Co-Authored-By: Kr8art <188977876+kr8art@users.noreply.github.com>
* cant be bothered
* make build and test debug run on the april fools branch (#35396 )
welp
* Revert "[April Fools] Juice that makes me go insane (#35370 )"
This reverts commit fcbdcf8452#35353 )"
This reverts commit 704293a051#1 )
* Modified aesprite tools
* WIP
* wipperoni
* We are done here, wawa
* Revert "Merge branch 'aseprite-tools' into hannah/vulps-wip"
This reverts commit d258645df60a94d0217fecd85a38545f2b951cde, reversing
changes made to 0ae39e862152ef6548533eba0547709594c55e90.
* Resolve merge issue
* Fix Urist McVulp forgetting his fursuit
---------
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>
* re-add ears and husk overlay
* revert adding ears to vox
* Crest Markings
* Fade Markings
* Sharp Markings
* microbalance + comments
* censor character nudity option compliance
* Ear Markings
* 1984 wagging animations
* Tail Markings
* tail wag icon
* annoyance
* guidebook
* slight temperature tweak
* seperate out snouts, port over 2 markings for testing
* fix
* seperate snout file
* Snout/Head Markings
* cleanup + locale for ears
* Head and Snout loc
* gray eyes
* crest and husk cleanup
* Tail and Chest loc
* Legs and Arms loc
* most important commit
* mime vulps like rations too
* missing loc
* microbalance
* not needed
* goatee
* white eyes
* harmony feedback tail fixes
* personal changes and fixes after playing
* fix fluffy tail clipping
* Sprite fixes, displacement fixes (#2 )
* Tune head displacement
* Vulps Sprite Tuning
* helmets
* detail
* Urist
* wag
* comban't
* fix attributions
* remove vulp biosuits
* fix vulp beards
* fixed up ears
* comment note
* further ear tweaks
* engi helmets
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kr8art <188977876+kr8art@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>
2025-09-05 12:43:17 +02:00
Minemoder5000
9be78ced63
Remove a default Cyborg name ( #39948 )
...
* 1984 clanker
* Fix prototype
2025-08-29 10:38:48 +02:00
Dmitry
57307b718c
upstream master sync
2025-08-11 18:16:45 +07:00
M87S
5cf8662f3c
Remove NamesGolem ( #39478 )
...
* deleted golem.ftl which contained golem names
* deleted golem.yml that went along with golem.ftl
2025-08-08 12:30:46 -07:00
Dmitry
4948a136f1
stable upstream syns
2025-07-17 14:36:21 +07:00
Hannah Giovanna Dawson
f5fd2dcb76
Scurret naming fixes ( #38776 )
...
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-07 00:30:44 +02:00
Hannah Giovanna Dawson
48d897d31e
Scurrets ( #38218 )
...
* Scurrets.
* Add missing equipment YAML
* Fix count of NamesFirstScurret
* Resolve PR comments, wa.
Also add like a bunch more wa replacements
* ed
* Update Resources/Textures/Mobs/Animals/scurret/displacement.rsi/meta.json
* :rivflabbergasted:
* Fixed spacings in scurret_last.ftl
* Fix mangled endings of some last names
* wawa
* the scug has a spear for self defence
2025-06-20 16:39:08 -07:00
Dmitry
a6ecbc3410
Merge remote-tracking branch 'upstream/master'
2025-05-24 22:35:13 +07:00
Dmitry
25c5e59248
Upstream ( #3172 )
...
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Stomf <5dorkydorks@gmail.com>
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com>
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com>
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: eoineoineoin <helloworld@eoinrul.es>
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com>
Co-authored-by: nikitosych <boriszyn@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com>
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: J <billsmith116@gmail.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Spanky <scott@wearejacob.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: archee1 <archee3@hotmail.co.uk>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: poklj <compgeek223@gmail.com>
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com>
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com>
2025-05-24 11:00:17 +03:00
IProduceWidgets
a021c02b25
More wizard names ( #36437 )
...
* Wizard names
* readd any dropped names.
* haha funny number
* update dataset counts!
2025-05-14 23:06:56 +02:00
lzk
3587d6edff
update ion laws ( #3145 )
2025-04-29 22:39:56 +02:00
Samuka-C
6ef03b082f
Xenoborgs part 1 ( #36830 )
...
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-23 19:38:10 -07:00
T-Stalker
bad79973f2
Add 1 dragon name ( #36846 )
...
* this is a commit you cannot skip
* why do you have to add a count why
2025-04-23 20:11:34 +10:00
Tayrtahn
e529bc6196
Improve LocalizedDataset test to check for low Count ( #36848 )
...
* Improve LocalizedDataset test to check for low Count
* Fix missing entries for FigurinesFootsoldier
2025-04-23 11:29:13 +02:00
lzk228
a0ab19ee4a
Merge remote-tracking branch 'wizards/stable' into 04-21-upstream-sync
...
# Conflicts:
# Content.Client/Humanoid/MarkingPicker.xaml.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/convex.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/elkridge.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/loop.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Maps/plasma.yml
# Resources/Prototypes/Maps/relic.yml
# Resources/Prototypes/Maps/train.yml
# Resources/Textures/Objects/Misc/brbsign.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
2025-04-22 11:02:12 +02:00
mubururu_
8f68d7c7a2
random names for space dragons ( #36656 )
...
* raoooaoaouurrr
* forgot to save before initial
* title changes
* new format who dis
* forgot i made 30
2025-04-17 23:05:14 +02:00
Tayrtahn
110ed2736f
Convert spam letters to a LocalizedDataset ( #36393 )
...
* Convert spam letters to a LocalizedDataset
* Error -> warning
* Comments
* Add migrations for old spam mail entities
2025-04-14 19:38:21 +02:00
SlamBamActionman
18bedfec0a
Add implant names to implanters ( #36555 )
...
* Initial commit
* Add tips!
2025-04-14 18:50:42 +02:00
Tayrtahn
8d8c1e4dae
Make RandomMetadata properly support localization ( #36343 )
...
* Make _outputSegments readonly
* Remove mystery character
* Use Fluent instead of string concatenation
* Adjust format
* Convert existing content
* Don't need these anymore
* Docs
2025-04-06 11:12:39 -07:00
