Ed
dc47bb2283
Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream
...
# Conflicts:
# Content.Server/Station/Systems/StationSpawningSystem.cs
2024-10-15 15:25:44 +03:00
Ed
d259191d3d
Cargo system ( #487 )
...
* simple storeship arriving
* pupu
* ship cycling
* buy positions prototypes
* i hate UI
* PriceControl
* second tab ui
* baloon! pallets!
* update shop in town
* setup billboard timer
* split to sell and buy categories
* renaming gaming
* actually selling
* fix infinity selling
* improve timer
* move description too rigt part UI
* bar selling
* iron cabinet
* purge currency categories
* remove town balance, add money box
* special proposal, FTLImmune anchor
* fix UI
* remove tests buying
* Update CP14StoreWindow.xaml.cs
* currency converter
* currency clean up
* Update CP14CargoSystem.cs
* clean up part 2
* rider petpet
* coins audio
* coin improvment
* Update coins.yml
* translate
* more coins roundstart
* Update wallet.yml
* Update wallet.yml
* generate coin problem fix
* refactor proto reading
* fixes
* huh
* shuttle logshit fix, add to tavern map
* Update CP14StationTravelingStoreShipTargetComponent.cs
2024-10-15 15:22:06 +03:00
Pieter-Jan Briers
796764d755
Fix some rounds failing to end due to mind roles ( #32792 ) ( #32793 )
...
* Fix some rounds failing to end due to mind roles
Fixes #32791
This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo().
This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set.
The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype.
I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception.
I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix.
* At least one maintainer approved this tiny PR without reading it, not naming names.
2024-10-13 23:00:40 +02:00
Nim
40959cf422
fix resp ( #488 )
2024-10-13 02:09:41 +03:00
Nim
a6fc5e6ace
Rabbit ( #486 )
...
* rabbit
* meat
* гладить
* тоже гладить
2024-10-12 20:01:13 +03:00
scrivoy
e98af125dc
Fixed capitalization in Interface description ( #32739 )
2024-10-10 21:40:41 +02:00
Errant
93c7bdc134
Mind Role Entities ( #31318 )
...
* Mind Role Entities wip
* headrev count fix
* silicon stuff, cleanup
* exclusive antag config, cleanup
* jobroleadd overwerite
* logging stuff
* MindHasRole cleanup, admin log stuff
* last second cleanup
* ocd
* minor cleanup
* remove createdTime datafield
* now actually using the event replacement I made for role time tracking
* weh
2024-10-10 10:48:56 +02:00
beck-thompson
327466a6e2
Plushies can now have pAIs stuffed into them (v2)! ( #30805 )
...
* First commit
* I forgot silly me
* Actually added comments
* spellin
* fixes
* more blacklists
* Minor fixes
* Speech Verb also changes now
* Simple name stuff
* Other fixes
* remove one line of whitespace
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-10-09 20:01:32 +02:00
chavonadelal
6d99597349
Job title localization ( #32338 )
...
* Job title localization
* Correcting fields
2024-10-09 17:05:36 +02:00
Ed
844b4d4616
underworld ( #485 )
2024-10-09 16:19:38 +03:00
beck-thompson
5a41cc81b3
Decrease price of radio jammer from 4 tc -> 3 tc ( #32472 )
...
* First commit
* increase price by one tc
2024-10-09 14:44:38 +02:00
lzk
d450b613d6
fix typo ( #32712 )
2024-10-09 14:41:07 +02:00
Ed
b9df2a495a
some blacksmith bandage ( #483 )
...
* anvil
* iron and copper ore walls + procedural cave update
* vladimirs rocks
* furnace
* Revert "furnace"
This reverts commit f378e4fb85b2c6a193fcdc6d70b10e3ab164999291c226d18d3c3a87c25e7fb44b4908891c3ba0aa4f2eaef6c19d7e042ddf
2024-10-09 13:40:06 +03:00
beck-thompson
384ff7e8f6
Add pumpkin pie! ( #32623 )
...
* first commit
* Licence fix
* rosysyntax licence change (permission granted!)
* simplify
* Better wording
2024-10-09 10:29:41 +11:00
Nim
1ca7456363
AI Factions ( #481 )
...
* factions
* CP14
* Update ai_factions.yml
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-10-08 22:52:46 +03:00
K-Dynamic
6f9b4f4226
CHIMP and APE particle speed increase ( #32690 )
...
* swap omega and delta particle colours
* remove upgrade doafter
* explicit syndicate chip description
* Syndicate CHIMP stealth
* fast projectile speed
* 10 to 12 shots
* buff heat dmg
* upgrade chip mentions omega particle
* Revert "remove upgrade doafter"
This reverts commit 8a321980b7a384daca06215656494e0c116e7333.
* Revert "explicit syndicate chip description"
This reverts commit c803c773739a61fc5b3a6cb90810622a6d5846c9.
* Revert "Syndicate CHIMP stealth"
This reverts commit 698a108580892addabf8d51494a72e1ee651b8e6.
* Revert "10 to 12 shots"
This reverts commit 858ac0392be0549eb0a288648413d1020cabae1a.
* Revert "swap omega and delta particle colours"
This reverts commit 4c000b2f110a5d35f317cb61cb5b03ea32841ad5.
* Revert "buff heat dmg"
This reverts commit 02a8690dafbd41631b098e51ef9afba5b6ee6ac4.
2024-10-08 20:29:37 +02:00
Plykiya
1366f6b405
Replace the Librarian's round-start D10 with a D20 ( #32648 )
...
Replace D10 with a D20
2024-10-08 11:53:50 +02:00
shamp
922dd0bce6
Fix cloth dupe ( #32685 )
...
Update curtains.yml
2024-10-08 11:51:23 +02:00
Saphire Lattice
f22f9e39c5
Change minibomb to be explosion resistant and start timer on damage ( #32429 )
...
* Make minibomb explosion resistant and trigger timer on damage
* Tune damage behaviour and threshold for minibomb
2024-10-08 00:42:42 +02:00
Ed
d2c5aa74b4
Ritualizm ( #474 )
...
* ritual cucumber setup
* entities requirements
* try graph???
* Revert "try graph???"
This reverts commit c90c6353cb
2024-10-06 18:04:18 +03:00
Nim
a6532a2801
fix ( #480 )
2024-10-06 17:12:31 +03:00
Golinth
46a2eb545e
Fully Revert Clown Waddling ( #32652 )
...
Fully revert Clown Waddling (revival of #29161 )
A sad day, see #29156 for discussion
2024-10-06 15:33:02 +02:00
Арт
867efe8b5b
Add flowers to loadout ( #32097 )
...
* Add_Poppy&Lily
* Add_FlowerWreath
* Add_Headflowers
Sprites, meta, prototype
* Id_Changes
* Changes
* Update_Sprite
* Desc_Change
* Scale_Change
* Sprite_Scaling
2024-10-06 14:48:49 +02:00
slarticodefast
eb4e422cb0
fix light bulbs not fitting into the trash bag ( #32452 )
...
fix trash
2024-10-05 12:44:47 -06:00
Nim
98c921aa94
Zombie and old lamp ( #467 )
...
* zombie
* fix
* spawner fix
* license
* woman parts
* male parts
* 122
* 123
* 124
* HideSpawnMenu
* damn
* requested
* fixxxx
* gooo
2024-10-04 21:24:17 +03:00
Nim
21ea4290a5
Paintings ( #479 )
...
* oppa
* fix
* Update Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-10-04 21:18:01 +03:00
Ed
c55241355e
Update wild.yml
2024-10-04 19:48:18 +03:00
Ed
35baaacbce
Blue amanita flower, mana potions! ( #478 )
...
* merge bloodgrass and red flowers
* delete sprites
* add blue amanita sprites
* restruct alchemy reactions folders
* mana heal and damage reagent
* add gatherable to worldgen
* fixes
* Update sewing_table.yml
* Update Alchemy.xml
* Update Alchemy.xml
* Update migration.yml
2024-10-04 19:19:13 +03:00
Saphire Lattice
94c8018ff3
Change the syndicate charge to start a timer on signal ( #32423 )
...
* Change the syndicate charge to start a timer on signal
* Actually add the component in question
* Add default link for TimerStart signal
2024-10-04 11:34:48 +02:00
SoulFN
9e054c1f9d
Give dragon pull ability ( #32568 )
2024-10-04 15:39:50 +10:00
Ed
ab1e071fdf
Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
2024-10-03 17:34:08 +03:00
Vasilis
bc76cd876f
Remove sentience from clean and medi bot ( #32383 )
...
There is no point in these silicon being sentient, they have basically zero role play potential and are not meant to be controlled by players. The janibot can be played somewhat but at that point we have janitor borgs which are way better at this. You can only clean floors and even then it does a terrible job at doing that and only that. A player playing as a janibot will get bored quickly. No amount of RP will save you.
A player taking over a mediborg just makes it useless as you cant inject anymore. And again, medical borg. There's no point in adding the feature. It's too much work then its worth when we have borgs.
They don't have ghost role info for a reason. They are not meant to be played.
2024-10-03 03:32:10 -07:00
ArtisticRoomba
c68e5a667c
Various item contraband fixes ( #32614 )
...
* fixes current contraband issues: xray cannon, hos's trench coats, stinger grenades
* yet another contraband addition
2024-10-03 12:01:58 +02:00
SpaceCat
b603233480
change sound ( #476 )
2024-10-03 09:28:50 +03:00
Pieter-Jan Briers
2d644095e3
Fix borg hands showing up in stripping menu ( #32606 )
...
* Fix borg hands showing up in stripping menu
Borgs can't drop their items anyways, and the amount of hands borgs have causes the UI to just bug out.
* Add more checks
2024-10-03 02:11:56 +02:00
Pieter-Jan Briers
719f78956b
Disable bioluminescence plant mutations because it breaks the engine ( #32561 )
...
No fun allowed
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-10-02 15:52:14 +02:00
deltanedas
8b14e2534d
fix instigator not existing ( #32597 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-10-02 13:44:11 +02:00
lzk
c55e311c7e
Cleanup pins.yml ( #32593 )
...
* Cleanup pins.yml
* oh my
* forgor
2024-10-02 13:23:32 +02:00
lzk
edc83b2fab
cleanup and fix dinky star ( #32594 )
...
* cleanup dinky star
* fix
* oh
2024-10-02 12:53:19 +02:00
Toly65
ea3b14faac
Bandaid fix to entityeffects on plant trays ( #32576 )
...
prevented the bioluminescent and slippery effects from being applied to the plant (and thus the plant tray)
2024-10-02 11:37:49 +02:00
ArchRBX
dd12ac1f8a
MedTek Cartridge ( #32450 )
...
* initial commit
* adds cartridge to cmo's locker
* tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too
* fixes ert medic pda not having it preinstalled
* adds attribution
* removes redundant dependencies
* fix agent pda
---------
Co-authored-by: archrbx <punk.gear5260@fastmail.com >
2024-10-01 23:17:57 -07:00
TakoDragon
542817807d
Red circuit floor ( #32557 )
...
* red circuit added
* index colour begone
2024-10-01 23:35:48 -06:00
TakoDragon
936917cd05
Hydroponics doors ( #32575 )
...
* spriting done
* yml hydro updates
* Named wrong thing and forgot it inherets
2024-10-01 23:33:35 -06:00
slarticodefast
360585276d
fix voice mask chameleon menu ( #32546 )
2024-10-01 21:22:09 -06:00
TakoDragon
23f4bc1d7a
Gay Boykissers ( #32584 )
2024-10-01 23:07:48 +02:00
BramvanZijp
f79de12509
Prevent borgs from being able to be briefly toggled off. ( #32485 )
...
* Prevent borgs from being able to be briefly toggled off.
* Use the pre-existing component instead of making an unneccesary duplicate.
2024-10-02 01:13:59 +10:00
Jaraten
6c08ca60f3
frame & table ( #464 )
...
* frame & table
* rem superfluous sprite
* merge conflict
* duplicate_ID
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-10-01 16:32:14 +03:00
ScarKy0
ba68fb2ddb
Update binary key to use AI icon ( #32327 )
...
* Init
* uplink icon
2024-10-01 14:03:37 +10:00
Golinth
3b682d4d68
Added Firebots - Real ( #32482 )
...
* Add Firebots
Had to add OnActivateInWorld to the spray system to get the bot to work. Checks for the flammable component and if the onFire boolean is true.
* Make SpraySystem actually use useDelay
got rid of that TODO
* Added firebot speech
Fire detected!
2024-09-30 20:13:16 -07:00
kosticia
5681db31a9
Changing the thief's objective to stealing ID cards. ( #32411 )
...
* Changed thief ID objection
* Update Resources/Prototypes/Objectives/thief.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-10-01 00:40:31 +02:00
