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 += "[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 += " " + + dat += " " + dat += "
"
+ dat += "[gear_points] loadout point[gear_points == 1 ? "" : "s"] remaining Clear Loadout"
+ dat += " | "
+ else
+ dat += ""
+ dat += "Mismatched parts: [(show_mismatched_markings) ? "Enabled" : "Disabled"]"
+ dat += " | "
- //Character Appearance
- if(APPEARANCE_TAB)
- if(path)
- var/savefile/S = new /savefile(path)
- if(S)
- dat += ""
+ dat += " Advanced colors: [(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) ? "Enabled" : "Disabled"]"
+ dat += " | "
+
+ 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 += "Custom job preferences: " + dat += "Preferred AI Core Display: [preferred_ai_core_display] " + dat += "Preferred Security Department: [prefered_security_department] | "
+ 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 += " Consent preferences" + dat += "ERP : [erppref]" + dat += "Non-Con : [nonconpref] " + dat += "Vore : [vorepref] " + //END OF SKYRAT EDIT + + 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 += "[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 += " Skin Tone" - 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 += "[use_custom_skin_tone ? "custom: [skin_tone]" : skin_tone] " - dat += " | " //body moves right sandstorm change
+ var/mutant_colors
+ if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
+ if(!use_skintones)
+ dat += APPEARANCE_CATEGORY_COLUMN
- var/use_skintones = pref_species.use_skintones
- if(use_skintones)
- dat += APPEARANCE_CATEGORY_COLUMN
+ dat += "
" - dat += "#[grad_color] Change
" + dat += "" + 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 += ""
- //Mutant stuff
- var/mutant_category = 0
-
- dat += APPEARANCE_CATEGORY_COLUMN
- dat += "
| [marking_list[2]] - [actual_name] | ˄ ˅ X [color_marking_dat] |
Lewd preferences
" + dat += "Lust tolerance:[lust_tolerance]" + dat += "Sexual potency:[sexual_potency]" + 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" + //SPLURT EDIT BEGIN - gregnancy preferences + 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 += "" 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) + if(pref_species.use_skintones) + dat += "Genitals use skintone:[features["genitals_use_skintone"] == TRUE ? "Yes" : "No"]" + dat += "
Penis
" + dat += "[features["has_cock"] == TRUE ? "Yes" : "No"]" + if(features["has_cock"]) + if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) + dat += "Penis Color:" + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding)
" + else + 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 += "Testicles Color:
" + dat += "#[features["balls_color"]] Change
" + dat += "Testicles Shape: [features["balls_shape"]]" + dat += "Testicles Visibility:[features["balls_visibility"]]" + //SPLURT Edit + dat += "Egg Stuffing:[features["balls_stuffing"] == TRUE ? "Yes" : "No"]" + dat += "Produces:" + var/datum/reagent/balls_fluid = find_reagent_object_from_type(features["balls_fluid"]) + if(balls_fluid && (balls_fluid in GLOB.genital_fluids_list)) + dat += "[balls_fluid.name]" + else + dat += "Nothing?" + //SPLURT Edit end dat += "" - mutant_category = 0 + dat += APPEARANCE_CATEGORY_COLUMN + dat += "
Vagina
" + dat += "[features["has_vag"] == TRUE ? "Yes" : "No"]" + if(features["has_vag"]) + dat += "Vagina Type: [features["vag_shape"]]" + if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) + dat += "Vagina Color:" + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding)
" + else + dat += "Vagina Color:
" + dat += "#[features["vag_color"]] Change
" + dat += "Vagina Visibility:[features["vag_visibility"]]" + dat += "Egg Stuffing:[features["vag_stuffing"] == TRUE ? "Yes" : "No"]" //SPLURT Edit + dat += "Has Womb:[features["has_womb"] == TRUE ? "Yes" : "No"]" + //SPLURT Edit + if(features["has_womb"] == TRUE) + dat += "Produces:" + var/datum/reagent/womb_fluid = find_reagent_object_from_type(features["womb_fluid"]) + if(womb_fluid && (womb_fluid in GLOB.genital_fluids_list)) + dat += "[womb_fluid.name]" + else + dat += "Nothing?" + //SPLURT Edit end + dat += "" + dat += APPEARANCE_CATEGORY_COLUMN + dat += "
Breasts
" + dat += "[features["has_breasts"] == TRUE ? "Yes" : "No"]" + if(features["has_breasts"]) + if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) + dat += "Color:" + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding)
" + else + dat += "Color:
" + dat += "#[features["breasts_color"]] Change
" + dat += "Cup Size:[features["breasts_size"]]" + dat += "Breasts Shape:[features["breasts_shape"]]" + dat += "Breasts Visibility:[features["breasts_visibility"]]" + dat += "Lactates:[features["breasts_producing"] == TRUE ? "Yes" : "No"]" + //SPLURT Edit + dat += "Egg Stuffing:[features["breasts_stuffing"] == TRUE ? "Yes" : "No"]" + if(features["breasts_producing"] == TRUE) + dat += "Produces:" + var/datum/reagent/breasts_fluid = find_reagent_object_from_type(features["breasts_fluid"]) + if(breasts_fluid && (breasts_fluid in GLOB.genital_fluids_list)) + dat += "[breasts_fluid.name]" + else + dat += "Nothing?" + //SPLURT Edit end + dat += "" + dat += APPEARANCE_CATEGORY_COLUMN + dat += "
Butt
" + dat += "[features["has_butt"] == TRUE ? "Yes" : "No"]" + if(features["has_butt"]) + if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) + dat += "Color:" + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding)
" + else + dat += "Color:
" + dat += "#[features["butt_color"]] Change
" + dat += "Butt Size:[features["butt_size"]]" + dat += "Butt Visibility:[features["butt_visibility"]]" + //SPLURT Edit + dat += "Egg Stuffing:[features["butt_stuffing"] == TRUE ? "Yes" : "No"]" + dat += "Butthole Sprite:[features["has_anus"] == TRUE ? "Yes" : "No"]" + if(features["has_anus"]) + dat += "Butthole Color:
" + if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding)
" + else + dat += "#[features["anus_color"]] Change
" + dat += "Butthole Shape: [features["anus_shape"]]" + dat += "Butthole Visibility:[features["anus_visibility"]]" + dat += "Egg Stuffing:[features["anus_stuffing"] == TRUE ? "Yes" : "No"]" - 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]" + dat += "" + dat += APPEARANCE_CATEGORY_COLUMN + dat += "Belly
" + dat += "[features["has_belly"] == TRUE ? "Yes" : "No"]" + if(features["has_belly"]) + if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) + dat += "Color:" + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding)
" + else + dat += "Color:
" + dat += "#[features["belly_color"]] Change
" + dat += "Belly Size:[features["belly_size"]]" + dat += "Belly Visibility:[features["belly_visibility"]]" + dat += "Egg Stuffing:[features["belly_stuffing"] == TRUE ? "Yes" : "No"]" + dat += "" + if(all_quirks.Find("Dullahan")) + dat += APPEARANCE_CATEGORY_COLUMN - if(mutant_category) - dat += "" - mutant_category = 0 + dat += "
Neckfire
" + dat += "[features["neckfire"] ? "Yes" : "No"]" + if(features["neckfire"]) + dat += "Color:" + dat += "#[features["neckfire_color"]]Change
" - dat += "
[GLOB.all_mutant_parts[marking_type]]
" // give it the appropriate title for the type of marking + dat += "Add marking" + 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 += " | "
+ for(var/limb in GLOB.bodypart_values)
+ if(length(GLOB.bodypart_values) % 3 != 0)
+ continue
+ total_pages++
+
+ for(var/limb in GLOB.bodypart_values)
+ if(!iterated_markings)
+ 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 += "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 += " | " + 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 += "Nothing?" - dat += " | "
- dat += APPEARANCE_CATEGORY_COLUMN
- dat += "
" - dat += "#[features["belly_color"]] Change " - dat += "Belly Size:[features["belly_size"]]" - dat += "Belly Visibility:[features["belly_visibility"]]" - dat += "Egg Stuffing:[features["belly_stuffing"] == TRUE ? "Yes" : "No"]" - dat += " | "
- if(all_quirks.Find("Dullahan"))
- dat += APPEARANCE_CATEGORY_COLUMN
+ if(!GLOB.loadout_categories[gear_category])
+ gear_category = GLOB.loadout_categories[1]
+ var/firstcat = TRUE
+ for(var/category in GLOB.loadout_categories)
+ if(firstcat)
+ firstcat = FALSE
+ else
+ dat += " |"
+ if(category == gear_category)
+ dat += " [category] "
+ else
+ dat += " [category] "
- dat += "|||
" - 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 ? "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 " + if(!length(GLOB.loadout_categories[gear_category])) + dat += "No subcategories detected. Something is horribly wrong!" + else + var/list/subcategories = GLOB.loadout_categories[gear_category] + if(!subcategories.Find(gear_subcategory)) + gear_subcategory = subcategories[1] + + var/firstsubcat = TRUE + for(var/subcategory in subcategories) + if(firstsubcat) + firstsubcat = FALSE + else + dat += " |" + if(gear_subcategory == subcategory) + dat += " [subcategory] " + else + dat += " [subcategory] " + 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 += "
" + + 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 += "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 += "" + dat += " | "
- dat += "Special Role Settings" + dat += "Special Role Settings" - if(jobban_isbanned(user, ROLE_SYNDICATE)) - dat += "You are banned from antagonist roles." - src.be_special = list() + 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"]" + 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" + for (var/i in GLOB.special_roles) + if(jobban_isbanned(user, i)) + dat += "Be [capitalize(i)]: BANNED " 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)) + 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 += " " - if(!CONFIG_GET(flag/auto_deadmin_antagonists)) - dat += "As Antag: [(deadmin & DEADMIN_ANTAGONIST)?"Deadmin":"Keep Admin"] " - else - dat += "As Antag: FORCED " + dat += "Combo HUD Lighting: [(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"] " + dat += "Use Modern Player Panel: [use_new_playerpanel ? "Yes" : "No"] " //SPLURT Edit - if(!CONFIG_GET(flag/auto_deadmin_heads)) - dat += "As Command: [(deadmin & DEADMIN_POSITION_HEAD)?"Deadmin":"Keep Admin"] " + //deadmin + dat += " Deadmin While Playing" + if(CONFIG_GET(flag/auto_deadmin_players)) + dat += "Always Deadmin: FORCED" else - dat += "As Command: FORCED " + 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_security)) - dat += "As Security: [(deadmin & DEADMIN_POSITION_SECURITY)?"Deadmin":"Keep Admin"] " - else - dat += "As Security: 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_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] " + if(!CONFIG_GET(flag/auto_deadmin_security)) + dat += "As Security: [(deadmin & DEADMIN_POSITION_SECURITY)?"Deadmin":"Keep Admin"] " + else + dat += "As Security: FORCED " - 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 += " " + 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 += "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 += "
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]
" - 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() + //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"]
" + //SPLURT Edit end - dat += "
" - if(!length(GLOB.loadout_items)) - 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 += " | |||
" + dat += " " - if(!length(GLOB.loadout_categories[gear_category])) - dat += "No subcategories detected. Something is horribly wrong!" - else - var/list/subcategories = GLOB.loadout_categories[gear_category] - if(!subcategories.Find(gear_subcategory)) - gear_subcategory = subcategories[1] - - var/firstsubcat = TRUE - for(var/subcategory in subcategories) - if(firstsubcat) - firstsubcat = FALSE + 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 += " |" - if(gear_subcategory == subcategory) - dat += " [subcategory] " + 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 - dat += " [subcategory] " - 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 += "" + if (p_map in config.maplist) + var/datum/map_config/VM = config.maplist[p_map] + if (!VM) + p_map += " (No longer exists)" 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] | " + p_map = VM.map_name + else + p_map += " (No longer exists)" + if(CONFIG_GET(flag/allow_map_voting)) + dat += "Preferred Map: [p_map]
"
+ 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 += "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) // 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 \ @@ -3148,47 +3218,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_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_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.") + //SPLURT Edit if("gfluid_black") var/list/datum/reagent/fluid_list = GLOB.genital_fluids_list.Copy() var/list/blacklisted = list() @@ -3208,6 +3268,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,7 +3549,14 @@ 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) @@ -3732,6 +3800,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 4754a87e3cd8..c265604f8169 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 /* 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) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 1cd09097f418..598136acfb55 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 1b8b4d9e002e..011f64d3ec2a 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 2e431a8a3470..18b9dc61cabf 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 155efcd7dca4..52ed3eca5e4c 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 7a5ffbbbae68..ce8c54a68512 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 c351cd25c6e8..e7674c7a2b2f 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/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index 378313311e83..ea5223975443 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 20bcf4b70da5..c5c135f8a513 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 000000000000..e7fc4d11bf93 --- /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 000000000000..5229fba3ea0d --- /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 ca5f6b135b3c..e5cab7a6f557 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 6052229e35fa..0c30c42a6552 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/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index 18e717191e03..cfeae5730b0c 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 29f9a37433a4..b849df2fc87e 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/photography/_pictures.dm b/code/modules/photography/_pictures.dm index 6f85cdb3a617..dace901ceaa6 100644 --- a/code/modules/photography/_pictures.dm +++ b/code/modules/photography/_pictures.dm @@ -76,7 +76,7 @@ /proc/load_photo_from_disk(id, location) var/datum/picture/P = load_picture_from_disk(id) if(istype(P)) - var/obj/item/photo/p = new(location, P) + var/obj/item/photo/old/p = new(location, P) return p /proc/load_picture_from_disk(id) diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm index 6f35e7a99d1d..48a920355365 100644 --- a/code/modules/photography/photos/album.dm +++ b/code/modules/photography/photos/album.dm @@ -48,7 +48,7 @@ for(var/i in ids) if(i in current_ids) continue - var/obj/item/photo/P = load_photo_from_disk(i) + var/obj/item/photo/old/P = load_photo_from_disk(i) if(istype(P)) if(!SEND_SIGNAL(src, COMSIG_TRY_STORAGE_INSERT, P, null, TRUE, TRUE)) qdel(P) diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index 4000bf843cdb..45aa4aeb79ef 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -98,7 +98,7 @@ load_from_id(data[persistence_id]) /obj/structure/sign/picture_frame/proc/load_from_id(id) - var/obj/item/photo/P = load_photo_from_disk(id) + var/obj/item/photo/old/P = load_photo_from_disk(id) if(istype(P)) if(istype(framed)) framed.forceMove(drop_location()) 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 1b1c710e8c38..0ac303a3a083 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 ea8e59a6b3d1..f2514b6f9c98 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/techweb/nodes/tools_nodes.dm b/code/modules/research/techweb/nodes/tools_nodes.dm index 86a48ab8de90..004795113bbc 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 99aaa8d8ec56..f350dd507e22 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 cda573d11d8a..f9a588e63ad0 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 1268cb190421..bc10b7a47131 100644 --- a/config/sandstorm/balance.txt +++ b/config/sandstorm/balance.txt @@ -57,3 +57,36 @@ 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 diff --git a/config/splurt/autocryo.txt b/config/splurt/autocryo.txt new file mode 100644 index 000000000000..bae707e02110 --- /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/config/splurt/general.txt b/config/splurt/general.txt index dcc4de101d4d..6eed64353545 100644 --- a/config/splurt/general.txt +++ b/config/splurt/general.txt @@ -9,3 +9,8 @@ MAX_INFINIDORMS 5 # Weighted station traits # If uncommented, the server will pick random station traits according to their weight configuration WEIGHTED_STATION_TRAITS + +# Base amount of max save slots +# Amount of character slots that players will have without modifiers being applied +# default is 24 +#BASE_SAVE_SLOTS 24 diff --git a/html/changelogs/archive/2023-02.yml b/html/changelogs/archive/2023-02.yml index f105d2f39c6f..c4252dd18f19 100644 --- a/html/changelogs/archive/2023-02.yml +++ b/html/changelogs/archive/2023-02.yml @@ -21,3 +21,93 @@ LeDrascol: - rscadd: Added variant of Subtle verb with typing indicator - tweak: Default binding for Subtle is now Control-5 +2023-02-07: + LeDrascol: + - tweak: Added gain, lose, and medical text to werewolf quirk + - tweak: Updated werewolf ability tooltip + - tweak: Changed body part sprites used for werewolf + - tweak: Werewolves cannot transform while asleep, restrained, or stunned + - tweak: Werewolf transformation now has a five second cooldown + - tweak: Werewolf species name prefix is now based on gender + - tweak: Werewolves can be slime and jelly entities + - tweak: Werewolves will gain an appropriate taur body if the owner had one + - bugfix: Werewolves cannot transform while dead + - bugfix: Werewolf transformation organ bug fixed for some species + - bugfix: Werewolf old species attributes are no longer lost on action removal + - bugfix: Werewolves custom species name properly applies + - bugfix: Werewolves will regain exotic eye types + - code_imp: Added a werewolf quirk trait + - refactor: Updated werewolf quirk variable names + - tweak: Added Bluespace Light Replacer to the Science protolathe + The-Real-Goku: + - rscadd: Added persistent photo album. + - rscadd: Added custom name for player album. ([Player name]'s album) + - rscadd: Added specific names for the photo albums located in the Heads of Departments' + lockers. (Ex. Captain, HoP...) + - bugfix: Fixed in-hand sprite for Photo Album. (They looked like briefcases before). + zeroisthebiggay: + - bugfix: ai research +2023-02-09: + BongaTheProto: + - rscadd: New tail, Snake Tail (Large) + - tweak: Now the max amount of character slots can be configured, and donators get + more slots + - bugfix: Photographer quirk will no longer fuck over your neck loadout items + Comicao1: + - rscadd: Added a few icons and code. Not modularized because it's not possible. + - rscadd: Adds the inflate verb. +2023-02-10: + 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-20: + LeDrascol: + - refactor: Refactored trait defines diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi new file mode 100644 index 000000000000..144287ced02d 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 d976daa3668c..1a0684c2fddd 100644 Binary files a/icons/emoji_32.dmi and b/icons/emoji_32.dmi differ diff --git a/icons/mob/augmentation/cosmetic_prosthetic/veymed.dmi b/icons/mob/augmentation/cosmetic_prosthetic/veymed.dmi new file mode 100644 index 000000000000..aaf11cfd9f58 Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/veymed.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 9746e61a3d32..f7062b9f4ec2 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 d0ebbb450113..b694d0ba35ec 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 0d87e7871cd6..3836f4c713aa 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 95a04717e951..73ba2fcdb0b5 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 4ed8c8db9a7c..6b42ad12c796 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 4c092368727b..197f08835653 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 5f895c4805fb..f33beecb327a 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 848ad6233c8b..4f96b36e2e0b 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 000000000000..55cce181a5b7 --- /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 a0be000b3150..24545e7b4c30 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 58dd6e9fc3b9..fdaee6f309e6 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 5c22485c1f05..280f6a248510 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 c149e1c11e41..7a2bb8d87d5d 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 f739dec7b156..8d738c425a60 100644 --- a/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm +++ b/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm @@ -64,3 +64,31 @@ // 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 diff --git a/modular_sand/code/controllers/subsystem/interactions.dm b/modular_sand/code/controllers/subsystem/interactions.dm index f4a1a08c5e0e..dee26167c31f 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 2d7f79413289..c985ff2e9cd5 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 + 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 - 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!")) + if(!src) + to_chat(usr, span_warning("Your interaction target is gone!")) 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 -*/ + 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 +/// The menu itself, only var is target which is the mob you are interacting with +/datum/component/interaction_menu_granter + var/mob/living/target -/datum/mind/New(key) +/datum/component/interaction_menu_granter/Initialize(...) + if(!ismob(parent)) + return COMPONENT_INCOMPATIBLE + var/mob/parent_mob = parent + if(!parent_mob.client) + return COMPONENT_INCOMPATIBLE . = ..() - interaction_holder = new(src) -/// The menu itself, only var is target which is the mob you are interacting with -/datum/interaction_menu - var/mob/living/target +/datum/component/interaction_menu_granter/RegisterWithParent() + . = ..() + RegisterSignal(parent, COMSIG_MOB_CTRLSHIFTCLICKON, .proc/open_menu) + +/datum/component/interaction_menu_granter/Destroy(force, ...) + target = null + . = ..() -/datum/interaction_menu/ui_state(mob/user) - return GLOB.conscious_state +/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/interaction_menu/ui_interact(mob/user, datum/tgui/ui) +/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 f264ded3b580..0161e9ac902c 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 e5be0fc43424..96207fbffaff 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 b7077ae80dea..5ba1efe8e84c 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 2171ec0b7fe8..ccd0708d93be 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/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm index 1769ebe2aa62..0ddd5be709c9 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/modules/client/loadout/accessories.dm b/modular_sand/code/modules/client/loadout/accessories.dm index a317069bf495..61562dd38b32 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 1c3986de1f5a..e2afe193ffba 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/mob/living/silicon/robot/robot.dm b/modular_sand/code/modules/mob/living/silicon/robot/robot.dm index 1ae172a5c479..184b318d1e8a 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 05b0920a20cb..7957645e5490 100644 --- a/modular_sand/code/modules/mob/mob.dm +++ b/modular_sand/code/modules/mob/mob.dm @@ -1,3 +1,22 @@ +// 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) diff --git a/modular_sand/code/modules/resize/resizing.dm b/modular_sand/code/modules/resize/resizing.dm index 9d0302561d0c..913fcbb294a4 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_splurt/code/_globalvars/lists/mobs.dm b/modular_splurt/code/_globalvars/lists/mobs.dm index 92a3c83791f1..22062af32939 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 000000000000..c94e2e3d9865 --- /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/configuration/entries/splurt_general.dm b/modular_splurt/code/controllers/configuration/entries/splurt_general.dm index 8c79ccfe15b4..cf0b98343413 100644 --- a/modular_splurt/code/controllers/configuration/entries/splurt_general.dm +++ b/modular_splurt/code/controllers/configuration/entries/splurt_general.dm @@ -4,3 +4,6 @@ config_entry_value = 5 /datum/config_entry/flag/weighted_station_traits + +/datum/config_entry/number/base_save_slots + config_entry_value = DEFAULT_SAVE_SLOTS diff --git a/modular_splurt/code/controllers/subsystem/afk.dm b/modular_splurt/code/controllers/subsystem/afk.dm new file mode 100644 index 000000000000..70e213c269a7 --- /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 a8558a583500..6fae1b981dc8 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_datums.dm b/modular_splurt/code/datums/interactions/lewd/lewd_datums.dm index ca6fddf6e87b..896cc1c05fc5 100644 --- a/modular_splurt/code/datums/interactions/lewd/lewd_datums.dm +++ b/modular_splurt/code/datums/interactions/lewd/lewd_datums.dm @@ -469,6 +469,20 @@ if(gut) gut.modify_size(-1) +/datum/interaction/lewd/inflate_belly + description = "Inflate belly" + require_user_belly = REQUIRE_EXPOSED + interaction_sound = null + max_distance = 0 + user_is_target = TRUE + write_log_user = "inflated their belly" + write_log_target = null + +/datum/interaction/lewd/inflate_belly/display_interaction(mob/living/carbon/user) + var/obj/item/organ/genital/belly/gut = user.getorganslot(ORGAN_SLOT_BELLY) + if(gut) + gut.modify_size(1) + /datum/interaction/lewd/nuzzle_belly description = "Nuzzle their belly." require_target_belly = REQUIRE_EXPOSED diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm index 1984a6a73fcb..70a84f4d82f9 100644 --- a/modular_splurt/code/datums/traits/good.dm +++ b/modular_splurt/code/datums/traits/good.dm @@ -1,3 +1,18 @@ +//Main code edits +/datum/quirk/photographer + desc = "You carry your camera and personal photo album everywhere you go, and you're quicker at taking pictures." + +/datum/quirk/photographer/on_spawn() + . = ..() + var/mob/living/carbon/human/H = quirk_holder + var/obj/item/storage/photo_album/photo_album = new(get_turf(H)) + H.put_in_hands(photo_album) + H.equip_to_slot(photo_album, ITEM_SLOT_BACKPACK) + photo_album.persistence_id = "personal_[H.mind.key]" // this is a persistent album, the ID is tied to the account's key to avoid tampering + photo_album.persistence_load() + photo_album.name = "[H.real_name]'s photo album" + +//Own stuff /datum/quirk/tough name = "Tough" desc = "Your body is abnormally enduring and can take 10% more damage." diff --git a/modular_splurt/code/datums/traits/neutral.dm b/modular_splurt/code/datums/traits/neutral.dm index 156a3fc4b31e..9c7c6b8f6774 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 @@ -510,21 +508,43 @@ /datum/quirk/werewolf //adds the werewolf quirk name = "Werewolf" - desc = "A beastly affliction allows you to shapeshift into a more wolfish appearance at will. This will increase your size (In general and below!) and cause you to behave as though you were an anthropomorphic canine. (This is still being tested. Please send any bugs to nukechicken on discord)" + desc = "A beastly affliction allows you to shape-shift into a large anthropomorphic canine at will." value = 0 + mob_trait = TRAIT_WEREWOLF + gain_text = span_notice("You feel the full moon beckon.") + lose_text = span_notice("The moon's call hushes into silence.") + medical_record_text = "Patient has been reported howling at the night sky." + var/list/old_features /datum/quirk/werewolf/add() - . = ..() - var/mob/living/carbon/human/H = quirk_holder - var/datum/action/werewolf/W = new - W.Grant(H) + // Define old features + old_features = list("species" = SPECIES_HUMAN, "legs" = "Plantigrade", "size" = 1, "bark") + + // Define quirk mob + var/mob/living/carbon/human/quirk_mob = quirk_holder + + // Record features + old_features = quirk_mob.dna.features.Copy() + old_features["species"] = quirk_mob.dna.species.type + old_features["custom_species"] = quirk_mob.custom_species + old_features["size"] = get_size(quirk_mob) + old_features["bark"] = quirk_mob.vocal_bark_id + old_features["taur"] = quirk_mob.dna.features["taur"] + old_features["eye_type"] = quirk_mob.dna.species.eye_type + +/datum/quirk/werewolf/post_add() + // Define quirk action + var/datum/action/cooldown/werewolf/transform/quirk_action = new + + // Grant quirk action + quirk_action.Grant(quirk_holder) /datum/quirk/werewolf/remove() - var/mob/living/carbon/human/H = quirk_holder - var/datum/action/werewolf/W = locate() in H.actions - W.Remove(H) - . = ..() + // Define quirk action + var/datum/action/cooldown/werewolf/transform/quirk_action = locate() in quirk_holder.actions + // Revoke quirk action + quirk_action.Remove(quirk_holder) /datum/quirk/gargoyle //Mmmm yes stone time name = "Gargoyle" @@ -613,15 +633,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() . = ..() @@ -640,15 +659,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 51b93106fd8c..da19988868ec 100644 --- a/modular_splurt/code/datums/traits/trait_actions.dm +++ b/modular_splurt/code/datums/traits/trait_actions.dm @@ -673,89 +673,221 @@ // Quirk: Werewolf // -/datum/action/werewolf - name = "Transform" - desc = "Transform into your wolf form." +/datum/action/cooldown/werewolf + name = "Werewolf Ability" + desc = "Do something related to werewolves." icon_icon = 'modular_splurt/icons/mob/actions/misc_actions.dmi' button_icon_state = "Transform" + check_flags = AB_CHECK_RESTRAINED | AB_CHECK_STUN | AB_CHECK_CONSCIOUS | AB_CHECK_ALIVE + cooldown_time = 5 SECONDS + transparent_when_unavailable = TRUE + +/datum/action/cooldown/werewolf/transform + name = "Toggle Werewolf Form" + desc = "Transform in or out of your wolf form." var/transformed = FALSE - var/list/old_features = list("species" = SPECIES_HUMAN, "legs" = "Plantigrade", "size" = 1, "bark") + var/species_changed = FALSE + var/werewolf_gender = "Lycan" + var/list/old_features -/datum/action/werewolf/Trigger() +/datum/action/cooldown/werewolf/transform/Grant() . = ..() - var/mob/living/carbon/human/H = owner - var/obj/item/organ/genital/penis/P = H.getorganslot(ORGAN_SLOT_PENIS) - var/obj/item/organ/genital/breasts/B = H.getorganslot(ORGAN_SLOT_BREASTS) - var/obj/item/organ/genital/vagina/V = H.getorganslot(ORGAN_SLOT_VAGINA) - H.shake_animation(2) - if(!transformed) // transform them - H.visible_message(span_danger("[H] shivers, their flesh bursting with a sudden growth of thick fur and their features contorting to that of a beast's, fully transforming them into a werewolf!")) - H.set_species(/datum/species/mammal, 1) - H.dna.species.mutant_bodyparts["mam_tail"] = "Wolf" - H.dna.species.mutant_bodyparts["legs"] = "Digitigrade" - H.Digitigrade_Leg_Swap(FALSE) - H.dna.species.mutant_bodyparts["mam_snouts"] = "Mammal, Thick" - H.dna.features["mam_ears"] = "Wolf" - H.dna.features["mam_tail"] = "Wolf" - H.dna.features["mam_snouts"] = "Mammal, Thick" - H.dna.features["legs"] = "Digitigrade" - H.update_size(get_size(H) + 0.5) - H.set_bark("bark") - H.custom_species = "Werewolf" - if(!(H.dna.species.species_traits.Find(DIGITIGRADE))) - H.dna.species.species_traits += DIGITIGRADE - H.update_body() - H.update_body_parts() - if(B) - B.color = "#[H.dna.features["mcolor"]]" - B.update() - if(P) - P.shape = "Knotted" - P.color = "#ff7c80" - P.update() - P.modify_size(6) - if(V) - V.shape = "Furred" - V.color = "#[H.dna.features["mcolor"]]" - V.update() - else // untransform them - H.visible_message(span_danger("[H] shrinks, their wolfish features quickly receding.")) - H.set_species(old_features["species"], TRUE) - H.set_bark(old_features["bark"]) - H.dna.features["mam_ears"] = old_features["mam_ears"] - H.dna.features["mam_snouts"] = old_features["mam_snouts"] - H.dna.features["mam_tail"] = old_features["mam_tail"] - H.dna.features["legs"] = old_features["legs"] //i hate legs i hate legs i hate legs i hate legs i hate legs i hate legs i hate legs + + // Define carbon owner + var/mob/living/carbon/action_owner_carbon = owner + + // Define parent quirk + var/datum/quirk/werewolf/quirk_data = locate() in action_owner_carbon.roundstart_quirks + + // Check if data was copied + if(!quirk_data) + // Log error and return + log_game("Failed to get species data for werewolf action!") + return + + // Define stored features + old_features = quirk_data.old_features.Copy() + + // Define action owner + var/mob/living/carbon/human/action_owner = owner + + // Set species gendered name + switch(action_owner.gender) + if(MALE) + werewolf_gender = "Wer" + if(FEMALE) + werewolf_gender = "Wīf" + if(PLURAL) + werewolf_gender = "Hie" + if(NEUTER) + werewolf_gender = "Þing" + +/datum/action/cooldown/werewolf/transform/Trigger() + . = ..() + + // Check if unavailable + // Checks the parent function's return value + if(!.) + // Messages will not display here + return FALSE + + // Define action owner + var/mob/living/carbon/human/action_owner = owner + + // Check for restraints + if(!CHECK_MOBILITY(action_owner, MOBILITY_USE)) + // Warn user, then return + action_owner.visible_message(span_warning("You cannot transform while restrained!")) + return + + // Define citadel organs + var/obj/item/organ/genital/penis/organ_penis = action_owner.getorganslot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/breasts/organ_breasts = action_owner.getorganslot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/vagina/organ_vagina = action_owner.getorganslot(ORGAN_SLOT_VAGINA) + + // Play shake animation + action_owner.shake_animation(2) + + // Transform into wolf form + if(!transformed) + // Define current species type + var/datum/species/owner_species = action_owner.dna.species.type + + // Check if species has changed + if(old_features["species"] != owner_species) + // Set old species + old_features["species"] = owner_species + + // Define species prefix + var/custom_species_prefix + + // Check if species is mammal (anthro) + if(ismammal(action_owner)) + // Do nothing! + + // Check if species is already a mammal sub-type + else if(owner_species in subtypesof(/datum/species/mammal)) + // Do nothing! + + // Check if species is a jelly + else if(isjellyperson(action_owner)) + // Set species prefix + custom_species_prefix = "Jelly " + + // Check if species is a jelly subtype + else if(owner_species in subtypesof(/datum/species/jelly)) + // Set species prefix + custom_species_prefix = "Slime " + + // Species is not a mammal + else + // Change species + action_owner.set_species(/datum/species/mammal, 1) + + // Set species changed + species_changed = TRUE + + // Set species features + action_owner.dna.custom_species = "[custom_species_prefix][werewolf_gender]wulf" + action_owner.dna.species.mutant_bodyparts["mam_tail"] = "Otusian" + action_owner.dna.species.mutant_bodyparts["legs"] = "Digitigrade" + action_owner.Digitigrade_Leg_Swap(FALSE) + action_owner.dna.species.mutant_bodyparts["mam_snouts"] = "Sergal" + action_owner.dna.features["mam_ears"] = "Jackal" + action_owner.dna.features["mam_tail"] = "Otusian" + action_owner.dna.features["mam_snouts"] = "Sergal" + action_owner.dna.features["legs"] = "Digitigrade" + action_owner.dna.features["insect_fluff"] = "Hyena" + action_owner.update_size(get_size(action_owner) + 0.5) + action_owner.set_bark("bark") + if(old_features["taur"] != "None") + action_owner.dna.features["taur"] = "Canine" + if(!(action_owner.dna.species.species_traits.Find(DIGITIGRADE))) + action_owner.dna.species.species_traits += DIGITIGRADE + action_owner.update_body() + action_owner.update_body_parts() + + // Update possible citadel organs + if(organ_breasts) + organ_breasts.color = "#[action_owner.dna.features["mcolor"]]" + organ_breasts.update() + if(organ_penis) + organ_penis.shape = "Knotted" + organ_penis.color = "#ff7c80" + organ_penis.update() + organ_penis.modify_size(6) + if(organ_vagina) + organ_vagina.shape = "Furred" + organ_vagina.color = "#[action_owner.dna.features["mcolor"]]" + organ_vagina.update() + + // Un-transform from wolf form + else + // Check if species was already mammal (anthro) + if(!species_changed) + // Do nothing! + + // Species was not a mammal + else + // Revert species + action_owner.set_species(old_features["species"], TRUE) + + // Clear species changed flag + species_changed = FALSE + + // Revert species trait + action_owner.set_bark(old_features["bark"]) + action_owner.dna.custom_species = old_features["custom_species"] + action_owner.dna.features["mam_ears"] = old_features["mam_ears"] + action_owner.dna.features["mam_snouts"] = old_features["mam_snouts"] + action_owner.dna.features["mam_tail"] = old_features["mam_tail"] + action_owner.dna.features["legs"] = old_features["legs"] + action_owner.dna.features["insect_fluff"] = old_features["insect_fluff"] + action_owner.dna.species.eye_type = old_features["eye_type"] + if(old_features["taur"] != "None") + action_owner.dna.features["taur"] = old_features["taur"] if(old_features["legs"] == "Plantigrade") - H.dna.species.species_traits -= DIGITIGRADE - H.Digitigrade_Leg_Swap(TRUE) - H.dna.species.mutant_bodyparts["legs"] = old_features["legs"] - H.update_body() - H.update_body_parts() - H.update_size(get_size(H) - 0.5) - if(B) - B.color = "#[old_features["breasts_color"]]" - B.update() - if(H.has_penis()) - P.shape = old_features["cock_shape"] - P.color = "#[old_features["cock_color"]]" - P.update() - P.modify_size(-6) - if(H.has_vagina()) - V.shape = old_features["vag_shape"] - V.color = "#[old_features["vag_color"]]" - V.update() - V.update_size() + action_owner.dna.species.species_traits -= DIGITIGRADE + action_owner.Digitigrade_Leg_Swap(TRUE) + action_owner.dna.species.mutant_bodyparts["legs"] = old_features["legs"] + action_owner.update_body() + action_owner.update_body_parts() + action_owner.update_size(get_size(action_owner) - 0.5) + + // Revert citadel organs + if(organ_breasts) + organ_breasts.color = "#[old_features["breasts_color"]]" + organ_breasts.update() + if(action_owner.has_penis()) + organ_penis.shape = old_features["cock_shape"] + organ_penis.color = "#[old_features["cock_color"]]" + organ_penis.update() + organ_penis.modify_size(-6) + if(action_owner.has_vagina()) + organ_vagina.shape = old_features["vag_shape"] + organ_vagina.color = "#[old_features["vag_color"]]" + organ_vagina.update() + organ_vagina.update_size() + + // Set transformation message + var/owner_p_their = action_owner.p_their() + var/toggle_message = (!transformed ? "[action_owner] shivers, [owner_p_their] flesh bursting with a sudden growth of thick fur as [owner_p_their] features contort to that of a beast, fully transforming [action_owner.p_them()] into a werewolf!" : "[action_owner] shrinks, [owner_p_their] wolfish features quickly receding.") + + // Alert in local chat + action_owner.visible_message(span_danger(toggle_message)) + + // Toggle transformation state transformed = !transformed -/datum/action/werewolf/Grant()// on grant sets some variables - . = ..() - var/mob/living/carbon/human/H = owner - old_features = H.dna.features.Copy() - old_features["species"] = H.dna.species.type - old_features["size"] = get_size(H) - old_features["bark"] = H.vocal_bark_id + // Start cooldown + StartCooldown() + + // Return success + return TRUE +// +// Quirk: Gargoyle +// /datum/action/gargoyle/transform name = "Transform" @@ -795,10 +927,6 @@ to_chat(H, span_warning("You have transformed too recently; you cannot yet transform again!")) return 0 -// -// Quirk: Gargoyle -// - /datum/action/gargoyle/check name = "Check" desc = "Check your current energy levels." diff --git a/modular_splurt/code/game/objects/effects/landmarks.dm b/modular_splurt/code/game/objects/effects/landmarks.dm index 1d26983266e5..6825efe6ca70 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/game/objects/items/toys.dm b/modular_splurt/code/game/objects/items/toys.dm index 1d441a4a94ae..b131fd5c7445 100644 --- a/modular_splurt/code/game/objects/items/toys.dm +++ b/modular_splurt/code/game/objects/items/toys.dm @@ -39,3 +39,70 @@ // Set flavor text name = "generic action figure" desc = "It\'s just a normal toy." + +/obj/item/toy/beach_ball + var/obj/item/vibrator + var/enabled = FALSE + +/obj/item/toy/beach_ball/syndicate + icon_state = "ballsyndicate" + icon = 'modular_splurt/icons/misc/beach.dmi' + desc = "Hmm. This ball is a bit heavier and tougher than the others." + +/obj/item/toy/beach_ball/attackby(obj/item/I, mob/living/user) + if(istype(I, /obj/item/electropack/vibrator)) + if(vibrator) + to_chat(user, span_warning("There is already a vibrator inside this!")) + else + if(!user.transferItemToLoc(I,src)) + return + to_chat(user, span_notice("You put [I] inside [src].")) + vibrator = I + +/obj/item/toy/beach_ball/attack_self(mob/user) + var/list/options_list = list() + if(vibrator) + options_list += list("Eject" = image(icon = 'icons/radials/taperecorder.dmi', icon_state = "eject", dir = EAST)) + options_list += list("Play" = image(icon = 'icons/radials/taperecorder.dmi', icon_state = "play", dir = WEST)) + if(options_list) + var/selection = show_radial_menu(user, src, options_list, radius = 38, require_near = TRUE, tooltips = TRUE) + if(!selection) + return + switch(selection) + if("Play") + playsound(user, 'sound/effects/clock_tick.ogg', 50, 1, -1) + enabled = !enabled + if(enabled) + START_PROCESSING(SSobj, src) + else + STOP_PROCESSING(SSobj, src) + to_chat(user, "You toggle the [vibrator].") + if("Eject") + playsound(user, 'sound/weapons/empty.ogg', 100, 1) + to_chat(user, "You remove [vibrator] from [src].") + user.put_in_hands(vibrator) + enabled = FALSE + vibrator = null + update_icon() + +/obj/item/toy/beach_ball/process() + if(vibrator && enabled) + throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),3,1) + playsound(src, 'modular_splurt/sound/lewd/vibrate.ogg', 40, 1, -1) + +/obj/item/toy/beach_ball/syndicate/process() + . = ..() + if(vibrator && enabled) + throwforce = 60 + +/obj/item/toy/beach_ball/syndicate/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) + if(ishuman(thrower)) + throwforce = 0 + . = ..() + +/obj/item/toy/beach_ball/syndicate/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + . = ..() + if(istype(hit_atom, /turf/closed/wall) && throwforce > 0) + var/turf/closed/wall/W = hit_atom + W.dismantle_wall() + diff --git a/modular_splurt/code/modules/antagonists/slaver/slaver.dm b/modular_splurt/code/modules/antagonists/slaver/slaver.dm index 610e12b74d74..7638cc11f359 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/client/loadout/accessory.dm b/modular_splurt/code/modules/client/loadout/accessory.dm new file mode 100644 index 000000000000..e2d2e6d8be27 --- /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 d10f8234446d..b75b1cd62115 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 29d91596d727..1333a8c76496 100644 --- a/modular_splurt/code/modules/client/loadout/uniform.dm +++ b/modular_splurt/code/modules/client/loadout/uniform.dm @@ -146,3 +146,15 @@ 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") diff --git a/modular_splurt/code/modules/client/preferences.dm b/modular_splurt/code/modules/client/preferences.dm index 683afd00cfd0..13b9bc882bb7 100644 --- a/modular_splurt/code/modules/client/preferences.dm +++ b/modular_splurt/code/modules/client/preferences.dm @@ -1,12 +1,18 @@ /datum/preferences + max_save_slots = DEFAULT_SAVE_SLOTS var/unholypref = "No" //Goin 2 hell fo dis one - var/list/gfluid_blacklist = list() //Stuff you don't want people to cum into you /datum/preferences/New(client/C) if(!GLOB.genital_fluids_list) build_genital_fluids_list() //I DON'T KNOW where else to put it, ok?? + //Extra saves for donators + max_save_slots = CONFIG_GET(number/base_save_slots) + if(istype(C)) + var/extra_slots = (IS_CKEY_DONATOR_GROUP(C.key, DONATOR_GROUP_TIER_1) + IS_CKEY_DONATOR_GROUP(C.key, DONATOR_GROUP_TIER_2) + IS_CKEY_DONATOR_GROUP(C.key, DONATOR_GROUP_TIER_3)) * 10 + max_save_slots += extra_slots + . = ..() /proc/build_genital_fluids_list() diff --git a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm index f5a8fac73506..d87fd74ce723 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 000000000000..eafad46702e4 --- /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 3f6b80626019..990dedb2a8bf 100644 --- a/modular_splurt/code/modules/clothing/under/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/under/miscellaneous.dm @@ -311,3 +311,25 @@ /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) 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 c388d8fe3c9f..813e34f04180 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 000000000000..76056726d0b1 --- /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/mob/dead/new_player/sprite_accesories/tails.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm index 4bc73fc7247b..7f9eff453e46 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 @@ -249,6 +249,24 @@ icon = 'modular_splurt/icons/mob/mam_tails.dmi' matrixed_sections = MATRIX_RED_GREEN +/datum/sprite_accessory/tails/mam_tails/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/mam_tails_animated/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 + //Lizard tails /datum/sprite_accessory/tails/lizard/tailmaw name = "Tailmaw" @@ -306,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" @@ -400,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/living/carbon/human/emote.dm b/modular_splurt/code/modules/mob/living/carbon/human/emote.dm new file mode 100644 index 000000000000..8877e15eaba0 --- /dev/null +++ b/modular_splurt/code/modules/mob/living/carbon/human/emote.dm @@ -0,0 +1,12 @@ +/datum/emote/sound/human/huh + key = "huh" + key_third_person = "huh's" + message = "seems confused." + sound = 'modular_splurt/sound/voice/huh.ogg' + +/datum/emote/sound/human/whine + key = "whine" + key_third_person = "whines" + message = "whines." + sound = 'modular_splurt/sound/voice/whine.ogg' + 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 000000000000..24246535343f --- /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 000000000000..e640cfbf1842 --- /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 fa00e0ff449b..65ece9be12b3 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 7dc25f9c5dc4..b9d3412e5079 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/photography/photos/album.dm b/modular_splurt/code/modules/photography/photos/album.dm new file mode 100644 index 000000000000..f7795a670e23 --- /dev/null +++ b/modular_splurt/code/modules/photography/photos/album.dm @@ -0,0 +1,27 @@ +/obj/item/storage/photo_album + desc = "A big book used to store photos and mementos." + item_state = "album" + lefthand_file = 'modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi' + righthand_file = 'modular_splurt/icons/mob/inhands/misc/books_righthand.dmi' + w_class = WEIGHT_CLASS_SMALL + +/obj/item/storage/photo_album/HoS + name = "photo album (Head of Security)" + +/obj/item/storage/photo_album/RD + name = "photo album (Research Director)" + +/obj/item/storage/photo_album/HoP + name = "photo album (Head of Personnel)" + +/obj/item/storage/photo_album/Captain + name = "photo album (Captain)" + +/obj/item/storage/photo_album/CMO + name = "photo album (Chief Medical Officer)" + +/obj/item/storage/photo_album/QM + name = "photo album (Quartermaster)" + +/obj/item/storage/photo_album/CE + name = "photo album (Chief Engineer)" diff --git a/modular_splurt/code/modules/photography/photos/photo.dm b/modular_splurt/code/modules/photography/photos/photo.dm new file mode 100644 index 000000000000..3eb0f707529f --- /dev/null +++ b/modular_splurt/code/modules/photography/photos/photo.dm @@ -0,0 +1,3 @@ +/obj/item/photo/old + icon = 'modular_splurt/icons/obj/items_and_weapons.dmi' + icon_state = "photo_old" 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 0b7fc6f66205..cbbb817aa42c 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 07917089d2c8..972cd42ba998 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/designs/misc_designs.dm b/modular_splurt/code/modules/research/designs/misc_designs.dm new file mode 100644 index 000000000000..e6105fd3f355 --- /dev/null +++ b/modular_splurt/code/modules/research/designs/misc_designs.dm @@ -0,0 +1,2 @@ +/datum/design/light_replacer_blue/New() + departmental_flags |= DEPARTMENTAL_FLAG_SCIENCE 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 000000000000..a662a03f7fc9 --- /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/research/techweb/nodes/robotic_nodes.dm b/modular_splurt/code/modules/research/techweb/nodes/robotic_nodes.dm index f90fac955d5d..92564858131b 100644 --- a/modular_splurt/code/modules/research/techweb/nodes/robotic_nodes.dm +++ b/modular_splurt/code/modules/research/techweb/nodes/robotic_nodes.dm @@ -1,7 +1,7 @@ /datum/techweb_node/neural_programming design_ids = list("impant_radio") -/datum/techweb_node/ai/Initialize() +/datum/techweb_node/ai/New() var/extra_designs = list( "slut_module", "shebang_module", diff --git a/modular_splurt/code/modules/uplink/uplink_items/uplink_devices.dm b/modular_splurt/code/modules/uplink/uplink_items/uplink_devices.dm new file mode 100644 index 000000000000..fe3de42d03d0 --- /dev/null +++ b/modular_splurt/code/modules/uplink/uplink_items/uplink_devices.dm @@ -0,0 +1,6 @@ +/datum/uplink_item/device_tools/syndicate_ball + name = "Syndicate Beach Ball" + item = /obj/item/toy/beach_ball/syndicate + desc = "A beach ball, it reacts when a vibrator is inserted inside of it. Watch out!" + cost = 3 + diff --git a/modular_splurt/code/modules/vending/clothesmate.dm b/modular_splurt/code/modules/vending/clothesmate.dm index d7d67e401156..d6dee6e947c0 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 1d2f3c5a94f3..53b6abb542bb 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/misc/beach.dmi b/modular_splurt/icons/misc/beach.dmi new file mode 100644 index 000000000000..0bc186df19c5 Binary files /dev/null and b/modular_splurt/icons/misc/beach.dmi differ diff --git a/modular_splurt/icons/mob/64_mam_tails.dmi b/modular_splurt/icons/mob/64_mam_tails.dmi index 115d05143612..71249b8896b2 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 000000000000..024e1d544325 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 000000000000..6d189aeba5e9 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 0956dfbdd1dd..005bdc7b7d92 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 a37e1178f13b..755d9c92e9e7 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 1555bade4dda..dccf18cc4379 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/inhands/misc/books_lefthand.dmi b/modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi new file mode 100644 index 000000000000..cd59fe6d0316 Binary files /dev/null and b/modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi differ diff --git a/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi b/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi new file mode 100644 index 000000000000..a2fc3cc73b1d Binary files /dev/null and b/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi differ diff --git a/modular_splurt/icons/mob/landmarks.dmi b/modular_splurt/icons/mob/landmarks.dmi index 7ee3942be1bb..5c596e0c95a3 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/obj/clothing/accessories.dmi b/modular_splurt/icons/obj/clothing/accessories.dmi new file mode 100644 index 000000000000..c15501ea74a3 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 71b62b42bcc0..311174d23da4 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 3880f77532f3..f6648a1fac84 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 4ea6784f4e1b..55d640912e94 100644 Binary files a/modular_splurt/icons/obj/drinks.dmi and b/modular_splurt/icons/obj/drinks.dmi differ diff --git a/modular_splurt/icons/obj/items_and_weapons.dmi b/modular_splurt/icons/obj/items_and_weapons.dmi index 0dd0e88c6a9e..a5b3d02d5b96 100644 Binary files a/modular_splurt/icons/obj/items_and_weapons.dmi and b/modular_splurt/icons/obj/items_and_weapons.dmi differ diff --git a/modular_splurt/sound/voice/huh.ogg b/modular_splurt/sound/voice/huh.ogg new file mode 100644 index 000000000000..accf4cab3c7d Binary files /dev/null and b/modular_splurt/sound/voice/huh.ogg differ diff --git a/modular_splurt/sound/voice/waa.ogg b/modular_splurt/sound/voice/waa.ogg new file mode 100644 index 000000000000..9e5ba7866f24 Binary files /dev/null and b/modular_splurt/sound/voice/waa.ogg differ diff --git a/modular_splurt/sound/voice/whine.ogg b/modular_splurt/sound/voice/whine.ogg new file mode 100644 index 000000000000..2d2f825a83ac Binary files /dev/null and b/modular_splurt/sound/voice/whine.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 2ea84c02e08c..e54661c7c128 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,7 @@ #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\language.dm" #include "code\__SANDCODE\DEFINES\lewd.dm" #include "code\__SANDCODE\DEFINES\loadout.dm" @@ -247,6 +252,7 @@ #include "code\__SANDCODE\DEFINES\subsystems.dm" #include "code\__SANDCODE\DEFINES\traits.dm" #include "code\__SANDCODE\DEFINES\wires.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" @@ -262,6 +268,7 @@ #include "code\__SPLURTCODE\DEFINES\lewd.dm" #include "code\__SPLURTCODE\DEFINES\login.dm" #include "code\__SPLURTCODE\DEFINES\mobs.dm" +#include "code\__SPLURTCODE\DEFINES\preferences.dm" #include "code\__SPLURTCODE\DEFINES\pregnancy.dm" #include "code\__SPLURTCODE\DEFINES\quirks.dm" #include "code\__SPLURTCODE\DEFINES\radiation.dm" @@ -274,8 +281,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" @@ -761,6 +766,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" @@ -816,6 +825,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" @@ -1991,6 +2002,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" @@ -2686,6 +2698,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" @@ -2741,6 +2754,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" @@ -3716,6 +3730,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" @@ -3860,6 +3875,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" @@ -3943,6 +3959,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" @@ -3953,7 +3970,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" @@ -4285,6 +4301,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" @@ -4293,6 +4310,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" @@ -4533,6 +4551,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" @@ -4592,6 +4611,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" @@ -4643,6 +4663,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" @@ -4678,10 +4699,13 @@ #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\human\emote.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\human.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\human_defines.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\inventory.dm" @@ -4714,6 +4738,8 @@ #include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\king_of_goats.dm" #include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\sand.dm" #include "modular_splurt\code\modules\paperwork\pen.dm" +#include "modular_splurt\code\modules\photography\photos\album.dm" +#include "modular_splurt\code\modules\photography\photos\photo.dm" #include "modular_splurt\code\modules\power\cell.dm" #include "modular_splurt\code\modules\power\reactor\fluffed.dm" #include "modular_splurt\code\modules\projectiles\ammunition\ballistic\pistol.dm" @@ -4760,6 +4786,7 @@ #include "modular_splurt\code\modules\research\designs\mecha_designs.dm" #include "modular_splurt\code\modules\research\designs\mechfabricator_designs.dm" #include "modular_splurt\code\modules\research\designs\medical_designs.dm" +#include "modular_splurt\code\modules\research\designs\misc_designs.dm" #include "modular_splurt\code\modules\research\designs\power_designs.dm" #include "modular_splurt\code\modules\research\designs\stock_parts_designs.dm" #include "modular_splurt\code\modules\research\designs\tool_designs.dm" @@ -4769,6 +4796,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 000000000000..2bdb752d8609 --- /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