Commit Graph

45 Commits

Author SHA1 Message Date
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
SkyratBot
d9c8fb0139 [MIRROR] Makes greyscale configs check for a name and output more errors at once (#5940)
* Makes greyscale configs check for a name and output more errors at once (#59271)

* Makes greyscale configs check for a name and output more errors at once

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-25 15:14:55 +01:00
SkyratBot
32a481a65b [MIRROR] Fix stupid casing where we have both icons/Testing and icons/testing (#5838)
* Fix stupid casing where we have both icons/Testing and icons/testing (#59220)

In this PR, mothblocks malds.

* Fix stupid casing where we have both icons/Testing and icons/testing

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-05-21 04:19:36 +01:00
SkyratBot
c3a1b78d8f [MIRROR] Adds greyscale color selection to vending machines (#5814)
* Adds greyscale color selection to vending machines

* conflicts?

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-05-20 23:25:31 +01:00
SkyratBot
44c218ae9c [MIRROR] Fixes / new magic shoes sprite (#5552)
* Fixes / new magic shoes sprite (#58750)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Fixes / new magic shoes sprite

* Update CentCom_skyrat.dmm

Co-authored-by: YakumoChen <king_yoshi42@yahoo.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-10 14:56:56 +01:00
SkyratBot
b5dc716b24 Greyscale sombrero and shamebrero (#5496)
Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-06 15:08:09 +01:00
SkyratBot
941bcdb6fc [MIRROR] Convert PDAs to GAGS (#5450)
* Convert PDAs to GAGS (#58844)

* Convert PDAs to GAGS

* Leave the clown PDA as it was

Co-authored-by: celotajstg <celotajstg@ users.noreply.github.com>

* Convert PDAs to GAGS

Co-authored-by: Celotajs <81999976+celotajstg@users.noreply.github.com>
Co-authored-by: celotajstg <celotajstg@ users.noreply.github.com>
2021-05-04 18:25:32 +01:00
SkyratBot
0e063e63d6 [MIRROR] Converts circuitboards to GAGS (#5439)
* Converts circuitboards to GAGS (#58841)

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

* Converts circuitboards to GAGS

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>
2021-05-04 01:07:32 +01:00
SkyratBot
d04e93f44f [MIRROR] Adds canister windows (#5420)
* Adds canister windows (#58826)

* Adds canister windows

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-03 15:12:48 +01:00
SkyratBot
15779b4df6 [MIRROR] Adds support for dirs and config changing in GAGS debug menu (#5379)
* Adds support for dirs and config changing in GAGS debug menu (#58794)

Previously, the menu wouldn't show you the generation steps for icons other than the south dir icons. You can now specify which you want to see. In addition the config type itself can be changed so as to allow previewing of icons that normally are not displayed directly on the map.

Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Adds support for dirs and config changing in GAGS debug menu

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-05-01 09:56:15 +01:00
SkyratBot
0efe89a6fb [MIRROR] Converts space carps to GAGS (#5356)
* Converts space carps to GAGS (#58710)

* Converts space carps to GAGS

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-04-30 13:09:48 +01:00
SkyratBot
4ff4b5d15b [MIRROR] Convert jumpsuits, jumpskirts and sneakers to GAGS (#5181)
* Convert jumpsuits, jumpskirts and sneakers to GAGS (#58514)

* Convert jumpsuits, jumpskirts and sneakers to GAGS

* Update maint_loot_common.dm

Co-authored-by: Celotajs <81999976+celotajstg@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-26 23:59:18 +01:00
SkyratBot
b95c094a63 [MIRROR] Fixes GAGS generated icons having no width or height value (#5179)
* Fixes GAGS generated icons having no width or height value (#58567)

* Fixes GAGS generated icons having no width or height value

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-04-25 21:20:42 +01:00
SkyratBot
41196908e2 [MIRROR] Renames GAS to GAGS (#5071)
* Renames GAS to GAGS (#58488)

* Renames GAS to GAGS

* Adds a hypen to Auto-Generated

Co-authored-by: Fikou <piotrbryla@ onet.pl>

Co-authored-by: Fikou <piotrbryla@ onet.pl>

* Renames GAS to GAGS

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Fikou <piotrbryla@ onet.pl>
2021-04-21 18:34:19 +01:00
SkyratBot
d5bf2b0b4e [MIRROR] Converts screwdrivers to GAS (#5058)
* Converts screwdrivers to GAS (#58453)

* Basic GAS setup

* Compile fix

* Fixes, inhands, belt icons

* New procs

* New version of GAGS

* Inhand for subtypes

* Typo fix

* Converts screwdrivers to GAS

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-04-21 05:53:17 +01:00
SkyratBot
e9d852bcd0 [MIRROR] Swaps the layer and result columns in the greyscale debug menu (#5043)
* Accidentally swapped the two (#58515)

* Swaps the layer and result columns in the greyscale debug menu

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-04-20 16:29:32 +01:00
SkyratBot
29c9908e09 [MIRROR] Adds icon state configuration to GAS (#4990)
* Adds icon state configuration to GAS (#58487)

Relatively simple change that allows you to specify icon states in greyscale config so as to allow generating icon files with multiple states. This is a requisite for GAS to work with icon smoothing.

Also a couple bits of additional warnings and documentation.

* Adds icon state configuration to GAS

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-04-18 01:24:43 +01:00
SkyratBot
1fa8f89cd1 [MIRROR] Converts wirecutters to GAS (#4927)
* Converts wirecutters to GAS (#58307)

* New wirecutters Greyscale

* New procs use

* Converts wirecutters to GAS

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-15 17:13:49 +01:00
SkyratBot
acdbc8a6c4 [MIRROR] Makes the GAS system only update the icon when it has changed (#4924)
* Makes the GAS system only update the icon when it has changed (#58337)

* Makes the GAS system only update the icon when it has changed

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-04-15 16:22:45 +01:00
SkyratBot
bc6c285adb [MIRROR] Advanced Greyscale Sprite Generation (#4792)
* Advanced Greyscale Sprite Generation (#58112)

* Nonfunctional greyscale code

* Functional greyscale sprites via filter

Probably going to set the icon instead later

* Switches to greyscale json config

* Adds the reference layer type and converts the other canister types

* Working previews

* Adds readme

* Fixes overlays and breaking

* Removes old canister sprites

* Removes an unused var

* Fixes tgui lints

* Removes a bunch of the old canister icon states

Yeah I need to fix relabeling as well

* Removes some debug sprites

* Sorts canister type list and breaks up base shader step

* Removes an unnecessary preview hack

* Makes prototype canister greyscale

* Properly sizes the ui

* Fills in the canister map sprite

* Adds some more warnings to layers

* Makes broken overlay more prominent

* Removes a preview var that isn't needed anymore

* Cleans up client ref in Destroy

* Cleans up the tgui window a bit

* Update GreyscaleModifyMenu.tsx

* Animates the canister falling over

* Removes a commented out line that's no longer needed

Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Advanced Greyscale Sprite Generation

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-04-10 17:59:30 +01:00