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
Morb0
22283a01f1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Content.Shared/Chat/SharedChatSystem.cs
2023-08-15 00:08:39 +03:00
Emisse
3268ea3d92
plastic hydro crates ( #19112 )
2023-08-14 02:29:01 -05:00
Emisse
b3c8dff61c
o2 crate recolour ( #19113 )
...
* o2 crate recolour
* fix inside of box shading
2023-08-14 02:28:53 -05:00
Emisse
603f990f8a
engi crate recolor ( #19094 )
2023-08-14 00:17:07 -04:00
Morb0
f5c44e5bd0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/typing_indicator.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Effects/speech.rsi/alien0.png
# Resources/Textures/Effects/speech.rsi/alien1.png
# Resources/Textures/Effects/speech.rsi/alien2.png
# Resources/Textures/Effects/speech.rsi/alienroyal0.png
# Resources/Textures/Effects/speech.rsi/alienroyal1.png
# Resources/Textures/Effects/speech.rsi/alienroyal2.png
# Resources/Textures/Effects/speech.rsi/blob0.png
# Resources/Textures/Effects/speech.rsi/blob1.png
# Resources/Textures/Effects/speech.rsi/blob2.png
# Resources/Textures/Effects/speech.rsi/clock0.png
# Resources/Textures/Effects/speech.rsi/clock1.png
# Resources/Textures/Effects/speech.rsi/clock2.png
# Resources/Textures/Effects/speech.rsi/default0.png
# Resources/Textures/Effects/speech.rsi/default1.png
# Resources/Textures/Effects/speech.rsi/default2.png
# Resources/Textures/Effects/speech.rsi/guardian0.png
# Resources/Textures/Effects/speech.rsi/guardian1.png
# Resources/Textures/Effects/speech.rsi/guardian2.png
# Resources/Textures/Effects/speech.rsi/holo0.png
# Resources/Textures/Effects/speech.rsi/holo1.png
# Resources/Textures/Effects/speech.rsi/holo2.png
# Resources/Textures/Effects/speech.rsi/lawyer0.png
# Resources/Textures/Effects/speech.rsi/lawyer1.png
# Resources/Textures/Effects/speech.rsi/lawyer2.png
# Resources/Textures/Effects/speech.rsi/machine0.png
# Resources/Textures/Effects/speech.rsi/machine1.png
# Resources/Textures/Effects/speech.rsi/machine2.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/robot0.png
# Resources/Textures/Effects/speech.rsi/robot1.png
# Resources/Textures/Effects/speech.rsi/robot2.png
# Resources/Textures/Effects/speech.rsi/slime0.png
# Resources/Textures/Effects/speech.rsi/slime1.png
# Resources/Textures/Effects/speech.rsi/slime2.png
# Resources/Textures/Effects/speech.rsi/swarmer0.png
# Resources/Textures/Effects/speech.rsi/swarmer1.png
# Resources/Textures/Effects/speech.rsi/swarmer2.png
# Resources/Textures/Effects/speech.rsi/syndibot0.png
# Resources/Textures/Effects/speech.rsi/syndibot1.png
# Resources/Textures/Effects/speech.rsi/syndibot2.png
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/command.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/science.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
2023-08-13 05:40:29 +03:00
potato1234_x
f4bbe3603d
Add trash carts and janitorial trash carts ( #18996 )
...
* everything
* half loot
2023-08-12 13:05:32 -06:00
potato1234_x
fbecde1f68
ice ( #18985 )
2023-08-11 01:28:26 -06:00
Nemanja
9eee1adcb9
The Cratening ( #18972 )
...
* so it begins
* The Cratening
* welded sprites
2023-08-10 19:12:38 -05:00
LinkUyx
fcd8d044c8
Resprite command crate ( #1258 )
2023-08-05 18:45:15 +03:00
Morb0
10da53cbd9
Resprite syndicate crate
2023-08-02 15:20:50 +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
Hyenh
ede3e89851
Adds Syndicate Crate ( #18497 )
...
* Retextures surplus crates.
* Adds locale name+desc.
* Removes period from ent names.
2023-07-31 14:28:15 -06:00
Morb0
23eef7660d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-07-28 01:02:37 +03:00
AjexRose
7ef7fb2096
Retexture of command crate ( #18294 )
2023-07-25 14:18:01 -06:00
Tunguso4ka
730285290a
coffin and two graves ( #18213 )
2023-07-23 21:13:10 -06:00
comasqw
72dcbd2891
resprite chemcrate secure ( #1178 )
2023-06-30 02:34:33 +03:00
SonicHDC
b05f0f5dd6
[Resprite] Better tanks ( #1095 )
...
Co-authored-by: lzk228 <124214523+lzk228@users.noreply.github.com>
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2023-06-30 02:28:29 +03: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
c99585c94f
Toy Box filled with toys (ready for merge) ( #16252 )
2023-06-03 13:31:47 +10:00
faint
81d2382840
Rollback water cooler respriting
2023-05-25 00:19:19 +03:00
faint
34d03aa1df
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Structures/hydro_tray.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-05-25 00:18:11 +03:00
MisterMecky
8e3f2cc1fa
fix watercooler sprite (Also adds solution visuals) ( #16740 )
2023-05-24 01:24:42 +10:00
MisterMecky
0e337fb646
add solution visuals for watertank, fueltank etc. ( #16653 )
2023-05-21 18:27:51 -06: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
Fluffiest Floofers
58998df37d
Updates the suit storage to tg 3/4 version ( #16566 )
2023-05-18 13:52:05 -04:00
Flareguy
19b5d9253d
Suit storage units ( #16128 )
2023-05-13 21:36:46 -04:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
Maxtone
332510df3b
Paramedic role, redone ( #15439 )
...
Co-authored-by: MagnusCrowe <whiterider1988@yahoo.com>
2023-05-01 17:13:56 +10:00
Puro
0ec5e257ad
[Fix] Small mistakes ( #15955 )
2023-04-30 19:04:49 -06:00
metalgearsloth
0c16e5f076
Remove kvass ( #15939 )
...
- Sprite looks bad.
- I don't think I've ever seen it ordered.
- There's no reason to have one drink in a tank.
- Adding region-specific things is cringe.
2023-04-30 02:16:15 -05:00
Morbo
3ed1fcd6da
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
2023-04-26 14:23:40 +03:00
Puro
509761c260
[Brigmedic] Something like a "big update" ( #15496 )
...
* [Brigmedic] Something like a "big update"
* new locker
* hardsuit resprite
* resprite resprited hardsuit
back to the future
* custom headset
* remove key
* TrackingImplanter in locker
* pda UI fix
* brigmedic bedsheet
* added transparency
* mask
* desc
* name mask
* skirt of life
* Suits resprite
* PDA resprite | Brigmed - Brigmedic
* meta dic :)
* Beret + medical gown
* backpacks
* locker fill update
* why not?
bzzz Moth-pocalypse
* Brigmed - Brigmedic
* fix
* chance update
2023-04-26 00:48:44 -06:00
Chris
e6012a3956
Add secure chemistry crates and jugs ( #15211 )
2023-04-24 09:53:17 +10:00
Morbo
5a14c570aa
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
# Resources/Prototypes/typing_indicator.yml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png
2023-04-15 19:12:31 +03:00
potato1234_x
41f8b401da
Misc sprite changes ( #15011 )
2023-04-14 12:43:49 -07:00
Morbo
47d49bf035
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
2023-04-11 22:36:33 +03:00
brainfood1183
8e817e2b97
pirate content ( #11799 )
...
* pirate content
* pirate content
* merge
* merge
* update launchers
* trying to fix launcher error
* merge
* merge
* merge
* fix for launchers
* update to held cannon sprite
* attempt to fix issue
* first updates in long time
* changes mostly to sprites
* more sprite fixes
* more sprite changes
* json fixes
* small update
* new pirate crate
* update
* updae json
* fix eva
* update accent
* fix accentcomp
* improved pirate chest
* accent localized
* station to docks
* modified the pirate ship
* changed pda spawns for firstmate nad piratecaptain to passenger pdas
* fixes
* pirate accent
* removed spacing in shotgun.yml
* redo accent
* fix
* removed no spawn from helmet hardsuit
* suffix capitalization
* tweaks
* a
* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.
* pirate accent fixes
* desc fix
---------
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-04-09 22:47:40 -07:00
Morbo
7590263a5b
Update highfueltank sprite
2023-04-05 00:14:25 +03:00
Morbo
8cc2a785fc
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-04-04 23:53:11 +03:00
potato1234_x
a42a2f8021
High-capacity welding fuel tank ( #15019 )
...
* high capacity fuel tank
* nerf that explosion holy shit
* e
2023-04-03 00:26:57 -06:00
potato1234_x
33f937cdc4
Frezon Canister Tweaks ( #14442 )
2023-03-13 23:42:07 -04:00
RomanMinaev
acb3bf4242
[Resprite] Fax and gas canisters ( #659 )
2022-12-22 07:21:52 -08:00
Morbo
bdd758ea49
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2022-12-21 20:29:22 +03:00
metalgearsloth
b1b3f765fa
Fix the remaining invalid RSIs ( #13113 )
2022-12-20 11:49:18 -06: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
798a880a82
Fix some more rsis ( #13107 )
2022-12-20 09:37:34 +01:00
Morbo
f032966976
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/ISSUE_TEMPLATE/config.yml
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
2022-12-07 08:34:29 +03:00
brainfood1183
375ca1e22b
Hamster Pet (GhostRoleMob) ( #12813 )
2022-12-06 15:28:05 -08:00
