Commit Graph

69 Commits

Author SHA1 Message Date
SkyratBot
d27cd97f74 [MIRROR] [IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane [MDB IGNORE] (#16030)
* [IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane

* fix map merges

* icon paths and merge conflicts

Co-authored-by: skylord-a52 <skylord-a52@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-09-24 20:10:28 -04:00
SkyratBot
65baf0e4d7 [MIRROR] [MDB IGNORE] Split clothing inhands [MDB IGNORE] (#16052)
* [MDB IGNORE] Split clothing inhands (#69576)

* split clothing inhands

* empty commit

Co-authored-by: tattle <article.disaster@ gmail.com>

* [MDB IGNORE] Split clothing inhands

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: tattle <article.disaster@ gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-09-24 18:47:14 -04:00
SkyratBot
3652337c49 [MIRROR] Resprites Trekkie Uniforms, adds Voyager Uniforms, adds Trekkie Costume Crate [MDB IGNORE] (#15885)
* Resprites Trekkie Uniforms, adds Voyager Uniforms, adds Trekkie Costume Crate (#68871)

Added a Star Trek Costume Crate and updated the Star Trek uniforms to modern sprite standards, as well as adding Voyager uniforms!

* Resprites Trekkie Uniforms, adds Voyager Uniforms, adds Trekkie Costume Crate

* goodbye

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-09-04 03:48:05 +01:00
SkyratBot
df31f6c849 [MIRROR] Adds Ethereal Fashion [MDB IGNORE] (#16024)
* Adds Ethereal Fashion

* Update code/datums/greyscale/config_types/greyscale_configs.dm

* add to loadout

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-09-04 03:31:05 +01:00
SkyratBot
1b7f17f107 [MIRROR] [IDB IGNORE] The Great Sweep: Moving dmis into subfolders (part 1) [MDB IGNORE] (#15801)
* [IDB IGNORE] The Great Sweep: Moving dmis into subfolders (part 1)

* Fixes all the conflicts and all of our modular files using core icon files with broken paths

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-08-28 15:11:04 -04:00
SkyratBot
9bf423a635 [MIRROR] Suit DMI split p2: Obj icons [MDB IGNORE] (#15617)
* Suit DMI split p2: Obj icons

* Fixing the conflict!

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

* fix modular stuff

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-08-27 13:58:56 -04:00
SkyratBot
afaefc3d0b [MIRROR] GAGS most radio encryption keys [MDB IGNORE] (#15571)
* GAGS most radio encryption keys (#69104)

* the radio star

* I think it's funny that I've had the same contrast problem on all of my GAGS PRS

* oops forgot to make the RD's key unique

* fine

* what if I said please

* swaps translation key to be in line with the other new ones

* GAGS most radio encryption keys

* Fixes our modular encryption keys as well!

Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-08-13 17:57:48 -07:00
SkyratBot
adba963bda [MIRROR] New Sneaker Sprites by Any%! [MDB IGNORE] (#15607)
New Sneaker Sprites by Any%!

Co-authored-by: Imaginos16 <77556824+Imaginos16@users.noreply.github.com>
2022-08-13 17:33:17 -07:00
SkyratBot
8ea5bc8c04 [MIRROR] The GAGening: Families edition [MDB IGNORE] (#15353)
* The GAGening: Families edition

* ew

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-08-04 15:47:58 +01:00
OrionTheFox
b15331b4df [MANUAL MIRROR] The GAGening: Clothesmate edition [MDB IGNORE] (#15100)
* The GAGening: Clothesmate edition

* ThisShouldWork

* hgnbhg

* would probably help to have the right .dmi

* fixed?

* Fuck you

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
2022-07-27 03:19:42 +01:00
SkyratBot
10acc0963f [MIRROR] Removes a stray gags config and adds a warning for misplaced configs [MDB IGNORE] (#15128)
* Removes a stray gags config and adds a warning for misplaced configs (#68558)

* Removes a stray gags config and adds a warning for misplaced configs

* Added recognition to the Skyrat GAGS folder too, so unit tests don't consistently fail

* Using regex instead so that it catches subfolders too

* I shouldn't have added a new here, whoops

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-07-24 13:26:15 +01:00
SkyratBot
dfc1b9a4c0 [MIRROR] [MDB Ignore]Suit DMI split p1: Mob icons [MDB IGNORE] (#14963)
* [MDB Ignore]Suit DMI split p1: Mob icons

* [MDB Ignore]Suit DMI split p1: Mob icons

* [MDB Ignore]Suit DMI split p1: Mob icons

* wew

* wew

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-07-22 12:45:47 +00:00
SkyratBot
0777ed611a [MIRROR] You can now tape people's mouths closed (Also tape GAGS) [MDB IGNORE] (#14894)
* You can now tape people's mouths closed (Also tape GAGS)

* Apply suggestions from code review

Co-authored-by: Ebb-Real <95765134+Ebb-Real@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-07-13 21:32:06 +00:00
Useroth
8c4890caac GAGS-ifies ties, and removes inherent ties from some outfits. (#67053) (#14630)
Removes the inherent ties from most civilian outfits with a single-color tie baked into them.

Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
2022-06-30 02:48:05 +01:00
SkyratBot
b290c49a94 [MIRROR] Add new H.E.C.K. suit GAGS sprite, recolorable via spray can [MDB IGNORE] (#14006)
* Add new H.E.C.K. suit GAGS sprite, recolorable via spray can (#67217)

imageadd: The H.E.C.K. suit has a new sprite. (by Meyhazah)
add: You can now use a spray can to completely recolor the H.E.C.K. suit.

* Add new H.E.C.K. suit GAGS sprite, recolorable via spray can

Co-authored-by: Urumasi <Urumasi@email.cz>
2022-05-31 04:01:33 +01:00
SkyratBot
af79be78b4 [MIRROR] Vape GAGS [MDB IGNORE] (#13555)
* Vape GAGS

* Vape GAGS

Co-authored-by: Ebb-Real <95765134+Ebb-Real@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-05-17 21:08:19 +01:00
SkyratBot
f4c2b35c06 [MIRROR] Most materials can be used to build most things [MDB IGNORE] (#13202)
* Most materials can be used to build most things

* Fixes the merge conflict

* Makes it so our vis_overlay1 is initialized first. It's awful but it works

* Properly fixes the CI issues with the plasma airlocks

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-05-03 19:11:07 +01:00
SkyratBot
8d4fe66406 [MIRROR] [MDB IGNORE] Removes ballast from thermomachines [MDB IGNORE] (#13088)
* [MDB IGNORE] Removes ballast from thermomachines

* epic

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-04-25 14:35:45 +01:00
SkyratBot
43c3921170 [MIRROR] new pda sprites! [MDB IGNORE] (#12996)
* new pda sprites! (#66369)

Replaced new PDA sprites with even newer ones!

* new pda sprites!

Co-authored-by: capsaicin <84609863+capsaicinz@users.noreply.github.com>
2022-04-22 15:03:41 +01:00
magatsuchi
dc8adc2924 Modular Tablets: Converting PDAs to the NtOS System (SKYRAT VERSION) (#12920)
* hot-patch 1

* hot patch 2

* hot patch 3

* slight issue
2022-04-20 16:55:49 +01:00
Gandalf
ad0b6e4e67 Batch pr pull (#12554)
* https://github.com/tgstation/tgstation/pull/65814

* https://github.com/tgstation/tgstation/pull/65832

* https://github.com/tgstation/tgstation/pull/65850

* https://github.com/tgstation/tgstation/pull/65689

* https://github.com/tgstation/tgstation/pull/65579

* https://github.com/tgstation/tgstation/pull/65760
2022-04-06 19:26:58 +01:00
SkyratBot
ddfc30c89c [MIRROR] Adds Moth Fashion [MDB IGNORE] (#11612)
* Adds Moth Fashion

* skyrat fix

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2022-02-20 21:10:39 +00:00
SkyratBot
9a29d6f1e6 [MIRROR] Adds a color matrix layer to GAGS [MDB IGNORE] (#10669)
* Adds a color matrix layer to GAGS (#63957)

* Adds a color matrix layer to GAGS

* Fixes default row value

* Passes along the last viable icon for color matrix use

* Removes stray nocache reference

* Adds a color matrix layer to GAGS

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2022-01-14 12:05:40 +00:00
Tom
ebd5914af5 Patches digi and vox gags jumpsuits and sneakers (#9665)
* It's ALWAYS the digi icons

* remove indent
2021-11-23 16:06:15 -05:00
SkyratBot
a937abb309 [MIRROR] Beds and Benches: The Aesthetic Revolution [re-PR'd With EOB's Blessing] [MDB IGNORE] (#9022)
* Beds and Benches: The Aesthetic Revolution [re-PR'd With EOB's Blessing]

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Zytolg <33048583+Zytolg@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-10-26 17:00:31 +01:00
SkyratBot
6d99a7ed80 [MIRROR] Thermomachine design icon fix [MDB IGNORE] (#8720)
* thermomachine design icon fix (#61779)

* Thermomachine design icon fix

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-10-09 09:02:51 -04:00
SkyratBot
c8761c0af1 [MIRROR] Replaces CTF hardsuits with new armoured vests [MDB IGNORE] (#8466)
* Replaces CTF hardsuits with new armoured vests (#61716)

Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>

* Replaces CTF hardsuits with new armoured vests

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>
2021-09-29 02:17:33 +01:00
SkyratBot
90dd69c10b [MIRROR] Updates Greyscale Colors of PDAs and Gives QM a Survival Pen since I was in there anyway. (#8329)
* Updates Greyscale Colors of PDAs and Gives QM a Survival Pen since I was in there anyway. (#61261)

About The Pull Request

Hallo! This is part two of my PDA update, where I take the old hokey colors that were just left in to not rock the boat, and changes them to better fit the current aesthetic of the game. It also makes the captain's PDA have some more fanfare, without even adding a sprite, I just did a funny trick with the layers.

In addition to that, I have updated the sprite for the survival pen, and made it so QMs start with one in their PDA.

bespoke final
peen
Why It's Good For The Game

The old PDA colors on the new PDA sprites were odd in a few places, this fixes that. I spent about a week or so going to different players of the different jobs and departments getting their input on what colors they'd like their PDAs to be, and now the best looking options that make sense, will be added in! Woo!

Also I just think the QM having a emergency shovel is kind of cool, and its a really neat item that deserves just a little more love, so why not?
Changelog

cl
expansion: Updated old GAGS colors for the PDAs based on user feedback
imageadd: Updated appearance of the Survival Pen
expansion: The Quartermaster now starts with a Survival Pen because its flavorful. Survival Pen has also been updated to use the fancy font, since, its fancy.
/cl

* Updates Greyscale Colors of PDAs and Gives QM a Survival Pen since I was in there anyway.

Co-authored-by: EricZilla <81941674+EricZilla@users.noreply.github.com>
2021-09-23 01:47:16 +01:00
SkyratBot
747c211944 [MIRROR] Sparring Sect! (#8237)
* Sparring Sect!

* Update greyscale_configs.dm

* https://github.com/tgstation/tgstation/pull/61527/

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-19 22:24:40 +01:00
SkyratBot
95ac28a6b0 [MIRROR] GAGS fix + debug improvements I needed to find it (#8219)
* GAGS fix + debug improvements I needed to find it

* Feex

Co-authored-by: Emmett Gaines <ninjanomnom@protonmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-09-17 21:02:48 +01:00
GoldenAlpharex
e9bb28b4de [MODULAR] The Beret-lliant Update (#7243)
* There's so many of them...

* Beret-lliant!

* Shut up linters
2021-07-30 12:18:13 +12:00
SkyratBot
e370c77705 [MIRROR] Fix gas meters to display properly (#7226)
* Fix gas meters to display properly (#60433)

* Fix gas meters to display properly

Co-authored-by: Tim <timothymtorres@gmail.com>
2021-07-29 11:15:45 +01:00
SkyratBot
a671213d5d [MIRROR] Fixes the map sprite for lizard plushes (#7204)
* Fixes the map sprite for lizard plushes (#60416)

This PR fixes the placeholder map sprite for lizard plushes. I included a map sprite in my original GAGS PR but I forgot a single character from the icon_state which made it not work and I didn't realize until after it was merged.

* Fixes the map sprite for lizard plushes

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-07-28 23:11:01 +01:00
SkyratBot
8a9ab67aad [MIRROR] That's it. *GAGS'ifies your berets* (#7097)
* That's it. *GAGS'ifies your berets*

* a

* Update head.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 22:21:49 +01:00
SkyratBot
7856d92066 [MIRROR] GAGS coloring for Atmos that displays changes in temperature (#7061)
* GAGS coloring for Atmos that displays changes in temperature (#59924)

This PR adds temperature based coloring for atmos gas meters and freezers.

These values are based on the BODYTEMP icon warnings that you get when a room is too hot or too cold. There is also some minor code improvements where some of the icon heat and cold warnings were hardcoded values. I made this a constant in the __DEFINES.atmospherics.dm file that you can see below. These values have been applied to air alarms, thermomachines, gas meters, and species code.

This is a QoL update for atmos tech nerds. Instead of having to manually examine a gas meter or use an analyzer to determine what temperature is in the pipes you can rely on the colored icons to communicate that information rapidly. This should also help prevent harmful gas leaks where a person unwrenches a pipe without realizing there is hot gas inside it. And you should be able to troubleshoot a delaming SM faster and easier with these colors.

* GAGS coloring for Atmos that displays changes in temperature

Co-authored-by: Tim <timothymtorres@gmail.com>
2021-07-26 15:42:46 +01:00
SkyratBot
4f3dfd7804 [MIRROR] introduce advanced sucking functionality to custodians (+ bonus GAGging) (#6697)
* introduce advanced sucking functionality to custodians (+ bonus GAGging) (#59925)

* base sucking functionality

* functional upgrade and upgrade refactor

* minor tweak here

* finish overhaul of upgrades, add gags-ified upgrades

* add documentation (you love to see it)

* update sucking sound

* do some of the requested cleanup, fix key going into trash bag, add right click func

* introduce advanced sucking functionality to custodians (+ bonus GAGging)

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2021-07-04 01:07:28 +01:00
SkyratBot
05258b974b [MIRROR] Makes GAGS layer limit per icon state, not per config file (#6687)
* Makes GAGS layer limit per icon state, not per config file (#59923)

* Makes GAGS layer limit per icon state, not per config file

Co-authored-by: Emmett Gaines <ninjanomnom@protonmail.com>
2021-07-03 22:25:22 +01:00
SkyratBot
c4c628f912 [MIRROR] Adds verification for reference layers to check if target config has the desired icon_state (#6640)
* Adds verification for reference layers to check if target config has the desired icon_state (#59884)

* Adds verification for reference layers to check if target config has the desired icon_state

Co-authored-by: Emmett Gaines <ninjanomnom@protonmail.com>
2021-07-01 22:58:39 +01:00
SkyratBot
9c861af7b7 [MIRROR] Greyscale Mat Datum Stationary Smooth Tanks (#6544)
* Greyscale Mat Datum Stationary Smooth Tanks

* Update icon_smoothing.dm

Co-authored-by: Emmett Gaines <ninjanomnom@protonmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-27 16:37:32 +01:00
SkyratBot
caeb25149d [MIRROR] Converts suspenders to GAGS. (#6414)
* Converts suspenders to GAGS. (#59537)

Suspenders were already basically given a greyscale sprite by me in the past, this converts them to GAGS allowing custom recolors of them through existing code already in place.

* Converts suspenders to GAGS.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2021-06-20 22:54:53 +01:00
SkyratBot
51721a4ed3 [MIRROR] Fixes Cayenne's error sign flickering (#6290)
* Fixes Cayenne's error sign flickering (#59614)

This PR fixes a case where Cayenne's sprite was flickering an error sign when carrying a disk and correctly assigns icon state names to JSON gags files for carp mouth and wirecutters as per newest standards to prevent further issues with them in the future.

* Fixes Cayenne's error sign flickering

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-06-14 18:43:52 +12:00
SkyratBot
e1c7ca12d1 [MIRROR] Wrapping Paper GAGS (#6309)
* Convert wrapping paper sprites to GAGS (#59374)

Wrapping paper has been put through GAGS. You can set the base color and ribbon color with right click, then apply it to a package.

Co-authored-by: coiax <yellowbounder@ gmail.com>

* Wrapping Paper GAGS

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
2021-06-14 18:42:46 +12:00
SkyratBot
b0fa114ece [MIRROR] Additional GAGS configuration json verification (#6301)
* Additional GAGS configuration json verification (#59524)

This standardizes how values are read from the json for greyscale layers so that error handling can check for some additional things:
No extra keys in the json that are unknown
No missing keys that a layer needs to work
Values are the expected type for that key

A variety of error messages have been added for various ways the json can be malformed and should hopefully provide good feedback for anyone working with greyscale configurations.

* Additional GAGS configuration json verification

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-06-14 18:41:58 +12:00
ORCACommander
f297323c1a Fixed Run time in GAGS caused by peacekeeper clothes [Semi-Modular] [FIX] (#6167)
* Fixed Run time in GAGS caused by peacekeeper clothes

bonus fixed a syntax error in jobs.dm

* Apply Azarak Fix

* CI Nuke

99 CI errors on the Wall 99 CI errors take one down bash it around 134 CI Errors on the wall
2021-06-08 16:48:28 +12:00
SkyratBot
c03eeaa918 [MIRROR] GAGs modular Winter Coats (#6157)
* GAGs modular Winter Coats

* Mirror!

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-06 13:29:11 +12:00
SkyratBot
e27ce8d4fd [MIRROR] More GAGS debug and color select improvement (#6144)
* Improved GAGS debug (#59392)

* More GAGS debug and color select improvement

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-06-05 17:12:11 +12:00
SkyratBot
4914ae5ae1 [MIRROR] Datum mat GAGS support and mace migration (#6059)
* Datum mat GAGS support and mace migration

* Mirror!

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 15:49:32 +12:00
SkyratBot
bd37563645 [MIRROR] Converts Poppies, Lilies, Geraniums, and Rainbow Bunch flowers to GAGS (#6042)
* Converts Poppies, Lilies, Geraniums, and Rainbow Bunch flowers to GAGS

* Mirror!

* Opium

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 15:24:44 +12:00
SkyratBot
d3a2f60d78 [MIRROR] GAGS Lizard Plushes (#6007)
* GAGS Lizard Plushes  (#59323)

* greyscale lizards

* repathing

* uses set greyscale

* mapped sprite

* GAGS Lizard Plushes

* Goodbye lizzers

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 14:40:42 +12:00
SkyratBot
66df847bad [MIRROR] Adds a unit test for icon states on GAGS items and fixes some inhand sprites (#6015)
* Adds a unit test for icon states on GAGS items and fixes some inhand sprites (#59330)

This adds a unit test which goes through all items and makes sure all the icon states needed are in the greyscale configurations, if it has one.

* Adds a unit test for icon states on GAGS items and fixes some inhand sprites

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-28 16:42:34 +01:00