Commit Graph

46 Commits

Author SHA1 Message Date
lzk
c55e311c7e Cleanup pins.yml (#32593)
* Cleanup pins.yml

* oh my

* forgor
2024-10-02 13:23:32 +02:00
lzk
edc83b2fab cleanup and fix dinky star (#32594)
* cleanup dinky star

* fix

* oh
2024-10-02 12:53:19 +02:00
TakoDragon
23f4bc1d7a Gay Boykissers (#32584) 2024-10-01 23:07:48 +02:00
LankLTE
0f6808e16a Remove the shock collar. (#31229)
* Remove the shock collar.

* add migration
2024-08-21 13:56:56 -04:00
to4no_fix
6567fa36e4 Adding shock collar and electropack (#30529)
* Adding shock collar with the new ShockOnTrigger

* Cleaning and updating the shock collar

* Add StripDelay datafield to ClothingComponent

* Adding SelfUnremovableClothingComponent

* ShockCollar Update

* Correction of the shock collar

* Correction of the shock collar 2

* Renaming the DamageSpecifier DataField to Damage

* Fixing the damage field in ShockCollar

* Cleaning the ShockCollar

* Renaming ShockCollar to ClothingNeckShockCollar

* Adding ClothingNeckShockCollar as a stealTarget to a thief

* Fixing a typo of the sprite path in ClothingNeckShockCollar

* Cleaning the ShockOnTriggerComponent

* Revision of SelfUnremovableClothing

* Adding a ClothingBackpackElectropack

* Sprite fix

* Code review

* Shock Collar sprite update

* add commit hash

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-08-15 10:30:39 -04:00
PoorMansDreams
793eb87f31 Adds a Dinky Star Sticker for security officers (#29767)
* Sec-Star-TASTIC

* fix license

* now counts as trash

* Sticks to people + wearable

* no more sticky

* no more sticky

* mystery-space

* Update Loadout Yaml
2024-08-15 11:50:55 +10:00
pigeonpeas
329a0a875b Grey mantle in winterdrobe (#29774)
* add the mantle

* fix a few things

* fix merge conflict stuff, remove from winterdrobe and lathe.

* Add mantle to loadouts (20 hour requirement)
2024-08-13 19:20:12 +10:00
MureixloI
3f4e093eaf [Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak (#28719)
* [Fix] CMO's equipped cloak

* [Fix] CMO's equipped cloak

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker
2024-08-09 22:02:26 +10:00
lzk
ead78b72d2 Add default whistle + whistles reorganize (#27676)
* Add default whistle + whistle reorganize

* aaa

* fux?

* fiiiiix???

* Revert "fiiiiix???"

This reverts commit 15353465d58db615185afa8c549e1819099c1a5b.

* Apply suggestions from code review

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-05-05 16:42:35 +02:00
Terraspark4941
d2d62b97ac Autism pins! (#25597)
* hee hee he ha ha

* added gold varients, forgive me for my spritework

* maints loot, copying from past PRs

* Trying to fix RSI

* speedran these sprites in break time, pictures will be later

* Fixed/Tweaked glows

* consensus

* gregregation

* dam copiryte

* oops i forgot to delete 2 fields hope this works
2024-04-14 15:35:35 +10:00
lzk
55c77af33c Combine flower crown and wreath (#26605)
* Combine flower crown and wreath

* huh

* huuh :trollface:
2024-03-31 19:52:52 +11:00
Pieter-Jan Briers
89db4409a4 Remove CRLF, enforce with workflow (#26401)
* Check for CRLF in actions workflow

Make emisse weep

* Copy paste bottom text

* I would like to thank StackOverflow for this spite PR.

* Mention file name in message because the workflow tab doesn't display it.

* dos2unix everything
2024-03-24 22:06:17 +01:00
Firewatch
93d820f315 Syndicate Decoy Bundle + Snap Pops (#25333)
* it works

halilujeah

* toggleable lights

removes a redundant flashlight since you can turn on the balloons to cast light

* final touches

syndicate decoys :trollface:

* touches

it works now

* minor spelling mistake



* minor spelling mistake 2

darn

* adds whistle

commanders now spawn with a whistle around their neck

* yaml linter

luv you linter baby

* smallify the whistle

it was way too big, this has been addressed

* sprite fix

am dummy 👍

* netsync errors

wouldn't compile properly

* forgor

* i suck at yaml

smh

* decoys for all

now both syndicate and traitors can use the decoys, yippee!

* Update meta.json

credit my discord username

* Update uplink-catalog.ftl

* Update decoys.yml

base decoy no longer shows in the entity browser

* immortal gone

balloons have gained mortality
2024-02-28 16:53:46 -05:00
themias
8bba4b852b Headphones can be turned on (#23882)
Toggle headphones
2024-01-11 16:25:27 -07:00
Aexxie
f724291c2a Adds the central commanders cloak. (#23666)
* Adds the central commanders cloak.

* Adds it to CentDrobe, and also matches it to other naming schemes

* oops fucked up a capital letter. fixed
2024-01-07 00:12:12 -07:00
Ubaser
93a77e89fe Flower wreaths (#23662)
* add

* fix
2024-01-07 00:03:46 -07:00
TherapyGoth
c94189d78b Added more pride cloaks and made them craftable at the uniform printer (#21077)
* added more pride capes

* made the capes craftable

* fixed sprite names and coding errors

* renamed capes to cloaks to be in line with other cloaks

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-01-06 17:15:06 +11:00
Alekshhh
de54934430 HOS Clothing Tweak (#23174)
* hos

* tweak
2023-12-29 10:09:22 -05:00
Ubaser
fd3c922a08 Add chaplain stoles (#22955)
add
2023-12-25 18:05:59 -07:00
Emisse
f05262b6ad resprite every captain item (#22739)
* captain giga resprite

* fixe a bit

* kill

* swag destroyed

* Revert "swag destroyed"

This reverts commit 30c8aafdf6ccc1ac290268f7645e040b709811b3.
2023-12-19 15:36:36 -05:00
Ed
c99e265435 Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551)
* add some stuff

* finish pack

* Update encryption_keys.yml

* revert secret channels

* revert spy key

* add spy crew monitor

* add invisible crate

* add void cloak
2023-11-12 16:41:45 -07:00
Ubaser
063c9aa5fa Add QM mantle (#20621)
* add

* fix prototype
2023-10-01 10:28:47 -04:00
Skarletto
12cb42349e cap drip refactor (#18276)
* swap out captain hardhat

* updated navy cap cloak

* change default cap suit/skirt along with monkey alts

* fixes capcap shading

* cap hardhat

* slight sheath edit

* capcap now able to be worn by hamlet

* capcap ACTUALLY able to be worn by hamlet now

* mantle edit

* winter coat

* formalcloak

* small json edit

* me when the when me the when me when the

* carapace

* gloves

* goof'd

* gloves are darkerrrrr
2023-07-28 18:09:19 -06:00
brainfood1183
f2d3ea9117 Hamster resprite by RamZ and hamster can wear some clothing, monkey eva resprite. (#17439) 2023-06-29 18:36:19 -04:00
OctoRocket
3499f4265b [Add] Adds CentCom scarf (#16832)
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-27 19:09:32 +10:00
OctoRocket
5f035f0444 [Add] Adds more scarfs! (#16631) 2023-05-20 11:15:32 +10: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
AsikKEsel
dce680065d [Entity] Add new medals (#15577)
* Add 6 new medals

* Update medalcase.yml

* Update medals.yml

* Update medalcase.yml
2023-04-20 17:54:31 -06:00
Puro
7f481f4b73 [Sprite] In hand sprites for cloaks (#15484) 2023-04-17 16:21:49 -06: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
Puro
2c8d148bca [Sprites] Adds in hand sprites (#15244) 2023-04-09 15:42:17 -06:00
Puro
3e7ff70d31 [Clothing] Moth cloak and mask (#14851)
* Moth cloak

* Update meta.json

* Update meta.json

* fixed moth mask

yes.

* Moth mask now hides hair

yes.

* now the moth's cloak will spawn on the map

yes
2023-03-26 13:11:43 -06:00
Flareguy
78bef79609 Alternate atmos & sci jumpsuits + minor tie sprite changes (#14305) 2023-03-06 15:42:10 -04:00
deltanedas
d2a590a2ca animate wizard bedsheet, fixes #13753 (#14331) 2023-03-01 09:31:04 -04:00
Nemanja
35e6cfba9b fix lesbian flag pin sprite (#13625) 2023-01-21 14:16:34 +11:00
PixelTK
60f67f5583 LGBTQIA+ pins (#13472) 2023-01-16 17:51:13 -08:00
nmajask
ed97cb7569 Ports goliath cloaks from TG (#13283) 2023-01-12 14:46:47 +11:00
Pieter-Jan Briers
b707b788ac Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
Kara
ae71b15a7d Vampire cloak (#10073) 2022-07-27 01:15:47 -07:00
Emisse
04792a47de Mantles, Medals, Changeling Prep (#7233)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-03-27 21:15:39 -07:00
Emisse
8f583cda11 Formal Clothing, Cloaks, Atmos, and Hardsuit Stat Revision (#7166)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-03-19 18:19:44 +11:00
Pancake
6b1eae6574 Add NanoTrasen clothing. (#6682) 2022-02-16 12:07:14 -06: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
Swept
bfe575b7b6 Random bedsheet spawner. (#2940)
* Initial

* Optimized YAML

* Probbed

* Updates RSIs

* Maps them into dorms.

* A

* Adds descriptions from TG

* Addressed reviews
2021-01-11 18:02:36 +11:00
Swept
f46a6a8d81 Copyright Pass/Pruning | Part 1 - Clothing (#2539)
* Backpacks/Belts

* Cleans up Headsets

* Glasses and Gloves (Remind me to make an alpha for those stupid gloves)

* This commit has taken too many of my damn tears please appreciate it

* Holy SHIT that was an ordeal

* NECK and MASKS

* Jumpsuits/skirts

* Goodbye old color.rsi

* Outerclothing

* More Outerclothing

* It builds now

* More ID organization :)

* Gloves up to scratch

* My piss burns

* GLasses

* Added some more glasses

* Mission control we are ready for review

* Hotfix

* Cleanup

* Fix not commenting out whole line in contents

* duffelbag => duffel bag

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Fixed Breath Mask

* Scrubs

* New line

* Fixed Build

* Ok

* Update engivend.yml

* Fix meson glasses prototype in boxes

* Fix prototype name for sec glasses in boxes

* Fix InventoryHelpersTest janitor jumpsuit prototype

* Fix outdated stationstation prototypes

* Fix vending machines having invalid starting inventories

* Fix chapel vending machine

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2020-11-22 15:17:14 +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