Morb0
8a0a435965
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json
2024-01-05 00:55:19 +03:00
brainfood1183
b06d9cb64a
Adds Hellspawn (Nar'Sie demon mob) ( #20291 )
...
* HellSpawn Mob
* added spawner
* summary for the namespace
* larger collider, cannot enter single tile corridors.
* fix
* remove duplicate from yml, fix attributions.
* moved action to shared, moved comp to shared, networked comp, separated heal, fixed attributions
* removed flammable from hellspawn
removed the healing effect from firestarter ability (healing can be separate ability).
* Update attributions.yml
fix attributions
* fix
* fix
2024-01-04 05:53:15 -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
Darkie
1c8eb2f3de
Added a regular and an engraved zippo (flippo) lighter ( #23020 )
...
* Added the zippo and engraved zippo. Added the engraved zippo in the detective's coat.
* Added copyright.
* Renamed to Flippo
* Gave the Flippo new sounds. Moved the lighter sound collections to their own folder in Items.
* Fixed YAML issues that showed up with moving the lighter noises to their own folder.
* Added the detective's Flippo as a thief objective, with half the weight of the forensic scanner.
2023-12-27 15:47:35 -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
Kara
e4a227ff0d
Explosion SFX juicing + higher persistence ( #22544 )
2023-12-16 03:57:46 +11:00
Morb0
caf8ac8005
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/wrench.rsi/meta.json
2023-12-08 13:54:31 +03:00
Nim
460bfdc73c
Space cobra 1.1 ( #20298 )
...
* space cobra again
* didn't see
* fix
* Dirty
* space spider
* license
* component
* sprite update
* visibility
* fix
* fix visibility
2023-12-06 20:25:57 -05:00
Arthur Asimov
3da699ad32
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
2023-12-05 07:42:45 +03:00
brainfood1183
63bc4bf6b1
Banana Clown Outfit ( #22068 )
...
* Banana Clown Outfit
* Update SkatesComponent.cs
2023-12-04 16:12:02 -07:00
Morb0
804c99fcc5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/CCVar/CCVars.cs
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel.png
2023-11-22 20:22:45 +03:00
Whisper
5362ba3009
Add vibe ace to the lobby playlist ( #21751 )
2023-11-19 14:49:33 -08:00
Morb0
611bfea5ff
Merge remote-tracking branch 'upstream/master' into update-sposnors
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Packaging/ContentPackaging.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Resources/Audio/Weapons/Guns/Gunshots/license.txt
# Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
2023-11-08 03:00:51 +03:00
brainfood1183
40b36d1dc5
Roller Skates ( #20257 )
...
* adds roller skates
* removed hascomp and changed addcomp to ensurecomp, modified to _random, _stun
* remove icon from type: sprite
* sorted dependencies
* skates no longer added skater component to user, movmeentspeedmodifier and damagehighspeedimpact had access removed.
* fixes
* fixes
2023-11-05 19:42:37 -07:00
Nim
3d1333280a
The Mobs of the Living Light ( #21338 )
...
* The Mobs of the Living Light
* fix
* sound
* radius
* minor sprite changes
2023-11-05 19:24:14 -07:00
Morb0
55a91108c1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-10-15 17:52:02 +03:00
deltanedas
4c9246589b
add flash and dash sounds to paracusia ( #20983 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-13 22:49:04 -07:00
Morb0
1b513f0c1a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
Pieter-Jan Briers
bf16698efa
Portable Generator Rework ( #19302 )
2023-08-25 11:40:42 -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
T-Stalker
322b5f71b4
Add two more reboot themes ( #19219 )
2023-08-18 23:58:44 +10: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
Kara
baddcf1b26
Chain link fencing ( #18956 )
2023-08-11 00:16:25 +10:00
lzk
c5ef96c2ea
Title2 lobby music ( #1160 )
2023-07-19 13:47:04 +03:00
faint
31f283cc8e
Merge remote-tracking branch 'wizards/master' into upstream-sync
2023-07-04 03:14:11 +03:00
Nemanja
b3063fbebe
add artifact sound effects ( #17792 )
2023-07-03 21:14:27 +10:00
Morb0
636bea81df
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
# Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.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/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-06-19 21:06:28 +03:00
brainfood1183
4322faf5c9
Behonker and Clown Spider (ready for merge) ( #16678 )
2023-06-15 12:47:36 +10:00
justproggramer
608ddf0ab8
Emotion ( #17187 )
2023-06-08 16:22:02 +10:00
brainfood1183
c99585c94f
Toy Box filled with toys (ready for merge) ( #16252 )
2023-06-03 13:31:47 +10:00
faint
69ddbdd9f4
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Resources/Prototypes/secret_weights.yml
2023-05-31 03:26:01 +03:00
metalgearsloth
0c83642c5a
Add ambient music ( #16829 )
2023-05-29 10:44:11 +10:00
Morb0
c124b716a3
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Traits/TraitSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Research/technologies.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/moose.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png
2023-05-20 13:51:12 +03:00
Emisse
ba1db5a11c
Remove among us noise from game ( #16589 )
...
* Delete emergency_meeting.ogg
* Update reinforcement_teleporter.yml
* Update attributions.yml
* Update troll.yml
* Update mecha_equipment.yml
2023-05-18 23:44:23 -06:00
Morb0
5e8d55caf8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/saltern.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
2023-05-13 10:39:34 +03:00
lzk228
9492fd7b2f
Sigh sound ( #16223 )
...
* comit1
* Create attributions.yml
* Update Resources/Audio/Voice/Human/license.txt
* Update attributions.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-11 03:17:24 -06:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
deltanedas
bc101e1fb5
H.O.N.K. mech ( #14670 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-05 23:21:13 +10:00
Morbo
85c619c12f
Use new sound collection for nuke music
2023-04-29 15:02:06 +03:00
pofitlo
447f08b10a
add new music for nuke ( #15035 )
2023-04-29 18:57:59 +10:00
brainfood1183
2fba2b18ab
Adds Bananium ( #14663 )
2023-04-29 15:38:09 +10:00
brainfood1183
4d2a558977
[entities] Kangaroos, boxer improvements, boxing bell and hamlet updates. ( #15546 )
...
* kangaroo
* fixes
* fuix
* fixes and rotational sprites for bell
* why wont u work, stupid rsi thingy
* attempt to fix
* now hsould work
* fix bell
* fix the bell
* bell make noise on hitting it
* add faction simple hostile to space kangaroo
* added boxing kangaroo spawner comes with gloves and agressive
2023-04-23 20:31:07 -06:00
RobbyTheFish
426bb95e1b
[Entity] Add Ian's Backpack ( #15519 )
...
* Initial commit
Add Ian's backpack
* Fixed inhand sprites
* Add fill to HoP Locker
Added Ian's 50% probability chance to spawn Ian's backpack in HoP locker
2023-04-19 01:40:25 -06:00
Whisper
adb6b168b7
[SFX] Jester shoes now jingle. Sounds by GentleJester#8754 ( #15457 )
...
* Jester shoes jingle
* Added attribution
* Needs source I guess?
2023-04-16 23:56:19 -06:00
Morb
3c06b87572
Use chat emotes for disease ( #15134 )
...
* Use chat emote system for disease
* Use chat emotes in prototypes
* Fix sound path
* Fix prototype ids
* Update Content.Server/Disease/DiseaseSystem.cs
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
---------
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
2023-04-07 16:17:30 -07:00
lapatison
cc5c590ece
Adds the clown recorder (Clown fix) ( #15074 )
2023-04-06 20:06:52 -06:00
brainfood1183
ad31749b55
Desk Bell fix, Poster Rise fix, Happyhonk Mime inhand fix. ( #14973 )
...
* deskbell, poster rise fix, happyhonk mime inhand fix.
* cancollide: false
2023-03-30 22:32:57 -06:00
T-Stalker
3b9fd4867e
Re-adds skub noise [Not april fools] ( #14978 )
2023-03-31 15:25:46 +11:00
metalgearsloth
6157dfa3c0
Salvage dungeons ( #14520 )
2023-03-10 16:41:22 +11:00
brainfood1183
c9e70d8ea0
Cluwne smite ( #13367 )
2023-03-06 11:09:24 -08:00
