diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 82770a7216f..597ad805309 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -333,6 +333,13 @@ GLOBAL_LIST_INIT(autodrobe_contraband_items, list( /obj/item/clothing/under/syndicate/skyrat/enclave = 3, /obj/item/clothing/under/syndicate/skyrat/enclave/officer = 3, /obj/item/clothing/under/syndicate/syndibunny/fake = 3, + /obj/item/clothing/head/bandana/snake = 3, //Solid, Vic and ... Venom I guess? + /obj/item/clothing/under/rank/civilian/bubber/boss = 3, //Okay maybe there is room for more than one Boss and Snake + /obj/item/clothing/gloves/bubber/boss = 3, + /obj/item/clothing/shoes/jackboots/boss = 3, + /obj/item/clothing/under/rank/civilian/bubber/snake = 3, + /obj/item/clothing/gloves/bubber/snake = 3, + /obj/item/clothing/shoes/jackboots/snake = 3, // BUBBER EDIT ADDITION END - Extra stuff )) diff --git a/modular_zubbers/code/modules/clothing/gloves/misc.dm b/modular_zubbers/code/modules/clothing/gloves/misc.dm index cf50d1a2ad5..1819b10608d 100644 --- a/modular_zubbers/code/modules/clothing/gloves/misc.dm +++ b/modular_zubbers/code/modules/clothing/gloves/misc.dm @@ -46,3 +46,18 @@ RESKIN_WORN_ICON_STATE = "overwatch" ), ) + + +//MGS stuff sprited by Crumpaloo for onlyplateau, please credit when porting, which you obviously have permission to do. +/obj/item/clothing/gloves/color/black/security/snake + name = "stealth gloves" + desc = "We will forsake our countries." + uses_advanced_reskins = FALSE + icon = 'modular_zubbers/icons/obj/clothing/gloves/gloves.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/gloves/gloves.dmi' + icon_state = "snake" + +/obj/item/clothing/gloves/bubber/snake + name = "big boss' gloves" + desc = "We will forsake our countries." + icon_state = "snake" diff --git a/modular_zubbers/code/modules/clothing/gloves/syndicate.dm b/modular_zubbers/code/modules/clothing/gloves/syndicate.dm index 86b6d4264ee..9c8336ca0cc 100644 --- a/modular_zubbers/code/modules/clothing/gloves/syndicate.dm +++ b/modular_zubbers/code/modules/clothing/gloves/syndicate.dm @@ -10,3 +10,18 @@ greyscale_colors = "#FFFFFF" icon = 'icons/obj/clothing/gloves.dmi' worn_icon = 'icons/mob/clothing/hands.dmi' + +//MGS stuff sprited by Crumpaloo for onlyplateau, please credit when porting, which you obviously have permission to do. +/obj/item/clothing/gloves/combat/boss + name = "patriot's gloves" + desc = "We're both slowly being eaten away by the karma of others. We'll never have the chance to die peacefully of old age. We have no tomorrow. But we can still have hope for the future." + icon = 'modular_zubbers/icons/obj/clothing/gloves/gloves.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/gloves/gloves.dmi' + icon_state = "boss" + +//Uninsul'd for cosplay/LARP +/obj/item/clothing/gloves/bubber/boss + name = "mercury woman's gloves" + desc = "We're both slowly being eaten away by the karma of others. We'll never have the chance to die peacefully of old age. We have no tomorrow. But we can still have hope for the future." + icon_state = "boss" + diff --git a/modular_zubbers/code/modules/clothing/head/hats.dm b/modular_zubbers/code/modules/clothing/head/hats.dm index 57f76423d36..2f2e7c68080 100644 --- a/modular_zubbers/code/modules/clothing/head/hats.dm +++ b/modular_zubbers/code/modules/clothing/head/hats.dm @@ -23,3 +23,16 @@ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' icon_state = "unberet" dog_fashion = null + +//Ported from Kuro020 of TGMC. +/obj/item/clothing/head/bandana/snake + name = "soldier's bandana" + desc = "Her bandana, salvaged from Lake Nicaragua and lovingly repaired." + icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' + icon_state = "headband_snake" + +/obj/item/clothing/head/bandana/snake/sec + name = "armored bandana" + desc = "For ten years, we lived and died together. You couldn't possibly understand." + armor_type = /datum/armor/cosmetic_sec diff --git a/modular_zubbers/code/modules/clothing/shoes/boots.dm b/modular_zubbers/code/modules/clothing/shoes/boots.dm index 3a6c8b3350b..d96ef50e643 100644 --- a/modular_zubbers/code/modules/clothing/shoes/boots.dm +++ b/modular_zubbers/code/modules/clothing/shoes/boots.dm @@ -372,3 +372,26 @@ AddComponent(/datum/component/squeak, combine_sounds, 75) +//MGS stuff sprited by Crumpaloo for onlyplateau, please credit when porting, which you obviously have permission to do. +/obj/item/clothing/shoes/combat/boss + name = "patriot's boots" + desc = "There is nothing left inside me now. Nothing at all. No hatred, not even regret." + icon_state = "boss" + icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi' + clothing_traits = list(TRAIT_SILENT_FOOTSTEPS) //Stealth suit. + +/obj/item/clothing/shoes/jackboots/boss + name = "mecury woman's boots" + desc = "There is nothing left inside me now. Nothing at all. No hatred, not even regret." + icon_state = "boss" + icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi' + +/obj/item/clothing/shoes/jackboots/snake + name = "stealth boots" + desc = "We will leave our motherlands behind us." + icon_state = "snake" + icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi' + clothing_traits = list(TRAIT_SILENT_FOOTSTEPS) diff --git a/modular_zubbers/code/modules/clothing/under/misc.dm b/modular_zubbers/code/modules/clothing/under/misc.dm index 53640c07a3e..7a54c6cb40c 100644 --- a/modular_zubbers/code/modules/clothing/under/misc.dm +++ b/modular_zubbers/code/modules/clothing/under/misc.dm @@ -626,3 +626,13 @@ icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' icon_state = "citizenblue" + +//MGS stuff sprited by Crumpaloo for onlyplateau, please credit when porting, which you obviously have permission to do. + +/obj/item/clothing/under/rank/civilian/bubber/snake + name = "big boss' stealth suit" + desc = "We may all be headed straight to hell. But what better place for us than this?" + icon = 'modular_zubbers/icons/obj/clothing/under/syndicate.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/syndicate.dmi' + icon_state = "snake" + diff --git a/modular_zubbers/code/modules/clothing/under/security.dm b/modular_zubbers/code/modules/clothing/under/security.dm index efb75ee0a2f..6174d6db519 100644 --- a/modular_zubbers/code/modules/clothing/under/security.dm +++ b/modular_zubbers/code/modules/clothing/under/security.dm @@ -54,3 +54,13 @@ RESKIN_WORN_ICON_STATE = "overwatch_red" ), ) + + +//MGS stuff sprited by Crumpaloo for onlyplateau, please credit when porting, which you obviously have permission to do. +/obj/item/clothing/under/rank/security/snake + name = "stealth suit" + desc = "We may all be headed straight to hell. But what better place for us than this?" + icon = 'modular_zubbers/icons/obj/clothing/under/syndicate.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/syndicate.dmi' + icon_state = "snake" + uses_advanced_reskins = FALSE diff --git a/modular_zubbers/code/modules/clothing/under/syndicate.dm b/modular_zubbers/code/modules/clothing/under/syndicate.dm index 9cd539aec71..fac946e9a6b 100644 --- a/modular_zubbers/code/modules/clothing/under/syndicate.dm +++ b/modular_zubbers/code/modules/clothing/under/syndicate.dm @@ -7,7 +7,7 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY dying_key = DYE_REGISTRY_JUMPSKIRT supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - has_sensor = 1 + has_sensor = HAS_SENSORS /obj/item/clothing/under/misc/maid/tactical/Initialize(mapload) . = ..() @@ -38,3 +38,20 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY dying_key = DYE_REGISTRY_JUMPSKIRT supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + + +//MGS stuff sprited by Crumpaloo for onlyplateau, please credit when porting, which you obviously have permission to do. +/obj/item/clothing/under/syndicate/boss + name = "patriot's stealth suit" + desc = "Let's make this the greatest 10 minutes of our lives, Jack." + icon = 'modular_zubbers/icons/obj/clothing/under/syndicate.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/syndicate.dmi' + icon_state = "boss" + has_sensor = HAS_SENSORS + +/obj/item/clothing/under/rank/civilian/bubber/boss + name = "mercury woman's sneaking suit" + desc = "Let's make this the greatest 10 minutes of our lives, Jack." + icon = 'modular_zubbers/icons/obj/clothing/under/syndicate.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/syndicate.dmi' + icon_state = "boss" diff --git a/modular_zubbers/code/modules/vending/multisec.dm b/modular_zubbers/code/modules/vending/multisec.dm index 8c775b526f2..47cab785f65 100644 --- a/modular_zubbers/code/modules/vending/multisec.dm +++ b/modular_zubbers/code/modules/vending/multisec.dm @@ -161,6 +161,10 @@ /obj/item/clothing/mask/gas/german = 3, //As far as I can tell, this is nowhere else in the game. /obj/item/clothing/head/soft/veteran = 1, /obj/item/clothing/head/helmet/toggleable/justice = 1, //More than one of these in the Vendor and they'll get annoying fast. Hence why Justice2 isn't here. + /obj/item/clothing/head/bandana/snake/sec = 1, //There's only room for one Boss, and one Snake. + /obj/item/clothing/under/rank/security/snake = 1, + /obj/item/clothing/gloves/color/black/security/snake = 1, + /obj/item/clothing/shoes/jackboots/snake = 1, ) payment_department = ACCOUNT_SEC diff --git a/modular_zubbers/code/modules/vending/wardrobe.dm b/modular_zubbers/code/modules/vending/wardrobe.dm index 012e6468a24..06a8956002c 100644 --- a/modular_zubbers/code/modules/vending/wardrobe.dm +++ b/modular_zubbers/code/modules/vending/wardrobe.dm @@ -292,6 +292,9 @@ /obj/item/clothing/head/playbunnyears/syndicate = 3, /obj/item/clothing/neck/tie/bunnytie/syndicate = 3, /obj/item/clothing/suit/jacket/tailcoat/syndicate = 3, + /obj/item/clothing/under/syndicate/boss = 1, + /obj/item/clothing/gloves/combat/boss = 1, + /obj/item/clothing/shoes/combat/boss = 1, /obj/item/clothing/suit/toggle/jacket/zubber/bomber/syndicate = 3, /obj/item/clothing/under/syndicate/syndibunny = 3, ) diff --git a/modular_zubbers/icons/mob/clothing/feet/feet.dmi b/modular_zubbers/icons/mob/clothing/feet/feet.dmi index 87b17ef082e..05e92a5bf06 100644 Binary files a/modular_zubbers/icons/mob/clothing/feet/feet.dmi and b/modular_zubbers/icons/mob/clothing/feet/feet.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/gloves/gloves.dmi b/modular_zubbers/icons/mob/clothing/gloves/gloves.dmi index 6941fed32eb..9ee9293d37a 100644 Binary files a/modular_zubbers/icons/mob/clothing/gloves/gloves.dmi and b/modular_zubbers/icons/mob/clothing/gloves/gloves.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/head/hats.dmi b/modular_zubbers/icons/mob/clothing/head/hats.dmi index df3ca42ea27..ebee63c7d2e 100644 Binary files a/modular_zubbers/icons/mob/clothing/head/hats.dmi and b/modular_zubbers/icons/mob/clothing/head/hats.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/syndicate.dmi b/modular_zubbers/icons/mob/clothing/under/syndicate.dmi new file mode 100644 index 00000000000..6cee9244e9a Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/syndicate.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/feet/feet.dmi b/modular_zubbers/icons/obj/clothing/feet/feet.dmi index 7f63da0ffd7..c13c11941fc 100644 Binary files a/modular_zubbers/icons/obj/clothing/feet/feet.dmi and b/modular_zubbers/icons/obj/clothing/feet/feet.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/gloves/gloves.dmi b/modular_zubbers/icons/obj/clothing/gloves/gloves.dmi index ea084feb706..c9e18738e08 100644 Binary files a/modular_zubbers/icons/obj/clothing/gloves/gloves.dmi and b/modular_zubbers/icons/obj/clothing/gloves/gloves.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/head/hats.dmi b/modular_zubbers/icons/obj/clothing/head/hats.dmi index cf3fe122a5d..b64264df38c 100644 Binary files a/modular_zubbers/icons/obj/clothing/head/hats.dmi and b/modular_zubbers/icons/obj/clothing/head/hats.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/under/syndicate.dmi b/modular_zubbers/icons/obj/clothing/under/syndicate.dmi new file mode 100644 index 00000000000..1c65b892f76 Binary files /dev/null and b/modular_zubbers/icons/obj/clothing/under/syndicate.dmi differ