Arthur Asimov
f8d4eea0dc
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Maps/core.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
2023-12-03 15:10:26 +03:00
NULL882
bb6091a76c
Mining things [part 2] ( #21953 )
...
* mining-window (Diagonal)
* mining-airlock "glass"
2023-11-29 17:57:29 -07:00
NULL882
f268e626a7
Mining things ( #21909 )
...
* mining-doors
* mining-tiles
* mining-window
* Change copyright in meta.json
* Change license in attributions.yml
2023-11-27 14:25:15 -07:00
SonicHDC
71ce92ddc1
Diagonal walls resprite ( #1562 )
2023-11-09 12:20:22 +03:00
Morb0
7a328a7635
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-11-08 14:28:45 +03:00
Darkie
b5e88901eb
Adding damage visuals for directional windows ( #21194 )
...
* Added a crack overlay for directional windows. Added directional window crack components to windows, reinforced windows, plasma windows and reinforced plasma windows.
* Changed the copyright information with the files I actually used.
* Updated the copyright further.
2023-11-07 18:31:45 -07: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
SonicHDC
8f2cc624d3
[Resprite] Uranium windows ( #1089 )
2023-05-23 10:18:16 +03:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
AsikKEsel
b67cb04f19
Added uranium glass and uranium window ( #15869 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-06 14:47:19 +10:00
Morbo
6343d1e1f8
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
2022-12-20 14:15:13 +03:00
metalgearsloth
945101e5e4
Fix a bunch of invalid rsi files ( #13104 )
2022-12-20 09:36:59 +01:00
Arthur
421895e321
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-07-08 20:58:22 +03:00
Ablankmann
e6d9c5f622
See-Through Shuttle Wall ( #9306 )
2022-07-02 19:10:19 -07:00
Morber
645d9d883e
[Resprite] Direct windows/doors ( #281 )
...
* Update direct windows sprites
* Update windoor sprites
2022-06-26 00:49:27 +03:00
Morber
cd65cd152b
[Resprite] Walls ( #247 )
...
* Add TauCeti to icon smooth tool
* Update solid walls texture
* Update window texture
* Update reinforced plasma window texture
* Mistake window texture with reinforced window
* Update window texture
* Update reinforced window copyrights
* Update plasma window texture
* Update reinforced tined window texture
* Make windows smooth with walls
2022-06-13 21:27:24 +03:00
mirrorcult
61d9053e66
Make thindows 4-dir instead of 8-dir ( #6490 )
2022-02-06 13:25:13 +11:00
Lamrr
af1aa7ec77
Adds full-tile tinted windows. ( #6278 )
2022-01-23 10:44:12 -07:00
mirrorcult
198933a513
Directional windows ( #5195 )
2021-11-07 11:12:42 +11:00
Flipp Syder
91b4ce6f24
Adds generic damage visualizer to the game ( #4893 )
2021-10-29 10:04:24 +02:00
SethLafuente
2b2211a468
Reinforced Plasma Windows ( #4962 )
...
* submodule
* adds reinforced plasma windows
* Fixed some of le issues
* removing the module
* empty
literal nothing
* empty
same empty
* request fixes
* ups forgot to add that
* small change
change do after and camel reinforcedPlasmaWindow
* Update structures.yml
* Update rplasma.yml
* Update meta.json
* Update structures.yml
* Update structures.yml
* Update window.yml
* Update structures.yml
* small fixes
* literary nothing why is this here
* Update window.yml
* Update structures.yml
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-10-24 23:46:38 +11:00
Swept
e34888373a
Respriting the codebase ( #4820 )
...
* Walls
* Airlocks mostly ported
* Disposal Unit
* Tiles
* Lighting
* Catwalk
* Windows
* Some vending machine work
* More Vending Machines
* Rest of vending machine sprites ported
* Fixes to vending machines
* Tables (This took a lot of work)
* Fixes low walls being required for window smoothing
- Also replaces window damage visualization
* Plasma Window
* APC
* SMES + Reorganized parts.yml
* Furniture and Organization and Removed Shelf
* Renamed seats.yml to chairs.yml
* Dispensers
* Lazy-fixed the glass airlocks
* Don't need this no more
* Tilez
* blue circuit my fucking beloved
* Switches lights to cev one
* Conveyors and Switch
* Reorients lights
* !ALERT! MAP CHANGES !ALERT!
Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
2021-10-15 11:58:40 +02:00
Swept
5f9ba812ca
Reorganizes Resources/Constructible ( #4252 )
2021-07-15 18:30:50 +00:00
