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
0b053a65ba
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
2023-08-17 06:19:53 +03:00
deltanedas
0f310951b7
remove id computer board objective ( #19171 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-15 07:07:56 -07:00
Morb0
9a4db6ca8d
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Server/Doors/Systems/AirlockSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/diona.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
# Resources/Textures/Tiles/attributions.yml
2023-08-11 03:09:35 +03:00
Nemanja
829f2f8976
Remove request computer board steal objective ( #18925 )
...
* remove request computer board steal objective
* this thing, too
2023-08-10 11:34:38 +03: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
Nim
cbe932eecf
Objective of the Theft, Emergency Security Orders ( #16837 )
2023-08-02 20:05:12 +10:00
deltanedas
678d18d79e
add kill head to objective group ( #18496 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-07-31 14:37:53 -06: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
deltanedas
3432a28271
add kill head objective ( #17891 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-07-09 20:26:17 -06:00
Morbo
1b79af1fc2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Changelog/ChangelogManager.cs
# Content.Client/Doors/AirlockVisualizer.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +03:00
keronshb
ac87effca0
[Revert] Reverts Ninja ( #15516 )
...
* Revert "[Antag] add space ninja as midround antag (#14069 )"
This reverts commit c1cda0dbf8#15490 )"
This reverts commit 251f429fb3
2023-04-19 01:43:09 -06:00
Morbo
ea68e39611
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/RulesCorvax.txt
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-04-19 02:54:06 +03:00
deltanedas
251f429fb3
[Fix] move ninja objectives into NinjaRole ( #15490 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-17 16:32:05 -06:00
deltanedas
c1cda0dbf8
[Antag] add space ninja as midround antag ( #14069 )
...
* start of space ninja midround antag
* suit has powercell, can be upgraded only (not replaced with equal or worse battery)
* add doorjacking to ninja gloves, power cell, doorjack objective (broken), tweaks
* 💀
* add basic suit power display that uses stamina rsi
* add draining apc/sub/smes - no wires yet
* add research downloading
* ninja starts implanted, move some stuff to yaml
* add Automated field to OnUseTimerTrigger
* implement spider charge and objective
* fix client crash when taking suit off, some refactor
* add survive condition and tweak locale
* add comms console icon for objective
* add calling in a threat - currently revenant and dragon
* combine all glove abilities
* locale
* spark sounds when draining, refactoring
* toggle is actually toggle now
* prevent crash if disabling stealth with outline
* add antag ctrl for ninja, hopefully show greentext
* fix greentext and some other things
* disabling gloves if taken off or suit taken off
* basic energy katana, change ninja loadout
* recallable katana, refactoring
* start of dash - not done yet
* katana dashing ability
* merge upstream + compiling, make AutomatedTimer its own component
* docs and stuff
* partial refactor of glove abilities, still need to move handling
* make dooremaggedevent by ref
* move bunch of stuff to shared - broken
* clean ninja antag verb
* doc
* mark rule config fields as required
* fix client crash
* wip systems refactor
* big refactor of systems
* fuck
* make TryDoElectrocution callable from shared
* finish refactoring?
* no guns
* start with internals on
* clean up glove abilities, add range check
* create soap, in place of ninja throwing stars
* add emp suit ability
* able to eat chefs stolen food in space
* stuff, tell client when un/cloaked but there is bug with gloves
* fix prediction breaking gloves on client
* ninja soap despawns after a minute
* ninja spawns outside the station now, with gps + station coords to navigate
* add cooldown to stun ability
* cant use glove abilities in combat mode
* require empty hand to use glove abilities
* use ghost role spawner
* Update Content.Server/Ninja/Systems/NinjaSuitSystem.cs
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
* some review changes
* show powercell charge on examine
* new is needed
* address some reviews
* ninja starts with jetpack, i hope
* partial feedback
* uhh
* pro
* remove pirate from threats list
* use doafter refactor
* pro i gave skeleton jetpack
* some stuff
* use auto gen state
* mr handy
* use EntityQueryEnumerator
* cleanup
* spider charge target anti-troll
* mmmmmm
---------
Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-04-17 01:33:27 -06:00
Morb
e6405b7eef
Add hijack traitor objective ( #854 )
2023-03-02 09:37:04 -08:00
Kara
c821ca71aa
Portals & hand teleporter ( #13266 )
...
* basic system with portals & linked ents
* hand tele sprites, no impl
* hand tele and teleportation works
* fancy it up
* oog
* special case projectiles
* predict portal-to-portal teleportation
* this stuff
* check nullspace
* sloth
* give to rd instead
* i guess this can probably happen
* docs
2023-01-02 19:58:25 -06:00
Rane
3184619d42
Objective Assignment Refactor ( #11678 )
2022-11-16 12:58:47 -08:00
Rane
65534f847d
new social traitor objective + fix targeting for other traitor alive ( #11775 )
2022-10-09 12:09:45 -07:00
Vordenburg
718183277d
Replace StayAliveObjective with EscapeShuttleObjective. ( #11642 )
2022-10-04 14:57:14 -07:00
0x6273
d9b25f6a42
Fix cargo computer boards ( #11430 )
2022-09-20 19:09:59 +10:00
Rane
fdba747541
introduce requirement to prevent from being tasked to steal your own item ( #11139 )
2022-09-10 23:43:31 -07:00
Nemanja
69e69e7db7
Captain's Captain's Jetpack ( #10195 )
2022-08-08 18:55:50 +10:00
Rane
8de2590e29
Steal condition tells you where to steal it from ( #9605 )
2022-07-14 20:09:11 -07:00
EmoGarbage404
5e316afe86
Update traitorObjectives..yml ( #9231 )
2022-06-27 13:37:41 +02:00
Emisse
7e6641a7cd
Jetpack Locker Fills and Captain Jetpack Traitor Objective ( #9102 )
2022-06-24 18:39:12 +10:00
metalgearsloth
fb943a61dc
Gun refactor ( #8301 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00
Emisse
ea498da45d
Captain's Antique Laser Gun and Traitor Objective ( #7940 )
2022-05-09 17:43:36 -07:00
EmoGarbage404
6405ac6d9b
Corgi Meat Objective ( #7304 )
2022-03-28 13:52:45 -07:00
Rane
01a522160d
Disabled 'stay alive' objective, reduced probabilities of steal and die ( #6247 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-01-31 01:19:27 +11:00
Rane
9012623c02
Added CE's advanced magboots ( #6344 )
2022-01-28 19:28:05 +01:00
Rane
0280b81eb4
Rebalanced traitor objective difficulty ( #6173 )
2022-01-14 22:02:16 -07:00
Rane
b5f03f4682
New Objective: Ensure another traitor stays alive. ( #6020 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-14 01:53:50 +11:00
Rane
9603e47096
Added difficulty overrides for several traitor objectives ( #6018 )
2022-01-04 13:05:05 +01:00
Rane
ab28be3c54
Adjusted traitor steal objectives ( #5974 )
...
* Adjusted traitor steal objectives
* Added theft target to cargo
2022-01-01 17:56:25 +01:00
Fishfish458
b62a8f3805
[ADD] Hypospray to CMO lockers and to traitor objectives ( #5872 )
...
Co-authored-by: fishfish458 <fishfish458>
2021-12-23 09:51:49 +01:00
ShadowCommander
bfc63e2912
Add character names to round end screen and localize more of the strings ( #5088 )
...
* Add character names and move more traitor round end strings to fluent
* Change coloring and wording
* Fix no objectives
2021-11-03 14:40:32 +01:00
Paul Ritter
f7c09fbd7e
Traitor ( #2566 )
...
* basic implementation
* minor fixes
* objectives temp commit
* proper onstart bind
* changes all conditions to be bound to a mind-instance
* oops
* oops v2
* adds possiblity to enable duplicate assignment of objective
equal objectives are unable to be added
* minor fixes, adds greentext
* refactors incompatability to be defined by requirements
* fixes a wrong whitespace
* minor fix
* addressed reviews v1
* address reviews v2
Co-authored-by: Exp <theexp111@gmail.com>
* final sweep
* adds/refactors traitor&sss cvars
* Update Content.Server/Mobs/Mind.cs
* never trust github web
* adds datasets & makes codewords use them
* addresses exp's reviews
* addressed zumos reviews
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: Exp <theexp111@gmail.com>
2020-12-01 17:05:19 +01:00
Paul Ritter
6602c8c972
Objectives ( #2459 )
...
* temp commit to save progress
* adds objectives
* refactors mind.addobjective a bit
* better names for my testobjectives which i'll remove later on anyways
* nullable errors
* some misc fixes
* no sorted or set, what was i thinking here?
* removes unused imports
* added commands
* fully implements stealcondition
* started uiwork
* moved prototypeicon to engine
* removes objective class & uiwork
* refactors ui to only update when opened
adds progresstexturerect
* adds some margin
* removes some testing code
* ignores objectiveprototypes on clientside
* fixes
* removes using statements for exp
* gets the job
* always show issuer
* locs & _
* giving commands some love
* Update Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs
Co-authored-by: Exp <theexp111@gmail.com>
* makes commands use new thingy
* string interpolation
* good catch exp
* loc'd
* linq gone
* runtime
* moves function from engine
* oopsie
* Update Content.Server/Objectives/Conditions/StealCondition.cs
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* makes messages directed
* base call & validation
* shuffle once
* No? Money down!
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: Exp <theexp111@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-11-22 18:38:07 +11:00
