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
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
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
kosticia
5681db31a9
Changing the thief's objective to stealing ID cards. ( #32411 )
...
* Changed thief ID objection
* Update Resources/Prototypes/Objectives/thief.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-01 00:40:31 +02:00
deltanedas
7d4ea967e0
remove thief figurine objective ( #32413 )
...
* make figurine objective just 1
* remove the objective entirely
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-27 21:04:22 +02:00
Эдуард
1468cbdb8a
Wanted list cartridge ( #31223 )
...
* WantedListCartridge has been added
* WantedListCartridge user interface works
* WantedListCartridge is added as standard in some PDAs
* The CriminalRecordsSystem can now also take into account who created the record
* Added offense history table
* Fix of missing loaderUid for a cartridge without installing the program
* Added personalized information about the target
* The crime history has been finalized
* Added StatusList
* The officer's name has been added to the automatic history
* WantedListCartridge has been added to the HOS locker
* WantedListCartridge has been removed from brigmedic's preset programs
* The StealConditionSystem now takes into account whether a cartridge is inserted or installed
* Added target to thief on WantedListCartridge
* Merge fix
* Removing copypaste
* Fix merge 2
* The sprite of WantedListCartridge has been changed
* Update pda.yml
* Fix scrollbar in the history table
* Upstream localization fix
* `StatusList` has been replaced by `ListContainer` with `TextureRect`
* Margin fix
2024-09-19 12:22:02 +02:00
Morb0
768b5e9862
Use categories for hide spawn menu
2024-09-19 11:05:49 +03:00
Morb0
34d3cf6293
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 10:30:01 +03:00
chavonadelal
ccc5f61584
Localization of steal targets ( #30153 )
...
* Localization of steal targets
* Correction of localization of theft objects
* The second correction of the localization of theft targets
* Update steal-target-groups.ftl
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
* Revision of the localization method
* Choosing a simple option for localization
* Fix TechnologyDisk name
* Corrections based on feedback received
* correction of declension
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-09-16 14:50:14 +02:00
Morb0
2b35b9922f
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Entities/Objects/Misc/books.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-09-07 08:35:45 +03:00
Boaz1111
2acee53f72
Energy Shotgun Change 2 - Narrow Nerf + instances from NoSpawn --> categories: [ HideSpawnMenu ] + self recharge removed + 1 more shot + normal recharge speed ( #31235 )
...
* narrow nerf
* last instance of nospawn gone
* removes self recharge
* 8 shots, less recharge time
2024-09-07 02:35:01 +02:00
Morb0
0f339baab5
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Stations/base.yml
2024-09-01 22:20:47 +03:00
Nemanja
c88666c66e
Salvage Equipment Rebalance [Reclaimer Removal] ( #31333 )
...
* Salvage Equipment Rebalance
* oh yeah!
* make fire extinguisher 100%
2024-09-01 01:39:32 +02:00
Morb0
07a34aaaae
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# 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/Structures/Wallmounts/signs.rsi/meta.json
2024-08-23 09:38:36 +03:00
LankLTE
0f6808e16a
Remove the shock collar. ( #31229 )
...
* Remove the shock collar.
* add migration
2024-08-21 13:56:56 -04:00
Halches
ccb042d3ce
Nuke disj objective only with escape objective ( #2235 )
2024-08-20 15:35:10 +03:00
Boaz1111
2f923d88e4
New head of security weapon:Energy Shotgun ( #30643 )
...
* Reset hopefully?
* removes the emergency security orders
* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Rewrites the description based on review
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
* 7 shots, recharge taking 42 seconds
* minor renaming :godo:
* please work
* Revert "please work"
This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.
* please fix
---------
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
2024-08-19 21:14:30 +10:00
Morb0
a0bce916fb
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/origin.yml
2024-08-16 14:29:08 +03:00
Nim
84af71eb7c
Golden toilet ( #31049 )
...
* golden toilet
* Destructible
* sprite
* fix
* copyright
2024-08-15 13:23:59 -06:00
to4no_fix
6567fa36e4
Adding shock collar and electropack ( #30529 )
...
* Adding shock collar with the new ShockOnTrigger
* Cleaning and updating the shock collar
* Add StripDelay datafield to ClothingComponent
* Adding SelfUnremovableClothingComponent
* ShockCollar Update
* Correction of the shock collar
* Correction of the shock collar 2
* Renaming the DamageSpecifier DataField to Damage
* Fixing the damage field in ShockCollar
* Cleaning the ShockCollar
* Renaming ShockCollar to ClothingNeckShockCollar
* Adding ClothingNeckShockCollar as a stealTarget to a thief
* Fixing a typo of the sprite path in ClothingNeckShockCollar
* Cleaning the ShockOnTriggerComponent
* Revision of SelfUnremovableClothing
* Adding a ClothingBackpackElectropack
* Sprite fix
* Code review
* Shock Collar sprite update
* add commit hash
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-08-15 10:30:39 -04:00
Morb0
acf1ff4ec0
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.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/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/StatusIcon/faction.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# 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/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/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
2024-08-12 13:18:43 +03:00
Ed
03745efc7f
Thief beacons (try 2) ( #29997 )
...
content
2024-08-08 16:17:50 +03:00
strO0pwafel
35819e4ba5
more consistent CentComm naming ( #29217 )
...
* first-commit
* second commit
* i think i get git kinda maybe
* all of resources i think
* last easy changes
* oops
* Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml
---------
Co-authored-by: stroopwafel <j.o.luijkx@student.tudelft.nl>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-08-08 20:04:19 +10:00
Arthur Asimov
b97dcf215a
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# .github/labeler.yml
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-02 11:29:44 +03:00
Velcroboy
378d1e5c71
Adjusts the Bingus steal target to include any of the named cats ( #30504 )
...
* Adjusts the Bingus steal target to include any of the named cats
* Change name of target group
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-08-02 16:02:56 +10:00
Spessmann
34a7aa70ce
Thief objectives for figurines and stamps ask for less items ( #30390 )
...
Makes thief objective for stealing figures and stamps easier
2024-07-28 02:11:26 +03:00
Morb0
a5980baa7d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/security.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
# Resources/migration.yml
2024-07-21 07:20:43 +03:00
Ed
d8ab4982ad
Character menu issuer localization ( #29840 )
...
* Update CharacterUIController.cs
* TODO Burn this shit
* huh?
* huh!
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-07-17 08:47:50 +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
Morb0
9888f8fa57
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
# Content.Client/Lobby/LobbyUIController.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# 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/Entities/Mobs/base.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Medical.xml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/Service/Bartender.xml
# Resources/ServerInfo/Guidebook/Service/Chef.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-14 19:48:52 +03:00
Tayrtahn
68dc1fb055
Fix ninja Spider Clan charge not getting a target ( #28871 )
2024-06-12 23:37:31 -07:00
deltanedas
8d78b7442a
make objectives use entityCategory ( #28269 )
2024-06-03 09:23:52 -04:00
Morb0
4bf8b9eed6
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
2024-05-29 01:14:59 +03:00
Ghagliiarghii
b95df6530d
Update Antagonists Guidebook Sections ( #27931 )
...
* Update MinorAntagonists.xml
Flesh out the Rat King and Space Dragon sections of MinorAntagonists.xml in the guidebook.
* Rope the rest of the Guidebook Antag Entries into this (except Zombies they were fine) - Also fix two typos I discovered during research
* oops missed a hyphen
* Sydnicate :despair:
* AUTOTELL ON -> OPERATIVES
2024-05-27 17:51:30 -07:00
Morb0
ac51af0830
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
2024-05-26 13:10:11 +03:00
deltanedas
a06ea58249
antag objective issuing refactor ( #28216 )
...
* add AntagObjectives from GenericAntag
* add AntagRandomObjectives that traitor and thief can use
* make ObjectivesSystem use initial character name which AntagSelection passes
* make thief and traitor use AntagRandomObjectives
* remove now unused locale
* make sleeper agents rule use baseTraitorRule
* restore dragon rule oop
* bandaid for genericantag
* real
* typo
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-25 16:14:48 -04:00
Morb0
3fcd731834
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/criminal_records.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
2024-05-09 13:47:39 +03: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
Morb0
d9142b3553
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/conflict-labeler.yml
# .github/workflows/labeler-pr.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
2024-04-30 21:12:31 +03: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
Morb0
3e015c6f67
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
Whisper
7decf64c39
Raise difficulty class of RD hardsuit objective ( #27103 )
...
Raise difficulty class of RD hardsuit
2024-04-18 19:41:11 -04:00
Morb0
860f045b08
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
# Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png
# Resources/Textures/Objects/Misc/books.rsi/book0.png
# Resources/Textures/Objects/Misc/books.rsi/book1.png
# Resources/Textures/Objects/Misc/books.rsi/book2.png
# Resources/Textures/Objects/Misc/books.rsi/book3.png
# Resources/Textures/Objects/Misc/books.rsi/book4.png
# Resources/Textures/Objects/Misc/books.rsi/book5.png
# Resources/Textures/Objects/Misc/books.rsi/book6.png
# Resources/Textures/Objects/Misc/books.rsi/book7.png
# Resources/Textures/Objects/Misc/books.rsi/book8.png
# Resources/Textures/Objects/Misc/books.rsi/book_bar.png
# Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png
# Resources/Textures/Objects/Misc/books.rsi/book_borg.png
# Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png
# Resources/Textures/Objects/Misc/books.rsi/book_cooking.png
# Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png
# Resources/Textures/Objects/Misc/books.rsi/book_detective.png
# Resources/Textures/Objects/Misc/books.rsi/book_engineering.png
# Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png
# Resources/Textures/Objects/Misc/books.rsi/book_fish.png
# Resources/Textures/Objects/Misc/books.rsi/book_hacking.png
# Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png
# Resources/Textures/Objects/Misc/books.rsi/book_infections.png
# Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png
# Resources/Textures/Objects/Misc/books.rsi/book_origami.png
# Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png
# Resources/Textures/Objects/Misc/books.rsi/book_space_law.png
# Resources/Textures/Objects/Misc/books.rsi/meta.json
2024-04-02 11:32:48 +03:00
Wrexbe (Josh)
a23ff527d4
Fix round start crash (causing instant restart) ( #26579 )
...
* Fix round start crash
* Make `TryCreateObjective` more error tolerant
2024-03-31 10:50:29 +11:00
Morb0
6fc8c1cd54
Merge remote-tracking branch 'upstream/master' into master-syndicate
...
# Conflicts:
# Content.Packaging/ServerPackaging.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Holo/holofan.rsi/meta.json
# Resources/Textures/Structures/Holo/wetfloor.rsi/meta.json
2024-03-27 01:12:55 +03:00
Nemanja
3b9c5d43ec
Nerf ninja research stealing ( #26421 )
...
* nerf ninja steal objective
* fubar
2024-03-26 11:52:27 +11:00
ChaseFlorom
b44015bd55
Removed Cannabis from thief objectives ( #26412 )
...
* Removed Cannabis from thief objectives
* Removed the steal group and from cannabis prototypes
2024-03-25 01:02:56 +03:00
Morb0
b70efe1fa8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
# Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Windows/directional.rsi/meta.json
2024-03-08 16:05:59 +03:00
kerisargit
b6fefa10ab
Return hijack objective ( #1903 )
2024-03-08 13:14:13 +03:00
