mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
BatrachophrenoandGitHub
af6c74d917
Currently, only Preferences Verbs use subcategories. As a result, all other Verb tabs are only organized alphabetically, meaning that a single mechanic (ie. languages) has its governing Verbs scattered rather than grouped together. Verb organization by Tab handles broad organization - IC, OOC, Objects, etc.- highly effectively but requires the user to click-navigate to other Tabs to access any other verbs. Verb organization within a Tab can be handled by A.) subcategories and B.) Verb name prefixes (such as Earphones - *****). The first option is the clearest and cleanest, but consumes additional vertical space. The second option conserves vertical space at the cost of visual clarity. This PR attempts to reorganize Verbs by their Tabs, Subcategories, and prefixes with the following priorities in mind: - Minimal disruption; any radical change must be justified (don't move shit around just for the sake of moving shit around.) - Verbs which share common functions (such as Languages) should be grouped together. - Maintainability. Contributors should not need to memorize an excessively convoluted Subcategories list; Subcategories must be intuitive and simple. - Subcategories should be used judiciously when grouping Verbs to conserve vertical space. Example: Instead of creating a Subcategory for Emotes, just rename Audible Emote and Visual Emote to Emote (Audible) and Emote (Visual). - Subcategories should highlight uncommon or unusual verbs when reasonable. Example: There are several animal husbandry-related Verbs, and because most characters will not have access to those verbs regularly, we can be less conservative with space (because they'll be gone most of the time) for the sake of emphasizing their availability. This PR covers the IC, OOC, and Object Tabs. Subcategories: OOC.Chat (Chat functions) - AOOC - LOOC - Devsay (moved from Special Verbs) - Dsay (moved from Special Verbs) - OOC OOC.Debug (Fix shit) - Fit viewport - Fix chat - Refresh TGUI OOC.Round (Round information) - Check Gamemode Probability - Check Round Info - Custom Event Info - Vote IC.Antag (Antag verbs w/o their own tab) - Invite to the Loyalists - Invite to the Revolutionaries - Set Ambition IC.Critters (More critter stuff than you'd expect there to be) - Befriend Carp (Previous name 'Become Friends') - Befriend Cat (Previous name 'Become Friends') - Befriend Dog - Befriend Ives - Name Alien Species - Name Animal IC.Language (Language-related stuff) - Check Default Language - Check Known Languages - Set Default Language IC.Maneuver (Movement, positioning, etc.) - Adjust walk speed - Do Pushup - Face Direction - Look Down - Look Up - Move Downwards - Move Upwards - Rest Object.Equipped (Equipped object stuff, mostly for drip) - Adjust Badge - Adjust Bag Straps (Backpacks) - Adjust Goggles - Adjust Mask - Adjust Welding Goggles - Adjust Welding Mask - Change Glasses Layer - Change Pants Layer - Change Wrist Radio Layer - Change Wristwear Layer - Check Time - Flip Badge - Flip Belt - Flip Eyepatch - Flip Hat - Flip ID card (ID card) - Flip Radio (Clip-on radio) - Flip Wristwear - Fold Collar - Lock Antenna(e) - Point At Watch - Raise Shroud - Roll Up Cape Mantle - Roll Up/Down Jumpsuit - Roll Up/Down Sleeves - Switch Belt Layer - Switch ID Layer - Switch Lanyard Layer - Switch Shoe Layer - Toggle Aviators (Like a dozen variants) - Toggle Ceremonial Garment Lights - Toggle Coat Buttons - Toggle Coat Zipper - Toggle Hair Coverage (For hats helmets etc) - Toggle Hair Coverage (FOR BABY CARP!!!!!) - Toggle Helmet Camera - Toggle Hood - Toggle Lyodsuit Mask - Toggle Poncho Tail Coverage - Toggle Shirt Buttons - Toggle Suit Sensors - Toggle Visor (Pilot helmet) - Toggle Waistcoat Buttons - Transform Holoclothing - Voidsuit - Eject Suit Cooler - Voidsuit - Eject Tank - Voidsuit - Toggle Helmet Object.Held (If you're HOLDING it, its probably relevant to you rn) - Activate Held Object (Silicons; moved from IC) - Alter Beacon's Signal (Radio beacon) - Change Bite Size (Utensils) - Change Pen Colour - Choose Colour (Paint sprayer) - Choose Decal (Paint sprayer) - Choose Direction (Paint sprayer) - Choose Preset Colour (Paint sprayer) - Describe Prototype - Draw Boot Knife - Empty Bee Net - Empty Spray Bottle - Holster - Name Gun - Name Prototype - Plant Flag (Flags) - Print Plant Report - Remove Chopsticks - Remove Top - Set Detector High-Bound (Light meter) - Set Detector Low-Bound (Light meter) - Set Hailer Message (Hailer) - Set Timer (Timer igniter) - Set Valve Pressure (Pneumatic cannon) - Show Held Item - Spin Cylinder (Revolvers) - Switch Verbosity (Health analyzer) - Toggle Chainsaw Power (Chainsaw) - Toggle Flashlight Brightness (Flashlights) - Toggle Gun Safety - Toggle Hazard Vest - Toggle Pinpointer Mode (Pinpointer) - Toggle Mister (Backpack water tank. Goes into/out of hands) - Twist Cap - Use Scope - Wield Pick/Drill - Wield Two-Handed Weapon (Two-handed weapons) Object.Cards (I fucking hate cards!!!) - Deck - Deal - Deck - Draw - Deck - Pick - Hand - Pick - Turn Hand Into Deck Object.Earphones (Enough here to separate out) - Eject Music Cartridge - Change Volume - Next Song - Pause/Unpause - Play/Stop - Previous Song Object.Jetpack (This is probably really important to see quickly) - Toggle Jetpack - Toggle Jetpack Stabilization Object.Tape Recorder (Enough here to separate out) - Start Recording - Stop Recording - Clear Memory - Playback Memory - Print Transcript - Eject Portable Storage **IC tab example:** <img width="1061" height="277" alt="Screenshot 2025-08-09 101813" src="https://github.com/user-attachments/assets/a2afe92d-34fd-4160-bf68-b459a4195e26" /> **Objects tab example:** <img width="1100" height="472" alt="Screenshot 2025-08-09 101807" src="https://github.com/user-attachments/assets/a36e4c76-594e-4569-93ba-ffcda57e8760" />
236 lines
6.7 KiB
Plaintext
236 lines
6.7 KiB
Plaintext
//
|
|
// Shirts
|
|
//
|
|
|
|
// Dress Shirt
|
|
/obj/item/clothing/under/dressshirt
|
|
name = "dress shirt"
|
|
desc = "A casual dress shirt."
|
|
icon = 'icons/obj/item/clothing/under/shirt/shirts.dmi'
|
|
icon_state = "dressshirt"
|
|
item_state = "dressshirt"
|
|
contained_sprite = TRUE
|
|
var/rolled = FALSE
|
|
|
|
/obj/item/clothing/under/dressshirt/update_clothing_icon()
|
|
var/mob/M = loc
|
|
if(ismob(loc))
|
|
M.update_inv_wear_suit()
|
|
|
|
/obj/item/clothing/under/dressshirt/verb/roll_up_shirt_sleeves()
|
|
set name = "Roll Up Sleeves"
|
|
set desc = "Roll up your shirt sleeves. Doesn't work with some shirts."
|
|
set category = "Object.Equipped"
|
|
set src in usr
|
|
|
|
if(use_check_and_message(usr))
|
|
return FALSE
|
|
|
|
var/list/icon_states = icon_states(icon)
|
|
var/initial_state = initial(icon_state)
|
|
var/new_state = "[initial_state]_r"
|
|
if(!(new_state in icon_states))
|
|
to_chat(usr, SPAN_WARNING("Your shirt doesn't allow this!"))
|
|
return
|
|
|
|
rolled = !rolled
|
|
to_chat(usr, SPAN_NOTICE("You roll your shirt sleeves [rolled ? "up" : "down"]."))
|
|
icon_state = rolled ? new_state : initial_state
|
|
item_state = rolled ? new_state : initial_state
|
|
overlay_state = rolled ? new_state : initial_state
|
|
update_icon()
|
|
update_clothing_icon()
|
|
|
|
/obj/item/clothing/under/dressshirt/alt
|
|
name = "dress shirt"
|
|
desc = "A casual dress shirt."
|
|
icon_state = "dressshirt_alt"
|
|
item_state = "dressshirt_alt"
|
|
|
|
/obj/item/clothing/under/dressshirt/alt/vneck
|
|
name = "v-neck dress shirt"
|
|
desc = "A casual dress shirt."
|
|
icon_state = "dressshirtvneck_alt"
|
|
item_state = "dressshirtvneck_alt"
|
|
|
|
/obj/item/clothing/under/dressshirt/deepv
|
|
name = "deep v-neck dress shirt"
|
|
desc = "A casual dress shirt with a deep neckline."
|
|
icon_state = "dressshirt_deepv"
|
|
item_state = "dressshirt_deepv"
|
|
|
|
/obj/item/clothing/under/dressshirt/crop
|
|
name = "cropped dress shirt"
|
|
desc = "A casual cropped dress shirt."
|
|
icon_state = "dressshirt_crop"
|
|
item_state = "dressshirt_crop"
|
|
|
|
// So people can see how these appear in the loadout
|
|
/obj/item/clothing/under/dressshirt/rolled
|
|
name = "dress shirt"
|
|
desc = "A casual dress shirt. This one has its sleeves rolled up."
|
|
icon_state = "dressshirt_r"
|
|
item_state = "dressshirt_r"
|
|
|
|
/obj/item/clothing/under/dressshirt/alt/rolled
|
|
name = "dress shirt"
|
|
desc = "A casual dress shirt. This one has its sleeves rolled up."
|
|
icon_state = "dressshirt_alt_r"
|
|
item_state = "dressshirt_alt_r"
|
|
|
|
/obj/item/clothing/under/dressshirt/alt/vneck/rolled
|
|
name = "v-neck dress shirt"
|
|
desc = "A casual dress shirt. This one has its sleeves rolled up."
|
|
icon_state = "dressshirtvneck_alt_r"
|
|
item_state = "dressshirtvneck_alt_r"
|
|
|
|
/obj/item/clothing/under/dressshirt/deepv/rolled
|
|
name = "deep v-neck dress shirt"
|
|
desc = "A casual dress shirt with a deep neckline. This one has its sleeves rolled up."
|
|
icon_state = "dressshirt_deepv_r"
|
|
item_state = "dressshirt_deepv_r"
|
|
|
|
/obj/item/clothing/under/dressshirt/crop/rolled
|
|
name = "cropped dress shirt"
|
|
desc = "A casual cropped dress shirt. This one has its sleeves rolled up"
|
|
icon_state = "dressshirt_crop_r"
|
|
item_state = "dressshirt_crop_r"
|
|
|
|
|
|
/obj/item/clothing/under/dressshirt/asymmetric
|
|
name = "asymmetric dress shirt"
|
|
desc = "A casual dress shirt that opens diagonally down the front."
|
|
icon_state = "dressshirt_asymmetric"
|
|
item_state = "dressshirt_asymmetric"
|
|
|
|
// Long Sleeve
|
|
|
|
/obj/item/clothing/under/dressshirt/longsleeve
|
|
name = "long-sleeved shirt"
|
|
desc = "A long-sleeved shirt made of light fabric."
|
|
icon_state = "longshirt"
|
|
item_state = "longshirt"
|
|
|
|
/obj/item/clothing/under/dressshirt/longsleeve_s
|
|
name = "striped long-sleeved shirt"
|
|
desc = "A long-sleeved shirt made of light fabric. This one has some stripes."
|
|
icon_state = "longshirt_s"
|
|
item_state = "longshirt_s"
|
|
has_accents = TRUE
|
|
|
|
/obj/item/clothing/under/dressshirt/tshirt_s
|
|
name = "striped t-shirt"
|
|
desc = "A t-shirt made of light fabric. This one has some stripes."
|
|
icon_state = "tshirt_s"
|
|
item_state = "tshirt_s"
|
|
has_accents = TRUE
|
|
|
|
// T-shirt
|
|
|
|
/obj/item/clothing/under/dressshirt/tshirt
|
|
name = "t-shirt"
|
|
desc = "A simple, cheap t-shirt."
|
|
icon_state = "tshirt"
|
|
item_state = "tshirt"
|
|
|
|
/obj/item/clothing/under/dressshirt/tshirt_crop
|
|
name = "cropped t-shirt"
|
|
desc = "A simple, cheap cropped t-shirt."
|
|
icon_state = "tshirt_crop"
|
|
item_state = "tshirt_crop"
|
|
|
|
// Blouses and Tops
|
|
|
|
/obj/item/clothing/under/dressshirt/blouse
|
|
name = "blouse"
|
|
desc = "A loose fitting garment."
|
|
icon_state = "blouse"
|
|
item_state = "blouse"
|
|
|
|
/obj/item/clothing/under/dressshirt/longblouse
|
|
name = "long-sleeved blouse"
|
|
desc = "A long-sleeved, loose fitting garment."
|
|
icon_state = "longblouse"
|
|
item_state = "longblouse"
|
|
|
|
/obj/item/clothing/under/dressshirt/puffyblouse
|
|
name = "puffy blouse"
|
|
desc = "A loose fitting garment with plenty of material around the arms."
|
|
icon_state = "puffyblouse"
|
|
item_state = "puffyblouse"
|
|
|
|
/obj/item/clothing/under/dressshirt/haltertop
|
|
name = "halter top"
|
|
desc = "A sleeveless tank with straps tied behind the neck, commonly seen worn in Biesel."
|
|
icon_state = "haltertop"
|
|
item_state = "haltertop"
|
|
|
|
/obj/item/clothing/under/dressshirt/tanktop
|
|
name = "tank top"
|
|
desc = "A simple, cheap tank top."
|
|
icon_state = "tanktop"
|
|
item_state = "tanktop"
|
|
|
|
/obj/item/clothing/under/dressshirt/tanktop/feminine
|
|
icon_state = "tanktop_fem"
|
|
item_state = "tanktop_fem"
|
|
|
|
|
|
// Polo Shirts
|
|
/obj/item/clothing/under/dressshirt/polo
|
|
name = "polo shirt"
|
|
desc = "A stylish polo shirt."
|
|
icon_state = "polo"
|
|
item_state = "polo"
|
|
has_accents = TRUE
|
|
|
|
/obj/item/clothing/under/dressshirt/polo/polo_fem
|
|
desc = "A stylish polo shirt with a waist fit."
|
|
icon_state = "polo_fem"
|
|
item_state = "polo_fem"
|
|
has_accents = TRUE
|
|
|
|
// Silversun
|
|
|
|
/obj/item/clothing/under/dressshirt/silversun
|
|
name = "silversun floral shirt"
|
|
desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is cyan."
|
|
icon_state = "hawaii"
|
|
item_state = "hawaii"
|
|
contained_sprite = TRUE
|
|
var/open = FALSE
|
|
|
|
/obj/item/clothing/under/dressshirt/silversun/verb/unbutton()
|
|
set name = "Toggle Shirt Buttons"
|
|
set category = "Object.Equipped"
|
|
set src in usr
|
|
|
|
if(!istype(usr, /mob/living))
|
|
return
|
|
if(use_check_and_message(usr))
|
|
return
|
|
|
|
var/mob/user = usr
|
|
attack_self(user)
|
|
|
|
/obj/item/clothing/under/dressshirt/silversun/attack_self(mob/user)
|
|
open = !open
|
|
icon_state = "[initial(icon_state)][open ? "_open" : ""]"
|
|
item_state = icon_state
|
|
to_chat(user, SPAN_NOTICE("You [open ? "open" : "close"] \the [src]."))
|
|
|
|
|
|
/obj/item/clothing/under/dressshirt/silversun/red
|
|
desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is crimson."
|
|
icon_state = "hawaii_red"
|
|
item_state = "hawaii_red"
|
|
|
|
/obj/item/clothing/under/dressshirt/silversun/random
|
|
name = "silversun floral shirt"
|
|
|
|
/obj/item/clothing/under/dressshirt/silversun/random/Initialize()
|
|
. = ..()
|
|
if(prob(50))
|
|
icon_state = "hawaii_red"
|
|
color = color_rotation(rand(-11,12)*15)
|