Commit graph

9629 commits

Author SHA1 Message Date
lzk
09bf99a81a
remove bad name from datasets (#2684) 2024-10-16 21:13:18 +02:00
Morb0
74885605cf Fix upstream 2024-10-15 18:13:43 +03:00
Morb0
0eba25c0eb Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2024-10-15 17:04:40 +03:00
K-Dynamic
7e2c6ea3ea
Adds nitrogen to engi tank dispenser (#32565)
nitrogen to engi tank dispenser
2024-10-15 10:28:28 +02:00
Ada
a7741fe9e2
Arcade Prize Additions (#32309)
* rearranged existing arcade rewards for clarity and added more

* removed tesla toy

* removed plushie throngler

* removed singularity toy, readded tesla toy

* removed tesla toy again :(

* Readded accidentally removed PlushieRainbowLizard
2024-10-14 23:59:07 +02:00
mubururu_
6654e00411
organ sprite touch-ups (#32762)
* does work?

* fix

* shrunk organs to normal size of small

* made brains and liver look better

* made stomach slightly less bright

* unique sprite for diona lungs + inhands

* unique sprite for vox lungs + inhands
2024-10-14 13:32:32 +02:00
ScarKy0
5be82d2a7f
Cyborg module action icons (#32505)
* Init

* added jani and medical

* + sci and service modules

* + syndi modules

* fixing up

* geiger counter stuff
2024-10-14 18:05:40 +11:00
OnyxTheBrave
d79b34de9a
Fix Industrial Reagent Grinder sprite (#32758)
Updated to reflect the RecyclerVisualLayers no longer having a forward reverse or off visual effect.
2024-10-14 14:53:56 +11:00
Leon Friedrich
2d60a4684c
Hide role entities in the spawn menu (#32798) 2024-10-14 14:05:49 +11:00
Ko4ergaPunk
e140e1efae
New station goals (#2666)
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-10-14 04:40:13 +03:00
K-Dynamic
0bec8af824
rainbow lizard plushie (#32564)
* rainbow weh

* plushie loot table

* arcade loot pool

* remove from plushie crate

* fuk
2024-10-14 00:51:46 +02:00
lzk
f6c0c84219
я просто ахуел от этого пул реквеста! (Port Corporate Law in guidebook) (#2572) 2024-10-14 01:37:43 +03:00
Pieter-Jan Briers
c7b0d5a27c
Fix some rounds failing to end due to mind roles (#32792)
* 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 22:55:15 +02:00
SlamBamActionman
9bf7c44585
Add poster about the SSD term (#32736)
* moff

* Attribution
2024-10-13 22:25:49 +11:00
BramvanZijp
2e3db0e2c5
Increase AI Playtime Requirements (#32007)
* Increase AI Playtime Requirement

* Change silicon supervisor message

* Slightly lower AI time requirement and change borg supervisor to be just its laws for now.

* Leave the supervisor to another PR

* Comply with maintainer request

* Comply with another maintainer request because they forgor.
2024-10-13 17:38:32 +11:00
Golinth
561d55e7a4
Firebot Tweaks (#32629)
Removed random sentience and some other minor tweaks
2024-10-13 15:55:51 +11:00
Theodore Lukin
7f42c0a531
Qm external access (#32631)
gave qm external access
2024-10-13 15:55:12 +11:00
Stubaretka24
ab71093097
[Map] New Station Awesome (#2657) 2024-10-12 19:38:36 +03:00
eoineoineoin
70b7747fdd
Make APC UI work correctly with multiple users (#32465)
* Make APC UI work correctly with multiple users

* Check access only on client, when constructing UI

* Do TODO (Thanks, Robust 236.1)

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-10-12 19:21:43 +11: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
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
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
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
lastPechkin
a493504b45
[Maps] Новая цель на астру (#2646) 2024-10-06 19:41:11 +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
Morb
4b8ecbb16e
Remove custom PaperPrinter and use Paper material (#2644) 2024-10-05 14:38:10 +03:00
lzk
2e22dfb967
fix remove qm age requirement (#2642) 2024-10-05 05:05:20 +02:00
Morb0
46dfad9b4a Update locale 2024-10-04 20:28:43 +03:00
Morb0
3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +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
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
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