lzk
09bf99a81a
remove bad name from datasets ( #2684 )
2024-10-16 21:13:18 +02:00
lzk
f16991f187
fix hydro airlock ( #2683 )
2024-10-16 18:35:53 +02:00
IanComradeBot
b252b4e87c
Automatic changelog update
2024-10-16 16:14:03 +00:00
Ko4ergaPunk
ba6d770ffb
[Maps] Pilgrim update #6 ( #2681 )
2024-10-16 19:06:06 +03:00
IanComradeBot
8e97ed3b8e
Automatic changelog update
2024-10-16 05:53:06 +00:00
SonicHDC
ddca85f165
Hydroponics airlocks resprite ( #2679 )
2024-10-16 17:50:03 +12:00
IanComradeBot
179dda8f12
Automatic changelog update
2024-10-15 23:07:24 +00:00
MureixloI
4fefe8f90c
Resprite intercom's panel & fix robes sprites ( #2670 )
2024-10-16 11:03:29 +12:00
IanComradeBot
4d9e365cb9
Automatic changelog update
2024-10-15 18:17:56 +00:00
Meguneri
2f1bf3fca6
[Maps] Maus update ( #2674 )
2024-10-15 21:03:37 +03:00
IanComradeBot
72c08fdcad
Automatic changelog update
2024-10-15 17:59:53 +00:00
Stubaretka24
a05b6083c7
[Maps] Awesome MachineGun Fix ( #2675 )
2024-10-15 20:56:12 +03:00
Morb0
807791cd2a
Update locale
2024-10-15 18:48:35 +03: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
PJBot
d871313899
Automatic changelog update
2024-10-15 08:29:36 +00:00
K-Dynamic
7e2c6ea3ea
Adds nitrogen to engi tank dispenser ( #32565 )
...
nitrogen to engi tank dispenser
2024-10-15 10:28:28 +02:00
PJBot
7532d6f26e
Automatic changelog update
2024-10-14 22:00:15 +00: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
NotSoDamn
c326f58bb6
fix locale ( #2672 )
2024-10-14 21:21:17 +02:00
NotSoDamn
b9de29468b
tweak SmartFridge locale name ( #2671 )
2024-10-14 20:02:36 +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
scrivoy
8c17624896
Marathon: Add EVA Helmets to Perma and add Disposal Unit front of Atmos ( #32799 )
...
add: EVA helmets to perma, disposals bin atmos
2024-10-14 05:23:41 -06:00
PJBot
f5ab4f5cb6
Automatic changelog update
2024-10-14 07:07:25 +00: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
PJBot
a7339a5bf9
Automatic changelog update
2024-10-14 05:56:54 +00:00
PJBot
dd6433c44b
Automatic changelog update
2024-10-14 03:55:38 +00:00
metalgearsloth
71c9894903
Jobreq format ( #32806 )
...
* Format job requirements as hours and minutes
* Use TimeSpan.ToString for playtime instead of custom method
* wehflicts
---------
Co-authored-by: jmcb <joelsgp@protonmail.com>
2024-10-14 14:54:31 +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
PJBot
59490d8259
Automatic changelog update
2024-10-14 03:31:38 +00:00
Leon Friedrich
2d60a4684c
Hide role entities in the spawn menu ( #32798 )
2024-10-14 14:05:49 +11:00
IanComradeBot
365bbb1f01
Automatic changelog update
2024-10-14 01:41:50 +00: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
lzk
7cf982ff53
update rules ( #2667 )
2024-10-14 01:24:03 +02:00
PJBot
870eb439f3
Automatic changelog update
2024-10-13 22:52:54 +00: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
IanComradeBot
e3961831ad
Automatic changelog update
2024-10-13 22:44:18 +00:00
lzk
f6c0c84219
я просто ахуел от этого пул реквеста! (Port Corporate Law in guidebook) ( #2572 )
2024-10-14 01:37:43 +03:00
TeaMaki
076c692878
Warden Hat Texture Change ( #32253 )
2024-10-14 00:36:56 +02: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
github-actions[bot]
56ba3fdf09
Update Credits ( #32774 )
...
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-10-13 18:06:40 +02:00
IanComradeBot
a426cbbb65
Automatic changelog update
2024-10-13 14:42:16 +00:00
lastPechkin
1f29e791e5
[Maps] Astra brig rework ( #2661 )
2024-10-13 17:38:48 +03:00
lzk
c1f6b0c8b3
Fix cryo message gender ( #2576 )
2024-10-13 14:53:57 +02:00
PJBot
0e3f3536ff
Automatic changelog update
2024-10-13 11:26:56 +00:00
SlamBamActionman
9bf7c44585
Add poster about the SSD term ( #32736 )
...
* moff
* Attribution
2024-10-13 22:25:49 +11:00
PJBot
7af913ad13
Automatic changelog update
2024-10-13 08:23:11 +00:00
PJBot
52937a2e64
Automatic changelog update
2024-10-13 06:39:39 +00: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
PJBot
1f6bab7957
Automatic changelog update
2024-10-13 04:57:00 +00:00
