pacable
556d234b0a
Терминатор ( #333 )
...
* Revert Revert Exterminator pending newmed/redesign (#26978 )
This reverts commit f544c912#28218 )"
This reverts commit 489efeb717#30733 )"
This reverts commit 0a4b220854
2024-08-29 16:07:25 +03:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
Ed
03745efc7f
Thief beacons (try 2) ( #29997 )
...
content
2024-08-08 16:17:50 +03:00
Vigers Ray
bcb9508552
Говнокрад ( #268 )
...
* real?
* ok
* real 2
* one more thing that i forgot to port part 2
* i am dumb
* mofo og
* waaaagh
* some rework placeholders
* porting part 2
* bruh.
* bruh 2
* bruh 3.
* Update ChangelingRuleSystem.cs
* Update AdminVerbSystem.Antags.cs
* говнокрад это SubGamemode
* тяжело...
* пу-пу-пу
---------
Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com>
2024-08-08 09:28:44 +03:00
Pieter-Jan Briers
2a7bdd9b08
Revert "plutonium core steal objective" ( #29578 )
...
Revert "plutonium core steal objective (#26786 )"
This reverts commit f6ce07289a
2024-06-30 01:23:03 +10:00
deltanedas
f6ce07289a
plutonium core steal objective ( #26786 )
...
* add textures
* add SealingCabinet system
* add StoreUnlocker/ObjectiveUnlock system
* add plutonium core and nuke core container
* make nuke deconstructable
* add steal core objective
* add core extraction toolbox to new category
* typo ops wrench fuel
* use queries and resolve, have it resolve instead of using Comp
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-29 14:11:31 +10:00
deltanedas
24ab5c0982
ninja criminal records hacking ( #24982 )
...
* more humour
* spotted a troll
* add TryFindObjective to MindSystem
* replace copypaste bool conditions with CodeCondition
* use CodeConditionSystem in ninja + add handling for criminal hack
* add criminal records hacking
* update objectives
* :trollface:
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-08 23:35:11 -07:00
SlamBamActionman
f544c91298
Revert Exterminator pending newmed/redesign ( #26978 )
...
* Reverts Exterminator
* Includes commented out parts + sprites
* Readd stuff, comment out yaml
* Popup ads
* review
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 15:45:54 +10:00
Vyacheslav Kovalevsky
7311ce671f
Store ninja objectives in conditions 2 ( #20894 )
...
* move spider charge target from role
* shorter field names
* remove ninja role comment
* remove unused systems in SpaceNinjaSystem
* GenericAntagObjectivesAddedEvent
* check if warp point is on same map
* remove unnecessary import
* add missing loc when spider charge has no target
* a
* remove spider charge target requirement comp
* inline SpiderChargeTitle
* allow planting charge without objective
* remove map check
* fix role check when planting
* obj.Target
* Fix merge
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-01-29 15:06:32 +11:00
metalgearsloth
b1f9e25c13
Steal cleanup ( #24428 )
...
- Fix datafield spelling
- Fix some code oddities
2024-01-28 12:10:39 +11: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
deltanedas
2ca649edfa
add limits to steal objectives ( #22672 )
...
* add ObjectiveLimit comp/system
* give ian and disk limits
* all
* up limit
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-24 17:20:55 -08: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
Morb
d27df9705d
Fix hijack objective ( #21241 )
...
* Fix hijack
* Max difficulty
2023-10-27 22:33:18 -04:00
Morb
47b244b191
Hijack shuttle objective ( #19621 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2023-10-24 18:55:46 +11:00
Slava0135
6f8c2b7e52
Use conditions to store progress for Ninja objectives ( #20254 )
...
* TryGetObjectiveComp
* helper function to get objective
* store N of jacked doors in condition
* store called in threat bool in condition
* store techs in steal research condition
* fix access
* remove unused transform system
* use popup from shared system
* fix formatting
* condition => obj everywhere
* i fogror to remove downloaded nodes from role
* change signature
* use query
* View Variables
* spider charge detonated => condition
2023-10-10 09:32:10 +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
deltanedas
f7711edbe3
Objectives ecs rework ( #19967 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 16:18:10 +10:00
