Nanotrasen Cargo Bounties
" + update_icon() + + for(var/datum/bounty/B in GLOB.bounties_list) + if(B.claimed) + continue + info += {"[B.name]
+- Reward: [B.reward_string()] +
- Completed: [B.completion_string()]
Occupation Choices
" - dat += "Set Occupation PreferencesQuirk Setup
" - dat += "Configure QuirksIdentity
" - dat += "| "
- if(jobban_isbanned(user, "appearance"))
- dat += "You are banned from using custom names and appearances. You can continue to adjust your characters, but you will be randomised once you join the game. " - dat += "Random Name " - dat += "Always Random Name:[be_random_name ? "Yes" : "No"] " + dat += " " - dat += "[nameless ? "Default designation" : "Name"]:" - dat += "[real_name] " - dat += "Be nameless: [nameless ? "Yes" : "No"] " + dat += " " - dat += "Age: [age] " + dat += " " + dat += "
"
+ dat += " Advanced colors: [(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) ? "Enabled" : "Disabled"]"
+ dat += " | "
- //Character Appearance
- if(APPEARANCE_TAB)
- if(path)
- var/savefile/S = new /savefile(path)
- if(S)
- dat += " |
" + switch(character_settings_tab) + //General + if(GENERAL_CHAR_TAB) + dat += "
Occupation Choices
" + dat += "Set Occupation PreferencesQuirk Setup
" + dat += "Configure QuirksIdentity
" + dat += "| "
+ if(jobban_isbanned(user, "appearance"))
+ dat += "You are banned from using custom names and appearances. You can continue to adjust your characters, but you will be randomised once you join the game. " + dat += "Random Name " + dat += "Always Random Name:[be_random_name ? "Yes" : "No"] " + + dat += "[nameless ? "Default designation" : "Name"]:" + dat += "[real_name] " + dat += "Be nameless: [nameless ? "Yes" : "No"] " + + dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))] " + dat += "Age: [age] " + + dat += "Special Names: " + var/old_group + for(var/custom_name_id in GLOB.preferences_custom_names) + var/namedata = GLOB.preferences_custom_names[custom_name_id] + if(!old_group) + old_group = namedata["group"] + else if(old_group != namedata["group"]) + old_group = namedata["group"] dat += " " - unspaced_slots = 0 - S.cd = "/character[i]" - S["real_name"] >> name - if(!name) - name = "Character[i]" - dat += "[name] " - dat += "" + dat += "[namedata["pref_name"]]: [custom_names[custom_name_id]] " + dat += " " - dat += "
Records" - dat += "Security Records " - if(length_char(security_records) <= 40) - if(!length(security_records)) - dat += "\[...\]" - else - dat += "[security_records]" - else - dat += "[TextPreview(security_records)]... " - - dat += " Medical Records " - if(length_char(medical_records) <= 40) - if(!length(medical_records)) - dat += "\[...\] " - else - dat += "[medical_records]" - else - dat += "[TextPreview(medical_records)]... " - - dat += APPEARANCE_CATEGORY_COLUMN //body moves right sandstorm change - - dat += " Body" - dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]" - if(gender != NEUTER && pref_species.sexes) - dat += "Body Model:[features["body_model"] == MALE ? "Masculine" : "Feminine"] " - dat += "Limb Modification: " - dat += "Modify Limbs " - for(var/modification in modified_limbs) - if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC) - dat += "[modification]: [modified_limbs[modification][2]] " - else - dat += "[modification]: [modified_limbs[modification][1]] " - dat += " " - dat += "Species:[pref_species.name] " - dat += "Custom Species Name:[custom_species ? custom_species : "None"] " - dat += "Random Body:Randomize! " - dat += "Always Random Body:[be_random_body ? "Yes" : "No"] " - dat += " Cycle background:[bgstate] " - - dat += " | " //body moves right sandstorm change
-
- var/use_skintones = pref_species.use_skintones
- if(use_skintones)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "
"
+ dat += "Flavor Text" + dat += "Set Examine Text" + if(length(features["flavor_text"]) <= MAX_FLAVOR_PREVIEW_LEN) + if(!length(features["flavor_text"])) + dat += "\[...\] " //skyrat - adds //come to brazil or brazil comes to you + else + dat += "[html_encode(features["flavor_text"])] " //skyrat - adds and uses html_encode else - dat += " Left Eye Color" - dat += "#[left_eye_color] Change" - dat += "Right Eye Color" - dat += "#[right_eye_color] Change" - - if(HAIR in pref_species.species_traits) - - dat += APPEARANCE_CATEGORY_COLUMN - - dat += " Hair Style" - - dat += "[hair_style]" - dat += "< >" - dat += "#[hair_color] Change " - - dat += " Facial Hair Style" - - dat += "[facial_hair_style]" - dat += "< >" - dat += "#[facial_hair_color] Change " - - dat += " Hair Gradient" - - dat += "[grad_style]" - dat += "< >" - dat += "#[grad_color] Change " - - dat += " | "
- //Mutant stuff
- var/mutant_category = 0
-
- dat += APPEARANCE_CATEGORY_COLUMN
- dat += "
| [marking_list[2]] - [actual_name] | ˄ ˅ X [color_marking_dat] |
[GLOB.all_mutant_parts[mutant_part]]
" - dat += "[features[mutant_part]]" - var/color_type = GLOB.colored_mutant_parts[mutant_part] //if it can be coloured, show the appropriate button - if(color_type) - dat += "#[features[color_type]] Change" + dat += "[TextPreview(html_encode(features["flavor_text"]))]...
" //skyrat edit, uses html_encode + //SPLURT edit - naked flavor text + dat += "
Naked Flavor Text
" + dat += "Set Naked Examine Text" + if(length(features["naked_flavor_text"]) <= 40) + if(!length(features["naked_flavor_text"])) + dat += "\[...\]
" + else + dat += "[html_encode(features["naked_flavor_text"])]
" else - if(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) //advanced individual part colouring system - //is it matrixed or does it have extra parts to be coloured? - var/find_part = features[mutant_part] || pref_species.mutant_bodyparts[mutant_part] - var/find_part_list = GLOB.mutant_reference_list[mutant_part] - if(find_part && find_part != "None" && find_part_list) - var/datum/sprite_accessory/accessory = find_part_list[find_part] - if(accessory) - if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future - var/mutant_string = accessory.mutant_part_string - var/primary_feature = "[mutant_string]_primary" - var/secondary_feature = "[mutant_string]_secondary" - var/tertiary_feature = "[mutant_string]_tertiary" - if(!features[primary_feature]) - features[primary_feature] = features["mcolor"] - if(!features[secondary_feature]) - features[secondary_feature] = features["mcolor2"] - if(!features[tertiary_feature]) - features[tertiary_feature] = features["mcolor3"] + dat += "[TextPreview(html_encode(features["naked_flavor_text"]))]...
" + //SPLURT edit end + dat += "
Silicon Flavor Text
" + dat += "Set Silicon Examine Text" + if(length(features["silicon_flavor_text"]) <= MAX_FLAVOR_PREVIEW_LEN) + if(!length(features["silicon_flavor_text"])) + dat += "\[...\]
" + else + dat += "[features["silicon_flavor_text"]]
" + else + dat += "[TextPreview(features["silicon_flavor_text"])]...
" + dat += "
OOC notes
" + dat += "Set OOC notes" + var/ooc_notes_len = length(features["ooc_notes"]) + if(ooc_notes_len <= MAX_FLAVOR_PREVIEW_LEN) + if(!ooc_notes_len) + dat += "\[...\]
" + else + dat += "[features["ooc_notes"]]
" + else + dat += "[TextPreview(features["ooc_notes"])]...
" + //SPLURT EDIT + dat += "
Headshot Image
" + dat += "Set Headshot Image" + if(features["headshot_link"]) + dat += "
" + //SPLURT EDIT END + //SKYRAT EDIT + dat += "
Consent preferences
" + dat += "ERP : [erppref]" + dat += "Non-Con : [nonconpref]
" + dat += "Vore : [vorepref]
" + //END OF SKYRAT EDIT - var/matrixed_sections = accessory.matrixed_sections - if(accessory.color_src == MATRIXED && !matrixed_sections) - message_admins("Sprite Accessory Failure (customization): Accessory [accessory.type] is a matrixed item without any matrixed sections set!") - continue - else if(accessory.color_src == MATRIXED) - switch(matrixed_sections) - if(MATRIX_GREEN) //only composed of a green section - primary_feature = secondary_feature //swap primary for secondary, so it properly assigns the second colour, reserved for the green section - if(MATRIX_BLUE) - primary_feature = tertiary_feature //same as above, but the tertiary feature is for the blue section - if(MATRIX_RED_BLUE) //composed of a red and blue section - secondary_feature = tertiary_feature //swap secondary for tertiary, as blue should always be tertiary - if(MATRIX_GREEN_BLUE) //composed of a green and blue section - primary_feature = secondary_feature //swap primary for secondary, as first option is green, which is linked to the secondary - secondary_feature = tertiary_feature //swap secondary for tertiary, as second option is blue, which is linked to the tertiary - dat += "Primary Color
" - dat += "#[features[primary_feature]] Change
" - if((accessory.color_src == MATRIXED && (matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)) || (accessory.extra && (accessory.extra_color_src == MUTCOLORS || accessory.extra_color_src == MUTCOLORS2 || accessory.extra_color_src == MUTCOLORS3))) - dat += "Secondary Color
" - dat += "#[features[secondary_feature]] Change
" - if((accessory.color_src == MATRIXED && matrixed_sections == MATRIX_ALL) || (accessory.extra2 && (accessory.extra2_color_src == MUTCOLORS || accessory.extra2_color_src == MUTCOLORS2 || accessory.extra2_color_src == MUTCOLORS3))) - dat += "Tertiary Color
" - dat += "#[features[tertiary_feature]] Change
" + dat += APPEARANCE_CATEGORY_COLUMN //body moves right sandstorm change - mutant_category++ - if(mutant_category >= MAX_MUTANT_ROWS) + dat += "
Body
" + dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]" + if(gender != NEUTER && pref_species.sexes) + dat += "Body Model:[features["body_model"] == MALE ? "Masculine" : "Feminine"]
" + dat += "Limb Modification:
" + dat += "Modify Limbs
" + for(var/modification in modified_limbs) + if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC) + dat += "[modification]: [modified_limbs[modification][2]]
" + else + dat += "[modification]: [modified_limbs[modification][1]]
" + dat += "
" + dat += "Species:[pref_species.name]
" + dat += "Custom Species Name:[custom_species ? custom_species : "None"]
" + dat += "Random Body:Randomize!
" + dat += "Always Random Body:[be_random_body ? "Yes" : "No"]
" + dat += "
Cycle background:[bgstate]
" + + dat += "" //body moves right sandstorm change + + var/use_skintones = pref_species.use_skintones + if(use_skintones) + dat += APPEARANCE_CATEGORY_COLUMN + + dat += "
Skin Tone
" + + dat += "[use_custom_skin_tone ? "custom: [skin_tone]" : skin_tone]" + + var/mutant_colors + if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits)) + if(!use_skintones) + dat += APPEARANCE_CATEGORY_COLUMN + + dat += "
Body Colors
" + + dat += "Primary Color:" + dat += "#[features["mcolor"]] Change
" + + dat += "Secondary Color:
" + dat += "#[features["mcolor2"]] Change
" + + dat += "Tertiary Color:
" + dat += "#[features["mcolor3"]] Change
" + mutant_colors = TRUE + + dat += "Sprite Size: [features["body_size"]*100]%
" + + if(!(NOEYES in pref_species.species_traits)) + dat += "
Eye Type
" + dat += "[eye_type]" + if((EYECOLOR in pref_species.species_traits)) + if(!use_skintones && !mutant_colors) + dat += APPEARANCE_CATEGORY_COLUMN + if(left_eye_color != right_eye_color) + split_eye_colors = TRUE + dat += "
Heterochromia
" + dat += "[split_eye_colors ? "Enabled" : "Disabled"]" + if(!split_eye_colors) + dat += "Eye Color
" + dat += "#[left_eye_color] Change" + else + dat += "Left Eye Color
" + dat += "#[left_eye_color] Change" + dat += "Right Eye Color
" + dat += "#[right_eye_color] Change" + + if(HAIR in pref_species.species_traits) + + dat += APPEARANCE_CATEGORY_COLUMN + + dat += "
Hair Style
" + + dat += "[hair_style]" + dat += "< >" + dat += "#[hair_color] Change
" + + dat += "
Facial Hair Style
" + + dat += "[facial_hair_style]" + dat += "< >" + dat += "#[facial_hair_color] Change
" + + dat += "
Hair Gradient
" + + dat += "[grad_style]" + dat += "< >" + dat += "#[grad_color] Change
" + + dat += "" + + //Mutant stuff + var/mutant_category = 0 + + for(var/mutant_part in GLOB.all_mutant_parts) + if(mutant_part == "mam_body_markings") + continue + if(parent.can_have_part(mutant_part)) + if(!mutant_category) + dat += APPEARANCE_CATEGORY_COLUMN + dat += "
[GLOB.all_mutant_parts[mutant_part]]
" + dat += "[features[mutant_part]]" + var/color_type = GLOB.colored_mutant_parts[mutant_part] //if it can be coloured, show the appropriate button + if(color_type) + dat += "#[features[color_type]] Change" + else + if(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) //advanced individual part colouring system + //is it matrixed or does it have extra parts to be coloured? + var/find_part = features[mutant_part] || pref_species.mutant_bodyparts[mutant_part] + var/find_part_list = GLOB.mutant_reference_list[mutant_part] + if(find_part && find_part != "None" && find_part_list) + var/datum/sprite_accessory/accessory = find_part_list[find_part] + if(accessory) + if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future + var/mutant_string = accessory.mutant_part_string + var/primary_feature = "[mutant_string]_primary" + var/secondary_feature = "[mutant_string]_secondary" + var/tertiary_feature = "[mutant_string]_tertiary" + if(!features[primary_feature]) + features[primary_feature] = features["mcolor"] + if(!features[secondary_feature]) + features[secondary_feature] = features["mcolor2"] + if(!features[tertiary_feature]) + features[tertiary_feature] = features["mcolor3"] + + var/matrixed_sections = accessory.matrixed_sections + if(accessory.color_src == MATRIXED && !matrixed_sections) + message_admins("Sprite Accessory Failure (customization): Accessory [accessory.type] is a matrixed item without any matrixed sections set!") + continue + else if(accessory.color_src == MATRIXED) + switch(matrixed_sections) + if(MATRIX_GREEN) //only composed of a green section + primary_feature = secondary_feature //swap primary for secondary, so it properly assigns the second colour, reserved for the green section + if(MATRIX_BLUE) + primary_feature = tertiary_feature //same as above, but the tertiary feature is for the blue section + if(MATRIX_RED_BLUE) //composed of a red and blue section + secondary_feature = tertiary_feature //swap secondary for tertiary, as blue should always be tertiary + if(MATRIX_GREEN_BLUE) //composed of a green and blue section + primary_feature = secondary_feature //swap primary for secondary, as first option is green, which is linked to the secondary + secondary_feature = tertiary_feature //swap secondary for tertiary, as second option is blue, which is linked to the tertiary + dat += "Primary Color
" + dat += "#[features[primary_feature]] Change
" + if((accessory.color_src == MATRIXED && (matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)) || (accessory.extra && (accessory.extra_color_src == MUTCOLORS || accessory.extra_color_src == MUTCOLORS2 || accessory.extra_color_src == MUTCOLORS3))) + dat += "Secondary Color
" + dat += "#[features[secondary_feature]] Change
" + if((accessory.color_src == MATRIXED && matrixed_sections == MATRIX_ALL) || (accessory.extra2 && (accessory.extra2_color_src == MUTCOLORS || accessory.extra2_color_src == MUTCOLORS2 || accessory.extra2_color_src == MUTCOLORS3))) + dat += "Tertiary Color
" + dat += "#[features[tertiary_feature]] Change
" + + mutant_category++ + if(mutant_category >= MAX_MUTANT_ROWS) + dat += "" + mutant_category = 0 + + if(length(pref_species.allowed_limb_ids)) + if(!chosen_limb_id || !(chosen_limb_id in pref_species.allowed_limb_ids)) + chosen_limb_id = pref_species.limbs_id || pref_species.id + if(!mutant_category) + dat += APPEARANCE_CATEGORY_COLUMN + dat += "
Body sprite
" + dat += "[chosen_limb_id]" + + if(mutant_category) dat += "" mutant_category = 0 - if(length(pref_species.allowed_limb_ids)) - if(!chosen_limb_id || !(chosen_limb_id in pref_species.allowed_limb_ids)) - chosen_limb_id = pref_species.limbs_id || pref_species.id - dat += "Body sprite
" - dat += "[chosen_limb_id]" - - if(mutant_category) - dat += "" - mutant_category = 0 - - dat += ""
- dat += "Clothing & Equipment" - /* skyrat change - dat += "Underwear:[underwear]" - if(GLOB.underwear_list[underwear]?.has_color) - dat += "Underwear Color: #[undie_color] Change" - dat += "Undershirt:[undershirt]" - if(GLOB.undershirt_list[undershirt]?.has_color) - dat += "Undershirt Color: #[shirt_color] Change " - dat += "Socks:[socks]" - if(GLOB.socks_list[socks]?.has_color) - dat += "Socks Color: #[socks_color] Change " - */ - dat += "Backpack:[backbag]" - dat += "Jumpsuit: [jumpsuit_style] " - if((HAS_FLESH in pref_species.species_traits) || (HAS_BONE in pref_species.species_traits)) - dat += " Temporal Scarring: [(persistent_scars) ? "Enabled" : "Disabled"]" - dat += "Clear scar slots " - dat += "Uplink Location:[uplink_spawn_loc]" - dat += " | "
-
- dat += ""
- dat += "Lewd preferences" - dat += "Lust tolerance:[lust_tolerance]" - dat += "Sexual potency:[sexual_potency]" - dat += " | "
-
- //SPLURT EDIT BEGIN - gregnancy preferences
- dat += ""
- dat += "Pregnancy preferences" - dat += "Chance of impregnation:[virility ? virility : "Disabled"]" - dat += "Chance of getting pregnant:[fertility ? fertility : "Disabled"]" - dat += "Lay inert eggs:[features["inert_eggs"] == TRUE ? "Enabled" : "Disabled"]" - if(fertility) - dat += "Pregnancy inflation:[pregnancy_inflation ? "Enabled" : "Disabled"]" - dat += "Pregnancy breast growth:[pregnancy_breast_growth ? "Enabled" : "Disabled"]" - if(fertility || features["inert_eggs"]) - dat += "Egg shell:[egg_shell]" - dat += " | "
- //SPLURT EDIT END
- dat += APPEARANCE_CATEGORY_COLUMN
- if(NOGENITALS in pref_species.species_traits)
- dat += "Your species ([pref_species.name]) does not support genitals!
"
+ dat += "Clothing & Equipment" + /* skyrat change + dat += "Underwear:[underwear]" + if(GLOB.underwear_list[underwear]?.has_color) + dat += "Underwear Color: #[undie_color] Change" + dat += "Undershirt:[undershirt]" + if(GLOB.undershirt_list[undershirt]?.has_color) + dat += "Undershirt Color: #[shirt_color] Change " + dat += "Socks:[socks]" + if(GLOB.socks_list[socks]?.has_color) + dat += "Socks Color: #[socks_color] Change " + */ + dat += "Backpack:[backbag]" + dat += "Jumpsuit: [jumpsuit_style] " + if((HAS_FLESH in pref_species.species_traits) || (HAS_BONE in pref_species.species_traits)) + dat += " Temporal Scarring: [(persistent_scars) ? "Enabled" : "Disabled"]" + dat += "Clear scar slots " + dat += "Uplink Location:[uplink_spawn_loc]" + dat += " | "
- if(SPEECH_TAB)
- if(path)
- var/savefile/S = new /savefile(path)
- if(S)
- dat += ""
+ dat += "Lewd preferences" + dat += "Lust tolerance:[lust_tolerance]" + dat += "Sexual potency:[sexual_potency]" + dat += " | "
- dat += "||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
"
- dat += "Speech preferences" - dat += "Custom Speech Verb:" - dat += "[custom_speech_verb] " - dat += "Custom Tongue: " - dat += "[custom_tongue] " - //SANDSTORM EDIT - additional language + runechat color - dat += "Additional Language " - var/list/languages_sorted = sortList(language) - dat += "[language.len ? languages_sorted.Join(", ") : "None"] " - dat += "Custom runechat color: [enable_personal_chat_color ? "Enabled" : "Disabled"] [enable_personal_chat_color ? "[personal_chat_color] Change" : ""] " - dat += " | "
- //END OF SANDSTORM EDIT
- dat += ""
- dat += "Vocal Bark preferences" - var/datum/bark/B = GLOB.bark_list[bark_id] - dat += "Vocal Bark Sound:" - dat += "[B ? initial(B.name) : "INVALID"] " - dat += "Vocal Bark Speed: [bark_speed] " - dat += "Vocal Bark Pitch: [bark_pitch] " - dat += "Vocal Bark Variance: [bark_variance] " - dat += " Preview Bark " - dat += " | "
- dat += "
"
- dat += "General Settings" - dat += "UI Style: [UI_style]" - dat += "Outline: [outline_enabled ? "Enabled" : "Disabled"] " - dat += "Outline Color: [outline_color ? "" : "Theme-based (null)"][outline_color] Change " - dat += "Screentip: [screentip_pref ? "Enabled" : "Disabled"] " - dat += "Screentip Color: [screentip_color] Change " - dat += "tgui Monitors: [(tgui_lock) ? "Primary" : "All"] " - dat += "tgui Style: [(tgui_fancy) ? "Fancy" : "No Frills"] " - dat += "Input Framework: [(tgui_input_mode) ? "tgui" : "BYOND"] " - dat += "tgui Button Size: [(tgui_large_buttons) ? "Large" : "Small"] " - dat += "tgui Buttons Swapped: [(tgui_swapped_buttons) ? "Yes" : "No"] " - dat += "Show Runechat Chat Bubbles: [chat_on_map ? "Enabled" : "Disabled"] " - dat += "Runechat message char limit: [max_chat_length] " - dat += "See Runechat for non-mobs: [see_chat_non_mob ? "Enabled" : "Disabled"] " - //SKYRAT CHANGES BEGIN - dat += "See Runechat for emotes: [see_chat_emotes ? "Enabled" : "Disabled"] " - //SKYRAT CHANGES END - dat += " " - dat += "Action Buttons: [(buttons_locked) ? "Locked In Place" : "Unlocked"] " - dat += " " - dat += "PDA Color: [pda_color] Change " - dat += "PDA Style: [pda_style] " - dat += "PDA Reskin: [pda_skin] " - dat += " " - dat += "Ghost Ears: [(chat_toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"] " - dat += "Ghost Radio: [(chat_toggles & CHAT_GHOSTRADIO) ? "All Messages":"No Messages"] " - dat += "Ghost Sight: [(chat_toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"] " - dat += "Ghost Whispers: [(chat_toggles & CHAT_GHOSTWHISPER) ? "All Speech" : "Nearest Creatures"] " - dat += "Ghost PDA: [(chat_toggles & CHAT_GHOSTPDA) ? "All Messages" : "Nearest Creatures"] " - dat += "Window Flashing: [(windowflashing) ? "Enabled":"Disabled"] " - dat += " " - dat += "Play Admin MIDIs: [(toggles & SOUND_MIDI) ? "Enabled":"Disabled"] " - dat += "Play Lobby Music: [(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"] " - dat += "See Pull Requests: [(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"] " - dat += " " - if(user.client) - if(unlock_content) - dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"] " - if(unlock_content || check_rights_for(user.client, R_ADMIN)) - dat += "OOC Color: [ooccolor ? ooccolor : GLOB.normal_ooc_colour] Change " - dat += "Antag OOC Color: [aooccolor ? aooccolor : GLOB.normal_aooc_colour] Change " - - dat += " | "
-
- dat += ""
-
- dat += "Special Role Settings" - - if(jobban_isbanned(user, ROLE_SYNDICATE)) - dat += "You are banned from antagonist roles." - src.be_special = list() - - dat += "DISABLE ALL ANTAGONISM [(toggles & NO_ANTAG) ? "YES" : "NO"]" - - for (var/i in GLOB.special_roles) - if(jobban_isbanned(user, i)) - dat += "Be [capitalize(i)]: BANNED " - else - var/days_remaining = null - if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age - var/mode_path = GLOB.special_roles[i] - var/datum/game_mode/temp_mode = new mode_path - days_remaining = temp_mode.get_remaining_days(user.client) - - if(days_remaining) - dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS] " + //SPLURT EDIT BEGIN - gregnancy preferences + dat += " | "
+ dat += "Pregnancy preferences" + dat += "Chance of impregnation:[virility ? virility : "Disabled"]" + dat += "Chance of getting pregnant:[fertility ? fertility : "Disabled"]" + dat += "Lay inert eggs:[features["inert_eggs"] == TRUE ? "Enabled" : "Disabled"]" + if(fertility) + dat += "Pregnancy inflation:[pregnancy_inflation ? "Enabled" : "Disabled"]" + dat += "Pregnancy breast growth:[pregnancy_breast_growth ? "Enabled" : "Disabled"]" + if(fertility || features["inert_eggs"]) + dat += "Egg shell:[egg_shell]" + dat += " | "
+ //SPLURT EDIT END
+ dat += APPEARANCE_CATEGORY_COLUMN
+ if(NOGENITALS in pref_species.species_traits)
+ dat += "Your species ([pref_species.name]) does not support genitals!"
-
- if(user.client.holder) // sandstorm start - moves admin prefs to the right
- dat += "Admin Settings" - dat += "Adminhelp Sounds: [(toggles & SOUND_ADMINHELP)?"Enabled":"Disabled"]" - dat += "Announce Login: [(toggles & ANNOUNCE_LOGIN)?"Enabled":"Disabled"] " - dat += " " - dat += "Combo HUD Lighting: [(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"] " - dat += "Use Modern Player Panel: [use_new_playerpanel ? "Yes" : "No"] " // sandstorm end - moves admins prefs to the right - - //deadmin - dat += " Deadmin While Playing" - if(CONFIG_GET(flag/auto_deadmin_players)) - dat += "Always Deadmin: FORCED" - else - dat += "Always Deadmin: [(deadmin & DEADMIN_ALWAYS)?"Enabled":"Disabled"] " - if(!(deadmin & DEADMIN_ALWAYS)) - dat += " " - if(!CONFIG_GET(flag/auto_deadmin_antagonists)) - dat += "As Antag: [(deadmin & DEADMIN_ANTAGONIST)?"Deadmin":"Keep Admin"] " - else - dat += "As Antag: FORCED " - - if(!CONFIG_GET(flag/auto_deadmin_heads)) - dat += "As Command: [(deadmin & DEADMIN_POSITION_HEAD)?"Deadmin":"Keep Admin"] " - else - dat += "As Command: FORCED " - - if(!CONFIG_GET(flag/auto_deadmin_security)) - dat += "As Security: [(deadmin & DEADMIN_POSITION_SECURITY)?"Deadmin":"Keep Admin"] " - else - dat += "As Security: FORCED " - - if(!CONFIG_GET(flag/auto_deadmin_silicons)) - dat += "As Silicon: [(deadmin & DEADMIN_POSITION_SILICON)?"Deadmin":"Keep Admin"] " - else - dat += "As Silicon: FORCED " - - dat += " Citadel Preferences" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe. - dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]" - dat += "Long strip menu: [long_strip_menu ? "Enabled" : "Disabled"] " - dat += "Auto stand: [autostand ? "Enabled" : "Disabled"] " - dat += "Auto OOC: [auto_ooc ? "Enabled" : "Disabled"] " - dat += "Force Slot Storage HUD: [no_tetris_storage ? "Enabled" : "Disabled"] " - dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")] " - if (user && user.client && !user.client.prefs.screenshake==0) - dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")] " - dat += "Recoil Screen Push: [(recoil_screenshake==100) ? "Full" : ((recoil_screenshake==0) ? "None" : "[screenshake]")] " - var/p_chaos - if (!preferred_chaos) - p_chaos = "No preference" - else - p_chaos = preferred_chaos - dat += "Preferred Chaos Amount: [p_chaos] " - - dat += " S.P.L.U.R.T. Preferences" - dat += "Be Antagonist Victim: [be_victim ? be_victim : BEVICTIM_ASK]" - dat += "Disable combat mode cursor: [disable_combat_cursor?"Yes":"No"] " - dat += "Splashscreen Player Panel Style: [(toggles & TG_PLAYER_PANEL)?"TG":"Old"] " - dat += " " - - dat += " | "
- dat += "
" - dat += "Ghost Orbit: [ghost_orbit]
" - var/button_name = "If you see this something went wrong." - switch(ghost_accs) - if(GHOST_ACCS_FULL) - button_name = GHOST_ACCS_FULL_NAME - if(GHOST_ACCS_DIR) - button_name = GHOST_ACCS_DIR_NAME - if(GHOST_ACCS_NONE) - button_name = GHOST_ACCS_NONE_NAME - - dat += "Ghost Accessories: [button_name]
" - switch(ghost_others) - if(GHOST_OTHERS_THEIR_SETTING) - button_name = GHOST_OTHERS_THEIR_SETTING_NAME - if(GHOST_OTHERS_DEFAULT_SPRITE) - button_name = GHOST_OTHERS_DEFAULT_SPRITE_NAME - if(GHOST_OTHERS_SIMPLE) - button_name = GHOST_OTHERS_SIMPLE_NAME - - dat += "Ghosts of Others: [button_name]
" - dat += "
" - - dat += "FPS: [clientfps]
" - - dat += "Income Updates: [(chat_toggles & CHAT_BANKCARD) ? "Allowed" : "Muted"]
" - dat += "
" - - dat += "Parallax (Fancy Space): " - switch (parallax) - if (PARALLAX_LOW) - dat += "Low" - if (PARALLAX_MED) - dat += "Medium" - if (PARALLAX_INSANE) - dat += "Insane" - if (PARALLAX_DISABLE) - dat += "Disabled" - else - dat += "High" - dat += "
" - dat += "Ambient Occlusion: [ambientocclusion ? "Enabled" : "Disabled"]
" - dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"]
" - dat += "HUD Button Flashes: [hud_toggle_flash ? "Enabled" : "Disabled"]
" - dat += "HUD Button Flash Color: [hud_toggle_color] Change
" - -/* CITADEL EDIT - We're using top menu instead - button_name = pixel_size - dat += "Pixel Scaling: [(button_name) ? "Pixel Perfect [button_name]x" : "Stretch to fit"]
" - - switch(scaling_method) - if(SCALING_METHOD_NORMAL) - button_name = "Nearest Neighbor" - if(SCALING_METHOD_DISTORT) - button_name = "Point Sampling" - if(SCALING_METHOD_BLUR) - button_name = "Bilinear" - dat += "Scaling Method: [button_name]
" -*/ - - if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation)) - var/p_map = preferred_map - if (!p_map) - p_map = "Default" - if (config.defaultmap) - p_map += " ([config.defaultmap.map_name])" - else - if (p_map in config.maplist) - var/datum/map_config/VM = config.maplist[p_map] - if (!VM) - p_map += " (No longer exists)" - else - p_map = VM.map_name - else - p_map += " (No longer exists)" - if(CONFIG_GET(flag/allow_map_voting)) - dat += "Preferred Map: [p_map]
" - - dat += "" - - if(LOADOUT_TAB) - //calculate your gear points from the chosen item - gear_points = CONFIG_GET(number/initial_gear_points) - var/list/chosen_gear = loadout_data["SAVE_[loadout_slot]"] - if(chosen_gear) - for(var/loadout_item in chosen_gear) - var/loadout_item_path = loadout_item[LOADOUT_ITEM] - if(loadout_item_path) - var/datum/gear/loadout_gear = text2path(loadout_item_path) - if(loadout_gear) - gear_points -= initial(loadout_gear.cost) - else - chosen_gear = list() - - dat += "
| Name | " - dat += "Cost | " - dat += "Restrictions | " - dat += "Description |
| [name][extra_loadout_data] | " - dat += "[gear.cost] | "
- if(islist(gear.restricted_roles))
- if(gear.restricted_roles.len)
- if(gear.restricted_desc)
- dat += ""
- dat += gear.restricted_desc
- dat += ""
+ dat += "Penis Color: " + dat += "#[features["cock_color"]] Change " + var/tauric_shape = FALSE + if(features["cock_taur"]) + var/datum/sprite_accessory/penis/P = GLOB.cock_shapes_list[features["cock_shape"]] + if(P.taur_icon && parent.can_have_part("taur")) + var/datum/sprite_accessory/taur/T = GLOB.taur_list[features["taur"]] + if(T.taur_mode & P.accepted_taurs) + tauric_shape = TRUE + dat += "Penis Shape: [features["cock_shape"]][tauric_shape ? " (Taur)" : ""]" + dat += "Penis Length: [features["cock_length"]] inch(es)" + dat += "Diameter Ratio: [features["cock_diameter_ratio"]]" //SPLURT Edit + dat += "Penis Visibility:[features["cock_visibility"]]" + dat += "Egg Stuffing:[features["cock_stuffing"] == TRUE ? "Yes" : "No"]" //SPLURT Edit + dat += "Has Testicles:[features["has_balls"] == TRUE ? "Yes" : "No"]" + if(features["has_balls"]) + if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) + dat += "Testicles Color: " + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding) " else - dat += "" - dat += gear.restricted_roles.Join(";") - dat += "" - if(!istype(gear, /datum/gear/unlockable)) - // the below line essentially means "if the loadout item is picked by the user and has a custom description, give it the custom description, otherwise give it the default description" - dat += " | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] Progress: [min(progress_made, unlockable.progress_required)]/[unlockable.progress_required] | " + dat += "Testicles Color:
[GLOB.all_mutant_parts[marking_type]]
" // give it the appropriate title for the type of marking + dat += "Add marking" + dat += ""
+ dat += "
"
+ dat += " | "
+ iterated_markings = 0
+ dat += "
| " + dat += " | " + dat += " | " + dat += " | " + dat += " | " + dat += " | " + dat += "" + + // list out the current markings you have + if(length(features[marking_type])) + var/list/markings = features[marking_type] + if(!islist(markings)) + // something went terribly wrong + markings = list() + + for(var/list/marking_list in markings) + var/marking_index = markings.Find(marking_list) // consider changing loop to go through indexes over lists instead of using Find here + var/limb_value = marking_list[1] + var/actual_name = GLOB.bodypart_names[num2text(limb_value)] // get the actual name from the bitflag representing the part the marking is applied to + if(actual_name != limb) + continue + var/color_marking_dat = "" + var/number_colors = 1 + var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]] + var/matrixed_sections = S.covered_limbs[actual_name] + if(S && matrixed_sections) + // if it has nothing initialize it to white + if(length(marking_list) == 2) + var/first = "#FFFFFF" + var/second = "#FFFFFF" + var/third = "#FFFFFF" + if(features["mcolor"]) + first = "#[features["mcolor"]]" + if(features["mcolor2"]) + second = "#[features["mcolor2"]]" + if(features["mcolor3"]) + third = "#[features["mcolor3"]]" + marking_list += list(list(first, second, third)) // just assume its 3 colours if it isnt it doesnt matter we just wont use the other values + // index magic + var/primary_index = 1 + var/secondary_index = 2 + var/tertiary_index = 3 + switch(matrixed_sections) + if(MATRIX_GREEN) + primary_index = 2 + if(MATRIX_BLUE) + primary_index = 3 + if(MATRIX_RED_BLUE) + secondary_index = 2 + if(MATRIX_GREEN_BLUE) + primary_index = 2 + secondary_index = 3 + + // we know it has one matrixed section at minimum + color_marking_dat += "[marking_list[3][primary_index]]" + // if it has a second section, add it + if(matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL) + number_colors = 2 + color_marking_dat += "[marking_list[3][secondary_index]]" + // if it has a third section, add it + if(matrixed_sections == MATRIX_ALL) + number_colors = 3 + color_marking_dat += "[marking_list[3][tertiary_index]]" + dat += " |
| [marking_index] | " + dat += "˅ | " + dat += "˄ | " + dat += "[marking_list[2]] | " + dat += "[color_marking_dat] | " + dat += "X | " + dat += "
| " + dat += " | " + dat += " | " + dat += " | " + dat += " | " + dat += " | " + dat += " |
"
+ dat += "Speech preferences" + dat += "Custom Speech Verb:" + dat += "[custom_speech_verb] " + dat += "Custom Tongue: " + dat += "[custom_tongue] " + //SANDSTORM EDIT - additional language + runechat color + dat += "Additional Language " + var/list/languages_sorted = sortList(language) + dat += "[language.len ? languages_sorted.Join(", ") : "None"] " + dat += "Custom runechat color: [enable_personal_chat_color ? "Enabled" : "Disabled"] [enable_personal_chat_color ? "[personal_chat_color] Change" : ""] " + dat += " | "
+ //END OF SANDSTORM EDIT
+ dat += ""
+ dat += "Vocal Bark preferences" + var/datum/bark/B = GLOB.bark_list[bark_id] + dat += "Vocal Bark Sound:" + dat += "[B ? initial(B.name) : "INVALID"] " + dat += "Vocal Bark Speed: [bark_speed] " + dat += "Vocal Bark Pitch: [bark_pitch] " + dat += "Vocal Bark Variance: [bark_variance] " + dat += " Preview Bark " + dat += " | "
+ dat += "
"
+ dat += "Records" + dat += "Security Records " + if(length_char(security_records) <= 40) + if(!length(security_records)) + dat += "\[...\]" + else + dat += "[security_records]" + else + dat += "[TextPreview(security_records)]... " + + dat += " Medical Records " + if(length_char(medical_records) <= 40) + if(!length(medical_records)) + dat += "\[...\] " + else + dat += "[medical_records]" + else + dat += "[TextPreview(medical_records)]... " + dat += " |
| Name | " + dat += "Cost | " + dat += "Restrictions | " + dat += "Description |
| [name][extra_loadout_data] | " + dat += "[gear.cost] | " + if(islist(gear.restricted_roles)) + if(gear.restricted_roles.len) + if(gear.restricted_desc) + dat += "" + dat += gear.restricted_desc + dat += "" + else + dat += "" + dat += gear.restricted_roles.Join(";") + dat += "" + if(!istype(gear, /datum/gear/unlockable)) + // the below line essentially means "if the loadout item is picked by the user and has a custom description, give it the custom description, otherwise give it the default description" + dat += " | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] Progress: [min(progress_made, unlockable.progress_required)]/[unlockable.progress_required] | " + dat += "
"
- dat += "Fetish content prefs" - dat += "Allow Lewd Verbs: [(toggles & VERB_CONSENT) ? "Yes":"No"]" // Skyrat - ERP Mechanic Addition - dat += "Mute Lewd Verb Sounds: [(toggles & LEWD_VERB_SOUNDS) ? "Yes":"No"] " // Skyrat - ERP Mechanic Addition - dat += "Arousal:[arousable == TRUE ? "Enabled" : "Disabled"] " - dat += "Genital examine text:[(cit_toggles & GENITAL_EXAMINE) ? "Enabled" : "Disabled"] " - dat += "Vore examine text:[(cit_toggles & VORE_EXAMINE) ? "Enabled" : "Disabled"] " - dat += "Voracious MediHound sleepers: [(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"] " - dat += "Hear Vore Sounds: [(cit_toggles & EATING_NOISES) ? "Yes" : "No"] " - dat += "Hear Vore Digestion Sounds: [(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"] " - dat += "Allow trash forcefeeding (requires Trashcan quirk) [(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"] " - dat += "Forced Feminization: [(cit_toggles & FORCED_FEM) ? "Allowed" : "Disallowed"] " - dat += "Forced Masculinization: [(cit_toggles & FORCED_MASC) ? "Allowed" : "Disallowed"] " - dat += "Lewd Hypno: [(cit_toggles & HYPNO) ? "Allowed" : "Disallowed"] " - dat += "Bimbofication: [(cit_toggles & BIMBOFICATION) ? "Allowed" : "Disallowed"] " - dat += " | "
- dat +=""
- dat += "Other content prefs" - dat += "Breast Enlargement: [(cit_toggles & BREAST_ENLARGEMENT) ? "Allowed" : "Disallowed"]" - dat += "Penis Enlargement: [(cit_toggles & PENIS_ENLARGEMENT) ? "Allowed" : "Disallowed"] " - dat += "Butt Enlargement: [(cit_toggles & BUTT_ENLARGEMENT) ? "Allowed" : "Disallowed"] " - dat += "Belly Inflation: [(cit_toggles & BELLY_INFLATION) ? "Allowed" : "Disallowed"] " - dat += "Hypno: [(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"] " - dat += "Aphrodisiacs: [(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"] " - dat += "Ass Slapping: [(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"] " - //SPLURT EDIT - dat += "? " - dat += "Unholy ERP verbs : [unholypref] " //https://www.youtube.com/watch?v=OHKARc-GObU - //END OF SPLURT EDIT - //SKYRAT EDIT - dat += "? " - dat += "Extreme ERP verbs : [extremepref] " // https://youtu.be/0YrU9ASVw6w - if(extremepref != "No") - dat += "? " - dat += "Harmful ERP verbs : [extremeharm] " - //END OF SKYRAT EDIT - dat += "Automatic Wagging: [(cit_toggles & NO_AUTO_WAG) ? "Disabled" : "Enabled"] " - dat += "? " - dat += "Genital Fluid Blacklist " - if(gfluid_blacklist?.len) - dat += "? " - dat += "Genital Fluid Un-Blacklist " - dat += " |
" + if(PREFERENCES_TAB) // Game Preferences + dat += "
" + + switch(preferences_tab) + if(GAME_PREFS_TAB) + dat += "
"
+ dat += "General Settings" + dat += "UI Style: [UI_style]" + dat += "Outline: [outline_enabled ? "Enabled" : "Disabled"] " + dat += "Outline Color: [outline_color ? "" : "Theme-based (null)"][outline_color] Change " + dat += "Screentip: [screentip_pref] " + dat += "Screentip Color: [screentip_color] Change " + dat += "\ + Screentip context with images: [screentip_allow_images ? "Allowed" : "Disallowed"] " + dat += "tgui Monitors: [(tgui_lock) ? "Primary" : "All"] " + dat += "tgui Style: [(tgui_fancy) ? "Fancy" : "No Frills"] " + dat += "Show Runechat Chat Bubbles: [chat_on_map ? "Enabled" : "Disabled"] " + dat += "Runechat message char limit: [max_chat_length] " + dat += "See Runechat for non-mobs: [see_chat_non_mob ? "Enabled" : "Disabled"] " + //SKYRAT CHANGES BEGIN + dat += "See Runechat for emotes: [see_chat_emotes ? "Enabled" : "Disabled"] " + //SKYRAT CHANGES END + dat += " " + dat += "Action Buttons: [(buttons_locked) ? "Locked In Place" : "Unlocked"] " + dat += " " + dat += "PDA Color: [pda_color] Change " + dat += "PDA Style: [pda_style] " + dat += "PDA Reskin: [pda_skin] " + dat += " " + dat += "Ghost Ears: [(chat_toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"] " + dat += "Ghost Radio: [(chat_toggles & CHAT_GHOSTRADIO) ? "All Messages":"No Messages"] " + dat += "Ghost Sight: [(chat_toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"] " + dat += "Ghost Whispers: [(chat_toggles & CHAT_GHOSTWHISPER) ? "All Speech" : "Nearest Creatures"] " + dat += "Ghost PDA: [(chat_toggles & CHAT_GHOSTPDA) ? "All Messages" : "Nearest Creatures"] " + + dat += " | "
+
+ dat += ""
+
+ dat += "Special Role Settings" + + if(jobban_isbanned(user, ROLE_SYNDICATE)) + dat += "You are banned from antagonist roles." + src.be_special = list() + + dat += "DISABLE ALL ANTAGONISM [(toggles & NO_ANTAG) ? "YES" : "NO"]" + + for (var/i in GLOB.special_roles) + if(jobban_isbanned(user, i)) + dat += "Be [capitalize(i)]: BANNED " + else + var/days_remaining = null + if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age + var/mode_path = GLOB.special_roles[i] + var/datum/game_mode/temp_mode = new mode_path + days_remaining = temp_mode.get_remaining_days(user.client) + + if(days_remaining) + dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS\] " + else + var/enabled_text = "" + if(i in be_special) + if(be_special[i] >= 1) + enabled_text = "Enabled" + else + enabled_text = "Low" + else + enabled_text = "Disabled" + dat += "Be [capitalize(i)]: [enabled_text] " + dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"] " + + dat += " |
"
+ dat += "OOC Settings" + dat += "Window Flashing: [(windowflashing) ? "Enabled":"Disabled"]" + dat += " " + dat += "Play Admin MIDIs: [(toggles & SOUND_MIDI) ? "Enabled":"Disabled"] " + dat += "Play Lobby Music: [(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"] " + dat += "See Pull Requests: [(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"] " + dat += " " + if(user.client) + if(unlock_content) + dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"] " + if(unlock_content || check_rights_for(user.client, R_ADMIN)) + dat += "OOC Color: [ooccolor ? ooccolor : GLOB.normal_ooc_colour] Change " + dat += "Antag OOC Color: [aooccolor ? aooccolor : GLOB.normal_aooc_colour] Change " + + if(user.client.holder) + dat += " Admin Settings" + dat += "Adminhelp Sounds: [(toggles & SOUND_ADMINHELP)?"Enabled":"Disabled"]" + dat += "Announce Login: [(toggles & ANNOUNCE_LOGIN)?"Enabled":"Disabled"] " + dat += " " + dat += "Combo HUD Lighting: [(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"] " + dat += "Use Modern Player Panel: [use_new_playerpanel ? "Yes" : "No"] " //SPLURT Edit + + //deadmin + dat += " Deadmin While Playing" + if(CONFIG_GET(flag/auto_deadmin_players)) + dat += "Always Deadmin: FORCED" + else + dat += "Always Deadmin: [(deadmin & DEADMIN_ALWAYS)?"Enabled":"Disabled"] " + if(!(deadmin & DEADMIN_ALWAYS)) + dat += " " + if(!CONFIG_GET(flag/auto_deadmin_antagonists)) + dat += "As Antag: [(deadmin & DEADMIN_ANTAGONIST)?"Deadmin":"Keep Admin"] " + else + dat += "As Antag: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_heads)) + dat += "As Command: [(deadmin & DEADMIN_POSITION_HEAD)?"Deadmin":"Keep Admin"] " + else + dat += "As Command: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_security)) + dat += "As Security: [(deadmin & DEADMIN_POSITION_SECURITY)?"Deadmin":"Keep Admin"] " + else + dat += "As Security: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_silicons)) + dat += "As Silicon: [(deadmin & DEADMIN_POSITION_SILICON)?"Deadmin":"Keep Admin"] " + else + dat += "As Silicon: FORCED " + + dat += " | "
+
+ dat += ""
+
+ dat += "Citadel Preferences" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe. + dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]" + dat += "Long strip menu: [long_strip_menu ? "Enabled" : "Disabled"] " + dat += "Auto stand: [autostand ? "Enabled" : "Disabled"] " + dat += "Auto OOC: [auto_ooc ? "Enabled" : "Disabled"] " + dat += "Force Slot Storage HUD: [no_tetris_storage ? "Enabled" : "Disabled"] " + dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")] " + if (user && user.client && !user.client.prefs.screenshake==0) + dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")] " + dat += "Recoil Screen Push: [(recoil_screenshake==100) ? "Full" : ((recoil_screenshake==0) ? "None" : "[screenshake]")] " + var/p_chaos + if (!preferred_chaos) + p_chaos = "No preference" + else + p_chaos = preferred_chaos + dat += "Preferred Chaos Amount: [p_chaos] " + + //SPLURT Edit + dat += " S.P.L.U.R.T. Preferences" + dat += "Be Antagonist Victim: [be_victim ? be_victim : BEVICTIM_ASK]" + dat += "Disable combat mode cursor: [disable_combat_cursor?"Yes":"No"] " + dat += "Splashscreen Player Panel Style: [(toggles & TG_PLAYER_PANEL)?"TG":"Old"] " + dat += "Character Creation Menu Style: [new_character_creator ? "New" : "Old"] " + //SPLURT Edit end + + dat += " " + + if(unlock_content) + dat += "Ghost Form: [ghost_form] " + dat += "Ghost Orbit: [ghost_orbit] " + var/button_name = "If you see this something went wrong." + switch(ghost_accs) + if(GHOST_ACCS_FULL) + button_name = GHOST_ACCS_FULL_NAME + if(GHOST_ACCS_DIR) + button_name = GHOST_ACCS_DIR_NAME + if(GHOST_ACCS_NONE) + button_name = GHOST_ACCS_NONE_NAME + + dat += "Ghost Accessories: [button_name] " + switch(ghost_others) + if(GHOST_OTHERS_THEIR_SETTING) + button_name = GHOST_OTHERS_THEIR_SETTING_NAME + if(GHOST_OTHERS_DEFAULT_SPRITE) + button_name = GHOST_OTHERS_DEFAULT_SPRITE_NAME + if(GHOST_OTHERS_SIMPLE) + button_name = GHOST_OTHERS_SIMPLE_NAME + + dat += "Ghosts of Others: [button_name] " + dat += " " + + dat += "FPS: [clientfps] " + + dat += "Income Updates: [(chat_toggles & CHAT_BANKCARD) ? "Allowed" : "Muted"] " + dat += " " + + dat += "Parallax (Fancy Space): " + switch (parallax) + if (PARALLAX_LOW) + dat += "Low" + if (PARALLAX_MED) + dat += "Medium" + if (PARALLAX_INSANE) + dat += "Insane" + if (PARALLAX_DISABLE) + dat += "Disabled" + else + dat += "High" + dat += " " + dat += "Ambient Occlusion: [ambientocclusion ? "Enabled" : "Disabled"] " + dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"] " + dat += "HUD Button Flashes: [hud_toggle_flash ? "Enabled" : "Disabled"] " + dat += "HUD Button Flash Color: [hud_toggle_color] Change " + + + if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation)) + var/p_map = preferred_map + if (!p_map) + p_map = "Default" + if (config.defaultmap) + p_map += " ([config.defaultmap.map_name])" + else + if (p_map in config.maplist) + var/datum/map_config/VM = config.maplist[p_map] + if (!VM) + p_map += " (No longer exists)" + else + p_map = VM.map_name + else + p_map += " (No longer exists)" + if(CONFIG_GET(flag/allow_map_voting)) + dat += "Preferred Map: [p_map] " + + dat += " |
"
+ dat += "Fetish content prefs" + dat += "Allow Lewd Verbs: [(toggles & VERB_CONSENT) ? "Yes":"No"]" // Skyrat - ERP Mechanic Addition + dat += "Mute Lewd Verb Sounds: [(toggles & LEWD_VERB_SOUNDS) ? "Yes":"No"] " // Skyrat - ERP Mechanic Addition + dat += "Arousal:[arousable == TRUE ? "Enabled" : "Disabled"] " + dat += "Genital examine text:[(cit_toggles & GENITAL_EXAMINE) ? "Enabled" : "Disabled"] " + dat += "Vore examine text:[(cit_toggles & VORE_EXAMINE) ? "Enabled" : "Disabled"] " + dat += "Voracious MediHound sleepers: [(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"] " + dat += "Hear Vore Sounds: [(cit_toggles & EATING_NOISES) ? "Yes" : "No"] " + dat += "Hear Vore Digestion Sounds: [(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"] " + dat += "Allow trash forcefeeding (requires Trashcan quirk) [(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"] " + dat += "Forced Feminization: [(cit_toggles & FORCED_FEM) ? "Allowed" : "Disallowed"] " + dat += "Forced Masculinization: [(cit_toggles & FORCED_MASC) ? "Allowed" : "Disallowed"] " + dat += "Lewd Hypno: [(cit_toggles & HYPNO) ? "Allowed" : "Disallowed"] " + dat += "Bimbofication: [(cit_toggles & BIMBOFICATION) ? "Allowed" : "Disallowed"] " + dat += " | "
+ dat +=""
+ dat += "Other content prefs" + dat += "Breast Enlargement: [(cit_toggles & BREAST_ENLARGEMENT) ? "Allowed" : "Disallowed"]" + dat += "Penis Enlargement: [(cit_toggles & PENIS_ENLARGEMENT) ? "Allowed" : "Disallowed"] " + dat += "Butt Enlargement: [(cit_toggles & BUTT_ENLARGEMENT) ? "Allowed" : "Disallowed"] " + dat += "Belly Inflation: [(cit_toggles & BELLY_INFLATION) ? "Allowed" : "Disallowed"] " //SPLURT Edit + dat += "Hypno: [(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"] " + dat += "Aphrodisiacs: [(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"] " + dat += "Ass Slapping: [(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"] " + //SPLURT EDIT + dat += "? " + dat += "Unholy ERP verbs : [unholypref] " //https://www.youtube.com/watch?v=OHKARc-GObU + //END OF SPLURT EDIT + //SKYRAT EDIT + dat += "? " //SPLURT Edit (wow! editception???) + dat += "Extreme ERP verbs : [extremepref] " // https://youtu.be/0YrU9ASVw6w + if(extremepref != "No") + dat += "? " //SPLURT Edit + dat += "Harmful ERP verbs : [extremeharm] " + //END OF SKYRAT EDIT + //SPLURT EDIT + dat += "Automatic Wagging: [(cit_toggles & NO_AUTO_WAG) ? "Disabled" : "Enabled"] " + dat += "? " + dat += "Genital Fluid Blacklist " + if(gfluid_blacklist?.len) + dat += "? " + dat += "Genital Fluid Un-Blacklist " + //SPLURT Edit end + dat += " |
" dat += "Keybindings mode controls how the game behaves with tab and map/input focus.
If it is on Hotkeys, the game will always attempt to force you to map focus, meaning keypresses are sent \ @@ -3148,47 +3223,37 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/limb_value = text2num(GLOB.bodypart_values[limb]) features[marking_type] += list(list(limb_value, selected_marking)) - if("marking_color") + if("marking_color_specific") var/index = text2num(href_list["marking_index"]) var/marking_type = href_list["marking_type"] - if(index && marking_type && features[marking_type]) - // work out the input options to show the user - var/list/options = list("Primary") - var/number_colors = text2num(href_list["number_colors"]) - var/color_number = 1 // 1-3 which color are we editing - if(number_colors >= 2) - options += "Secondary" - if(number_colors == 3) - options += "Tertiary" - var/color_option = input(user, "Select the colour you wish to edit") as null|anything in options - if(color_option) - if(color_option == "Secondary") color_number = 2 - if(color_option == "Tertiary") color_number = 3 - // perform some magic on the color number - var/list/marking_list = features[marking_type][index] - var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]] - var/matrixed_sections = S.covered_limbs[GLOB.bodypart_names[num2text(marking_list[1])]] - if(color_number == 1) - switch(matrixed_sections) - if(MATRIX_GREEN) - color_number = 2 - if(MATRIX_BLUE) - color_number = 3 - else if(color_number == 2) - switch(matrixed_sections) - if(MATRIX_RED_BLUE) - color_number = 3 - if(MATRIX_GREEN_BLUE) - color_number = 3 + var/color_number = text2num(href_list["number_color"]) + if(index && marking_type && color_number && features[marking_type]) + // perform some magic on the color number + var/list/marking_list = features[marking_type][index] + var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]] + var/matrixed_sections = S.covered_limbs[GLOB.bodypart_names[num2text(marking_list[1])]] + if(color_number == 1) + switch(matrixed_sections) + if(MATRIX_GREEN) + color_number = 2 + if(MATRIX_BLUE) + color_number = 3 + else if(color_number == 2) + switch(matrixed_sections) + if(MATRIX_RED_BLUE) + color_number = 3 + if(MATRIX_GREEN_BLUE) + color_number = 3 - var/color_list = features[marking_type][index][3] - var/new_marking_color = input(user, "Choose your character's marking color:", "Character Preference","#"+color_list[color_number]) as color|null - if(new_marking_color) - var/temp_hsv = RGBtoHSV(new_marking_color) - if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright, but only if they affect the skin - color_list[color_number] = "#[sanitize_hexcolor(new_marking_color, 6)]" - else - to_chat(user, "Invalid color. Your color is not bright enough.") + var/color_list = features[marking_type][index][3] + var/new_marking_color = input(user, "Choose your character's marking color:", "Character Preference","#"+color_list[color_number]) as color|null + if(new_marking_color) + var/temp_hsv = RGBtoHSV(new_marking_color) + if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright, but only if they affect the skin + color_list[color_number] = "#[sanitize_hexcolor(new_marking_color, 6)]" + else + to_chat(user, "Invalid color. Your color is not bright enough.") + //SPLURT Edit if("gfluid_black") var/list/datum/reagent/fluid_list = GLOB.genital_fluids_list.Copy() var/list/blacklisted = list() @@ -3208,6 +3273,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) LAZYREMOVE(gfluid_blacklist, selected.type) else to_chat(user, span_warning("You do not have blacklisted reagents!")) + //SPLURT Edit end else switch(href_list["preference"]) if("disable_combat_cursor") @@ -3488,11 +3554,20 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(pickedOutlineColor != pickedOutlineColor) outline_color = pickedOutlineColor // nullable if("screentip_pref") - screentip_pref = !screentip_pref + var/choice = tgalert(user, "Choose your screentip preference", "Screentipping?", "Yes", "Context Only", "No") + switch(choice) + if("Yes") + screentip_pref = SCREENTIP_PREFERENCE_ENABLED + if("Context Only") + screentip_pref = SCREENTIP_PREFERENCE_CONTEXT_ONLY + else + screentip_pref = SCREENTIP_PREFERENCE_DISABLED if("screentip_color") var/pickedScreentipColor = input(user, "Choose your screentip color.", "General Preference", screentip_color) as color|null if(pickedScreentipColor) screentip_color = pickedScreentipColor + if("screentip_allow_images") + screentip_allow_images = !screentip_allow_images if("tgui_lock") tgui_lock = !tgui_lock if("winflash") @@ -3732,6 +3807,17 @@ GLOBAL_LIST_EMPTY(preferences_datums) to_chat(usr, span_notice("Keep in mind that the photo will be downsized to 250x250 pixels, so the more square the photo, the better it will look.")) features["headshot_link"] = usr_input + if("character_preview") + preview_pref = href_list["tab"] + + if("character_tab") + if(href_list["tab"]) + character_settings_tab = text2num(href_list["tab"]) + + if("preferences_tab") + if(href_list["tab"]) + preferences_tab = text2num(href_list["tab"]) + if(href_list["preference"] == "gear") if(href_list["clear_loadout"]) loadout_data["SAVE_[loadout_slot]"] = list() diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 4754a87e3c..6bfb3684a9 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -5,7 +5,7 @@ // You do not need to raise this if you are adding new values that have sane defaults. // Only raise this value when changing the meaning/format/name/layout of an existing value // where you would want the updater procs below to run -#define SAVEFILE_VERSION_MAX 56 +#define SAVEFILE_VERSION_MAX 57.01 /* SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn @@ -56,6 +56,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car be_special -= "NO_ANTAGS" for(var/be_special_type in be_special) be_special[be_special_type] = 1 + if(current_version < 57) + if(screentip_pref) + screentip_pref = SCREENTIP_PREFERENCE_ENABLED + else + // Let's give it a little chance okay, change if you don't like still. + screentip_pref = SCREENTIP_PREFERENCE_CONTEXT_ONLY /datum/preferences/proc/update_character(current_version, savefile/S) if(current_version < 19) @@ -417,6 +423,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["outline_enabled"] >> outline_enabled S["screentip_pref"] >> screentip_pref S["screentip_color"] >> screentip_color + S["screentip_allow_images"] >> screentip_allow_images S["hotkeys"] >> hotkeys S["chat_on_map"] >> chat_on_map S["max_chat_length"] >> max_chat_length @@ -484,6 +491,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["disable_combat_cursor"] >> disable_combat_cursor S["use_new_playerpanel"] >> use_new_playerpanel S["gfluid_blacklist"] >> gfluid_blacklist + S["new_character_creator"] >> new_character_creator + //favorite outfits S["favorite_outfits"] >> favorite_outfits @@ -549,6 +558,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car key_bindings = sanitize_islist(key_bindings, list()) modless_key_bindings = sanitize_islist(modless_key_bindings, list()) favorite_outfits = SANITIZE_LIST(favorite_outfits) + screentip_color = sanitize_hexcolor(screentip_color, 6, 1, initial(screentip_color)) //SKYRAT CHANGES BEGIN see_chat_emotes = sanitize_integer(see_chat_emotes, 0, 1, initial(see_chat_emotes)) @@ -627,6 +637,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["outline_color"], outline_color) WRITE_FILE(S["screentip_pref"], screentip_pref) WRITE_FILE(S["screentip_color"], screentip_color) + WRITE_FILE(S["screentip_allow_images"], screentip_allow_images) WRITE_FILE(S["hotkeys"], hotkeys) WRITE_FILE(S["chat_on_map"], chat_on_map) WRITE_FILE(S["max_chat_length"], max_chat_length) @@ -686,6 +697,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["disable_combat_cursor"], disable_combat_cursor) WRITE_FILE(S["use_new_playerpanel"], use_new_playerpanel) WRITE_FILE(S["gfluid_blacklist"], gfluid_blacklist) + WRITE_FILE(S["new_character_creator"], new_character_creator) var/mob/living/carbon/human/H = parent.mob if(istype(H)) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 1cd09097f4..598136acfb 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -361,7 +361,7 @@ head = /obj/item/clothing/head/helmet/space/plasmaman uniform = /obj/item/clothing/under/plasmaman - r_hand= /obj/item/tank/internals/plasmaman/belt/full + r_hand = /obj/item/tank/internals/plasmaman/belt/full mask = /obj/item/clothing/mask/breath /datum/outfit/death_commando diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 1b8b4d9e00..011f64d3ec 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -7,7 +7,8 @@ // icon_state = "plasma" item_state = "" //no inhands - slot_flags = 0 + slot_flags = ITEM_SLOT_ACCESSORY + slot_equipment_priority = list(ITEM_SLOT_ACCESSORY) w_class = WEIGHT_CLASS_SMALL var/above_suit = FALSE var/minimize_when_attached = TRUE // TRUE if shown as a small icon in corner, FALSE if overlayed diff --git a/code/modules/events/shuttle_catastrophe.dm b/code/modules/events/shuttle_catastrophe.dm index 2e431a8a34..18b9dc61ca 100644 --- a/code/modules/events/shuttle_catastrophe.dm +++ b/code/modules/events/shuttle_catastrophe.dm @@ -9,6 +9,8 @@ /datum/round_event_control/shuttle_catastrophe/canSpawnEvent(players, gamemode) if(SSshuttle.emergency.name == "Build your own shuttle kit") return FALSE //don't undo manual player engineering, it also would unload people and ghost them, there's just a lot of problems + if(SSshuttle.emergency.in_flight()) + return FALSE //ditto, problems return ..() diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 155efcd7dc..52ed3eca5e 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -366,7 +366,7 @@ "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Prisoner") /proc/get_all_job_icons() //For all existing HUD icons - return get_all_jobs() + list("Prisoner") + return get_all_jobs() /proc/get_all_centcom_jobs() return list("VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","CentCom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","CentCom Bartender","Nuclear Waste Expert") //No idea how to modularly edit a global proc diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 7a5ffbbbae..ce8c54a685 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -309,12 +309,13 @@ C.assignment = J.title //End of skyrat change C.update_label() - for(var/A in SSeconomy.bank_accounts) - var/datum/bank_account/B = A - if(B.account_id == H.account_id) - C.registered_account = B - B.bank_cards += C - break + if(J.title != "Stowaway") + for(var/A in SSeconomy.bank_accounts) + var/datum/bank_account/B = A + if(B.account_id == H.account_id) + C.registered_account = B + B.bank_cards += C + break H.sec_hud_set_ID() var/obj/item/pda/PDA = H.get_item_by_slot(pda_slot) diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index c351cd25c6..e7674c7a2b 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -47,7 +47,8 @@ GLOBAL_LIST_INIT(civilian_positions, list( "Clown", "Mime", "Prisoner", - "Assistant")) + "Assistant", + "Stowaway")) GLOBAL_LIST_INIT(security_positions, list( "Head of Security", diff --git a/code/modules/keybindings/keybind/movement.dm b/code/modules/keybindings/keybind/movement.dm index 296b127cb4..4e14b69ae9 100644 --- a/code/modules/keybindings/keybind/movement.dm +++ b/code/modules/keybindings/keybind/movement.dm @@ -74,7 +74,7 @@ var/mob/M = user.mob M.westface() return TRUE - +/* /datum/keybinding/mob/shift_north hotkey_keys = list("CtrlShiftW", "CtrlShiftNorth") name = "pixel_shift_north" @@ -122,7 +122,7 @@ var/mob/M = user.mob M.westshift() return TRUE - +*/ /datum/keybinding/living/hold_sprint hotkey_keys = list() classic_keys = list() diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index 378313311e..ea52239754 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -30,7 +30,6 @@ age = rand(AGE_MIN,AGE_MAX) /datum/preferences/proc/update_preview_icon(current_tab) - var/equip_job = (current_tab != APPEARANCE_TAB) // Determine what job is marked as 'High' priority, and dress them up as such. var/datum/job/previewJob = get_highest_job() @@ -49,13 +48,14 @@ mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER)) copy_to(mannequin, initial_spawn = TRUE) - if(current_tab == LOADOUT_TAB) - //give it its loadout if not on the appearance tab - SSjob.equip_loadout(parent.mob, mannequin, FALSE, bypass_prereqs = TRUE, can_drop = FALSE) - else - if(previewJob && equip_job) - mannequin.job = previewJob.title - previewJob.equip(mannequin, TRUE, preference_source = parent) + switch(preview_pref) + if(PREVIEW_PREF_JOB) + if(previewJob) + mannequin.job = previewJob.title + previewJob.equip(mannequin, TRUE, preference_source = parent) + if(PREVIEW_PREF_LOADOUT) + SSjob.equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE) + SSjob.post_equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE) mannequin.regenerate_icons() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 20bcf4b70d..c5c135f8a5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -8,6 +8,7 @@ GLOB.carbon_list += src blood_volume = (BLOOD_VOLUME_NORMAL * blood_ratio) add_movespeed_modifier(/datum/movespeed_modifier/carbon_crawling) + register_context() /mob/living/carbon/Destroy() //This must be done first, so the mob ghosts correctly before DNA etc is nulled diff --git a/code/modules/mob/living/carbon/carbon_context.dm b/code/modules/mob/living/carbon/carbon_context.dm new file mode 100644 index 0000000000..e7fc4d11bf --- /dev/null +++ b/code/modules/mob/living/carbon/carbon_context.dm @@ -0,0 +1,48 @@ +/mob/living/carbon/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + . = ..() + + if (!isnull(held_item)) + return . + + if (!ishuman(user)) + return . + + var/combat_mode = SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE) + + if(user == src) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HELP, "Check injuries") + else if(!lying) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HELP, "Comfort") + else if (health >= 0 && !HAS_TRAIT(src, TRAIT_FAKEDEATH)) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HELP, "Shake") + else + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HELP, "CPR") + + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_DISARM, "Disarm") + if(combat_mode && (src != user)) + LAZYSET(context[SCREENTIP_CONTEXT_RMB], INTENT_DISARM, "Shove") + + if(src != user) + if (pulledby == user) + switch (user.grab_state) + if (GRAB_PASSIVE) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_GRAB, "Grip") + if (GRAB_AGGRESSIVE) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_GRAB, "Choke") + if (GRAB_NECK) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_GRAB, "Strangle") + else + return . + else + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_GRAB, "Pull") + + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HARM, "Attack") + + // Monkeys cannot be grabbed harder using ctrl-click, don't ask. + if((pulledby != user) && (src != user)) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Pull") + // Happens on any intent i believe + if((user == src) && combat_mode && lying) + LAZYSET(context[SCREENTIP_CONTEXT_RMB], INTENT_ANY, "Force to get up") + + return CONTEXTUAL_SCREENTIP_SET diff --git a/code/modules/mob/living/carbon/human/human_context.dm b/code/modules/mob/living/carbon/human/human_context.dm new file mode 100644 index 0000000000..5229fba3ea --- /dev/null +++ b/code/modules/mob/living/carbon/human/human_context.dm @@ -0,0 +1,36 @@ +/mob/living/carbon/human/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + . = ..() + + if (!ishuman(user)) + return . + + var/aim_for_mouth = user.zone_selected == "mouth" + var/target_on_help = a_intent == INTENT_HELP + var/target_aiming_for_mouth = zone_selected == "mouth" + var/target_restrained = restrained() + var/same_dir = (dir & user.dir) + var/aim_for_groin = user.zone_selected == "groin" + var/target_aiming_for_groin = zone_selected == "groin" + + if(aim_for_mouth && (target_on_help || target_restrained || target_aiming_for_mouth)) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_DISARM, "Slap face") + + else if(aim_for_groin && (src == user || lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin)) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_DISARM, "Slap ass") + + // Humans can actually be upgrade grabbed using ctrl-click + if(src != user) + if (pulledby == user) + switch (user.grab_state) + if (GRAB_PASSIVE) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Grip") + if (GRAB_AGGRESSIVE) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Choke") + if (GRAB_NECK) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Strangle") + else + return . + else + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Pull") + + return CONTEXTUAL_SCREENTIP_SET diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index ca5f6b135b..e5cab7a6f5 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -190,6 +190,10 @@ if(ITEM_SLOT_SUITSTORE) s_store = I update_inv_s_store() + if(ITEM_SLOT_ACCESSORY) + var/obj/item/clothing/under/attach_target = w_uniform + attach_target.attach_accessory(I, src, TRUE) + // updates handled by attach_accessory else to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") not_handled = TRUE diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 6052229e35..0c30c42a65 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1523,6 +1523,39 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_CAN_INSERT, I, H, TRUE)) return TRUE return FALSE + if(ITEM_SLOT_ACCESSORY) + if(istype(I, /obj/item/clothing/accessory/ring)) + if(istype(H.gloves)) + var/obj/item/clothing/gloves/attaching_target = H.gloves + if(length(attaching_target.attached_accessories) > attaching_target.max_accessories) + if(return_warning) + return_warning[1] = "\The [attaching_target] is at maximum capacity!" + return FALSE + if(attaching_target.dummy_thick) + if(return_warning) + return_warning[1] = "\The [attaching_target] are too bulky and cannot have accessories attached to it!" + return FALSE + else + return TRUE + else if(return_warning) + return_warning[1] = "\The [H.w_uniform] cannot have any attachments." + return FALSE + else + if(istype(H.w_uniform, /obj/item/clothing/under)) + var/obj/item/clothing/under/attaching_target = H.w_uniform + if(length(attaching_target.attached_accessories) > attaching_target.max_accessories) + if(return_warning) + return_warning[1] = "\The [attaching_target] is at maximum capacity!" + return FALSE + if(attaching_target.dummy_thick) + if(return_warning) + return_warning[1] = "\The [attaching_target] is too bulky and cannot have accessories attached to it!" + return FALSE + else + return TRUE + else if(return_warning) + return_warning[1] = "\The [H.w_uniform] cannot have any attachments." + return FALSE return FALSE //Unsupported slot /datum/species/proc/equip_delay_self_check(obj/item/I, mob/living/carbon/human/H, bypass_equip_delay_self) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 94aa69473d..4703712f31 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -678,7 +678,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) setDir(SOUTH) client.last_turn = world.time + MOB_FACE_DIRECTION_DELAY return TRUE - +/* /mob/verb/eastshift() set hidden = TRUE if(!canface()) @@ -710,7 +710,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) if(pixel_y >= -32) pixel_y-- is_shifted = TRUE - +*/ /mob/proc/IsAdvancedToolUser()//This might need a rename but it should replace the can this mob use things check return FALSE diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index a0d003b5af..7b5461ceb7 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -55,6 +55,8 @@ var/resting = 0 //Carbon var/lying = 0 var/lying_prev = 0 + + /// Whether the mob is pixel shifted or not var/is_shifted = FALSE /// List of movement speed modifiers applying to this mob diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 1da355a419..83f7bbbd82 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -45,6 +45,14 @@ if(mob.force_moving) return FALSE + // Sandstorm Edit + if(mob.shifting) + mob.pixel_shift(direction) + return FALSE + else if(mob.is_shifted) + mob.unpixel_shift() + // + var/mob/living/L = mob //Already checked for isliving earlier if(L.incorporeal_move) //Move though walls Process_Incorpmove(direction) diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index 18e717191e..cfeae5730b 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -167,7 +167,8 @@ if(!computer || !authenticated) return if(minor) - if(!(target_id_card.assignment in head_subordinates) && target_id_card.assignment != "Assistant") + var/assign = GetJobName(target_id_card) + if(!(assign in head_subordinates) && assign != "Assistant") return target_id_card.access -= get_all_centcom_access() + get_all_accesses() diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm index 29f9a37433..b849df2fc8 100644 --- a/code/modules/modular_computers/file_system/programs/jobmanagement.dm +++ b/code/modules/modular_computers/file_system/programs/jobmanagement.dm @@ -19,6 +19,7 @@ "AI", "Assistant", "Prisoner", + "Stowaway", "Cyborg", "Captain", "Head of Personnel", diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index 8a27f2669c..59816544ab 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -388,7 +388,7 @@ All the important duct code: singular_name = "duct" icon = 'icons/obj/plumbing/fluid_ducts.dmi' icon_state = "ducts" - custom_materials = list(/datum/material/iron=500) + custom_materials = list(/datum/material/plastic = 400) w_class = WEIGHT_CLASS_TINY novariants = FALSE max_amount = 50 diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm index 1b1c710e8c..0ac303a3a0 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm @@ -92,6 +92,11 @@ category = list("initial","Tools","Tool Designs") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE +/datum/design/airlock_painter/decal/tile + name = "Tile Sprayer" + id = "tile_sprayer" + build_path = /obj/item/airlock_painter/decal/tile + /datum/design/cultivator name = "Cultivator" id = "cultivator" diff --git a/code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm b/code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm index ea8e59a6b3..f2514b6f9c 100644 --- a/code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm +++ b/code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm @@ -17,7 +17,15 @@ build_path = /obj/item/circuitboard/computer/cargo/request category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_CARGO - + +/datum/design/board/bounty + name = "Computer Design (Bounty Console)" + desc = "Allows for the construction of circuit boards used to build a Bounty Console." + id = "bounty" + build_path = /obj/item/circuitboard/computer/bounty + category = list("Computer Boards") + departmental_flags = DEPARTMENTAL_FLAG_CARGO + /datum/design/board/mining name = "Computer Design (Outpost Status Display)" desc = "Allows for the construction of circuit boards used to build an outpost status display console." diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 7862f24715..30d0c70566 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -120,7 +120,7 @@ return round(A / max(1, all_materials[mat] * ef)) /obj/machinery/rnd/production/proc/efficient_with(path) - return !ispath(path, /obj/item/stack/sheet) && !ispath(path, /obj/item/stack/ore/bluespace_crystal) + return !ispath(path, /obj/item/stack/sheet) && !ispath(path, /obj/item/stack/ore/bluespace_crystal) && !ispath(path, /obj/item/stack/ducts) /obj/machinery/rnd/production/proc/user_try_print_id(id, amount) if((!istype(linked_console) && requires_console) || !id) diff --git a/code/modules/research/techweb/nodes/tools_nodes.dm b/code/modules/research/techweb/nodes/tools_nodes.dm index 86a48ab8de..004795113b 100644 --- a/code/modules/research/techweb/nodes/tools_nodes.dm +++ b/code/modules/research/techweb/nodes/tools_nodes.dm @@ -5,7 +5,7 @@ display_name = "Basic Tools" description = "Basic mechanical, electronic, surgical and botanical tools." prereq_ids = list("base") - design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "decal_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom", "normtrash", "spraycan") + design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "decal_painter", "tile_sprayer", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom", "normtrash", "spraycan") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500) /datum/techweb_node/basic_mining diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 99aaa8d8ec..f350dd507e 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -3,6 +3,8 @@ return /mob/living/carbon/get_bodypart(zone) + RETURN_TYPE(/obj/item/bodypart) + if(!zone) zone = BODY_ZONE_CHEST for(var/X in bodyparts) diff --git a/config/config.txt b/config/config.txt index cda573d11d..f9a588e63a 100644 --- a/config/config.txt +++ b/config/config.txt @@ -53,3 +53,4 @@ $include splurt/maps.txt $include splurt/server.txt $include splurt/connections.txt $include splurt/donator.txt +$include splurt/autocryo.txt diff --git a/config/sandstorm/balance.txt b/config/sandstorm/balance.txt index 1268cb1904..9df8fcebd6 100644 --- a/config/sandstorm/balance.txt +++ b/config/sandstorm/balance.txt @@ -57,3 +57,44 @@ BLUESPACEMINER_MULT_OUTPUT 1 ## What is the minimum stock part tier to produce bluespace crystals? BLUESPACEMINER_CRYSTAL_TIER 5 + +### +## TETRIS +### + +## The machine produces science points based on score +## Uncomment this to prevent it from doing so +#TETRIS_NO_SCIENCE + +## How many prizes can the machine dispense +## This is also limited by TETRIS_SCORE_MAX +TETRIS_PRIZES_MAX 5 + +## How many points required per prize vended +## Amount is equal to SCORE divided by TETRIS_REWARD_DIVISOR +TETRIS_REWARD_DIVISOR 1000 + +## Minimum score required to message admins +## This is intended for detecting suspicious scores +TETRIS_SCORE_HIGH 10000 + +## Maximum score that can be displayed +## Score values past this number are ignored +TETRIS_SCORE_MAX 100000 + +## Maximum research points that can be generated +## Score values past this number are ignored +TETRIS_SCORE_MAX_SCI 10000 + +## Minimum time between giving rewards +## This applies to both prizes and research points +## Time is measured in ticks +TETRIS_TIME_COOLDOWN 600 + +## +## PROTOLATHE RESTRICTIONS +### + +## Should production machinery be restricted for skeleton crews? +## Uncomment this to enable +#PROTOLOCK_DURING_LOWPOP diff --git a/config/splurt/autocryo.txt b/config/splurt/autocryo.txt new file mode 100644 index 0000000000..bae707e021 --- /dev/null +++ b/config/splurt/autocryo.txt @@ -0,0 +1,5 @@ +## Uncomment to enable automatic SSD cryo +# AUTOCRYO_ENABLED + +## Time in seconds before sending SSD users to cryo +AUTOCRYO_TIME_TRIGGER 24000 diff --git a/html/changelogs/archive/2023-02.yml b/html/changelogs/archive/2023-02.yml index 57ba553898..ec1398fab4 100644 --- a/html/changelogs/archive/2023-02.yml +++ b/html/changelogs/archive/2023-02.yml @@ -60,3 +60,96 @@ Comicao1: - rscadd: Beach ball may be inserted a vibrator in it. - rscadd: Syndicate beach ball also might be bought in the traitor's uplink. +2023-02-11: + SandPoot: + - refactor: Interaction menu is no longer stored in your mind, and should clear + references and all properly when deleting. + WoolyAypa: + - rscadd: Added a new polychromic Princess Leia outfits to the ClothesMate (and + loadout) + - rscadd: Added a polychromic version of the "Performers one piece" to the ClothesMate + (and loadout) + - rscadd: Added high-heel sandals to the KinkMate (and loadout) +2023-02-12: + BongaTheProto: + - bugfix: snake tail (large) is now available for humans and lizards too + WoolyAypa: + - bugfix: Space princess outfit now can be used along with digitigrade legs + - rscadd: Added some of the old dullahan stuff to the new one + - bugfix: Fixed the overlay glitches with the new dullahan quirk + - bugfix: Space princess outfit and the polychromic performers one piece can now + be colored in the loadout +2023-02-13: + Neyusha: + - rscadd: Added stowaway role +2023-02-14: + LeDrascol: + - tweak: SSD players are automatically sent to cryo after 40 minutes + - code_imp: Reverted non-modular SPLURT edits to TETRIS + - balance: T.E.T.R.I.S. arcade machine now generates research points if used by + scientists + - balance: T.E.T.R.I.S. machine maximum score, prize count, and points payout are + now limited + - balance: T.E.T.R.I.S. machine can only dispense rewards once per configured time + threshold + - server: Added configuration settings for the T.E.T.R.I.S. arcade machine +2023-02-16: + Zattarra: + - rscadd: Added the shortcrop, longcrop, and formalcrop. + - rscadd: Added croptops to loadout. + - rscadd: Added croptops to clothesmate. + - imageadd: Gave the croptops sprites. +2023-02-17: + LeDrascol: + - tweak: Hexacamphor overdose will remove the In Estrous quirk +2023-02-18: + KeplerWasTaken: + - rscadd: A new drink, the Ion Storm, made with 5 parts quadruple sec, 2 parts bastion + bourbon, resulting in 10 units. + LeDrascol: + - rscdel: Removed techweb entry for Infective Exo-Locomotion nanites +2023-02-19: + LeDrascol: + - bugfix: Fixed techweb exploit with 357 speed loader + - rscadd: Added more feedback messages to Cryptominer account changing + - tweak: Standard cryptominers will report account changes on Cargo radio + - balance: Setting a cryptominer's account now takes five seconds + - admin: Added game logging for Cryptominer account changes + - balance: Production machines now check ID cards for access + - balance: R&D console starts locked by default + - config: Added new configuration options for production machine access + - tweak: In Estrous examine text is now based on the holder's reproductive organs + - tweak: In Estrous gain text no longer implies the holder intends to be an organ + recipient + - code_imp: Added signals for organ insertion and removal + - tweak: The Gear Harness is now non-covering + - rscadd: Added Synthetic species flavor text for In Estrous + - tweak: In Estrous no longer requires both female organs + - code_imp: In Estrous examine text uses English lists + SandPoot: + - imageadd: Changed screentips icons to something a lot fancier unified with the + LMB / RMB text. +2023-02-20: + LeDrascol: + - refactor: Refactored trait defines +2023-02-21: + SandPoot: + - tweak: Tweaked pixelshifting. (Default keybinding is B, check your keybinds!) + - bugfix: Duct pipes will always have the same cost no matter where you make it. + - bugfix: Hand-made duct pipes will properly stack with machine made ones. +2023-02-22: + BongaTheProto: + - tweak: The pixelfishing keybind is now B, although you can use use the previous + ctrl+shift keybinds. Please make sure you check your keybinds! +2023-02-23: + Comicao1: + - tweak: Wendigos may now work in a proper way, and are also able to enslave people + through sex while grabbing them. + LeDrascol: + - rscadd: 'Added positive quirk: Rad Fiend' + WoolyAypa: + - rscadd: Added a tajaran snout option + - rscadd: Added an alt version of the dragon wings + - rscadd: Added a stripper version of the explorer jumpsuit + - rscadd: Added the security stripper outfit in the loadout + - tweak: Now the security stripper outfit can be used with digitigrade diff --git a/icons/UI_Icons/screentips/cursor_hints.dmi b/icons/UI_Icons/screentips/cursor_hints.dmi new file mode 100644 index 0000000000..9533d240a5 Binary files /dev/null and b/icons/UI_Icons/screentips/cursor_hints.dmi differ diff --git a/icons/UI_Icons/screentips/full_mouse.dmi b/icons/UI_Icons/screentips/full_mouse.dmi new file mode 100644 index 0000000000..32e0b8f67c Binary files /dev/null and b/icons/UI_Icons/screentips/full_mouse.dmi differ diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi new file mode 100644 index 0000000000..144287ced0 Binary files /dev/null and b/icons/effects/random_spawners.dmi differ diff --git a/icons/emoji_32.dmi b/icons/emoji_32.dmi index d976daa366..1a0684c2fd 100644 Binary files a/icons/emoji_32.dmi and b/icons/emoji_32.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 9746e61a3d..f7062b9f4e 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index d0ebbb4501..b694d0ba35 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 0d87e7871c..3836f4c713 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 95a04717e9..73ba2fcdb0 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi index 4ed8c8db9a..6b42ad12c7 100644 Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 4c09236872..197f088356 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -54,9 +54,10 @@ /datum/gear/donator/kiaramedal name = "Insignia of Steele" - slot = ITEM_SLOT_BACKPACK + slot = ITEM_SLOT_ACCESSORY path = /obj/item/clothing/accessory/medal/steele ckeywhitelist = list("inferno707") + handle_post_equip = TRUE /datum/gear/donator/hheart name = "The Hollow Heart" diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm index 5f895c4805..f33beecb32 100644 --- a/modular_citadel/code/modules/client/loadout/_loadout.dm +++ b/modular_citadel/code/modules/client/loadout/_loadout.dm @@ -55,6 +55,7 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) var/geargroupID //defines the ID that the gear inherits from the config var/loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION var/list/loadout_initial_colors = list() + var/handle_post_equip = FALSE //NEW DONATOR SYTSEM STUFF var/donoritem //autoset on new if null diff --git a/modular_citadel/code/modules/client/loadout/_service.dm b/modular_citadel/code/modules/client/loadout/_service.dm index 848ad6233c..4f96b36e2e 100644 --- a/modular_citadel/code/modules/client/loadout/_service.dm +++ b/modular_citadel/code/modules/client/loadout/_service.dm @@ -2,20 +2,20 @@ name = "Staff Assistant's jumpsuit" path = /obj/item/clothing/under/misc/staffassistant subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") /datum/gear/suit/neetsuit name = "D.A.B. suit" path = /obj/item/clothing/suit/assu_suit subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") cost = 2 /datum/gear/head/neethelm name = "D.A.B. helmet" path = /obj/item/clothing/head/assu_helmet subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") cost = 2 /datum/gear/backpack/plushvar diff --git a/modular_citadel/code/modules/client/loadout/accessory.dm b/modular_citadel/code/modules/client/loadout/accessory.dm new file mode 100644 index 0000000000..55cce181a5 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/accessory.dm @@ -0,0 +1,20 @@ +/datum/gear/accessory + category = LOADOUT_CATEGORY_ACCESSORY + slot = ITEM_SLOT_ACCESSORY + handle_post_equip = TRUE + +/datum/gear/accessory/necklace + name = "A renameable necklace" + path = /obj/item/clothing/accessory/necklace + +/datum/gear/accessory/polymaidapron + name = "Polychromic maid apron" + path = /obj/item/clothing/accessory/maidapron/polychromic + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#333333", "#FFFFFF") + +/datum/gear/accessory/pridepin + name = "Pride pin" + path = /obj/item/clothing/accessory/pride + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION + cost = 0 diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index a0be000b31..24545e7b4c 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -2,6 +2,7 @@ category = LOADOUT_CATEGORY_BACKPACK subcategory = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL slot = ITEM_SLOT_BACKPACK + handle_post_equip = TRUE /datum/gear/backpack/plushbox name = "Plushie Choice Box" @@ -172,25 +173,6 @@ path = /obj/item/storage/fancy/ringbox/diamond cost = 5 -/datum/gear/backpack/necklace //this is here because loadout doesn't support proper accessories - name = "A renameable necklace" - path = /obj/item/clothing/accessory/necklace - subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES - -/datum/gear/backpack/polymaidapron //this is ALSO here because loadout doesn't support proper accessories - name = "Polychromic maid apron" - path = /obj/item/clothing/accessory/maidapron/polychromic - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC - loadout_initial_colors = list("#333333", "#FFFFFF") - subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES - -/datum/gear/backpack/pridepin //what the two comments above said - name = "Pride pin" - path = /obj/item/clothing/accessory/pride - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION - subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES - cost = 0 - // Moved here from quirks /datum/gear/backpack/dyespray name = "Hair dye spray" diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 58dd6e9fc3..fdaee6f309 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -157,7 +157,7 @@ description = "A visored cap. Intended to be used with ORV uniform." path = /obj/item/clothing/head/kepi/orvi subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") /*Commenting out Until next Christmas or made automatic /datum/gear/santahatr diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 5c22485c1f..280f6a2485 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -623,7 +623,7 @@ name = "ORV uniform, assistant" path = /obj/item/clothing/under/trek/orv subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") /datum/gear/uniform/orvsrv name = "ORV uniform, other" diff --git a/modular_sand/code/_globalvars/bitfields.dm b/modular_sand/code/_globalvars/bitfields.dm index c149e1c11e..7a2bb8d87d 100644 --- a/modular_sand/code/_globalvars/bitfields.dm +++ b/modular_sand/code/_globalvars/bitfields.dm @@ -25,6 +25,7 @@ DEFINE_BITFIELD(flags_inv, list( )) DEFINE_BITFIELD(slot_flags, list( + "ITEM_SLOT_ACCESSORY" = ITEM_SLOT_ACCESSORY, "ITEM_SLOT_BACK" = ITEM_SLOT_BACK, "ITEM_SLOT_BACKPACK" = ITEM_SLOT_BACKPACK, "ITEM_SLOT_BELT" = ITEM_SLOT_BELT, diff --git a/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm b/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm index f739dec7b1..f181b9bffe 100644 --- a/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm +++ b/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm @@ -64,3 +64,35 @@ // BSM minimum tier for bluespace crystals /datum/config_entry/number/bluespaceminer_crystal_tier config_entry_value = 5 + +/// TETRIS ARCADE MACHINE /// +// If the machine should skip producing science points +/datum/config_entry/flag/tetris_no_science + +// Points required per prize vended +/datum/config_entry/number/tetris_reward_divisor + config_entry_value = 1000 + +// Points required per prize vended +/datum/config_entry/number/tetris_prizes_max + config_entry_value = 5 + +// Minimum score required to message admins +/datum/config_entry/number/tetris_score_high + config_entry_value = 10000 + +// Maximum research points that can be generated +/datum/config_entry/number/tetris_score_max + config_entry_value = 100000 + +// Maximum research points that can be generated +/datum/config_entry/number/tetris_score_max_sci + config_entry_value = 10000 + +// Minimum time between giving rewards +/datum/config_entry/number/tetris_time_cooldown + config_entry_value = 600 + +/// R&D Machinery /// +// Should production machinery be restricted for skeleton crews? +/datum/config_entry/flag/protolock_during_lowpop diff --git a/modular_sand/code/controllers/subsystem/interactions.dm b/modular_sand/code/controllers/subsystem/interactions.dm index f4a1a08c5e..dee26167c3 100644 --- a/modular_sand/code/controllers/subsystem/interactions.dm +++ b/modular_sand/code/controllers/subsystem/interactions.dm @@ -4,6 +4,9 @@ SUBSYSTEM_DEF(interactions) init_order = INIT_ORDER_INTERACTIONS var/list/interactions VAR_PROTECTED/list/blacklisted_mobs = list( + /mob/dead, + /mob/dview, + /mob/camera, // Although it would be funny to fuck the sentient disease or AI hologram /mob/living/simple_animal/pet, /mob/living/simple_animal/cockroach, /mob/living/simple_animal/babyKiwi, diff --git a/modular_sand/code/datums/interactions/interaction_interface.dm b/modular_sand/code/datums/components/interaction_menu_granter.dm similarity index 81% rename from modular_sand/code/datums/interactions/interaction_interface.dm rename to modular_sand/code/datums/components/interaction_menu_granter.dm index 2d7f794132..c985ff2e9c 100644 --- a/modular_sand/code/datums/interactions/interaction_interface.dm +++ b/modular_sand/code/datums/components/interaction_menu_granter.dm @@ -1,59 +1,69 @@ /// Attempts to open the tgui menu -/mob/living/verb/interact_with() +/mob/verb/interact_with() set name = "Interact With" set desc = "Perform an interaction with someone." set category = "IC" set src in view(usr.client) - if(!usr.mind) //Mindless boys, honestly just don't, it's better this way - return - if(!usr.mind.interaction_holder) - usr.mind.interaction_holder = new(usr.mind) - usr.mind.interaction_holder.target = src - usr.mind.interaction_holder.ui_interact(usr) - -/* -/// Allows "cyborg" players to change gender at will -/mob/living/silicon/robot/verb/toggle_gender() - set name = "Set Gender" - set desc = "Allows you to set your gender." - - if(stat != CONSCIOUS) - to_chat(usr, span_warning("You cannot toggle your gender while unconcious!")) + var/datum/component/interaction_menu_granter/menu = usr.GetComponent(/datum/component/interaction_menu_granter) + if(!menu) + to_chat(usr, span_warning("You must have done something really bad to not have an interaction component.")) return - var/choice = tgui_alert(usr, "Select Gender.", "Gender", list("Both", "Male", "Female")) - switch(choice) - if("Both") - has_penis = TRUE - has_vagina = TRUE - if("Male") - has_penis = TRUE - has_vagina = FALSE - if("Female") - has_penis = FALSE - has_vagina = TRUE -*/ + if(!src) + to_chat(usr, span_warning("Your interaction target is gone!")) + return + menu.open_menu(usr, src) #define INTERACTION_NORMAL 0 #define INTERACTION_LEWD 1 #define INTERACTION_EXTREME 2 -/datum/mind - var/datum/interaction_menu/interaction_holder - -/datum/mind/New(key) - . = ..() - interaction_holder = new(src) - /// The menu itself, only var is target which is the mob you are interacting with -/datum/interaction_menu +/datum/component/interaction_menu_granter var/mob/living/target -/datum/interaction_menu/ui_state(mob/user) - return GLOB.conscious_state +/datum/component/interaction_menu_granter/Initialize(...) + if(!ismob(parent)) + return COMPONENT_INCOMPATIBLE + var/mob/parent_mob = parent + if(!parent_mob.client) + return COMPONENT_INCOMPATIBLE + . = ..() -/datum/interaction_menu/ui_interact(mob/user, datum/tgui/ui) +/datum/component/interaction_menu_granter/RegisterWithParent() + . = ..() + RegisterSignal(parent, COMSIG_MOB_CTRLSHIFTCLICKON, .proc/open_menu) + +/datum/component/interaction_menu_granter/Destroy(force, ...) + target = null + . = ..() + +/datum/component/interaction_menu_granter/UnregisterFromParent() + UnregisterSignal(parent, COMSIG_MOB_CTRLSHIFTCLICKON) + . = ..() + +/// The one interacting is clicker, the interacted is clicked. +/datum/component/interaction_menu_granter/proc/open_menu(mob/clicker, mob/clicked) + // COMSIG_MOB_CTRLSHIFTCLICKON accepts `atom`s, prevent it + if(!istype(clicked)) + return FALSE + // Don't cancel admin quick spawn + if(isobserver(clicked) && check_rights_for(clicker.client, R_SPAWN)) + return FALSE + target = clicked + ui_interact(clicker) + return COMSIG_MOB_CANCEL_CLICKON + +/datum/component/interaction_menu_granter/ui_state(mob/user) + // Funny admin, don't you dare be the extra funny now. + if(user.client.holder && !user.client.holder.deadmined) + return GLOB.always_state + if(user == parent) + return GLOB.conscious_state + return GLOB.never_state + +/datum/component/interaction_menu_granter/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "MobInteraction", "Interactions") @@ -68,10 +78,10 @@ else return 0 -/datum/interaction_menu/ui_data(mob/user) +/datum/component/interaction_menu_granter/ui_data(mob/user) . = ..() //Getting player - var/mob/living/self = user + var/mob/living/self = parent //Getting info .["isTargetSelf"] = target == self .["interactingWith"] = target != self ? "Interacting with \the [target]..." : "Interacting with yourself..." @@ -136,22 +146,22 @@ genital_entry["arousal_state"] = genital.aroused_state genital_entry["always_accessible"] = genital.always_accessible genitals += list(genital_entry) - if(iscarbon(self) && !self.getorganslot(ORGAN_SLOT_ANUS)) - var/simulated_ass = list() - simulated_ass["name"] = "Anus" - simulated_ass["key"] = "anus" - var/visibility = "Invalid" - switch(self.anus_exposed) - if(1) - visibility = "Always visible" - if(0) - visibility = "Hidden by underwear" - else - visibility = "Always hidden" - simulated_ass["visibility"] = visibility - simulated_ass["possible_choices"] = GLOB.genitals_visibility_toggles - GEN_VISIBLE_NO_CLOTHES - simulated_ass["always_accessible"] = self.anus_always_accessible - genitals += list(simulated_ass) + if(!get_genitals.getorganslot(ORGAN_SLOT_ANUS)) //SPLURT Edit + var/simulated_ass = list() + simulated_ass["name"] = "Anus" + simulated_ass["key"] = "anus" + var/visibility = "Invalid" + switch(get_genitals.anus_exposed) + if(1) + visibility = "Always visible" + if(0) + visibility = "Hidden by underwear" + else + visibility = "Always hidden" + simulated_ass["visibility"] = visibility + simulated_ass["possible_choices"] = GLOB.genitals_visibility_toggles - GEN_VISIBLE_NO_CLOTHES + simulated_ass["always_accessible"] = get_genitals.anus_always_accessible + genitals += list(simulated_ass) .["genitals"] = genitals //Get their genitals @@ -227,18 +237,19 @@ else return "No" -/datum/interaction_menu/ui_act(action, params) +/datum/component/interaction_menu_granter/ui_act(action, params) if(..()) return + var/mob/living/parent_mob = parent switch(action) if("interact") var/datum/interaction/o = SSinteractions.interactions[params["interaction"]] if(o) - o.do_action(usr, target) + o.do_action(parent_mob, target) return TRUE return FALSE if("genital") - var/mob/living/carbon/self = usr + var/mob/living/carbon/self = parent_mob if("visibility" in params) if(params["genital"] == "anus") self.anus_toggle_visibility(params["visibility"]) @@ -301,7 +312,7 @@ return TRUE return FALSE if("char_pref") - var/datum/preferences/prefs = usr.client.prefs + var/datum/preferences/prefs = parent_mob.client.prefs var/value = num_to_pref(params["value"]) switch(params["char_pref"]) if("erp_pref") @@ -341,7 +352,7 @@ prefs.save_character() return TRUE if("pref") - var/datum/preferences/prefs = usr.client.prefs + var/datum/preferences/prefs = parent_mob.client.prefs switch(params["pref"]) if("verb_consent") TOGGLE_BITFIELD(prefs.toggles, VERB_CONSENT) diff --git a/modular_sand/code/datums/elements/holder_micro.dm b/modular_sand/code/datums/elements/holder_micro.dm index f264ded3b5..0161e9ac90 100644 --- a/modular_sand/code/datums/elements/holder_micro.dm +++ b/modular_sand/code/datums/elements/holder_micro.dm @@ -168,9 +168,12 @@ set category = "IC" set src in view(usr.client) - if(!usr.mind) //Mindless boys, honestly just don't, it's better this way + var/datum/component/interaction_menu_granter/menu = usr.GetComponent(/datum/component/interaction_menu_granter) + if(!menu) + to_chat(usr, span_warning("You must have done something really bad to not have an interaction component.")) return - if(!usr.mind.interaction_holder) - usr.mind.interaction_holder = new(usr.mind) - usr.mind.interaction_holder.target = src.held_mob - usr.mind.interaction_holder.ui_interact(usr) + + if(!src) + to_chat(usr, span_warning("Your interaction target is gone!")) + return + menu.open_menu(usr, src) diff --git a/modular_sand/code/datums/elements/skirt_peeking.dm b/modular_sand/code/datums/elements/skirt_peeking.dm index e5be0fc434..96207fbffa 100644 --- a/modular_sand/code/datums/elements/skirt_peeking.dm +++ b/modular_sand/code/datums/elements/skirt_peeking.dm @@ -29,12 +29,17 @@ // And are you under us while we're standing up? if(!(CHECK_BITFIELD(living_peeker.mobility_flags, MOBILITY_STAND)) && (CHECK_BITFIELD(peeked.mobility_flags, MOBILITY_STAND)) && (peeked.loc == living_peeker.loc)) return TRUE + // Do you happen to be small enough to easily look under us? + if(COMPARE_SIZES(peeked, peeker) >= 2) + return TRUE // Or are you nearby and we are up high // to-do SOMEONE PLEASE PORT /datum/element/climbable - var/obj/structure/high_ground = locate(/obj/structure) in get_turf(peeked) - if(high_ground && high_ground.climbable && CHECK_BITFIELD(peeked.mobility_flags, MOBILITY_STAND) && \ - peeked.Adjacent(peeker)) - return TRUE + var/obj/structure/high_ground_peeked = locate(/obj/structure) in get_turf(peeked) + var/obj/structure/high_ground_peeker = locate(/obj/structure) in get_turf(peeker) + if(high_ground_peeked && high_ground_peeked.climbable && CHECK_BITFIELD(peeked.mobility_flags, MOBILITY_STAND) && peeked.Adjacent(peeker)) + // Funnily enough, if we're at the same height, they can't just peek under us! + if(!(high_ground_peeker && high_ground_peeker.climbable)) + return TRUE return FALSE /datum/element/skirt_peeking/proc/on_examine(mob/living/carbon/human/peeked, mob/peeker, list/examine_list) @@ -99,3 +104,22 @@ string += " on full display." examine_content += span_purple(string) + // Let's see if we caught them, addtimer so it appears after the peek. + addtimer(CALLBACK(src, .proc/try_notice, peeked, peeker), 1) + +/// Alright, they've peeked us and everything, did we notice it though? +/datum/element/skirt_peeking/proc/try_notice(mob/living/carbon/human/peeked, mob/living/peeker) + if(!peeked || !peeker) + return + if(!istype(peeked) || !istype(peeker)) + return + var/obj/item/clothing/under/worn_uniform = peeked.get_item_by_slot(ITEM_SLOT_ICLOTHING) + if(!istype(worn_uniform)) + return + var/obj/item/clothing/glasses/eye_blocker = peeker.get_item_by_slot(ITEM_SLOT_EYES) + if(!(!peeked.client && (peeked.stat == CONSCIOUS) && !HAS_TRAIT(peeked, TRAIT_BLIND) && !is_blind(peeked) && \ + !peeker.is_eyes_covered(FALSE) && !(eye_blocker && eye_blocker.tint > 0) && \ + !(peeker.invisibility > peeked.invisibility) && !(peeker.alpha <= 30))) + return + to_chat(peeked, span_warning("You notice [peeker] looking under your [worn_uniform.name]!")) + to_chat(peeker, span_warning("[peeked] notices you peeking under [peeked.p_their()] [worn_uniform.name]!")) diff --git a/modular_sand/code/datums/interactions/_interaction.dm b/modular_sand/code/datums/interactions/_interaction.dm index b7077ae80d..5ba1efe8e8 100644 --- a/modular_sand/code/datums/interactions/_interaction.dm +++ b/modular_sand/code/datums/interactions/_interaction.dm @@ -10,13 +10,15 @@ - Makes all the code good because yes as well - SandPoot **/ -/mob/living/proc/list_interaction_attributes() - var/dat = list() +/mob/proc/list_interaction_attributes() + return list() + +/mob/living/list_interaction_attributes() + . = ..() if(has_hands()) - dat += "...have hands." + . += "...have hands." if(has_mouth()) - dat += "...have a mouth, which is [mouth_is_free() ? "uncovered" : "covered"]." - return dat + . += "...have a mouth, which is [mouth_is_free() ? "uncovered" : "covered"]." /// The base of all interactions /datum/interaction diff --git a/modular_sand/code/datums/interactions/lewd_interactions.dm b/modular_sand/code/datums/interactions/lewd_interactions.dm index 2171ec0b7f..ccd0708d93 100644 --- a/modular_sand/code/datums/interactions/lewd_interactions.dm +++ b/modular_sand/code/datums/interactions/lewd_interactions.dm @@ -516,18 +516,18 @@ return ..() /mob/living/list_interaction_attributes(mob/living/LM) - var/dat = ..() + . = ..() if(!COOLDOWN_FINISHED(LM, refractory_period)) - dat += "...are sexually exhausted for the time being." + . += "...are sexually exhausted for the time being." switch(a_intent) if(INTENT_HELP) - dat += "...are acting gentle." + . += "...are acting gentle." if(INTENT_DISARM) - dat += "...are acting playful." + . += "...are acting playful." if(INTENT_GRAB) - dat += "...are acting rough." + . += "...are acting rough." if(INTENT_HARM) - dat += "...are fighting anyone who comes near." + . += "...are fighting anyone who comes near." //Here comes the fucking weird shit. if(client) var/client/cli = client @@ -536,45 +536,44 @@ if(!ucli || (ucli.prefs.extremepref != "No")) if(!get_item_by_slot(ITEM_SLOT_EARS_LEFT) && !get_item_by_slot(ITEM_SLOT_EARS_RIGHT)) if(has_ears()) - dat += "...have unprotected ears." + . += "...have unprotected ears." else - dat += "...have a hole where their ears should be." + . += "...have a hole where their ears should be." else - dat += "...have covered ears." + . += "...have covered ears." if(!get_item_by_slot(ITEM_SLOT_EYES)) if(has_eyes()) - dat += "...have exposed eyes." + . += "...have exposed eyes." else - dat += "...have exposed eyesockets." + . += "...have exposed eyesockets." else - dat += "...have covered eyes." + . += "...have covered eyes." // // check those loops only once, thanks var/is_topless = is_topless() var/is_bottomless = is_bottomless() if(is_topless && is_bottomless) - dat += "...are naked." + . += "...are naked." else if((is_topless && !is_bottomless) || (!is_topless && is_bottomless)) - dat += "...are partially clothed." + . += "...are partially clothed." else - dat += "...are clothed." + . += "...are clothed." if(has_breasts(REQUIRE_EXPOSED)) - dat += "...have breasts." + . += "...have breasts." if(has_penis(REQUIRE_EXPOSED)) - dat += "...have a penis." + . += "...have a penis." if(has_strapon(REQUIRE_EXPOSED)) - dat += "...have a strapon." + . += "...have a strapon." if(has_balls(REQUIRE_EXPOSED)) - dat += "...have a ballsack." + . += "...have a ballsack." if(has_vagina(REQUIRE_EXPOSED)) - dat += "...have a vagina." + . += "...have a vagina." if(has_anus(REQUIRE_EXPOSED)) - dat += "...have an anus." + . += "...have an anus." if(has_feet(REQUIRE_EXPOSED)) switch(has_feet(REQUIRE_EXPOSED)) if(2) - dat += "...have a pair of feet." + . += "...have a pair of feet." if(1) - dat += "...have a single foot." - return dat + . += "...have a single foot." diff --git a/modular_sand/code/datums/traits/neutral.dm b/modular_sand/code/datums/traits/neutral.dm index 363f6f7e25..ea574d896b 100644 --- a/modular_sand/code/datums/traits/neutral.dm +++ b/modular_sand/code/datums/traits/neutral.dm @@ -36,16 +36,50 @@ desc = "Your system burns with the desire to be bred. Satisfying your lust will make you happy, while ignoring it may cause you to become sad and needy." value = 0 mob_trait = TRAIT_ESTROUS_ACTIVE - gain_text = span_love("You body burns with the desire to be bred.") + gain_text = span_love("You body burns with the desire to engage in breeding.") lose_text = span_notice("You feel more in control of your body and thoughts.") + // Default heat message for examine text + var/heat_type = "influenced by the estrous cycle" + + // Type of interaction to be performed + // Intended for use with downstream quirks + var/positional_orientation = "engage in breeding" + /datum/quirk/estrous_active/add() // Add examine hook RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/quirk_examine_estrous_active) + // Add organ change hooks + RegisterSignal(quirk_holder, COMSIG_MOB_ORGAN_ADD, .proc/update_heat_type) + RegisterSignal(quirk_holder, COMSIG_MOB_ORGAN_REMOVE, .proc/update_heat_type) + /datum/quirk/estrous_active/remove() - // Remove examine hook - UnregisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE) + // Remove signals + UnregisterSignal(quirk_holder, list(COMSIG_MOB_ORGAN_ADD, COMSIG_MOB_ORGAN_REMOVE, COMSIG_PARENT_EXAMINE)) + +/datum/quirk/estrous_active/post_add() + // Update text used by message + update_heat_type() + +/datum/quirk/estrous_active/proc/update_heat_type() + // Define temporary list of heat phrases + var/list/heat_phrases = list() + + // Check for male hormonal organ + if(quirk_holder.has_balls()) + heat_phrases += "in rut" + + // Check for female hormonal organ + if(quirk_holder.getorganslot(ORGAN_SLOT_WOMB)) + heat_phrases += "in estrous" + + // Check for synthetic + if(isrobotic(quirk_holder)) + heat_phrases += "simulating hormones" + + // Build English list + heat_type = english_list(heat_phrases, nothing_text = "experiencing high hormonal levels") /datum/quirk/estrous_active/proc/quirk_examine_estrous_active(atom/examine_target, mob/living/carbon/human/examiner, list/examine_list) SIGNAL_HANDLER @@ -59,4 +93,4 @@ return // Add quirk message - examine_list += span_love("[quirk_holder.p_they(TRUE)] [quirk_holder.p_are()] currently influenced by the estrous cycle, and long for breeding.") + examine_list += span_love("[quirk_holder.p_they(TRUE)] [quirk_holder.p_are()] currently [heat_type], with a longing to [positional_orientation].") diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm index 1769ebe2aa..0ddd5be709 100644 --- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm +++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm @@ -1,13 +1,20 @@ -#define REWARD_DIVISOR 1000 -// At the end of the game, the thing yields tetris_score/REWARD_DIVISOR prize tickets. Adjust accordingly. +// Configuration defines +#define TETRIS_REWARD_DIVISOR CONFIG_GET(number/tetris_reward_divisor) +#define TETRIS_PRIZES_MAX CONFIG_GET(number/tetris_prizes_max) +#define TETRIS_SCORE_HIGH CONFIG_GET(number/tetris_score_high) +#define TETRIS_SCORE_MAX CONFIG_GET(number/tetris_score_max) +#define TETRIS_SCORE_MAX_SCI CONFIG_GET(number/tetris_score_max_sci) +#define TETRIS_TIME_COOLDOWN CONFIG_GET(number/tetris_time_cooldown) +#define TETRIS_NO_SCIENCE CONFIG_GET(flag/tetris_no_science) + +// Cooldown defines +#define TETRIS_COOLDOWN_MAIN cooldown_timer /obj/machinery/computer/arcade/tetris name = "T.E.T.R.I.S." desc = "The pinnacle of human technology." - icon = 'icons/obj/computer.dmi' - icon_state = "arcade" circuit = /obj/item/circuitboard/computer/arcade/tetris - light_color = LIGHT_COLOR_GREEN + COOLDOWN_DECLARE(TETRIS_COOLDOWN_MAIN) /obj/machinery/computer/arcade/tetris/Topic(href, href_list) if(..()) @@ -15,13 +22,63 @@ else usr.set_machine(src) if(href_list["tetrisScore"]) - var/temp_score = text2num(href_list["tetrisScore"]) - say("YOUR SCORE: [temp_score]!") - var/reward = round(temp_score/REWARD_DIVISOR) - message_admins("[ADMIN_LOOKUPFLW(usr)] used [src] with score [temp_score] and total_rewards [reward]!!!") - if(reward > 5) - reward = 4 - prizevend(usr, reward) + // Sanitize score as an integer + // Restricts maximum score to (default) 100,000 + var/temp_score = sanitize_num_clamp(text2num(href_list["tetrisScore"]), max=TETRIS_SCORE_MAX) + + // Check for high score + if(temp_score > TETRIS_SCORE_HIGH) + // Alert admins + message_admins("[ADMIN_LOOKUPFLW(usr)] [ADMIN_KICK(usr)] has achieved a score of [temp_score] on [src] in [get_area(src.loc)]! Score exceeds configured suspicion threshold.") + + // Round and clamp prize count from 0 to (default) 5 + var/reward_count = clamp(round(temp_score/TETRIS_REWARD_DIVISOR), 0, TETRIS_PRIZES_MAX) + + // Define score text + var/score_text = (reward_count ? temp_score : "PATHETIC! TRY HARDER") + + // Display normal message + say("YOUR SCORE: [score_text]!") + + // Check if any prize would be vended + if(!reward_count) + // Return without further effects + return + + // Check cooldown + if(!COOLDOWN_FINISHED(src, TETRIS_COOLDOWN_MAIN)) + // Play a fake prize vend effect based on prizevend() + playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3) + visible_message(span_notice("[src] sputters for a moment before going quiet.")) + + // Return with no further effects + return + + // Set cooldown time + COOLDOWN_START(src, TETRIS_COOLDOWN_MAIN, TETRIS_TIME_COOLDOWN) + + // Vend prizes + prizevend(usr, reward_count) + + // Check if science points are possible and allowed + if((!SSresearch.science_tech) || TETRIS_NO_SCIENCE) + return + + // Define user ID card + var/obj/item/card/id/user_id = usr.get_idcard() + + // Check if ID exists + // Check if ID has science access + if(istype(user_id) && (ACCESS_RESEARCH in user_id.access)) + // Limit maximum research points to (default) 10,000 + var/score_research_points = clamp(temp_score, 0, TETRIS_SCORE_MAX_SCI) + + // Add science points based on score + SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = score_research_points)) + + // Announce points earned + say("Research personnel detected. Applying gathered data to algorithms...") + return /obj/machinery/computer/arcade/tetris/attack_ai(user as mob) @@ -99,3 +156,13 @@ user << browse(dat, "window=tetris;size=435x550") user.set_machine(src) onclose(user, "tetris") + +// Remove defines +#undef TETRIS_REWARD_DIVISOR +#undef TETRIS_PRIZES_MAX +#undef TETRIS_SCORE_HIGH +#undef TETRIS_SCORE_MAX +#undef TETRIS_SCORE_MAX_SCI +#undef TETRIS_TIME_COOLDOWN +#undef TETRIS_NO_SCIENCE +#undef TETRIS_COOLDOWN_MAIN diff --git a/modular_sand/code/game/machinery/cryptominers.dm b/modular_sand/code/game/machinery/cryptominers.dm index 6738511b4f..20f5bd69b4 100644 --- a/modular_sand/code/game/machinery/cryptominers.dm +++ b/modular_sand/code/game/machinery/cryptominers.dm @@ -19,7 +19,7 @@ /obj/machinery/cryptominer name = "cryptocurrency miner" - desc = "This handy-dandy machine will produce credits for your enjoyment." + desc = "This handy-dandy machine will produce credits for Cargo's enjoyment." icon = 'modular_sand/icons/obj/machines/cryptominer.dmi' icon_state = "off" density = TRUE @@ -32,9 +32,23 @@ var/miningtime = 3000 var/miningpoints = 50 var/datum/bank_account/pay_me = null + var/obj/item/radio/cargo_radio + // Should this machine send messages on cargo radio? + var/radio_snitch = TRUE /obj/machinery/cryptominer/Initialize(mapload) . = ..() + + // Create new radio + cargo_radio = new /obj/item/radio(src) + + // Prevent radio listening + cargo_radio.listening = 0 + + // Set radio frequency + cargo_radio.set_frequency(FREQ_SUPPLY) + + // Set default account pay_me = SSeconomy.get_dep_account(ACCOUNT_CAR) /obj/machinery/cryptominer/update_icon() @@ -48,6 +62,7 @@ /obj/machinery/cryptominer/Destroy() STOP_PROCESSING(SSmachines,src) + QDEL_NULL(cargo_radio) return ..() /obj/machinery/cryptominer/deconstruct() @@ -61,35 +76,107 @@ return if(default_unfasten_wrench(user, W)) return + + // Check if disabled + // Check if panel is open + // Check if user is in HELP intent if(!mining && panel_open && user.a_intent == INTENT_HELP) + // Attempt to locate user's ID var/id_card = W.GetID() - if(id_card) - var/obj/item/card/id/CARD = id_card - if(CARD.bank_support != ID_FREE_BANK_ACCOUNT) - to_chat(user, span_warning("This ID has no banking support whatsover, must be an older model...")) - return - if(!CARD.registered_account) - to_chat(user, span_warning("ERROR: No bank account found.")) - return - to_chat(user, span_notice("You link \the [CARD] to \the [src].")) - pay_me = CARD.registered_account - say("Now using [pay_me.account_holder ? "[pay_me.account_holder]s" : span_boldwarning("ERROR")] account.") + + // Check if ID exists + if(!id_card) return + // Define ID card + var/obj/item/card/id/CARD = id_card + + // Check if ID card has banking support + if(CARD.bank_support != ID_FREE_BANK_ACCOUNT) + // Warn in local chat and return + say("ERROR: No banking support found on provided ID card.") + return + + // Check if ID card has a linked account + if(!CARD.registered_account) + // Warn in local chat and return + say("ERROR: No bank account found on provided ID card.") + return + + // Display message in local chat + user.visible_message(span_notice("[user] begins setting \the [src] to use \the [CARD]."), span_notice("[user] begins setting \the [src] to use \the [CARD].")) + + // Display alert balloon + balloon_alert(user, "Configuring new account...") + + // Perform interaction timer + if(!do_after(user, 5 SECONDS, target = src)) + // Warn in local chat + user.visible_message(span_warning("[user] fails to link \the [src] to a new account!"), span_warning("You fail to link \the [src] to a new account!")) + + // Display alert balloon + balloon_alert(user, "Configuration failed!") + + // Return with no further effects + return + + // Alert user of linking success + to_chat(user, span_notice("You link \the [CARD] to \the [src].")) + + // Define previous account + var/old_account = pay_me + + // Set payment account to ID card's account + pay_me = CARD.registered_account + + // Say in local chat + say("Now using [pay_me.account_holder ? "[pay_me.account_holder]s" : span_boldwarning("ERROR")] account.") + + // Log interaction + log_game("[user] set \the [src] in [get_area(src)] to pay into their personal account. Previous account was [old_account].") + + // Check if old account was cargo + // Check if this machine should report over radio + if(radio_snitch && (old_account == SSeconomy.get_dep_account(ACCOUNT_CAR))) + // Send radio notice + cargo_radio.talk_into(src, "CRYPTO ALERT: Crew member [user] has set \the [src] in [get_area(src)] to use [pay_me.account_holder]\'s account, instead of Cargo!", FREQ_SUPPLY) + /obj/machinery/cryptominer/AltClick(mob/user) - user.visible_message(span_warning("[user] begins resetting \the [src]."), - span_warning("You begin resetting \the [src].")) - balloon_alert(user, "resetting") - if(do_after(user, 5 SECONDS, target = src)) - pay_me = SSeconomy.get_dep_account(ACCOUNT_CAR) - say("Now using [pay_me.account_holder]s account.") + // Alert user in chat + user.visible_message(span_warning("[user] begins resetting \the [src]."), span_warning("You begin resetting \the [src].")) + + // Display alert balloon + balloon_alert(user, "Resetting account...") + + // Perform interaction timer + if(!do_after(user, 5 SECONDS, target = src)) + // Warn in local chat + user.visible_message(span_warning("[user] fails to reset \the [src]."), span_warning("You fail to reset \the [src].")) + + // Display alert balloon + balloon_alert(user, "Reset failed!") + + // Return with no further effects + return + + // Define previous account + var/old_account = pay_me + + // Reset account to Cargo + pay_me = SSeconomy.get_dep_account(ACCOUNT_CAR) + + // Say in local chat + say("Now using [pay_me.account_holder]s account.") + + // Log interaction + log_game("[user] reset the \the [src] in [get_area(src)] to pay Cargo's departmental account. Previous account was [old_account]") /obj/machinery/cryptominer/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) . += span_notice("A little screen on the machine reads: Currently the linked bank account is [pay_me.account_holder ? "[pay_me.account_holder]s" : span_boldwarning("ERROR")].") - . += "Modify the destination of the credits using your id on it while it is inactive and has its panel open." - . += "Alt-Click to reset to the Cargo budget." + . += "Modify the destination of the credits using your id on it while it is inactive and has its panel open." + . += "Alt-Click to reset to the Cargo budget." /obj/machinery/cryptominer/process() // Get turf @@ -190,7 +277,7 @@ /obj/machinery/cryptominer/syndie name = "syndicate cryptocurrency miner" - desc = "This handy-dandy machine will produce credits for your enjoyment. It lasts a little longer." + desc = "This handy-dandy machine will produce credits for your own personal enjoyment. This one won't snitch on you to Cargo." icon_state = "off_syndie" density = TRUE use_power = IDLE_POWER_USE @@ -199,6 +286,7 @@ circuit = /obj/item/circuitboard/machine/cryptominer/syndie miningtime = 6000 miningpoints = 100 + radio_snitch = FALSE // Illegal tech! /obj/machinery/cryptominer/syndie/update_icon() . = ..() @@ -219,6 +307,7 @@ active_power_usage = 1 miningtime = 600000 miningpoints = 1000 + radio_snitch = FALSE // None of cargo's business! /obj/machinery/cryptominer/nanotrasen/update_icon() . = ..() diff --git a/modular_sand/code/modules/client/loadout/accessories.dm b/modular_sand/code/modules/client/loadout/accessories.dm index a317069bf4..61562dd38b 100644 --- a/modular_sand/code/modules/client/loadout/accessories.dm +++ b/modular_sand/code/modules/client/loadout/accessories.dm @@ -1,6 +1,5 @@ /datum/gear/accessories/ring - category = LOADOUT_CATEGORY_GLOVES - slot = ITEM_SLOT_HANDS + slot = ITEM_SLOT_ACCESSORY /datum/gear/accessories/ring/goldring name = "A gold ring" diff --git a/modular_sand/code/modules/clothing/gloves/accessories.dm b/modular_sand/code/modules/clothing/gloves/accessories.dm index 1c3986de1f..e2afe193ff 100644 --- a/modular_sand/code/modules/clothing/gloves/accessories.dm +++ b/modular_sand/code/modules/clothing/gloves/accessories.dm @@ -3,7 +3,8 @@ desc = "A tiny gold ring, sized to wrap around a finger." gender = NEUTER w_class = WEIGHT_CLASS_TINY - slot_flags = ITEM_SLOT_GLOVES + slot_flags = ITEM_SLOT_ACCESSORY | ITEM_SLOT_GLOVES + slot_equipment_priority = ITEM_SLOT_ACCESSORY | ITEM_SLOT_GLOVES | ITEM_SLOT_BACKPACK icon = 'icons/obj/ring.dmi' mob_overlay_icon = 'icons/mob/clothing/hands.dmi' icon_state = "ringgold" diff --git a/modular_sand/code/modules/clothing/under/miscellaneous.dm b/modular_sand/code/modules/clothing/under/miscellaneous.dm new file mode 100644 index 0000000000..dd965b8111 --- /dev/null +++ b/modular_sand/code/modules/clothing/under/miscellaneous.dm @@ -0,0 +1,8 @@ +/obj/item/clothing/under/misc/gear_harness + can_adjust = FALSE + body_parts_covered = NONE + +/obj/item/clothing/under/misc/gear_harness/toggle_jumpsuit_adjust() + // Alert user and return + to_chat(usr, span_notice("[src] cannot be adjusted!")) + return FALSE diff --git a/modular_sand/code/modules/mob/living/living_movement.dm b/modular_sand/code/modules/mob/living/living_movement.dm index bf9c5e2912..4a0464ef6b 100644 --- a/modular_sand/code/modules/mob/living/living_movement.dm +++ b/modular_sand/code/modules/mob/living/living_movement.dm @@ -15,6 +15,7 @@ to_chat(src, span_warning("You cannot increase your layer priority any further.")) return + layer = clamp(layer, MOB_LAYER_SHIFT_MIN, MOB_LAYER_SHIFT_MAX) layer += MOB_LAYER_SHIFT_INCREMENT var/layer_priority = FLOOR((layer - MOB_LAYER) * 100, 1) // Just for text feedback to_chat(src, span_notice("Your layer priority is now [layer_priority].")) @@ -31,6 +32,7 @@ to_chat(src, span_warning("You cannot decrease your layer priority any further.")) return + layer = clamp(layer, MOB_LAYER_SHIFT_MIN, MOB_LAYER_SHIFT_MAX) layer -= MOB_LAYER_SHIFT_INCREMENT var/layer_priority = FLOOR((layer - MOB_LAYER) * 100, 1) // Just for text feedback to_chat(src, span_notice("Your layer priority is now [layer_priority].")) diff --git a/modular_sand/code/modules/mob/living/silicon/robot/robot.dm b/modular_sand/code/modules/mob/living/silicon/robot/robot.dm index 1ae172a5c4..184b318d1e 100644 --- a/modular_sand/code/modules/mob/living/silicon/robot/robot.dm +++ b/modular_sand/code/modules/mob/living/silicon/robot/robot.dm @@ -18,3 +18,24 @@ /mob/living/silicon/robot/modules/roleplay/binarycheck() return 0 //Roleplay borgs aren't truly borgs + +/// Allows "cyborg" players to change gender at will +/mob/living/silicon/robot/verb/toggle_gender() + set name = "Set Gender" + set desc = "Allows you to set your gender." + + if(stat != CONSCIOUS) + to_chat(usr, span_warning("You cannot toggle your gender while unconcious!")) + return + + var/choice = tgui_alert(usr, "Select Gender.", "Gender", list("Both", "Male", "Female")) + switch(choice) + if("Both") + has_penis = TRUE + has_vagina = TRUE + if("Male") + has_penis = TRUE + has_vagina = FALSE + if("Female") + has_penis = FALSE + has_vagina = TRUE diff --git a/modular_sand/code/modules/mob/mob.dm b/modular_sand/code/modules/mob/mob.dm index 05b0920a20..ec6412f591 100644 --- a/modular_sand/code/modules/mob/mob.dm +++ b/modular_sand/code/modules/mob/mob.dm @@ -1,6 +1,70 @@ +// Configuration defines +#define JOB_MINIMAL_ACCESS CONFIG_GET(flag/jobs_have_minimal_access) +#define PROTOLOCK_DURING_LOWPOP CONFIG_GET(flag/protolock_during_lowpop) + +// Only Clients should have a panel for them, okay? +/mob/Login() + . = ..() + AddComponent(/datum/component/interaction_menu_granter) + +/mob/Logout() + qdel(GetComponent(/datum/component/interaction_menu_granter)) + . = ..() + +/mob/Initialize(mapload) + . = ..() + register_context() + +/mob/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + . = ..() + if(user.GetComponent(/datum/component/interaction_menu_granter)) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_SHIFT_LMB], INTENT_ANY, "Interact with") + return CONTEXTUAL_SCREENTIP_SET + ///Adjust the thirst of a mob /mob/proc/adjust_thirst(change, max = THIRST_LEVEL_THRESHOLD) thirst = clamp(thirst + change, 0, max) /mob/proc/set_thirst(change) thirst = max(0, change) + +/mob/proc/can_use_production(obj/machinery/rnd/production/machine_target) + // Check if server is NOT using minimal access + // This is intended for low populations + if((!PROTOLOCK_DURING_LOWPOP) && (!JOB_MINIMAL_ACCESS)) + // Allow unrestricted use + return TRUE + + // Define machine user + var/mob/living/carbon/human/machine_user = src + + // Check if user exists + if(!istype(machine_user)) + return TRUE + + // Define user ID card + var/obj/item/card/id/user_id = machine_user.get_idcard() + + // Check if ID card was found + if(!istype(user_id)) + // Warn in local chat, then return + machine_target.say("Access denied: Unable to scan user ID card.") + return FALSE + + // Check for Captain + if(ACCESS_CAPTAIN in user_id.access) + // Allow usage + return TRUE + + // Check if access requirements are met + if(machine_target.check_access(user_id)) + // Allow use + return TRUE + + // User does not have access + // Warn in local chat, then return + machine_target.say("Access denied: No valid departmental credentials detected.") + return FALSE + +#undef JOB_MINIMAL_ACCESS +#undef PROTOLOCK_DURING_LOWPOP diff --git a/modular_sand/code/modules/pixel_shift/pixel_shift.dm b/modular_sand/code/modules/pixel_shift/pixel_shift.dm new file mode 100644 index 0000000000..253ab050f3 --- /dev/null +++ b/modular_sand/code/modules/pixel_shift/pixel_shift.dm @@ -0,0 +1,101 @@ +#define MAXIMUM_PIXEL_SHIFT 16 +#define PASSABLE_SHIFT_THRESHOLD 8 + +/mob + /// If we are in the shifting setting. + var/shifting = FALSE + + /// Takes the four cardinal direction defines. Any atoms moving into this atom's tile will be allowed to from the added directions. + var/passthroughable = NONE + +/datum/keybinding/mob/pixel_shift + hotkey_keys = list("B") + name = "pixel_shift" + full_name = "Pixel Shift" + description = "Shift your characters offset." + category = CATEGORY_MOVEMENT + keybind_signal = COMSIG_KB_MOB_PIXELSHIFT + +/datum/keybinding/mob/pixel_shift/down(client/user) + . = ..() + if(.) + return + var/mob/M = user.mob + M.shifting = TRUE + return TRUE + +/datum/keybinding/mob/pixel_shift/up(client/user) + . = ..() + if(.) + return + var/mob/M = user.mob + M.shifting = FALSE + return TRUE + +/mob/proc/unpixel_shift() + return + +/mob/living/unpixel_shift() + . = ..() + passthroughable = NONE + if(is_shifted) + is_shifted = FALSE + pixel_x = get_standard_pixel_x_offset() + base_pixel_x + client?.pixel_x = 0 + pixel_y = get_standard_pixel_y_offset() + base_pixel_y + client?.pixel_y = 0 + +/mob/proc/pixel_shift(direction) + return + +/mob/living/set_pull_offsets(mob/living/pull_target, grab_state) + pull_target.unpixel_shift() + return ..() + +/mob/living/reset_pull_offsets(mob/living/pull_target, override) + pull_target.unpixel_shift() + return ..() + +/mob/living/pixel_shift(direction) + passthroughable = NONE + // switch(direction) // diagonal pixel-shifting, rejoice + if(CHECK_BITFIELD(direction, NORTH)) + if(pixel_y <= MAXIMUM_PIXEL_SHIFT + base_pixel_y) + pixel_y++ + client?.pixel_y++ + is_shifted = TRUE + if(CHECK_BITFIELD(direction, EAST)) + if(pixel_x <= MAXIMUM_PIXEL_SHIFT + base_pixel_x) + pixel_x++ + client?.pixel_x++ + is_shifted = TRUE + if(CHECK_BITFIELD(direction, SOUTH)) + if(pixel_y >= -MAXIMUM_PIXEL_SHIFT + base_pixel_y) + pixel_y-- + client?.pixel_y-- + is_shifted = TRUE + if(CHECK_BITFIELD(direction, WEST)) + if(pixel_x >= -MAXIMUM_PIXEL_SHIFT + base_pixel_x) + pixel_x-- + client?.pixel_x-- + is_shifted = TRUE + + // Yes, I know this sets it to true for everything if more than one is matched. + // Movement doesn't check diagonals, and instead just checks EAST or WEST, depending on where you are for those. + if(pixel_y > PASSABLE_SHIFT_THRESHOLD) + passthroughable |= EAST | SOUTH | WEST + if(pixel_x > PASSABLE_SHIFT_THRESHOLD) + passthroughable |= NORTH | SOUTH | WEST + if(pixel_y < -PASSABLE_SHIFT_THRESHOLD) + passthroughable |= NORTH | EAST | WEST + if(pixel_x < -PASSABLE_SHIFT_THRESHOLD) + passthroughable |= NORTH | EAST | SOUTH + +/mob/living/CanAllowThrough(atom/movable/mover, turf/target) + // Make sure to not allow projectiles of any kind past where they normally wouldn't. + if(!istype(mover, /obj/item/projectile) && !mover.throwing && passthroughable & mover.dir) + return TRUE + return ..() + +#undef MAXIMUM_PIXEL_SHIFT +#undef PASSABLE_SHIFT_THRESHOLD diff --git a/modular_sand/code/modules/research/machinery/_production.dm b/modular_sand/code/modules/research/machinery/_production.dm new file mode 100644 index 0000000000..936840ad4a --- /dev/null +++ b/modular_sand/code/modules/research/machinery/_production.dm @@ -0,0 +1,29 @@ +/obj/machinery/rnd/production/Initialize(mapload) + . = ..() + + // Generate access lists + gen_access() + +/obj/machinery/rnd/production/ui_interact(mob/user) + // Check if access is required + if(!req_access) + return ..() + + // Check if user can use machine + if(!user.can_use_production(src)) + return + + // Return normally + . = ..() + +/obj/machinery/rnd/production/Topic(raw, ls) + // Check if access is required + if(!req_access) + return ..() + + // Check if user can use machine + if(!usr.can_use_production(src)) + return + + // Return normally + . = ..() diff --git a/modular_sand/code/modules/research/machinery/departmental_circuit_imprinter.dm b/modular_sand/code/modules/research/machinery/departmental_circuit_imprinter.dm new file mode 100644 index 0000000000..712ea33cda --- /dev/null +++ b/modular_sand/code/modules/research/machinery/departmental_circuit_imprinter.dm @@ -0,0 +1,2 @@ +/obj/machinery/rnd/production/circuit_imprinter/department/science + req_access = list(ACCESS_RESEARCH) diff --git a/modular_sand/code/modules/research/machinery/departmental_protolathe.dm b/modular_sand/code/modules/research/machinery/departmental_protolathe.dm new file mode 100644 index 0000000000..4904828374 --- /dev/null +++ b/modular_sand/code/modules/research/machinery/departmental_protolathe.dm @@ -0,0 +1,17 @@ +/obj/machinery/rnd/production/protolathe/department/engineering + req_access = list(ACCESS_ENGINE) + +/obj/machinery/rnd/production/protolathe/department/service + req_one_access = list(ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR) + +/obj/machinery/rnd/production/protolathe/department/medical + req_access = list(ACCESS_MEDICAL) + +/obj/machinery/rnd/production/protolathe/department/cargo + req_access = list(ACCESS_CARGO) + +/obj/machinery/rnd/production/protolathe/department/science + req_access = list(ACCESS_RESEARCH) + +/obj/machinery/rnd/production/protolathe/department/security + req_access = list(ACCESS_SECURITY) diff --git a/modular_sand/code/modules/research/machinery/departmental_techfab.dm b/modular_sand/code/modules/research/machinery/departmental_techfab.dm new file mode 100644 index 0000000000..7f9601ab3a --- /dev/null +++ b/modular_sand/code/modules/research/machinery/departmental_techfab.dm @@ -0,0 +1,17 @@ +/obj/machinery/rnd/production/techfab/department/engineering + req_access = list(ACCESS_ENGINE) + +/obj/machinery/rnd/production/techfab/department/service + req_one_access = list(ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR) + +/obj/machinery/rnd/production/techfab/department/medical + req_access = list(ACCESS_MEDICAL) + +/obj/machinery/rnd/production/techfab/department/cargo + req_access = list(ACCESS_CARGO) + +/obj/machinery/rnd/production/techfab/department/science + req_access = list(ACCESS_RESEARCH) + +/obj/machinery/rnd/production/techfab/department/security + req_access = list(ACCESS_SECURITY) diff --git a/modular_sand/code/modules/research/rdconsole.dm b/modular_sand/code/modules/research/rdconsole.dm new file mode 100644 index 0000000000..0248ae315b --- /dev/null +++ b/modular_sand/code/modules/research/rdconsole.dm @@ -0,0 +1,2 @@ +/obj/machinery/computer/rdconsole + locked = TRUE diff --git a/modular_sand/code/modules/resize/resizing.dm b/modular_sand/code/modules/resize/resizing.dm index 9d0302561d..913fcbb294 100644 --- a/modular_sand/code/modules/resize/resizing.dm +++ b/modular_sand/code/modules/resize/resizing.dm @@ -19,12 +19,12 @@ return TRUE //Doing messages - if(abs(get_size(user)/get_size(target) >= 2)) //if the initiator is twice the size of the micro + if(COMPARE_SIZES(user, target) >= 2) //if the initiator is twice the size of the micro now_pushing = 0 user.forceMove(target.loc) //Smaller person being stepped on - if(get_size(user) > get_size(target) && iscarbon(src)) + if(iscarbon(src)) if(istype(user) && user.dna.features["taur"] == "Naga" || user.dna.features["taur"] == "Tentacle") target.visible_message(span_notice("[src] carefully slithers around [target]."), span_notice("[src]'s huge tail slithers besides you.")) else @@ -32,7 +32,7 @@ return TRUE //Smaller person stepping under a larger person - if(abs(get_size(target)/get_size(user)) >= 2) + if(COMPARE_SIZES(target, user) >= 2) user.forceMove(target.loc) now_pushing = 0 micro_step_under(target) @@ -59,7 +59,7 @@ user.forceMove(target.loc) return TRUE - if(abs(get_size(user)/get_size(target)) >= 2) + if(COMPARE_SIZES(user, target) >= 2) log_combat(user, target, "stepped on", addition="[user.a_intent] trample") if(user.a_intent == "disarm" && CHECK_MOBILITY(user, MOBILITY_MOVE) && !user.buckled) now_pushing = 0 @@ -67,7 +67,7 @@ user.sizediffStamLoss(target) user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE) //Full stop addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 3) //0.3 seconds - if(get_size(user) > get_size(target) && iscarbon(user)) + if(iscarbon(user)) if(istype(user) && user.dna.features["taur"] == "Naga" || user.dna.features["taur"] == "Tentacle") target.visible_message(span_danger("[src] carefully rolls their tail over [target]!"), span_danger("[src]'s huge tail rolls over you!")) else @@ -83,7 +83,7 @@ user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE) addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 10) //1 second //user.Stun(20) - if(get_size(user) > get_size(target) && iscarbon(user)) + if(iscarbon(user)) if(istype(user) && (user.dna.features["taur"] == "Naga" || user.dna.features["taur"] == "Tentacle")) target.visible_message(span_danger("[src] mows down [target] under their tail!"), span_userdanger("[src] plows their tail over you mercilessly!")) else @@ -97,7 +97,7 @@ user.sizediffStun(target) user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE) addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 7)//About 3/4th a second - if(get_size(user) > get_size(target) && iscarbon(user)) + if(iscarbon(user)) var/feetCover = (user.wear_suit && (user.wear_suit.body_parts_covered & FEET)) || (user.w_uniform && (user.w_uniform.body_parts_covered & FEET) || (user.shoes && (user.shoes.body_parts_covered & FEET))) if(feetCover) if(user?.dna?.features["taur"] == "Naga" || user?.dna?.features["taur"] == "Tentacle") @@ -116,7 +116,7 @@ SEND_SIGNAL(target, COMSIG_MICRO_PICKUP_FEET, user) return TRUE - if(abs(get_size(target)/get_size(user)) >= 2) + if(COMPARE_SIZES(target, user) >= 2) user.forceMove(target.loc) now_pushing = 0 micro_step_under(target) @@ -141,17 +141,17 @@ //Proc for scaling stamina damage on size difference /mob/living/carbon/proc/sizediffStamLoss(mob/living/carbon/target) - var/S = (get_size(src)/get_size(target)*25) //macro divided by micro, times 25 + var/S = COMPARE_SIZES(src, target) * 25 //macro divided by micro, times 25 target.Knockdown(S) //final result in stamina knockdown //Proc for scaling stuns on size difference (for grab intent) /mob/living/carbon/proc/sizediffStun(mob/living/carbon/target) - var/T = (get_size(src)/get_size(target)*2) //Macro divided by micro, times 2 + var/T = COMPARE_SIZES(src, target) * 2 //Macro divided by micro, times 2 target.Stun(T) //Proc for scaling brute damage on size difference /mob/living/carbon/proc/sizediffBruteloss(mob/living/carbon/target) - var/B = (get_size(src)/get_size(target)*3) //macro divided by micro, times 3 + var/B = COMPARE_SIZES(src, target) * 3 //macro divided by micro, times 3 target.adjustBruteLoss(B) //final result in brute loss //Proc for instantly grabbing valid size difference. Code optimizations soon(TM) diff --git a/modular_sand/code/modules/surgery/organs/organ_internal.dm b/modular_sand/code/modules/surgery/organs/organ_internal.dm new file mode 100644 index 0000000000..1492bce86b --- /dev/null +++ b/modular_sand/code/modules/surgery/organs/organ_internal.dm @@ -0,0 +1,22 @@ +/obj/item/organ/Insert(mob/living/carbon/organ_mob, special, drop_if_replaced) + . = ..() + + // Check parent return + if(!.) + return + + // Send signal to mob + SEND_SIGNAL(organ_mob, COMSIG_MOB_ORGAN_ADD, src, special, drop_if_replaced) + +/obj/item/organ/Remove(special) + . = ..() + + // Define organ mob + var/mob/living/carbon/organ_mob = . || null + + // Check if organ mob exists + if(!istype(organ_mob)) + return + + // Send signal to mob + SEND_SIGNAL(organ_mob, COMSIG_MOB_ORGAN_REMOVE, src, special) diff --git a/modular_sand/code/modules/uplink/uplink_items.dm b/modular_sand/code/modules/uplink/uplink_items.dm index be6d85b8f5..fca6b3cf20 100644 --- a/modular_sand/code/modules/uplink/uplink_items.dm +++ b/modular_sand/code/modules/uplink/uplink_items.dm @@ -11,3 +11,7 @@ desc = "An additional arm harvested from slaves captured by the Syndicate. Comes with an implanter." item = /obj/item/extra_arm cost = 8 + +// Made craftable, and no longer illegal +/datum/uplink_item/ammo/revolver + illegal_tech = FALSE diff --git a/modular_splurt/code/_globalvars/lists/mobs.dm b/modular_splurt/code/_globalvars/lists/mobs.dm index 92a3c83791..22062af329 100644 --- a/modular_splurt/code/_globalvars/lists/mobs.dm +++ b/modular_splurt/code/_globalvars/lists/mobs.dm @@ -1 +1,2 @@ GLOBAL_LIST_EMPTY(discord_passthrough) +GLOBAL_LIST_EMPTY(ssd_mob_list) // Player mobs that are SSD diff --git a/modular_splurt/code/controllers/configuration/entries/splurt_autocryo.dm b/modular_splurt/code/controllers/configuration/entries/splurt_autocryo.dm new file mode 100644 index 0000000000..c94e2e3d98 --- /dev/null +++ b/modular_splurt/code/controllers/configuration/entries/splurt_autocryo.dm @@ -0,0 +1,8 @@ +// Time before sending the user to cryo +/datum/config_entry/number/autocryo_time_trigger + config_entry_value = 24000 + min_val = 600 + integer = TRUE + +// Should this system be used? +/datum/config_entry/flag/autocryo_enabled diff --git a/modular_splurt/code/controllers/subsystem/afk.dm b/modular_splurt/code/controllers/subsystem/afk.dm new file mode 100644 index 0000000000..70e213c269 --- /dev/null +++ b/modular_splurt/code/controllers/subsystem/afk.dm @@ -0,0 +1,43 @@ +// Define config entries for cryo +#define SUBSYSTEM_CRYO_CAN_RUN CONFIG_GET(flag/autocryo_enabled) +#define SUBSYSTEM_CRYO_TIME CONFIG_GET(number/autocryo_time_trigger) + +SUBSYSTEM_DEF(auto_cryo) + name = "Automated Cryogenics" + flags = SS_BACKGROUND + +/datum/controller/subsystem/auto_cryo/Initialize() + // Check config before running + if(!SUBSYSTEM_CRYO_CAN_RUN) + can_fire = FALSE + + return ..() + +/datum/controller/subsystem/auto_cryo/fire() + // Check for any targets + if(!GLOB.ssd_mob_list.len) + // No SSD mobs exist + return + + // Check possible targets + for(var/mob/living/cryo_mob in GLOB.ssd_mob_list) + // Get SSD time + // This is set when disconnecting + var/afk_time = world.time - cryo_mob.lastclienttime + + // Check if client meets the time requirement + if(afk_time < SUBSYSTEM_CRYO_TIME) + continue + + // Send to cryo + cryoMob(cryo_mob, effects = TRUE) + + // Remove from SSD list + GLOB.ssd_mob_list -= cryo_mob + + // Log cryo interaction + log_game("[cryo_mob] was sent to cryo after being SSD for [afk_time] ticks.") + +// Remove defines +#undef SUBSYSTEM_CRYO_CAN_RUN +#undef SUBSYSTEM_CRYO_TIME diff --git a/modular_splurt/code/datums/components/dullahan.dm b/modular_splurt/code/datums/components/dullahan.dm index a8558a5835..6fae1b981d 100644 --- a/modular_splurt/code/datums/components/dullahan.dm +++ b/modular_splurt/code/datums/components/dullahan.dm @@ -1,3 +1,15 @@ +#define HEAD_ACCESSORIES_PATHS list(\ + /obj/item/clothing/head = 'icons/mob/clothing/head.dmi',\ + /obj/item/clothing/glasses = 'icons/mob/clothing/eyes.dmi',\ + /obj/item/reagent_containers/glass/bucket = 'icons/mob/clothing/head.dmi',\ + /obj/item/reagent_containers/rag/towel = 'icons/mob/clothing/head.dmi',\ + /obj/item/paper = 'icons/mob/clothing/head.dmi',\ + /obj/item/nullrod/fedora = 'icons/mob/clothing/head.dmi',\ + ) + +/obj/item/organ/eyes/dullahan + tint = 0 + /datum/component/neckfire var/mutable_appearance/neck_fire @@ -30,7 +42,7 @@ neck_fire.icon_state = "neckfire" neck_fire.color = fire_color - neck_fire.plane = 19 // glowy i hope + //neck_fire.plane = 19 // glowy i hope var/datum/action/neckfire/A = new /datum/action/neckfire(src) A.Grant(M) @@ -72,3 +84,84 @@ var/mob/living/carbon/human/H = quirk_holder if(H.dna.features["neckfire"] && !istype(H, /mob/living/carbon/human/dummy)) H.AddComponent(/datum/component/neckfire, H.dna.features["neckfire_color"]) + +/datum/component/dullahan + var/obj/item/clothing/head_accessory + var/mutable_appearance/head_accessory_MA + +/datum/component/dullahan/Initialize() + . = ..() + RegisterSignal(dullahan_head, COMSIG_MOUSEDROPPED_ONTO, .proc/on_mouse_dropped) + RegisterSignal(dullahan_head, COMSIG_MOUSEDROP_ONTO, .proc/on_mouse_drop) + +/datum/component/dullahan/proc/add_head_accessory(obj/item/clothing/I, item_path) + head_accessory_MA = mutable_appearance(I.mob_overlay_icon || HEAD_ACCESSORIES_PATHS[item_path]) + head_accessory_MA.icon_state = I.icon_state + I.forceMove(dullahan_head) + + dullahan_head.add_overlay(head_accessory_MA) + head_accessory = I + +/datum/component/dullahan/proc/remove_head_accessory(obj/item/clothing/I) + dullahan_head.cut_overlay(head_accessory_MA) + head_accessory = null + +/datum/component/dullahan/proc/on_mouse_dropped(datum/source, obj/item/I, mob/living/user) + var/mob/living/carbon/owner = dullahan_head.owner + var/item_path + + for(var/type in HEAD_ACCESSORIES_PATHS) + if(istype(I, type)) + item_path = type + break + + if(item_path && !head_accessory) + if(istype(I, /obj/item/clothing)) + var/obj/item/organ/eyes/dullahan/eyes = owner.getorganslot(ORGAN_SLOT_EYES) + var/obj/item/clothing/clothing = I + + eyes.flash_protect = clothing.flash_protect + eyes.tint = clothing.tint + owner.update_tint() + + add_head_accessory(I, item_path) + else + to_chat(user, span_notice("You can't put \the [I.name] on the head of \the [owner.name]")) + return + +/datum/component/dullahan/proc/on_mouse_drop(datum/source, atom/A, mob/living/user) + var/mob/living/carbon/owner = dullahan_head.owner + + if(head_accessory) + if(istype(A, /turf/open)) + head_accessory.forceMove(A) + else if(istype(A, /atom/movable/screen/inventory/hand)) + var/atom/movable/screen/inventory/hand/H = A + + user.put_in_hand(head_accessory, H.held_index) + else + return + + var/obj/item/organ/eyes/dullahan/eyes = owner.getorganslot(ORGAN_SLOT_EYES) + eyes.flash_protect = 0 + eyes.tint = 0 + owner.update_tint() + + remove_head_accessory(head_accessory) + +/datum/action/item_action/organ_action/dullahan/proc/toggle_monochromacy() + var/obj/item/organ/eyes/eyes = owner.getorganslot(ORGAN_SLOT_EYES) + + if(eyes.monochromacy_on) + owner.remove_client_colour(/datum/client_colour/monochrome) + else + owner.add_client_colour(/datum/client_colour/monochrome) + + eyes.monochromacy_on = !eyes.monochromacy_on + +/obj/item/organ/eyes + var/monochromacy_on = FALSE + +/datum/action/item_action/organ_action/dullahan/Grant(mob/M) + . = ..() + toggle_monochromacy() diff --git a/modular_splurt/code/datums/interactions/lewd/_lewd.dm b/modular_splurt/code/datums/interactions/lewd/_lewd.dm index a5579511b5..2cd1a55817 100644 --- a/modular_splurt/code/datums/interactions/lewd/_lewd.dm +++ b/modular_splurt/code/datums/interactions/lewd/_lewd.dm @@ -127,6 +127,7 @@ ass = new ass.Insert(partner) ass.climax_modify_size(src, getorganslot(ORGAN_SLOT_PENIS)) + else switch(last_genital.type) if(/obj/item/organ/genital/penis) @@ -193,6 +194,10 @@ ass = new ass.Insert(partner) ass.climax_modify_size(src, last_genital) + if(iswendigo(partner) && partner.pulling == src) + var/mob/living/carbon/wendigo/W = partner + W.slaves |= src + to_chat(src, " You are now [W]'s slave! Serve your master properly! ") if(!message) return ..() if(gender == MALE) diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm index 70a84f4d82..89e8ec6f9a 100644 --- a/modular_splurt/code/datums/traits/good.dm +++ b/modular_splurt/code/datums/traits/good.dm @@ -48,6 +48,52 @@ quirk_holder.weather_immunities -= "ash" */ +/datum/quirk/rad_fiend + name = "Rad Fiend" + desc = "You've been blessed by Cherenkov's warming light, causing you to emit a subtle glow at all times. Only intense radiation is capable of penetrating your protective barrier." + value = 2 + mob_trait = TRAIT_RAD_FIEND + gain_text = span_notice("You feel empowered by Cherenkov's glow.") + lose_text = span_notice("You realize that rads aren't so rad.") + + // Variable for the radiation immunity check + var/can_gain = TRUE + +/datum/quirk/rad_fiend/add() + // Define quirk holder mob + var/mob/living/carbon/human/quirk_mob = quirk_holder + + // Check for any radiation immunity + if(HAS_TRAIT(quirk_mob, TRAIT_RADIMMUNE)) + // Set gain status + can_gain = FALSE + + // Return without doing anything + return + + // Add glow control action + var/datum/action/rad_fiend/update_glow/quirk_action = new + quirk_action.Grant(quirk_mob) + +/datum/quirk/rad_fiend/post_add() + // Check if quirk effect was gained + if(can_gain) + return + + // Alert quirk holder of gain status + to_chat(quirk_holder, span_warning("As you are immune to radiation, you were unable to gain Cherenkov's blessing. Please discuss alternatives with a medical professional.")) + +/datum/quirk/rad_fiend/remove() + // Define quirk holder mob + var/mob/living/carbon/human/quirk_mob = quirk_holder + + // Remove glow control action + var/datum/action/rad_fiend/update_glow/quirk_action = locate() in quirk_mob.actions + quirk_action.Remove(quirk_mob) + + // Remove glow effect + quirk_mob.remove_filter("rad_fiend_glow") + /datum/quirk/dominant_aura name = "Dominant Aura" desc = "Your mere presence is assertive enough to appear as powerful to other people, so much in fact that the weaker kind can't help but throw themselves at your feet at the snap of a finger." diff --git a/modular_splurt/code/datums/traits/neutral.dm b/modular_splurt/code/datums/traits/neutral.dm index 8a8608dd42..e2f5cbe1b1 100644 --- a/modular_splurt/code/datums/traits/neutral.dm +++ b/modular_splurt/code/datums/traits/neutral.dm @@ -152,7 +152,6 @@ gain_text = span_notice("You feel like being someone's pet...") lose_text = span_notice("You no longer feel like being a pet...") processing_quirk = TRUE - var/mood_category = "dom_trained" var/notice_delay = 0 var/mob/living/carbon/human/last_dom @@ -202,10 +201,10 @@ //Handle the mood var/datum/component/mood/mood = quirk_holder.GetComponent(/datum/component/mood) - if(istype(mood.mood_events[mood_category], /datum/mood_event/dominant/good_boy)) - SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, mood_category, /datum/mood_event/dominant/good_boy) + if(istype(mood.mood_events[QMOOD_WELL_TRAINED], /datum/mood_event/dominant/good_boy)) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, QMOOD_WELL_TRAINED, /datum/mood_event/dominant/good_boy) else - SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, mood_category, /datum/mood_event/dominant/need) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, QMOOD_WELL_TRAINED, /datum/mood_event/dominant/need) //Don't do anything if a previous dom was found if(last_dom) @@ -279,7 +278,6 @@ // The shame is unbearable mood_quirk = FALSE processing_quirk = FALSE - var/mood_category = "backpack_implant_mood" /datum/quirk/storage_concealment/on_spawn() . = ..() @@ -295,10 +293,10 @@ // Check the quirk holder for the trait if(HAS_TRAIT(quirk_holder, TRAIT_HIDE_BACKPACK)) // When found: Mood bonus - SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, mood_category, /datum/mood_event/dorsualiphobic_mood_positive) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, QMOOD_HIDE_BAG, /datum/mood_event/dorsualiphobic_mood_positive) else // When not found: Mood penalty - SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, mood_category, /datum/mood_event/dorsualiphobic_mood_negative) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, QMOOD_HIDE_BAG, /datum/mood_event/dorsualiphobic_mood_negative) //succubus and incubus below /datum/quirk/incubus @@ -700,15 +698,14 @@ value = 0 mood_quirk = TRUE processing_quirk = TRUE - var/mood_category = "nudist_mood" /datum/quirk/nudist/on_process() var/mob/living/carbon/human/H = quirk_holder // Checking torso exposure appears to be a robust method. if( ( H.is_chest_exposed() && H.is_groin_exposed() ) ) - SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, mood_category, /datum/mood_event/nudist_positive) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, QMOOD_NUDIST, /datum/mood_event/nudist_positive) else - SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, mood_category, /datum/mood_event/nudist_negative) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, QMOOD_NUDIST, /datum/mood_event/nudist_negative) /datum/quirk/nudist/on_spawn() . = ..() @@ -727,15 +724,14 @@ mood_quirk = TRUE medical_record_text = "Patient feels more secure when wearing a gas mask." processing_quirk = TRUE - var/mood_category = "masked_mook" /datum/quirk/masked_mook/on_process() var/mob/living/carbon/human/H = quirk_holder var/obj/item/clothing/mask/gas/gasmask = H.get_item_by_slot(ITEM_SLOT_MASK) if(istype(gasmask)) - SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, mood_category, /datum/mood_event/masked_mook) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, QMOOD_MASKED_MOOK, /datum/mood_event/masked_mook) else - SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, mood_category, /datum/mood_event/masked_mook_incomplete) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, QMOOD_MASKED_MOOK, /datum/mood_event/masked_mook_incomplete) /datum/quirk/masked_mook/on_spawn() . = ..() diff --git a/modular_splurt/code/datums/traits/trait_actions.dm b/modular_splurt/code/datums/traits/trait_actions.dm index 80f77b2058..5e553ae64d 100644 --- a/modular_splurt/code/datums/traits/trait_actions.dm +++ b/modular_splurt/code/datums/traits/trait_actions.dm @@ -1338,3 +1338,67 @@ return else to_chat(H, span_warning("You are already conserving your energy!")) + +// +// Quirk: Rad Fiend +// + +/datum/action/rad_fiend + name = "Broken Rad Action" + desc = "Report this to a coder." + icon_icon = 'icons/effects/effects.dmi' + button_icon_state = "static" + +/datum/action/rad_fiend/update_glow + name = "Modify Glow" + desc = "Change your radioactive glow color." + button_icon_state = "blank" + + // Glow color to use + var/glow_color = "#39ff14" // Neon green + + // Thickness of glow outline + var/glow_range = 2 + +/datum/action/rad_fiend/update_glow/Grant() + . = ..() + + // Define user mob + var/mob/living/carbon/human/action_mob = owner + + // Add outline effect + action_mob.add_filter("rad_fiend_glow", 1, list("type" = "outline", "color" = glow_color+"30", "size" = glow_range)) + +/datum/action/rad_fiend/update_glow/Remove() + . = ..() + + // Define user mob + var/mob/living/carbon/human/action_mob = owner + + // Remove glow + action_mob.remove_filter("rad_fiend_glow") + +/datum/action/rad_fiend/update_glow/Trigger() + . = ..() + + // Define user mob + var/mob/living/carbon/human/action_mob = owner + + // Ask user for color input + var/input_color = input(action_mob, "Select a color to use for your glow outline.", "Select Glow Color", glow_color) as color|null + + // Check if color input was given + // Reset to stored color when not given input + glow_color = (input_color ? input_color : glow_color) + + // Ask user for range input + var/input_range = input(action_mob, "How much do you glow? Value may range between 1 to 2.", "Select Glow Range", glow_range) as num|null + + // Check if range input was given + // Reset to stored color when not given input + // Input is clamped in the 1-2 range + glow_range = (input_range ? clamp(input_range, 1, 2) : glow_range) + + // Update outline effect + action_mob.remove_filter("rad_fiend_glow") + action_mob.add_filter("rad_fiend_glow", 1, list("type" = "outline", "color" = glow_color+"30", "size" = glow_range)) diff --git a/modular_splurt/code/game/objects/effects/landmarks.dm b/modular_splurt/code/game/objects/effects/landmarks.dm index 1d26983266..6825efe6ca 100644 --- a/modular_splurt/code/game/objects/effects/landmarks.dm +++ b/modular_splurt/code/game/objects/effects/landmarks.dm @@ -23,6 +23,12 @@ icon = 'modular_splurt/icons/mob/landmarks.dmi' icon_state = "Psychologist" +/obj/effect/landmark/start/stowaway + name = "Stowaway" + icon = 'modular_splurt/icons/mob/landmarks.dmi' + icon_state = "Stowaway" + jobspawn_override = TRUE //spawn in maint + delete_after_roundstart = FALSE //Landmark that creates destinations for the navigate verb to path to /obj/effect/landmark/navigate_destination diff --git a/modular_splurt/code/modules/antagonists/slaver/slaver.dm b/modular_splurt/code/modules/antagonists/slaver/slaver.dm index 610e12b74d..7638cc11f3 100644 --- a/modular_splurt/code/modules/antagonists/slaver/slaver.dm +++ b/modular_splurt/code/modules/antagonists/slaver/slaver.dm @@ -44,6 +44,7 @@ GLOBAL_LIST_INIT(slavers_ransom_values, list( "Scientist" = SLAVER_STANDARD_RANSOM, "Roboticist" = SLAVER_STANDARD_RANSOM, "Prisoner" = SLAVER_STANDARD_RANSOM, + "Stowaway" = SLAVER_STANDARD_RANSOM, "Curator" = SLAVER_STANDARD_RANSOM, "Lawyer" = SLAVER_STANDARD_RANSOM, "Chaplain" = SLAVER_STANDARD_RANSOM, diff --git a/modular_splurt/code/modules/antagonists/wendigo/mob/defines_init.dm b/modular_splurt/code/modules/antagonists/wendigo/mob/defines_init.dm index 3b2fb09aa3..9cc5b9de67 100644 --- a/modular_splurt/code/modules/antagonists/wendigo/mob/defines_init.dm +++ b/modular_splurt/code/modules/antagonists/wendigo/mob/defines_init.dm @@ -37,6 +37,8 @@ var/obj/item/ears_extra = null var/obj/item/wrists = null + var/list/slaves = list() //people enslaved + /mob/living/carbon/wendigo/Initialize() . = ..() /* //TODO: Uncomment when objectives + forest get finished @@ -79,6 +81,7 @@ /mob/living/carbon/wendigo/Destroy() QDEL_NULL(physiology) + slaves.Cut() return ..() /mob/living/carbon/wendigo/update_body_parts() @@ -107,8 +110,10 @@ return TRUE /mob/living/carbon/wendigo/IsAdvancedToolUser() return TRUE +/* So they can be pulled. /mob/living/carbon/wendigo/can_be_pulled() return FALSE +*/ /mob/living/carbon/wendigo/is_literate() return TRUE /mob/living/carbon/wendigo/canBeHandcuffed() @@ -122,7 +127,7 @@ //ORGANS // /mob/living/carbon/wendigo/create_internal_organs() - internal_organs += new /obj/item/organ/eyes/wendigo + internal_organs += new /obj/item/organ/eyes/night_vision/wendigo internal_organs += new /obj/item/organ/liver/wendigo internal_organs += new /obj/item/organ/tongue @@ -131,3 +136,12 @@ internal_organs += new /obj/item/organ/stomach internal_organs += new /obj/item/organ/ears ..() + +/mob/living/carbon/wendigo/movement_delay() + . = ..() + var/adding = 0 + var/turf/T = get_turf(src) + if(T.get_lumcount() < 0.2) + adding += 1 + . += adding + diff --git a/modular_splurt/code/modules/antagonists/wendigo/mob/organs_bodyparts.dm b/modular_splurt/code/modules/antagonists/wendigo/mob/organs_bodyparts.dm index 11c74a7573..5fba7e8215 100644 --- a/modular_splurt/code/modules/antagonists/wendigo/mob/organs_bodyparts.dm +++ b/modular_splurt/code/modules/antagonists/wendigo/mob/organs_bodyparts.dm @@ -20,7 +20,7 @@ var/mob/living/carbon/wendigo/A = C A.metabolize_hunger() -/obj/item/organ/eyes/wendigo +/obj/item/organ/eyes/night_vision/wendigo sight_flags = SEE_MOBS /obj/item/bodypart/head/wendigo diff --git a/modular_splurt/code/modules/antagonists/wendigo/mob/wendigo_defense.dm b/modular_splurt/code/modules/antagonists/wendigo/mob/wendigo_defense.dm new file mode 100644 index 0000000000..d6a9a2314e --- /dev/null +++ b/modular_splurt/code/modules/antagonists/wendigo/mob/wendigo_defense.dm @@ -0,0 +1,63 @@ +/mob/living/carbon/wendigo/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE) + if(user.a_intent == INTENT_HARM) + . = ..(user, TRUE) + if(.) + return + adjustBruteLoss(15) + var/hitverb = "punched" + if(mob_size < MOB_SIZE_LARGE) + step_away(src,user,15) + sleep(1) + step_away(src,user,15) + hitverb = "slammed" + playsound(loc, "punch", 25, 1, -1) + visible_message("[user] has [hitverb] [src]!", \ + "[user] has [hitverb] [src]!", null, COMBAT_MESSAGE_RANGE) + return 1 + +/mob/living/carbon/wendigo/on_attack_hand(mob/living/carbon/human/M) + . = ..() + if(.) //To allow surgery to return properly. + return + switch(M.a_intent) + if (INTENT_HARM) + if(M != pulling && !src.slaves.Find(M)) + var/damage = rand(1, 9) + if (prob(90)) + playsound(loc, "punch", 25, 1, -1) + visible_message("[M] has punched [src]!", \ + "[M] has punched [src]!", null, COMBAT_MESSAGE_RANGE) + var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) + apply_damage(damage, BRUTE, affecting) + log_combat(M, src, "attacked") + M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) + else + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + visible_message("[M] has attempted to punch [src]!", \ + "[M] has attempted to punch [src]!", null, COMBAT_MESSAGE_RANGE) + + if (INTENT_DISARM) + if (!lying && M != pulling && !src.slaves.Find(M)) + M.do_attack_animation(src, ATTACK_EFFECT_DISARM) + if (prob(5)) + Unconscious(40) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + log_combat(M, src, "pushed") + visible_message("[M] has pushed down [src]!", \ + "[M] has pushed down [src]!") + else + if (prob(50)) + dropItemToGround(get_active_held_item()) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + visible_message("[M] has disarmed [src]!", \ + "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE) + else + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + visible_message("[M] has attempted to disarm [src]!",\ + "[M] has attempted to disarm [src]!", null, COMBAT_MESSAGE_RANGE) + +/mob/living/carbon/wendigo/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect) + if(!no_effect && !visual_effect_icon) + visual_effect_icon = ATTACK_EFFECT_CLAW + ..() + diff --git a/modular_splurt/code/modules/arousal/arousal.dm b/modular_splurt/code/modules/arousal/arousal.dm index b60b8e95e1..2fb47ccef0 100644 --- a/modular_splurt/code/modules/arousal/arousal.dm +++ b/modular_splurt/code/modules/arousal/arousal.dm @@ -1,6 +1,11 @@ /mob/living/carbon/human/mob_climax_partner(obj/item/organ/genital/G, mob/living/L, spillage, mb_time, obj/item/organ/genital/Lgen, forced = FALSE) . = ..() L.receive_climax(src, Lgen, G, spillage, forced = forced) + if(iswendigo(L)) + var/mob/living/carbon/wendigo/W = L + if(W.pulling == src) + W.slaves |= src + to_chat(src, " You are now [W]'s slave! Serve your master properly! ") /mob/living/proc/receive_climax(mob/living/partner, obj/item/organ/genital/receiver, obj/item/organ/genital/source, spill, forced) //gregnancy... diff --git a/modular_splurt/code/modules/client/loadout/accessory.dm b/modular_splurt/code/modules/client/loadout/accessory.dm new file mode 100644 index 0000000000..e2d2e6d8be --- /dev/null +++ b/modular_splurt/code/modules/client/loadout/accessory.dm @@ -0,0 +1,11 @@ +/datum/gear/accessory/shortcrop + name = "Short sleeved croptop" + path = /obj/item/clothing/accessory/shortcrop + +/datum/gear/accessory/longcrop + name = "Long sleeved croptop" + path = /obj/item/clothing/accessory/longcrop + +/datum/gear/accessory/formalcrop + name = "Formal croptop" + path = /obj/item/clothing/accessory/formalcrop diff --git a/modular_splurt/code/modules/client/loadout/shoes.dm b/modular_splurt/code/modules/client/loadout/shoes.dm index d10f823444..b75b1cd621 100644 --- a/modular_splurt/code/modules/client/loadout/shoes.dm +++ b/modular_splurt/code/modules/client/loadout/shoes.dm @@ -2,7 +2,7 @@ /datum/gear/shoes/footwraps name = "Cloth Footwraps" path= /obj/item/clothing/shoes/footwraps - + /datum/gear/shoes/invisiboots name = "Invisifiber Footwraps" path= /obj/item/clothing/shoes/invisiboots @@ -36,3 +36,7 @@ /datum/gear/shoes/puttee restricted_roles = list("Security Officer", "Warden", "Head of Security", "Brig Physician", "Blueshield") + +/datum/gear/shoes/highheel_sandals + name = "High-heel Sandals" + path = /obj/item/clothing/shoes/highheel_sandals diff --git a/modular_splurt/code/modules/client/loadout/uniform.dm b/modular_splurt/code/modules/client/loadout/uniform.dm index 29d91596d7..12c14d564d 100644 --- a/modular_splurt/code/modules/client/loadout/uniform.dm +++ b/modular_splurt/code/modules/client/loadout/uniform.dm @@ -146,3 +146,27 @@ path = /obj/item/clothing/under/goner/fake/poly loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC loadout_initial_colors = list("#E6E6E6") + +/datum/gear/uniform/leia_outfit + name = "Princess Leia Outfit" + path = /obj/item/clothing/under/misc/leia_outfit + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#C61818", "#D4AF37") + +/datum/gear/uniform/performer/polychromic + name = "Polychromic performers one piece" + path = /obj/item/clothing/under/performer/polychromic + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#ffffff") + +/datum/gear/uniform/stripper/security + name = "Security Stripper Outfit" + path = /obj/item/clothing/under/rank/security/stripper + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS + restricted_roles = list("Security Officer", "Warden", "Head Of Security") + +/datum/gear/uniform/stripper/explorer + name = "Explorer Stripper Outfit" + path = /obj/item/clothing/under/rank/cargo/miner/lavaland/stripper + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS + restricted_roles = list("Shaft Miner") diff --git a/modular_splurt/code/modules/client/preferences.dm b/modular_splurt/code/modules/client/preferences.dm index 13b9bc882b..9931dd1a2b 100644 --- a/modular_splurt/code/modules/client/preferences.dm +++ b/modular_splurt/code/modules/client/preferences.dm @@ -1,7 +1,11 @@ +#define APPEARANCE_CATEGORY_COLUMN "
Please create an account to save your preferences
"
+
+ dat += "" + + switch(current_tab) + if(SETTINGS_TAB) // Character Settings# + if(path) + var/savefile/S = new /savefile(path) + if(S) + dat += "
" + unspaced_slots = 0 + S.cd = "/character[i]" + S["real_name"] >> name + if(!name) + name = "Character[i]" + dat += "[name] " + dat += "
Occupation Choices
" + dat += "Set Occupation PreferencesQuirk Setup
" + dat += "Configure QuirksIdentity
" + dat += "| "
+ if(jobban_isbanned(user, "appearance"))
+ dat += "You are banned from using custom names and appearances. You can continue to adjust your characters, but you will be randomised once you join the game. " + dat += "Random Name " + dat += "Always Random Name:[be_random_name ? "Yes" : "No"] " + + dat += "[nameless ? "Default designation" : "Name"]:" + dat += "[real_name] " + dat += "Be nameless: [nameless ? "Yes" : "No"] " + + dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))] " + dat += "Age: [age] " + + dat += "Special Names: " + var/old_group + for(var/custom_name_id in GLOB.preferences_custom_names) + var/namedata = GLOB.preferences_custom_names[custom_name_id] + if(!old_group) + old_group = namedata["group"] + else if(old_group != namedata["group"]) + old_group = namedata["group"] + dat += " " + dat += "[namedata["pref_name"]]: [custom_names[custom_name_id]] " + dat += " " + + dat += "Custom job preferences: " + dat += "Preferred AI Core Display: [preferred_ai_core_display] " + dat += "Preferred Security Department: [prefered_security_department] | "
+ dat += "
" + unspaced_slots = 0 + S.cd = "/character[i]" + S["real_name"] >> name + if(!name) + name = "Character[i]" + dat += "[name] " + dat += "
"
+ dat += "Flavor Text" + dat += "Set Examine Text" + if(length(features["flavor_text"]) <= MAX_FLAVOR_PREVIEW_LEN) + if(!length(features["flavor_text"])) + dat += "\[...\] " //skyrat - adds //come to brazil or brazil comes to you + else + dat += "[html_encode(features["flavor_text"])] " //skyrat - adds and uses html_encode + else + dat += "[TextPreview(html_encode(features["flavor_text"]))]... " //skyrat edit, uses html_encode + //SPLURT edit - naked flavor text + dat += " Naked Flavor Text" + dat += "Set Naked Examine Text" + if(length(features["naked_flavor_text"]) <= 40) + if(!length(features["naked_flavor_text"])) + dat += "\[...\] " + else + dat += "[html_encode(features["naked_flavor_text"])] " + else + dat += "[TextPreview(html_encode(features["naked_flavor_text"]))]... " + //SPLURT edit end + dat += " Silicon Flavor Text" + dat += "Set Silicon Examine Text" + if(length(features["silicon_flavor_text"]) <= MAX_FLAVOR_PREVIEW_LEN) + if(!length(features["silicon_flavor_text"])) + dat += "\[...\] " + else + dat += "[features["silicon_flavor_text"]] " + else + dat += "[TextPreview(features["silicon_flavor_text"])]... " + dat += " OOC notes" + dat += "Set OOC notes" + var/ooc_notes_len = length(features["ooc_notes"]) + if(ooc_notes_len <= MAX_FLAVOR_PREVIEW_LEN) + if(!ooc_notes_len) + dat += "\[...\] " + else + dat += "[features["ooc_notes"]] " + else + dat += "[TextPreview(features["ooc_notes"])]... " + //SPLURT EDIT + dat += " Headshot Image" + dat += "Set Headshot Image" + if(features["headshot_link"]) + dat += " " + //SPLURT EDIT END + //SKYRAT EDIT + dat += "ERP : [erppref] " + dat += "Non-Con : [nonconpref] " + dat += "Vore : [vorepref] " + //END OF SKYRAT EDIT + + dat += " Records" + dat += "Security Records " + if(length_char(security_records) <= 40) + if(!length(security_records)) + dat += "\[...\]" + else + dat += "[security_records]" + else + dat += "[TextPreview(security_records)]... " + + dat += " Medical Records " + if(length_char(medical_records) <= 40) + if(!length(medical_records)) + dat += "\[...\] " + else + dat += "[medical_records]" + else + dat += "[TextPreview(medical_records)]... " + + dat += APPEARANCE_CATEGORY_COLUMN //body moves right sandstorm change + + dat += " Body" + dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]" + if(gender != NEUTER && pref_species.sexes) + dat += "Body Model:[features["body_model"] == MALE ? "Masculine" : "Feminine"] " + dat += "Limb Modification: " + dat += "Modify Limbs " + for(var/modification in modified_limbs) + if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC) + dat += "[modification]: [modified_limbs[modification][2]] " + else + dat += "[modification]: [modified_limbs[modification][1]] " + dat += " " + dat += "Species:[pref_species.name] " + dat += "Custom Species Name:[custom_species ? custom_species : "None"] " + dat += "Random Body:Randomize! " + dat += "Always Random Body:[be_random_body ? "Yes" : "No"] " + dat += " Cycle background:[bgstate] " + + dat += " | " //body moves right sandstorm change
+
+ var/use_skintones = pref_species.use_skintones
+ if(use_skintones)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "
| [marking_list[2]] - [actual_name] | ˄ ˅ X [color_marking_dat] |
[GLOB.all_mutant_parts[mutant_part]]
" + dat += "[features[mutant_part]]" + var/color_type = GLOB.colored_mutant_parts[mutant_part] //if it can be coloured, show the appropriate button + if(color_type) + dat += "#[features[color_type]] Change" + else + if(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) //advanced individual part colouring system + //is it matrixed or does it have extra parts to be coloured? + var/find_part = features[mutant_part] || pref_species.mutant_bodyparts[mutant_part] + var/find_part_list = GLOB.mutant_reference_list[mutant_part] + if(find_part && find_part != "None" && find_part_list) + var/datum/sprite_accessory/accessory = find_part_list[find_part] + if(accessory) + if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future + var/mutant_string = accessory.mutant_part_string + var/primary_feature = "[mutant_string]_primary" + var/secondary_feature = "[mutant_string]_secondary" + var/tertiary_feature = "[mutant_string]_tertiary" + if(!features[primary_feature]) + features[primary_feature] = features["mcolor"] + if(!features[secondary_feature]) + features[secondary_feature] = features["mcolor2"] + if(!features[tertiary_feature]) + features[tertiary_feature] = features["mcolor3"] + + var/matrixed_sections = accessory.matrixed_sections + if(accessory.color_src == MATRIXED && !matrixed_sections) + message_admins("Sprite Accessory Failure (customization): Accessory [accessory.type] is a matrixed item without any matrixed sections set!") + continue + else if(accessory.color_src == MATRIXED) + switch(matrixed_sections) + if(MATRIX_GREEN) //only composed of a green section + primary_feature = secondary_feature //swap primary for secondary, so it properly assigns the second colour, reserved for the green section + if(MATRIX_BLUE) + primary_feature = tertiary_feature //same as above, but the tertiary feature is for the blue section + if(MATRIX_RED_BLUE) //composed of a red and blue section + secondary_feature = tertiary_feature //swap secondary for tertiary, as blue should always be tertiary + if(MATRIX_GREEN_BLUE) //composed of a green and blue section + primary_feature = secondary_feature //swap primary for secondary, as first option is green, which is linked to the secondary + secondary_feature = tertiary_feature //swap secondary for tertiary, as second option is blue, which is linked to the tertiary + dat += "Primary Color
" + dat += "#[features[primary_feature]] Change
" + if((accessory.color_src == MATRIXED && (matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)) || (accessory.extra && (accessory.extra_color_src == MUTCOLORS || accessory.extra_color_src == MUTCOLORS2 || accessory.extra_color_src == MUTCOLORS3))) + dat += "Secondary Color
" + dat += "#[features[secondary_feature]] Change
" + if((accessory.color_src == MATRIXED && matrixed_sections == MATRIX_ALL) || (accessory.extra2 && (accessory.extra2_color_src == MUTCOLORS || accessory.extra2_color_src == MUTCOLORS2 || accessory.extra2_color_src == MUTCOLORS3))) + dat += "Tertiary Color
" + dat += "#[features[tertiary_feature]] Change
" + + mutant_category++ + if(mutant_category >= MAX_MUTANT_ROWS) + dat += "" + mutant_category = 0 + + if(length(pref_species.allowed_limb_ids)) + if(!chosen_limb_id || !(chosen_limb_id in pref_species.allowed_limb_ids)) + chosen_limb_id = pref_species.limbs_id || pref_species.id + dat += "
Body sprite
" + dat += "[chosen_limb_id]" + + if(mutant_category) + dat += "" + mutant_category = 0 + + dat += ""
+ dat += "Clothing & Equipment" + /* skyrat change + dat += "Underwear:[underwear]" + if(GLOB.underwear_list[underwear]?.has_color) + dat += "Underwear Color: #[undie_color] Change" + dat += "Undershirt:[undershirt]" + if(GLOB.undershirt_list[undershirt]?.has_color) + dat += "Undershirt Color: #[shirt_color] Change " + dat += "Socks:[socks]" + if(GLOB.socks_list[socks]?.has_color) + dat += "Socks Color: #[socks_color] Change " + */ + dat += "Backpack:[backbag]" + dat += "Jumpsuit: [jumpsuit_style] " + if((HAS_FLESH in pref_species.species_traits) || (HAS_BONE in pref_species.species_traits)) + dat += " Temporal Scarring: [(persistent_scars) ? "Enabled" : "Disabled"]" + dat += "Clear scar slots " + dat += "Uplink Location:[uplink_spawn_loc]" + dat += " | "
+
+ dat += ""
+ dat += "Lewd preferences" + dat += "Lust tolerance:[lust_tolerance]" + dat += "Sexual potency:[sexual_potency]" + dat += " | "
+
+ //SPLURT EDIT BEGIN - gregnancy preferences
+ dat += ""
+ dat += "Pregnancy preferences" + dat += "Chance of impregnation:[virility ? virility : "Disabled"]" + dat += "Chance of getting pregnant:[fertility ? fertility : "Disabled"]" + dat += "Lay inert eggs:[features["inert_eggs"] == TRUE ? "Enabled" : "Disabled"]" + if(fertility) + dat += "Pregnancy inflation:[pregnancy_inflation ? "Enabled" : "Disabled"]" + dat += "Pregnancy breast growth:[pregnancy_breast_growth ? "Enabled" : "Disabled"]" + if(fertility || features["inert_eggs"]) + dat += "Egg shell:[egg_shell]" + dat += " | "
+ //SPLURT EDIT END
+ dat += APPEARANCE_CATEGORY_COLUMN
+ if(NOGENITALS in pref_species.species_traits)
+ dat += "Your species ([pref_species.name]) does not support genitals!
" + unspaced_slots = 0 + S.cd = "/character[i]" + S["real_name"] >> name + if(!name) + name = "Character[i]" + dat += "[name] " + dat += "
"
+ dat += "Speech preferences" + dat += "Custom Speech Verb:" + dat += "[custom_speech_verb] " + dat += "Custom Tongue: " + dat += "[custom_tongue] " + //SANDSTORM EDIT - additional language + runechat color + dat += "Additional Language " + var/list/languages_sorted = sortList(language) + dat += "[language.len ? languages_sorted.Join(", ") : "None"] " + dat += "Custom runechat color: [enable_personal_chat_color ? "Enabled" : "Disabled"] [enable_personal_chat_color ? "[personal_chat_color] Change" : ""] " + dat += " | "
+ //END OF SANDSTORM EDIT
+ dat += ""
+ dat += "Vocal Bark preferences" + var/datum/bark/B = GLOB.bark_list[bark_id] + dat += "Vocal Bark Sound:" + dat += "[B ? initial(B.name) : "INVALID"] " + dat += "Vocal Bark Speed: [bark_speed] " + dat += "Vocal Bark Pitch: [bark_pitch] " + dat += "Vocal Bark Variance: [bark_variance] " + dat += " Preview Bark " + dat += " | "
+ dat += "
"
+ dat += "General Settings" + dat += "UI Style: [UI_style]" + dat += "Outline: [outline_enabled ? "Enabled" : "Disabled"] " + dat += "Outline Color: [outline_color ? "" : "Theme-based (null)"][outline_color] Change " + dat += "Screentip: [screentip_pref] " + dat += "Screentip Color: [screentip_color] Change " + dat += "tgui Monitors: [(tgui_lock) ? "Primary" : "All"] " + dat += "tgui Style: [(tgui_fancy) ? "Fancy" : "No Frills"] " + dat += "Input Framework: [(tgui_input_mode) ? "tgui" : "BYOND"] " + dat += "tgui Button Size: [(tgui_large_buttons) ? "Large" : "Small"] " + dat += "tgui Buttons Swapped: [(tgui_swapped_buttons) ? "Yes" : "No"] " + dat += "Show Runechat Chat Bubbles: [chat_on_map ? "Enabled" : "Disabled"] " + dat += "Runechat message char limit: [max_chat_length] " + dat += "See Runechat for non-mobs: [see_chat_non_mob ? "Enabled" : "Disabled"] " + //SKYRAT CHANGES BEGIN + dat += "See Runechat for emotes: [see_chat_emotes ? "Enabled" : "Disabled"] " + //SKYRAT CHANGES END + dat += " " + dat += "Action Buttons: [(buttons_locked) ? "Locked In Place" : "Unlocked"] " + dat += " " + dat += "PDA Color: [pda_color] Change " + dat += "PDA Style: [pda_style] " + dat += "PDA Reskin: [pda_skin] " + dat += " " + dat += "Ghost Ears: [(chat_toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"] " + dat += "Ghost Radio: [(chat_toggles & CHAT_GHOSTRADIO) ? "All Messages":"No Messages"] " + dat += "Ghost Sight: [(chat_toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"] " + dat += "Ghost Whispers: [(chat_toggles & CHAT_GHOSTWHISPER) ? "All Speech" : "Nearest Creatures"] " + dat += "Ghost PDA: [(chat_toggles & CHAT_GHOSTPDA) ? "All Messages" : "Nearest Creatures"] " + dat += "Window Flashing: [(windowflashing) ? "Enabled":"Disabled"] " + dat += " " + dat += "Play Admin MIDIs: [(toggles & SOUND_MIDI) ? "Enabled":"Disabled"] " + dat += "Play Lobby Music: [(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"] " + dat += "See Pull Requests: [(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"] " + dat += " " + if(user.client) + if(unlock_content) + dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"] " + if(unlock_content || check_rights_for(user.client, R_ADMIN)) + dat += "OOC Color: [ooccolor ? ooccolor : GLOB.normal_ooc_colour] Change " + dat += "Antag OOC Color: [aooccolor ? aooccolor : GLOB.normal_aooc_colour] Change " + + dat += " | "
+
+ dat += ""
+
+ dat += "Special Role Settings" + + if(jobban_isbanned(user, ROLE_SYNDICATE)) + dat += "You are banned from antagonist roles." + src.be_special = list() + + dat += "DISABLE ALL ANTAGONISM [(toggles & NO_ANTAG) ? "YES" : "NO"]" + + for (var/i in GLOB.special_roles) + if(jobban_isbanned(user, i)) + dat += "Be [capitalize(i)]: BANNED " + else + var/days_remaining = null + if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age + var/mode_path = GLOB.special_roles[i] + var/datum/game_mode/temp_mode = new mode_path + days_remaining = temp_mode.get_remaining_days(user.client) + + if(days_remaining) + dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS] " + else + var/enabled_text = "" + if(i in be_special) + if(be_special[i] >= 1) + enabled_text = "Enabled" + else + enabled_text = "Low" + else + enabled_text = "Disabled" + dat += "Be [capitalize(i)]: [enabled_text] " + dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"] " + + dat += " " + + dat += " | "
+
+ if(user.client.holder) // sandstorm start - moves admin prefs to the right
+ dat += "Admin Settings" + dat += "Adminhelp Sounds: [(toggles & SOUND_ADMINHELP)?"Enabled":"Disabled"]" + dat += "Announce Login: [(toggles & ANNOUNCE_LOGIN)?"Enabled":"Disabled"] " + dat += " " + dat += "Combo HUD Lighting: [(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"] " + dat += "Use Modern Player Panel: [use_new_playerpanel ? "Yes" : "No"] " // sandstorm end - moves admins prefs to the right + + //deadmin + dat += " Deadmin While Playing" + if(CONFIG_GET(flag/auto_deadmin_players)) + dat += "Always Deadmin: FORCED" + else + dat += "Always Deadmin: [(deadmin & DEADMIN_ALWAYS)?"Enabled":"Disabled"] " + if(!(deadmin & DEADMIN_ALWAYS)) + dat += " " + if(!CONFIG_GET(flag/auto_deadmin_antagonists)) + dat += "As Antag: [(deadmin & DEADMIN_ANTAGONIST)?"Deadmin":"Keep Admin"] " + else + dat += "As Antag: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_heads)) + dat += "As Command: [(deadmin & DEADMIN_POSITION_HEAD)?"Deadmin":"Keep Admin"] " + else + dat += "As Command: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_security)) + dat += "As Security: [(deadmin & DEADMIN_POSITION_SECURITY)?"Deadmin":"Keep Admin"] " + else + dat += "As Security: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_silicons)) + dat += "As Silicon: [(deadmin & DEADMIN_POSITION_SILICON)?"Deadmin":"Keep Admin"] " + else + dat += "As Silicon: FORCED " + + dat += " Citadel Preferences" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe. + dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]" + dat += "Long strip menu: [long_strip_menu ? "Enabled" : "Disabled"] " + dat += "Auto stand: [autostand ? "Enabled" : "Disabled"] " + dat += "Auto OOC: [auto_ooc ? "Enabled" : "Disabled"] " + dat += "Force Slot Storage HUD: [no_tetris_storage ? "Enabled" : "Disabled"] " + dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")] " + if (user && user.client && !user.client.prefs.screenshake==0) + dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")] " + dat += "Recoil Screen Push: [(recoil_screenshake==100) ? "Full" : ((recoil_screenshake==0) ? "None" : "[screenshake]")] " + var/p_chaos + if (!preferred_chaos) + p_chaos = "No preference" + else + p_chaos = preferred_chaos + dat += "Preferred Chaos Amount: [p_chaos] " + + dat += " S.P.L.U.R.T. Preferences" + dat += "Be Antagonist Victim: [be_victim ? be_victim : BEVICTIM_ASK]" + dat += "Disable combat mode cursor: [disable_combat_cursor?"Yes":"No"] " + dat += "Splashscreen Player Panel Style: [(toggles & TG_PLAYER_PANEL)?"TG":"Old"] " + dat += "Character Creation Menu Style: [new_character_creator ? "New" : "Old"] " + dat += " " + + dat += " | "
+ dat += "
" + dat += "Ghost Orbit: [ghost_orbit]
" + var/button_name = "If you see this something went wrong." + switch(ghost_accs) + if(GHOST_ACCS_FULL) + button_name = GHOST_ACCS_FULL_NAME + if(GHOST_ACCS_DIR) + button_name = GHOST_ACCS_DIR_NAME + if(GHOST_ACCS_NONE) + button_name = GHOST_ACCS_NONE_NAME + + dat += "Ghost Accessories: [button_name]
" + switch(ghost_others) + if(GHOST_OTHERS_THEIR_SETTING) + button_name = GHOST_OTHERS_THEIR_SETTING_NAME + if(GHOST_OTHERS_DEFAULT_SPRITE) + button_name = GHOST_OTHERS_DEFAULT_SPRITE_NAME + if(GHOST_OTHERS_SIMPLE) + button_name = GHOST_OTHERS_SIMPLE_NAME + + dat += "Ghosts of Others: [button_name]
" + dat += "
" + + dat += "FPS: [clientfps]
" + + dat += "Income Updates: [(chat_toggles & CHAT_BANKCARD) ? "Allowed" : "Muted"]
" + dat += "
" + + dat += "Parallax (Fancy Space): " + switch (parallax) + if (PARALLAX_LOW) + dat += "Low" + if (PARALLAX_MED) + dat += "Medium" + if (PARALLAX_INSANE) + dat += "Insane" + if (PARALLAX_DISABLE) + dat += "Disabled" + else + dat += "High" + dat += "
" + dat += "Ambient Occlusion: [ambientocclusion ? "Enabled" : "Disabled"]
" + dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"]
" + dat += "HUD Button Flashes: [hud_toggle_flash ? "Enabled" : "Disabled"]
" + dat += "HUD Button Flash Color: [hud_toggle_color] Change
" + +/* CITADEL EDIT - We're using top menu instead + button_name = pixel_size + dat += "Pixel Scaling: [(button_name) ? "Pixel Perfect [button_name]x" : "Stretch to fit"]
" + + switch(scaling_method) + if(SCALING_METHOD_NORMAL) + button_name = "Nearest Neighbor" + if(SCALING_METHOD_DISTORT) + button_name = "Point Sampling" + if(SCALING_METHOD_BLUR) + button_name = "Bilinear" + dat += "Scaling Method: [button_name]
" +*/ + + if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation)) + var/p_map = preferred_map + if (!p_map) + p_map = "Default" + if (config.defaultmap) + p_map += " ([config.defaultmap.map_name])" + else + if (p_map in config.maplist) + var/datum/map_config/VM = config.maplist[p_map] + if (!VM) + p_map += " (No longer exists)" + else + p_map = VM.map_name + else + p_map += " (No longer exists)" + if(CONFIG_GET(flag/allow_map_voting)) + dat += "Preferred Map: [p_map]
" + + dat += "" + + if(LOADOUT_TAB) + //calculate your gear points from the chosen item + gear_points = CONFIG_GET(number/initial_gear_points) + var/list/chosen_gear = loadout_data["SAVE_[loadout_slot]"] + if(chosen_gear) + for(var/loadout_item in chosen_gear) + var/loadout_item_path = loadout_item[LOADOUT_ITEM] + if(loadout_item_path) + var/datum/gear/loadout_gear = text2path(loadout_item_path) + if(loadout_gear) + gear_points -= initial(loadout_gear.cost) + else + chosen_gear = list() + + dat += "
| Name | " + dat += "Cost | " + dat += "Restrictions | " + dat += "Description |
| [name][extra_loadout_data] | " + dat += "[gear.cost] | " + if(islist(gear.restricted_roles)) + if(gear.restricted_roles.len) + if(gear.restricted_desc) + dat += "" + dat += gear.restricted_desc + dat += "" + else + dat += "" + dat += gear.restricted_roles.Join(";") + dat += "" + if(!istype(gear, /datum/gear/unlockable)) + // the below line essentially means "if the loadout item is picked by the user and has a custom description, give it the custom description, otherwise give it the default description" + dat += " | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] Progress: [min(progress_made, unlockable.progress_required)]/[unlockable.progress_required] | " + + dat += "
"
+ dat += "Fetish content prefs" + dat += "Allow Lewd Verbs: [(toggles & VERB_CONSENT) ? "Yes":"No"]" // Skyrat - ERP Mechanic Addition + dat += "Mute Lewd Verb Sounds: [(toggles & LEWD_VERB_SOUNDS) ? "Yes":"No"] " // Skyrat - ERP Mechanic Addition + dat += "Arousal:[arousable == TRUE ? "Enabled" : "Disabled"] " + dat += "Genital examine text:[(cit_toggles & GENITAL_EXAMINE) ? "Enabled" : "Disabled"] " + dat += "Vore examine text:[(cit_toggles & VORE_EXAMINE) ? "Enabled" : "Disabled"] " + dat += "Voracious MediHound sleepers: [(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"] " + dat += "Hear Vore Sounds: [(cit_toggles & EATING_NOISES) ? "Yes" : "No"] " + dat += "Hear Vore Digestion Sounds: [(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"] " + dat += "Allow trash forcefeeding (requires Trashcan quirk) [(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"] " + dat += "Forced Feminization: [(cit_toggles & FORCED_FEM) ? "Allowed" : "Disallowed"] " + dat += "Forced Masculinization: [(cit_toggles & FORCED_MASC) ? "Allowed" : "Disallowed"] " + dat += "Lewd Hypno: [(cit_toggles & HYPNO) ? "Allowed" : "Disallowed"] " + dat += "Bimbofication: [(cit_toggles & BIMBOFICATION) ? "Allowed" : "Disallowed"] " + dat += " | "
+ dat +=""
+ dat += "Other content prefs" + dat += "Breast Enlargement: [(cit_toggles & BREAST_ENLARGEMENT) ? "Allowed" : "Disallowed"]" + dat += "Penis Enlargement: [(cit_toggles & PENIS_ENLARGEMENT) ? "Allowed" : "Disallowed"] " + dat += "Butt Enlargement: [(cit_toggles & BUTT_ENLARGEMENT) ? "Allowed" : "Disallowed"] " + dat += "Belly Inflation: [(cit_toggles & BELLY_INFLATION) ? "Allowed" : "Disallowed"] " + dat += "Hypno: [(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"] " + dat += "Aphrodisiacs: [(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"] " + dat += "Ass Slapping: [(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"] " + //SPLURT EDIT + dat += "? " + dat += "Unholy ERP verbs : [unholypref] " //https://www.youtube.com/watch?v=OHKARc-GObU + //END OF SPLURT EDIT + //SKYRAT EDIT + dat += "? " + dat += "Extreme ERP verbs : [extremepref] " // https://youtu.be/0YrU9ASVw6w + if(extremepref != "No") + dat += "? " + dat += "Harmful ERP verbs : [extremeharm] " + //END OF SKYRAT EDIT + dat += "Automatic Wagging: [(cit_toggles & NO_AUTO_WAG) ? "Disabled" : "Enabled"] " + dat += "? " + dat += "Genital Fluid Blacklist " + if(gfluid_blacklist?.len) + dat += "? " + dat += "Genital Fluid Un-Blacklist " + dat += " |
" + if(KEYBINDINGS_TAB_OLD) // Custom keybindings + dat += "Keybindings: [(hotkeys) ? "Hotkeys" : "Input"]
" + dat += "Keybindings mode controls how the game behaves with tab and map/input focus.
If it is on Hotkeys, the game will always attempt to force you to map focus, meaning keypresses are sent \ + directly to the map instead of the input. You will still be able to use the command bar, but you need to tab to do it every time you click on the game map.
\ + If it is on Input, the game will not force focus away from the input bar, and you can switch focus using TAB between these two modes: If the input bar is pink, that means that you are in non-hotkey mode, sending all keypresses of the normal \ + alphanumeric characters, punctuation, spacebar, backspace, enter, etc, typing keys into the input bar. If the input bar is white, you are in hotkey mode, meaning all keypresses go into the game's keybind handling system unless you \ + manually click on the input bar to shift focus there.
\ + Input mode is the closest thing to the old input system.
\ + IMPORTANT: While in input mode's non hotkey setting (tab toggled), Ctrl + KEY will send KEY to the keybind system as the key itself, not as Ctrl + KEY. This means Ctrl + T/W/A/S/D/all your familiar stuff still works, but you \ + won't be able to access any regular Ctrl binds.
" + dat += "
Modifier-Independent binding - This is a singular bind that works regardless of if Ctrl/Shift/Alt are held down. For example, if combat mode is bound to C in modifier-independent binds, it'll trigger regardless of if you are \ + holding down shift for sprint. Each keybind can only have one independent binding, and each key can only have one keybind independently bound to it." + // Create an inverted list of keybindings -> key + var/list/user_binds = list() + var/list/user_modless_binds = list() + for (var/key in key_bindings) + for(var/kb_name in key_bindings[key]) + user_binds[kb_name] += list(key) + for (var/key in modless_key_bindings) + user_modless_binds[modless_key_bindings[key]] = key + + var/list/kb_categories = list() + // Group keybinds by category + for (var/name in GLOB.keybindings_by_name) + var/datum/keybinding/kb = GLOB.keybindings_by_name[name] + kb_categories[kb.category] += list(kb) + + dat += {" + + "} + + for (var/category in kb_categories) + dat += "
[category]
" + for (var/i in kb_categories[category]) + var/datum/keybinding/kb = i + var/current_independent_binding = user_modless_binds[kb.name] || "Unbound" + if(!length(user_binds[kb.name])) + dat += "[kb.full_name]Unbound" + var/list/default_keys = hotkeys ? kb.hotkey_keys : kb.classic_keys + if(LAZYLEN(default_keys)) + dat += "| Default: [default_keys.Join(", ")]" + dat += "" + if(!kb.special && !kb.clientside) + dat += "Independent Binding: [current_independent_binding]" + dat += "" + else + var/bound_key = user_binds[kb.name][1] + dat += "[kb.full_name][bound_key]" + for(var/bound_key_index in 2 to length(user_binds[kb.name])) + bound_key = user_binds[kb.name][bound_key_index] + dat += " | [bound_key]" + if(length(user_binds[kb.name]) < MAX_KEYS_PER_KEYBIND) + dat += "| Add Secondary" + var/list/default_keys = hotkeys ? kb.classic_keys : kb.hotkey_keys + if(LAZYLEN(default_keys)) + dat += "| Default: [default_keys.Join(", ")]" + dat += "" + if(!kb.special && !kb.clientside) + dat += "Independent Binding: [current_independent_binding]" + dat += "
" + + dat += "
" + dat += "\[Reset to default\]" + dat += "" + + + dat += "
Character Setup
", 640, 770)
+ popup.set_content(dat.Join())
+ popup.open(FALSE)
+ onclose(user, "preferences_window", src)
+
+/datum/preferences/process_link(mob/user, list/href_list)
+ switch(href_list["task"])
+ if("random")
+ //no
+ if("input")
+ switch(href_list["preference"])
+ if("marking_color")
+ var/index = text2num(href_list["marking_index"])
+ var/marking_type = href_list["marking_type"]
+ if(index && marking_type && features[marking_type])
+ // work out the input options to show the user
+ var/list/options = list("Primary")
+ var/number_colors = text2num(href_list["number_colors"])
+ var/color_number = 1 // 1-3 which color are we editing
+ if(number_colors >= 2)
+ options += "Secondary"
+ if(number_colors == 3)
+ options += "Tertiary"
+ var/color_option = input(user, "Select the colour you wish to edit") as null|anything in options
+ if(color_option)
+ if(color_option == "Secondary") color_number = 2
+ if(color_option == "Tertiary") color_number = 3
+ // perform some magic on the color number
+ var/list/marking_list = features[marking_type][index]
+ var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]]
+ var/matrixed_sections = S.covered_limbs[GLOB.bodypart_names[num2text(marking_list[1])]]
+ if(color_number == 1)
+ switch(matrixed_sections)
+ if(MATRIX_GREEN)
+ color_number = 2
+ if(MATRIX_BLUE)
+ color_number = 3
+ else if(color_number == 2)
+ switch(matrixed_sections)
+ if(MATRIX_RED_BLUE)
+ color_number = 3
+ if(MATRIX_GREEN_BLUE)
+ color_number = 3
+
+ var/color_list = features[marking_type][index][3]
+ var/new_marking_color = input(user, "Choose your character's marking color:", "Character Preference","#"+color_list[color_number]) as color|null
+ if(new_marking_color)
+ var/temp_hsv = RGBtoHSV(new_marking_color)
+ if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright, but only if they affect the skin
+ color_list[color_number] = "#[sanitize_hexcolor(new_marking_color, 6)]"
+ else
+ to_chat(user, "Invalid color. Your color is not bright enough.")
+ else
+ switch(href_list["preference"])
+ if("charcreation_style")
+ new_character_creator = !new_character_creator
+ . = ..()
+
/proc/build_genital_fluids_list()
var/list/blacklisted = list( //Nonos
@@ -133,3 +1312,6 @@
LAZYADD(allowed, fluid.type)
return allowed
+
+#undef APPEARANCE_CATEGORY_COLUMN
+#undef MAX_MUTANT_ROWS
diff --git a/modular_splurt/code/modules/client/preferences_savefile.dm b/modular_splurt/code/modules/client/preferences_savefile.dm
index 8d9abb7145..5471d37fd4 100644
--- a/modular_splurt/code/modules/client/preferences_savefile.dm
+++ b/modular_splurt/code/modules/client/preferences_savefile.dm
@@ -1,3 +1,8 @@
+/datum/preferences/update_preferences(current_version, savefile/S)
+ . = ..()
+ if(current_version < 57.01) //a
+ new_character_creator = TRUE
+
/datum/preferences/update_character(current_version, savefile/S)
. = ..()
if(current_version < 53.01)
diff --git a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm
index f5a8fac735..d87fd74ce7 100644
--- a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm
+++ b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm
@@ -84,3 +84,15 @@
build_path = /obj/item/clothing/shoes/jackboots/cbrn/mopp
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/obj/item/clothing/shoes/highheel_sandals
+ name = "high-heel sandals"
+ desc = "A pair of high-heel sandals"
+ icon = 'modular_splurt/icons/obj/clothing/shoes.dmi'
+ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/shoes.dmi'
+ anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/shoes_digi.dmi'
+ icon_state = "highheel_sandals"
+
+/obj/item/clothing/shoes/highheel_sandals/Initialize()
+ . = ..()
+ AddComponent(/datum/component/squeak, list('modular_splurt/sound/effects/footstep/highheel1.ogg' = 1,'modular_splurt/sound/effects/footstep/highheel2.ogg' = 1), 20)
diff --git a/modular_splurt/code/modules/clothing/under/accessories.dm b/modular_splurt/code/modules/clothing/under/accessories.dm
new file mode 100644
index 0000000000..eafad46702
--- /dev/null
+++ b/modular_splurt/code/modules/clothing/under/accessories.dm
@@ -0,0 +1,26 @@
+/obj/item/clothing/accessory/shortcrop
+ name = "short sleeved crop top"
+ desc = "A short sleeved crop top, for when it gets too hot."
+ icon = 'modular_splurt/icons/obj/clothing/accessories.dmi'
+ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/accessories.dmi'
+ icon_state = "shortcrop"
+ item_state = "shortcrop"
+ minimize_when_attached = FALSE
+
+/obj/item/clothing/accessory/longcrop
+ name = "long sleeved crop top"
+ desc = "A long sleeved crop top, now with long sleeves!"
+ icon = 'modular_splurt/icons/obj/clothing/accessories.dmi'
+ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/accessories.dmi'
+ icon_state = "longcrop"
+ item_state = "longcrop"
+ minimize_when_attached = FALSE
+
+/obj/item/clothing/accessory/formalcrop
+ name = "formal crop top"
+ desc = "A 'formal' crop top. Not sure how this'll fool anyone."
+ icon = 'modular_splurt/icons/obj/clothing/accessories.dmi'
+ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/accessories.dmi'
+ icon_state = "formalcrop"
+ item_state = "formalcrop"
+ minimize_when_attached = FALSE
diff --git a/modular_splurt/code/modules/clothing/under/miscellaneous.dm b/modular_splurt/code/modules/clothing/under/miscellaneous.dm
index 3f6b806260..495df2b3dd 100644
--- a/modular_splurt/code/modules/clothing/under/miscellaneous.dm
+++ b/modular_splurt/code/modules/clothing/under/miscellaneous.dm
@@ -123,7 +123,7 @@
item_state = "secstripper"
can_adjust = FALSE
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
- mutantrace_variation = NONE
+ mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
/obj/item/clothing/under/rank/brigdoc
name = "brig physician outfit"
@@ -311,3 +311,33 @@
/obj/item/clothing/under/misc/gear_harness
body_parts_covered = NONE
+/obj/item/clothing/under/misc/leia_outfit
+ name = "space princess outfit"
+ desc = "Chain for your Master's erotic asphyxiation not included."
+ icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+ icon_state = "leia"
+ can_adjust = FALSE
+ mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+
+/obj/item/clothing/under/misc/leia_outfit/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, list("#C61818", "#D4AF37"), 2)
+
+/obj/item/clothing/under/performer/polychromic
+ name = "polychromic performers one piece"
+ icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+ icon_state = "poly_performer"
+
+/obj/item/clothing/under/performer/polychromic/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, list("#ffffff"), 1)
+
+/obj/item/clothing/under/rank/cargo/miner/lavaland/stripper
+ name = "explorer stripper outfit"
+ desc = "This can't be dress code compliant, can it?"
+ icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+ icon_state = "explorerstripper"
+ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+ mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
diff --git a/modular_splurt/code/modules/food_and_drinks/recipes/drink_recipes.dm b/modular_splurt/code/modules/food_and_drinks/recipes/drink_recipes.dm
index c388d8fe3c..813e34f041 100644
--- a/modular_splurt/code/modules/food_and_drinks/recipes/drink_recipes.dm
+++ b/modular_splurt/code/modules/food_and_drinks/recipes/drink_recipes.dm
@@ -290,3 +290,14 @@
/datum/reagent/consumable/milkshake_base = 1,
/datum/reagent/consumable/watermelonjuice = 1
)
+
+/datum/chemical_reaction/ionstorm
+ name = "Ion Storm"
+ id = /datum/reagent/consumable/ethanol/ionstorm
+ results = list(/datum/reagent/consumable/ethanol/ionstorm = 10)
+ required_reagents = list(
+ /datum/reagent/consumable/ethanol/quadruple_sec = 5,
+ /datum/reagent/consumable/ethanol/bastion_bourbon = 2
+ )
+ mix_message = "The lights flicker for a moment..."
+ mix_sound = 'sound/weapons/taser.ogg'
diff --git a/modular_splurt/code/modules/jobs/job_types/stowaway.dm b/modular_splurt/code/modules/jobs/job_types/stowaway.dm
new file mode 100644
index 0000000000..76056726d0
--- /dev/null
+++ b/modular_splurt/code/modules/jobs/job_types/stowaway.dm
@@ -0,0 +1,63 @@
+GLOBAL_LIST_EMPTY(roundstart_stowaway)
+
+/datum/job/stowaway
+ title = "Stowaway"
+ flag = STOWAWAY
+ department_head = NONE
+ department_flag = NONE
+ paycheck = 0
+ paycheck_department = null
+ faction = "Station"
+ total_positions = 0
+ spawn_positions = 3
+ threat = 0.5
+ supervisors = "no one"
+ minimal_player_age = 3
+ exp_requirements = 100
+ exp_type = EXP_TYPE_CREW
+ considered_combat_role = FALSE
+ custom_spawn_text = "You are a stowaway. You should NOT be starting fights or attempting to fight security for any reason. At best you should be actively on the run from them as you are on the station illegally."
+ outfit = /datum/outfit/job/stowaway
+ plasma_outfit = /datum/outfit/plasmaman/stowaway
+ display_order = JOB_DISPLAY_ORDER_STOWAWAY
+
+/datum/job/stowaway/get_latejoin_spawn_point()
+ return get_roundstart_spawn_point()
+
+/datum/outfit/job/stowaway/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
+ ..()
+ var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
+ uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random
+
+/obj/item/card/id/stowaway_stolen
+ name = "unknown ID card"
+ desc = "An strange-looking old ID card."
+ icon_state = "data_1"
+ uses_overlays = FALSE
+ registered_name = null
+ assignment = null
+ access = list(ACCESS_MAINT_TUNNELS)
+ bank_support = ID_NO_BANK_ACCOUNT
+
+/datum/outfit/job/stowaway
+ name = "Stowaway"
+ jobtype = /datum/job/stowaway
+ uniform = /obj/item/clothing/under/color/random
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ id = /obj/item/card/id/stowaway_stolen
+ ears = null
+ belt = /obj/item/storage/belt/utility/atmostech
+ gloves = /obj/item/clothing/gloves/color/yellow
+ r_pocket = /obj/item/radio
+ l_pocket = /obj/item/flashlight
+
+/datum/outfit/plasmaman/stowaway
+ name = "Stowaway Plasmaman"
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ id = /obj/item/card/id/stowaway_stolen
+ ears = null
+ belt = /obj/item/storage/belt/utility/full
+ gloves = /obj/item/clothing/gloves/color/yellow
+ r_pocket = /obj/item/radio
+ l_pocket = /obj/item/flashlight
+
diff --git a/modular_splurt/code/modules/keybindings/keybind/movement.dm b/modular_splurt/code/modules/keybindings/keybind/movement.dm
index bdca385832..fbaffe5f37 100644
--- a/modular_splurt/code/modules/keybindings/keybind/movement.dm
+++ b/modular_splurt/code/modules/keybindings/keybind/movement.dm
@@ -21,3 +21,43 @@
var/mob/M = user.mob
M.tilt_left()
return TRUE
+
+/datum/keybinding/mob/pixel_shift/shift_north
+ hotkey_keys = list("CtrlShiftW", "CtrlShiftNorth")
+ name = "pixel_shift_north"
+ full_name = "Pixel Shift North"
+
+/datum/keybinding/mob/pixel_shift/shift_north/down(client/user)
+ var/mob/M = user.mob
+ M.pixel_shift(NORTH)
+ return TRUE
+
+/datum/keybinding/mob/pixel_shift/shift_east
+ hotkey_keys = list("CtrlShiftD", "CtrlShiftEast")
+ name = "pixel_shift_east"
+ full_name = "Pixel Shift East"
+
+/datum/keybinding/mob/pixel_shift/shift_east/down(client/user)
+ var/mob/M = user.mob
+ M.pixel_shift(EAST)
+ return TRUE
+
+/datum/keybinding/mob/pixel_shift/shift_south
+ hotkey_keys = list("CtrlShiftS", "CtrlShiftSouth")
+ name = "pixel_shift_south"
+ full_name = "Pixel Shift South"
+
+/datum/keybinding/mob/pixel_shift/shift_south/down(client/user)
+ var/mob/M = user.mob
+ M.pixel_shift(SOUTH)
+ return TRUE
+
+/datum/keybinding/mob/pixel_shift/shift_west
+ hotkey_keys = list("CtrlShiftA", "CtrlShiftWest")
+ name = "pixel_shift_west"
+ full_name = "Pixel Shift West"
+
+/datum/keybinding/mob/pixel_shift/shift_west/down(client/user)
+ var/mob/M = user.mob
+ M.pixel_shift(WEST)
+ return TRUE
diff --git a/modular_splurt/code/modules/mining/equipment/machine_vending.dm b/modular_splurt/code/modules/mining/equipment/machine_vending.dm
new file mode 100644
index 0000000000..58718601e9
--- /dev/null
+++ b/modular_splurt/code/modules/mining/equipment/machine_vending.dm
@@ -0,0 +1,5 @@
+/obj/machinery/mineral/equipment_vendor/Initialize(mapload)
+ . = ..()
+ prize_list += list(
+ new /datum/data/mining_equipment("Explorer Stripper Outfit", /obj/item/clothing/under/rank/cargo/miner/lavaland/stripper, 50)
+ )
diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm
index 549793e24f..f531ba1548 100644
--- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm
+++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm
@@ -243,3 +243,9 @@
name = "Sloog (lips)"
icon_state = "slooglips"
matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/snouts/mam_snouts/tajaran
+ name = "Tajaran"
+ icon = 'modular_splurt/icons/mob/mam_snouts.dmi'
+ icon_state = "tajaran"
+ matrixed_sections = MATRIX_RED_GREEN
diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm
index 46addc57fc..7f9eff453e 100644
--- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm
+++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm
@@ -324,6 +324,24 @@
icon = 'modular_splurt/icons/mob/mam_tails.dmi'
matrixed_sections = MATRIX_RED_GREEN
+/datum/sprite_accessory/tails/lizard/snakelarge
+ name = "Snake Tail (Large)"
+ icon_state = "snakelarge"
+ color_src = MATRIXED
+ icon = 'modular_splurt/icons/mob/64_mam_tails.dmi'
+ dimension_x = 64
+ center = TRUE
+ matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/tails_animated/lizard/snakelarge
+ name = "Snake Tail (Large)"
+ icon_state = "snakelarge"
+ color_src = MATRIXED
+ icon = 'modular_splurt/icons/mob/64_mam_tails.dmi'
+ dimension_x = 64
+ center = TRUE
+ matrixed_sections = MATRIX_RED_GREEN
+
//Human tails
/datum/sprite_accessory/tails/human/deer
name = "Deer"
@@ -418,3 +436,21 @@
color_src = MATRIXED
icon = 'modular_splurt/icons/mob/mam_tails.dmi'
matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/tails/human/snakelarge
+ name = "Snake Tail (Large)"
+ icon_state = "snakelarge"
+ color_src = MATRIXED
+ icon = 'modular_splurt/icons/mob/64_mam_tails.dmi'
+ dimension_x = 64
+ center = TRUE
+ matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/tails_animated/human/snakelarge
+ name = "Snake Tail (Large)"
+ icon_state = "snakelarge"
+ color_src = MATRIXED
+ icon = 'modular_splurt/icons/mob/64_mam_tails.dmi'
+ dimension_x = 64
+ center = TRUE
+ matrixed_sections = MATRIX_RED_GREEN
diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/wings.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/wings.dm
index 18ea553f13..fb30d13ae3 100644
--- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/wings.dm
+++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/wings.dm
@@ -166,3 +166,10 @@
icon_state = "angelmoth"
icon = 'modular_splurt/icons/mob/wings.dmi'
upgrade_to = SPECIES_WINGS_MOTH
+
+// Dragon wings but using WINGCOLOR instead
+/datum/sprite_accessory/deco_wings/dragonalt
+ name = "Dragon (Alt)"
+ icon_state = "dragonalt"
+ icon = 'modular_splurt/icons/mob/wings.dmi'
+ upgrade_to = SPECIES_WINGS_DRAGON
diff --git a/modular_splurt/code/modules/mob/living/carbon/carbon_defense.dm b/modular_splurt/code/modules/mob/living/carbon/carbon_defense.dm
new file mode 100644
index 0000000000..2939e1f545
--- /dev/null
+++ b/modular_splurt/code/modules/mob/living/carbon/carbon_defense.dm
@@ -0,0 +1,13 @@
+
+/mob/living/carbon/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
+ . = ..()
+ if(iswendigo(src) && user == pulling)
+ to_chat(src, "I can't hit them, their grip is too strong!")
+ return FALSE
+ if(iswendigo(src))
+ var/mob/living/carbon/wendigo/W = src
+ if(W.slaves.Find(user))
+ to_chat(src, "I can't hit them, they're my master!")
+ return FALSE
+
+
diff --git a/modular_splurt/code/modules/mob/living/carbon/human/human_defense.dm b/modular_splurt/code/modules/mob/living/carbon/human/human_defense.dm
new file mode 100644
index 0000000000..fb1ddf88b3
--- /dev/null
+++ b/modular_splurt/code/modules/mob/living/carbon/human/human_defense.dm
@@ -0,0 +1,52 @@
+
+/mob/living/carbon/human/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+ . = ..()
+ if(.) //To allow surgery to return properly.
+ return
+ if(iswendigo(user))
+ var/mob/living/carbon/wendigo/M = user
+ switch(M.a_intent)
+ if (INTENT_HARM)
+ var/damage = rand(1, 9)
+ var/turf/T = get_turf(user)
+ if(T.get_lumcount() < 0.2)
+ damage += rand(4,10)
+ if (prob(90))
+ playsound(loc, "punch", 25, 1, -1)
+ visible_message("[M] has punched [src]!", \
+ "[M] has punched [src]!", null, COMBAT_MESSAGE_RANGE)
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+ apply_damage(damage, BRUTE, affecting)
+ log_combat(M, src, "attacked")
+ M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
+ else
+ playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+ visible_message("[M] has attempted to punch [src]!", \
+ "[M] has attempted to punch [src]!", null, COMBAT_MESSAGE_RANGE)
+ if(INTENT_GRAB)
+ grabbedby(M)
+ if(INTENT_HELP)
+ if(M == src && check_self_for_injuries())
+ return
+ help_shake_act(M)
+ if (INTENT_DISARM)
+ if (!lying)
+ M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
+ if (prob(5))
+ Unconscious(40)
+ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+ log_combat(M, src, "pushed")
+ visible_message("[M] has pushed down [src]!", \
+ "[M] has pushed down [src]!")
+ else
+ if (prob(50))
+ dropItemToGround(get_active_held_item())
+ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+ visible_message("[M] has disarmed [src]!", \
+ "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE)
+ else
+ playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+ visible_message("[M] has attempted to disarm [src]!",\
+ "[M] has attempted to disarm [src]!", null, COMBAT_MESSAGE_RANGE)
+
+
diff --git a/modular_splurt/code/modules/mob/living/carbon/human/species.dm b/modular_splurt/code/modules/mob/living/carbon/human/species.dm
index 5fec507149..bf8ee799cd 100644
--- a/modular_splurt/code/modules/mob/living/carbon/human/species.dm
+++ b/modular_splurt/code/modules/mob/living/carbon/human/species.dm
@@ -33,3 +33,12 @@
*/
thirst_rate *= H.physiology.thirst_mod
H.adjust_thirst(-thirst_rate)
+
+/datum/species/handle_mutations_and_radiation(mob/living/carbon/human/H)
+ // Check for rad fiend quirk
+ // Check for radiation resist threshold
+ if(HAS_TRAIT(H, TRAIT_RAD_FIEND) && (H.radiation < RAD_BURN_THRESHOLD))
+ // Return without effects
+ return TRUE
+
+ . = ..()
diff --git a/modular_splurt/code/modules/mob/living/living.dm b/modular_splurt/code/modules/mob/living/living.dm
index c2b04a0d84..6d36fd208a 100644
--- a/modular_splurt/code/modules/mob/living/living.dm
+++ b/modular_splurt/code/modules/mob/living/living.dm
@@ -64,3 +64,12 @@
AddElement(/datum/element/smalltalk)
else
RemoveElement(/datum/element/smalltalk)
+
+/mob/living/do_resist_grab(moving_resist, forced, silent = FALSE)
+ . = ..()
+ if(iswendigo(pulledby)) //Grip is too strong, nonetheless.
+ to_chat(src, "The grip is too strong! I need some time...")
+ if(do_after(src, 200, target=pulledby))
+ to_chat(src, "I break free off [pulledby]'s grip!")
+ return TRUE
+
diff --git a/modular_splurt/code/modules/mob/living/login.dm b/modular_splurt/code/modules/mob/living/login.dm
new file mode 100644
index 0000000000..2424653534
--- /dev/null
+++ b/modular_splurt/code/modules/mob/living/login.dm
@@ -0,0 +1,10 @@
+/mob/living/Login()
+ . = ..()
+
+ // Check if mob is in SSD list
+ if(src in GLOB.ssd_mob_list)
+ // Remove from SSD list
+ GLOB.ssd_mob_list -= src
+
+ // Log mob SSD removal
+ log_game("[src] was removed from the SSD list.")
diff --git a/modular_splurt/code/modules/mob/living/logout.dm b/modular_splurt/code/modules/mob/living/logout.dm
new file mode 100644
index 0000000000..e640cfbf18
--- /dev/null
+++ b/modular_splurt/code/modules/mob/living/logout.dm
@@ -0,0 +1,25 @@
+/mob/living/Logout()
+ . = ..()
+
+ // Check for BORIS AI borgs
+ if(src in GLOB.available_ai_shells)
+ return
+
+ // Check for the AI
+ if(isAI(src))
+ return
+
+ // Check for VR mob
+ if(src.GetComponent(/datum/component/virtual_reality))
+ return
+
+ // Check if mob is in a VR pod
+ // This is not an ideal solution
+ if(istype(src.loc, /obj/machinery/vr_sleeper))
+ return
+
+ // Add to SSD list
+ GLOB.ssd_mob_list |= src
+
+ // Log mob SSD status
+ log_game("[src] was added to the SSD list.")
diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm b/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm
index fa00e0ff44..65ece9be12 100644
--- a/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm
+++ b/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm
@@ -1,7 +1,7 @@
//Main code edits
/// Allows "cyborg" players to change gender at will - Modularised here
// FUNCTION MOVED TO living.dm AS PROC
-/mob/living/silicon/robot/verb/toggle_gender()
+/mob/living/silicon/robot/toggle_gender()
set name = "Set Gender"
set desc = "Allows you to set your gender."
set category = "Robot Commands"
diff --git a/modular_splurt/code/modules/mob/splurt_emotes.dm b/modular_splurt/code/modules/mob/splurt_emotes.dm
index 7dc25f9c5d..b9d3412e50 100644
--- a/modular_splurt/code/modules/mob/splurt_emotes.dm
+++ b/modular_splurt/code/modules/mob/splurt_emotes.dm
@@ -758,6 +758,19 @@
user.nextsoundemote = world.time + 7
playsound(user, 'modular_splurt/sound/voice/weh_s.ogg', 50, 1, -1)
+/datum/emote/living/waa
+ key = "waa"
+ key_third_person = "waas"
+ message = "let out a waa!"
+
+/datum/emote/living/waa/run_emote(mob/user, params, type_override, intentional)
+ if(!(. = ..()))
+ return
+ if(user.nextsoundemote >= world.time)
+ return
+ user.nextsoundemote = world.time + 10
+ playsound(user, 'modular_splurt/sound/voice/waa.ogg', 50, 1, -1)
+
/datum/emote/living/mlem
key = "mlem"
key_third_person = "mlems"
diff --git a/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 0b7fc6f662..cbbb817aa4 100644
--- a/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -358,3 +358,27 @@
nT.Insert(M)
T.moveToNullspace()//To valhalla
to_chat(M, span_big_warning("Your tongue feels... weally fwuffy!!"))
+
+/datum/reagent/consumable/ethanol/ionstorm
+ name = "Ion Storm"
+ description = "A highly chaotic mixture that looks like it may react violently at any moment, but is surprisingly stable"
+ color = "#3fd2ff"
+ taste_description = "a scorching taste of strong alcohol and good brew going down your throat, making you feel warm inside"
+ glass_icon = 'modular_splurt/icons/obj/drinks.dmi'
+ glass_icon_state = "ionstorm"
+ glass_name = "glass of Ion Storm"
+ glass_desc = "You're not sure how this mixture is stable or even if it's drinkable, but it does remind you of a hot cup of apple cider on a cold winter morning"
+ pH = 6.5
+ value = REAGENT_VALUE_UNCOMMON
+ boozepwr = 30
+ quality = DRINK_FANTASTIC
+
+/datum/reagent/consumable/ethanol/ionstorm/on_mob_life(mob/living/carbon/C)
+ C.adjustBruteLoss(-0.5,0)
+ C.adjustFireLoss(-0.5,0)
+ if (C.reagents.has_reagent(/datum/reagent/medicine/epinephrine))
+ C.adjustToxLoss(0.25)
+ else
+ C.adjustOxyLoss(0.25)
+ . = 1
+ return ..()
diff --git a/modular_splurt/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/modular_splurt/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 07917089d2..972cd42ba9 100644
--- a/modular_splurt/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/modular_splurt/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -1,19 +1,62 @@
+#define QUIRK_ESTROUS_ACTIVE /datum/quirk/estrous_active
+
+// Hexacrocin
/datum/reagent/drug/aphrodisiacplus/overdose_start(mob/living/M)
+ . = ..()
+
+ // Check for mob with client
+ if(!(istype(M) && M.client))
+ return
+
+ // Check pref for arousable
+ if(!M.client?.prefs.arousable)
+ // Log interaction and return
+ M.log_message("overdosed on [src], but ignored it due to arousal preference.", LOG_EMOTE)
+ return
+
+ // Check pref for aphro
+ if(M.client?.prefs.cit_toggles & NO_APHRO)
+ // Log interaction and return
+ M.log_message("overdosed on [src], but ignored it due to aphrodisiac preference.", LOG_EMOTE)
+ return
+
// Check for pre-existing heat trait
- if(!HAS_TRAIT(M, TRAIT_ESTROUS_ACTIVE))
- // Check client preferences
- if(M && M.client?.prefs.arousable && !(M.client?.prefs.cit_toggles & NO_APHRO))
- // Add quirk
- M.add_quirk(/datum/quirk/estrous_active, APHRO_TRAIT)
+ if(!M.has_quirk(QUIRK_ESTROUS_ACTIVE))
+ // Add quirk
+ M.add_quirk(QUIRK_ESTROUS_ACTIVE, APHRO_TRAIT)
- // Chat message is handled by the quirk
+ // Chat message is handled by the quirk
- // Log interaction
- M.log_message("Given the In Estrous quirk by hexacrocin overdose.", LOG_EMOTE)
+ // Log interaction
+ M.log_message("was given the In Estrous quirk by [src] overdose.", LOG_EMOTE)
// Return normally
. = ..()
+// Hexacamphor
+/datum/reagent/drug/anaphrodisiacplus/overdose_start(mob/living/M)
+ . = ..()
+
+ // Check for mob with client
+ if(!(istype(M) && M.client))
+ return
+
+ // Check pref for arousable
+ if(!M.client?.prefs.arousable)
+ // Log interaction and return
+ M.log_message("overdosed on [src], but ignored it due to arousal preference.", LOG_EMOTE)
+ return
+
+ // Check for pre-existing heat trait
+ if(M.has_quirk(QUIRK_ESTROUS_ACTIVE))
+ // Remove quirk
+ M.remove_quirk(QUIRK_ESTROUS_ACTIVE)
+
+ // Chat message is handled by the quirk
+
+ // Log interaction
+ M.log_message("lost the In Estrous quirk due to [src] overdose.", LOG_EMOTE)
+
//Own stuff
/datum/reagent/drug/maint/tar
name = "Maintenance Tar"
@@ -81,3 +124,5 @@
var/temp = holder ? holder.chem_temp : T20C
T.atmos_spawn_air("copium=[volume];TEMP=[temp]")
return
+
+#undef QUIRK_ESTROUS_ACTIVE
diff --git a/modular_splurt/code/modules/research/techweb/nodes/nanites_nodes.dm b/modular_splurt/code/modules/research/techweb/nodes/nanites_nodes.dm
new file mode 100644
index 0000000000..a662a03f7f
--- /dev/null
+++ b/modular_splurt/code/modules/research/techweb/nodes/nanites_nodes.dm
@@ -0,0 +1,12 @@
+// Harmful nanites node
+/datum/techweb_node/nanite_hazard/New()
+ // Define designs to remove
+ var/list/rem_designs = list(
+ "spreading_nanites"
+ )
+
+ // Remove designs from the list
+ LAZYREMOVE(design_ids, rem_designs)
+
+ // Return
+ . = ..()
diff --git a/modular_splurt/code/modules/vending/clothesmate.dm b/modular_splurt/code/modules/vending/clothesmate.dm
index d7d67e4011..d6dee6e947 100644
--- a/modular_splurt/code/modules/vending/clothesmate.dm
+++ b/modular_splurt/code/modules/vending/clothesmate.dm
@@ -16,7 +16,12 @@
/obj/item/clothing/under/officesexy = 3,
/obj/item/clothing/suit/toggle/tunnelfox = 3,
/obj/item/clothing/under/performer = 2,
- /obj/item/clothing/under/bluedress = 3
+ /obj/item/clothing/under/bluedress = 3,
+ /obj/item/clothing/accessory/shortcrop = 3,
+ /obj/item/clothing/accessory/longcrop = 3,
+ /obj/item/clothing/accessory/formalcrop = 3,
+ /obj/item/clothing/under/misc/leia_outfit = 2,
+ /obj/item/clothing/under/performer/polychromic = 2
)
var/list/extra_contraband = list(
/obj/item/clothing/under/rank/civilian/lawyer/galaxy_red = 3,
diff --git a/modular_splurt/code/modules/vending/kinkmate.dm b/modular_splurt/code/modules/vending/kinkmate.dm
index 1d2f3c5a94..53b6abb542 100644
--- a/modular_splurt/code/modules/vending/kinkmate.dm
+++ b/modular_splurt/code/modules/vending/kinkmate.dm
@@ -29,7 +29,8 @@
/obj/item/restraints/bondage_rope = 5,
/obj/item/clothing/under/domina = 5,
/obj/item/clothing/under/performer = 3,
- /obj/item/clothing/shoes/invisiboots = 10 // Added here to go with the Gear Harness
+ /obj/item/clothing/shoes/invisiboots = 10, // Added here to go with the Gear Harness
+ /obj/item/clothing/shoes/highheel_sandals = 3
)
var/list/extra_contraband = list(
//Lewd-Clothes
diff --git a/modular_splurt/icons/mob/64_mam_tails.dmi b/modular_splurt/icons/mob/64_mam_tails.dmi
index b7f1ac3834..71249b8896 100644
Binary files a/modular_splurt/icons/mob/64_mam_tails.dmi and b/modular_splurt/icons/mob/64_mam_tails.dmi differ
diff --git a/modular_splurt/icons/mob/clothing/accessories.dmi b/modular_splurt/icons/mob/clothing/accessories.dmi
new file mode 100644
index 0000000000..024e1d5443
Binary files /dev/null and b/modular_splurt/icons/mob/clothing/accessories.dmi differ
diff --git a/modular_splurt/icons/mob/clothing/current_head_accessories.dmi b/modular_splurt/icons/mob/clothing/current_head_accessories.dmi
new file mode 100644
index 0000000000..6d189aeba5
Binary files /dev/null and b/modular_splurt/icons/mob/clothing/current_head_accessories.dmi differ
diff --git a/modular_splurt/icons/mob/clothing/shoes.dmi b/modular_splurt/icons/mob/clothing/shoes.dmi
index 0956dfbdd1..005bdc7b7d 100644
Binary files a/modular_splurt/icons/mob/clothing/shoes.dmi and b/modular_splurt/icons/mob/clothing/shoes.dmi differ
diff --git a/modular_splurt/icons/mob/clothing/shoes_digi.dmi b/modular_splurt/icons/mob/clothing/shoes_digi.dmi
index a37e1178f1..755d9c92e9 100644
Binary files a/modular_splurt/icons/mob/clothing/shoes_digi.dmi and b/modular_splurt/icons/mob/clothing/shoes_digi.dmi differ
diff --git a/modular_splurt/icons/mob/clothing/uniform.dmi b/modular_splurt/icons/mob/clothing/uniform.dmi
index 1555bade4d..22d71404af 100644
Binary files a/modular_splurt/icons/mob/clothing/uniform.dmi and b/modular_splurt/icons/mob/clothing/uniform.dmi differ
diff --git a/modular_splurt/icons/mob/landmarks.dmi b/modular_splurt/icons/mob/landmarks.dmi
index 7ee3942be1..5c596e0c95 100644
Binary files a/modular_splurt/icons/mob/landmarks.dmi and b/modular_splurt/icons/mob/landmarks.dmi differ
diff --git a/modular_splurt/icons/mob/mam_snouts.dmi b/modular_splurt/icons/mob/mam_snouts.dmi
index fb6071b8c2..4abff36de8 100644
Binary files a/modular_splurt/icons/mob/mam_snouts.dmi and b/modular_splurt/icons/mob/mam_snouts.dmi differ
diff --git a/modular_splurt/icons/mob/wings.dmi b/modular_splurt/icons/mob/wings.dmi
index 4f6d68199d..b79cb3f4ac 100644
Binary files a/modular_splurt/icons/mob/wings.dmi and b/modular_splurt/icons/mob/wings.dmi differ
diff --git a/modular_splurt/icons/obj/clothing/accessories.dmi b/modular_splurt/icons/obj/clothing/accessories.dmi
new file mode 100644
index 0000000000..c15501ea74
Binary files /dev/null and b/modular_splurt/icons/obj/clothing/accessories.dmi differ
diff --git a/modular_splurt/icons/obj/clothing/shoes.dmi b/modular_splurt/icons/obj/clothing/shoes.dmi
index 71b62b42bc..311174d23d 100644
Binary files a/modular_splurt/icons/obj/clothing/shoes.dmi and b/modular_splurt/icons/obj/clothing/shoes.dmi differ
diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi
index 3880f77532..df0c9a0f37 100644
Binary files a/modular_splurt/icons/obj/clothing/uniforms.dmi and b/modular_splurt/icons/obj/clothing/uniforms.dmi differ
diff --git a/modular_splurt/icons/obj/drinks.dmi b/modular_splurt/icons/obj/drinks.dmi
index 4ea6784f4e..55d640912e 100644
Binary files a/modular_splurt/icons/obj/drinks.dmi and b/modular_splurt/icons/obj/drinks.dmi differ
diff --git a/modular_splurt/sound/voice/waa.ogg b/modular_splurt/sound/voice/waa.ogg
new file mode 100644
index 0000000000..9e5ba7866f
Binary files /dev/null and b/modular_splurt/sound/voice/waa.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index aa7d34126d..2d1ceb8baf 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -108,6 +108,7 @@
#include "code\__DEFINES\rust_g.dm"
#include "code\__DEFINES\rust_g_overrides.dm"
#include "code\__DEFINES\say.dm"
+#include "code\__DEFINES\screentips.dm"
#include "code\__DEFINES\security_levels.dm"
#include "code\__DEFINES\shuttles.dm"
#include "code\__DEFINES\sight.dm"
@@ -157,6 +158,8 @@
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals.dm"
#include "code\__DEFINES\dcs\signals\signals_movable.dm"
+#include "code\__DEFINES\dcs\signals\signals_painting.dm"
+#include "code\__DEFINES\dcs\signals\signals_screentips.dm"
#include "code\__DEFINES\dcs\signals\signals_subsystem.dm"
#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_movement.dm"
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_living.dm"
@@ -211,6 +214,7 @@
#include "code\__HELPERS\reagents.dm"
#include "code\__HELPERS\roundend.dm"
#include "code\__HELPERS\sanitize_values.dm"
+#include "code\__HELPERS\screentips.dm"
#include "code\__HELPERS\shell.dm"
#include "code\__HELPERS\stat_tracking.dm"
#include "code\__HELPERS\text.dm"
@@ -232,6 +236,8 @@
#include "code\__HELPERS\sorts\MergeSort.dm"
#include "code\__HELPERS\sorts\TimSort.dm"
#include "code\__SANDCODE\DEFINES\chat.dm"
+#include "code\__SANDCODE\DEFINES\DNA.dm"
+#include "code\__SANDCODE\DEFINES\keybindings.dm"
#include "code\__SANDCODE\DEFINES\language.dm"
#include "code\__SANDCODE\DEFINES\lewd.dm"
#include "code\__SANDCODE\DEFINES\loadout.dm"
@@ -247,6 +253,8 @@
#include "code\__SANDCODE\DEFINES\subsystems.dm"
#include "code\__SANDCODE\DEFINES\traits.dm"
#include "code\__SANDCODE\DEFINES\wires.dm"
+#include "code\__SANDCODE\DEFINES\dcs\signals.dm"
+#include "code\__SANDCODE\DEFINES\dcs\signals\signals_mob_main.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals\sizecode.dm"
#include "code\__SANDCODE\HELPERS\sizecode.dm"
#include "code\__SPLURTCODE\DEFINES\access.dm"
@@ -260,6 +268,7 @@
#include "code\__SPLURTCODE\DEFINES\hud.dm"
#include "code\__SPLURTCODE\DEFINES\is_helpers.dm"
#include "code\__SPLURTCODE\DEFINES\lewd.dm"
+#include "code\__SPLURTCODE\DEFINES\loadout.dm"
#include "code\__SPLURTCODE\DEFINES\login.dm"
#include "code\__SPLURTCODE\DEFINES\mobs.dm"
#include "code\__SPLURTCODE\DEFINES\preferences.dm"
@@ -275,8 +284,6 @@
#include "code\__SPLURTCODE\DEFINES\traits.dm"
#include "code\__SPLURTCODE\DEFINES\arousal\genitals.dm"
#include "code\__SPLURTCODE\DEFINES\dcs\signals.dm"
-#include "code\__SPLURTCODE\DEFINES\zeros\species.dm"
-#include "code\__SPLURTCODE\DEFINES\zeros\traits.dm"
#include "code\_globalvars\admin.dm"
#include "code\_globalvars\bitfields.dm"
#include "code\_globalvars\configuration.dm"
@@ -762,6 +769,10 @@
#include "code\datums\elements\ventcrawling.dm"
#include "code\datums\elements\weather_listener.dm"
#include "code\datums\elements\wuv.dm"
+#include "code\datums\elements\screentips\contextual_screentip_bare_hands.dm"
+#include "code\datums\elements\screentips\contextual_screentip_item_typechecks.dm"
+#include "code\datums\elements\screentips\contextual_screentip_sharpness.dm"
+#include "code\datums\elements\screentips\contextual_screentip_tools.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"
#include "code\datums\helper_datums\icon_snapshot.dm"
@@ -817,6 +828,8 @@
#include "code\datums\ruins\lavaland.dm"
#include "code\datums\ruins\space.dm"
#include "code\datums\ruins\station.dm"
+#include "code\datums\screentips\atom_context.dm"
+#include "code\datums\screentips\item_context.dm"
#include "code\datums\skills\_check_skills.dm"
#include "code\datums\skills\_skill.dm"
#include "code\datums\skills\_skill_holder.dm"
@@ -1319,6 +1332,7 @@
#include "code\game\objects\items\stacks\medical.dm"
#include "code\game\objects\items\stacks\rods.dm"
#include "code\game\objects\items\stacks\stack.dm"
+#include "code\game\objects\items\stacks\stack_recipe.dm"
#include "code\game\objects\items\stacks\tape.dm"
#include "code\game\objects\items\stacks\telecrystal.dm"
#include "code\game\objects\items\stacks\tickets.dm"
@@ -1992,6 +2006,7 @@
#include "code\modules\buildmode\submodes\throwing.dm"
#include "code\modules\buildmode\submodes\variable_edit.dm"
#include "code\modules\cargo\bounty.dm"
+#include "code\modules\cargo\bounty_console.dm"
#include "code\modules\cargo\centcom_podlauncher.dm"
#include "code\modules\cargo\console.dm"
#include "code\modules\cargo\coupon.dm"
@@ -2687,6 +2702,7 @@
#include "code\modules\mob\living\brain\status_procs.dm"
#include "code\modules\mob\living\carbon\carbon.dm"
#include "code\modules\mob\living\carbon\carbon_active_parry.dm"
+#include "code\modules\mob\living\carbon\carbon_context.dm"
#include "code\modules\mob\living\carbon\carbon_defense.dm"
#include "code\modules\mob\living\carbon\carbon_defines.dm"
#include "code\modules\mob\living\carbon\carbon_movement.dm"
@@ -2742,6 +2758,7 @@
#include "code\modules\mob\living\carbon\human\examine.dm"
#include "code\modules\mob\living\carbon\human\human.dm"
#include "code\modules\mob\living\carbon\human\human_block.dm"
+#include "code\modules\mob\living\carbon\human\human_context.dm"
#include "code\modules\mob\living\carbon\human\human_defense.dm"
#include "code\modules\mob\living\carbon\human\human_defines.dm"
#include "code\modules\mob\living\carbon\human\human_helpers.dm"
@@ -3717,6 +3734,7 @@
#include "code\modules\tgui\states\human_adjacent.dm"
#include "code\modules\tgui\states\inventory.dm"
#include "code\modules\tgui\states\language_menu.dm"
+#include "code\modules\tgui\states\never.dm"
#include "code\modules\tgui\states\new_player.dm"
#include "code\modules\tgui\states\not_incapacitated.dm"
#include "code\modules\tgui\states\notcontained.dm"
@@ -3861,6 +3879,7 @@
#include "modular_citadel\code\modules\client\loadout\_medical.dm"
#include "modular_citadel\code\modules\client\loadout\_security.dm"
#include "modular_citadel\code\modules\client\loadout\_service.dm"
+#include "modular_citadel\code\modules\client\loadout\accessory.dm"
#include "modular_citadel\code\modules\client\loadout\backpack.dm"
#include "modular_citadel\code\modules\client\loadout\glasses.dm"
#include "modular_citadel\code\modules\client\loadout\gloves.dm"
@@ -3944,6 +3963,7 @@
#include "modular_sand\code\datums\action.dm"
#include "modular_sand\code\datums\ai_laws.dm"
#include "modular_sand\code\datums\shuttles.dm"
+#include "modular_sand\code\datums\components\interaction_menu_granter.dm"
#include "modular_sand\code\datums\components\mood.dm"
#include "modular_sand\code\datums\components\riding.dm"
#include "modular_sand\code\datums\components\container_item\container_item.dm"
@@ -3954,7 +3974,6 @@
#include "modular_sand\code\datums\elements\holder_micro.dm"
#include "modular_sand\code\datums\elements\skirt_peeking.dm"
#include "modular_sand\code\datums\interactions\_interaction.dm"
-#include "modular_sand\code\datums\interactions\interaction_interface.dm"
#include "modular_sand\code\datums\interactions\interaction_mob.dm"
#include "modular_sand\code\datums\interactions\lewd_definitions.dm"
#include "modular_sand\code\datums\interactions\lewd_interactions.dm"
@@ -4111,6 +4130,7 @@
#include "modular_sand\code\modules\clothing\suits\miscellaneous.dm"
#include "modular_sand\code\modules\clothing\under\_under.dm"
#include "modular_sand\code\modules\clothing\under\costumes.dm"
+#include "modular_sand\code\modules\clothing\under\miscellaneous.dm"
#include "modular_sand\code\modules\clothing\under\uniform.dm"
#include "modular_sand\code\modules\clothing\underwear\_underwear.dm"
#include "modular_sand\code\modules\clothing\underwear\boxers.dm"
@@ -4200,6 +4220,7 @@
#include "modular_sand\code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\legionnaire.dm"
#include "modular_sand\code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\pandora.dm"
#include "modular_sand\code\modules\movespeed\modifiers\components.dm"
+#include "modular_sand\code\modules\pixel_shift\pixel_shift.dm"
#include "modular_sand\code\modules\power\cell.dm"
#include "modular_sand\code\modules\power\lightning.dm"
#include "modular_sand\code\modules\power\port_gen.dm"
@@ -4220,6 +4241,7 @@
#include "modular_sand\code\modules\reagents\reagent_containers\glass.dm"
#include "modular_sand\code\modules\reagents\reagent_containers\pill.dm"
#include "modular_sand\code\modules\reagents\reagent_containers\spray.dm"
+#include "modular_sand\code\modules\research\rdconsole.dm"
#include "modular_sand\code\modules\research\stock_parts.dm"
#include "modular_sand\code\modules\research\designs\autolathe_designs.dm"
#include "modular_sand\code\modules\research\designs\biogenerator_designs.dm"
@@ -4234,6 +4256,10 @@
#include "modular_sand\code\modules\research\designs\weapon_designs.dm"
#include "modular_sand\code\modules\research\designs\autolathe_designs\autolathe_designs_medical_and_dinnerware.dm"
#include "modular_sand\code\modules\research\designs\machine_designs\machine_designs_all_misc.dm"
+#include "modular_sand\code\modules\research\machinery\_production.dm"
+#include "modular_sand\code\modules\research\machinery\departmental_circuit_imprinter.dm"
+#include "modular_sand\code\modules\research\machinery\departmental_protolathe.dm"
+#include "modular_sand\code\modules\research\machinery\departmental_techfab.dm"
#include "modular_sand\code\modules\research\nanites\nanite_programs\utility.dm"
#include "modular_sand\code\modules\research\techweb\nodes\alien_nodes.dm"
#include "modular_sand\code\modules\research\techweb\nodes\all_nodes.dm"
@@ -4252,6 +4278,7 @@
#include "modular_sand\code\modules\spells\spell.dm"
#include "modular_sand\code\modules\spells\spell_types\shapeshift.dm"
#include "modular_sand\code\modules\surgery\organs\augments_arms.dm"
+#include "modular_sand\code\modules\surgery\organs\organ_internal.dm"
#include "modular_sand\code\modules\telescience\telepad.dm"
#include "modular_sand\code\modules\telescience\telesci.dm"
#include "modular_sand\code\modules\telescience\telesci_computer.dm"
@@ -4286,6 +4313,7 @@
#include "modular_splurt\code\_onclick\hud\robot.dm"
#include "modular_splurt\code\_onclick\hud\screen_objects.dm"
#include "modular_splurt\code\_rendering\fullscreen\fullscreen.dm"
+#include "modular_splurt\code\controllers\configuration\entries\splurt_autocryo.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_comms.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_connections.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_discord.dm"
@@ -4294,6 +4322,7 @@
#include "modular_splurt\code\controllers\configuration\entries\splurt_general.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_maps.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_server.dm"
+#include "modular_splurt\code\controllers\subsystem\afk.dm"
#include "modular_splurt\code\controllers\subsystem\discord.dm"
#include "modular_splurt\code\controllers\subsystem\redbot.dm"
#include "modular_splurt\code\controllers\subsystem\ticker.dm"
@@ -4495,6 +4524,7 @@
#include "modular_splurt\code\modules\antagonists\wendigo\mob\mob_equip.dm"
#include "modular_splurt\code\modules\antagonists\wendigo\mob\organs_bodyparts.dm"
#include "modular_splurt\code\modules\antagonists\wendigo\mob\update_icons.dm"
+#include "modular_splurt\code\modules\antagonists\wendigo\mob\wendigo_defense.dm"
#include "modular_splurt\code\modules\arousal\arousal.dm"
#include "modular_splurt\code\modules\arousal\genitals.dm"
#include "modular_splurt\code\modules\arousal\genitals_sprite_accessories.dm"
@@ -4536,6 +4566,7 @@
#include "modular_splurt\code\modules\client\client_procs.dm"
#include "modular_splurt\code\modules\client\preferences.dm"
#include "modular_splurt\code\modules\client\preferences_savefile.dm"
+#include "modular_splurt\code\modules\client\loadout\accessory.dm"
#include "modular_splurt\code\modules\client\loadout\backpack.dm"
#include "modular_splurt\code\modules\client\loadout\boxers.dm"
#include "modular_splurt\code\modules\client\loadout\glasses.dm"
@@ -4595,6 +4626,7 @@
#include "modular_splurt\code\modules\clothing\suits\utility.dm"
#include "modular_splurt\code\modules\clothing\suits\vest.dm"
#include "modular_splurt\code\modules\clothing\under\_under.dm"
+#include "modular_splurt\code\modules\clothing\under\accessories.dm"
#include "modular_splurt\code\modules\clothing\under\miscellaneous.dm"
#include "modular_splurt\code\modules\clothing\under\shorts.dm"
#include "modular_splurt\code\modules\clothing\under\jobs\command.dm"
@@ -4646,6 +4678,7 @@
#include "modular_splurt\code\modules\jobs\job_types\security_officer.dm"
#include "modular_splurt\code\modules\jobs\job_types\service.dm"
#include "modular_splurt\code\modules\jobs\job_types\station_engineer.dm"
+#include "modular_splurt\code\modules\jobs\job_types\stowaway.dm"
#include "modular_splurt\code\modules\keybindings\keybind\communication.dm"
#include "modular_splurt\code\modules\keybindings\keybind\human.dm"
#include "modular_splurt\code\modules\keybindings\keybind\movement.dm"
@@ -4654,6 +4687,7 @@
#include "modular_splurt\code\modules\mentor\mentor_mouse.dm"
#include "modular_splurt\code\modules\mentor\mentor_verbs.dm"
#include "modular_splurt\code\modules\mining\equipment\kinetic_crusher.dm"
+#include "modular_splurt\code\modules\mining\equipment\machine_vending.dm"
#include "modular_splurt\code\modules\mining\lavaland\necropolis_chests.dm"
#include "modular_splurt\code\modules\mob\emote.dm"
#include "modular_splurt\code\modules\mob\mob.dm"
@@ -4682,12 +4716,16 @@
#include "modular_splurt\code\modules\mob\living\living_mobility.dm"
#include "modular_splurt\code\modules\mob\living\living_movement.dm"
#include "modular_splurt\code\modules\mob\living\living_signals.dm"
+#include "modular_splurt\code\modules\mob\living\login.dm"
+#include "modular_splurt\code\modules\mob\living\logout.dm"
#include "modular_splurt\code\modules\mob\living\navigation.dm"
#include "modular_splurt\code\modules\mob\living\say.dm"
#include "modular_splurt\code\modules\mob\living\brain\brain_item.dm"
#include "modular_splurt\code\modules\mob\living\carbon\carbon.dm"
+#include "modular_splurt\code\modules\mob\living\carbon\carbon_defense.dm"
#include "modular_splurt\code\modules\mob\living\carbon\human\emote.dm"
#include "modular_splurt\code\modules\mob\living\carbon\human\human.dm"
+#include "modular_splurt\code\modules\mob\living\carbon\human\human_defense.dm"
#include "modular_splurt\code\modules\mob\living\carbon\human\human_defines.dm"
#include "modular_splurt\code\modules\mob\living\carbon\human\inventory.dm"
#include "modular_splurt\code\modules\mob\living\carbon\human\physiology.dm"
@@ -4777,6 +4815,7 @@
#include "modular_splurt\code\modules\research\techweb\nodes\bluespace_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\mecha_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\medical_nodes.dm"
+#include "modular_splurt\code\modules\research\techweb\nodes\nanites_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\robotic_nodes.dm"
#include "modular_splurt\code\modules\resize\smallsprite_action.dm"
#include "modular_splurt\code\modules\ruins\objects_and_mobs\ash_walker_den.dm"
diff --git a/tgui/.yarn/releases/yarn-3.4.1.cjs b/tgui/.yarn/releases/yarn-3.4.1.cjs
new file mode 100644
index 0000000000..2bdb752d86
--- /dev/null
+++ b/tgui/.yarn/releases/yarn-3.4.1.cjs
@@ -0,0 +1,873 @@
+#!/usr/bin/env node
+/* eslint-disable */
+//prettier-ignore
+(()=>{var Mue=Object.create;var Wb=Object.defineProperty;var Kue=Object.getOwnPropertyDescriptor;var Uue=Object.getOwnPropertyNames;var Hue=Object.getPrototypeOf,Gue=Object.prototype.hasOwnProperty;var J=(r=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(r,{get:(e,t)=>(typeof require<"u"?require:e)[t]}):r)(function(r){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+r+'" is not supported')});var Yue=(r,e)=>()=>(r&&(e=r(r=0)),e);var w=(r,e)=>()=>(e||r((e={exports:{}}).exports,e),e.exports),ut=(r,e)=>{for(var t in e)Wb(r,t,{get:e[t],enumerable:!0})},jue=(r,e,t,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of Uue(e))!Gue.call(r,n)&&n!==t&&Wb(r,n,{get:()=>e[n],enumerable:!(i=Kue(e,n))||i.enumerable});return r};var Pe=(r,e,t)=>(t=r!=null?Mue(Hue(r)):{},jue(e||!r||!r.__esModule?Wb(t,"default",{value:r,enumerable:!0}):t,r));var _1=w((O7e,X1)=>{X1.exports=V1;V1.sync=uge;var W1=J("fs");function cge(r,e){var t=e.pathExt!==void 0?e.pathExt:process.env.PATHEXT;if(!t||(t=t.split(";"),t.indexOf("")!==-1))return!0;for(var i=0;i