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
Ed
1a4d58816f
Tech Anomaly ( #31764 )
...
* A
* B
* C
* D
* Update TechAnomalySystem.cs
* idle anim
* Update meta.json
* new animation
2024-09-06 10:24:17 +03:00
Morb0
a7492708b6
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
# Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
# Content.Server/GuideGenerator/ReagentEntry.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Datasets/ion_storm.yml
2024-07-01 14:55:33 +03:00
metalgearsloth
b6cf2ce524
Add FTL arrival visuals ( #29402 )
...
* Add FTL arrival visuals
* weh
* Update Content.Shared/Shuttles/Components/FTLComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-07-01 16:11:30 +10:00
Morb0
da333a1972
Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
2024-06-27 13:40:52 +03:00
Alex Evgrashin
b7c088fbf3
Fix SSD indicator for scaled humanoids ( #29310 )
...
Fix ssd
2024-06-22 11:11:40 +10:00
Morb0
38506f90df
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/specific.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
2024-04-27 13:24:36 +03:00
Errant
257b04d277
Vox sprite rework ( #26985 )
...
weh
2024-04-27 16:04:51 +10: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
chromiumboy
02273ca0e7
Improved RCDs ( #22799 )
...
* Initial radial menu prototyping for the RCD
* Radial UI buttons can send messages to the server
* Beginning to update RCDSystem
* RCD building system in progress
* Further updates
* Added extra effects, RCDSystem now reads RCD prototype data
* Replacing tiles is instant, multiple constructions are allowed, deconstruction is broken
* Added extra functionality to RadialContainers plus documentation
* Fixed localization of RCD UI strings
* Menu opens near cursor, added basic RCD
* Avoiding merge conflict
* Implemented atomized construction / deconstruction rules
* Increased RCD ammo base charges
* Moved input context definition to content
* Removed obsoleted code
* Updates to system
* Switch machine and computer frames for electrical cabling
* Added construction ghosts
* Fixed issue with keybind detection code
* Fixed RCD construction ghost mispredications
* Code clean up
* Updated deconstruction effects
* RCDs effects don't rotate
* Code clean up
* Balancing for ammo counts
* Code clean up
* Added missing localized strings
* More clean up
* Made directional window handling more robust
* Added documentation to radial menus and made them no longer dependent on Content
* Made radial containers more robust
* Further robustness to the radial menu
* The RCD submenu buttons are only shown when the destination layer has at least one children
* Expanded upon deconstructing plus construction balance
* Fixed line endings
* Updated list of RCD deconstructable entities. Now needs a component to deconstruct instead of a tag
* Bug fixes
* Revert unnecessary change
* Updated RCD strings
* Fixed bug
* More fixes
* Deconstructed tiles/subflooring convert to lattice instead
* Fixed failed tests (Linux doesn't like invalid spritespecifer paths)
* Fixing merge conflict
* Updated airlock assembly
* Fixing merge conflict
* Fixing merge conflict
* More fixing...
* Removed erroneous project file change
* Fixed string handling issue
* Trying to fix merge conflict
* Still fixing merge conflicts
* Balancing
* Hidden RCD construction ghosts when in 'build' mode
* Fixing merge conflict
* Implemented requested changes (Part 1)
* Added more requested changes
* Fix for failed test. Removed sussy null suppression
* Made requested changes - custom construction ghost system was replaced
* Fixing merge conflict
* Fixed merge conflict
* Fixed bug in RCD construction ghost validation
* Fixing merge conflict
* Merge conflict fixed
* Made required update
* Removed lingering RCD deconstruct tag
* Fixing merge conflict
* Merge conflict fixed
* Made requested changes
* Bug fixes and balancing
* Made string names more consistent
* Can no longer stack catwalks
2024-03-30 23:29:47 -05:00
Morb0
4ee0df9498
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Structures/stairs.rsi/meta.json
# Resources/Textures/Structures/stairs.rsi/stairs.png
# Resources/Textures/Structures/stairs.rsi/stairs_stage.png
2024-02-22 13:19:02 +03:00
Pieter-Jan Briers
0c8e617572
Shadow anomaly respects "reduced motion" ( #25355 )
...
Enabling "reduced motion" now makes the smoke effects not animate. This helps some people with vision issues.
2024-02-17 22:26:19 -05:00
Morb0
db07fb5098
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-02-18 02:20:00 +03:00
Pieter-Jan Briers
1ce2155315
Add new "OptionsVisualizer" ( #25128 )
...
This is a visualizer somewhat similar to the Generic. It allows configuring appearance info based on specific CVars the user has set. This allows YAML to easily configure alternatives for accessibility CVars like reduced motion.
2024-02-17 15:52:11 -05:00
Morb0
3cf641cd9a
Add idle state to vox typing indicator
2024-02-17 12:44:41 +03:00
Morb0
92bd0148fe
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Locale/en-US/chat/sanitizer-replacements.ftl
# Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00
Errant
5a9ab3b315
Vox names, species prototype cleanup, some cosmetic changes ( #24994 )
...
* voxnames
* New generator parameters, names are more readable
* bunch of missing vox stuff
* more names
* sad
2024-02-14 14:08:45 +11:00
Ed
ae321151ca
Shadow anomaly returns ( #24629 )
...
* content
* add cat
* ambient
* I FORGOT HEARTS!
* fix ambient
* some fixes
* canCollide: false
* connect to damageable
* pi
* remove fx
* some fixes
* *sad bruh*
* hazed
* Update base_shadow.yml
2024-02-13 17:12:32 -05:00
Morb0
bc161df9d4
Add fake lizard3 typing indicator
2024-02-03 03:46:28 +03:00
Morb0
32a8d1a21e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Server/Power/Generator/GeneratorSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png
2024-02-03 03:38:29 +03:00
lunarcomets
4520ac8c9b
add lizard speech bubble ( #23365 )
...
* add bubble sprites and yaml changes
* fixed issues
* lizardified names
* more fixes, got rid of error
* add indicator to kobolds
* updated sprites (removed notch, brightened colours)
2024-02-02 00:24:17 +11:00
778b
61fbd0c610
Add cyrillic support for brig timers ( #1706 )
2024-01-15 01:32:02 +03:00
lzk
b74e7fcf4f
[Resprite] Speech bubbles ( #1739 )
2024-01-10 14:43:51 +03:00
Morb0
1e0bee212f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/ServerInfo/Gameplay.txt
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Mask/bat.rsi/meta.json
# Resources/Textures/Clothing/Mask/bear.rsi/meta.json
# Resources/Textures/Clothing/Mask/bee.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/clown.rsi/meta.json
# Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/fox.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
# Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
# Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/merc.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/rat.rsi/meta.json
# Resources/Textures/Clothing/Mask/raven.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
I.K
e7c94c5aaf
Make the atmospherics meta not bad ( #23737 )
...
juej
2024-01-09 13:18:30 +03:00
brainfood1183
bb294a7aa2
Rock Anom effects ( #23633 )
...
* Rock Anom effects
* fix
* fix
2024-01-06 23:44:04 -07:00
Morb0
f062cbcec2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# LICENSE.TXT
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
# Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
2024-01-02 23:07:58 +03:00
Ed
bf7aa47b32
More artifact content ( #22574 )
...
* 3 new effect
* new trigger
* swap portal to Cak
* cake
* portals
* finish
* pupupu
* limitations (same maps)
* its broken now
* a
* portal fix, thx deltanedas
2023-12-31 21:19:03 -05:00
Morb0
8363a22e11
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Tools/actions_changelogs_since_last_run.py
2023-12-18 01:51:30 +03:00
chromiumboy
58f6086cb7
Adds construction effect to RCD ( #22633 )
2023-12-17 11:08:59 -05: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
brainfood1183
2933024fe8
Acidifier Effect Sprite ( #22425 )
2023-12-14 20:56:42 -05: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
5af97da997
diagonal window glass and pirate shuttle improvements ( #21174 )
...
* shuttle and priate improvements
* fix
* fix damn ubuntu
* darkened syndi airlocks
* fix
* fix ruranium
* added prison cell to pirate ship
2023-11-05 19:38:02 -07:00
Morb0
259233ad78
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/CharacterSetupGui.xaml
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Entities/Clothing/Back/satchel.yml
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
brainfood1183
00523b5260
New foam sprites (edge sprites) ( #21308 )
...
* New foam sprites (icon smoothing)
* changed to edge sprites for foam
* fix
* edges for metal foams
* fix
2023-10-29 10:13:41 -04:00
Morb0
6f6cbb14af
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/Changelog/ChangelogManager.cs
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# SpaceStation14.sln
2023-10-14 00:39:46 +03:00
Ed
5fa0e7dd49
Animals make hearts when you pet them ( #20859 )
2023-10-13 09:34:18 -08:00
Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
Morb
2a143c873c
SSD Indicator ( #19701 )
2023-09-11 15:52:56 +10:00
deltanedas
24810d916b
ninja 2 electric boogaloo ( #15534 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
Morb0
b3f8db2b0c
Add arachnid idle state for typing indicator
2023-09-05 01:23:47 +03:00
Morb0
b1550d7db0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +03:00
PixelTK
74bd86af2f
Arachnid RE-REWORK ( #19138 )
...
* tasty silk and webby crates
* winter coat
* fuck
* Move some files around and stuff
* FUCK
* Web closet finished
* what the fuck
* brain empty
* loss
* loss 2
* fuck
* web typing indicators
* minor spelling mistake, I lost.
* hiss
* changed
* And they said "Let's remove pockets", funniest shit I've ever heard.
* 2 seconds of stun
* fuck it we pr
* resprite
* dummy
* arachnid creampie sprite
* different + more "natural" crate sprites
* Webbing suits and webbing dresses.
* and other stuff I forgot to commit.
* and gone.
* no
* Cloth.
* I forgot to commit this? What???
* Eyes.
* Comment trimming
* winter coat resprite
2023-09-04 13:02:54 -07:00
deltanedas
04cd014179
nuke lights code change ( #19315 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-04 17:14:10 +03:00
Morb0
566c205a39
Fix moth speech bubble
2023-08-17 07:02:23 +03: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
Morb
64e8e37726
Make speech bubble 32px ( #1339 )
...
Co-authored-by: MilenVolf <milen.volf@gmail.com>
2023-08-16 14:55:43 +03:00
Kara
2e86f4c556
Portal sprite & behavior tweaks ( #19179 )
...
* Portal repalette
* Portal traversal verb + anchoring
* map restriction
* optional max distance checks if we decide to have them later
* lower pointlight energy slightly hopefully makes it less garish
2023-08-15 14:56:14 -06:00
Morb0
58e4f8c327
Revert moth speech to 64px
2023-08-13 06:04:20 +03:00
