mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
## About The Pull Request I'm working on it. the poll won so I am going ahead w/ this. <img width="1436" height="286" alt="image" src="https://github.com/user-attachments/assets/255eda79-eb2c-4e36-9ad8-53c91c3b245e" /> <img width="336" height="183" alt="image" src="https://github.com/user-attachments/assets/f92f5c29-c4e0-46da-889e-88acc903d253" /> stuff left to do - [x] finish hos outfits - [x] finish warden outfits - [x] finish obj icons - [ ] bugtest this is a total overhaul of security, essentially resetting everything to a new standard which can be worked off of. this is also a deletion of blusec, an antiquated, unpopular idea that has long since proven to both not be liked, and not work. ### this pr will not be the be-all, end-all. stuff will likely be tweaked, added, removed, changed, or resprited in the coming days, weeks, and months. due to just how much stuff security has. ## Why It's Good For The Game will write a markup for this specific pr eventually but I will just be posting the discord justification I gave <img width="427" height="313" alt="image" src="https://github.com/user-attachments/assets/e033ff0c-44f2-4cf6-ad9b-4b2d124cf21e" /> <img width="419" height="506" alt="image" src="https://github.com/user-attachments/assets/84e86f18-72d2-4bef-a84b-1b53067fe41d" /> ## Proof Of Testing <details> <summary>Screenshots/Videos</summary> <img width="967" height="1046" alt="image" src="https://github.com/user-attachments/assets/feaf9395-88d3-4999-a02f-e89cae25cc67" /> <img width="602" height="728" alt="image" src="https://github.com/user-attachments/assets/81daae2f-f18e-41a9-a225-48dbbaad697f" /> </details> ## Changelog 🆑 axietheaxolotl / viro del: blusec add: redsec /🆑
205 lines
10 KiB
Plaintext
205 lines
10 KiB
Plaintext
/obj/item/storage/backpack
|
|
species_clothing_color_coords = list(list(BACK_COLORPIXEL_X_1, BACK_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/backpack
|
|
|
|
/obj/item/clothing/glasses
|
|
species_clothing_color_coords = list(list(GLASSES_COLORPIXEL_X_1, GLASSES_COLORPIXEL_Y_1), list(GLASSES_COLORPIXEL_X_2, GLASSES_COLORPIXEL_Y_2))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/glasses
|
|
|
|
/obj/item/clothing/gloves
|
|
species_clothing_color_coords = list(list(GLOVES_COLORPIXEL_X_1, GLOVES_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/gloves
|
|
|
|
/obj/item/clothing/neck
|
|
species_clothing_color_coords = list(list(SCARF_COLORPIXEL_X_1, SCARF_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/scarf
|
|
|
|
/obj/item/clothing/neck/cloak
|
|
species_clothing_color_coords = list(list(CLOAK_COLORPIXEL_X_1, CLOAK_COLORPIXEL_Y_1), list(CLOAK_COLORPIXEL_X_2, CLOAK_COLORPIXEL_Y_2))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/cloak
|
|
|
|
/obj/item/clothing/neck/mantle
|
|
species_clothing_color_coords = list(list(MANTLE_COLORPIXEL_X_1, MANTLE_COLORPIXEL_Y_1), list(MANTLE_COLORPIXEL_X_2, MANTLE_COLORPIXEL_Y_2))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/mantle
|
|
|
|
/obj/item/clothing/neck/tie
|
|
species_clothing_color_coords = list(list(TIE_COLORPIXEL_X_1, TIE_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/tie
|
|
|
|
/obj/item/clothing/shoes
|
|
species_clothing_color_coords = list(list(SHOES_COLORPIXEL_X_1, SHOES_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/shoes
|
|
|
|
/obj/item/clothing/suit
|
|
species_clothing_color_coords = list(list(COAT_COLORPIXEL_X_1, COAT_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/coat
|
|
|
|
/obj/item/clothing/suit/wizrobe
|
|
species_clothing_color_coords = list(list(THICKROBE_COLORPIXEL_X_1, THICKROBE_COLORPIXEL_Y_1), list(THICKROBE_COLORPIXEL_X_2, THICKROBE_COLORPIXEL_Y_2), list(THICKROBE_COLORPIXEL_X_3, THICKROBE_COLORPIXEL_Y_3), list(THICKROBE_COLORPIXEL_X_4, THICKROBE_COLORPIXEL_Y_4), list(THICKROBE_COLORPIXEL_X_5, THICKROBE_COLORPIXEL_Y_5), list(THICKROBE_COLORPIXEL_X_6, THICKROBE_COLORPIXEL_Y_6))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/thickrobe/wiz
|
|
|
|
/obj/item/clothing/suit/jacket/trenchcoat
|
|
species_clothing_color_coords = list(list(LONGCOAT_COLORPIXEL_X_1, LONGCOAT_COLORPIXEL_Y_1), list(THICKROBE_COLORPIXEL_X_2, THICKROBE_COLORPIXEL_Y_2), list(THICKROBE_COLORPIXEL_X_3, THICKROBE_COLORPIXEL_Y_3), list(LONGCOAT_COLORPIXEL_X_4, LONGCOAT_COLORPIXEL_Y_4))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/thickrobe/longcoat
|
|
|
|
/obj/item/clothing/suit/jacket
|
|
species_clothing_color_coords = list(list(JACKET_COLORPIXEL_X_1, JACKET_COLORPIXEL_Y_1), list(JACKET_COLORPIXEL_X_2, JACKET_COLORPIXEL_Y_2), list(THICKROBE_COLORPIXEL_X_3, THICKROBE_COLORPIXEL_Y_3), list(JACKET_COLORPIXEL_X_4, JACKET_COLORPIXEL_Y_4))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/thickrobe/jacket
|
|
|
|
/obj/item/clothing/suit/armor
|
|
species_clothing_color_coords = list(list(ARMOR_COLORPIXEL_X_1, ARMOR_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/armor
|
|
|
|
/obj/item/clothing/suit/space
|
|
species_clothing_color_coords = list(list(SPACESUIT_COLORPIXEL_X_1, SPACESUIT_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/spacesuit
|
|
|
|
/obj/item/clothing/suit/mod
|
|
species_clothing_color_coords = list(list(MODSUIT_COLORPIXEL_X_1, MODSUIT_COLORPIXEL_Y_1), list(MODSUIT_COLORPIXEL_X_2, MODSUIT_COLORPIXEL_Y_2), list(MODSUIT_COLORPIXEL_X_3, MODSUIT_COLORPIXEL_Y_3))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/hardsuit
|
|
|
|
/obj/item/clothing/under
|
|
species_clothing_color_coords = list(list(UNDER_COLORPIXEL_X_1, UNDER_COLORPIXEL_Y_1), list(UNDER_COLORPIXEL_X_2, UNDER_COLORPIXEL_Y_2), list(UNDER_COLORPIXEL_X_3, UNDER_COLORPIXEL_Y_3))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/under
|
|
greyscale_config_worn_teshari_fallback_skirt = /datum/greyscale_config/teshari/under_skirt
|
|
|
|
/obj/item/mod/control
|
|
species_clothing_color_coords = list(list(MODCONTROL_COLORPIXEL_X_1, MODCONTROL_COLORPIXEL_Y_1))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/modcontrol
|
|
|
|
///GAGS below here
|
|
|
|
/obj/item/clothing/under/color
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/jumpsuit/worn/teshari
|
|
|
|
/obj/item/clothing/under/color/jumpskirt
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/jumpsuit/worn/teshari
|
|
|
|
/obj/item/clothing/shoes/sneakers
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/sneakers/worn/teshari
|
|
|
|
/obj/item/clothing/shoes/sneakers/orange
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/sneakers_orange/worn/teshari
|
|
|
|
/obj/item/clothing/head/collectable/beret
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
|
|
|
|
/obj/item/clothing/head/collectable/flatcap
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
|
|
|
|
/obj/item/clothing/head/frenchberet
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
|
|
|
|
/obj/item/clothing/head/flatcap
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
|
|
|
|
/obj/item/clothing/head/caphat/beret
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/badge
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/hats/hos/beret
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/sec
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/science/fancy
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/science/rd
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/durathread
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/centcom_formal
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/militia
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/sec/navywarden
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge_fancy/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/medical
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/engi
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/atmos
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/cargo/qm
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/hopcap/beret
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/blueshield
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/flatcap
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
|
|
|
|
/obj/item/clothing/head/frenchberet
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/sec/navywarden/syndicate
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/nanotrasen_consultant/beret
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/sec/armadyne
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge_fancy/worn/teshari
|
|
|
|
/obj/item/clothing/head/beret/sec/peacekeeper
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
|
|
|
|
/obj/item/clothing/neck/ranger_poncho
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/ranger_poncho/worn/teshari
|
|
|
|
/obj/item/clothing/under/dress/skirt/plaid
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/plaidskirt/worn/teshari
|
|
|
|
/obj/item/clothing/under/dress/sundress
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/sundress/worn/teshari
|
|
|
|
/obj/item/clothing/neck/scarf
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/scarf/worn/teshari
|
|
|
|
/obj/item/clothing/suit/toggle/suspenders
|
|
greyscale_config_worn_teshari = /datum/greyscale_config/suspenders/worn/teshari
|
|
|
|
// Unique clothing here
|
|
|
|
/obj/item/clothing/suit/kimjacket
|
|
species_clothing_color_coords = list(list(JACKET_COLORPIXEL_X_1, JACKET_COLORPIXEL_Y_1), list(JACKET_COLORPIXEL_X_2, JACKET_COLORPIXEL_Y_2), list(THICKROBE_COLORPIXEL_X_3, THICKROBE_COLORPIXEL_Y_3), list(JACKET_COLORPIXEL_X_4, JACKET_COLORPIXEL_Y_4))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/thickrobe/jacket
|
|
|
|
/obj/item/clothing/suit/discoblazer
|
|
species_clothing_color_coords = list(list(JACKET_COLORPIXEL_X_1, JACKET_COLORPIXEL_Y_1), list(JACKET_COLORPIXEL_X_2, JACKET_COLORPIXEL_Y_2), list(THICKROBE_COLORPIXEL_X_3, THICKROBE_COLORPIXEL_Y_3), list(JACKET_COLORPIXEL_X_4, JACKET_COLORPIXEL_Y_4))
|
|
greyscale_config_worn_teshari_fallback = /datum/greyscale_config/teshari/thickrobe/jacket
|
|
|
|
// Wintercoats and Satchels
|
|
|
|
/obj/item/storage/backpack/satchel
|
|
worn_icon_teshari = 'modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi'
|
|
|
|
/obj/item/storage/backpack/duffelbag
|
|
worn_icon_teshari = 'modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi'
|
|
|
|
/obj/item/clothing/suit/hooded/wintercoat/equipped(mob/living/user, slot)
|
|
var/mob/living/carbon/human/teshari = user
|
|
if(teshari.dna.species.name == "Teshari")
|
|
var/datum/component/toggle_attached_clothing/component = GetComponent(/datum/component/toggle_attached_clothing)
|
|
component.undeployed_overlay = null
|
|
. = ..()
|
|
|