Morb0
1e0bee212f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/ServerInfo/Gameplay.txt
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Mask/bat.rsi/meta.json
# Resources/Textures/Clothing/Mask/bear.rsi/meta.json
# Resources/Textures/Clothing/Mask/bee.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/clown.rsi/meta.json
# Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/fox.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
# Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
# Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/merc.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/rat.rsi/meta.json
# Resources/Textures/Clothing/Mask/raven.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
metalgearsloth
f0d9782df4
Cleanup mimic event ( #23705 )
...
* Cleanup mimic event
Now it won't be forced on dev map or mapping mode.
* Minor cleanup
2024-01-07 23:26:02 -07:00
Morb0
8ba54ec466
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png
2023-12-29 16:58:52 +03:00
Ed
b7decfe9ee
Add Thiefs to NukeOps ( #23102 )
...
Update roundstart.yml
2023-12-28 16:50:25 -07:00
Nemanja
3e08fe07cd
clerical error station event ( #23091 )
2023-12-27 20:09:05 -07:00
Emisse
880ca0af50
remove ion storm announcement ( #23045 )
...
real
2023-12-27 20:03:00 -07:00
Morb
85798bd851
Make thieves not pacifist ( #1682 )
2023-12-26 00:19:16 +03:00
Morb0
918f543c2c
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
# Resources/Textures/Objects/Devices/nuke.rsi/meta.json
# Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
2023-12-25 21:03:49 +03:00
deltanedas
52532e4075
exterminator midround minor antag ( #19946 )
...
* terminator locale
* terminate objective
* terminator components and shared system
* terminator roles rules and system
* terminator events
* skeleton recolour
* terminator and endoskeleton
* ghost role spawn
* damage modifier sets
* :trollface:
* :trollface:
* add antag prototype
* ghost role locale
* skynet
* :trollface:
* :trollface:
* :trollface:
* add endoskeleton body prototype
* :trollface:
* :trollface:
* smite locale
* implement terminate smite
* :trollface:
* :trollface:
* implement PopupBehavior
* endoskeleton transform popup
* move stuff from shared to server since nothing actually used it
* recolour everything
* update parts
* :trollface:
* :trollface:
* ok fire was using the damage set, back to 1.0
* tweak
* :trollface:
* :trollface:
* simplemob ops
* 1 rule per pro
* :trollface:
* :trollface:
* update some sprites
* structural damage
* :trollface:
* :trollface:
* Revert "update some sprites"
This reverts commit 459196c6a8942c5412885d5fe2f1a83a48408ddc.
* offbrand, add die objective to maybe remove fear of murderbone
* add shut down objective to the list
* fix ghost role
* fix control mob
* :trollface:
* :trollface:
* please
* naming
* code changes for GenericAntag terminator
* yml changes for GenericAntag terminator
* :trollface:
* moved kill objective override to an objective component
* use kill objective override
* fix
* oh
* locale changes
* change burn to heat for skin melting gib
* change some endoskeleton stuff
* pro
* i already did this dementia ops
* objective
* fix
* pro
* swap out full sprite
* update parts
* forgor
* fix mind transfer
* type
* endoskeleton has 500 mass
* evil
* fishops
* warops
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-24 20:16:56 -07:00
Morb0
c333fc2b20
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-12-24 20:02:16 +03:00
Ed
144af233c4
New Thief minor antagonist ( #21520 )
...
* start working
* add right-click thief antagins
some architecture restruct
* add meh thief greeting audio
* add thief subgamemode to Traitors gamemode
* add late join thief (not tested yet)
add briefing
* add pacifism
* add Steal tasks to thief
* fix crash thief+traitor on person
* add new condition: collection steal
* add tracking of succes collection objective
* add stamp collection target
remove some boring steal target
add check pulling entity to collection target
* finalize first 2 group objective
* start merging stealing objective systems
* merging
* finish merging. Now traitor steal objective work better
* we don't check the items of pullable sentient entity
* clear naming, enable thief signle item objective start
* objective pack add
* finish with steal item objectives
* convert string to ProtoId<>
* some clean up
* add thieves to revolution game mode
* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
* update pacifism: fix crashing, monkey-thief without pacified
* adaptive animal briefing, cleaning locales
* add structure steal objectives
* remove RCD target
* add thiefs to manifest, but bug with traitor duplications
* add escape objective
* add chat briefing
* setup animal objective group system
* add animal steal objectives
* add animal objectives notroleconditions
* add morty
* now thief mode has a chance of not launching Now there are a random number of thieves per round from 1 to 3
* 6 hours of trying to fix duplicate tasks. Failure
* added thief pinpointer (buggy)
* start thief backpack UI work
* revert pinpointer for scope reason
* UI continue work
* add thief starter kits content
* remove ERP kit :trollface:
* finally! giving starting items to thief. Now it playable, but still need more work
* clean up
* fix
* fox
* add merged items into thief
new Starting Kit (buggy)
* fix YES antag menu
* objection tweaks
* remove hearts objective, working on spawning things from toolbox
* smug
* fixes
* add race specifier objective condition LAMPS
* meh
* fix fix fix
* the alive
* Adding stamps
* Update backpack.ftl
* Revert1
* Revert ftl
* add voice mask to communicator kit
* Update Resources/Locale/en-US/administration/antag.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/objectives/conditions/steal.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/prototypes/roles/antags.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* update
* fix
* more reusable function, add documentation
* fix doc
* faint fixes
---------
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-12-24 02:58:28 -07:00
Morb0
7d4b894002
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
2023-12-16 03:05:40 +03:00
Kevin Zheng
68171cdacf
Increase gas leak event weight ( #22508 )
2023-12-15 10:41:01 +11:00
Morb0
259233ad78
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/CharacterSetupGui.xaml
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Entities/Clothing/Back/satchel.yml
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
potato1234_x
1c604a41a5
Cockroach + Glockroach Admeme + Mothroach ( #19752 )
...
* cockroach
* Update Resources/Textures/Mobs/Animals/cockroach.rsi/meta.json
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
* parenting fixe
* d
* rsi fail
* mothroach!!!!
* cockroach vent event + critters in trashcart
* linter
* fix
* commit
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2023-10-31 13:28:42 -07:00
Morb0
681762aca7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
2023-10-28 14:14:36 +03:00
deltanedas
b9af991e04
Ion storm event ( #20277 )
...
* ion storm event prototype + locale
* add lawsets
* use lawsets, make borgs ion storm targets
* ion storm rule and ion storm target
* lawset prototype
* use lawsets
* update silicon law system to use lawsets and support ion storm event
* new toys
* fix
* more fix
* fixy
* ion storm admin logging
* assigning laws makes borg provide its own laws, other stuff
* 1h reoccurence
* 50% chance
* better call saul
* emagLaws is required
* add announcment audio
* fixy
* family friendly gaming
* fixy
* address reviews
* fixy
* more fixy and no erp
* pro
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 22:40:13 -04:00
Morb0
75443d7fb6
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Communications/CommunicationsConsoleSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
Nemanja
2c8a97fe02
Revert "Revert "Reenable kudzu."" ( #20876 )
2023-10-09 20:34:41 -07:00
Sailor
a62b9ea19b
Revert "Reenable kudzu." ( #20843 )
2023-10-09 00:08:42 -07:00
Nemanja
2a75e7213e
Wow kudzu is back! ( #20822 )
2023-10-07 13:59:39 -06:00
Morb0
5a4438ca85
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.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/secret_weights.yml
# Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-10-05 19:37:38 +03:00
coolmankid12345
9df5ded9ad
Revolutionaries ( #18477 )
...
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2023-10-04 18:47:33 -07:00
Morb0
34a8740819
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/build-test-release.yml
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
2023-10-02 02:18:19 +03:00
deltanedas
94a11f28ca
dragon refactor, objectives and use GenericAntag ( #20201 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-30 13:18:01 -07:00
Morb0
64f1e79a5a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/manifest.yml
2023-09-28 17:32:44 +03:00
deltanedas
91a157d7ed
use weighted random for ninja threats ( #20469 )
...
* change threats to be weighted random and a little cleanup
* ninja rule stores weighted random id for threats
* move threats out of the rule and into weighted random
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-24 23:16:09 -04:00
Morb0
13b3bfa217
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/update-wiki.yml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/Markings/MarkingPrototype.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/manifest.yml
2023-09-24 12:56:24 +03:00
Nemanja
f16ff3a2d9
Rat King Milsim + Buffs ( #20190 )
...
* rat king update
* rummaging
* buuuuunnnnncccchhh of shit
* the last of it
* make rat servants not ghost roles
* pissma buff and cooldown
2023-09-22 15:01:05 -05:00
deltanedas
37c5020a71
move ninja objectives code into generic antag system ( #20186 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-21 07:33:18 -07:00
Morb0
58ef40767e
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +03:00
Nemanja
fdbadbe579
closet skeleton event ( #19802 )
2023-09-19 15:05:17 +10:00
deltanedas
f7711edbe3
Objectives ecs rework ( #19967 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 16:18:10 +10:00
612
236a97d190
Disable kuzdu pending growth rate fix ( #20200 )
2023-09-15 09:16:03 -08:00
deltanedas
c3e8be7ce8
ninja can spawn earlier, 1h reoccurence ( #20091 )
...
* ninja can spawn earlier, 1h reoccurence
* need 40p
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-13 16:02:29 -06:00
Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
deltanedas
24810d916b
ninja 2 electric boogaloo ( #15534 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
Morb0
b1550d7db0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +03:00
Flareguy
7b69395061
Blindy changes a bunch of event spawnrates in hopes that it does something. ( #19803 )
...
* blindly changes some event rates in hopes it does something cool
* emergent game play
2023-09-03 23:38:22 -04:00
Morb0
5a6058666e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/white_mono.png
2023-08-31 20:55:00 +03:00
Nemanja
4d677f0685
1v1 me first to 31 no powerups [Deathmatch Gamemode] ( #19467 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-08-30 18:06:15 -07:00
Morb0
81fe87f513
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
2023-08-21 09:44:38 +03:00
CrigCrag
4aafd72632
let loneops happen 10 minutes earlier ( #19274 )
2023-08-20 22:12:28 +10:00
deltanedas
e65212ab90
better solar flare ( #19189 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-19 16:39:35 -07:00
Morb0
0cffa43345
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
# Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
# Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
# Resources/Textures/Decals/bricktile.rsi/dark_box.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_e.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_n.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_s.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_w.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_e.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_n.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_s.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_w.png
# Resources/Textures/Decals/bricktile.rsi/meta.json
# Resources/Textures/Decals/bricktile.rsi/steel_box.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_e.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_n.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_s.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_w.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_e.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_n.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_w.png
# Resources/Textures/Decals/bricktile.rsi/white_box.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/white_end_e.png
# Resources/Textures/Decals/bricktile.rsi/white_end_n.png
# Resources/Textures/Decals/bricktile.rsi/white_end_s.png
# Resources/Textures/Decals/bricktile.rsi/white_end_w.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/white_line_e.png
# Resources/Textures/Decals/bricktile.rsi/white_line_n.png
# Resources/Textures/Decals/bricktile.rsi/white_line_s.png
# Resources/Textures/Decals/bricktile.rsi/white_line_w.png
# Resources/Textures/Decals/minitile.rsi/dark_box.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_se.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/dark_end_e.png
# Resources/Textures/Decals/minitile.rsi/dark_end_n.png
# Resources/Textures/Decals/minitile.rsi/dark_end_s.png
# Resources/Textures/Decals/minitile.rsi/dark_end_w.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_se.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/dark_line_e.png
# Resources/Textures/Decals/minitile.rsi/dark_line_n.png
# Resources/Textures/Decals/minitile.rsi/dark_line_s.png
# Resources/Textures/Decals/minitile.rsi/dark_line_w.png
# Resources/Textures/Decals/minitile.rsi/meta.json
# Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_se.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/steel_end_e.png
# Resources/Textures/Decals/minitile.rsi/steel_end_n.png
# Resources/Textures/Decals/minitile.rsi/steel_end_s.png
# Resources/Textures/Decals/minitile.rsi/steel_end_w.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_se.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/steel_line_e.png
# Resources/Textures/Decals/minitile.rsi/steel_line_n.png
# Resources/Textures/Decals/minitile.rsi/steel_line_s.png
# Resources/Textures/Decals/minitile.rsi/steel_line_w.png
# Resources/Textures/Decals/minitile.rsi/white_box.png
# Resources/Textures/Decals/minitile.rsi/white_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/white_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/white_corner_se.png
# Resources/Textures/Decals/minitile.rsi/white_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/white_end_e.png
# Resources/Textures/Decals/minitile.rsi/white_end_n.png
# Resources/Textures/Decals/minitile.rsi/white_end_s.png
# Resources/Textures/Decals/minitile.rsi/white_end_w.png
# Resources/Textures/Decals/minitile.rsi/white_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/white_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/white_inner_se.png
# Resources/Textures/Decals/minitile.rsi/white_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/white_line_w.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/bar.png
# Resources/Textures/Tiles/clown.png
# Resources/Textures/Tiles/dark.png
# Resources/Textures/Tiles/dark_diagonal.png
# Resources/Textures/Tiles/dark_diagonal_mini.png
# Resources/Textures/Tiles/dark_herringbone.png
# Resources/Textures/Tiles/dark_mini.png
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/dark_offset.png
# Resources/Textures/Tiles/dark_pavement.png
# Resources/Textures/Tiles/dark_pavement_vertical.png
# Resources/Textures/Tiles/hydro.png
# Resources/Textures/Tiles/kitchen.png
# Resources/Textures/Tiles/laundry.png
# Resources/Textures/Tiles/steel.png
# Resources/Textures/Tiles/steel_diagonal.png
# Resources/Textures/Tiles/steel_diagonal_mini.png
# Resources/Textures/Tiles/steel_herringbone.png
# Resources/Textures/Tiles/steel_mini.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/steel_offset.png
# Resources/Textures/Tiles/steel_pavement.png
# Resources/Textures/Tiles/steel_pavement_vertical.png
# Resources/Textures/Tiles/white.png
# Resources/Textures/Tiles/white_diagonal.png
# Resources/Textures/Tiles/white_diagonal_mini.png
# Resources/Textures/Tiles/white_herringbone.png
# Resources/Textures/Tiles/white_mini.png
# Resources/Textures/Tiles/white_mono.png
# Resources/Textures/Tiles/white_offset.png
# Resources/Textures/Tiles/white_pavement.png
# Resources/Textures/Tiles/white_pavement_vertical.png
2023-08-02 15:13:51 +03:00
metalgearsloth
b0b1597aad
Fix cargo gifts ( #18449 )
...
Some of the IDs were invalid and no typeserializer.
2023-07-30 12:53:54 -06:00
Morb0
23eef7660d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-07-28 01:02:37 +03:00
Nemanja
d55cd23b0a
Zombie Mode 𝓡𝓮𝓭𝓾𝔁 ( #18199 )
...
* zombie mode redux
* the great zombie changes
* fix this
* 65 down to 50
* empty
* Changes to address stalling
* make zombie nukies no longer nukies
* actually work
2023-07-25 15:31:35 -06:00
deltanedas
88eaf7a772
dragon minor refactor and stuff ( #18149 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-07-25 10:32:12 +10:00
faint
076d2e339b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
2023-07-10 07:03:24 +03:00
