cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for #91885

Browse Source
This commit is contained in:
Roxy
2025-07-04 20:47:25 -04:00
parent d2ceb25ade
commit 280a7f6d8a
20 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/costume.dm
+1 -1
View File
@@ -55,7 +55,7 @@
desc = "Just like from one of those chinese cartoons!"
greyscale_colors = "#494955#EEEEEE"
icon = 'icons/map_icons/clothing/head/_head.dmi'
icon_state = "/obj/item/clothing/head/costume/maid"
icon_state = "/obj/item/clothing/head/costume/maid_headband" // BUBBER EDIT - Temporary fix for upstream bug - ORIGINAL: icon_state = "/obj/item/clothing/head/costume/maid"
post_init_icon_state = "maid"
greyscale_config = /datum/greyscale_config/maid_headband
greyscale_config_worn = /datum/greyscale_config/maid_headband/worn
icons/map_icons/clothing/head/_head.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

icons/map_icons/clothing/under/costume.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

modular_skyrat/master_files/code/modules/loadout/categories/gloves.dm
-4
View File
@@ -77,10 +77,6 @@
name = "Aerostatic Gloves"
item_path = /obj/item/clothing/gloves/kim
/datum/loadout_item/gloves/maid
name = "Maid Arm Covers"
item_path = /obj/item/clothing/gloves/maid
/datum/loadout_item/gloves/maid_arm_covers
name = "Colourable Maid Arm Covers"
item_path = /obj/item/clothing/gloves/maid_arm_covers
modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
+1 -1
View File
@@ -333,7 +333,7 @@
/datum/loadout_item/head/maidhead2
name = "Frilly Maid Headband"
item_path = /obj/item/clothing/head/costume/maidheadband
item_path = /obj/item/clothing/head/costume/maid_headband
/datum/loadout_item/head/wig
name = "Wig"
modular_skyrat/master_files/code/modules/loadout/categories/neck.dm
-4
View File
@@ -245,10 +245,6 @@
name = "Stethoscope"
item_path = /obj/item/clothing/neck/stethoscope
/datum/loadout_item/neck/maid
name = "Maid Neck Cover"
item_path = /obj/item/clothing/neck/maid
/*
* DONATOR
*/
modular_skyrat/modules/GAGS/greyscale_configs.dm
+8 -8
View File
@@ -1151,39 +1151,39 @@
//GRAYSCALE MAID COSTUME
/datum/greyscale_config/maid_neck_cover
/datum/greyscale_config/bubber_maid_neck_cover
name = "Maid Neck Cover"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_neck_cover.json'
/datum/greyscale_config/maid_neck_cover/worn
/datum/greyscale_config/bubber_maid_neck_cover/worn
name = "Maid Neck Cover (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi'
/datum/greyscale_config/maid_arm_covers
/datum/greyscale_config/bubber_maid_arm_covers
name = "Maid Arm Covers"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_arm_covers.json'
/datum/greyscale_config/maid_arm_covers/worn
/datum/greyscale_config/bubber_maid_arm_covers/worn
name = "Maid Arm Covers (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi'
/datum/greyscale_config/maid_costume
/datum/greyscale_config/bubber_maid_costume
name = "Maid Costume"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_costume.json'
/datum/greyscale_config/maid_costume/worn
/datum/greyscale_config/bubber_maid_costume/worn
name = "Maid Costume (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi'
/datum/greyscale_config/maid_headband
/datum/greyscale_config/bubber_maid_headband
name = "Maid Headband"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_headband.json'
/datum/greyscale_config/maid_headband/worn
/datum/greyscale_config/bubber_maid_headband/worn
name = "Maid Headband (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi'
modular_skyrat/modules/customization/modules/clothing/hands/hands.dm
+2 -2
View File
@@ -52,8 +52,8 @@
icon = 'icons/map_icons/clothing/_clothing.dmi'
icon_state = "/obj/item/clothing/gloves/maid_arm_covers"
post_init_icon_state = "maid_arm_covers"
greyscale_config = /datum/greyscale_config/maid_arm_covers
greyscale_config_worn = /datum/greyscale_config/maid_arm_covers/worn
greyscale_config = /datum/greyscale_config/bubber_maid_arm_covers
greyscale_config_worn = /datum/greyscale_config/bubber_maid_arm_covers/worn
greyscale_config_inhand_left = null
greyscale_config_inhand_right = null
greyscale_colors = "#7b9ab5#edf9ff"
modular_skyrat/modules/customization/modules/clothing/head/costume.dm
+2 -2
View File
@@ -108,7 +108,7 @@
icon = 'icons/map_icons/clothing/head/_head.dmi'
icon_state = "/obj/item/clothing/head/maid_headband"
post_init_icon_state = "maid_headband"
greyscale_config = /datum/greyscale_config/maid_headband
greyscale_config_worn = /datum/greyscale_config/maid_headband/worn
greyscale_config = /datum/greyscale_config/bubber_maid_headband
greyscale_config_worn = /datum/greyscale_config/bubber_maid_headband/worn
greyscale_colors = "#edf9ff"
flags_1 = IS_PLAYER_COLORABLE_1
modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm
+2 -2
View File
@@ -119,7 +119,7 @@
icon = 'icons/map_icons/clothing/neck.dmi'
icon_state = "/obj/item/clothing/neck/maid_neck_cover"
post_init_icon_state = "maid_neck_cover"
greyscale_config = /datum/greyscale_config/maid_neck_cover
greyscale_config_worn = /datum/greyscale_config/maid_neck_cover/worn
greyscale_config = /datum/greyscale_config/bubber_maid_neck_cover
greyscale_config_worn = /datum/greyscale_config/bubber_maid_neck_cover/worn
greyscale_colors = "#7b9ab5#edf9ff"
flags_1 = IS_PLAYER_COLORABLE_1
modular_skyrat/modules/customization/modules/clothing/under/costumes.dm
+2 -2
View File
@@ -22,7 +22,7 @@
icon_state = "/obj/item/clothing/under/maid_costume"
post_init_icon_state = "maid_costume"
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
greyscale_config = /datum/greyscale_config/maid_costume
greyscale_config_worn = /datum/greyscale_config/maid_costume/worn
greyscale_config = /datum/greyscale_config/bubber_maid_costume
greyscale_config_worn = /datum/greyscale_config/bubber_maid_costume/worn
greyscale_colors = "#7b9ab5#edf9ff"
flags_1 = IS_PLAYER_COLORABLE_1
modular_skyrat/modules/mapping/code/wardrobes.dm
+1 -1
View File
@@ -36,7 +36,7 @@
/obj/item/clothing/gloves/combat = 3,
/obj/item/clothing/under/syndicate/skyrat/maid = 5,
/obj/item/clothing/gloves/combat/maid = 5,
/obj/item/clothing/head/costume/maidheadband/syndicate = 5,
/obj/item/clothing/head/costume/maid_headband/syndicate = 5,
/obj/item/storage/box/nif_ghost_box/ghost_role = 10,
)
modular_skyrat/modules/modular_vending/code/autodrobe.dm
+1 -3
View File
@@ -48,10 +48,8 @@
/obj/item/clothing/under/suit/waiter = 1,
/obj/item/clothing/suit/apron = 1,
/obj/item/clothing/suit/apron/overalls = 1,
/obj/item/clothing/head/costume/maidheadband = 1,
/obj/item/clothing/head/costume/maid_headband = 1,
/obj/item/clothing/under/costume/maid = 1,
/obj/item/clothing/gloves/maid = 1,
/obj/item/clothing/neck/maid = 1,
/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
/obj/item/clothing/accessory/maidapron = 1,
/obj/item/clothing/gloves/maid_arm_covers = 1,
modular_skyrat/modules/opposing_force/code/equipment/clothing.dm
+1 -1
View File
@@ -65,7 +65,7 @@
/obj/item/storage/backpack/duffelbag/syndie/maid/PopulateContents() //by far the weakest bundle
new /obj/item/clothing/under/syndicate/skyrat/maid(src)
new /obj/item/clothing/gloves/combat/maid(src)
new /obj/item/clothing/head/costume/maidheadband/syndicate(src)
new /obj/item/clothing/head/costume/maid_headband/syndicate(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/radio/headset/syndicate/alt(src)
new /obj/item/card/id/advanced/chameleon(src)
modular_skyrat/modules/syndie_edits/code/syndie_edits.dm
+9 -2
View File
@@ -140,12 +140,19 @@
soft_type = "ds"
//Maid Outfit
/obj/item/clothing/head/costume/maidheadband/syndicate
/obj/item/clothing/head/costume/maid_headband/syndicate
name = "tactical maid headband"
desc = "Tacticute."
icon_state = "syndimaid_headband"
icon = 'modular_skyrat/master_files/icons/obj/clothing/head/costume.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/costume.dmi'
icon_state = "syndimaid_headband"
post_init_icon_state = null
greyscale_colors = null
greyscale_config = null
greyscale_config_worn = null
greyscale_config_inhand_left = null
greyscale_config_inhand_right = null
flags_1 = parent_type::flags_1 & ~IS_PLAYER_COLORABLE_1
/obj/item/clothing/gloves/combat/maid
name = "combat maid sleeves"
modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/_syndimaid.dm
+1 -1
View File
@@ -12,6 +12,6 @@
/obj/item/storage/box/syndimaid/PopulateContents()
. = ..()
new /obj/item/clothing/under/syndicate/skyrat/maid/armored(src)
new /obj/item/clothing/head/costume/maidheadband/syndicate/armored(src)
new /obj/item/clothing/head/costume/maid_headband/syndicate/armored(src)
new /obj/item/clothing/gloves/combat/maid/armored(src)
new /obj/item/clothing/shoes/jackboots/heel/tactical(src)
modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/clothes.dm
+1 -1
View File
@@ -45,7 +45,7 @@
wearer_species.update_no_equip_flags(human_wearer, new_flags)
wear_locked = lock ? WEAKREF(human_wearer) : null
/obj/item/clothing/head/costume/maidheadband/syndicate/armored
/obj/item/clothing/head/costume/maid_headband/syndicate/armored
armor_type = /datum/armor/clothing_under/syndimaid
body_parts_covered = HEAD
resistance_flags = parent_type::resistance_flags | FIRE_PROOF
modular_zubbers/code/modules/clothing/head/syndicate.dm
-6
View File
@@ -1,6 +0,0 @@
/obj/item/clothing/head/costume/maidheadband/tactical_maid //Donor item for skyefree
name = "tactical maid headband"
desc = "Tacticute."
icon_state = "syndimaid_headband"
icon = 'modular_skyrat/master_files/icons/obj/clothing/head/costume.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/costume.dmi'
modular_zubbers/code/modules/loadout/categories/heads.dm
+1 -1
View File
@@ -157,7 +157,7 @@
/datum/loadout_item/head/tactical_maid_headband //Donor item for skyefree
name = "Tactical Maid Headband"
item_path = /obj/item/clothing/head/costume/maidheadband/tactical_maid
item_path = /obj/item/clothing/head/costume/maid_headband/syndicate
donator_only = TRUE
/datum/loadout_item/head/mime_bunny_ears
tgstation.dme
-1
View File
@@ -9221,7 +9221,6 @@
#include "modular_zubbers\code\modules\clothing\head\helmet.dm"
#include "modular_zubbers\code\modules\clothing\head\jobs.dm"
#include "modular_zubbers\code\modules\clothing\head\sombrero.dm"
#include "modular_zubbers\code\modules\clothing\head\syndicate.dm"
#include "modular_zubbers\code\modules\clothing\head\wig.dm"
#include "modular_zubbers\code\modules\clothing\mask\clown.dm"
#include "modular_zubbers\code\modules\clothing\mask\gasmask.dm"