Skip to content

Commit

Permalink
Resprites Colored Jumpsuits! (#3570)
Browse files Browse the repository at this point in the history
<!-- 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
Look upon my works ye mighty, and despair.


![image](https://github.com/user-attachments/assets/527eddb7-3359-4d5c-a35a-875d42469a37)


This PR notably removes the woefully underused and really badly sprited
rainbow jumpsuit I did three years ago, as well as a mediocre reference
to Fight Club.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Better sprites!
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: PositiveEntropy
imageadd: All colored jumpsuits have been resprited!
del: Rainbow and khaki jumpsuits (including the buster subtype) have
been removed.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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. -->
  • Loading branch information
Imaginos16 authored Oct 16, 2024
1 parent 0437333 commit 9759ebf
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 34 deletions.
2 changes: 0 additions & 2 deletions code/game/machinery/washing_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ GLOBAL_LIST_INIT(dye_registry, list(
DYE_PURPLE = /obj/item/clothing/under/color/lightpurple,
DYE_BLACK = /obj/item/clothing/under/color/black,
DYE_WHITE = /obj/item/clothing/under/color/white,
DYE_RAINBOW = /obj/item/clothing/under/color/rainbow,
DYE_MIME = /obj/item/clothing/under/rank/civilian/mime,
DYE_CLOWN = /obj/item/clothing/under/rank/civilian/clown,
DYE_CHAP = /obj/item/clothing/under/rank/civilian/chaplain,
Expand All @@ -33,7 +32,6 @@ GLOBAL_LIST_INIT(dye_registry, list(
DYE_PURPLE = /obj/item/clothing/under/color/jumpskirt/lightpurple,
DYE_BLACK = /obj/item/clothing/under/color/jumpskirt/black,
DYE_WHITE = /obj/item/clothing/under/color/jumpskirt/white,
DYE_RAINBOW = /obj/item/clothing/under/color/jumpskirt/rainbow,
DYE_MIME = /obj/item/clothing/under/rank/civilian/mime/skirt,
DYE_CHAP = /obj/item/clothing/under/rank/civilian/chaplain/skirt,
DYE_QM = /obj/item/clothing/under/rank/cargo/qm/skirt,
Expand Down
1 change: 0 additions & 1 deletion code/game/objects/items/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
new /obj/item/storage/belt/fannypack/bustin(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/under/color/khaki/buster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
Expand Down
4 changes: 0 additions & 4 deletions code/modules/client/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@
display_name = "jumpsuit, random"
path = /obj/item/clothing/under/color/random //literally useless if grey assistants is off

/datum/gear/uniform/color/rainbow
display_name = "jumpsuit, rainbow"
path = /obj/item/clothing/under/color/rainbow

//Shorts

/datum/gear/uniform/athshortsred
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/factions/independent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
job_icon = "cargotechnician"

ears = /obj/item/radio/headset/headset_cargo
uniform = /obj/item/clothing/under/color/khaki
uniform = /obj/item/clothing/under/color/lightbrown
dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)

Expand Down
27 changes: 2 additions & 25 deletions code/modules/clothing/under/color.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

/obj/item/clothing/under/color/random
icon_state = "random_jumpsuit"
mob_overlay_state = "rainbow" // if you somehow equip it like that
mob_overlay_state = "white" // if you somehow equip it like that

/obj/item/clothing/under/color/random/Initialize()
..()
Expand All @@ -25,7 +25,7 @@

/obj/item/clothing/under/color/jumpskirt/random
icon_state = "random_jumpsuit" //Skirt variant needed
mob_overlay_state = "rainbow"
mob_overlay_state = "white"

/obj/item/clothing/under/color/jumpskirt/random/Initialize()
..()
Expand Down Expand Up @@ -186,15 +186,6 @@
icon_state = "lightbrown_skirt"
item_state = "lb_suit"

/obj/item/clothing/under/color/khaki
name = "khaki jumpsuit"
icon_state = "khakij"
item_state = "lb_suit"

/obj/item/clothing/under/color/khaki/buster
name = "buster jumpsuit"
desc = "There seems to be a large stain in the left pocket. Someone must have squashed a really big twinkie."

/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
icon_state = "brown"
Expand All @@ -214,17 +205,3 @@
name = "maroon jumpskirt"
icon_state = "maroon_skirt"
item_state = "r_suit"

/obj/item/clothing/under/color/rainbow
name = "rainbow jumpsuit"
desc = "A multi-colored jumpsuit!"
icon_state = "rainbow"
item_state = "rainbow"
can_adjust = FALSE

/obj/item/clothing/under/color/jumpskirt/rainbow
name = "rainbow jumpskirt"
desc = "A multi-colored jumpskirt!"
icon_state = "rainbow_skirt"
item_state = "rainbow"
can_adjust = FALSE
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@
/obj/item/clothing/under/rank/cargo/miner/lavaland = 10,
/obj/item/clothing/under/rank/prisoner = 10,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 5,
/obj/item/clothing/under/color/khaki/buster = 5,
/obj/item/clothing/under/rank/cargo/miner = 5
)
)
Expand Down
Binary file modified icons/mob/clothing/under/color.dmi
Binary file not shown.
Binary file modified icons/mob/species/misc/digitigrade.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/color.dmi
Binary file not shown.

0 comments on commit 9759ebf

Please sign in to comment.