Werewolf test - #4
Closed
LuciferEOS wants to merge 31 commits into
Closed
Conversation
github-actions
Bot
added
size/L
S: Untriaged
Changes: Sprites
Changes: Audio
and removed
size/L
labels
|
Sound Bot This PR changed 2 sounds: Details``` Resources/Audio/_Inky/Antag/Werewolf/howl.ogg: Ogg data, Vorbis audio, mono, 48000 Hz, ~80000 bps Resources/Audio/_Inky/Antag/Werewolf/werewolf_start.ogg: Ogg data, Vorbis audio, stereo, 48000 Hz, ~128000 bps ``` |
|
RSI Diff Bot; head commit b6e79b2 merging into 3e01f0b Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi
Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi
Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi
Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi
Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi
Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi
|
* woofwoof (Inky-Station#70) * fix (Inky-Station#69) * e (Inky-Station#74) * Fix csproj dependency (Inky-Station#82) * fix * fix 2 * Update README.md * Larp outfit (Inky-Station#75) * detective arriving works fine in my dev enviroment, loadouts works so i think is ready to go?????????????? * Update detective.yml * ignore this shit * LINTER ERROR LINTER ERROR GRAAAAAAAAAAAAAAA * loadout larp larp * "just write loadout" i will believe you mf * 25 hours shhhhhhhhhh * Update loadout_groups.yml * im gonna just * Update loadout_groups.yml --------- Co-authored-by: LuciferMkshelter <154002422+LuciferEOS@users.noreply.github.com> * I should be fucking hung for this (Inky-Station#77) * QM cloak and beret resprite (#6305) * qm cloak and beret update qm cloak and qm beret * _Goobstation not GoobStation (fix) * Remade CMO cloak and mantle (#6190) * Captain: Fixing colour consistency (#6502) * Cap colour fixing * further sprites * envirosuit grr * Cloak/mantle resprites for Command (#6495) * Command cloak and mantle resprites * qm cloak and mantle * CE ensemble recolour * hos mantle resprite * CE neckpiece options option to switch between green (orange) and white neckpieces for CE * fix * fix * fix * sigh, more fix * QM mantle sprite fix (#6604) fix qm mantle yaml literally the tiniest ah fix * [Port] Medichem Goggles and Glasses from downstream. (#6359) Bounty - Medichem Goggles and Glasses (#349) * Copy edits from Goobstation Copying 3 commits I made in my goob fork * Implement and fix crafting recipes Recipes weren't working but I managed to get them to work * Fix recipe wording i may be stupid * Give CMO medichem glasses The Chief Medical Officer gets Medichem Glasses equipped instead of Medical Glasses when they spawn. Using a Chameleon Controller Implant gives you Medichem Glasses instead of a Medical HUD. * Trying to fix recipe Why can't it just work man * Give Visiting CMO Medichem * Update Namespaces my bad * Fix Namespaces Again Who would have thought that the stuff I put in Omu would need to be in the Omu namespace * Minor spelling mistake * man * Removed Emtpy space --------- Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com> Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com> * Jumpsuit toggle and resprites (#6160) * toggelable tops clothing enable, sec section * dont even ask... it just works * meta fix + BSO toggle * PDA visual code port from Goob-Station/Goob-Station#5848 * moved modified jumpsuits/skirts to goobmod * fixed + temp monkey sprites * fix rsi issue YES I KNOW THESE ARE NOT IN PALLET * fileshare push * update * pen + RD * rsi issue fix * cargo update * sci inhand error fix * valid RSI * filepath naming fix * joel * outter command PDA fix * FUck you bad joel filepath naming fix valid RSI cargo update rsi issue fix pen + RD update fileshare push fix rsi issue YES I KNOW THESE ARE NOT IN PALLET fixed + temp monkey sprites moved modified jumpsuits/skirts to goobmod PDA visual code port from Goob-Station/Goob-Station#5848 meta fix + BSO toggle dont even ask... it just works toggelable tops clothing enable, sec section � Conflicts: � Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml � Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml � Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml � Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml � Resources/Prototypes/Entities/Objects/Devices/pda.yml � Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml � Resources/Prototypes/Loadouts/loadout_groups.yml � Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml � Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml � Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml � Resources/Prototypes/_Lavaland/Entities/Clothing/Uniforms/jumpsuits.yml � Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/meta.json � Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/blueshield_shirt.rsi/meta.json � Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/equipped-INNERCLOTHING.png � Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/meta.json * gulp * guh * # Goob # Goob # Goob # Goob # Goob # Goob * I'm YAMLing my Linter * Move stuff comment others * Apply suggestions from code review * Update Resources/Prototypes/_Goobstation/Entities/Clothing/Back/satchel.yml * Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml * Update Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml * Update Resources/Prototypes/_Goobstation/Entities/Clothing/Back/backpacks.yml * Update Resources/Prototypes/_Goobstation/Entities/Clothing/Shoes/boots.yml * Update Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml * Fix these * Fix these2 * Last * 1 * messenger bag update for cargo --------- Co-authored-by: notactuallymarty <martynashagriefer@gmail.com> Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com> * [BOUNTY] New CentCom drip (#6598) * centcom stuff * more * sobs and cries delete extra 'm' from file path * larp adjusted the item descriptions per review * Veteran sec's New drip (#6306) * backend done * inhands and descryptions * airy * renamed to veteran and increased time requirement * yaml :( * rename * Update Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com> --------- Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com> * m blowing my shit smoove off * hhhhghghhghgf * Add sprites for Vox organs (#40555) * Blue organs for blue blood * EYES GO IN THE HEAD * Accidental upload * Also accidental upload * skreeching for the future * SKREEEEEEEEEE * THese are not the files you are looking for * Sprite attribution * Bone armour/BSO swatmask/Atmos firesuit Vox sprites (#5918) j * it never ends * Fixes new Veteran Jumpsuit Showing not being aquirable (#6334) im a CHUUD * one thousands years in the mines * add vox sprites * fixed backsprite width * im killing myself tonight * ghost of bso * cuuuuuck * im sped * g * trading outpost fix * slop * Revert "[Port] Medichem Goggles and Glasses from downstream. (#6359)" This reverts commit 9b9cfb5. * g * i guess bro * ok whatever bro i cant be fucked anymore --------- Co-authored-by: sey <134509717+seyriix@users.noreply.github.com> Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com> Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com> Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com> Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com> Co-authored-by: Jvne <39907509+H2Owe@users.noreply.github.com> Co-authored-by: notactuallymarty <martynashagriefer@gmail.com> Co-authored-by: Johnly <Jonhlybr@gmail.com> Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com> Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com> Co-authored-by: Still <git@stillconfusing.net> --------- Co-authored-by: YERO <tomas.tr.mlg123@gmail.com> Co-authored-by: Shegare <147345753+Shegare@users.noreply.github.com> Co-authored-by: 10KE <151458027+10kee@users.noreply.github.com> Co-authored-by: sey <134509717+seyriix@users.noreply.github.com> Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com> Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com> Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com> Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com> Co-authored-by: Jvne <39907509+H2Owe@users.noreply.github.com> Co-authored-by: notactuallymarty <martynashagriefer@gmail.com> Co-authored-by: Johnly <Jonhlybr@gmail.com> Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com> Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com> Co-authored-by: Still <git@stillconfusing.net>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Resources/Locale/en-US/_Goobstation/loadouts/loadout-groups.ftl # Resources/Prototypes/Body/Species/vox.yml # Resources/Prototypes/Entities/Clothing/Head/hats.yml # Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml # Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml # Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml # Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/cargo_technician.yml # Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml # Resources/Prototypes/_Goobstation/Loadouts/Jobs/Security/security_officer.yml # Resources/Prototypes/_Goobstation/Loadouts/loadout_groups.yml # Resources/Prototypes/_Lavaland/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/_Trauma/Body/Species/vox.yml # Resources/Prototypes/_Trauma/Entities/Clothing/Head/hats.yml # Resources/Prototypes/_Trauma/Loadouts/Jobs/Security/security_officer.yml # Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-vox.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png # Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/equipped-INNERCLOTHING.png # Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/icon.png # Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/meta.json # Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/equipped-INNERCLOTHING.png # Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/icon.png # Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/meta.json # Resources/migration.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
Why / Balance
Technical details
Media
Requirements
Breaking changes
Changelog