mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 00:29:02 +01:00
DanielanceandGitHub
29ddc6a575
## About The Pull Request Adds digitigrade legs and teshari sprites for winter coats (and some extra winter coat subtypes) that lacked them on this list, from [this link](https://app.milanote.com/1Tzxnc1wYY2b3d/digi-sprites?p=SEkpuGTg5kd), which itself is from [this message](https://discord.com/channels/1059199070016655462/1184264879041949726/1328481959919226891) in the discord. <img width="679" height="708" alt="image" src="https://github.com/user-attachments/assets/da09bbd4-b342-4936-a80e-6019c4d2c03a" /> There also also a few other changes, elaboration below. This PR affects the following items: <img width="650" height="204" alt="all coats" src="https://github.com/user-attachments/assets/64447510-c581-497e-b700-90f2fa715c2c" /> **Other Changes** - All teshari winter coats can be zipped open now. (Previously you could, but it would not look visually different.) <img width="70" height="87" alt="image" src="https://github.com/user-attachments/assets/8bdf848e-d7ed-4492-b7be-2a0cdda97493" /> - The teshari sprite colors for the HoP, QM, and Cargo winter coats have been updated. - New teshari sprites for: captain, coroner, ratvarian, narsian, christmas (red and green), blueshield, endotherm, colorable, tailored, colorable, security winter coat and hood. Also the pullover and zipup hoodie, and security jacket. - Removed the duplicate security winter jacket (black and red). - Recolored the security winter coat (white and red), added a hood to it, and moved it in the place of the duplicate. Added a new icon for the security winter jacket. (Old vs new comparison) <img width="128" height="64" alt="image" src="https://github.com/user-attachments/assets/75bd5b44-5c1b-42d2-9a5d-20d06fa9785d" /> - Added some missing pixels to the hood of the default teshari winter coat. ## Why It's Good For The Game Less missing sprites good! ## Proof Of Testing Works on my machine. <details> <summary>Screenshots/Videos</summary> <img width="1508" height="1026" alt="digi wintercoats pr proof of testing image" src="https://github.com/user-attachments/assets/fa60753b-28ca-4bdf-a5b6-d0e6b4c7a940" /> The ratvar hoodie animates too (not this fast or choppy ingame) <img width="294" height="119" alt="ratvar hoodie animated" src="https://github.com/user-attachments/assets/1be7c2f7-a5c8-4d44-9742-1366a1e7ed34" /> The hoodie replacement works (there isn't a duplicate jacket) <img width="427" height="258" alt="Screenshot_1" src="https://github.com/user-attachments/assets/5f6e948a-e3ee-4633-8000-84711213adae" /> </details> ## Changelog 🆑 add: added digi legs sprites to all winter coats and related clothing add: updated/added some winter coat teshari sprites (including hoodies) add: teshari winter coats can open now, added missing teshari pixels on the grey winter hood add: slightly recolored the security winter coat and added a hood to it fix: removed duplicate security jacket in the secdrobe fix: fixed incorrect security jacket hood icon (by giving it a new one) /🆑
166 lines
8.8 KiB
Plaintext
166 lines
8.8 KiB
Plaintext
/obj/machinery/vending/wardrobe/sec_wardrobe
|
|
name = "\improper Security Outfitting Station"
|
|
desc = "A vending machine stocked with a multitude of security outfits, including standardized uniforms and general equipment."
|
|
icon = 'icons/obj/machines/vending.dmi'
|
|
icon_state = "secdrobe"
|
|
light_mask = null
|
|
products = list() // Overriding this to the default to prevent any issues when building the product menu
|
|
product_categories = list(
|
|
list(
|
|
"name" = "Red",
|
|
"icon" = "shield",
|
|
"products" = list(
|
|
/obj/item/clothing/suit/hooded/wintercoat/security/redsec = 6,
|
|
/obj/item/storage/backpack/security = 6,
|
|
/obj/item/storage/backpack/satchel/sec = 6,
|
|
/obj/item/storage/backpack/duffelbag/sec = 6,
|
|
/obj/item/storage/backpack/messenger/sec = 6,
|
|
/obj/item/clothing/under/rank/security/officer/redsec = 6,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/armadyne = 6,
|
|
/obj/item/clothing/under/rank/security/camo = 6,
|
|
/obj/item/clothing/under/rank/security/officer/turtleneck/red = 6,
|
|
/obj/item/clothing/under/rank/security/officer/turtleneck/red/skirt = 6,
|
|
/obj/item/clothing/under/rank/security/officer/suit/red = 6,
|
|
/obj/item/clothing/shoes/jackboots = 6,
|
|
/obj/item/clothing/shoes/jackboots/peacekeeper/armadyne = 6,
|
|
/obj/item/clothing/shoes/jackboots/gogo_boots = 6,
|
|
/obj/item/clothing/head/helmet/sec/redsec = 6,
|
|
/obj/item/clothing/head/beret/sec = 6,
|
|
/obj/item/clothing/head/security_kepi = 6,
|
|
/obj/item/clothing/head/beret/sec/peacekeeper/armadyne = 6,
|
|
/obj/item/clothing/head/soft/sec = 6,
|
|
/obj/item/clothing/head/security_beanie = 6,
|
|
/obj/item/clothing/head/costume/ushanka/sec = 10,
|
|
/obj/item/clothing/head/playbunnyears/security = 6,
|
|
/obj/item/clothing/under/rank/security/security_bunnysuit = 6,
|
|
/obj/item/clothing/suit/armor/security_tailcoat = 6,
|
|
/obj/item/clothing/neck/tie/bunnytie/security = 6,
|
|
/obj/item/clothing/head/playbunnyears/security/assistant = 6,
|
|
/obj/item/clothing/under/rank/security/security_assistant_bunnysuit = 6,
|
|
/obj/item/clothing/suit/armor/security_tailcoat/assistant = 6,
|
|
/obj/item/clothing/neck/tie/bunnytie/security_assistant = 6,
|
|
/obj/item/clothing/mask/bandana/red = 6,
|
|
/obj/item/clothing/neck/pauldron = 6,
|
|
/obj/item/clothing/neck/pauldron/commander = 6,
|
|
/obj/item/clothing/neck/pauldron/captain = 6,
|
|
/obj/item/clothing/gloves/color/black = 6,
|
|
/obj/item/clothing/gloves/color/black/peacekeeper/armadyne = 6,
|
|
/obj/item/clothing/under/rank/security/officer/skirt = 6,
|
|
/obj/item/clothing/under/rank/security/skyrat/utility/redsec = 6,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/skirt_redsec = 6,
|
|
/obj/item/clothing/suit/toggle/jacket/sec/old = 6,
|
|
/obj/item/clothing/suit/armor/vest/secjacket = 6,
|
|
/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne = 6,
|
|
/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor = 6,
|
|
/obj/item/clothing/suit/armor/vest/caligram_parka_vest_tan = 6,
|
|
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/sec = 6,
|
|
/obj/item/clothing/suit/hooded/wintercoat/security = 6,
|
|
/obj/item/clothing/suit/toggle/jacket/sec = 6,
|
|
/obj/item/clothing/neck/security_cape = 6,
|
|
/obj/item/clothing/neck/security_cape/armplate = 6,
|
|
/obj/item/clothing/under/rank/security/officer = 6,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/skirt = 6,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/miniskirt = 6,
|
|
/obj/item/clothing/under/rank/security/officer/blueshirt = 6,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/trousers = 6,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts = 6,
|
|
/obj/item/clothing/under/rank/security/skyrat/utility = 6,
|
|
/obj/item/clothing/under/rank/security/officer/turtleneck = 6,
|
|
/obj/item/clothing/shoes/jackboots/sec = 6,
|
|
/obj/item/clothing/gloves/color/black/security = 6,
|
|
/obj/item/clothing/head/helmet/sec/futuristic = 6,
|
|
/obj/item/clothing/suit/armor/vest/collared_vest = 6, //added by Bangle
|
|
/obj/item/clothing/under/rank/security/viro/officer = 6,
|
|
/obj/item/clothing/under/rank/security/viro/officer/lowcut = 6,
|
|
/obj/item/clothing/under/rank/security/viro/officer/skirt = 6,
|
|
/obj/item/clothing/under/rank/security/viro/officer/formal = 6,
|
|
/obj/item/clothing/under/rank/security/viro/officer/bodysuit = 6,
|
|
/obj/item/clothing/suit/armor/vest/viro = 6,
|
|
/obj/item/clothing/suit/armor/vest/viro/heavy = 6,
|
|
/obj/item/clothing/suit/armor/vest/viro/leatherjacket = 6,
|
|
/obj/item/clothing/suit/armor/vest/viro/softshell = 6,
|
|
/obj/item/clothing/head/sec/viro = 6,
|
|
/obj/item/clothing/head/sec/viro/beanie = 6,
|
|
|
|
),
|
|
),
|
|
list(
|
|
"name" = "Medic",
|
|
"icon" = "notes-medical",
|
|
"products" = list(
|
|
/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic = 3,
|
|
/obj/item/clothing/suit/hazardvest/security_medic = 3,
|
|
/obj/item/clothing/head/helmet/sec/peacekeeper/security_medic = 3,
|
|
/obj/item/clothing/head/beret/sec/security_medic = 3,
|
|
/obj/item/clothing/head/playbunnyears/brig_phys = 3,
|
|
/obj/item/clothing/under/rank/security/brig_phys_bunnysuit = 3,
|
|
/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/doctor_tailcoat = 3,
|
|
/obj/item/clothing/neck/tie/bunnytie/brig_phys = 3,
|
|
/obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec = 3,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate = 3,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/security_medic = 3,
|
|
/obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt = 3,
|
|
)
|
|
),
|
|
list(
|
|
"name" = "Corrections",
|
|
"icon" = "handcuffs",
|
|
"products" = list(
|
|
/obj/item/clothing/under/rank/security/corrections_officer = 2, //If, or more likely when the Brig Officers abandon them, you can now get 'em here! Yay! Wahoo!
|
|
/obj/item/clothing/under/rank/security/corrections_officer/skirt = 2,
|
|
/obj/item/clothing/under/rank/security/corrections_officer/sweater = 2,
|
|
/obj/item/clothing/under/rank/security/corrections_officer/sweater/skirt = 2,
|
|
/obj/item/clothing/suit/toggle/jacket/corrections_officer = 2,
|
|
/obj/item/clothing/under/rank/prisoner/classic = 6, //To be given to Prisoners.
|
|
/obj/item/clothing/head/playbunnyears/prisoner = 6,
|
|
/obj/item/clothing/under/rank/security/prisoner_bunnysuit = 6,
|
|
/obj/item/clothing/neck/tie/bunnytie/prisoner = 6,
|
|
),
|
|
),
|
|
)
|
|
premium = list(
|
|
/obj/item/clothing/under/rank/security/officer/formal = 6,
|
|
/obj/item/clothing/suit/jacket/officer/blue = 6,
|
|
/obj/item/clothing/head/beret/sec/navyofficer = 6,
|
|
/obj/item/clothing/suit/jacket/officer/tan = 6,
|
|
/obj/item/clothing/accessory/badge/holo = 10, //I know there's a box of them but, why not have more, eh?
|
|
/obj/item/clothing/accessory/badge/holo/cord = 10,
|
|
/obj/item/clothing/head/helmet/blueshirt = 3,
|
|
/obj/item/clothing/suit/armor/vest/blueshirt = 3,
|
|
/obj/item/riding_saddle/leather/peacekeeper = 3,
|
|
)
|
|
|
|
//CONTRABAND: Basically for less serious/hard to cat stuff like the Cowboy and Bluecoat stuff. And for stuff that shouldn't be easy to get like HUD varients.
|
|
|
|
|
|
contraband = list(
|
|
/obj/item/clothing/under/colonial/nri_police = 3,
|
|
/obj/item/clothing/head/cowboy/skyrat/cattleman/sec = 3,
|
|
/obj/item/clothing/head/cowboy/skyrat/cattleman/wide/sec = 3,
|
|
/obj/item/clothing/head/fedora/det_hat/cybergoggles = 3,
|
|
/obj/item/clothing/head/helmet/metrocophelmet = 6,
|
|
/obj/item/clothing/suit/armor/vest/alt/sec/metrocop = 6,
|
|
/obj/item/clothing/gloves/color/black/security/metrocop = 6,
|
|
/obj/item/clothing/under/rank/security/metrocop = 6,
|
|
/obj/item/clothing/shoes/jackboots/combine = 6,
|
|
/obj/item/clothing/glasses/hud/eyepatch/sec = 3, //No flash protection on the eyepatches, so they're worse than the sunnies.
|
|
/obj/item/clothing/glasses/hud/eyepatch/sec/blindfold = 3, //Ditto
|
|
/obj/item/clothing/glasses/hud/ar/aviator/security = 3, //Printable, but you have to choose between HUD and flash protection.
|
|
/obj/item/clothing/glasses/hud/ar/projector/security = 3,
|
|
/obj/item/clothing/mask/gas/half_mask = 3,
|
|
/obj/item/clothing/head/hats/caphat/parade/fedcap/sec = 3,
|
|
/obj/item/clothing/suit/fedcoat/modern/sec = 3,
|
|
/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
|
|
|
|
|
|
/obj/item/vending_refill/wardrobe/sec_wardrobe
|
|
machine_name = "Security Outfitting Station"
|