Commit graph

7743 commits

Author SHA1 Message Date
VigersRay
381562a0f4 фиксы апстрима 2024-06-04 11:16:43 +03:00
VigersRay
55060929c7 фиксы апстрима 2024-06-04 09:54:56 +03:00
VigersRay
5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
Tayrtahn
9d2b4ed3b2
Add an integration test for solution fill level sprites. (#28564) 2024-06-04 10:23:43 +10:00
deltanedas
16b3fb1204
LoadMapRule grid storage rework (#28210)
*
2024-06-03 20:04:19 -04:00
Mr. 27
7d22897d02
Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605)
*
2024-06-03 19:52:15 -04:00
Verm
2ae5c953de
Humans can no longer honk on command (#28566)
* Humans can no longer honk on command

* Undo change it emote file

* I hate tabs

* Some comments
2024-06-04 01:45:00 +02:00
Velcroboy
98ab251f92
Remove duplicate entities (#28561) 2024-06-03 16:55:43 -04:00
RenQ
3e2eb6cc7a
"Death gasp" for a moth (#28409) 2024-06-03 14:48:01 -04:00
Ed
a4d1601758
Accent trait limit (#28046) 2024-06-03 14:47:06 -04:00
Tayrtahn
b5e8a69622
Add a test for sliceable cargo bounty exploits (#28357) 2024-06-03 12:24:32 -04:00
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs (#28270) 2024-06-03 12:12:21 -04:00
deltanedas
8d78b7442a
make objectives use entityCategory (#28269) 2024-06-03 09:23:52 -04:00
Cojoke
e784f2cf3c
Make projectiles not hit crates unless clicked on (#28072) 2024-06-03 09:04:07 -04:00
deltanedas
977bd5ad6d
make GameRule use entity category (#28294) 2024-06-03 08:39:25 -04:00
Cojoke
a0b49116be
Adds Chat Triggers to the Gasp Emote (#28466) 2024-06-03 08:10:24 -04:00
Cojoke
eb026c9b5b
Gives Medibots Random Lines(not a good title) (#28543) 2024-06-03 08:05:14 -04:00
Verm
36396e3f86
Changes SyndiCat spawner to a radio (#28492) 2024-06-03 07:54:32 -04:00
Verm
31eb3ed62c
Welding tweaks (#27959) 2024-06-02 23:28:53 -04:00
AJCM-git
509e3aedf7
RespawnRuleSystem tweaks. (#28528) 2024-06-02 23:28:38 -04:00
Whisper
9dbdacda95
Rename admin cloak to weh cloak (#28540) 2024-06-02 19:18:49 -07:00
Killerqu00
4eadbbc39d
fix typos in bonfire descriptions (#28515)
* fix typo

* a
2024-06-02 15:40:02 -04:00
Leon Friedrich
16be126ca1
Remove noSpawn: true from action entity prototypes (#28508) 2024-06-02 01:11:48 -07:00
slarticodefast
1283989346
Flash overlay rework and bugfixes (#27369) 2024-06-02 00:17:53 -04:00
Cojoke
4c667b2d8f
Fix Lasers Being Blocked by External Airlocks and Shuttle Airlocks (#28065) 2024-06-02 00:13:12 -04:00
Leon Friedrich
6235fa1ac6
Content changes for entity categories PR (#27232)
* Content changes for entity categories PR

* Poke tests

* Why are tests suddenly working?
2024-06-02 14:08:15 +10:00
MilenVolf
5d970b0861
Station event component and system tweaks (#28331)
* Make anomaly, artifact and gifts events announcement sound optional

* Requested changes + Added new "GameRuleAfterAddedEvent" for StationEventSystem

We need to call "Add" in "StationEventSystem" after others GameRule's in case if we need to change StationEventComponent variables.

* Fix margins

* Makes use of GameRuleComponent.Delay and remove station system handling of delays plus small cleanup

* Fix merge

---------

Co-authored-by: AJCM <AJCM@tutanota.com>
2024-06-01 16:34:58 -04:00
AJCM-git
09256cfaa5
Makes machine parts stackable, removes unused field in stack prototypes (#28434)
* Makes machine parts stacks, removes unused field in stack prototypes

* forgor

* Fix tests

* Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely

* detail

* a
2024-06-01 13:49:28 -04:00
Nemanja
be6f55a090
Clean up store system (#28463) 2024-06-01 11:29:17 -04:00
VigersRay
6f8cfd7c47 Фикс КПБ 2024-06-01 13:12:42 +03:00
VigersRay
e27ff1e186 Hyperlink law book 2024-06-01 09:45:12 +03:00
VigersRay
1b725c9db8 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
2024-06-01 09:38:18 +03:00
Kevin Zheng
355d0fee38
Increase Tesla coil power output (#28424)
* Increase Tesla coil power output

* Make number bigger
2024-06-01 01:51:16 -04:00
Cojoke
cbba09ae25
Gives Mediborg the Medical Hud (#28391) 2024-06-01 00:54:24 -04:00
Verm
a9a65b7e0d
Randomizes more humanoid appearances (#27997) 2024-06-01 00:51:07 -04:00
Nemanja
a1a8f04036
Decouple interactions from hands, cleanup old events, add new fears (#28393)
* ok basic shit

* second part

* pretend it isn't real it can't hurt you.

* 👁️ 👁️

* shadowcommander review
2024-05-31 13:26:19 -07:00
Flareguy
2ddca94375
Adds more spawners (#28280)
* adds more spawners

* make it WORK. ooo.. a. e

* fix

* outerclothing capitalization

* prototype fix

* flashbang fix
2024-05-31 12:52:04 -07:00
Brandon Li
114a99eb8d
Chem colors (#28367)
* chem colors

* lithium & sodium colors

* update oxygen color

* update fluorine color
2024-05-31 12:44:22 -07:00
Flesh
e145a666c9
Use existing probability field (#28422)
Remove the PlantAdjustAttribute "Prob" field and use the existing probability field from ReagentEffects instead.
2024-05-31 09:56:41 -08:00
ShadeAware
478768fa1d
Pizza Parties no longer flood the station with more than it could ever eat. (#28448)
Removes pizza flood
2024-05-31 11:59:52 -04:00
deltanedas
5da2151924
dragon antag refactor (#28217)
* remove dragon system usage of GenericAntag

* add AntagRandomSpawn for making antags spawn at a random tile

* add AntagSpawner to make an antag spawner just spawn an entity

* add antag prototype for dragon since it never had one

* make dragon spawner a GhostRoleAntagSpawner, remove GenericAntag

* make dragon rule use AntagSelection and stuff

* remove dragon GenericAntag rule

* add back to spawn menu

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-31 11:08:26 -04:00
NazrinNya
9eb3239fcc
make it so you cant build disposal pipes in impassable objects (#28447)
make it so you cant build disposal pipes in impassable objects (like walls)
2024-05-31 10:49:00 -04:00
Ubaser
ae3a22398e
Give janitors a roundstart light replacer (#28441)
add
2024-05-31 02:44:21 -06:00
Ubaser
ec28a077a2
Give botanists a roundstart plant clipper (#28439)
add
2024-05-31 00:37:47 -07:00
VigersRay
69a74126bf fixes 2024-05-31 05:12:13 +03:00
VigersRay
3f4137d289 remove busido.yml 2024-05-31 04:27:58 +03:00
Ghagliiarghii
abfa12e315
Create sale console computer board (#28425) 2024-05-30 20:28:12 -04:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2)
* commit
2024-05-31 02:16:18 +03:00
ShadowCommander
34486f7451
Fix firelocks not requiring engineering access (#28415) 2024-05-30 13:25:07 -04:00
Tayrtahn
98446cb061
Convert advertisements to use localized datasets (#28400)
* Convert advertisements to use LocalizedDatasets

* File consolidation

* Arcade machines too
2024-05-30 12:08:42 -04:00