Morb0
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
potato1234_x
566505cdb3
short hair sprite change ( #19425 )
2023-08-23 17:42:33 -04:00
Nairod
4a520ae2cb
Arachnid Markings Expansion ( #19439 )
2023-08-23 17:37:42 -04:00
Emisse
a470f8f40b
classic hair options ( #19422 )
2023-08-21 23:45:19 -06: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
Nemanja
848b713982
diona customization ( #19304 )
2023-08-20 19:02:12 -06:00
Alekshhh
b1350b61aa
Modern Hair Tweak ( #19344 )
...
* hair
* hair2
* mm
2023-08-20 19:00:51 -06:00
Alekshhh
b65728793c
I am being held at gunpoint by emisse ( #19335 )
2023-08-20 02:54:44 -06:00
Alekshhh
9491f322de
Hair Overhaul ( #19298 )
...
* OLD SPICE
* BODY WASH
* POWER
* meta moment
2023-08-19 18:37:56 -04: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
Nairod
4d2c039b2b
Improved Coloring Layers For Moth Wings ( #18929 )
...
* Improved layers
* Removed excess PNGs
2023-08-09 19:32:00 -06:00
Emisse
a78aa423e7
fix hair ( #18931 )
2023-08-09 19:17:26 -06:00
Morb0
676272809d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-08-08 12:54:45 +03:00
MilenVolf
924a68732a
New moth markings for customization ( #18768 )
2023-08-07 11:12:41 -06:00
Morb0
1f35458078
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Player/diona.yml
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/dark_plastic.png
# Resources/Textures/Tiles/plastic.png
# Resources/Textures/Tiles/steel_dirty.png
# Resources/Textures/Tiles/white_plastic.png
2023-08-05 05:10:09 +03:00
MilenVolf
c20f86733b
Moths textures & Layer ordering fix + creampied sprite ( #18653 )
...
* Moths textures & Layer ordering fix + creampied sprite
* Forgot to add
* weh
* oops
2023-08-04 12:31:39 -06:00
LankLTE
70545f4873
Moths. ( #18593 )
2023-08-04 15:21:28 +10:00
Morb0
23eef7660d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-07-28 01:02:37 +03:00
PixelTK
2298ae92c3
Small (and maybe unnoticable) arachnid changes ( #18261 )
...
* Small arachnid sprite changes
* chest marking colour
2023-07-24 14:21:07 -06:00
faint
5828dca50b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png
2023-07-21 16:32:31 +03:00
PixelTK
9cc8d6902e
Arachnids: New markings, new organs sprites and chelicerae ( #18177 )
...
* New markings, new organs sprites and chelicerae
* Update locale
2023-07-20 15:55:49 -06:00
faint
0e1e7668a3
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Procedural/salvage_rewards.yml
# 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/Wallmounts/intercom.rsi/unshaded.png
# Resources/Textures/Tiles/attributions.yml
2023-07-14 14:40:25 +03:00
Nairod
cdf6cbcb3f
More tiger markings ( #18007 )
2023-07-13 00:22:14 -06: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
PixelTK
941a3cd113
Arachnid sprite changes ( #17412 )
...
* Changed arachnid sprites to be less human-like and more "fluffy"
* few fixes + tweaks
* torso quick change
2023-06-17 14:47:31 -05:00
DEATHB4DEFEAT
a8337172ca
More gendered sprite masks ( #14735 )
2023-06-05 21:11:45 +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
PixelTK
3a7416a40c
[Addition & Tweak] Arachnid sprite update and 3 new markings ( #16470 )
2023-05-16 11:26:28 -04:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
PixelTK
8269a500b3
Arachnid species ( #13945 )
2023-04-30 02:19:06 +10: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
Peptide90
97006710b4
[QOL] Removed unnecessary delays in some old texture meta.json files ( #15378 )
...
* removed old delay from meta.json
* removed old delay from meta.json
* removed old delay from meta.json
* removed old delay from meta.json
* removed old delay from meta.json
* delay fix
* delay fix
* delay fix
* fix delays
* fix delays
2023-04-16 23:50:37 -06:00
Morbo
2807df199f
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-01-15 19:48:27 +03:00
Morb
97cc084a54
More diona customization ( #12576 )
2023-01-15 00:54:47 -04: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
945101e5e4
Fix a bunch of invalid rsi files ( #13104 )
2022-12-20 09:36:59 +01:00
Morb
41eb1f00ed
Animated cat tail ( #603 )
2022-12-06 21:17:22 -08:00
Scribbles0
e0f9b06f9a
Heterochromia ( #12126 )
...
* eye markings
* downsizes
* fixes reptilian.yml
* hopefully fixes files changed stuffs
* fix narcotics.yml
2022-11-08 15:16:12 -06:00
Nemanja
fd9bedae9a
New Species: Diona ( #11497 )
...
* new species: Diona
* more diona stuff
* dey breathing now
* test fixe
* fix a merge
* now actually fix the merge
* foobar
* oversight
* ok now the rest of em
2022-11-08 14:26:59 -06:00
T-Stalker
698976029c
Adds axolotl and snake hood frills for reptilians! ( #10013 )
2022-07-25 15:47:04 +10:00
EmoGarbage404
53a05caa35
Skeleton Bugfix Pt. 2 ( #8137 )
2022-05-13 18:31:34 -07:00
T-Stalker
8544fea510
More markings! ( #7964 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-06 18:50:00 +10:00
Flipp Syder
65da5fbae0
Fixes up lizard tails for markings ( #7948 )
2022-05-05 12:31:48 +02:00
Flipp Syder
a30cae21f6
Markings ( #7072 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-05 10:07:42 +02:00
metalgearsloth
92ff81b6c9
Initial mockup of the Reptilian species ( #6973 )
...
Co-authored-by: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com>
2022-03-10 15:05:07 +11:00
Pieter-Jan Briers
0ac4c0e85c
SKREEEEEE ( #3706 )
...
* Import bird sprites and define basic mob.
* SKREEEEEEEEE
* Move hair styles to new sprite accessory prototypes.
Basic stuff, no multi-species stuff yet.
* Vox hair styles and clothes
* Make HumanoidCharacterProfile.Default() a static default to fix tests.
Usages that wanted the previous random behavior now call Random().
* Remove names from hair style prototypes.
(They're in localization files)
* Update Content.Shared/Actions/ActionType.cs
(sk)reeee github
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-03-28 17:26:32 +11:00
Swept
a57db85208
Swept commits JSON genocide. ( #2991 )
...
* Clothing Folder Complete
* All Textures 1st Pass
* All Textures 2nd Pass
* All Textures 3rd Pass PLUS Manual Tweaking
* 5th Pass MORE MANUAL
* Fixes flares
* 4th Pass (I skipped over)
* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
AJCM-git
ae41d03ec6
Re-organizing the Resources folder. Part 1. ( #1234 )
...
* First commit
* Lockers
* Lockers electric boogaloo
* Crates and Lockers
* Almost finishing the Textures folder
* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects
* dont know what happened here
* Commit before merge
* re-organizing
* Lockers broken
* Commit before merge
* Submodule
* renaming
* Fixing most issues
* forgot these ones
* Updating submodule
* typo
* Fixing some paths
* fixing some paths
* updating submodule
* (hopefully) fixing the submodule
2020-07-07 19:19:00 +02:00
