Commit Graph

100 Commits

Author SHA1 Message Date
nevimer
f9e9525dc8 Merge remote-tracking branch 'skrat/master' into upstream-jul-24
# Conflicts:
#	_maps/map_files/Deltastation/DeltaStation2.dmm
#	_maps/map_files/tramstation/tramstation.dmm
2023-07-24 20:11:34 -04:00
SkyratBot
c8bcaebadc [MIRROR] Standardizes a majority of the GAGS configs for Clothing [MDB IGNORE] (#22554)
* Standardizes a majority of the GAGS configs for Clothing

* why was this unchecked

* Painfully updates our modular

* Delete bandanafix.dm

* Update tgstation.dme

---------

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: Bloop <vinylspiders@gmail.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
2023-07-20 20:24:46 -04:00
nevimer
29d9d1a49f Merge remote-tracking branch 'skrat/master' into upstream-remake-stop-commiting-to-master
# Conflicts:
#	.github/CODEOWNERS
#	code/__DEFINES/footsteps.dm
#	code/game/objects/items/spear.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/language/language_holder.dm
#	code/modules/mob/living/carbon/human/species_types/abductors.dm
#	code/modules/mob/living/carbon/human/species_types/ethereal.dm
#	code/modules/mob/living/carbon/human/species_types/felinid.dm
#	code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
#	code/modules/mob/living/carbon/human/species_types/plasmamen.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	modular_skyrat/modules/altborgs/code/robot_model.dm
#	modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm
#	modular_skyrat/modules/examinemore/code/examine_more.dm
#	modular_skyrat/modules/opposing_force/code/equipment/loadouts.dm
2023-07-19 02:18:09 -04:00
SkyratBot
2f552919c1 [MIRROR] Icons folder cleaning wave two [MDB IGNORE] (#22454)
* Icons folder cleaning wave two

* Merge conflict resolution

* Modular path hell

* hmm

* Update 2022-10.yml

* Another modular thing

---------

Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
2023-07-16 00:41:18 -04:00
SkyratBot
fcacebfe38 [MIRROR] Adds Roach Infusion to the DNA infuser [MDB IGNORE] (#22190)
* Adds Roach Infusion to the DNA infuser

* Icons

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
2023-07-14 23:11:18 -04:00
SkyratBot
2f5c7f8389 [MIRROR] Icon folder cleaning wave one [MDB IGNORE] (#22374)
* Icon folder cleaning wave one

* Fixe a merge conflict

* Fixes some more merge conflicts

* Fixes some modular icon paths

* Fixes even more modular icon paths...

Hopefully that's the last of them

* Fixes some merge discrepencies

* More merge issues

* ok

* not ok

---------

Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
2023-07-13 16:24:33 -04:00
nevimer
b34fea1cc2 Ports Biodome from Orbstation (#265)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Ports: https://github.com/lizardqueenlexi/orbstation/pull/454 by
[Profakos](https://github.com/Profakos)
and all it's follow up PR's and fixes.

Biodome is an incredible map, with tons of character and polish.
Originally created for [Orbstation](https://orbstation.space/), Biodome
will surely be a beloved map here aswell.


![biodome_2](https://github.com/Bubberstation/Bubberstation/assets/77420409/1b289720-d32f-446f-bf9d-68392284e94a)


![biodome_1](https://github.com/Bubberstation/Bubberstation/assets/77420409/572e3296-63e3-4976-8f0b-365ac91bcbf9)


## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Biodome map, ported from Orbstation! A large vacation themed map!
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2023-07-02 03:54:20 -04:00
Tom
15b7c7bf71 removes sneaky merge conflict marker (#21919)
remove marker
2023-06-19 17:00:29 -04:00
SkyratBot
8b7bdc4959 [MIRROR] Shuttle events [MDB IGNORE] (#21917)
Shuttle events

Co-authored-by: Time-Green <timkoster1@hotmail.com>
Co-authored-by: ghost sheep <sheepwiththemask@gmail.com>
2023-06-18 15:02:04 +02:00
SkyratBot
7b94ae1c04 [MIRROR] Sorts the Greyscale Configs files [MDB IGNORE] (#21891)
* Sorts the Greyscale Configs files

* fix

---------

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: ghost sheep <sheepwiththemask@gmail.com>
2023-06-18 14:34:07 +02:00
SkyratBot
4f41c8dbfa [MIRROR] GAGS-ifies the Hawaiian Shirt, adds it to the ClothesMate [MDB IGNORE] (#21683)
* GAGS-ifies the Hawaiian Shirt, adds it to the ClothesMate (#75866)

## About The Pull Request
Technically a port of
https://github.com/Skyrat-SS13/Skyrat-tg/pull/17085
On the tin, it was mentioned that they could use it, I had these
on-hand. Probably should have been up here in the first place anyways.

![dreamseeker_ktdTANkHU9](https://github.com/tgstation/tgstation/assets/76465278/1c067db1-7e5a-4a8e-b912-9df0182a39ea)

![dreamseeker_0jPbNpXygu](https://github.com/tgstation/tgstation/assets/76465278/d9d27197-5971-44d2-bcff-24eeb23e4a9a)

![dreamseeker_AVZClDGGRt](https://github.com/tgstation/tgstation/assets/76465278/6736429b-3ef2-499f-b147-342254f44b1d)

Also makes them available in the ClothesMate so that crew can enjoy this
beautiful... just... beautiful item.

Worth noting, this item may be reworked in the future to an accessory.
This is just the greyscale half, the hard part. Changing the type to an
accessory in the future is easy now.
## Why It's Good For The Game
GAGS is good for items like this that just deserve lots of color. And
making them available for crew to actually use is cool.
## Changelog
🆑
add: The Hawaiian Overshirt is now GAGS, and available to crew in the
ClothesMate. Mahalo a aloha!
/🆑

* GAGS-ifies the Hawaiian Shirt, adds it to the ClothesMate

* removes duplicate

---------

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: ghost sheep <sheepwiththemask@gmail.com>
2023-06-07 15:30:39 +00:00
SkyratBot
ff6c2c3ca5 [MIRROR] PDA Fixes and Changes and Cargo Console Fix [MDB IGNORE] (#21617)
* PDA Fixes and Changes and Cargo Console Fix (#75768)

Was updating the documentation about PDAs on the wiki and saw some minor
issues, threw in the bug fix for issue
https://github.com/tgstation/tgstation/issues/75231 as well because why
not.
Also added the ability to put medipens into PDAs, they're small and
pen-like enough, right?

* PDA Fixes and Changes and Cargo Console Fix

---------

Co-authored-by: Oreo <20830349+Peliex@users.noreply.github.com>
2023-06-07 15:31:32 +02:00
SkyratBot
c57f774df3 [MIRROR] GAGSifies Plushies [MDB IGNORE] (#21307)
* GAGSifies Plushies (#75442)

image: Space lizard, carp, slime and snake plushies have been resprited and set up to support GAGS.

* GAGSifies Plushies

* sneezes - oh this is updatepaths

---------

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
2023-05-23 16:17:12 +00:00
SkyratBot
33961776ce [MIRROR] Wintercoats can now be zipped and unzipped through alt-click and separates the hood sprites from the jacket sprites [MDB IGNORE] (#20718)
* Wintercoats can now be zipped and unzipped through alt-click and separates the hood sprites from the jacket sprites (#74886)

## About The Pull Request
The title says it all, really.

~~Initially, I was only going to do it for all wintercoats, but then I
figured I might as well bring it down to all of `/hooded`, just so other
suits could benefit from it, since that behavior came from there anyway.
Does that mean that it does nothing for some of them? Yes, it does. Does
that justify having another variable to tell whether or not that should
be possible? In my humble opinion, not really, but I'm not against it if
it's requested.~~

~~That functionality was intentionally removed from the Void Cloak, as
there would be balance implications (since bringing up the hood makes
the whole cloak invisible, which you could skirt by just "zipping" it,
which also makes it invisible.~~

~~The sprites were already there, so this change was very simple to do.
Simply unties the zipped up look from the fact that the hood is up.
However, toggling the hood forces the zipping/unzipping, just so there's
no balance implications involved. It's just simpler that way.~~

So, I ended up going back and changing the sprites so that the hoods
would no longer be baked into the jacket's sprites, so that they could
be done as overlays instead, which ended up solving my problem with
hoods not being there on zipped-up versions.

For now, it's been made on winter coats only, but it shouldn't be that
difficult to bring it back down to the `/hooded` level. I just didn't
want to bother touching up the sprites down there, as it already took me
like 2-3 hours touching up the sprites of the winter coats alone.

I also took the decision to make it so EVA winter coats used the regular
winter coat's sprites, because they had special ones that just looked
like worse versions of the original, without anything special going on
for them. It was just a straight downgrade compared to the base sprite,
in my opinion.

There's still issues with the custom winter coat, in that the hood isn't
made into an overlay for it yet (and that'll require an extra bit of
logic to make it work, too), but it was already an issue before, the
hood is always present on the current version of the custom winter coat.

There's still a handful (sadly, most) of the winter coats that don't
properly reflect on their obj sprites when they're opened versus when
they're closed, but that's due to an initial spriter oversight, and not
to my doing. The open versions were just left as closed on many of them,
and I simply don't have the patience nor the appropriate skills to edit
that many coats that way.

## Why It's Good For The Game
Now you can be stylish with or without the hoodie!

![image](https://user-images.githubusercontent.com/58045821/233544697-cc821c3a-d965-4d96-af44-c44ff866496f.png)

![image](https://user-images.githubusercontent.com/58045821/233544711-da956b6b-44c4-4903-a34f-4d2890abc781.png)

![image](https://user-images.githubusercontent.com/58045821/233544717-b5221b04-0e6d-4931-83d0-d56fdac60ec3.png)

According to ChatGPT, with one small tweak (thanks Opera GX for the
suggestion):

> Zipped and unzipped through alt-click, winter coats can now be. Hmm,
stylishly warm, you shall be. Feel like a Spaceman, you will. Use the
Force, to zip and unzip, you must. Look cool, you will. Yes, hmmm.

## Changelog

🆑 GoldenAlpharex, ChatGPT for the first changelog entry (slightly
edited)
qol: Zipped and unzipped through alt-click, winter coats can now be.
Hmm, stylishly warm, you shall be. Feel like a Spaceman, you will. Use
the Force, to zip and unzip, you must. Look cool, you will. Yes, hmmm.
image: Winter coats no longer have their hood baked into their jacket's
sprite, both in item form and when worn.
fix: Updated the Icebox EVA winter coats (the Endotherm winter coats) to
use the same sprites as the regular winter coats.
/🆑

---------

Co-authored-by: san7890 <the@ san7890.com>

* Wintercoats can now be zipped and unzipped through alt-click and separates the hood sprites from the jacket sprites

* update modular wintercoat.dmi

* forgot

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>
Co-authored-by: ghost sheep <sheepwiththemask@gmail.com>
2023-04-24 17:20:33 +02:00
SkyratBot
9ad30cd3aa [MIRROR] Only checks for greyscale json config folder [MDB IGNORE] (#20639)
* Only checks for greyscale json config folder

* Update _greyscale_config.dm

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-04-21 16:41:50 -07:00
SkyratBot
9a594755f3 [MIRROR] Renames delta time to be a more obvious name [MDB IGNORE] (#20507)
* Renames delta time to be a more obvious name

* updates to our code

---------

Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-04-12 20:45:43 +01:00
SkyratBot
a078fe797b [MIRROR] Cleans up marisa shoes GAGS [MDB IGNORE] (#20306)
* Cleans up marisa shoes GAGS (#74451)

## About The Pull Request

The marisa shoes were building their icon using greyscale config for
their normal icons, but the worn ones were for some reason using a
`worn_icon_state` "marisa" that had its own full sprite.

I removed the sprite and added an overlay instead for the one part of
the shoes that differs from base sneakers.

Cleaned up the weirdness, now it uses the sneakers base config to build
its icon like all the other sneakers.

## Why It's Good For The Game

Clearer code, less weirdness. Icons created using GAGS are consistent
now.

<details>
<summary>The default colors on a mob still look exactly the same as the
old icon, removing the need for it</summary>

![image](https://user-images.githubusercontent.com/13398309/229326885-142b82a3-b93c-4514-8518-5cee9255d7ad.png)

</details>

<details>
<summary>Now worn icons get set up correctly, where the yellow bit is
uncolored</summary>

![image](https://user-images.githubusercontent.com/13398309/229327106-422bdbe8-7749-442d-810c-3f35f4410327.png)
</details>

## Changelog

🆑
fix: marisa shoes will now build its worn icon using the greyscale
config like sneakers do
/🆑

* Cleans up marisa shoes GAGS

---------

Co-authored-by: Bloop <vinylspiders@gmail.com>
2023-04-04 04:45:34 +01:00
SkyratBot
893e1996ad [MIRROR] New Station Trait, Employee Birthday! [MDB IGNORE] (#19690)
* New Station Trait, Employee Birthday!

* Update generic_positive_events.dm

* vr additions

---------

Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
2023-03-09 21:51:44 +00:00
SkyratBot
03d9def35d [MIRROR] Customizable GAGS Witch Hat [MDB IGNORE] (#19087)
* Customizable GAGS Witch Hat (#72477)

## About The Pull Request

Implements new sprites for the witch (Marisa) hat, divided into three
greyscale icon states - base, bow, and charms. The hat can have its
colours customized at an AutoDrobe. The not fake version has also been
changed in the same way. The default colours are approximately the same
to the old hat's.

![A coven of witches showing off their newly colourable
hats](https://user-images.githubusercontent.com/94123167/210642213-42e08912-1c11-469e-afda-66ce567280dd.png)
_A coven of witches showing off their newly colourable hats_

## Why It's Good For The Game

More customization options for clothes allow for more variety and
greater player creativity.

## Changelog

🆑
add: added greyscale json configs for witch hat and witch hat worn.
imageadd: Added new, greyscale states to head/wizard.dmi
imagedel: Removed Marisa hat states from head/wizard.dmi
code: changed Marisa hat code in wiz_robes.dm to make them use
greyscale.
config: changed greyscale configs to include the witch hat.
/🆑

* Customizable GAGS Witch Hat

---------

Co-authored-by: Kepteyn <94123167+Kepteyn@users.noreply.github.com>
2023-02-02 16:17:22 +00:00
SkyratBot
c51a58401d [MIRROR] New Mob [Garden Gnomes] [MDB IGNORE] (#18784)
* New Mob [Garden Gnomes] (#72672)

## About The Pull Request
Garden gnomes can go into the ground when they stand still for a while.
If they are damaged and underground they will heal. If they are
underground they will also gain damage resistance. They can make people
trip when underground and deal some damage. They are available through
golden slime cores or you can collect them from cargo with an emag. If
one of them gets damaged they will all retaliate against the attacker.

They have a very realistic colour pallet based on online gathered data.
Depending on their colour pallets some of them have a very low chance of
spawning.
## Why It's Good For The Game
These new garden gnomes come with expanding the world building of space
station 13. These gnomes will add more variety to the game play and use
an interesting AI and behavior that interacts with the player.

![gnome_promo1](https://user-images.githubusercontent.com/25363960/212195653-0b434f17-e73c-4a87-b8b8-e96dcf057269.PNG)

![gnome_promo2](https://user-images.githubusercontent.com/25363960/212195658-4cbcd863-dcab-4643-9e3b-686e79dcb435.PNG)
## Changelog
🆑
add: Adds garden gnomes.
imageadd: Adds garden gnome sprites.
/🆑

* New Mob [Garden Gnomes]

Co-authored-by: Comxy <tijntensen@gmail.com>
2023-01-18 13:37:37 +00:00
SkyratBot
85b56a310d [MIRROR] Fix JSON description for solo bench and tram [NO GBP] [MDB IGNORE] (#18661) 2023-01-12 13:58:59 -08:00
lessthanthree
280460bab8 [MANUAL MIRROR] [NO GBP] Side mounted tram controls (#18636)
* Side mounted tram controls (#72193)

Continuation of https://github.com/tgstation/tgstation/pull/72047 this
part was left out until it could be done using directional map helpers.
- Side mounts the tram controls freeing up the middle space for
shenanigans or whatever, and you can hit the controls faster from either
side of the tram.
- Emergency exit feature, doors can be forced open when the tram has
lost power.
- Accessible spots for wheelchairs (Ian's injured, you know!)

![image](https://user-images.githubusercontent.com/83487515/210920404-150f394b-4263-45d4-82ef-12eda0cfedb7.png)

- Looks like a tram direction sign instead of an awkward center placed
computer. Build an ice cream or illicit drugs shop or something in the
middle. Frees up space.
- You don't get stuck on an unpowered tram if you don't have a crowbar.
🆑 LT3
imageadd: Tram controls are now side mounted, freeing up space. Even
better, you now have two of them!
imageadd: Added a new accessible space on the tram for wheelchairs
fix: Removed duplicate tram plate/platforms
code: Tram has its own floor subtype for the walls and windows
add: Emergency exit feature added for people who are silly enough to not
carry a crowbar
/🆑

* floors.dmi
2023-01-11 08:14:12 -08:00
SkyratBot
798531331d [MIRROR] New Heretic rune sprites & animations [MDB IGNORE] (#18598)
* New Heretic rune sprites & animations (#72415)

## About The Pull Request

I made some magic circle animations for a downstream antagonist (coming
to tg 2023?) and people told me "Jacquerel heretic should also do
something like this" so after several hours of madness now they do.

![image](https://user-images.githubusercontent.com/7483112/210856249-f59ea631-5ea2-4aa4-bff3-cac2469fde8e.png)

This PR redraws the Heretic Transmutation Rune, and adds new effects for
drawing and unsummoning it.
The below videos are slightly outdated because the base colour is a tad
lighter now but you'll get the idea.

https://user-images.githubusercontent.com/7483112/210192981-0a34f3f9-ec78-4332-8148-896886d4d344.mp4

The animation is the same if you use the Codex Cicatrix, just the gaps
between steps are shorter.
Additionally, your rune effects are now coloured based on your heretic
path.

https://user-images.githubusercontent.com/7483112/210192985-4bda65af-5655-43a2-9685-0ca4d1519c87.mp4

Now the only caveat I can think of here is that as the 30 second long
drawing process now comes with flashy effects this _does_ make you
potentially more visible to random people who wander into your secret
den than previously, however as that would require them to overlook you
standing completely still with a _burning hand_ I don't think that
should be a massive issue.
Nobody was relying on the extremely long action bar having no animation
to draw runes in the middle of rooms full of people... right?

## Why It's Good For The Game

It looks cool.

## Changelog

🆑
imageadd: New look and animations for the Heretic's transmutation rune
/🆑

* New Heretic rune sprites & animations

Co-authored-by: Jacquerel <hnevard@gmail.com>
2023-01-08 17:05:53 -08:00
SkyratBot
b08e6d24b2 [MIRROR] 3/4ths-ify some wall mount sprites (by Kryson and Viro) [MDB IGNORE] (#18039)
* 3/4ths-ify some wall mount sprites (by Kryson and Viro) (#71788)

posters are now 24px tall, new sprites for nanomeds, emergency safes, and ticket machines
(by Kryson)

* 3/4ths-ify some wall mount sprites (by Kryson and Viro)

* DON'T INCLUDE FUCKING OVERRIDES IF THEY DON'T DO ANYTHING HHHNGH MY CI IS FAILING CODERS

* FUCK

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
2022-12-12 13:56:40 -05:00
SkyratBot
a5a173f672 [MIRROR] Adds the DNA Infuser, a genetics machine you feed corpses to infuse their DNA with yours! What could go wrong?! [MDB IGNORE] (#17811)
* Adds the DNA Infuser, a genetics machine you feed corpses to infuse their DNA with yours! What could go wrong?!

* SR conflicts

* fox ears

* remove duplicate event and merge master

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-12-07 16:07:26 +00:00
SkyratBot
9f3ebb04cb [MIRROR] Basic Mob Carp Part I: Colourful carp [MDB IGNORE] (#17704)
* Basic Mob Carp Part I: Colourful carp

* merge skew

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-11-28 13:49:44 -05:00
SkyratBot
a82fb5ba19 [MIRROR] Quantum keycards change color depending on the linked pad's location [MDB IGNORE] (#17796)
* Quantum keycards change color depending on the linked pad's location (#71518)

## About The Pull Request
aka: quantum pads with gags

Quantum keycards now light up depending on the linked pads
location/status, and the pads location will be visible on examine.
The card will be white if no pad is linked, the color of the department
the linked pad is in, or dark gray as a fallback.
## Why It's Good For The Game
Quantum keycards are impossible to organize, especially if you have
multiple on you. Differentiating your secret way into CE's office or
space could be vital. This helps to differentiate them and keep you
'safe'.
## Changelog
🆑
qol: quantum keycards light up with the department theyre in (or grey as
a fallback)
qol: quantum keycards are custom renamable w/ pen, to help keep em
organized
/🆑

Co-authored-by: etherware-novice <candy@ notarealaddr.com>
Co-authored-by: Candycaneannihalator <candycane@ thisisnotarealaddr.com>

* Quantum keycards change color depending on the linked pad's location

Co-authored-by: texan-down-under <73374039+etherware-novice@users.noreply.github.com>
Co-authored-by: etherware-novice <candy@ notarealaddr.com>
Co-authored-by: Candycaneannihalator <candycane@ thisisnotarealaddr.com>
2022-11-28 09:37:12 -05:00
SkyratBot
bdb951b7c0 [MIRROR] GAGs Buckets [MDB IGNORE] (#17213)
* GAGs Buckets

* Update code/datums/components/crafting/recipes.dm

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-10-28 12:12:26 -07:00
SkyratBot
2fa180cb99 [MIRROR] Fix an error message in ReadLayerGroup() [MDB IGNORE] (#17054)
* Fix an error message in `ReadLayerGroup()` (#70666)

* Fix an error message in `ReadLayerGroup()`

Co-authored-by: wixoa <wixoag@gmail.com>
2022-10-20 23:03:30 -04:00
SkyratBot
3795ed1a6b [MIRROR] [MDB Ignore]Hats DMI split [MDB IGNORE] (#16693)
* [MDB Ignore]Hats DMI split

* e

* STAFE

* e

* e

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-09 23:00:42 +01:00
SkyratBot
2847b2b37e [MIRROR] [ready] adds unit test for missing inhand icons. fixes a bunch of missing inhand icons [MDB IGNORE] (#16649)
* [ready] adds unit test for missing inhand icons. fixes a bunch of missing inhand icons

* cf

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-09 22:36:07 +01:00
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