Nanotrasen Cargo Bounties
" + update_icon() + + for(var/datum/bounty/B in GLOB.bounties_list) + if(B.claimed) + continue + info += {"[B.name]
+- Reward: [B.reward_string()] +
- Completed: [B.completion_string()]
Occupation Choices
" - dat += "Set Occupation PreferencesQuirk Setup
" - dat += "Configure QuirksIdentity
" - dat += "| "
- if(jobban_isbanned(user, "appearance"))
- dat += "You are banned from using custom names and appearances. You can continue to adjust your characters, but you will be randomised once you join the game. " - dat += "Random Name " - dat += "Always Random Name:[be_random_name ? "Yes" : "No"] " + dat += " " - dat += "[nameless ? "Default designation" : "Name"]:" - dat += "[real_name] " - dat += "Be nameless: [nameless ? "Yes" : "No"] " + dat += " " - dat += "Age: [age] " + dat += " " + dat += "
"
+ dat += " Advanced colors: [(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) ? "Enabled" : "Disabled"]"
+ dat += " | "
- //Character Appearance
- if(APPEARANCE_TAB)
- if(path)
- var/savefile/S = new /savefile(path)
- if(S)
- dat += " |
" + switch(character_settings_tab) + //General + if(GENERAL_CHAR_TAB) + dat += "
Occupation Choices
" + dat += "Set Occupation PreferencesQuirk Setup
" + dat += "Configure QuirksIdentity
" + dat += "| "
+ if(jobban_isbanned(user, "appearance"))
+ dat += "You are banned from using custom names and appearances. You can continue to adjust your characters, but you will be randomised once you join the game. " + dat += "Random Name " + dat += "Always Random Name:[be_random_name ? "Yes" : "No"] " + + dat += "[nameless ? "Default designation" : "Name"]:" + dat += "[real_name] " + dat += "Be nameless: [nameless ? "Yes" : "No"] " + + dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))] " + dat += "Age: [age] " + + dat += "Special Names: " + var/old_group + for(var/custom_name_id in GLOB.preferences_custom_names) + var/namedata = GLOB.preferences_custom_names[custom_name_id] + if(!old_group) + old_group = namedata["group"] + else if(old_group != namedata["group"]) + old_group = namedata["group"] dat += " " - unspaced_slots = 0 - S.cd = "/character[i]" - S["real_name"] >> name - if(!name) - name = "Character[i]" - dat += "[name] " - dat += "" + dat += "[namedata["pref_name"]]: [custom_names[custom_name_id]] " + dat += " " - dat += "
Records" - dat += "Security Records " - if(length_char(security_records) <= 40) - if(!length(security_records)) - dat += "\[...\]" - else - dat += "[security_records]" - else - dat += "[TextPreview(security_records)]... " - - dat += " Medical Records " - if(length_char(medical_records) <= 40) - if(!length(medical_records)) - dat += "\[...\] " - else - dat += "[medical_records]" - else - dat += "[TextPreview(medical_records)]... " - - dat += APPEARANCE_CATEGORY_COLUMN //body moves right sandstorm change - - dat += " Body" - dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]" - if(gender != NEUTER && pref_species.sexes) - dat += "Body Model:[features["body_model"] == MALE ? "Masculine" : "Feminine"] " - dat += "Limb Modification: " - dat += "Modify Limbs " - for(var/modification in modified_limbs) - if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC) - dat += "[modification]: [modified_limbs[modification][2]] " - else - dat += "[modification]: [modified_limbs[modification][1]] " - dat += " " - dat += "Species:[pref_species.name] " - dat += "Custom Species Name:[custom_species ? custom_species : "None"] " - dat += "Random Body:Randomize! " - dat += "Always Random Body:[be_random_body ? "Yes" : "No"] " - dat += " Cycle background:[bgstate] " - - dat += " | " //body moves right sandstorm change
-
- var/use_skintones = pref_species.use_skintones
- if(use_skintones)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "
"
+ dat += "Flavor Text" + dat += "Set Examine Text" + if(length(features["flavor_text"]) <= MAX_FLAVOR_PREVIEW_LEN) + if(!length(features["flavor_text"])) + dat += "\[...\] " //skyrat - adds //come to brazil or brazil comes to you + else + dat += "[html_encode(features["flavor_text"])] " //skyrat - adds and uses html_encode else - dat += " Left Eye Color" - dat += "#[left_eye_color] Change" - dat += "Right Eye Color" - dat += "#[right_eye_color] Change" - - if(HAIR in pref_species.species_traits) - - dat += APPEARANCE_CATEGORY_COLUMN - - dat += " Hair Style" - - dat += "[hair_style]" - dat += "< >" - dat += "#[hair_color] Change " - - dat += " Facial Hair Style" - - dat += "[facial_hair_style]" - dat += "< >" - dat += "#[facial_hair_color] Change " - - dat += " Hair Gradient" - - dat += "[grad_style]" - dat += "< >" - dat += "#[grad_color] Change " - - dat += " | "
- //Mutant stuff
- var/mutant_category = 0
-
- dat += APPEARANCE_CATEGORY_COLUMN
- dat += "
| [marking_list[2]] - [actual_name] | ˄ ˅ X [color_marking_dat] |
[GLOB.all_mutant_parts[mutant_part]]
" - dat += "[features[mutant_part]]" - var/color_type = GLOB.colored_mutant_parts[mutant_part] //if it can be coloured, show the appropriate button - if(color_type) - dat += "#[features[color_type]] Change" + dat += "[TextPreview(html_encode(features["flavor_text"]))]...
" //skyrat edit, uses html_encode + //SPLURT edit - naked flavor text + dat += "
Naked Flavor Text
" + dat += "Set Naked Examine Text" + if(length(features["naked_flavor_text"]) <= 40) + if(!length(features["naked_flavor_text"])) + dat += "\[...\]
" + else + dat += "[html_encode(features["naked_flavor_text"])]
" else - if(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) //advanced individual part colouring system - //is it matrixed or does it have extra parts to be coloured? - var/find_part = features[mutant_part] || pref_species.mutant_bodyparts[mutant_part] - var/find_part_list = GLOB.mutant_reference_list[mutant_part] - if(find_part && find_part != "None" && find_part_list) - var/datum/sprite_accessory/accessory = find_part_list[find_part] - if(accessory) - if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future - var/mutant_string = accessory.mutant_part_string - var/primary_feature = "[mutant_string]_primary" - var/secondary_feature = "[mutant_string]_secondary" - var/tertiary_feature = "[mutant_string]_tertiary" - if(!features[primary_feature]) - features[primary_feature] = features["mcolor"] - if(!features[secondary_feature]) - features[secondary_feature] = features["mcolor2"] - if(!features[tertiary_feature]) - features[tertiary_feature] = features["mcolor3"] + dat += "[TextPreview(html_encode(features["naked_flavor_text"]))]...
" + //SPLURT edit end + dat += "
Silicon Flavor Text
" + dat += "Set Silicon Examine Text" + if(length(features["silicon_flavor_text"]) <= MAX_FLAVOR_PREVIEW_LEN) + if(!length(features["silicon_flavor_text"])) + dat += "\[...\]
" + else + dat += "[features["silicon_flavor_text"]]
" + else + dat += "[TextPreview(features["silicon_flavor_text"])]...
" + dat += "
OOC notes
" + dat += "Set OOC notes" + var/ooc_notes_len = length(features["ooc_notes"]) + if(ooc_notes_len <= MAX_FLAVOR_PREVIEW_LEN) + if(!ooc_notes_len) + dat += "\[...\]
" + else + dat += "[features["ooc_notes"]]
" + else + dat += "[TextPreview(features["ooc_notes"])]...
" + //SPLURT EDIT + dat += "
Headshot Image
" + dat += "Set Headshot Image" + if(features["headshot_link"]) + dat += "
" + //SPLURT EDIT END + //SKYRAT EDIT + dat += "
Consent preferences
" + dat += "ERP : [erppref]" + dat += "Non-Con : [nonconpref]
" + dat += "Vore : [vorepref]
" + //END OF SKYRAT EDIT - var/matrixed_sections = accessory.matrixed_sections - if(accessory.color_src == MATRIXED && !matrixed_sections) - message_admins("Sprite Accessory Failure (customization): Accessory [accessory.type] is a matrixed item without any matrixed sections set!") - continue - else if(accessory.color_src == MATRIXED) - switch(matrixed_sections) - if(MATRIX_GREEN) //only composed of a green section - primary_feature = secondary_feature //swap primary for secondary, so it properly assigns the second colour, reserved for the green section - if(MATRIX_BLUE) - primary_feature = tertiary_feature //same as above, but the tertiary feature is for the blue section - if(MATRIX_RED_BLUE) //composed of a red and blue section - secondary_feature = tertiary_feature //swap secondary for tertiary, as blue should always be tertiary - if(MATRIX_GREEN_BLUE) //composed of a green and blue section - primary_feature = secondary_feature //swap primary for secondary, as first option is green, which is linked to the secondary - secondary_feature = tertiary_feature //swap secondary for tertiary, as second option is blue, which is linked to the tertiary - dat += "Primary Color
" - dat += "#[features[primary_feature]] Change
" - if((accessory.color_src == MATRIXED && (matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)) || (accessory.extra && (accessory.extra_color_src == MUTCOLORS || accessory.extra_color_src == MUTCOLORS2 || accessory.extra_color_src == MUTCOLORS3))) - dat += "Secondary Color
" - dat += "#[features[secondary_feature]] Change
" - if((accessory.color_src == MATRIXED && matrixed_sections == MATRIX_ALL) || (accessory.extra2 && (accessory.extra2_color_src == MUTCOLORS || accessory.extra2_color_src == MUTCOLORS2 || accessory.extra2_color_src == MUTCOLORS3))) - dat += "Tertiary Color
" - dat += "#[features[tertiary_feature]] Change
" + dat += APPEARANCE_CATEGORY_COLUMN //body moves right sandstorm change - mutant_category++ - if(mutant_category >= MAX_MUTANT_ROWS) + dat += "
Body
" + dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]" + if(gender != NEUTER && pref_species.sexes) + dat += "Body Model:[features["body_model"] == MALE ? "Masculine" : "Feminine"]
" + dat += "Limb Modification:
" + dat += "Modify Limbs
" + for(var/modification in modified_limbs) + if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC) + dat += "[modification]: [modified_limbs[modification][2]]
" + else + dat += "[modification]: [modified_limbs[modification][1]]
" + dat += "
" + dat += "Species:[pref_species.name]
" + dat += "Custom Species Name:[custom_species ? custom_species : "None"]
" + dat += "Random Body:Randomize!
" + dat += "Always Random Body:[be_random_body ? "Yes" : "No"]
" + dat += "
Cycle background:[bgstate]
" + + dat += "" //body moves right sandstorm change + + var/use_skintones = pref_species.use_skintones + if(use_skintones) + dat += APPEARANCE_CATEGORY_COLUMN + + dat += "
Skin Tone
" + + dat += "[use_custom_skin_tone ? "custom: [skin_tone]" : skin_tone]" + + var/mutant_colors + if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits)) + if(!use_skintones) + dat += APPEARANCE_CATEGORY_COLUMN + + dat += "
Body Colors
" + + dat += "Primary Color:" + dat += "#[features["mcolor"]] Change
" + + dat += "Secondary Color:
" + dat += "#[features["mcolor2"]] Change
" + + dat += "Tertiary Color:
" + dat += "#[features["mcolor3"]] Change
" + mutant_colors = TRUE + + dat += "Sprite Size: [features["body_size"]*100]%
" + + if(!(NOEYES in pref_species.species_traits)) + dat += "
Eye Type
" + dat += "[eye_type]" + if((EYECOLOR in pref_species.species_traits)) + if(!use_skintones && !mutant_colors) + dat += APPEARANCE_CATEGORY_COLUMN + if(left_eye_color != right_eye_color) + split_eye_colors = TRUE + dat += "
Heterochromia
" + dat += "[split_eye_colors ? "Enabled" : "Disabled"]" + if(!split_eye_colors) + dat += "Eye Color
" + dat += "#[left_eye_color] Change" + else + dat += "Left Eye Color
" + dat += "#[left_eye_color] Change" + dat += "Right Eye Color
" + dat += "#[right_eye_color] Change" + + if(HAIR in pref_species.species_traits) + + dat += APPEARANCE_CATEGORY_COLUMN + + dat += "
Hair Style
" + + dat += "[hair_style]" + dat += "< >" + dat += "#[hair_color] Change
" + + dat += "
Facial Hair Style
" + + dat += "[facial_hair_style]" + dat += "< >" + dat += "#[facial_hair_color] Change
" + + dat += "
Hair Gradient
" + + dat += "[grad_style]" + dat += "< >" + dat += "#[grad_color] Change
" + + dat += "" + + //Mutant stuff + var/mutant_category = 0 + + for(var/mutant_part in GLOB.all_mutant_parts) + if(mutant_part == "mam_body_markings") + continue + if(parent.can_have_part(mutant_part)) + if(!mutant_category) + dat += APPEARANCE_CATEGORY_COLUMN + dat += "
[GLOB.all_mutant_parts[mutant_part]]
" + dat += "[features[mutant_part]]" + var/color_type = GLOB.colored_mutant_parts[mutant_part] //if it can be coloured, show the appropriate button + if(color_type) + dat += "#[features[color_type]] Change" + else + if(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) //advanced individual part colouring system + //is it matrixed or does it have extra parts to be coloured? + var/find_part = features[mutant_part] || pref_species.mutant_bodyparts[mutant_part] + var/find_part_list = GLOB.mutant_reference_list[mutant_part] + if(find_part && find_part != "None" && find_part_list) + var/datum/sprite_accessory/accessory = find_part_list[find_part] + if(accessory) + if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future + var/mutant_string = accessory.mutant_part_string + var/primary_feature = "[mutant_string]_primary" + var/secondary_feature = "[mutant_string]_secondary" + var/tertiary_feature = "[mutant_string]_tertiary" + if(!features[primary_feature]) + features[primary_feature] = features["mcolor"] + if(!features[secondary_feature]) + features[secondary_feature] = features["mcolor2"] + if(!features[tertiary_feature]) + features[tertiary_feature] = features["mcolor3"] + + var/matrixed_sections = accessory.matrixed_sections + if(accessory.color_src == MATRIXED && !matrixed_sections) + message_admins("Sprite Accessory Failure (customization): Accessory [accessory.type] is a matrixed item without any matrixed sections set!") + continue + else if(accessory.color_src == MATRIXED) + switch(matrixed_sections) + if(MATRIX_GREEN) //only composed of a green section + primary_feature = secondary_feature //swap primary for secondary, so it properly assigns the second colour, reserved for the green section + if(MATRIX_BLUE) + primary_feature = tertiary_feature //same as above, but the tertiary feature is for the blue section + if(MATRIX_RED_BLUE) //composed of a red and blue section + secondary_feature = tertiary_feature //swap secondary for tertiary, as blue should always be tertiary + if(MATRIX_GREEN_BLUE) //composed of a green and blue section + primary_feature = secondary_feature //swap primary for secondary, as first option is green, which is linked to the secondary + secondary_feature = tertiary_feature //swap secondary for tertiary, as second option is blue, which is linked to the tertiary + dat += "Primary Color
" + dat += "#[features[primary_feature]] Change
" + if((accessory.color_src == MATRIXED && (matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)) || (accessory.extra && (accessory.extra_color_src == MUTCOLORS || accessory.extra_color_src == MUTCOLORS2 || accessory.extra_color_src == MUTCOLORS3))) + dat += "Secondary Color
" + dat += "#[features[secondary_feature]] Change
" + if((accessory.color_src == MATRIXED && matrixed_sections == MATRIX_ALL) || (accessory.extra2 && (accessory.extra2_color_src == MUTCOLORS || accessory.extra2_color_src == MUTCOLORS2 || accessory.extra2_color_src == MUTCOLORS3))) + dat += "Tertiary Color
" + dat += "#[features[tertiary_feature]] Change
" + + mutant_category++ + if(mutant_category >= MAX_MUTANT_ROWS) + dat += "" + mutant_category = 0 + + if(length(pref_species.allowed_limb_ids)) + if(!chosen_limb_id || !(chosen_limb_id in pref_species.allowed_limb_ids)) + chosen_limb_id = pref_species.limbs_id || pref_species.id + if(!mutant_category) + dat += APPEARANCE_CATEGORY_COLUMN + dat += "
Body sprite
" + dat += "[chosen_limb_id]" + + if(mutant_category) dat += "" mutant_category = 0 - if(length(pref_species.allowed_limb_ids)) - if(!chosen_limb_id || !(chosen_limb_id in pref_species.allowed_limb_ids)) - chosen_limb_id = pref_species.limbs_id || pref_species.id - dat += "Body sprite
" - dat += "[chosen_limb_id]" - - if(mutant_category) - dat += "" - mutant_category = 0 - - dat += ""
- dat += "Clothing & Equipment" - /* skyrat change - dat += "Underwear:[underwear]" - if(GLOB.underwear_list[underwear]?.has_color) - dat += "Underwear Color: #[undie_color] Change" - dat += "Undershirt:[undershirt]" - if(GLOB.undershirt_list[undershirt]?.has_color) - dat += "Undershirt Color: #[shirt_color] Change " - dat += "Socks:[socks]" - if(GLOB.socks_list[socks]?.has_color) - dat += "Socks Color: #[socks_color] Change " - */ - dat += "Backpack:[backbag]" - dat += "Jumpsuit: [jumpsuit_style] " - if((HAS_FLESH in pref_species.species_traits) || (HAS_BONE in pref_species.species_traits)) - dat += " Temporal Scarring: [(persistent_scars) ? "Enabled" : "Disabled"]" - dat += "Clear scar slots " - dat += "Uplink Location:[uplink_spawn_loc]" - dat += " | "
-
- dat += ""
- dat += "Lewd preferences" - dat += "Lust tolerance:[lust_tolerance]" - dat += "Sexual potency:[sexual_potency]" - dat += " | "
-
- //SPLURT EDIT BEGIN - gregnancy preferences
- dat += ""
- dat += "Pregnancy preferences" - dat += "Chance of impregnation:[virility ? virility : "Disabled"]" - dat += "Chance of getting pregnant:[fertility ? fertility : "Disabled"]" - dat += "Lay inert eggs:[features["inert_eggs"] == TRUE ? "Enabled" : "Disabled"]" - if(fertility) - dat += "Pregnancy inflation:[pregnancy_inflation ? "Enabled" : "Disabled"]" - dat += "Pregnancy breast growth:[pregnancy_breast_growth ? "Enabled" : "Disabled"]" - if(fertility || features["inert_eggs"]) - dat += "Egg shell:[egg_shell]" - dat += " | "
- //SPLURT EDIT END
- dat += APPEARANCE_CATEGORY_COLUMN
- if(NOGENITALS in pref_species.species_traits)
- dat += "Your species ([pref_species.name]) does not support genitals!
"
+ dat += "Clothing & Equipment" + /* skyrat change + dat += "Underwear:[underwear]" + if(GLOB.underwear_list[underwear]?.has_color) + dat += "Underwear Color: #[undie_color] Change" + dat += "Undershirt:[undershirt]" + if(GLOB.undershirt_list[undershirt]?.has_color) + dat += "Undershirt Color: #[shirt_color] Change " + dat += "Socks:[socks]" + if(GLOB.socks_list[socks]?.has_color) + dat += "Socks Color: #[socks_color] Change " + */ + dat += "Backpack:[backbag]" + dat += "Jumpsuit: [jumpsuit_style] " + if((HAS_FLESH in pref_species.species_traits) || (HAS_BONE in pref_species.species_traits)) + dat += " Temporal Scarring: [(persistent_scars) ? "Enabled" : "Disabled"]" + dat += "Clear scar slots " + dat += "Uplink Location:[uplink_spawn_loc]" + dat += " | "
- if(SPEECH_TAB)
- if(path)
- var/savefile/S = new /savefile(path)
- if(S)
- dat += ""
+ dat += "Lewd preferences" + dat += "Lust tolerance:[lust_tolerance]" + dat += "Sexual potency:[sexual_potency]" + dat += " | "
- dat += "||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
"
- dat += "Speech preferences" - dat += "Custom Speech Verb:" - dat += "[custom_speech_verb] " - dat += "Custom Tongue: " - dat += "[custom_tongue] " - //SANDSTORM EDIT - additional language + runechat color - dat += "Additional Language " - var/list/languages_sorted = sortList(language) - dat += "[language.len ? languages_sorted.Join(", ") : "None"] " - dat += "Custom runechat color: [enable_personal_chat_color ? "Enabled" : "Disabled"] [enable_personal_chat_color ? "[personal_chat_color] Change" : ""] " - dat += " | "
- //END OF SANDSTORM EDIT
- dat += ""
- dat += "Vocal Bark preferences" - var/datum/bark/B = GLOB.bark_list[bark_id] - dat += "Vocal Bark Sound:" - dat += "[B ? initial(B.name) : "INVALID"] " - dat += "Vocal Bark Speed: [bark_speed] " - dat += "Vocal Bark Pitch: [bark_pitch] " - dat += "Vocal Bark Variance: [bark_variance] " - dat += " Preview Bark " - dat += " | "
- dat += "
"
- dat += "General Settings" - dat += "UI Style: [UI_style]" - dat += "Outline: [outline_enabled ? "Enabled" : "Disabled"] " - dat += "Outline Color: [outline_color ? "" : "Theme-based (null)"][outline_color] Change " - dat += "Screentip: [screentip_pref ? "Enabled" : "Disabled"] " - dat += "Screentip Color: [screentip_color] Change " - dat += "tgui Monitors: [(tgui_lock) ? "Primary" : "All"] " - dat += "tgui Style: [(tgui_fancy) ? "Fancy" : "No Frills"] " - dat += "Input Framework: [(tgui_input_mode) ? "tgui" : "BYOND"] " - dat += "tgui Button Size: [(tgui_large_buttons) ? "Large" : "Small"] " - dat += "tgui Buttons Swapped: [(tgui_swapped_buttons) ? "Yes" : "No"] " - dat += "Show Runechat Chat Bubbles: [chat_on_map ? "Enabled" : "Disabled"] " - dat += "Runechat message char limit: [max_chat_length] " - dat += "See Runechat for non-mobs: [see_chat_non_mob ? "Enabled" : "Disabled"] " - //SKYRAT CHANGES BEGIN - dat += "See Runechat for emotes: [see_chat_emotes ? "Enabled" : "Disabled"] " - //SKYRAT CHANGES END - dat += " " - dat += "Action Buttons: [(buttons_locked) ? "Locked In Place" : "Unlocked"] " - dat += " " - dat += "PDA Color: [pda_color] Change " - dat += "PDA Style: [pda_style] " - dat += "PDA Reskin: [pda_skin] " - dat += " " - dat += "Ghost Ears: [(chat_toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"] " - dat += "Ghost Radio: [(chat_toggles & CHAT_GHOSTRADIO) ? "All Messages":"No Messages"] " - dat += "Ghost Sight: [(chat_toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"] " - dat += "Ghost Whispers: [(chat_toggles & CHAT_GHOSTWHISPER) ? "All Speech" : "Nearest Creatures"] " - dat += "Ghost PDA: [(chat_toggles & CHAT_GHOSTPDA) ? "All Messages" : "Nearest Creatures"] " - dat += "Window Flashing: [(windowflashing) ? "Enabled":"Disabled"] " - dat += " " - dat += "Play Admin MIDIs: [(toggles & SOUND_MIDI) ? "Enabled":"Disabled"] " - dat += "Play Lobby Music: [(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"] " - dat += "See Pull Requests: [(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"] " - dat += " " - if(user.client) - if(unlock_content) - dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"] " - if(unlock_content || check_rights_for(user.client, R_ADMIN)) - dat += "OOC Color: [ooccolor ? ooccolor : GLOB.normal_ooc_colour] Change " - dat += "Antag OOC Color: [aooccolor ? aooccolor : GLOB.normal_aooc_colour] Change " - - dat += " | "
-
- dat += ""
-
- dat += "Special Role Settings" - - if(jobban_isbanned(user, ROLE_SYNDICATE)) - dat += "You are banned from antagonist roles." - src.be_special = list() - - dat += "DISABLE ALL ANTAGONISM [(toggles & NO_ANTAG) ? "YES" : "NO"]" - - for (var/i in GLOB.special_roles) - if(jobban_isbanned(user, i)) - dat += "Be [capitalize(i)]: BANNED " - else - var/days_remaining = null - if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age - var/mode_path = GLOB.special_roles[i] - var/datum/game_mode/temp_mode = new mode_path - days_remaining = temp_mode.get_remaining_days(user.client) - - if(days_remaining) - dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS] " + //SPLURT EDIT BEGIN - gregnancy preferences + dat += " | "
+ dat += "Pregnancy preferences" + dat += "Chance of impregnation:[virility ? virility : "Disabled"]" + dat += "Chance of getting pregnant:[fertility ? fertility : "Disabled"]" + dat += "Lay inert eggs:[features["inert_eggs"] == TRUE ? "Enabled" : "Disabled"]" + if(fertility) + dat += "Pregnancy inflation:[pregnancy_inflation ? "Enabled" : "Disabled"]" + dat += "Pregnancy breast growth:[pregnancy_breast_growth ? "Enabled" : "Disabled"]" + if(fertility || features["inert_eggs"]) + dat += "Egg shell:[egg_shell]" + dat += " | "
+ //SPLURT EDIT END
+ dat += APPEARANCE_CATEGORY_COLUMN
+ if(NOGENITALS in pref_species.species_traits)
+ dat += "Your species ([pref_species.name]) does not support genitals!"
-
- if(user.client.holder) // sandstorm start - moves admin prefs to the right
- dat += "Admin Settings" - dat += "Adminhelp Sounds: [(toggles & SOUND_ADMINHELP)?"Enabled":"Disabled"]" - dat += "Announce Login: [(toggles & ANNOUNCE_LOGIN)?"Enabled":"Disabled"] " - dat += " " - dat += "Combo HUD Lighting: [(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"] " - dat += "Use Modern Player Panel: [use_new_playerpanel ? "Yes" : "No"] " // sandstorm end - moves admins prefs to the right - - //deadmin - dat += " Deadmin While Playing" - if(CONFIG_GET(flag/auto_deadmin_players)) - dat += "Always Deadmin: FORCED" - else - dat += "Always Deadmin: [(deadmin & DEADMIN_ALWAYS)?"Enabled":"Disabled"] " - if(!(deadmin & DEADMIN_ALWAYS)) - dat += " " - if(!CONFIG_GET(flag/auto_deadmin_antagonists)) - dat += "As Antag: [(deadmin & DEADMIN_ANTAGONIST)?"Deadmin":"Keep Admin"] " - else - dat += "As Antag: FORCED " - - if(!CONFIG_GET(flag/auto_deadmin_heads)) - dat += "As Command: [(deadmin & DEADMIN_POSITION_HEAD)?"Deadmin":"Keep Admin"] " - else - dat += "As Command: FORCED " - - if(!CONFIG_GET(flag/auto_deadmin_security)) - dat += "As Security: [(deadmin & DEADMIN_POSITION_SECURITY)?"Deadmin":"Keep Admin"] " - else - dat += "As Security: FORCED " - - if(!CONFIG_GET(flag/auto_deadmin_silicons)) - dat += "As Silicon: [(deadmin & DEADMIN_POSITION_SILICON)?"Deadmin":"Keep Admin"] " - else - dat += "As Silicon: FORCED " - - dat += " Citadel Preferences" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe. - dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]" - dat += "Long strip menu: [long_strip_menu ? "Enabled" : "Disabled"] " - dat += "Auto stand: [autostand ? "Enabled" : "Disabled"] " - dat += "Auto OOC: [auto_ooc ? "Enabled" : "Disabled"] " - dat += "Force Slot Storage HUD: [no_tetris_storage ? "Enabled" : "Disabled"] " - dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")] " - if (user && user.client && !user.client.prefs.screenshake==0) - dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")] " - dat += "Recoil Screen Push: [(recoil_screenshake==100) ? "Full" : ((recoil_screenshake==0) ? "None" : "[screenshake]")] " - var/p_chaos - if (!preferred_chaos) - p_chaos = "No preference" - else - p_chaos = preferred_chaos - dat += "Preferred Chaos Amount: [p_chaos] " - - dat += " S.P.L.U.R.T. Preferences" - dat += "Be Antagonist Victim: [be_victim ? be_victim : BEVICTIM_ASK]" - dat += "Disable combat mode cursor: [disable_combat_cursor?"Yes":"No"] " - dat += "Splashscreen Player Panel Style: [(toggles & TG_PLAYER_PANEL)?"TG":"Old"] " - dat += " " - - dat += " | "
- dat += "
" - dat += "Ghost Orbit: [ghost_orbit]
" - var/button_name = "If you see this something went wrong." - switch(ghost_accs) - if(GHOST_ACCS_FULL) - button_name = GHOST_ACCS_FULL_NAME - if(GHOST_ACCS_DIR) - button_name = GHOST_ACCS_DIR_NAME - if(GHOST_ACCS_NONE) - button_name = GHOST_ACCS_NONE_NAME - - dat += "Ghost Accessories: [button_name]
" - switch(ghost_others) - if(GHOST_OTHERS_THEIR_SETTING) - button_name = GHOST_OTHERS_THEIR_SETTING_NAME - if(GHOST_OTHERS_DEFAULT_SPRITE) - button_name = GHOST_OTHERS_DEFAULT_SPRITE_NAME - if(GHOST_OTHERS_SIMPLE) - button_name = GHOST_OTHERS_SIMPLE_NAME - - dat += "Ghosts of Others: [button_name]
" - dat += "
" - - dat += "FPS: [clientfps]
" - - dat += "Income Updates: [(chat_toggles & CHAT_BANKCARD) ? "Allowed" : "Muted"]
" - dat += "
" - - dat += "Parallax (Fancy Space): " - switch (parallax) - if (PARALLAX_LOW) - dat += "Low" - if (PARALLAX_MED) - dat += "Medium" - if (PARALLAX_INSANE) - dat += "Insane" - if (PARALLAX_DISABLE) - dat += "Disabled" - else - dat += "High" - dat += "
" - dat += "Ambient Occlusion: [ambientocclusion ? "Enabled" : "Disabled"]
" - dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"]
" - dat += "HUD Button Flashes: [hud_toggle_flash ? "Enabled" : "Disabled"]
" - dat += "HUD Button Flash Color: [hud_toggle_color] Change
" - -/* CITADEL EDIT - We're using top menu instead - button_name = pixel_size - dat += "Pixel Scaling: [(button_name) ? "Pixel Perfect [button_name]x" : "Stretch to fit"]
" - - switch(scaling_method) - if(SCALING_METHOD_NORMAL) - button_name = "Nearest Neighbor" - if(SCALING_METHOD_DISTORT) - button_name = "Point Sampling" - if(SCALING_METHOD_BLUR) - button_name = "Bilinear" - dat += "Scaling Method: [button_name]
" -*/ - - if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation)) - var/p_map = preferred_map - if (!p_map) - p_map = "Default" - if (config.defaultmap) - p_map += " ([config.defaultmap.map_name])" - else - if (p_map in config.maplist) - var/datum/map_config/VM = config.maplist[p_map] - if (!VM) - p_map += " (No longer exists)" - else - p_map = VM.map_name - else - p_map += " (No longer exists)" - if(CONFIG_GET(flag/allow_map_voting)) - dat += "Preferred Map: [p_map]
" - - dat += "" - - if(LOADOUT_TAB) - //calculate your gear points from the chosen item - gear_points = CONFIG_GET(number/initial_gear_points) - var/list/chosen_gear = loadout_data["SAVE_[loadout_slot]"] - if(chosen_gear) - for(var/loadout_item in chosen_gear) - var/loadout_item_path = loadout_item[LOADOUT_ITEM] - if(loadout_item_path) - var/datum/gear/loadout_gear = text2path(loadout_item_path) - if(loadout_gear) - gear_points -= initial(loadout_gear.cost) - else - chosen_gear = list() - - dat += "
| Name | " - dat += "Cost | " - dat += "Restrictions | " - dat += "Description |
| [name][extra_loadout_data] | " - dat += "[gear.cost] | "
- if(islist(gear.restricted_roles))
- if(gear.restricted_roles.len)
- if(gear.restricted_desc)
- dat += ""
- dat += gear.restricted_desc
- dat += ""
+ dat += "Penis Color: " + dat += "#[features["cock_color"]] Change " + var/tauric_shape = FALSE + if(features["cock_taur"]) + var/datum/sprite_accessory/penis/P = GLOB.cock_shapes_list[features["cock_shape"]] + if(P.taur_icon && parent.can_have_part("taur")) + var/datum/sprite_accessory/taur/T = GLOB.taur_list[features["taur"]] + if(T.taur_mode & P.accepted_taurs) + tauric_shape = TRUE + dat += "Penis Shape: [features["cock_shape"]][tauric_shape ? " (Taur)" : ""]" + dat += "Penis Length: [features["cock_length"]] inch(es)" + dat += "Diameter Ratio: [features["cock_diameter_ratio"]]" //SPLURT Edit + dat += "Penis Visibility:[features["cock_visibility"]]" + dat += "Egg Stuffing:[features["cock_stuffing"] == TRUE ? "Yes" : "No"]" //SPLURT Edit + dat += "Has Testicles:[features["has_balls"] == TRUE ? "Yes" : "No"]" + if(features["has_balls"]) + if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) + dat += "Testicles Color: " + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding) " else - dat += "" - dat += gear.restricted_roles.Join(";") - dat += "" - if(!istype(gear, /datum/gear/unlockable)) - // the below line essentially means "if the loadout item is picked by the user and has a custom description, give it the custom description, otherwise give it the default description" - dat += " | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] Progress: [min(progress_made, unlockable.progress_required)]/[unlockable.progress_required] | " + dat += "Testicles Color:
[GLOB.all_mutant_parts[marking_type]]
" // give it the appropriate title for the type of marking + dat += "Add marking" + dat += ""
+ dat += "
"
+ dat += " | "
+ iterated_markings = 0
+ dat += "
| " + dat += " | " + dat += " | " + dat += " | " + dat += " | " + dat += " | " + dat += "" + + // list out the current markings you have + if(length(features[marking_type])) + var/list/markings = features[marking_type] + if(!islist(markings)) + // something went terribly wrong + markings = list() + + for(var/list/marking_list in markings) + var/marking_index = markings.Find(marking_list) // consider changing loop to go through indexes over lists instead of using Find here + var/limb_value = marking_list[1] + var/actual_name = GLOB.bodypart_names[num2text(limb_value)] // get the actual name from the bitflag representing the part the marking is applied to + if(actual_name != limb) + continue + var/color_marking_dat = "" + var/number_colors = 1 + var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]] + var/matrixed_sections = S.covered_limbs[actual_name] + if(S && matrixed_sections) + // if it has nothing initialize it to white + if(length(marking_list) == 2) + var/first = "#FFFFFF" + var/second = "#FFFFFF" + var/third = "#FFFFFF" + if(features["mcolor"]) + first = "#[features["mcolor"]]" + if(features["mcolor2"]) + second = "#[features["mcolor2"]]" + if(features["mcolor3"]) + third = "#[features["mcolor3"]]" + marking_list += list(list(first, second, third)) // just assume its 3 colours if it isnt it doesnt matter we just wont use the other values + // index magic + var/primary_index = 1 + var/secondary_index = 2 + var/tertiary_index = 3 + switch(matrixed_sections) + if(MATRIX_GREEN) + primary_index = 2 + if(MATRIX_BLUE) + primary_index = 3 + if(MATRIX_RED_BLUE) + secondary_index = 2 + if(MATRIX_GREEN_BLUE) + primary_index = 2 + secondary_index = 3 + + // we know it has one matrixed section at minimum + color_marking_dat += "[marking_list[3][primary_index]]" + // if it has a second section, add it + if(matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL) + number_colors = 2 + color_marking_dat += "[marking_list[3][secondary_index]]" + // if it has a third section, add it + if(matrixed_sections == MATRIX_ALL) + number_colors = 3 + color_marking_dat += "[marking_list[3][tertiary_index]]" + dat += " |
| [marking_index] | " + dat += "˅ | " + dat += "˄ | " + dat += "[marking_list[2]] | " + dat += "[color_marking_dat] | " + dat += "X | " + dat += "
| " + dat += " | " + dat += " | " + dat += " | " + dat += " | " + dat += " | " + dat += " |
"
+ dat += "Speech preferences" + dat += "Custom Speech Verb:" + dat += "[custom_speech_verb] " + dat += "Custom Tongue: " + dat += "[custom_tongue] " + //SANDSTORM EDIT - additional language + runechat color + dat += "Additional Language " + var/list/languages_sorted = sortList(language) + dat += "[language.len ? languages_sorted.Join(", ") : "None"] " + dat += "Custom runechat color: [enable_personal_chat_color ? "Enabled" : "Disabled"] [enable_personal_chat_color ? "[personal_chat_color] Change" : ""] " + dat += " | "
+ //END OF SANDSTORM EDIT
+ dat += ""
+ dat += "Vocal Bark preferences" + var/datum/bark/B = GLOB.bark_list[bark_id] + dat += "Vocal Bark Sound:" + dat += "[B ? initial(B.name) : "INVALID"] " + dat += "Vocal Bark Speed: [bark_speed] " + dat += "Vocal Bark Pitch: [bark_pitch] " + dat += "Vocal Bark Variance: [bark_variance] " + dat += " Preview Bark " + dat += " | "
+ dat += "
"
+ dat += "Records" + dat += "Security Records " + if(length_char(security_records) <= 40) + if(!length(security_records)) + dat += "\[...\]" + else + dat += "[security_records]" + else + dat += "[TextPreview(security_records)]... " + + dat += " Medical Records " + if(length_char(medical_records) <= 40) + if(!length(medical_records)) + dat += "\[...\] " + else + dat += "[medical_records]" + else + dat += "[TextPreview(medical_records)]... " + dat += " |
| Name | " + dat += "Cost | " + dat += "Restrictions | " + dat += "Description |
| [name][extra_loadout_data] | " + dat += "[gear.cost] | " + if(islist(gear.restricted_roles)) + if(gear.restricted_roles.len) + if(gear.restricted_desc) + dat += "" + dat += gear.restricted_desc + dat += "" + else + dat += "" + dat += gear.restricted_roles.Join(";") + dat += "" + if(!istype(gear, /datum/gear/unlockable)) + // the below line essentially means "if the loadout item is picked by the user and has a custom description, give it the custom description, otherwise give it the default description" + dat += " | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] | [loadout_item ? (loadout_item[LOADOUT_CUSTOM_DESCRIPTION] ? loadout_item[LOADOUT_CUSTOM_DESCRIPTION] : gear.description) : gear.description] Progress: [min(progress_made, unlockable.progress_required)]/[unlockable.progress_required] | " + dat += "
"
- dat += "Fetish content prefs" - dat += "Allow Lewd Verbs: [(toggles & VERB_CONSENT) ? "Yes":"No"]" // Skyrat - ERP Mechanic Addition - dat += "Mute Lewd Verb Sounds: [(toggles & LEWD_VERB_SOUNDS) ? "Yes":"No"] " // Skyrat - ERP Mechanic Addition - dat += "Arousal:[arousable == TRUE ? "Enabled" : "Disabled"] " - dat += "Genital examine text:[(cit_toggles & GENITAL_EXAMINE) ? "Enabled" : "Disabled"] " - dat += "Vore examine text:[(cit_toggles & VORE_EXAMINE) ? "Enabled" : "Disabled"] " - dat += "Voracious MediHound sleepers: [(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"] " - dat += "Hear Vore Sounds: [(cit_toggles & EATING_NOISES) ? "Yes" : "No"] " - dat += "Hear Vore Digestion Sounds: [(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"] " - dat += "Allow trash forcefeeding (requires Trashcan quirk) [(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"] " - dat += "Forced Feminization: [(cit_toggles & FORCED_FEM) ? "Allowed" : "Disallowed"] " - dat += "Forced Masculinization: [(cit_toggles & FORCED_MASC) ? "Allowed" : "Disallowed"] " - dat += "Lewd Hypno: [(cit_toggles & HYPNO) ? "Allowed" : "Disallowed"] " - dat += "Bimbofication: [(cit_toggles & BIMBOFICATION) ? "Allowed" : "Disallowed"] " - dat += " | "
- dat +=""
- dat += "Other content prefs" - dat += "Breast Enlargement: [(cit_toggles & BREAST_ENLARGEMENT) ? "Allowed" : "Disallowed"]" - dat += "Penis Enlargement: [(cit_toggles & PENIS_ENLARGEMENT) ? "Allowed" : "Disallowed"] " - dat += "Butt Enlargement: [(cit_toggles & BUTT_ENLARGEMENT) ? "Allowed" : "Disallowed"] " - dat += "Belly Inflation: [(cit_toggles & BELLY_INFLATION) ? "Allowed" : "Disallowed"] " - dat += "Hypno: [(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"] " - dat += "Aphrodisiacs: [(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"] " - dat += "Ass Slapping: [(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"] " - //SPLURT EDIT - dat += "? " - dat += "Unholy ERP verbs : [unholypref] " //https://www.youtube.com/watch?v=OHKARc-GObU - //END OF SPLURT EDIT - //SKYRAT EDIT - dat += "? " - dat += "Extreme ERP verbs : [extremepref] " // https://youtu.be/0YrU9ASVw6w - if(extremepref != "No") - dat += "? " - dat += "Harmful ERP verbs : [extremeharm] " - //END OF SKYRAT EDIT - dat += "Automatic Wagging: [(cit_toggles & NO_AUTO_WAG) ? "Disabled" : "Enabled"] " - dat += "? " - dat += "Genital Fluid Blacklist " - if(gfluid_blacklist?.len) - dat += "? " - dat += "Genital Fluid Un-Blacklist " - dat += " |
" + if(PREFERENCES_TAB) // Game Preferences + dat += "
" + + switch(preferences_tab) + if(GAME_PREFS_TAB) + dat += "
"
+ dat += "General Settings" + dat += "UI Style: [UI_style]" + dat += "Outline: [outline_enabled ? "Enabled" : "Disabled"] " + dat += "Outline Color: [outline_color ? "" : "Theme-based (null)"][outline_color] Change " + dat += "Screentip: [screentip_pref] " + dat += "Screentip Color: [screentip_color] Change " + dat += "tgui Monitors: [(tgui_lock) ? "Primary" : "All"] " + dat += "tgui Style: [(tgui_fancy) ? "Fancy" : "No Frills"] " + dat += "Show Runechat Chat Bubbles: [chat_on_map ? "Enabled" : "Disabled"] " + dat += "Runechat message char limit: [max_chat_length] " + dat += "See Runechat for non-mobs: [see_chat_non_mob ? "Enabled" : "Disabled"] " + //SKYRAT CHANGES BEGIN + dat += "See Runechat for emotes: [see_chat_emotes ? "Enabled" : "Disabled"] " + //SKYRAT CHANGES END + dat += " " + dat += "Action Buttons: [(buttons_locked) ? "Locked In Place" : "Unlocked"] " + dat += " " + dat += "PDA Color: [pda_color] Change " + dat += "PDA Style: [pda_style] " + dat += "PDA Reskin: [pda_skin] " + dat += " " + dat += "Ghost Ears: [(chat_toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"] " + dat += "Ghost Radio: [(chat_toggles & CHAT_GHOSTRADIO) ? "All Messages":"No Messages"] " + dat += "Ghost Sight: [(chat_toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"] " + dat += "Ghost Whispers: [(chat_toggles & CHAT_GHOSTWHISPER) ? "All Speech" : "Nearest Creatures"] " + dat += "Ghost PDA: [(chat_toggles & CHAT_GHOSTPDA) ? "All Messages" : "Nearest Creatures"] " + + dat += " | "
+
+ dat += ""
+
+ dat += "Special Role Settings" + + if(jobban_isbanned(user, ROLE_SYNDICATE)) + dat += "You are banned from antagonist roles." + src.be_special = list() + + dat += "DISABLE ALL ANTAGONISM [(toggles & NO_ANTAG) ? "YES" : "NO"]" + + for (var/i in GLOB.special_roles) + if(jobban_isbanned(user, i)) + dat += "Be [capitalize(i)]: BANNED " + else + var/days_remaining = null + if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age + var/mode_path = GLOB.special_roles[i] + var/datum/game_mode/temp_mode = new mode_path + days_remaining = temp_mode.get_remaining_days(user.client) + + if(days_remaining) + dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS\] " + else + var/enabled_text = "" + if(i in be_special) + if(be_special[i] >= 1) + enabled_text = "Enabled" + else + enabled_text = "Low" + else + enabled_text = "Disabled" + dat += "Be [capitalize(i)]: [enabled_text] " + dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"] " + + dat += " |
"
+ dat += "OOC Settings" + dat += "Window Flashing: [(windowflashing) ? "Enabled":"Disabled"]" + dat += " " + dat += "Play Admin MIDIs: [(toggles & SOUND_MIDI) ? "Enabled":"Disabled"] " + dat += "Play Lobby Music: [(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"] " + dat += "See Pull Requests: [(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"] " + dat += " " + if(user.client) + if(unlock_content) + dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"] " + if(unlock_content || check_rights_for(user.client, R_ADMIN)) + dat += "OOC Color: [ooccolor ? ooccolor : GLOB.normal_ooc_colour] Change " + dat += "Antag OOC Color: [aooccolor ? aooccolor : GLOB.normal_aooc_colour] Change " + + if(user.client.holder) + dat += " Admin Settings" + dat += "Adminhelp Sounds: [(toggles & SOUND_ADMINHELP)?"Enabled":"Disabled"]" + dat += "Announce Login: [(toggles & ANNOUNCE_LOGIN)?"Enabled":"Disabled"] " + dat += " " + dat += "Combo HUD Lighting: [(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"] " + dat += "Use Modern Player Panel: [use_new_playerpanel ? "Yes" : "No"] " //SPLURT Edit + + //deadmin + dat += " Deadmin While Playing" + if(CONFIG_GET(flag/auto_deadmin_players)) + dat += "Always Deadmin: FORCED" + else + dat += "Always Deadmin: [(deadmin & DEADMIN_ALWAYS)?"Enabled":"Disabled"] " + if(!(deadmin & DEADMIN_ALWAYS)) + dat += " " + if(!CONFIG_GET(flag/auto_deadmin_antagonists)) + dat += "As Antag: [(deadmin & DEADMIN_ANTAGONIST)?"Deadmin":"Keep Admin"] " + else + dat += "As Antag: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_heads)) + dat += "As Command: [(deadmin & DEADMIN_POSITION_HEAD)?"Deadmin":"Keep Admin"] " + else + dat += "As Command: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_security)) + dat += "As Security: [(deadmin & DEADMIN_POSITION_SECURITY)?"Deadmin":"Keep Admin"] " + else + dat += "As Security: FORCED " + + if(!CONFIG_GET(flag/auto_deadmin_silicons)) + dat += "As Silicon: [(deadmin & DEADMIN_POSITION_SILICON)?"Deadmin":"Keep Admin"] " + else + dat += "As Silicon: FORCED " + + dat += " | "
+
+ dat += ""
+
+ dat += "Citadel Preferences" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe. + dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]" + dat += "Long strip menu: [long_strip_menu ? "Enabled" : "Disabled"] " + dat += "Auto stand: [autostand ? "Enabled" : "Disabled"] " + dat += "Auto OOC: [auto_ooc ? "Enabled" : "Disabled"] " + dat += "Force Slot Storage HUD: [no_tetris_storage ? "Enabled" : "Disabled"] " + dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")] " + if (user && user.client && !user.client.prefs.screenshake==0) + dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")] " + dat += "Recoil Screen Push: [(recoil_screenshake==100) ? "Full" : ((recoil_screenshake==0) ? "None" : "[screenshake]")] " + var/p_chaos + if (!preferred_chaos) + p_chaos = "No preference" + else + p_chaos = preferred_chaos + dat += "Preferred Chaos Amount: [p_chaos] " + + //SPLURT Edit + dat += " S.P.L.U.R.T. Preferences" + dat += "Be Antagonist Victim: [be_victim ? be_victim : BEVICTIM_ASK]" + dat += "Disable combat mode cursor: [disable_combat_cursor?"Yes":"No"] " + dat += "Splashscreen Player Panel Style: [(toggles & TG_PLAYER_PANEL)?"TG":"Old"] " + //SPLURT Edit end + + dat += " " + + if(unlock_content) + dat += "Ghost Form: [ghost_form] " + dat += "Ghost Orbit: [ghost_orbit] " + var/button_name = "If you see this something went wrong." + switch(ghost_accs) + if(GHOST_ACCS_FULL) + button_name = GHOST_ACCS_FULL_NAME + if(GHOST_ACCS_DIR) + button_name = GHOST_ACCS_DIR_NAME + if(GHOST_ACCS_NONE) + button_name = GHOST_ACCS_NONE_NAME + + dat += "Ghost Accessories: [button_name] " + switch(ghost_others) + if(GHOST_OTHERS_THEIR_SETTING) + button_name = GHOST_OTHERS_THEIR_SETTING_NAME + if(GHOST_OTHERS_DEFAULT_SPRITE) + button_name = GHOST_OTHERS_DEFAULT_SPRITE_NAME + if(GHOST_OTHERS_SIMPLE) + button_name = GHOST_OTHERS_SIMPLE_NAME + + dat += "Ghosts of Others: [button_name] " + dat += " " + + dat += "FPS: [clientfps] " + + dat += "Income Updates: [(chat_toggles & CHAT_BANKCARD) ? "Allowed" : "Muted"] " + dat += " " + + dat += "Parallax (Fancy Space): " + switch (parallax) + if (PARALLAX_LOW) + dat += "Low" + if (PARALLAX_MED) + dat += "Medium" + if (PARALLAX_INSANE) + dat += "Insane" + if (PARALLAX_DISABLE) + dat += "Disabled" + else + dat += "High" + dat += " " + dat += "Ambient Occlusion: [ambientocclusion ? "Enabled" : "Disabled"] " + dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"] " + dat += "HUD Button Flashes: [hud_toggle_flash ? "Enabled" : "Disabled"] " + dat += "HUD Button Flash Color: [hud_toggle_color] Change " + + + if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation)) + var/p_map = preferred_map + if (!p_map) + p_map = "Default" + if (config.defaultmap) + p_map += " ([config.defaultmap.map_name])" + else + if (p_map in config.maplist) + var/datum/map_config/VM = config.maplist[p_map] + if (!VM) + p_map += " (No longer exists)" + else + p_map = VM.map_name + else + p_map += " (No longer exists)" + if(CONFIG_GET(flag/allow_map_voting)) + dat += "Preferred Map: [p_map] " + + dat += " |
"
+ dat += "Fetish content prefs" + dat += "Allow Lewd Verbs: [(toggles & VERB_CONSENT) ? "Yes":"No"]" // Skyrat - ERP Mechanic Addition + dat += "Mute Lewd Verb Sounds: [(toggles & LEWD_VERB_SOUNDS) ? "Yes":"No"] " // Skyrat - ERP Mechanic Addition + dat += "Arousal:[arousable == TRUE ? "Enabled" : "Disabled"] " + dat += "Genital examine text:[(cit_toggles & GENITAL_EXAMINE) ? "Enabled" : "Disabled"] " + dat += "Vore examine text:[(cit_toggles & VORE_EXAMINE) ? "Enabled" : "Disabled"] " + dat += "Voracious MediHound sleepers: [(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"] " + dat += "Hear Vore Sounds: [(cit_toggles & EATING_NOISES) ? "Yes" : "No"] " + dat += "Hear Vore Digestion Sounds: [(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"] " + dat += "Allow trash forcefeeding (requires Trashcan quirk) [(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"] " + dat += "Forced Feminization: [(cit_toggles & FORCED_FEM) ? "Allowed" : "Disallowed"] " + dat += "Forced Masculinization: [(cit_toggles & FORCED_MASC) ? "Allowed" : "Disallowed"] " + dat += "Lewd Hypno: [(cit_toggles & HYPNO) ? "Allowed" : "Disallowed"] " + dat += "Bimbofication: [(cit_toggles & BIMBOFICATION) ? "Allowed" : "Disallowed"] " + dat += " | "
+ dat +=""
+ dat += "Other content prefs" + dat += "Breast Enlargement: [(cit_toggles & BREAST_ENLARGEMENT) ? "Allowed" : "Disallowed"]" + dat += "Penis Enlargement: [(cit_toggles & PENIS_ENLARGEMENT) ? "Allowed" : "Disallowed"] " + dat += "Butt Enlargement: [(cit_toggles & BUTT_ENLARGEMENT) ? "Allowed" : "Disallowed"] " + dat += "Belly Inflation: [(cit_toggles & BELLY_INFLATION) ? "Allowed" : "Disallowed"] " //SPLURT Edit + dat += "Hypno: [(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"] " + dat += "Aphrodisiacs: [(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"] " + dat += "Ass Slapping: [(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"] " + //SPLURT EDIT + dat += "? " + dat += "Unholy ERP verbs : [unholypref] " //https://www.youtube.com/watch?v=OHKARc-GObU + //END OF SPLURT EDIT + //SKYRAT EDIT + dat += "? " //SPLURT Edit (wow! editception???) + dat += "Extreme ERP verbs : [extremepref] " // https://youtu.be/0YrU9ASVw6w + if(extremepref != "No") + dat += "? " //SPLURT Edit + dat += "Harmful ERP verbs : [extremeharm] " + //END OF SKYRAT EDIT + //SPLURT EDIT + dat += "Automatic Wagging: [(cit_toggles & NO_AUTO_WAG) ? "Disabled" : "Enabled"] " + dat += "? " + dat += "Genital Fluid Blacklist " + if(gfluid_blacklist?.len) + dat += "? " + dat += "Genital Fluid Un-Blacklist " + //SPLURT Edit end + dat += " |
" dat += "Keybindings mode controls how the game behaves with tab and map/input focus.
If it is on Hotkeys, the game will always attempt to force you to map focus, meaning keypresses are sent \ @@ -3148,47 +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_number = text2num(href_list["number_color"]) + if(index && marking_type && color_number && features[marking_type]) + // perform some magic on the color number + var/list/marking_list = features[marking_type][index] + var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]] + var/matrixed_sections = S.covered_limbs[GLOB.bodypart_names[num2text(marking_list[1])]] + if(color_number == 1) + switch(matrixed_sections) + if(MATRIX_GREEN) + color_number = 2 + if(MATRIX_BLUE) + color_number = 3 + else if(color_number == 2) + switch(matrixed_sections) + if(MATRIX_RED_BLUE) + color_number = 3 + if(MATRIX_GREEN_BLUE) + color_number = 3 - var/color_list = features[marking_type][index][3] - var/new_marking_color = input(user, "Choose your character's marking color:", "Character Preference","#"+color_list[color_number]) as color|null - if(new_marking_color) - var/temp_hsv = RGBtoHSV(new_marking_color) - if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright, but only if they affect the skin - color_list[color_number] = "#[sanitize_hexcolor(new_marking_color, 6)]" - else - to_chat(user, "Invalid color. Your color is not bright enough.") + var/color_list = features[marking_type][index][3] + var/new_marking_color = input(user, "Choose your character's marking color:", "Character Preference","#"+color_list[color_number]) as color|null + if(new_marking_color) + var/temp_hsv = RGBtoHSV(new_marking_color) + if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright, but only if they affect the skin + color_list[color_number] = "#[sanitize_hexcolor(new_marking_color, 6)]" + else + to_chat(user, "Invalid color. Your color is not bright enough.") + //SPLURT Edit if("gfluid_black") var/list/datum/reagent/fluid_list = GLOB.genital_fluids_list.Copy() var/list/blacklisted = list() @@ -3208,6 +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 4754a87e3c..c265604f81 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/clothing.dm b/code/modules/clothing/clothing.dm index f349eae02b..5afd5abe3e 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -82,12 +82,14 @@ if(M.putItemFromInventoryInHandIfPossible(src, H.held_index)) add_fingerprint(usr) + /obj/item/reagent_containers/food/snacks/clothing name = "oops" desc = "If you're reading this it means I messed up. This is related to moths eating clothes and I didn't know a better way to do it than making a new food object." list_reagents = list(/datum/reagent/consumable/nutriment = 1) tastes = list("dust" = 1, "lint" = 1) - +/* +MOVED TO: modular_splurt/code/module/clothing/clothing.dm /obj/item/clothing/attack(mob/M, mob/user, def_zone) if(user.a_intent != INTENT_HARM && isinsect(M)) var/obj/item/reagent_containers/food/snacks/clothing/clothing_as_food = new @@ -98,6 +100,9 @@ else return ..() + return ..() +*/ + /obj/item/clothing/attackby(obj/item/W, mob/user, params) if(damaged_clothes && istype(W, repairable_by)) var/obj/item/stack/S = W @@ -130,6 +135,7 @@ UnregisterSignal(user, COMSIG_MOVABLE_MOVED) to_chat(user, "You fix the damage on [src].") + /** * take_damage_zone() is used for dealing damage to specific bodyparts on a worn piece of clothing, meant to be called from [/obj/item/bodypart/proc/check_woundings_mods()] * diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index f3868f703f..0a626a0558 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -440,6 +440,16 @@ icon_state = "cowboyhat_sec" item_state= "cowboyhat_sec" +/obj/item/clothing/head/cowboyhat/polychromic + name = "polychromic cowboy hat" + desc = "A polychromic cowboy hat, perfect for your indecisive rancher" + icon_state = "cowboyhat_poly" + item_state= "cowboyhat_poly" + +/obj/item/clothing/head/cowboyhat/polychromic/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#5F5F5F", "#DDDDDD"), 2) + /obj/item/clothing/head/squatter_hat name = "slav squatter hat" icon_state = "squatter_hat" diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 1cd09097f4..598136acfb 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -361,7 +361,7 @@ head = /obj/item/clothing/head/helmet/space/plasmaman uniform = /obj/item/clothing/under/plasmaman - r_hand= /obj/item/tank/internals/plasmaman/belt/full + r_hand = /obj/item/tank/internals/plasmaman/belt/full mask = /obj/item/clothing/mask/breath /datum/outfit/death_commando diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 7c1fc6fe3d..08a77b9b2b 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -144,7 +144,7 @@ /obj/item/clothing/shoes/jackboots name = "jackboots" - desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time." + desc = "Nanotrasen-brand jackboots for all your jackboots-related needs. From genuine combat to tacticool LARPing, satisfaction is guaranteed." icon_state = "jackboots" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' @@ -155,6 +155,11 @@ pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes lace_time = 12 SECONDS +/obj/item/clothing/shoes/jackboots/sec + name = "security jackboots" + desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time." + icon_state = "jackboots_sec" + /obj/item/clothing/shoes/jackboots/fast slowdown = -1 diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index d1af3e4512..c87095e5ff 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -26,7 +26,6 @@ var/max_accessories = 3 var/list/obj/item/clothing/accessory/attached_accessories = list() var/list/mutable_appearance/accessory_overlays = list() - var/is_skirt = FALSE //SANDSTORM EDIT END /obj/item/clothing/under/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE) diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 1b8b4d9e00..011f64d3ec 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -7,7 +7,8 @@ // icon_state = "plasma" item_state = "" //no inhands - slot_flags = 0 + slot_flags = ITEM_SLOT_ACCESSORY + slot_equipment_priority = list(ITEM_SLOT_ACCESSORY) w_class = WEIGHT_CLASS_SMALL var/above_suit = FALSE var/minimize_when_attached = TRUE // TRUE if shown as a small icon in corner, FALSE if overlayed diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 3abe65a790..d8c7af788f 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -3,6 +3,8 @@ //this datum is used by the events controller to dictate how it selects events /datum/round_event_control var/name //The human-readable name of the event + var/category //The category of the event + var/description //The description of the event var/typepath //The typepath of the event datum /datum/round_event var/weight = 10 //The weight this event has in the random-selection process. @@ -38,6 +40,7 @@ min_players = CEILING(min_players * CONFIG_GET(number/events_min_players_mul), 1) /datum/round_event_control/wizard + category = EVENT_CATEGORY_WIZARD wizardevent = TRUE var/can_be_midround_wizard = TRUE @@ -107,13 +110,22 @@ log_admin_private("[key_name(usr)] cancelled event [name].") SSblackbox.record_feedback("tally", "event_admin_cancelled", 1, typepath) -/datum/round_event_control/proc/runEvent(random = FALSE) +/* +Runs the event +* Arguments: +* - random: shows if the event was triggered randomly, or by on purpose by an admin or an item +* - announce_chance_override: if the value is not null, overrides the announcement chance when an admin calls an event +*/ +/datum/round_event_control/proc/runEvent(random = FALSE, announce_chance_override = null, admin_forced = FALSE) var/datum/round_event/E = new typepath() E.current_players = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) E.control = src SSblackbox.record_feedback("tally", "event_ran", 1, "[E]") occurrences++ + if(announce_chance_override != null) + E.announce_chance = announce_chance_override + testing("[time2text(world.time, "hh:mm:ss")] [E.type]") if(random) log_game("Random Event triggering: [name] ([typepath])") @@ -129,18 +141,29 @@ var/processing = TRUE var/datum/round_event_control/control - var/startWhen = 0 //When in the lifetime to call start(). - var/announceWhen = 0 //When in the lifetime to call announce(). Set an event's announceWhen to -1 if announcement should not be shown. - var/endWhen = 0 //When in the lifetime the event should end. + /// When in the lifetime to call start(). + /// This is in seconds - so 1 = ~2 seconds in. + var/start_when = 0 + /// When in the lifetime to call announce(). If you don't want it to announce use announce_chance, below. + /// This is in seconds - so 1 = ~2 seconds in. + var/announce_when = 0 + /// Probability of announcing, used in prob(), 0 to 100, default 100. Called in process, and for a second time in the ion storm event. + var/announce_chance = 100 + /// When in the lifetime the event should end. + /// This is in seconds - so 1 = ~2 seconds in. + var/end_when = 0 - var/activeFor = 0 //How long the event has existed. You don't need to change this. - var/current_players = 0 //Amount of of alive, non-AFK human players on server at the time of event start + /// How long the event has existed. You don't need to change this. + var/activeFor = 0 + /// Amount of of alive, non-AFK human players on server at the time of event start + var/current_players = 0 var/threat = 0 - var/fakeable = TRUE //Can be faked by fake news event. + /// Can be faked by fake news event. + var/fakeable = TRUE //Called first before processing. //Allows you to setup your event, such as randomly -//setting the startWhen and or announceWhen variables. +//setting the start_when and or announce_when variables. //Only called once. //EDIT: if there's anything you want to override within the new() call, it will not be overridden by the time this proc is called. //It will only have been overridden by the time we get to announce() start() tick() or end() (anything but setup basically). @@ -148,7 +171,7 @@ /datum/round_event/proc/setup() return -//Called when the tick is equal to the startWhen variable. +//Called when the tick is equal to the start_when variable. //Allows you to start before announcing or vice versa. //Only called once. /datum/round_event/proc/start() @@ -165,20 +188,20 @@ notify_ghosts("[control.name] has an object of interest: [atom_of_interest]!", source=atom_of_interest, action=NOTIFY_ORBIT, header="Something's Interesting!") return -//Called when the tick is equal to the announceWhen variable. +//Called when the tick is equal to the announce_when variable. //Allows you to announce before starting or vice versa. //Only called once. /datum/round_event/proc/announce(fake) return -//Called on or after the tick counter is equal to startWhen. +//Called on or after the tick counter is equal to start_when. //You can include code related to your event or add your own //time stamped events. //Called more than once. /datum/round_event/proc/tick() return -//Called on or after the tick is equal or more than endWhen +//Called on or after the tick is equal or more than end_when //You can include code related to the event ending. //Do not place spawn() in here, instead use tick() to check for //the activeFor variable. @@ -197,28 +220,28 @@ if(!processing) return - if(activeFor == startWhen) + if(activeFor == start_when) processing = FALSE start() processing = TRUE - if(activeFor == announceWhen) + if(activeFor == announce_when && prob(announce_chance)) processing = FALSE announce(FALSE) processing = TRUE - if(startWhen < activeFor && activeFor < endWhen) + if(start_when < activeFor && activeFor < end_when) processing = FALSE tick() processing = TRUE - if(activeFor == endWhen) + if(activeFor == end_when) processing = FALSE end() processing = TRUE // Everything is done, let's clean up. - if(activeFor >= endWhen && activeFor >= announceWhen && activeFor >= startWhen) + if(activeFor >= end_when && activeFor >= announce_when && activeFor >= start_when) processing = FALSE kill() diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm index 9fe3a2a7a9..64c743d1a1 100755 --- a/code/modules/events/abductor.dm +++ b/code/modules/events/abductor.dm @@ -6,6 +6,8 @@ min_players = 30 earliest_start = 30 MINUTES dynamic_should_hijack = TRUE + category = EVENT_CATEGORY_INVASION + description = "One or more abductor teams spawns, and they plan to experiment on the crew." /datum/round_event/ghost_role/abductor minimum_required = 2 diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index f7014df648..cf94253bbb 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -5,9 +5,11 @@ min_players = 25 max_occurrences = 1 dynamic_should_hijack = TRUE + category = EVENT_CATEGORY_ENTITIES + description = "A xenomorph larva spawns on a random vent." /datum/round_event/ghost_role/alien_infestation - announceWhen = 400 + announce_when = 400 minimum_required = 1 role_name = "alien larva" @@ -19,7 +21,7 @@ /datum/round_event/ghost_role/alien_infestation/setup() - announceWhen = rand(announceWhen, announceWhen + 50) + announce_when = rand(announce_when, announce_when + 50) if(prob(50)) spawncount++ diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm index ae0d5442ad..456a83958d 100644 --- a/code/modules/events/anomaly.dm +++ b/code/modules/events/anomaly.dm @@ -5,11 +5,13 @@ min_players = 1 max_occurrences = 0 //This one probably shouldn't occur! It'd work, but it wouldn't be very fun. weight = 15 + category = EVENT_CATEGORY_ANOMALIES + description = "This anomaly shocks and explodes. This is the base type." /datum/round_event/anomaly var/area/impact_area var/obj/effect/anomaly/anomaly_path = /obj/effect/anomaly/flux - announceWhen = 1 + announce_when = 1 /datum/round_event/anomaly/proc/findEventArea() diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm index fd64b20244..f058f37da4 100644 --- a/code/modules/events/anomaly_bluespace.dm +++ b/code/modules/events/anomaly_bluespace.dm @@ -4,10 +4,11 @@ max_occurrences = 1 weight = 5 + description = "This anomaly randomly teleports all items and mobs in a large area." /datum/round_event/anomaly/anomaly_bluespace - startWhen = 3 - announceWhen = 10 + start_when = 3 + announce_when = 10 anomaly_path = /obj/effect/anomaly/bluespace /datum/round_event/anomaly/anomaly_bluespace/announce(fake) diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm index 6368e70b94..d3b1e8ea7e 100644 --- a/code/modules/events/anomaly_flux.dm +++ b/code/modules/events/anomaly_flux.dm @@ -4,10 +4,11 @@ max_occurrences = 5 weight = 20 + description = "This anomaly shocks and explodes." /datum/round_event/anomaly/anomaly_flux - startWhen = 10 - announceWhen = 3 + start_when = 10 + announce_when = 3 anomaly_path = /obj/effect/anomaly/flux /datum/round_event/anomaly/anomaly_flux/announce(fake) diff --git a/code/modules/events/anomaly_grav.dm b/code/modules/events/anomaly_grav.dm index c1b4ade5c0..232d2ddd35 100644 --- a/code/modules/events/anomaly_grav.dm +++ b/code/modules/events/anomaly_grav.dm @@ -4,11 +4,11 @@ max_occurrences = 5 weight = 20 - + description = "This anomaly throws things around." /datum/round_event/anomaly/anomaly_grav - startWhen = 3 - announceWhen = 20 + start_when = 3 + announce_when = 20 anomaly_path = /obj/effect/anomaly/grav /datum/round_event/anomaly/anomaly_grav/announce(fake) diff --git a/code/modules/events/anomaly_pyro.dm b/code/modules/events/anomaly_pyro.dm index 83c1fa64cc..dee0330743 100644 --- a/code/modules/events/anomaly_pyro.dm +++ b/code/modules/events/anomaly_pyro.dm @@ -5,10 +5,11 @@ min_players = 5 max_occurrences = 5 weight = 20 + description = "This anomaly sets things on fire, and creates a pyroclastic slime." /datum/round_event/anomaly/anomaly_pyro - startWhen = 3 - announceWhen = 10 + start_when = 3 + announce_when = 10 anomaly_path = /obj/effect/anomaly/pyro /datum/round_event/anomaly/anomaly_pyro/announce(fake) diff --git a/code/modules/events/anomaly_vortex.dm b/code/modules/events/anomaly_vortex.dm index 7228030616..43dcc0baf4 100644 --- a/code/modules/events/anomaly_vortex.dm +++ b/code/modules/events/anomaly_vortex.dm @@ -5,10 +5,11 @@ min_players = 20 max_occurrences = 2 weight = 5 + description = "This anomaly sucks in and detonates items." /datum/round_event/anomaly/anomaly_vortex - startWhen = 10 - announceWhen = 3 + start_when = 10 + announce_when = 3 anomaly_path = /obj/effect/anomaly/bhole /datum/round_event/anomaly/anomaly_vortex/announce(fake) diff --git a/code/modules/events/atmos_speed.dm b/code/modules/events/atmos_speed.dm index 17a02d3dd1..64e6e883cc 100644 --- a/code/modules/events/atmos_speed.dm +++ b/code/modules/events/atmos_speed.dm @@ -3,10 +3,12 @@ typepath = /datum/round_event/atmos_flux max_occurrences = 5 weight = 10 + category = EVENT_CATEGORY_ENGINEERING + description = "Modifies the speed of the SSair randomly, ends after one minute." /datum/round_event/atmos_flux - announceWhen = 1 - endWhen = 600 + announce_when = 1 + end_when = 600 var/original_speed /datum/round_event/atmos_flux/announce(fake) diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 89a84d3494..63d7122cb8 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -4,6 +4,8 @@ max_occurrences = 1 weight = 4 earliest_start = 5 MINUTES + category = EVENT_CATEGORY_FRIENDLY + description = "A colourful display can be seen through select windows. And the kitchen." /datum/round_event_control/aurora_caelus/canSpawnEvent(players, gamemode) if(!CONFIG_GET(flag/starlight)) @@ -11,9 +13,9 @@ return ..() /datum/round_event/aurora_caelus - announceWhen = 1 - startWhen = 9 - endWhen = 50 + announce_when = 1 + start_when = 9 + end_when = 50 var/list/aurora_colors = list("#A2FF80", "#A2FF8B", "#A2FF96", "#A2FFA5", "#A2FFB6", "#A2FFC7", "#A2FFDE", "#A2FFEE") var/aurora_progress = 0 //this cycles from 1 to 8, slowly changing colors from gentle green to gentle blue diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index e31711661d..d28c5d6512 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -7,9 +7,11 @@ earliest_start = 60 MINUTES min_players = 35 dynamic_should_hijack = TRUE + category = EVENT_CATEGORY_ENTITIES + description = "Spawns a new blob overmind." /datum/round_event/ghost_role/blob - announceWhen = -1 + announce_when = -1 role_name = "blob overmind" fakeable = TRUE diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 0529d102dc..85d69a1509 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -3,6 +3,8 @@ typepath = /datum/round_event/brain_trauma weight = 25 min_players = 5 + category = EVENT_CATEGORY_HEALTH + description = "A crewmember gains a random trauma." /datum/round_event_control/brain_trauma/canSpawnEvent(var/players_amt, var/gamemode) if(!..()) return FALSE diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 1b275af4fb..cab9daaa55 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -5,10 +5,12 @@ min_players = 15 max_occurrences = 1 + category = EVENT_CATEGORY_AI + description = "Vending machines will attack people until the Patient Zero is disabled." /datum/round_event/brand_intelligence - announceWhen = 21 - endWhen = 1000 //Ends when all vending machines are subverted anyway. + announce_when = 21 + end_when = 1000 //Ends when all vending machines are subverted anyway. var/list/obj/machinery/vending/vendingMachines = list() var/list/obj/machinery/vending/infectedMachines = list() var/obj/machinery/vending/originMachine diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm index 7246c9aedf..fc35df791b 100644 --- a/code/modules/events/bureaucratic_error.dm +++ b/code/modules/events/bureaucratic_error.dm @@ -3,9 +3,11 @@ typepath = /datum/round_event/bureaucratic_error max_occurrences = 1 weight = 5 + category = EVENT_CATEGORY_BUREAUCRATIC + description = "Randomly opens and closes job slots, along with changing the overflow role." /datum/round_event/bureaucratic_error - announceWhen = 1 + announce_when = 1 /datum/round_event/bureaucratic_error/announce(fake) priority_announce("A recent bureaucratic error in the Organic Resources Department may result in personnel shortages in some departments and redundant staffing in others.", "Paperwork Mishap Alert") diff --git a/code/modules/events/camerafailure.dm b/code/modules/events/camerafailure.dm index 8d7ef3204c..453b919c5b 100644 --- a/code/modules/events/camerafailure.dm +++ b/code/modules/events/camerafailure.dm @@ -4,6 +4,8 @@ weight = 100 max_occurrences = 20 alert_observers = FALSE + category = EVENT_CATEGORY_ENGINEERING + description = "Turns off a random amount of cameras." /datum/round_event/camera_failure fakeable = FALSE diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index f927a59ad6..bed6cf84ea 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -5,6 +5,8 @@ min_players = 2 earliest_start = 10 MINUTES max_occurrences = 6 + category = EVENT_CATEGORY_ENTITIES + description = "Summons a school of space carp." /datum/round_event_control/carp_migration/New() . = ..() @@ -14,12 +16,12 @@ earliest_start *= 0.5 /datum/round_event/carp_migration - announceWhen = 3 - startWhen = 50 + announce_when = 3 + start_when = 50 var/hasAnnounced = FALSE /datum/round_event/carp_migration/setup() - startWhen = rand(40, 60) + start_when = rand(40, 60) /datum/round_event/carp_migration/announce(fake) if(prob(50)) diff --git a/code/modules/events/cat_surgeon.dm b/code/modules/events/cat_surgeon.dm index 025d2d2325..254fdaecca 100644 --- a/code/modules/events/cat_surgeon.dm +++ b/code/modules/events/cat_surgeon.dm @@ -1,45 +1,47 @@ /datum/round_event_control/cat_surgeon - name = "Cat Surgeon" - typepath = /datum/round_event/cat_surgeon - max_occurrences = 1 - weight = 5 + name = "Cat Surgeon" + typepath = /datum/round_event/cat_surgeon + max_occurrences = 1 + weight = 5 + category = EVENT_CATEGORY_ENTITIES + description = "Spawns a crazy surgeon ready to perverse things with the crew." /datum/round_event/cat_surgeon/announce(fake) priority_announce("One of our... ahem... 'special' cases has escaped. As it happens their last known location before their tracker went dead is your station so keep an eye out for them. On an unrelated note, has anyone seen our cats?", sender_override = "Nanotrasen Psych Ward", has_important_message = TRUE) /datum/round_event/cat_surgeon/start() - var/list/spawn_locs = list() - var/list/unsafe_spawn_locs = list() - for(var/X in GLOB.xeno_spawn) - if(!isfloorturf(X)) - unsafe_spawn_locs += X - continue - var/turf/open/floor/F = X - var/datum/gas_mixture/A = F.air - var/oxy_moles = A.get_moles(GAS_O2) - if((oxy_moles < 16 || oxy_moles > 50) || A.get_moles(GAS_PLASMA) || A.get_moles(GAS_CO2) >= 10) - unsafe_spawn_locs += F - continue - if((A.return_temperature() <= 270) || (A.return_temperature() >= 360)) - unsafe_spawn_locs += F - continue - var/pressure = A.return_pressure() - if((pressure <= 20) || (pressure >= 550)) - unsafe_spawn_locs += F - continue - spawn_locs += F + var/list/spawn_locs = list() + var/list/unsafe_spawn_locs = list() + for(var/X in GLOB.xeno_spawn) + if(!isfloorturf(X)) + unsafe_spawn_locs += X + continue + var/turf/open/floor/F = X + var/datum/gas_mixture/A = F.air + var/oxy_moles = A.get_moles(GAS_O2) + if((oxy_moles < 16 || oxy_moles > 50) || A.get_moles(GAS_PLASMA) || A.get_moles(GAS_CO2) >= 10) + unsafe_spawn_locs += F + continue + if((A.return_temperature() <= 270) || (A.return_temperature() >= 360)) + unsafe_spawn_locs += F + continue + var/pressure = A.return_pressure() + if((pressure <= 20) || (pressure >= 550)) + unsafe_spawn_locs += F + continue + spawn_locs += F - if(!spawn_locs.len) - spawn_locs += unsafe_spawn_locs + if(!spawn_locs.len) + spawn_locs += unsafe_spawn_locs - if(!spawn_locs.len) - message_admins("No valid spawn locations found, aborting...") - return MAP_ERROR + if(!spawn_locs.len) + message_admins("No valid spawn locations found, aborting...") + return MAP_ERROR - var/turf/T = get_turf(pick(spawn_locs)) - var/mob/living/simple_animal/hostile/cat_butcherer/S = new(T) - playsound(S, 'sound/misc/catscream.ogg', 75, 1, -1) - message_admins("A cat surgeon has been spawned at [COORD(T)][ADMIN_JMP(T)]") - log_game("A cat surgeon has been spawned at [COORD(T)]") - return SUCCESSFUL_SPAWN + var/turf/T = get_turf(pick(spawn_locs)) + var/mob/living/simple_animal/hostile/cat_butcherer/S = new(T) + playsound(S, 'sound/misc/catscream.ogg', 75, 1, -1) + message_admins("A cat surgeon has been spawned at [COORD(T)][ADMIN_JMP(T)]") + log_game("A cat surgeon has been spawned at [COORD(T)]") + return SUCCESSFUL_SPAWN diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 0342ca4643..b47dad0c93 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -2,9 +2,11 @@ name = "Communications Blackout" typepath = /datum/round_event/communications_blackout weight = 30 + category = EVENT_CATEGORY_ENGINEERING + description = "Heavily emps all telecommunication machines, blocking all communication for a while." /datum/round_event/communications_blackout - announceWhen = 1 + announce_when = 1 /datum/round_event/communications_blackout/announce(fake) var/alert = pick( "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you*%fj00)`5vc-BZZT", \ diff --git a/code/modules/events/devil.dm b/code/modules/events/devil.dm index 7d6e0bd441..3d6382b2a4 100644 --- a/code/modules/events/devil.dm +++ b/code/modules/events/devil.dm @@ -2,6 +2,8 @@ name = "Create Devil" typepath = /datum/round_event/ghost_role/devil max_occurrences = 0 + category = EVENT_CATEGORY_ENTITIES + description = "Spawns a devil, looking forward to makings deals with crewmembers to get their souls." /datum/round_event/ghost_role/devil var/success_spawn = 0 diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 517cf33b82..753349fdd6 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -4,9 +4,11 @@ max_occurrences = 1 min_players = 3 weight = 5 + category = EVENT_CATEGORY_HEALTH + description = "A classic or advanced disease will infect some crewmembers." /datum/round_event/disease_outbreak - announceWhen = 15 + announce_when = 15 var/virus_type @@ -24,7 +26,7 @@ priority_announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", "outbreak7") /datum/round_event/disease_outbreak/setup() - announceWhen = rand(15, 30) + announce_when = rand(15, 30) /datum/round_event/disease_outbreak/start() diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 941478d52a..6b0139c449 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -5,10 +5,12 @@ max_occurrences = 1000 earliest_start = 0 MINUTES alert_observers = FALSE + category = EVENT_CATEGORY_SPACE + description = "A single space dust is hurled at the station." /datum/round_event/space_dust - startWhen = 1 - endWhen = 2 + start_when = 1 + end_when = 2 fakeable = FALSE /datum/round_event/space_dust/start() @@ -21,11 +23,13 @@ max_occurrences = 1 min_players = 10 earliest_start = 20 MINUTES + category = EVENT_CATEGORY_SPACE + description = "The station is pelted by an extreme amount of sand for several minutes." /datum/round_event/sandstorm - startWhen = 1 - endWhen = 150 // ~5 min - announceWhen = 0 + start_when = 1 + end_when = 150 // ~5 min + announce_when = 0 fakeable = FALSE /datum/round_event/sandstorm/announce(fake) diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index b850b4db62..f04389b1a1 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -4,12 +4,13 @@ earliest_start = 10 MINUTES min_players = 5 weight = 40 - alert_observers = FALSE + category = EVENT_CATEGORY_ENGINEERING + description = "Destroys all lights in a large area." /datum/round_event/electrical_storm var/lightsoutAmount = 1 var/lightsoutRange = 25 - announceWhen = 1 + announce_when = 1 /datum/round_event/electrical_storm/announce(fake) if(prob(50)) diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index cebf1ed14b..ec69f9e2c9 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -2,6 +2,8 @@ name = "Fake Virus" typepath = /datum/round_event/fake_virus weight = 20 + category = EVENT_CATEGORY_HEALTH + description = "Some crewmembers suffer from temporary hypochondria." /datum/round_event/fake_virus/start() var/list/fake_virus_victims = list() diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index 5ac75cf087..95b7d1c3ce 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -4,7 +4,8 @@ weight = 20 max_occurrences = 5 var/forced_type //Admin abuse - + category = EVENT_CATEGORY_BUREAUCRATIC + description = "Fakes an event announcement." /datum/round_event_control/falsealarm/admin_setup() if(!check_rights(R_FUN)) @@ -17,15 +18,15 @@ if(!initial(event.fakeable)) continue possible_types += E - + forced_type = input(usr, "Select the scare.","False event") as null|anything in possible_types /datum/round_event_control/falsealarm/canSpawnEvent(players_amt, gamemode) return ..() && length(gather_false_events()) /datum/round_event/falsealarm - announceWhen = 0 - endWhen = 1 + announce_when = 0 + end_when = 1 fakeable = FALSE /datum/round_event/falsealarm/announce(fake) diff --git a/code/modules/events/floorcluwne.dm b/code/modules/events/floorcluwne.dm index ce9a2d8cc3..6b91fb2ca2 100644 --- a/code/modules/events/floorcluwne.dm +++ b/code/modules/events/floorcluwne.dm @@ -4,7 +4,8 @@ max_occurrences = 0 min_players = 20 weight = 10 - + category = EVENT_CATEGORY_ENTITIES + description = "Spawns a floor cluwne, will hunt a random player and most likely gib them, prepare for adminhelps." /datum/round_event/floor_cluwne/start() var/list/spawn_locs = list() diff --git a/code/modules/events/fugitive_spawning.dm b/code/modules/events/fugitive_spawning.dm index a09f0f584e..13964d6ec6 100644 --- a/code/modules/events/fugitive_spawning.dm +++ b/code/modules/events/fugitive_spawning.dm @@ -4,6 +4,8 @@ max_occurrences = 1 min_players = 20 earliest_start = 30 MINUTES //deadchat sink, lets not even consider it early on. + category = EVENT_CATEGORY_INVASION + description = "Fugitives will hide on the station, followed by hunters." /datum/round_event/ghost_role/fugitives minimum_required = 1 diff --git a/code/modules/events/ghost_role.dm b/code/modules/events/ghost_role.dm index ae1d1320a5..baabb435bc 100644 --- a/code/modules/events/ghost_role.dm +++ b/code/modules/events/ghost_role.dm @@ -7,6 +7,8 @@ var/minimum_required = 1 var/role_name = "debug rat with cancer" // Q U A L I T Y M E M E S var/list/spawned_mobs = list() + var/status + var/cached_announcement_chance fakeable = FALSE /datum/round_event/ghost_role/start() @@ -17,7 +19,10 @@ // to prevent us from getting gc'd halfway through processing = FALSE - var/status = spawn_role() + status = spawn_role() + if(isnull(cached_announcement_chance)) + cached_announcement_chance = announce_chance //only announce once we've finished the spawning loop. + announce_chance = (status == SUCCESSFUL_SPAWN ? cached_announcement_chance : 0) if((status == WAITING_FOR_SOMETHING)) if(retry >= MAX_SPAWN_ATTEMPT) message_admins("[role_name] event has exceeded maximum spawn attempts. Aborting and refunding.") diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index 1bb0ee617a..c39a6e1bb2 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -3,10 +3,12 @@ typepath = /datum/round_event/grid_check weight = 10 max_occurrences = 3 + category = EVENT_CATEGORY_ENGINEERING + description = "Turns off all APCs for a while, or until they are manually rebooted." /datum/round_event/grid_check - announceWhen = 1 - startWhen = 1 + announce_when = 1 + start_when = 1 /datum/round_event/grid_check/announce(fake) priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", "poweroff") diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 930a2b884f..4f94576fa6 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -4,6 +4,8 @@ weight = 10 max_occurrences = 2 min_players = 10 // To avoid shafting lowpop + category = EVENT_CATEGORY_HEALTH + description = "A random crewmember's heart gives out." /datum/round_event_control/heart_attack/canSpawnEvent(var/players_amt, var/gamemode) if(!..()) return FALSE diff --git a/code/modules/events/high_priority_bounty.dm b/code/modules/events/high_priority_bounty.dm index ffdcd8840b..90f27b19f9 100644 --- a/code/modules/events/high_priority_bounty.dm +++ b/code/modules/events/high_priority_bounty.dm @@ -4,6 +4,8 @@ max_occurrences = 3 weight = 20 earliest_start = 10 + category = EVENT_CATEGORY_BUREAUCRATIC + description = "Creates bounties that are three times original worth." /datum/round_event/high_priority_bounty/announce(fake) priority_announce("Central Command has issued a high-priority cargo bounty. Details have been sent to all bounty consoles.", "Nanotrasen Bounty Program") diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 9824355e4b..fd45eb4ccf 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -5,6 +5,8 @@ weight = -1 //forces it to be called, regardless of weight max_occurrences = 1 earliest_start = 0 MINUTES + category = EVENT_CATEGORY_HOLIDAY + description = "Gives everyone treats, and turns Ian and Polly into their festive versions." /datum/round_event/spooky/start() ..() diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 16ae047729..ebe44d3e00 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -11,6 +11,8 @@ weight = -1 //forces it to be called, regardless of weight max_occurrences = 1 earliest_start = 0 MINUTES + category = EVENT_CATEGORY_HOLIDAY + description = "Puts people on dates! They must protect each other. Sometimes a vengeful third wheel spawns." /datum/round_event/valentines/start() ..() diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index e043caa29d..a9bedb3c57 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -68,6 +68,8 @@ weight = 20 max_occurrences = 1 earliest_start = 30 MINUTES + category = EVENT_CATEGORY_HOLIDAY + description = "Spawns santa, who shall roam the station, handing out gifts." /datum/round_event/santa var/mob/living/carbon/human/santa //who is our santa? diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 482abe67f2..a48191e8a1 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -13,7 +13,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 min_players = 15 max_occurrences = 5 var/atom/special_target - + category = EVENT_CATEGORY_SPACE + description = "The station passes through an immovable rod." /datum/round_event_control/immovable_rod/admin_setup() if(!check_rights(R_FUN)) @@ -24,7 +25,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 special_target = get_turf(usr) /datum/round_event/immovable_rod - announceWhen = 5 + announce_when = 5 /datum/round_event/immovable_rod/announce(fake) priority_announce("What the fuck was that?!", "General Alert", has_important_message = TRUE) diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index f25b476657..0fefb43170 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -5,6 +5,8 @@ typepath = /datum/round_event/ion_storm weight = 15 min_players = 2 + category = EVENT_CATEGORY_AI + description = "Gives the AI a new, randomized law." /datum/round_event/ion_storm var/replaceLawsetChance = 25 //chance the AI's lawset is completely replaced with something else per config weights @@ -14,8 +16,8 @@ var/botEmagChance = 10 var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means it is announced var/ionMessage = null - var/ionAnnounceChance = 33 - announceWhen = 1 + announce_when = 1 + announce_chance = 33 /datum/round_event/ion_storm/add_law_only // special subtype that adds a law only replaceLawsetChance = 0 @@ -25,7 +27,7 @@ botEmagChance = 0 /datum/round_event/ion_storm/announce(fake) - if(announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(ionAnnounceChance)) || fake) + if(announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(announce_chance)) || fake) priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", "ionstorm", has_important_message = prob(80)) diff --git a/code/modules/events/major_dust.dm b/code/modules/events/major_dust.dm index 3f7cbc77f5..dc24a52b19 100644 --- a/code/modules/events/major_dust.dm +++ b/code/modules/events/major_dust.dm @@ -2,6 +2,7 @@ name = "Major Space Dust" typepath = /datum/round_event/meteor_wave/major_dust weight = 8 + description = "The station is pelted by sand." /datum/round_event/meteor_wave/major_dust wave_name = "space dust" diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm index d8e52cf46d..2a0c45a5ff 100644 --- a/code/modules/events/mass_hallucination.dm +++ b/code/modules/events/mass_hallucination.dm @@ -5,6 +5,8 @@ max_occurrences = 5 min_players = 1 var/forced_hallucination + category = EVENT_CATEGORY_HEALTH + description = "Multiple crewmembers start to hallucinate the same thing." /datum/round_event_control/mass_hallucination/admin_setup() if(!check_rights(R_FUN)) diff --git a/code/modules/events/meateor_wave.dm b/code/modules/events/meateor_wave.dm index c4711055d9..a625f53788 100644 --- a/code/modules/events/meateor_wave.dm +++ b/code/modules/events/meateor_wave.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/meteor_wave/meaty weight = 2 max_occurrences = 1 + description = "A meteor wave made of meat." /datum/round_event/meteor_wave/meaty wave_name = "meaty" diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index a3e0eb70ff..a3534be3ea 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -10,22 +10,24 @@ min_players = 15 max_occurrences = 3 earliest_start = 25 MINUTES + category = EVENT_CATEGORY_SPACE + description = "A regular meteor wave." /datum/round_event/meteor_wave - startWhen = 6 - endWhen = 66 - announceWhen = 1 + start_when = 6 + end_when = 66 + announce_when = 1 threat = 15 var/list/wave_type var/wave_name = "normal" var/direction /datum/round_event/meteor_wave/setup() - announceWhen = 1 - startWhen = 150 // 5 minutes + announce_when = 1 + start_when = 150 // 5 minutes if(GLOB.singularity_counter) - startWhen *= 1 - min(GLOB.singularity_counter * SINGULO_BEACON_DISTURBANCE, SINGULO_BEACON_MAX_DISTURBANCE) - endWhen = startWhen + 60 + start_when *= 1 - min(GLOB.singularity_counter * SINGULO_BEACON_DISTURBANCE, SINGULO_BEACON_MAX_DISTURBANCE) + end_when = start_when + 60 /datum/round_event/meteor_wave/New() ..() @@ -61,9 +63,9 @@ kill() /datum/round_event/meteor_wave/announce(fake) - priority_announce(generateMeteorString(startWhen,TRUE,direction), "Meteor Alert", "meteors", has_important_message = TRUE) + priority_announce(generateMeteorString(start_when,TRUE,direction), "Meteor Alert", "meteors", has_important_message = TRUE) -/proc/generateMeteorString(startWhen,syndiealert,direction) +/proc/generateMeteorString(start_when,syndiealert,direction) var/directionstring switch(direction) if(NORTH) @@ -74,7 +76,7 @@ directionstring = " towards starboard" if(WEST) directionstring = " towards port" - return "Meteors have been detected on a collision course with the station[directionstring]. Estimated time until impact: [round((startWhen * SSevents.wait) / 10, 0.1)] seconds.[GLOB.singularity_counter && syndiealert ? " Warning: Anomalous gravity pulse detected, Syndicate technology interference likely." : ""]" + return "Meteors have been detected on a collision course with the station[directionstring]. Estimated time until impact: [round((start_when * SSevents.wait) / 10, 0.1)] seconds.[GLOB.singularity_counter && syndiealert ? " Warning: Anomalous gravity pulse detected, Syndicate technology interference likely." : ""]" /datum/round_event/meteor_wave/tick() if(ISMULTIPLE(activeFor, 3)) @@ -87,7 +89,7 @@ min_players = 20 max_occurrences = 3 earliest_start = 35 MINUTES - + description = "A meteor wave with higher chance of big meteors." /datum/round_event/meteor_wave/threatening wave_name = "threatening" @@ -100,6 +102,7 @@ min_players = 25 max_occurrences = 3 earliest_start = 45 MINUTES + description = "A meteor wave that might summon a tunguska class meteor." /datum/round_event/meteor_wave/catastrophic wave_name = "catastrophic" diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm index 373c495972..5bf842ba47 100644 --- a/code/modules/events/mice_migration.dm +++ b/code/modules/events/mice_migration.dm @@ -2,6 +2,8 @@ name = "Mice Migration" typepath = /datum/round_event/mice_migration weight = 10 + category = EVENT_CATEGORY_ENTITIES + description = "A horde of mice arrives, and perhaps even the Rat King themselves." /datum/round_event/mice_migration var/minimum_mice = 5 diff --git a/code/modules/events/nightmare.dm b/code/modules/events/nightmare.dm index 62f9c88d49..71351d85be 100644 --- a/code/modules/events/nightmare.dm +++ b/code/modules/events/nightmare.dm @@ -4,6 +4,8 @@ max_occurrences = 1 min_players = 20 dynamic_should_hijack = TRUE + category = EVENT_CATEGORY_ENTITIES + description = "Spawns a nightmare, aiming to darken the station." /datum/round_event/ghost_role/nightmare minimum_required = 1 diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 8d8adf2735..cbefa58c7b 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -2,7 +2,9 @@ name = "Lone Operative" typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only - max_occurrences = 0 //Now it is actually admin only + max_occurrences = 1 + category = EVENT_CATEGORY_INVASION + description = "A single nuclear operative assaults the station." /datum/round_event/ghost_role/operative minimum_required = 1 diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 188d733cd8..1b1fdee584 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -6,6 +6,8 @@ min_players = 10 earliest_start = 30 MINUTES dynamic_should_hijack = TRUE + category = EVENT_CATEGORY_INVASION + description = "The crew will either pay up, or face a pirate assault." #define PIRATES_ROGUES "Rogues" // #define PIRATES_SILVERSCALES "Silverscales" diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 59bb22e9af..b1b68fb585 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -4,6 +4,8 @@ weight = 2 min_players = 15 earliest_start = 30 MINUTES + category = EVENT_CATEGORY_ENTITIES + description = "Syndicate troops pour out of portals." /datum/round_event/portal_storm/syndicate_shocktroop boss_types = list(/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper = 2) @@ -15,6 +17,8 @@ typepath = /datum/round_event/portal_storm/portal_storm_narsie weight = 0 max_occurrences = 0 + category = EVENT_CATEGORY_ENTITIES + description = "Nar'sie constructs pour out of portals." /datum/round_event/portal_storm/portal_storm_narsie boss_types = list(/mob/living/simple_animal/hostile/construct/builder = 6) @@ -22,9 +26,9 @@ /mob/living/simple_animal/hostile/construct/wraith/hostile = 6) /datum/round_event/portal_storm - startWhen = 7 - endWhen = 999 - announceWhen = 1 + start_when = 7 + end_when = 999 + announce_when = 1 var/list/boss_spawn = list() var/list/boss_types = list() //only configure this if you have hostiles @@ -53,7 +57,7 @@ while(number_of_hostiles > hostiles_spawn.len) hostiles_spawn += get_random_station_turf() - next_boss_spawn = startWhen + CEILING(2 * number_of_hostiles / number_of_bosses, 1) + next_boss_spawn = start_when + CEILING(2 * number_of_hostiles / number_of_bosses, 1) /datum/round_event/portal_storm/announce(fake) do_announce() @@ -117,7 +121,7 @@ /datum/round_event/portal_storm/proc/time_to_end() if(!hostile_types.len && !boss_types.len) - endWhen = activeFor + end_when = activeFor if(!number_of_hostiles && number_of_bosses) - endWhen = activeFor + end_when = activeFor diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index d35f4931fb..110ab745a0 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -3,10 +3,12 @@ typepath = /datum/round_event/grey_tide max_occurrences = 2 min_players = 5 + category = EVENT_CATEGORY_ENGINEERING + description = "Bolts open all doors in one or more departments." /datum/round_event/grey_tide - announceWhen = 50 - endWhen = 20 + announce_when = 50 + end_when = 20 var/list/area/areasToOpen = list() var/list/potential_areas = list(/area/command, /area/engineering, @@ -17,8 +19,8 @@ var/severity = 1 /datum/round_event/grey_tide/setup() - announceWhen = rand(50, 60) - endWhen = rand(20, 30) + announce_when = rand(50, 60) + end_when = rand(20, 30) severity = rand(1,3) for(var/i in 1 to severity) var/picked_area = pick_n_take(potential_areas) diff --git a/code/modules/events/processor_overload.dm b/code/modules/events/processor_overload.dm index 6f20d954ed..578520f565 100644 --- a/code/modules/events/processor_overload.dm +++ b/code/modules/events/processor_overload.dm @@ -3,9 +3,11 @@ typepath = /datum/round_event/processor_overload weight = 15 min_players = 20 + category = EVENT_CATEGORY_ENGINEERING + description = "Emps the telecomm processors, scrambling radio speech. Might blow up a few." /datum/round_event/processor_overload - announceWhen = 1 + announce_when = 1 /datum/round_event/processor_overload/announce(fake) var/alert = pick( "Exospheric bubble inbound. Processor overload is likely. Please contact you*%xp25)`6cq-BZZT", \ diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 52a207fd14..5ba3d017e1 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -2,14 +2,16 @@ name = "Radiation Storm" typepath = /datum/round_event/radiation_storm max_occurrences = 1 + category = EVENT_CATEGORY_SPACE + description = "Radiation storm affects the station, forcing the crew to escape to maintenance." /datum/round_event/radiation_storm /datum/round_event/radiation_storm/setup() - startWhen = 3 - endWhen = startWhen + 1 - announceWhen = 1 + start_when = 3 + end_when = start_when + 1 + announce_when = 1 /datum/round_event/radiation_storm/announce(fake) priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", "radiation", has_important_message = TRUE) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index d90792c88f..8cccaba68b 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -2,7 +2,8 @@ name = "Random Human-level Intelligence" typepath = /datum/round_event/ghost_role/sentience weight = 10 - + category = EVENT_CATEGORY_FRIENDLY + description = "An animal or robot becomes sentient!" /datum/round_event/ghost_role/sentience minimum_required = 1 @@ -75,6 +76,8 @@ name = "Station-wide Human-level Intelligence" typepath = /datum/round_event/ghost_role/sentience/all weight = 0 + category = EVENT_CATEGORY_FRIENDLY + description = "ALL animals and robots become sentient, provided there is enough ghosts." /datum/round_event/ghost_role/sentience/all one = "all" diff --git a/code/modules/events/shuttle_catastrophe b/code/modules/events/shuttle_catastrophe.dm similarity index 91% rename from code/modules/events/shuttle_catastrophe rename to code/modules/events/shuttle_catastrophe.dm index d948b39d3b..18b9dc61ca 100644 --- a/code/modules/events/shuttle_catastrophe +++ b/code/modules/events/shuttle_catastrophe.dm @@ -3,10 +3,14 @@ typepath = /datum/round_event/shuttle_catastrophe weight = 10 max_occurrences = 1 + category = EVENT_CATEGORY_BUREAUCRATIC + description = "Replaces the emergency shuttle with a random one." /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/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 38d52797d7..49a0f94000 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -13,10 +13,12 @@ typepath = /datum/round_event/shuttle_loan max_occurrences = 1 earliest_start = 7 MINUTES + category = EVENT_CATEGORY_BUREAUCRATIC + description = "If cargo accepts the offer, fills the shuttle with loot and/or enemies." /datum/round_event/shuttle_loan - announceWhen = 1 - endWhen = 500 + announce_when = 1 + end_when = 500 var/dispatched = 0 var/dispatch_type = 0 var/bonus_points = 10000 @@ -72,7 +74,7 @@ var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) if(D) D.adjust_money(bonus_points) - endWhen = activeFor + 1 + end_when = activeFor + 1 SSshuttle.supply.mode = SHUTTLE_CALL SSshuttle.supply.destination = SSshuttle.getDock("supply_home") @@ -101,9 +103,9 @@ /datum/round_event/shuttle_loan/tick() if(dispatched) if(SSshuttle.supply.mode != SHUTTLE_IDLE) - endWhen = activeFor + end_when = activeFor else - endWhen = activeFor + 1 + end_when = activeFor + 1 /datum/round_event/shuttle_loan/end() if(SSshuttle.shuttle_loan && SSshuttle.shuttle_loan.dispatched) diff --git a/code/modules/events/space_dragon.dm b/code/modules/events/space_dragon.dm index e06666b6bb..d06327ec0f 100644 --- a/code/modules/events/space_dragon.dm +++ b/code/modules/events/space_dragon.dm @@ -6,11 +6,13 @@ earliest_start = 30 MINUTES min_players = 20 dynamic_should_hijack = TRUE + category = EVENT_CATEGORY_ENTITIES + description = "Spawns a space dragon, which will try to take over the station." /datum/round_event/ghost_role/space_dragon minimum_required = 1 role_name = "Space Dragon" - announceWhen = 10 + announce_when = 10 /datum/round_event/ghost_role/space_dragon/announce(fake) priority_announce("A large organic energy flux has been recorded near of [station_name()], please stand-by.", "Lifesign Alert", has_important_message = TRUE) diff --git a/code/modules/events/space_ninja.dm b/code/modules/events/space_ninja.dm index 4a9dc4d2eb..aaf3f1a302 100644 --- a/code/modules/events/space_ninja.dm +++ b/code/modules/events/space_ninja.dm @@ -6,6 +6,8 @@ earliest_start = 30 MINUTES min_players = 15 dynamic_should_hijack = TRUE + category = EVENT_CATEGORY_INVASION + description = "A space ninja infiltrates the station." /datum/round_event/ghost_role/space_ninja minimum_required = 1 diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index a96e74f1e4..1bbcb0dd92 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -4,6 +4,8 @@ weight = 15 max_occurrences = 3 min_players = 20 + category = EVENT_CATEGORY_ENTITIES + description = "Kudzu begins to overtake the station. Might spawn man-traps." /datum/round_event/spacevine fakeable = FALSE diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 23ce6ce730..6e8c29d3a9 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -4,15 +4,17 @@ weight = 5 max_occurrences = 1 min_players = 15 + category = EVENT_CATEGORY_ENTITIES + description = "Spawns spider eggs, ready to hatch." /datum/round_event/spider_infestation - announceWhen = 400 + announce_when = 400 var/spawncount = 1 /datum/round_event/spider_infestation/setup() - announceWhen = rand(announceWhen, announceWhen + 50) + announce_when = rand(announce_when, announce_when + 50) spawncount = rand(5, 8) /datum/round_event/spider_infestation/announce(fake) diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index 7705ece78a..31b14bb8b9 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -5,6 +5,8 @@ max_occurrences = 4 earliest_start = 10 MINUTES min_players = 5 // To make your chance of getting help a bit higher. + category = EVENT_CATEGORY_HEALTH + description = "A random crewmember gets appendicitis." /datum/round_event/spontaneous_appendicitis fakeable = FALSE diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm index 2464432d72..f7240f9e8b 100644 --- a/code/modules/events/stray_cargo.dm +++ b/code/modules/events/stray_cargo.dm @@ -5,6 +5,8 @@ weight = 5 max_occurrences = 4 earliest_start = 10 MINUTES + category = EVENT_CATEGORY_BUREAUCRATIC + description = "A pod containing a random supply crate lands on the station." ///Spawns a cargo pod containing a random cargo supply pack on a random area of the station /datum/round_event/stray_cargo @@ -20,7 +22,7 @@ * Also randomizes the start timer */ /datum/round_event/stray_cargo/setup() - startWhen = rand(20, 40) + start_when = rand(20, 40) impact_area = find_event_area() if(!impact_area) CRASH("No valid areas for cargo pod found.") @@ -89,6 +91,7 @@ weight = 0 max_occurrences = 0 earliest_start = 30 MINUTES + description = "A pod containing syndicate gear lands on the station." /datum/round_event/stray_cargo/syndicate possible_pack_types = list(/datum/supply_pack/misc/syndicate) diff --git a/code/modules/events/supermatter_surge.dm b/code/modules/events/supermatter_surge.dm index d873e6ca8f..08deaae7d5 100644 --- a/code/modules/events/supermatter_surge.dm +++ b/code/modules/events/supermatter_surge.dm @@ -4,6 +4,8 @@ weight = 20 max_occurrences = 5 earliest_start = 10 MINUTES + category = EVENT_CATEGORY_ENGINEERING + description = "Randomly modifies the supermatter's power, giving the engineers a lot of headaches." /datum/round_event_control/supermatter_surge/canSpawnEvent() if(GLOB.main_supermatter_engine?.has_been_powered) diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm index 7862e85709..16c81e4056 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -4,18 +4,20 @@ weight = 5 max_occurrences = 1 min_players = 2 + category = EVENT_CATEGORY_SPACE + description = "Several modified radstorms hit the station." /datum/round_event/supernova - announceWhen = 40 - startWhen = 1 - endWhen = 300 + announce_when = 40 + start_when = 1 + end_when = 300 var/power = 1 var/datum/sun/supernova var/storm_count = 0 var/announced = FALSE /datum/round_event/supernova/setup() - announceWhen = rand(4, 60) + announce_when = rand(4, 60) supernova = new SSsun.suns += supernova switch(rand(1,5)) @@ -53,10 +55,10 @@ sucker_light.give_home_power() /datum/round_event/supernova/tick() - var/midpoint = round((endWhen-startWhen)/2) + var/midpoint = round((end_when-start_when)/2) if(activeFor < midpoint) supernova.power_mod = min(supernova.power_mod*1.2, power) - if(activeFor > endWhen-10) + if(activeFor > end_when-10) supernova.power_mod /= 4 if(prob(round(supernova.power_mod)) && prob(5-storm_count) && !SSweather.get_weather_by_type(/datum/weather/rad_storm)) SSweather.run_weather(/datum/weather/rad_storm/supernova) diff --git a/code/modules/events/travelling_trader.dm b/code/modules/events/travelling_trader.dm index be697c9b6d..ac9d103f5f 100644 --- a/code/modules/events/travelling_trader.dm +++ b/code/modules/events/travelling_trader.dm @@ -4,10 +4,12 @@ weight = 8 max_occurrences = 2 earliest_start = 0 MINUTES + category = EVENT_CATEGORY_FRIENDLY + description = "A mysterious figure requests something to the crew and rewards them with something for getting it done." /datum/round_event/travelling_trader - startWhen = 0 - endWhen = 900 //you effectively have 15 minutes to complete the traders request, before they disappear + start_when = 0 + end_when = 900 //you effectively have 15 minutes to complete the traders request, before they disappear var/mob/living/carbon/human/dummy/travelling_trader/trader var/atom/spawn_location //where the trader appears diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index 5a0da3ebc2..17dd2ca8b2 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -4,6 +4,8 @@ weight = 50 max_occurrences = 10 alert_observers = FALSE + category = EVENT_CATEGORY_HEALTH + description = "Unties people's shoes, with a chance to knot them as well." /datum/round_event/untied_shoes fakeable = FALSE diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 2c03531bcc..fb88f81598 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -3,11 +3,13 @@ typepath = /datum/round_event/vent_clog weight = 10 max_occurrences = 3 + category = EVENT_CATEGORY_HEALTH + description = "All the scrubbers onstation spit random chemicals in smoke form." /datum/round_event/vent_clog - announceWhen = 1 - startWhen = 5 - endWhen = 35 + announce_when = 1 + start_when = 5 + end_when = 35 var/interval = 2 var/list/vents = list() var/randomProbability = 0 @@ -62,7 +64,7 @@ priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert", has_important_message = TRUE) /datum/round_event/vent_clog/setup() - endWhen = rand(120, 180) + end_when = rand(120, 180) for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines) var/turf/T = get_turf(temp_vent) var/area/A = T.loc @@ -108,6 +110,7 @@ min_players = 15 max_occurrences = 1 earliest_start = 35 MINUTES + description = "Extra dangerous chemicals come out of the scrubbers." /datum/round_event/vent_clog/threatening randomProbability = 10 @@ -120,6 +123,7 @@ min_players = 25 max_occurrences = 1 earliest_start = 45 MINUTES + description = "EXTREMELY dangerous chemicals come out of the scrubbers." /datum/round_event/vent_clog/catastrophic randomProbability = 30 @@ -129,6 +133,7 @@ name = "Clogged Vents: Beer" typepath = /datum/round_event/vent_clog/beer max_occurrences = 0 + description = "Spits out beer through the scrubber system." /datum/round_event/vent_clog/beer reagentsAmount = 100 @@ -137,6 +142,7 @@ name = "Anti-Plasma Flood" typepath = /datum/round_event/vent_clog/plasma_decon max_occurrences = 0 + description = "Freezing smoke comes out of the scrubbers." /datum/round_event/vent_clog/beer/announce() priority_announce("The scrubbers network is experiencing an unexpected surge of pressurized beer. Some ejection of contents may occur.", "Atmospherics alert") diff --git a/code/modules/events/wisdomcow.dm b/code/modules/events/wisdomcow.dm index 553dd8f309..3c03911d1d 100644 --- a/code/modules/events/wisdomcow.dm +++ b/code/modules/events/wisdomcow.dm @@ -3,6 +3,8 @@ typepath = /datum/round_event/wisdomcow max_occurrences = 1 weight = 10 + category = EVENT_CATEGORY_FRIENDLY + description = "A cow appears to tell you wise words." /datum/round_event/wisdomcow/announce(fake) priority_announce("A wise cow has been spotted in the area. Be sure to ask for her advice.", "Nanotrasen Cow Ranching Agency") diff --git a/code/modules/events/wizard/aid.dm b/code/modules/events/wizard/aid.dm index 5f49b48900..2380027284 100644 --- a/code/modules/events/wizard/aid.dm +++ b/code/modules/events/wizard/aid.dm @@ -6,6 +6,7 @@ typepath = /datum/round_event/wizard/robelesscasting max_occurrences = 1 earliest_start = 0 MINUTES + description = "Wizard no longer needs robes to cast spells." /datum/round_event/wizard/robelesscasting/start() @@ -28,6 +29,7 @@ typepath = /datum/round_event/wizard/improvedcasting max_occurrences = 4 //because that'd be max level spells earliest_start = 0 MINUTES + description = "Levels up the wizard's spells." /datum/round_event/wizard/improvedcasting/start() for(var/i in GLOB.mob_living_list) diff --git a/code/modules/events/wizard/blobies.dm b/code/modules/events/wizard/blobies.dm index 7438b462f6..6933847f80 100644 --- a/code/modules/events/wizard/blobies.dm +++ b/code/modules/events/wizard/blobies.dm @@ -3,6 +3,7 @@ weight = 3 typepath = /datum/round_event/wizard/blobies max_occurrences = 3 + description = "Spawns a blob spore on every corpse." /datum/round_event/wizard/blobies/start() diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm index 061de0ea7c..639673ac15 100644 --- a/code/modules/events/wizard/curseditems.dm +++ b/code/modules/events/wizard/curseditems.dm @@ -5,6 +5,7 @@ max_occurrences = 3 earliest_start = 0 MINUTES can_be_midround_wizard = FALSE + description = "Gives everyone a cursed item." //Note about adding items to this: Because of how NODROP_1 works if an item spawned to the hands can also be equiped to a slot //it will be able to be put into that slot from the hand, but then get stuck there. To avoid this make a new subtype of any diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index ce6b4802fa..f08a40751d 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -5,6 +5,7 @@ max_occurrences = 1 earliest_start = 0 MINUTES can_be_midround_wizard = FALSE // not removing it completely yet + description = "A department is turned into an independent state." /datum/round_event/wizard/deprevolt/start() diff --git a/code/modules/events/wizard/embeddies.dm b/code/modules/events/wizard/embeddies.dm index fe08b9c743..32c9affb6d 100644 --- a/code/modules/events/wizard/embeddies.dm +++ b/code/modules/events/wizard/embeddies.dm @@ -4,6 +4,7 @@ typepath = /datum/round_event/wizard/embedpocalypse max_occurrences = 1 earliest_start = 0 MINUTES + description = "Everything becomes pointy enough to embed in people when thrown." /datum/round_event/wizard/embedpocalypse/start() for(var/obj/item/I in world) @@ -26,6 +27,7 @@ typepath = /datum/round_event/wizard/embedpocalypse/sticky max_occurrences = 1 earliest_start = 0 MINUTES + description = "Everything becomes sticky enough to be glued to people when thrown." /datum/round_event_control/wizard/embedpocalypse/sticky/canSpawnEvent(players_amt, gamemode) if(GLOB.embedpocalypse) diff --git a/code/modules/events/wizard/fakeexplosion.dm b/code/modules/events/wizard/fakeexplosion.dm index 3ba20f4768..7a89fc14bd 100644 --- a/code/modules/events/wizard/fakeexplosion.dm +++ b/code/modules/events/wizard/fakeexplosion.dm @@ -4,6 +4,7 @@ typepath = /datum/round_event/wizard/fake_explosion max_occurrences = 1 earliest_start = 0 MINUTES + description = "The nuclear explosion cutscene begins to play to scare the crew." /datum/round_event/wizard/fake_explosion/start() sound_to_playing_players('sound/machines/alarm.ogg') diff --git a/code/modules/events/wizard/ghost.dm b/code/modules/events/wizard/ghost.dm index c288953efb..5a11616b8f 100644 --- a/code/modules/events/wizard/ghost.dm +++ b/code/modules/events/wizard/ghost.dm @@ -4,6 +4,7 @@ typepath = /datum/round_event/wizard/ghost max_occurrences = 1 earliest_start = 0 MINUTES + description = "Ghosts become visible." /datum/round_event/wizard/ghost/start() var/msg = "You suddenly feel extremely obvious..." @@ -18,6 +19,7 @@ typepath = /datum/round_event/wizard/possession max_occurrences = 5 earliest_start = 0 MINUTES + description = "Ghosts become visible and gain the power of possession." /datum/round_event/wizard/possession/start() for(var/mob/dead/observer/G in GLOB.player_list) diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index 82e72df3b9..1864ad6d20 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -4,6 +4,7 @@ typepath = /datum/round_event/wizard/greentext max_occurrences = 1 earliest_start = 0 MINUTES + description = "The Green Text appears on the station, tempting people to try and pick it up." /datum/round_event/wizard/greentext/start() diff --git a/code/modules/events/wizard/imposter.dm b/code/modules/events/wizard/imposter.dm index 29704168e9..2b7e9bcf17 100644 --- a/code/modules/events/wizard/imposter.dm +++ b/code/modules/events/wizard/imposter.dm @@ -4,6 +4,7 @@ typepath = /datum/round_event/wizard/imposter max_occurrences = 1 earliest_start = 0 MINUTES + description = "Spawns a doppelganger of the wizard." /datum/round_event/wizard/imposter/start() for(var/datum/mind/M in SSticker.mode.wizards) diff --git a/code/modules/events/wizard/invincible.dm b/code/modules/events/wizard/invincible.dm index b69d1541ee..0dea1fbaf7 100644 --- a/code/modules/events/wizard/invincible.dm +++ b/code/modules/events/wizard/invincible.dm @@ -4,6 +4,7 @@ typepath = /datum/round_event/wizard/invincible max_occurrences = 5 earliest_start = 0 MINUTES + description = "Everyone is invincible for a short time ticks." /datum/round_event/wizard/invincible/start() diff --git a/code/modules/events/wizard/lava.dm b/code/modules/events/wizard/lava.dm index 9a882b45df..75962c81ad 100644 --- a/code/modules/events/wizard/lava.dm +++ b/code/modules/events/wizard/lava.dm @@ -4,9 +4,10 @@ typepath = /datum/round_event/wizard/lava max_occurrences = 3 earliest_start = 0 MINUTES + description = "Turns the floor into hot lava." /datum/round_event/wizard/lava - endWhen = 0 + end_when = 0 var/started = FALSE /datum/round_event/wizard/lava/start() diff --git a/code/modules/events/wizard/madness.dm b/code/modules/events/wizard/madness.dm index ac86236623..de2c30a032 100644 --- a/code/modules/events/wizard/madness.dm +++ b/code/modules/events/wizard/madness.dm @@ -3,6 +3,7 @@ weight = 1 typepath = /datum/round_event/wizard/madness earliest_start = 0 MINUTES + description = "Reveals a horrifying truth to everyone, giving them a trauma." var/forced_secret diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index 052143722e..b900a2da9f 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -4,13 +4,14 @@ typepath = /datum/round_event/wizard/magicarp max_occurrences = 1 earliest_start = 0 MINUTES + description = "Summons a school of carps with magic projectiles." /datum/round_event/wizard/magicarp - announceWhen = 3 - startWhen = 50 + announce_when = 3 + start_when = 50 /datum/round_event/wizard/magicarp/setup() - startWhen = rand(40, 60) + start_when = rand(40, 60) /datum/round_event/wizard/magicarp/announce(fake) priority_announce("Unknown magical entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") diff --git a/code/modules/events/wizard/petsplosion.dm b/code/modules/events/wizard/petsplosion.dm index fb4d433905..ff3ebdd128 100644 --- a/code/modules/events/wizard/petsplosion.dm +++ b/code/modules/events/wizard/petsplosion.dm @@ -5,6 +5,7 @@ max_occurrences = 1 //Exponential growth is nothing to sneeze at! earliest_start = 0 MINUTES var/mobs_to_dupe = 0 + description = "Rapidly multiplies the animals on the station." /datum/round_event_control/wizard/petsplosion/preRunEvent() for(var/mob/living/simple_animal/F in GLOB.alive_mob_list) @@ -16,7 +17,7 @@ ..() /datum/round_event/wizard/petsplosion - endWhen = 61 //1 minute (+1 tick for endWhen not to interfere with tick) + end_when = 61 //1 minute (+1 tick for end_when not to interfere with tick) var/countdown = 0 var/mobs_duped = 0 diff --git a/code/modules/events/wizard/race.dm b/code/modules/events/wizard/race.dm index 5c3b8432c1..8c45a9504b 100644 --- a/code/modules/events/wizard/race.dm +++ b/code/modules/events/wizard/race.dm @@ -5,6 +5,7 @@ max_occurrences = 5 earliest_start = 0 MINUTES can_be_midround_wizard = FALSE + description = "Gives everyone a random race." /datum/round_event/wizard/race var/list/stored_name @@ -16,7 +17,7 @@ stored_name = list() stored_species = list() stored_dna = list() - endWhen = rand(600,1200) //10 to 20 minutes + end_when = rand(600,1200) //10 to 20 minutes ..() /datum/round_event/wizard/race/start() diff --git a/code/modules/events/wizard/rpgloot.dm b/code/modules/events/wizard/rpgloot.dm index bf3104450e..911a9bf665 100644 --- a/code/modules/events/wizard/rpgloot.dm +++ b/code/modules/events/wizard/rpgloot.dm @@ -4,6 +4,7 @@ typepath = /datum/round_event/wizard/rpgloot max_occurrences = 1 earliest_start = 0 MINUTES + description = "Every item in the world will have fantastical names." /datum/round_event/wizard/rpgloot/start() var/upgrade_scroll_chance = 0 diff --git a/code/modules/events/wizard/shuffle.dm b/code/modules/events/wizard/shuffle.dm index 18b8c8e21c..5659818b48 100644 --- a/code/modules/events/wizard/shuffle.dm +++ b/code/modules/events/wizard/shuffle.dm @@ -8,6 +8,7 @@ max_occurrences = 5 earliest_start = 0 MINUTES can_be_midround_wizard = FALSE // not removing it completely yet + description = "Shuffles everyone around on the station." /datum/round_event/wizard/shuffleloc/start() var/list/moblocs = list() @@ -45,6 +46,7 @@ max_occurrences = 5 earliest_start = 0 MINUTES can_be_midround_wizard = FALSE // not removing it completely yet + description = "Shuffles the names of everyone around the station." /datum/round_event/wizard/shufflenames/start() var/list/mobnames = list() @@ -80,6 +82,7 @@ max_occurrences = 3 earliest_start = 0 MINUTES can_be_midround_wizard = FALSE // not removing it completely yet + description = "Shuffles the minds of everyone around the station, except for the wizard." /datum/round_event/wizard/shuffleminds/start() var/list/mobs = list() diff --git a/code/modules/events/wizard/summons.dm b/code/modules/events/wizard/summons.dm index ac1160e0f5..886dfdfd10 100644 --- a/code/modules/events/wizard/summons.dm +++ b/code/modules/events/wizard/summons.dm @@ -5,6 +5,7 @@ max_occurrences = 1 earliest_start = 0 MINUTES can_be_midround_wizard = FALSE // not removing it completely yet + description = "Summons a gun for everyone. Might turn people into survivalists." /datum/round_event_control/wizard/summonguns/New() if(CONFIG_GET(flag/no_summon_guns)) @@ -21,6 +22,7 @@ max_occurrences = 1 earliest_start = 0 MINUTES can_be_midround_wizard = FALSE // not removing it completely yet + description = "Summons a magic item for everyone. Might turn people into survivalists." /datum/round_event_control/wizard/summonmagic/New() if(CONFIG_GET(flag/no_summon_magic)) diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index 3207e3b635..413658e34d 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -4,11 +4,12 @@ max_occurrences = 3 weight = 2 min_players = 2 - + category = EVENT_CATEGORY_SPACE + description = "Space time anomalies appear on the station, randomly teleporting people who walk into them." /datum/round_event/wormholes - announceWhen = 10 - endWhen = 60 + announce_when = 10 + end_when = 60 var/list/pick_turfs = list() var/list/wormholes = list() @@ -16,8 +17,8 @@ var/number_of_wormholes = 400 /datum/round_event/wormholes/setup() - announceWhen = rand(0, 20) - endWhen = rand(40, 80) + announce_when = rand(0, 20) + end_when = rand(40, 80) /datum/round_event/wormholes/start() for(var/turf/open/floor/T in world) diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 10b825440a..9c538f4bde 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -5,6 +5,8 @@ weight = -1 max_occurrences = 1 earliest_start = 0 MINUTES + category = EVENT_CATEGORY_HOLIDAY + description = "Hides surprise filled easter eggs in maintenance." /datum/round_event/easter/announce(fake) priority_announce(pick("Hip-hop into Easter!","Find some Bunny's stash!","Today is National 'Hunt a Wabbit' Day.","Be kind, give Chocolate Eggs!")) @@ -16,6 +18,8 @@ typepath = /datum/round_event/rabbitrelease weight = 5 max_occurrences = 10 + category = EVENT_CATEGORY_HOLIDAY + description = "Summons a wave of cute rabbits." /datum/round_event/rabbitrelease/announce(fake) priority_announce("Unidentified furry objects detected coming aboard [station_name()]. Beware of Adorable-ness.", "Fluffy Alert", "aliens") diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index 5dd8ad9155..8ef60d8b54 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -15,6 +15,8 @@ weight = -1 //forces it to be called, regardless of weight max_occurrences = 1 earliest_start = 0 MINUTES + category = EVENT_CATEGORY_HOLIDAY + description = "Spawns Jacq, a friendly mob that gives players a couple fun stuff to do." /datum/round_event/jacqueen/start() ..() diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 155efcd7dc..52ed3eca5e 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -366,7 +366,7 @@ "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Prisoner") /proc/get_all_job_icons() //For all existing HUD icons - return get_all_jobs() + list("Prisoner") + return get_all_jobs() /proc/get_all_centcom_jobs() return list("VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","CentCom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","CentCom Bartender","Nuclear Waste Expert") //No idea how to modularly edit a global proc diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 7a5ffbbbae..ce8c54a685 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -309,12 +309,13 @@ C.assignment = J.title //End of skyrat change C.update_label() - for(var/A in SSeconomy.bank_accounts) - var/datum/bank_account/B = A - if(B.account_id == H.account_id) - C.registered_account = B - B.bank_cards += C - break + if(J.title != "Stowaway") + for(var/A in SSeconomy.bank_accounts) + var/datum/bank_account/B = A + if(B.account_id == H.account_id) + C.registered_account = B + B.bank_cards += C + break H.sec_hud_set_ID() var/obj/item/pda/PDA = H.get_item_by_slot(pda_slot) diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 7839d1ecb9..c998580cae 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -38,7 +38,7 @@ display_order = JOB_DISPLAY_ORDER_HEAD_OF_SECURITY blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia, /datum/quirk/insanity) threat = 3 - + family_heirlooms = list( /obj/item/book/manual/wiki/security_space_law ) @@ -51,7 +51,7 @@ belt = /obj/item/pda/heads/hos ears = /obj/item/radio/headset/heads/hos/alt uniform = /obj/item/clothing/under/rank/security/head_of_security - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/jackboots/sec suit = /obj/item/clothing/suit/armor/hos/trenchcoat gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/HoS/beret diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 8dedc6c6dc..f4a234d9b2 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -28,7 +28,7 @@ display_order = JOB_DISPLAY_ORDER_SECURITY_OFFICER blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia) threat = 2 - + family_heirlooms = list( /obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec @@ -131,7 +131,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/helmet/sec suit = /obj/item/clothing/suit/armor/vest/alt - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/jackboots/sec l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld backpack_contents = list(/obj/item/melee/baton/loaded=1) diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 714c599024..ec4e81caea 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -29,7 +29,7 @@ display_order = JOB_DISPLAY_ORDER_WARDEN blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia) threat = 2 - + family_heirlooms = list( /obj/item/book/manual/wiki/security_space_law ) @@ -46,7 +46,7 @@ belt = /obj/item/pda/warden ears = /obj/item/radio/headset/headset_sec/alt uniform = /obj/item/clothing/under/rank/security/warden - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/jackboots/sec suit = /obj/item/clothing/suit/armor/vest/warden/alt gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/warden diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index c351cd25c6..e7674c7a2b 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -47,7 +47,8 @@ GLOBAL_LIST_INIT(civilian_positions, list( "Clown", "Mime", "Prisoner", - "Assistant")) + "Assistant", + "Stowaway")) GLOBAL_LIST_INIT(security_positions, list( "Head of Security", diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index 378313311e..ea52239754 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -30,7 +30,6 @@ age = rand(AGE_MIN,AGE_MAX) /datum/preferences/proc/update_preview_icon(current_tab) - var/equip_job = (current_tab != APPEARANCE_TAB) // Determine what job is marked as 'High' priority, and dress them up as such. var/datum/job/previewJob = get_highest_job() @@ -49,13 +48,14 @@ mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER)) copy_to(mannequin, initial_spawn = TRUE) - if(current_tab == LOADOUT_TAB) - //give it its loadout if not on the appearance tab - SSjob.equip_loadout(parent.mob, mannequin, FALSE, bypass_prereqs = TRUE, can_drop = FALSE) - else - if(previewJob && equip_job) - mannequin.job = previewJob.title - previewJob.equip(mannequin, TRUE, preference_source = parent) + switch(preview_pref) + if(PREVIEW_PREF_JOB) + if(previewJob) + mannequin.job = previewJob.title + previewJob.equip(mannequin, TRUE, preference_source = parent) + if(PREVIEW_PREF_LOADOUT) + SSjob.equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE) + SSjob.post_equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE) mannequin.regenerate_icons() diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index c31b566cf3..66a0827059 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -94,6 +94,10 @@ C.dna.copy_dna(brainmob.stored_dna) if(HAS_TRAIT(L, TRAIT_NOCLONE)) LAZYSET(brainmob.status_traits, TRAIT_NOCLONE, L.status_traits[TRAIT_NOCLONE]) + // Sandstorm edit: DNC Order quirk + if(HAS_TRAIT(L, TRAIT_DNC_ORDER)) + LAZYSET(brainmob.status_traits, TRAIT_DNC_ORDER, L.status_traits[TRAIT_DNC_ORDER]) + // End Sandstorm edit var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE) if(ZI) brainmob.set_species(ZI.old_species) //For if the brain is cloned diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 84b52007b8..3ec63cea1a 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -8,6 +8,7 @@ GLOB.carbon_list += src blood_volume = (BLOOD_VOLUME_NORMAL * blood_ratio) add_movespeed_modifier(/datum/movespeed_modifier/carbon_crawling) + register_context() /mob/living/carbon/Destroy() //This must be done first, so the mob ghosts correctly before DNA etc is nulled diff --git a/code/modules/mob/living/carbon/carbon_context.dm b/code/modules/mob/living/carbon/carbon_context.dm new file mode 100644 index 0000000000..e7fc4d11bf --- /dev/null +++ b/code/modules/mob/living/carbon/carbon_context.dm @@ -0,0 +1,48 @@ +/mob/living/carbon/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + . = ..() + + if (!isnull(held_item)) + return . + + if (!ishuman(user)) + return . + + var/combat_mode = SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE) + + if(user == src) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HELP, "Check injuries") + else if(!lying) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HELP, "Comfort") + else if (health >= 0 && !HAS_TRAIT(src, TRAIT_FAKEDEATH)) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HELP, "Shake") + else + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HELP, "CPR") + + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_DISARM, "Disarm") + if(combat_mode && (src != user)) + LAZYSET(context[SCREENTIP_CONTEXT_RMB], INTENT_DISARM, "Shove") + + if(src != user) + if (pulledby == user) + switch (user.grab_state) + if (GRAB_PASSIVE) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_GRAB, "Grip") + if (GRAB_AGGRESSIVE) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_GRAB, "Choke") + if (GRAB_NECK) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_GRAB, "Strangle") + else + return . + else + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_GRAB, "Pull") + + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HARM, "Attack") + + // Monkeys cannot be grabbed harder using ctrl-click, don't ask. + if((pulledby != user) && (src != user)) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Pull") + // Happens on any intent i believe + if((user == src) && combat_mode && lying) + LAZYSET(context[SCREENTIP_CONTEXT_RMB], INTENT_ANY, "Force to get up") + + return CONTEXTUAL_SCREENTIP_SET diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 2ef3aa36a6..113853d315 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -153,10 +153,6 @@ if(MOOD_LEVEL_HAPPY4 to INFINITY) . += "[t_He] look[p_s()] ecstatic." - if(HAS_TRAIT(src, TRAIT_IN_HEAT) && (HAS_TRAIT(user, TRAIT_HEAT_DETECT) || src == user)) - . += "" - . += "[t_He] [t_is] currently in [gender == MALE ? "rut" : "heat"]." - if(LAZYLEN(.) > 1) .[1] += "
" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index edb5de8188..373c7e2d79 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -460,10 +460,6 @@ if (length(msg)) . += "[msg.Join("")]" - if(HAS_TRAIT(src, TRAIT_IN_HEAT) && (HAS_TRAIT(user, TRAIT_HEAT_DETECT) || src == user)) - . += "" - . += "[t_He] [t_is] currently in [gender == MALE ? "rut" : "heat"]." - var/trait_exam = common_trait_examine() if (!isnull(trait_exam)) . += trait_exam diff --git a/code/modules/mob/living/carbon/human/human_context.dm b/code/modules/mob/living/carbon/human/human_context.dm new file mode 100644 index 0000000000..5229fba3ea --- /dev/null +++ b/code/modules/mob/living/carbon/human/human_context.dm @@ -0,0 +1,36 @@ +/mob/living/carbon/human/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + . = ..() + + if (!ishuman(user)) + return . + + var/aim_for_mouth = user.zone_selected == "mouth" + var/target_on_help = a_intent == INTENT_HELP + var/target_aiming_for_mouth = zone_selected == "mouth" + var/target_restrained = restrained() + var/same_dir = (dir & user.dir) + var/aim_for_groin = user.zone_selected == "groin" + var/target_aiming_for_groin = zone_selected == "groin" + + if(aim_for_mouth && (target_on_help || target_restrained || target_aiming_for_mouth)) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_DISARM, "Slap face") + + else if(aim_for_groin && (src == user || lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin)) + LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_DISARM, "Slap ass") + + // Humans can actually be upgrade grabbed using ctrl-click + if(src != user) + if (pulledby == user) + switch (user.grab_state) + if (GRAB_PASSIVE) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Grip") + if (GRAB_AGGRESSIVE) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Choke") + if (GRAB_NECK) + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Strangle") + else + return . + else + LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Pull") + + return CONTEXTUAL_SCREENTIP_SET diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index fa216db0b0..af3a0693dd 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -190,6 +190,10 @@ if(ITEM_SLOT_SUITSTORE) s_store = I update_inv_s_store() + if(ITEM_SLOT_ACCESSORY) + var/obj/item/clothing/under/attach_target = w_uniform + attach_target.attach_accessory(I, src, TRUE) + // updates handled by attach_accessory else to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") not_handled = TRUE diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 6052229e35..0c30c42a65 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1523,6 +1523,39 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_CAN_INSERT, I, H, TRUE)) return TRUE return FALSE + if(ITEM_SLOT_ACCESSORY) + if(istype(I, /obj/item/clothing/accessory/ring)) + if(istype(H.gloves)) + var/obj/item/clothing/gloves/attaching_target = H.gloves + if(length(attaching_target.attached_accessories) > attaching_target.max_accessories) + if(return_warning) + return_warning[1] = "\The [attaching_target] is at maximum capacity!" + return FALSE + if(attaching_target.dummy_thick) + if(return_warning) + return_warning[1] = "\The [attaching_target] are too bulky and cannot have accessories attached to it!" + return FALSE + else + return TRUE + else if(return_warning) + return_warning[1] = "\The [H.w_uniform] cannot have any attachments." + return FALSE + else + if(istype(H.w_uniform, /obj/item/clothing/under)) + var/obj/item/clothing/under/attaching_target = H.w_uniform + if(length(attaching_target.attached_accessories) > attaching_target.max_accessories) + if(return_warning) + return_warning[1] = "\The [attaching_target] is at maximum capacity!" + return FALSE + if(attaching_target.dummy_thick) + if(return_warning) + return_warning[1] = "\The [attaching_target] is too bulky and cannot have accessories attached to it!" + return FALSE + else + return TRUE + else if(return_warning) + return_warning[1] = "\The [H.w_uniform] cannot have any attachments." + return FALSE return FALSE //Unsupported slot /datum/species/proc/equip_delay_self_check(obj/item/I, mob/living/carbon/human/H, bypass_equip_delay_self) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 589c9a1dd0..5093a9f24a 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -64,10 +64,6 @@ brutemod = 0.9 species_language_holder = /datum/language_holder/lizard/ash - -#define HEAT_CYCLE_LENGTH 32 -#define HEAT_CYCLE_OFFSET 11 - /datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species) if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail_lizard"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines C.dna.features["tail_lizard"] = "Smooth" @@ -80,12 +76,6 @@ C.dna.features["mam_snouts"] = "Sharp" C.dna.features["mcolor2"] = C.dna.features["mcolor"] //for no funne rainbows C.dna.features["mcolor3"] = C.dna.features["mcolor"] - ADD_TRAIT(C, TRAIT_HEAT_DETECT, SPECIES_TRAIT) - var/temp = text2num(GLOB.round_id) - var/tempish = ((temp + (HEAT_CYCLE_OFFSET + 2)) % HEAT_CYCLE_LENGTH) - if(tempish <= 2 && tempish >= 0) - to_chat(C, "It's this time again.. Your loins lay restless as they await a potential mate.") - ADD_TRAIT(C, TRAIT_IN_HEAT, SPECIES_TRAIT) if(C.gender == MALE) C.dna.features["has_cock"] = TRUE @@ -103,6 +93,3 @@ C.give_genitals(1) C.update_body() return ..() - -#undef HEAT_CYCLE_LENGTH -#undef HEAT_CYCLE_OFFSET diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm index f49c5933bb..b50aeb5f48 100644 --- a/code/modules/mob/living/silicon/damage_procs.dm +++ b/code/modules/mob/living/silicon/damage_procs.dm @@ -9,9 +9,6 @@ adjustBruteLoss(damage_amount, forced = forced) if(BURN) adjustFireLoss(damage_amount, forced = forced) - if(OXY) - if(damage < 0 || forced) //we shouldn't be taking oxygen damage through this proc, but we'll let it heal. - adjustOxyLoss(damage_amount, forced = forced) return 1 @@ -30,7 +27,7 @@ /mob/living/silicon/setCloneLoss(amount, updating_health = TRUE, forced = FALSE) return FALSE -/mob/living/silicon/adjustStaminaLoss(amount, updating_health = 1, forced = FALSE)//immune to stamina damage. +/mob/living/silicon/adjustStaminaLoss(amount, updating_health = 1, forced = FALSE) //immune to stamina damage. return FALSE /mob/living/silicon/setStaminaLoss(amount, updating_health = 1) @@ -41,3 +38,15 @@ /mob/living/silicon/setOrganLoss(slot, amount) return FALSE + +/mob/living/silicon/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE) //immune to oxygen damage + if(istype(src, /mob/living/silicon/ai)) //ais are snowflakes and use oxyloss for being in AI cards and having no battery + return ..() + + return FALSE + +/mob/living/silicon/setOxyLoss(amount, updating_health = TRUE, forced = FALSE) + if(istype(src, /mob/living/silicon/ai)) //ditto + return ..() + + return FALSE diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index 9e81725731..e54d5e05b7 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -85,15 +85,6 @@ /mob/living/silicon/pai/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, only_robotic = FALSE, only_organic = TRUE) return take_holo_damage(amount) -/mob/living/silicon/pai/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, toxins_type = TOX_DEFAULT) - return FALSE - -/mob/living/silicon/pai/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE) - return FALSE - -/mob/living/silicon/pai/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE) - return FALSE - /mob/living/silicon/pai/adjustStaminaLoss(amount, updating_health, forced = FALSE) if(forced) take_holo_damage(amount) @@ -108,27 +99,3 @@ /mob/living/silicon/pai/getFireLoss() return emittermaxhealth - emitterhealth - -/mob/living/silicon/pai/getToxLoss(toxins_type = TOX_OMNI) - return FALSE - -/mob/living/silicon/pai/getOxyLoss() - return FALSE - -/mob/living/silicon/pai/getCloneLoss() - return FALSE - -/mob/living/silicon/pai/getStaminaLoss() - return FALSE - -/mob/living/silicon/pai/setCloneLoss() - return FALSE - -/mob/living/silicon/pai/setStaminaLoss() - return FALSE - -/mob/living/silicon/pai/setToxLoss(toxins_type = TOX_OMNI) - return FALSE - -/mob/living/silicon/pai/setOxyLoss() - return FALSE diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index e902d57ddd..8a0b8def51 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -1,7 +1,6 @@ /mob/living/silicon/robot/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return - adjustOxyLoss(-10) //we're a robot! handle_robot_hud_updates() handle_robot_cell() diff --git a/code/modules/mob/living/silicon/robot/update_icons.dm b/code/modules/mob/living/silicon/robot/update_icons.dm index 088c93cff1..59c3c1794c 100644 --- a/code/modules/mob/living/silicon/robot/update_icons.dm +++ b/code/modules/mob/living/silicon/robot/update_icons.dm @@ -17,12 +17,16 @@ icon_state = "[module.cyborg_base_icon]-wreck" if(module.cyborg_pixel_offset) - pixel_x = module.cyborg_pixel_offset + var/matrix/M = transform + M.c = module.cyborg_pixel_offset + transform = M //End of citadel changes if(module.cyborg_base_icon == "robot") icon = 'icons/mob/robots.dmi' - pixel_x = initial(pixel_x) + var/matrix/M = transform + M.c = 0 // Cyborg's initial x offset is very likely to be 0 + transform = M if(stat != DEAD && !(IsUnconscious() || IsStun() || IsParalyzed() || low_power_mode)) //Not dead, not stunned. if(!eye_lights) eye_lights = new() diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index a87c0a81ab..e1a179ea52 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -45,14 +45,6 @@ adjustBruteLoss(damage) if(BURN) adjustFireLoss(damage) - if(TOX) - adjustToxLoss(damage) - if(OXY) - adjustOxyLoss(damage) - if(CLONE) - adjustCloneLoss(damage) - if(STAMINA) - adjustStaminaLoss(damage) /mob/living/silicon/attack_paw(mob/living/user) return attack_hand(user) diff --git a/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm b/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm index 6f5f0e3dba..9c4becbdcf 100644 --- a/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm +++ b/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm @@ -5,8 +5,8 @@ max_occurrences = 2 earliest_start = 20 MINUTES min_players = 5 - - + category = EVENT_CATEGORY_ENTITIES + description = "Annoying little creatures go around the station causing havoc and hacking everything." /datum/round_event/gremlin var/static/list/acceptable_spawns = list("xeno_spawn", "generic event spawn", "blobstart", "Assistant") diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index 2c6bef81c2..113a0b33fa 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -43,6 +43,7 @@ to_chat(usr, "You slide \the [pen] into \the [src]'s pen slot.") inserted_item = pen playsound(src, 'sound/machines/button.ogg', 50, 1) + SStgui.update_uis(src) /obj/item/modular_computer/tablet/proc/remove_pen() if(hasSiliconAccessInArea(usr) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) @@ -52,6 +53,7 @@ usr.put_in_hands(inserted_item) to_chat(usr, "You remove [inserted_item] from \the [src]'s pen slot.") inserted_item = null + SStgui.update_uis(src) else to_chat(usr, "\The [src] does not have a pen in it!") @@ -78,9 +80,21 @@ QDEL_NULL(inserted_item) return ..() +/obj/item/modular_computer/tablet/ui_act(action, params) + . = ..() + if(.) + return + if(action == "TABLET_eject_pen") + if(istype(src, /obj/item/modular_computer/tablet)) + var/obj/item/modular_computer/tablet/self = src + if(self.can_have_pen) + self.remove_pen() + return TRUE + /obj/item/modular_computer/tablet/ui_data(mob/user) . = ..() - .["PC_showpeneject"] = inserted_item ? 1 : 0 + .["TABLET_show_pen_eject"] = inserted_item ? 1 : 0 + /obj/item/modular_computer/tablet/update_icon_state() if(has_variants) if(!finish_color) diff --git a/code/modules/modular_computers/file_system/programs/airestorer.dm b/code/modules/modular_computers/file_system/programs/airestorer.dm index 4f181c0e34..ff5240306b 100644 --- a/code/modules/modular_computers/file_system/programs/airestorer.dm +++ b/code/modules/modular_computers/file_system/programs/airestorer.dm @@ -75,9 +75,8 @@ restoring = FALSE return ai_slot.locked = TRUE - A.adjustOxyLoss(-5, FALSE) - A.adjustFireLoss(-5, FALSE) - A.adjustToxLoss(-5, FALSE) + A.adjustOxyLoss(-5, FALSE, FALSE) + A.adjustFireLoss(-5, FALSE, FALSE) A.adjustBruteLoss(-5, FALSE) // Please don't forget to update health, otherwise the below if statements will probably always fail. diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index 18e717191e..cfeae5730b 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -167,7 +167,8 @@ if(!computer || !authenticated) return if(minor) - if(!(target_id_card.assignment in head_subordinates) && target_id_card.assignment != "Assistant") + var/assign = GetJobName(target_id_card) + if(!(assign in head_subordinates) && assign != "Assistant") return target_id_card.access -= get_all_centcom_access() + get_all_accesses() diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm index 29f9a37433..b849df2fc8 100644 --- a/code/modules/modular_computers/file_system/programs/jobmanagement.dm +++ b/code/modules/modular_computers/file_system/programs/jobmanagement.dm @@ -19,6 +19,7 @@ "AI", "Assistant", "Prisoner", + "Stowaway", "Cyborg", "Captain", "Head of Personnel", diff --git a/code/modules/photography/_pictures.dm b/code/modules/photography/_pictures.dm index 6f85cdb3a6..dace901cea 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 6f35e7a99d..48a9203553 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 4000bf843c..45aa4aeb79 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/power/solar.dm b/code/modules/power/solar.dm index 27fb30a459..67ab3817ae 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -242,8 +242,9 @@ to_chat(user, "You need to secure the assembly before you can add glass.") return var/obj/item/stack/sheet/S = W - if(S.use(2)) - glass_type = W.type + S = S.split_stack(amount=2) + if(S) + glass_type = S playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) user.visible_message("[user] places the glass on the solar assembly.", "You place the glass on the solar assembly.") if(tracker) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 9b10a843e8..5fd158c028 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -181,7 +181,6 @@ /obj/item/gun/energy/kinetic_accelerator/emp_act(severity) return -/* moved to modular_sand /obj/item/gun/energy/kinetic_accelerator/proc/reload() cell.give(cell.maxcharge) process_chamber() @@ -191,7 +190,7 @@ to_chat(loc, "[src] silently charges up.") update_icon() overheat = FALSE -*/ + /obj/item/gun/energy/kinetic_accelerator/update_overlays() . = ..() if(!can_shoot()) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 8bbaa55a66..f68c925d74 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -57,7 +57,7 @@ /datum/reagent/blood/on_mob_life(mob/living/carbon/C) //Because lethals are preferred over stamina. damnifino. var/blood_id = C.get_blood_id() - if((blood_id in GLOB.blood_reagent_types) && !HAS_TRAIT(C, TRAIT_NOMARROW) && !HAS_TRAIT(C, BLOODFLEDGE)) + if((blood_id in GLOB.blood_reagent_types) && !HAS_TRAIT(C, TRAIT_NOMARROW) && !HAS_TRAIT(C, TRAIT_BLOODFLEDGE)) if(!data || !(data["blood_type"] in get_safe_blood(C.dna.blood_type))) //we only care about bloodtype here because this is where the poisoning should be C.adjustToxLoss(rand(2,8)*REAGENTS_EFFECT_MULTIPLIER, TRUE, TRUE) //forced to ensure people don't use it to gain beneficial toxin as slime person ..() diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm index 1b1c710e8c..0ac303a3a0 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm @@ -92,6 +92,11 @@ category = list("initial","Tools","Tool Designs") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE +/datum/design/airlock_painter/decal/tile + name = "Tile Sprayer" + id = "tile_sprayer" + build_path = /obj/item/airlock_painter/decal/tile + /datum/design/cultivator name = "Cultivator" id = "cultivator" diff --git a/code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm b/code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm index ea8e59a6b3..f2514b6f9c 100644 --- a/code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm +++ b/code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm @@ -17,7 +17,15 @@ build_path = /obj/item/circuitboard/computer/cargo/request category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_CARGO - + +/datum/design/board/bounty + name = "Computer Design (Bounty Console)" + desc = "Allows for the construction of circuit boards used to build a Bounty Console." + id = "bounty" + build_path = /obj/item/circuitboard/computer/bounty + category = list("Computer Boards") + departmental_flags = DEPARTMENTAL_FLAG_CARGO + /datum/design/board/mining name = "Computer Design (Outpost Status Display)" desc = "Allows for the construction of circuit boards used to build an outpost status display console." diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 98b04a8382..7862f24715 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -232,9 +232,12 @@ var/amount = materials.mat_container.materials[mat_id] var/ref = REF(M) l += "* [amount] of [M.name]: " - if(amount >= MINERAL_MATERIAL_AMOUNT) l += "Eject [RDSCREEN_NOBREAK]" + if(amount >= MINERAL_MATERIAL_AMOUNT) l += "1x [RDSCREEN_NOBREAK]" if(amount >= MINERAL_MATERIAL_AMOUNT*5) l += "5x [RDSCREEN_NOBREAK]" - if(amount >= MINERAL_MATERIAL_AMOUNT) l += "All[RDSCREEN_NOBREAK]" + if(amount >= MINERAL_MATERIAL_AMOUNT*10) l += "10x [RDSCREEN_NOBREAK]" + if(amount >= MINERAL_MATERIAL_AMOUNT*20) l += "20x [RDSCREEN_NOBREAK]" + if(amount >= MINERAL_MATERIAL_AMOUNT*50) l += "50x [RDSCREEN_NOBREAK]" + if(amount >= MINERAL_MATERIAL_AMOUNT) l += "Max Stack[RDSCREEN_NOBREAK]" l += "" l += "[RDSCREEN_NOBREAK]" return l diff --git a/code/modules/research/techweb/nodes/tools_nodes.dm b/code/modules/research/techweb/nodes/tools_nodes.dm index 86a48ab8de..004795113b 100644 --- a/code/modules/research/techweb/nodes/tools_nodes.dm +++ b/code/modules/research/techweb/nodes/tools_nodes.dm @@ -5,7 +5,7 @@ display_name = "Basic Tools" description = "Basic mechanical, electronic, surgical and botanical tools." prereq_ids = list("base") - design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "decal_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom", "normtrash", "spraycan") + design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "decal_painter", "tile_sprayer", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom", "normtrash", "spraycan") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500) /datum/techweb_node/basic_mining diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 1f027c450c..10fab0ed06 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -685,6 +685,7 @@ to_chat(SM, "You also become depressingly aware that you are not a real creature, but instead a holoform. Your existence is limited to the parameters of the holodeck.") to_chat(user, "[SM] accepts [src] and suddenly becomes attentive and aware. It worked!") SM.copy_languages(user) + SM.add_overlay(mutable_appearance('icons/mob/hud.dmi', "brother", ANTAG_LAYER)) after_success(user, SM) qdel(src) else @@ -754,6 +755,7 @@ to_chat(SM, "In a quick flash, you feel your consciousness flow into [SM]!") to_chat(SM, "You are now [SM]. Your allegiances, alliances, and role is still the same as it was prior to consciousness transfer!") SM.name = "[user.real_name]" + SM.add_overlay(mutable_appearance('icons/mob/hud.dmi', "brother", ANTAG_LAYER)) qdel(src) /obj/item/slimepotion/slime/steroid diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 99aaa8d8ec..f350dd507e 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -3,6 +3,8 @@ return /mob/living/carbon/get_bodypart(zone) + RETURN_TYPE(/obj/item/bodypart) + if(!zone) zone = BODY_ZONE_CHEST for(var/X in bodyparts) diff --git a/code/modules/tgui/states/fun.dm b/code/modules/tgui/states/fun.dm new file mode 100644 index 0000000000..ba72f40fd0 --- /dev/null +++ b/code/modules/tgui/states/fun.dm @@ -0,0 +1,17 @@ +/*! + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + +/** + * tgui state: fun_state + * + * Checks that the user has the fun privilige. + */ + +GLOBAL_DATUM_INIT(fun_state, /datum/ui_state/fun_state, new) + +/datum/ui_state/fun_state/can_use_topic(src_object, mob/user) + if(check_rights_for(user.client, R_FUN)) + return UI_INTERACTIVE + return UI_CLOSE diff --git a/config/config.txt b/config/config.txt index 8db6b1f725..f9a588e63a 100644 --- a/config/config.txt +++ b/config/config.txt @@ -42,6 +42,7 @@ $include entries/vote.txt $include plushies/defines.txt # Special Sandstorm configs $include sandstorm/config.txt +$include sandstorm/balance.txt # Special SPLURT configs $include splurt/fetish_content.txt @@ -52,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 new file mode 100644 index 0000000000..bc10b7a471 --- /dev/null +++ b/config/sandstorm/balance.txt @@ -0,0 +1,92 @@ +# Special Sandstorm balance config! + +### +## CRYPTOMINER +### + +## Should cryptominers work in non-atmos turf (ex. space)? +## Uncomment this to disable atmos processing (cheat mode) +#CRYPTO_IGNORE_ATMOS + +## What point multiplier should cryptominers use? +## Determined by heat level, or uses MAX in cheat mode +CRYPTO_MULTIPLIER_MIN 0.2 +CRYPTO_MULTIPLIER_MID 1 +CRYPTO_MULTIPLIER_MAX 3 + +## What heat thresholds should cryptominers use? +## This is measured in Kelvins +CRYPTO_HEAT_THRESHOLD_MIN 225 +CRYPTO_HEAT_THRESHOLD_MID 273 +CRYPTO_HEAT_THRESHOLD_MAX 500 + +## How much heat should cryptominers produce? +## This amount is added to the environment on process +CRYPTO_HEAT_POWER 100 + +## How long between cryptominers producing resources? +## Currently unimplemented! +CRYPTO_MINING_TIME 3000 + +## What material amount should the cryptominers produce? +## This is modified by the MULTIPLIER value +## Currently unimplemented! +CRYPTO_PAYOUT_AMOUNT 50 + +## How much power should the cryptominer use? +## Currently unimplemented! +CRYPTO_POWER_USE_IDLE 20 +CRYPTO_POWER_USE_ACTIVE 200 +CRYPTO_POWER_USE_PROCESS 20 + +### +## AUTODOC +### + +## How long should the autodoc take to perform surgery? +## This is modified by stock part ratings +AUTODOC_TIME_SURGERY_BASE 350 + +### +## BLUESPACE MINER +### + +## How much should the bluespace miner produce, compared to normal? +## This is modified by stock part ratings +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 0000000000..bae707e021 --- /dev/null +++ b/config/splurt/autocryo.txt @@ -0,0 +1,5 @@ +## Uncomment to enable automatic SSD cryo +# AUTOCRYO_ENABLED + +## Time in seconds before sending SSD users to cryo +AUTOCRYO_TIME_TRIGGER 24000 diff --git a/config/splurt/general.txt b/config/splurt/general.txt index dcc4de101d..6eed643535 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-01.yml b/html/changelogs/archive/2023-01.yml index d8475b3fd7..db12f86726 100644 --- a/html/changelogs/archive/2023-01.yml +++ b/html/changelogs/archive/2023-01.yml @@ -113,3 +113,99 @@ Winter Schock: - bugfix: Doll with monophobia dont get stress in someone vore belly - bugfix: Blind doll with monophobia dont get stress while someone in 1 tile range +2023-01-21: + LeDrascol: + - balance: Synthetic Lizardperson, Synthetic Anthropomorph, and IPC no longer experience + thirst + SandPoot: + - rscadd: Added a reskin to the premium kinetic accelerator. + - bugfix: Fixed some possible graphical glitches with the mining hardsuit reskin. + - tweak: Tweaked skirt peeking into allowing peeking under people that are on top + of tables. + - refactor: Refactored skirt peeking into element. + zeroisthebiggay: + - spellcheck: the meme emotes +2023-01-22: + LeDrascol: + - bugfix: Fixed missing newline characters for mood events + WoolyAypa: + - rscadd: Added a new nullrod re-skin + - rscadd: Added papal clothing to the armament beacon choices +2023-01-23: + LunarFleet: + - tweak: Allowed borgs to craft + - tweak: Changes service borgs' items +2023-01-24: + LeDrascol: + - tweak: Bloodfledge flavor text updated + - tweak: Bloodfledge ability buttons are bloodsucker themed + - tweak: Bloodfledge biting considers many more factors + - tweak: Bloodfledge biting limits safe blood transfer while passive grabbing + - tweak: Bloodfledge biting splatters blood if interrupted + - tweak: Bloodfledge biting from same-species non-standard blood species transfers + instead of nourishing + - tweak: Bloodfledge biting species penalties do not apply on same-species interactions + - tweak: Bloodfledge ID cards will use their holder's financial account + - tweak: Bloodfledges will become upset when draining robots, slimes, corpses, or + undead + - tweak: Bloodfledges are penalized for fully draining any body + - tweak: Bloodfledges gain a mood effect from drinking from Cursed Blood users + - tweak: Bloodfledges can over-drink and become fat + - balance: Bloodsucker Fledgling is now a positive quirk, costing 2 points + - balance: Bloodfledges have less arbitrary traits + - balance: Bloodfledges can't use the power cord implant + - balance: Bloodfledge revive cannot be used while starving, the body is too damaged, + or the user suicides + - balance: Bloodfledge coffin healing rate reduced slightly + - balance: Bloodfledge coffin healing costs hunger based on healed amount + - balance: Bloodfledge coffin healing does not work on robots + - balance: Bloodfledge bite cooldown increased slightly + - balance: Bloodfledge interactions benefit from Voracious + - balance: Bloodfledge chapel penalties removed + - balance: Holy water is more dangerous for bloodfledges + - bugfix: Fixed various spelling mistakes related to Bloodsucker Fledglings + - bugfix: Fixed Bloodfledge ID card getting lost with full backpacks + - imageadd: Added a new icon and overlay for vampire IDs + - imagedel: Removed old non-modular vampire ID icon + - refactor: Refactored all Bloodsucker Fledgling code + - refactor: Trait BLOODFLEDGE is now TRAIT_BLOODFLEDGE +2023-01-25: + LeDrascol: + - rscadd: 'Added quirk: DNC Order' + - code_imp: Removed redundant definition of DNC quirk + - tweak: Moved Research Rack from Data Theory to Biological Technology +2023-01-26: + Kush1Push1: + - rscadd: Ported body markings for head; pilot and pilot jaw. + ShamanSliph: + - rscadd: 'Added new Quirk: Clothes Eater' + - bugfix: Fixed insects getting infinite nutrient from chewing on clothes. +2023-01-27: + AshTheDerg: + - tweak: Modified Booze Shaker options + - bugfix: fixed broken Borg Beer Shaker +2023-01-28: + '@Dexxiol': + - imageadd: Done some ui sprites for the underwear slots. + LeDrascol: + - rscadd: Added the Saliith plushie pinpointer + - tweak: The Saliith plushie will throw knives instead of deleting them + - tweak: The Saliith plushie will appear in a random location on the map + - tweak: Only one Saliith plushie can exist in the game at once + - balance: The Saliith plushie is now indestructible + - balance: The Saliith plushie cannot be destroyed by any means + - balance: The Saliith plushie now uses a lightning smite instead of gibbing + - balance: The Saliith plushie will no longer smite brainwashed victims + - balance: The Saliith plushie will now retaliate against plushmium use + - imageadd: Added a green pinpointer sprite +2023-01-30: + LeDrascol: + - server: Added configuration settings for Cryptominer, Autodoc, and Bluespace Miner. + Moribun: + - rscadd: nightstalker tail + - rscdel: striked out issue from zombie making blood recovery not possible + - tweak: vault suit to work +2023-01-31: + LeDrascol: + - balance: Reduced the price of individual condoms from 40 to 10 credits + - balance: Reduced the price of bulk condoms from 200 to 80 credits diff --git a/html/changelogs/archive/2023-02.yml b/html/changelogs/archive/2023-02.yml new file mode 100644 index 0000000000..7b87736aba --- /dev/null +++ b/html/changelogs/archive/2023-02.yml @@ -0,0 +1,101 @@ +2023-02-02: + LeDrascol: + - tweak: Hypnotic Gaze checks for ten new conditions + - tweak: Hypnotic Gaze supports personal pronouns + - tweak: Hypnotic Gaze accounts for non-con preferences + - balance: Hypnotic Gaze interaction time reduced from 12s to 5s + - balance: Hypnotic Gaze can be blocked by eye protection and mind shielding + - rscadd: Added quirk Estrous Detection + - rscadd: Added quirk In Estrous + - tweak: Ashwalkers now spawn with the Estrous Detection quirk + - tweak: Ashwalkers will now gain the In Estrous quirk during some rounds +2023-02-03: + LeDrascol: + - code_imp: Removed obsolete entries for In Heat and Estrus Detection + - rscadd: Added the Imaginary Friend Action Figure + - rscadd: Added the Dissociative Mirror + - tweak: Restored techweb node and circuit printing for Cryptominers +2023-02-04: + AshTheDerg: + - rscadd: Added 10 new varieties of Milkshake + 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. diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi new file mode 100644 index 0000000000..144287ced0 Binary files /dev/null and b/icons/effects/random_spawners.dmi differ diff --git a/icons/emoji_32.dmi b/icons/emoji_32.dmi index d976daa366..1a0684c2fd 100644 Binary files a/icons/emoji_32.dmi and b/icons/emoji_32.dmi differ diff --git a/icons/mob/OnFire.dmi b/icons/mob/OnFire.dmi index 7768bf0269..e82442f4d0 100644 Binary files a/icons/mob/OnFire.dmi and b/icons/mob/OnFire.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 0000000000..aaf11cfd9f 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 2338fa37a0..f7062b9f4e 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index 3360521b51..88b63f46b8 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/feet_digi.dmi b/icons/mob/clothing/feet_digi.dmi index 82d4856d38..41b75ec240 100644 Binary files a/icons/mob/clothing/feet_digi.dmi and b/icons/mob/clothing/feet_digi.dmi differ diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 1d4a76e519..3060ae8f2a 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index fb0246e6e3..26a8b1808f 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/icemoon/64x64megafauna.dmi b/icons/mob/icemoon/64x64megafauna.dmi index 5a622dc7bc..e466b62556 100644 Binary files a/icons/mob/icemoon/64x64megafauna.dmi and b/icons/mob/icemoon/64x64megafauna.dmi differ diff --git a/icons/mob/inhands/equipment/belt_lefthand.dmi b/icons/mob/inhands/equipment/belt_lefthand.dmi index 81b12c60f9..944022713b 100644 Binary files a/icons/mob/inhands/equipment/belt_lefthand.dmi and b/icons/mob/inhands/equipment/belt_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/belt_righthand.dmi b/icons/mob/inhands/equipment/belt_righthand.dmi index 42ed3a30c6..78c5fc47b5 100644 Binary files a/icons/mob/inhands/equipment/belt_righthand.dmi and b/icons/mob/inhands/equipment/belt_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index d0ebbb4501..b694d0ba35 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 0d87e7871c..3836f4c713 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/axes_lefthand.dmi b/icons/mob/inhands/weapons/axes_lefthand.dmi index 6b4041e477..021c005fc3 100644 Binary files a/icons/mob/inhands/weapons/axes_lefthand.dmi and b/icons/mob/inhands/weapons/axes_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/axes_righthand.dmi b/icons/mob/inhands/weapons/axes_righthand.dmi index 30553d6320..c19440b531 100644 Binary files a/icons/mob/inhands/weapons/axes_righthand.dmi and b/icons/mob/inhands/weapons/axes_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/melee_lefthand.dmi b/icons/mob/inhands/weapons/melee_lefthand.dmi index bb6de0432e..0477b1b0f9 100644 Binary files a/icons/mob/inhands/weapons/melee_lefthand.dmi and b/icons/mob/inhands/weapons/melee_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/melee_righthand.dmi b/icons/mob/inhands/weapons/melee_righthand.dmi index 346f6d5977..cf2cf50ad9 100644 Binary files a/icons/mob/inhands/weapons/melee_righthand.dmi and b/icons/mob/inhands/weapons/melee_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index 62e48f626b..860bc5a3de 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index 658e7304df..326821dc8b 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 00b57726f1..d9fd50c9ed 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi index 0799920a6c..5d9bad32ac 100644 Binary files a/icons/obj/clothing/belt_overlays.dmi and b/icons/obj/clothing/belt_overlays.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 48aaa3a418..70548c5719 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 70c48c52da..855936dfb4 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 6e8ea50d39..0831f7be2f 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 50de425aad..2406e61190 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index 9af0a6ba3a..eadf4a1591 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 567fc8ace8..73cc4b6853 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi index 7fc2eaae7f..27301fa272 100644 Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 3e57f4eca4..b958ca201c 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 95a04717e9..73ba2fcdb0 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 7926ead12d..077a3b43db 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi index 4ed8c8db9a..6b42ad12c7 100644 Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 4c09236872..197f088356 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -54,9 +54,10 @@ /datum/gear/donator/kiaramedal name = "Insignia of Steele" - slot = ITEM_SLOT_BACKPACK + slot = ITEM_SLOT_ACCESSORY path = /obj/item/clothing/accessory/medal/steele ckeywhitelist = list("inferno707") + handle_post_equip = TRUE /datum/gear/donator/hheart name = "The Hollow Heart" diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm index 5f895c4805..f33beecb32 100644 --- a/modular_citadel/code/modules/client/loadout/_loadout.dm +++ b/modular_citadel/code/modules/client/loadout/_loadout.dm @@ -55,6 +55,7 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) var/geargroupID //defines the ID that the gear inherits from the config var/loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION var/list/loadout_initial_colors = list() + var/handle_post_equip = FALSE //NEW DONATOR SYTSEM STUFF var/donoritem //autoset on new if null diff --git a/modular_citadel/code/modules/client/loadout/_service.dm b/modular_citadel/code/modules/client/loadout/_service.dm index 848ad6233c..4f96b36e2e 100644 --- a/modular_citadel/code/modules/client/loadout/_service.dm +++ b/modular_citadel/code/modules/client/loadout/_service.dm @@ -2,20 +2,20 @@ name = "Staff Assistant's jumpsuit" path = /obj/item/clothing/under/misc/staffassistant subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") /datum/gear/suit/neetsuit name = "D.A.B. suit" path = /obj/item/clothing/suit/assu_suit subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") cost = 2 /datum/gear/head/neethelm name = "D.A.B. helmet" path = /obj/item/clothing/head/assu_helmet subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") cost = 2 /datum/gear/backpack/plushvar diff --git a/modular_citadel/code/modules/client/loadout/accessory.dm b/modular_citadel/code/modules/client/loadout/accessory.dm new file mode 100644 index 0000000000..55cce181a5 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/accessory.dm @@ -0,0 +1,20 @@ +/datum/gear/accessory + category = LOADOUT_CATEGORY_ACCESSORY + slot = ITEM_SLOT_ACCESSORY + handle_post_equip = TRUE + +/datum/gear/accessory/necklace + name = "A renameable necklace" + path = /obj/item/clothing/accessory/necklace + +/datum/gear/accessory/polymaidapron + name = "Polychromic maid apron" + path = /obj/item/clothing/accessory/maidapron/polychromic + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#333333", "#FFFFFF") + +/datum/gear/accessory/pridepin + name = "Pride pin" + path = /obj/item/clothing/accessory/pride + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION + cost = 0 diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index a0be000b31..24545e7b4c 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -2,6 +2,7 @@ category = LOADOUT_CATEGORY_BACKPACK subcategory = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL slot = ITEM_SLOT_BACKPACK + handle_post_equip = TRUE /datum/gear/backpack/plushbox name = "Plushie Choice Box" @@ -172,25 +173,6 @@ path = /obj/item/storage/fancy/ringbox/diamond cost = 5 -/datum/gear/backpack/necklace //this is here because loadout doesn't support proper accessories - name = "A renameable necklace" - path = /obj/item/clothing/accessory/necklace - subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES - -/datum/gear/backpack/polymaidapron //this is ALSO here because loadout doesn't support proper accessories - name = "Polychromic maid apron" - path = /obj/item/clothing/accessory/maidapron/polychromic - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC - loadout_initial_colors = list("#333333", "#FFFFFF") - subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES - -/datum/gear/backpack/pridepin //what the two comments above said - name = "Pride pin" - path = /obj/item/clothing/accessory/pride - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION - subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES - cost = 0 - // Moved here from quirks /datum/gear/backpack/dyespray name = "Hair dye spray" diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index d0563d2986..fdaee6f309 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -157,7 +157,7 @@ description = "A visored cap. Intended to be used with ORV uniform." path = /obj/item/clothing/head/kepi/orvi subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") /*Commenting out Until next Christmas or made automatic /datum/gear/santahatr @@ -195,6 +195,12 @@ restricted_desc = "Security" restricted_roles = list("Warden","Detective","Security Officer","Head of Security") +/datum/gear/head/cowboyhat/polychromic + name = "Cowboy Hat, Polychromic" + path = /obj/item/clothing/head/cowboyhat/polychromic + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#5F5F5F", "#DDDDDD") + /datum/gear/head/wkepi name = "white kepi" path = /obj/item/clothing/head/kepi diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 5c22485c1f..280f6a2485 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -623,7 +623,7 @@ name = "ORV uniform, assistant" path = /obj/item/clothing/under/trek/orv subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS - restricted_roles = list("Assistant") + restricted_roles = list("Assistant", "Stowaway") /datum/gear/uniform/orvsrv name = "ORV uniform, other" diff --git a/modular_citadel/code/modules/mentor/mentor_memo.dm b/modular_citadel/code/modules/mentor/mentor_memo.dm index 59ea92febd..c64101c30e 100644 --- a/modular_citadel/code/modules/mentor/mentor_memo.dm +++ b/modular_citadel/code/modules/mentor/mentor_memo.dm @@ -94,7 +94,7 @@ var/datum/db_query/update_query = SSdbcore.NewQuery({" UPDATE [format_table_name("mentor_memo")] SET memotext = :new_memo, last_editor = :ckey, edits = :edit_text WHERE ckey = :target_ckey - "}, list("new_memo" = new_memo, "ckey" = ckey, "edit_text" = (edit_text ? "" : edit_text), "target_ckey" = target_ckey)) + "}, list("new_memo" = new_memo, "ckey" = ckey, "edit_text" = (edit_text || ""), "target_ckey" = target_ckey)) if(!update_query.Execute()) var/err = update_query.ErrorMsg() qdel(update_query) diff --git a/modular_sand/code/_globalvars/bitfields.dm b/modular_sand/code/_globalvars/bitfields.dm index 934786c792..7a2bb8d87d 100644 --- a/modular_sand/code/_globalvars/bitfields.dm +++ b/modular_sand/code/_globalvars/bitfields.dm @@ -4,7 +4,28 @@ (this sort of bitfield definition will ALWAYS use this menu so you can't var edit normally) */ + +DEFINE_BITFIELD(flags_inv, list( + "HIDEACCESSORY" = HIDEACCESSORY, + "HIDEEARS" = HIDEEARS, + "HIDEEYES" = HIDEEYES, + "HIDEFACE" = HIDEFACE, + "HIDEFACIALHAIR" = HIDEFACIALHAIR, + "HIDEGLOVES" = HIDEGLOVES, + "HIDEHAIR" = HIDEHAIR, + "HIDEJUMPSUIT" = HIDEJUMPSUIT, + "HIDEMASK" = HIDEMASK, + "HIDENECK" = HIDENECK, + "HIDESHOES" = HIDESHOES, + "HIDESNOUT" = HIDESNOUT, + "HIDESUITSTORAGE" = HIDESUITSTORAGE, + "HIDETAUR" = HIDETAUR, + "HIDEUNDERWEAR" = HIDEUNDERWEAR, + "HIDEWRISTS" = HIDEWRISTS, +)) + 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, @@ -31,3 +52,22 @@ DEFINE_BITFIELD(slot_flags, list( "ITEM_SLOT_UNDERWEAR" = ITEM_SLOT_UNDERWEAR, "ITEM_SLOT_WRISTS" = ITEM_SLOT_WRISTS, )) + +DEFINE_BITFIELD(vis_flags_inv, list( + "HIDEACCESSORY" = HIDEACCESSORY, + "HIDEEARS" = HIDEEARS, + "HIDEEYES" = HIDEEYES, + "HIDEFACE" = HIDEFACE, + "HIDEFACIALHAIR" = HIDEFACIALHAIR, + "HIDEGLOVES" = HIDEGLOVES, + "HIDEHAIR" = HIDEHAIR, + "HIDEJUMPSUIT" = HIDEJUMPSUIT, + "HIDEMASK" = HIDEMASK, + "HIDENECK" = HIDENECK, + "HIDESHOES" = HIDESHOES, + "HIDESNOUT" = HIDESNOUT, + "HIDESUITSTORAGE" = HIDESUITSTORAGE, + "HIDETAUR" = HIDETAUR, + "HIDEUNDERWEAR" = HIDEUNDERWEAR, + "HIDEWRISTS" = HIDEWRISTS, +)) diff --git a/modular_sand/code/_globalvars/lists/lewd_content.dm b/modular_sand/code/_globalvars/lists/lewd_content.dm new file mode 100644 index 0000000000..686e610126 --- /dev/null +++ b/modular_sand/code/_globalvars/lists/lewd_content.dm @@ -0,0 +1,23 @@ +/* + * List of clothes with possible peeking under, + * It is prefilled with clothes that cannot be caught + * by the automatic system (has no skirt in path) +*/ +GLOBAL_LIST_INIT(skirt_peekable, list( + /obj/item/clothing/under/rank/civilian/janitor/maid = TRUE, + /obj/item/clothing/under/costume/loincloth = TRUE, + /obj/item/clothing/under/costume/loincloth/cloth = TRUE, + /obj/item/clothing/under/costume/loincloth/cloth/sensor = TRUE, + )) + +/* + * List of clothes you can't say a pair of. + * Ex: + * A pair of jockstrap? +*/ +GLOBAL_LIST_INIT(pairless_panties, list( + /obj/item/clothing/underwear/briefs/jockstrap = TRUE, + /obj/item/clothing/underwear/briefs/panties/thong = TRUE, + /obj/item/clothing/underwear/briefs/panties/thong/babydoll = TRUE, + /obj/item/clothing/underwear/briefs/mankini = TRUE +)) diff --git a/modular_sand/code/_globalvars/lists/objects.dm b/modular_sand/code/_globalvars/lists/objects.dm index dd737fbe73..bbdfa5207d 100644 --- a/modular_sand/code/_globalvars/lists/objects.dm +++ b/modular_sand/code/_globalvars/lists/objects.dm @@ -1,2 +1,3 @@ GLOBAL_LIST_EMPTY(ic_jammers) GLOBAL_LIST_EMPTY(ic_speakers) +GLOBAL_DATUM_INIT(saliith_plushie, /obj/item/toy/plush/lizardplushie/saliith, new) diff --git a/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm b/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm new file mode 100644 index 0000000000..8d738c425a --- /dev/null +++ b/modular_sand/code/controllers/configuration/entries/sandstorm_balance.dm @@ -0,0 +1,94 @@ +/// CRYPTOMINERS /// +// Should cryptominers work in non-atmos turf +/datum/config_entry/flag/crypto_ignore_atmos + +// Cryptominer point multipliers +/datum/config_entry/number/crypto_multiplier_min + config_entry_value = 0.20 + integer = FALSE + +/datum/config_entry/number/crypto_multiplier_mid + config_entry_value = 1 + integer = FALSE + +/datum/config_entry/number/crypto_multiplier_max + config_entry_value = 3 + integer = FALSE + +// Cryptominer heat thresholds +/datum/config_entry/number/crypto_heat_threshold_min + config_entry_value = 225 + +/datum/config_entry/number/crypto_heat_threshold_mid + config_entry_value = 273 + +/datum/config_entry/number/crypto_heat_threshold_max + config_entry_value = 500 + +// Cryptominer heat produced +/datum/config_entry/number/crypto_heat_power + config_entry_value = 100 + +/* + * The contained configuration values are currently unimplemented + * +// Cryptominer processing time +/datum/config_entry/number/crypto_mining_time + config_entry_value = 3000 + +// Cryptominer base payout +/datum/config_entry/number/crypto_payout_amount + config_entry_value = 50 + +// Cryptominer power use +/datum/config_entry/number/crypto_power_use_idle + config_entry_value = 20 + +/datum/config_entry/number/crypto_power_use_active + config_entry_value = 200 + +/datum/config_entry/number/crypto_power_use_process + config_entry_value = 20 +*/ + +/// AUTODOC /// +// Autodoc processing time +/datum/config_entry/number/autodoc_time_surgery_base + config_entry_value = 350 + +/// BLUESPACE MINER /// +// BSM production output multiplier +/datum/config_entry/number/bluespaceminer_mult_output + config_entry_value = 1 + +// 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 f4a1a08c5e..dee26167c3 100644 --- a/modular_sand/code/controllers/subsystem/interactions.dm +++ b/modular_sand/code/controllers/subsystem/interactions.dm @@ -4,6 +4,9 @@ SUBSYSTEM_DEF(interactions) init_order = INIT_ORDER_INTERACTIONS var/list/interactions VAR_PROTECTED/list/blacklisted_mobs = list( + /mob/dead, + /mob/dview, + /mob/camera, // Although it would be funny to fuck the sentient disease or AI hologram /mob/living/simple_animal/pet, /mob/living/simple_animal/cockroach, /mob/living/simple_animal/babyKiwi, diff --git a/modular_sand/code/datums/interactions/interaction_interface.dm b/modular_sand/code/datums/components/interaction_menu_granter.dm similarity index 81% rename from modular_sand/code/datums/interactions/interaction_interface.dm rename to modular_sand/code/datums/components/interaction_menu_granter.dm index 2d7f794132..04c743fecd 100644 --- a/modular_sand/code/datums/interactions/interaction_interface.dm +++ b/modular_sand/code/datums/components/interaction_menu_granter.dm @@ -1,59 +1,69 @@ /// Attempts to open the tgui menu -/mob/living/verb/interact_with() +/mob/verb/interact_with() set name = "Interact With" set desc = "Perform an interaction with someone." set category = "IC" set src in view(usr.client) - if(!usr.mind) //Mindless boys, honestly just don't, it's better this way - return - if(!usr.mind.interaction_holder) - usr.mind.interaction_holder = new(usr.mind) - usr.mind.interaction_holder.target = src - usr.mind.interaction_holder.ui_interact(usr) - -/* -/// Allows "cyborg" players to change gender at will -/mob/living/silicon/robot/verb/toggle_gender() - set name = "Set Gender" - set desc = "Allows you to set your gender." - - if(stat != CONSCIOUS) - to_chat(usr, span_warning("You cannot toggle your gender while unconcious!")) + var/datum/component/interaction_menu_granter/menu = usr.GetComponent(/datum/component/interaction_menu_granter) + if(!menu) + to_chat(usr, span_warning("You must have done something really bad to not have an interaction component.")) return - var/choice = tgui_alert(usr, "Select Gender.", "Gender", list("Both", "Male", "Female")) - switch(choice) - if("Both") - has_penis = TRUE - has_vagina = TRUE - if("Male") - has_penis = TRUE - has_vagina = FALSE - if("Female") - has_penis = FALSE - has_vagina = TRUE -*/ + if(!src) + to_chat(usr, span_warning("Your interaction target is gone!")) + return + menu.open_menu(usr, src) #define INTERACTION_NORMAL 0 #define INTERACTION_LEWD 1 #define INTERACTION_EXTREME 2 -/datum/mind - var/datum/interaction_menu/interaction_holder - -/datum/mind/New(key) - . = ..() - interaction_holder = new(src) - /// The menu itself, only var is target which is the mob you are interacting with -/datum/interaction_menu +/datum/component/interaction_menu_granter var/mob/living/target -/datum/interaction_menu/ui_state(mob/user) - return GLOB.conscious_state +/datum/component/interaction_menu_granter/Initialize(...) + if(!ismob(parent)) + return COMPONENT_INCOMPATIBLE + var/mob/parent_mob = parent + if(!parent_mob.client) + return COMPONENT_INCOMPATIBLE + . = ..() -/datum/interaction_menu/ui_interact(mob/user, datum/tgui/ui) +/datum/component/interaction_menu_granter/RegisterWithParent() + . = ..() + RegisterSignal(parent, COMSIG_MOB_CTRLSHIFTCLICKON, .proc/open_menu) + +/datum/component/interaction_menu_granter/Destroy(force, ...) + target = null + . = ..() + +/datum/component/interaction_menu_granter/UnregisterFromParent() + UnregisterSignal(parent, COMSIG_MOB_CTRLSHIFTCLICKON) + . = ..() + +/// The one interacting is clicker, the interacted is clicked. +/datum/component/interaction_menu_granter/proc/open_menu(mob/clicker, mob/clicked) + // Don't cancel admin quick spawn + if(isobserver(clicked) && check_rights_for(clicker, R_SPAWN)) + return FALSE + // COMSIG_MOB_CTRLSHIFTCLICKON accepts `atom`s, prevent it + if(!istype(clicked)) + return FALSE + target = clicked + ui_interact(clicker) + return COMSIG_MOB_CANCEL_CLICKON + +/datum/component/interaction_menu_granter/ui_state(mob/user) + // Funny admin, don't you dare be the extra funny now. + if(user.client.holder && !user.client.holder.deadmined) + return GLOB.always_state + if(user == parent) + return GLOB.conscious_state + return GLOB.never_state + +/datum/component/interaction_menu_granter/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "MobInteraction", "Interactions") @@ -68,10 +78,10 @@ else return 0 -/datum/interaction_menu/ui_data(mob/user) +/datum/component/interaction_menu_granter/ui_data(mob/user) . = ..() //Getting player - var/mob/living/self = user + var/mob/living/self = parent //Getting info .["isTargetSelf"] = target == self .["interactingWith"] = target != self ? "Interacting with \the [target]..." : "Interacting with yourself..." @@ -136,22 +146,22 @@ genital_entry["arousal_state"] = genital.aroused_state genital_entry["always_accessible"] = genital.always_accessible genitals += list(genital_entry) - if(iscarbon(self) && !self.getorganslot(ORGAN_SLOT_ANUS)) - var/simulated_ass = list() - simulated_ass["name"] = "Anus" - simulated_ass["key"] = "anus" - var/visibility = "Invalid" - switch(self.anus_exposed) - if(1) - visibility = "Always visible" - if(0) - visibility = "Hidden by underwear" - else - visibility = "Always hidden" - simulated_ass["visibility"] = visibility - simulated_ass["possible_choices"] = GLOB.genitals_visibility_toggles - GEN_VISIBLE_NO_CLOTHES - simulated_ass["always_accessible"] = self.anus_always_accessible - genitals += list(simulated_ass) + if(!get_genitals.getorganslot(ORGAN_SLOT_ANUS)) //SPLURT Edit + var/simulated_ass = list() + simulated_ass["name"] = "Anus" + simulated_ass["key"] = "anus" + var/visibility = "Invalid" + switch(get_genitals.anus_exposed) + if(1) + visibility = "Always visible" + if(0) + visibility = "Hidden by underwear" + else + visibility = "Always hidden" + simulated_ass["visibility"] = visibility + simulated_ass["possible_choices"] = GLOB.genitals_visibility_toggles - GEN_VISIBLE_NO_CLOTHES + simulated_ass["always_accessible"] = get_genitals.anus_always_accessible + genitals += list(simulated_ass) .["genitals"] = genitals //Get their genitals @@ -227,18 +237,19 @@ else return "No" -/datum/interaction_menu/ui_act(action, params) +/datum/component/interaction_menu_granter/ui_act(action, params) if(..()) return + var/mob/living/parent_mob = parent switch(action) if("interact") var/datum/interaction/o = SSinteractions.interactions[params["interaction"]] if(o) - o.do_action(usr, target) + o.do_action(parent_mob, target) return TRUE return FALSE if("genital") - var/mob/living/carbon/self = usr + var/mob/living/carbon/self = parent_mob if("visibility" in params) if(params["genital"] == "anus") self.anus_toggle_visibility(params["visibility"]) @@ -301,7 +312,7 @@ return TRUE return FALSE if("char_pref") - var/datum/preferences/prefs = usr.client.prefs + var/datum/preferences/prefs = parent_mob.client.prefs var/value = num_to_pref(params["value"]) switch(params["char_pref"]) if("erp_pref") @@ -341,7 +352,7 @@ prefs.save_character() return TRUE if("pref") - var/datum/preferences/prefs = usr.client.prefs + var/datum/preferences/prefs = parent_mob.client.prefs switch(params["pref"]) if("verb_consent") TOGGLE_BITFIELD(prefs.toggles, VERB_CONSENT) diff --git a/modular_sand/code/datums/elements/holder_micro.dm b/modular_sand/code/datums/elements/holder_micro.dm index f264ded3b5..0161e9ac90 100644 --- a/modular_sand/code/datums/elements/holder_micro.dm +++ b/modular_sand/code/datums/elements/holder_micro.dm @@ -168,9 +168,12 @@ set category = "IC" set src in view(usr.client) - if(!usr.mind) //Mindless boys, honestly just don't, it's better this way + var/datum/component/interaction_menu_granter/menu = usr.GetComponent(/datum/component/interaction_menu_granter) + if(!menu) + to_chat(usr, span_warning("You must have done something really bad to not have an interaction component.")) return - if(!usr.mind.interaction_holder) - usr.mind.interaction_holder = new(usr.mind) - usr.mind.interaction_holder.target = src.held_mob - usr.mind.interaction_holder.ui_interact(usr) + + if(!src) + to_chat(usr, span_warning("Your interaction target is gone!")) + return + menu.open_menu(usr, src) diff --git a/modular_sand/code/datums/elements/skirt_peeking.dm b/modular_sand/code/datums/elements/skirt_peeking.dm new file mode 100644 index 0000000000..96207fbffa --- /dev/null +++ b/modular_sand/code/datums/elements/skirt_peeking.dm @@ -0,0 +1,125 @@ +/datum/element/skirt_peeking + element_flags = ELEMENT_DETACH + +/datum/element/skirt_peeking/Attach(datum/peeked) + . = ..() + if(!ishuman(peeked)) + return ELEMENT_INCOMPATIBLE + + RegisterSignal(peeked, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(peeked, COMSIG_PARENT_EXAMINE_MORE, .proc/on_closer_look) + +/datum/element/skirt_peeking/proc/can_skirt_peek(mob/living/carbon/human/peeked, mob/peeker) + var/mob/living/living_peeker = peeker + var/obj/item/clothing/under/worn_uniform = peeked.get_item_by_slot(ITEM_SLOT_ICLOTHING) + + // Unfortunately, you can't see it + var/obj/item/clothing/suit/outer_clothing = peeked.get_item_by_slot(ITEM_SLOT_OCLOTHING) + if(outer_clothing && CHECK_MULTIPLE_BITFIELDS(outer_clothing.body_parts_covered, CHEST | GROIN | LEGS | FEET)) + return FALSE + // + + // Valid clothing section + if(worn_uniform && is_type_in_typecache(worn_uniform.type, GLOB.skirt_peekable)) + // We are being peeked by a spooky ghost who sees all? + if(isobserver(peeker)) + return TRUE + // Are you a living creature (and not us)? + if(istype(living_peeker) && (living_peeker != peeked)) + // 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_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) + if(can_skirt_peek(peeked, peeker)) + examine_list += span_purple("[peeked.p_theyre(TRUE)] wearing a skirt! I can probably give it a little peek looking closer.") + +/datum/element/skirt_peeking/proc/on_closer_look(mob/living/carbon/human/peeked, mob/peeker, list/examine_content) + if(can_skirt_peek(peeked, peeker)) + var/obj/item/clothing/under/worn_uniform = peeked.get_item_by_slot(ITEM_SLOT_ICLOTHING) + var/string = "Peeking under [peeked]'s [worn_uniform.name], you can see " + var/obj/item/clothing/underwear/worn_underwear = peeked.get_item_by_slot(ITEM_SLOT_UNDERWEAR) + if(worn_underwear) + string += "a " + if(!is_type_in_typecache(worn_underwear.type, GLOB.pairless_panties)) //a pair of thong + string += "pair of " + if(worn_underwear.color) + string += "[worn_underwear.name]." + else + string += "[worn_underwear.name]." + + var/obj/item/organ/genital/penis/penis = peeked.getorganslot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/vagina/vagina = peeked.getorganslot(ORGAN_SLOT_VAGINA) + if(penis?.aroused_state) + string += span_love(" There's a visible bulge on [peeked.p_their()] front.") + else if(vagina?.aroused_state) + string += span_love(" [peeked.p_theyre(TRUE)] wet with arousal.") + + else + string += "[peeked.p_theyre()] not wearing anything!\n[peeked.p_their(TRUE)]" + var/list/genitals = list() + for(var/obj/item/organ/genital/genital in peeked.internal_organs) + if(CHECK_BITFIELD(genital.genital_flags, (GENITAL_INTERNAL|GENITAL_HIDDEN))) + continue + + var/appended + switch(genital.type) + if(/obj/item/organ/genital/vagina) + if(genital.aroused_state) + appended += " wet" + if(lowertext(genital.shape) != "human") + appended += " [lowertext(genital.shape)]" + if(lowertext(genital.shape) != "cloaca") //their wet cloaca vagina + appended += " [lowertext(genital.name)]" // goodbye pussy + + if(/obj/item/organ/genital/testicles) + var/obj/item/organ/genital/testicles/nuts = genital + appended += " [lowertext(nuts.size_name)] [lowertext(nuts.name)]" + if(/obj/item/organ/genital/penis) + if(genital.aroused_state) + appended += " fully erect" + if(lowertext(genital.shape) != "human") + appended += " [lowertext(genital.shape)]" + appended += " [lowertext(genital.name)]" // Name it something funny, i dare you. + if(/obj/item/organ/genital/butt) + var/obj/item/organ/genital/butt/booty = genital + appended += " [booty.size_name] [lowertext(booty.name)]" // Maybe " average butt pair" isn't the best for now + else + continue + genitals += appended + + string += english_list(genitals, " featureless groin", " and", ",") + string += " on full display." + + examine_content += span_purple(string) + // Let's see if we caught them, addtimer so it appears after the peek. + addtimer(CALLBACK(src, .proc/try_notice, peeked, peeker), 1) + +/// Alright, they've peeked us and everything, did we notice it though? +/datum/element/skirt_peeking/proc/try_notice(mob/living/carbon/human/peeked, mob/living/peeker) + if(!peeked || !peeker) + return + if(!istype(peeked) || !istype(peeker)) + return + var/obj/item/clothing/under/worn_uniform = peeked.get_item_by_slot(ITEM_SLOT_ICLOTHING) + if(!istype(worn_uniform)) + return + var/obj/item/clothing/glasses/eye_blocker = peeker.get_item_by_slot(ITEM_SLOT_EYES) + if(!(!peeked.client && (peeked.stat == CONSCIOUS) && !HAS_TRAIT(peeked, TRAIT_BLIND) && !is_blind(peeked) && \ + !peeker.is_eyes_covered(FALSE) && !(eye_blocker && eye_blocker.tint > 0) && \ + !(peeker.invisibility > peeked.invisibility) && !(peeker.alpha <= 30))) + return + to_chat(peeked, span_warning("You notice [peeker] looking under your [worn_uniform.name]!")) + to_chat(peeker, span_warning("[peeked] notices you peeking under [peeked.p_their()] [worn_uniform.name]!")) diff --git a/modular_sand/code/datums/interactions/_interaction.dm b/modular_sand/code/datums/interactions/_interaction.dm index b7077ae80d..5ba1efe8e8 100644 --- a/modular_sand/code/datums/interactions/_interaction.dm +++ b/modular_sand/code/datums/interactions/_interaction.dm @@ -10,13 +10,15 @@ - Makes all the code good because yes as well - SandPoot **/ -/mob/living/proc/list_interaction_attributes() - var/dat = list() +/mob/proc/list_interaction_attributes() + return list() + +/mob/living/list_interaction_attributes() + . = ..() if(has_hands()) - dat += "...have hands." + . += "...have hands." if(has_mouth()) - dat += "...have a mouth, which is [mouth_is_free() ? "uncovered" : "covered"]." - return dat + . += "...have a mouth, which is [mouth_is_free() ? "uncovered" : "covered"]." /// The base of all interactions /datum/interaction diff --git a/modular_sand/code/datums/interactions/lewd_interactions.dm b/modular_sand/code/datums/interactions/lewd_interactions.dm index 2171ec0b7f..ccd0708d93 100644 --- a/modular_sand/code/datums/interactions/lewd_interactions.dm +++ b/modular_sand/code/datums/interactions/lewd_interactions.dm @@ -516,18 +516,18 @@ return ..() /mob/living/list_interaction_attributes(mob/living/LM) - var/dat = ..() + . = ..() if(!COOLDOWN_FINISHED(LM, refractory_period)) - dat += "...are sexually exhausted for the time being." + . += "...are sexually exhausted for the time being." switch(a_intent) if(INTENT_HELP) - dat += "...are acting gentle." + . += "...are acting gentle." if(INTENT_DISARM) - dat += "...are acting playful." + . += "...are acting playful." if(INTENT_GRAB) - dat += "...are acting rough." + . += "...are acting rough." if(INTENT_HARM) - dat += "...are fighting anyone who comes near." + . += "...are fighting anyone who comes near." //Here comes the fucking weird shit. if(client) var/client/cli = client @@ -536,45 +536,44 @@ if(!ucli || (ucli.prefs.extremepref != "No")) if(!get_item_by_slot(ITEM_SLOT_EARS_LEFT) && !get_item_by_slot(ITEM_SLOT_EARS_RIGHT)) if(has_ears()) - dat += "...have unprotected ears." + . += "...have unprotected ears." else - dat += "...have a hole where their ears should be." + . += "...have a hole where their ears should be." else - dat += "...have covered ears." + . += "...have covered ears." if(!get_item_by_slot(ITEM_SLOT_EYES)) if(has_eyes()) - dat += "...have exposed eyes." + . += "...have exposed eyes." else - dat += "...have exposed eyesockets." + . += "...have exposed eyesockets." else - dat += "...have covered eyes." + . += "...have covered eyes." // // check those loops only once, thanks var/is_topless = is_topless() var/is_bottomless = is_bottomless() if(is_topless && is_bottomless) - dat += "...are naked." + . += "...are naked." else if((is_topless && !is_bottomless) || (!is_topless && is_bottomless)) - dat += "...are partially clothed." + . += "...are partially clothed." else - dat += "...are clothed." + . += "...are clothed." if(has_breasts(REQUIRE_EXPOSED)) - dat += "...have breasts." + . += "...have breasts." if(has_penis(REQUIRE_EXPOSED)) - dat += "...have a penis." + . += "...have a penis." if(has_strapon(REQUIRE_EXPOSED)) - dat += "...have a strapon." + . += "...have a strapon." if(has_balls(REQUIRE_EXPOSED)) - dat += "...have a ballsack." + . += "...have a ballsack." if(has_vagina(REQUIRE_EXPOSED)) - dat += "...have a vagina." + . += "...have a vagina." if(has_anus(REQUIRE_EXPOSED)) - dat += "...have an anus." + . += "...have an anus." if(has_feet(REQUIRE_EXPOSED)) switch(has_feet(REQUIRE_EXPOSED)) if(2) - dat += "...have a pair of feet." + . += "...have a pair of feet." if(1) - dat += "...have a single foot." - return dat + . += "...have a single foot." diff --git a/modular_sand/code/datums/traits/negative.dm b/modular_sand/code/datums/traits/negative.dm index 3a50591875..2d238f1589 100644 --- a/modular_sand/code/datums/traits/negative.dm +++ b/modular_sand/code/datums/traits/negative.dm @@ -15,3 +15,10 @@ /datum/quirk/sheltered/remove() //i mean, the lose text explains it, so i'm making it actually work var/mob/living/carbon/human/H = quirk_holder H.grant_language(/datum/language/common) + +/datum/quirk/dnc_order + name = "DNC Order" + desc = "You have a Do Not Clone order on your record, stating that you may not be cloned. You can still be revived by other means." + value = -2 + mob_trait = TRAIT_DNC_ORDER + medical_record_text = "Patient has a DNC (Do Not Clone) order and will be rejected by cloning mechanisms as a result." diff --git a/modular_sand/code/datums/traits/neutral.dm b/modular_sand/code/datums/traits/neutral.dm index 89486dc153..363f6f7e25 100644 --- a/modular_sand/code/datums/traits/neutral.dm +++ b/modular_sand/code/datums/traits/neutral.dm @@ -22,3 +22,41 @@ lose_text = span_love("You feel the warm blow of life flooding your womb, full of newfound, vibrant fertility!") medical_record_text = "Patient doesn't seem able to ovulate properly..." */ + +/datum/quirk/estrous_detection + name = "Estrous Detection" + desc = "You have a mammalian sense of detecting if someone\'s body longs for breeding." + value = 0 + mob_trait = TRAIT_ESTROUS_DETECT + gain_text = span_love("Your senses adjust, allowing a mammalian sense of others' fertility.") + lose_text = span_notice("Your sense of others' fertility fades.") + +/datum/quirk/estrous_active + name = "In Estrous" + desc = "Your system burns with the desire to be bred. Satisfying your lust will make you happy, while ignoring it may cause you to become sad and needy." + value = 0 + mob_trait = TRAIT_ESTROUS_ACTIVE + gain_text = span_love("You body burns with the desire to be bred.") + lose_text = span_notice("You feel more in control of your body and thoughts.") + +/datum/quirk/estrous_active/add() + // Add examine hook + RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/quirk_examine_estrous_active) + +/datum/quirk/estrous_active/remove() + // Remove examine hook + UnregisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE) + +/datum/quirk/estrous_active/proc/quirk_examine_estrous_active(atom/examine_target, mob/living/carbon/human/examiner, list/examine_list) + SIGNAL_HANDLER + + // Check if human examiner exists + if(!istype(examiner)) + return + + // Check if examiner lacks the trait, or is self examining + if(!HAS_TRAIT(examiner, TRAIT_ESTROUS_DETECT) || (examiner == quirk_holder)) + return + + // Add quirk message + examine_list += span_love("[quirk_holder.p_they(TRUE)] [quirk_holder.p_are()] currently influenced by the estrous cycle, and long for breeding.") diff --git a/modular_sand/code/game/machinery/autodoc.dm b/modular_sand/code/game/machinery/autodoc.dm index fcd00555c4..d4d266200b 100644 --- a/modular_sand/code/game/machinery/autodoc.dm +++ b/modular_sand/code/game/machinery/autodoc.dm @@ -1,3 +1,6 @@ +// Configuration defines +#define AUTODOC_TIME_BASE CONFIG_GET(number/autodoc_time_surgery_base) + /obj/machinery/autodoc name = "autodoc" desc = "An advanced machine used for inserting organs and implants into the occupant." @@ -17,8 +20,11 @@ . = ..() update_icon() + // Set initial time based on config + surgerytime = max(AUTODOC_TIME_BASE,10) + /obj/machinery/autodoc/RefreshParts() - var/max_time = 350 + var/max_time = AUTODOC_TIME_BASE for(var/obj/item/stock_parts/L in component_parts) max_time -= (L.rating*10) surgerytime = max(max_time,10) @@ -165,3 +171,5 @@ return obj_flags |= EMAGGED to_chat(user, span_warning("You reprogram [src]'s surgery procedures.")) + +#undef AUTODOC_TIME_BASE diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm index 1769ebe2aa..0ddd5be709 100644 --- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm +++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm @@ -1,13 +1,20 @@ -#define REWARD_DIVISOR 1000 -// At the end of the game, the thing yields tetris_score/REWARD_DIVISOR prize tickets. Adjust accordingly. +// Configuration defines +#define TETRIS_REWARD_DIVISOR CONFIG_GET(number/tetris_reward_divisor) +#define TETRIS_PRIZES_MAX CONFIG_GET(number/tetris_prizes_max) +#define TETRIS_SCORE_HIGH CONFIG_GET(number/tetris_score_high) +#define TETRIS_SCORE_MAX CONFIG_GET(number/tetris_score_max) +#define TETRIS_SCORE_MAX_SCI CONFIG_GET(number/tetris_score_max_sci) +#define TETRIS_TIME_COOLDOWN CONFIG_GET(number/tetris_time_cooldown) +#define TETRIS_NO_SCIENCE CONFIG_GET(flag/tetris_no_science) + +// Cooldown defines +#define TETRIS_COOLDOWN_MAIN cooldown_timer /obj/machinery/computer/arcade/tetris name = "T.E.T.R.I.S." desc = "The pinnacle of human technology." - icon = 'icons/obj/computer.dmi' - icon_state = "arcade" circuit = /obj/item/circuitboard/computer/arcade/tetris - light_color = LIGHT_COLOR_GREEN + COOLDOWN_DECLARE(TETRIS_COOLDOWN_MAIN) /obj/machinery/computer/arcade/tetris/Topic(href, href_list) if(..()) @@ -15,13 +22,63 @@ else usr.set_machine(src) if(href_list["tetrisScore"]) - var/temp_score = text2num(href_list["tetrisScore"]) - say("YOUR SCORE: [temp_score]!") - var/reward = round(temp_score/REWARD_DIVISOR) - message_admins("[ADMIN_LOOKUPFLW(usr)] used [src] with score [temp_score] and total_rewards [reward]!!!") - if(reward > 5) - reward = 4 - prizevend(usr, reward) + // Sanitize score as an integer + // Restricts maximum score to (default) 100,000 + var/temp_score = sanitize_num_clamp(text2num(href_list["tetrisScore"]), max=TETRIS_SCORE_MAX) + + // Check for high score + if(temp_score > TETRIS_SCORE_HIGH) + // Alert admins + message_admins("[ADMIN_LOOKUPFLW(usr)] [ADMIN_KICK(usr)] has achieved a score of [temp_score] on [src] in [get_area(src.loc)]! Score exceeds configured suspicion threshold.") + + // Round and clamp prize count from 0 to (default) 5 + var/reward_count = clamp(round(temp_score/TETRIS_REWARD_DIVISOR), 0, TETRIS_PRIZES_MAX) + + // Define score text + var/score_text = (reward_count ? temp_score : "PATHETIC! TRY HARDER") + + // Display normal message + say("YOUR SCORE: [score_text]!") + + // Check if any prize would be vended + if(!reward_count) + // Return without further effects + return + + // Check cooldown + if(!COOLDOWN_FINISHED(src, TETRIS_COOLDOWN_MAIN)) + // Play a fake prize vend effect based on prizevend() + playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3) + visible_message(span_notice("[src] sputters for a moment before going quiet.")) + + // Return with no further effects + return + + // Set cooldown time + COOLDOWN_START(src, TETRIS_COOLDOWN_MAIN, TETRIS_TIME_COOLDOWN) + + // Vend prizes + prizevend(usr, reward_count) + + // Check if science points are possible and allowed + if((!SSresearch.science_tech) || TETRIS_NO_SCIENCE) + return + + // Define user ID card + var/obj/item/card/id/user_id = usr.get_idcard() + + // Check if ID exists + // Check if ID has science access + if(istype(user_id) && (ACCESS_RESEARCH in user_id.access)) + // Limit maximum research points to (default) 10,000 + var/score_research_points = clamp(temp_score, 0, TETRIS_SCORE_MAX_SCI) + + // Add science points based on score + SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = score_research_points)) + + // Announce points earned + say("Research personnel detected. Applying gathered data to algorithms...") + return /obj/machinery/computer/arcade/tetris/attack_ai(user as mob) @@ -99,3 +156,13 @@ user << browse(dat, "window=tetris;size=435x550") user.set_machine(src) onclose(user, "tetris") + +// Remove defines +#undef TETRIS_REWARD_DIVISOR +#undef TETRIS_PRIZES_MAX +#undef TETRIS_SCORE_HIGH +#undef TETRIS_SCORE_MAX +#undef TETRIS_SCORE_MAX_SCI +#undef TETRIS_TIME_COOLDOWN +#undef TETRIS_NO_SCIENCE +#undef TETRIS_COOLDOWN_MAIN diff --git a/modular_sand/code/game/machinery/computer/cloning.dm b/modular_sand/code/game/machinery/computer/cloning.dm new file mode 100644 index 0000000000..e7844ef944 --- /dev/null +++ b/modular_sand/code/game/machinery/computer/cloning.dm @@ -0,0 +1,15 @@ +// Proc for scanning a mob in a cloning machine +/obj/machinery/computer/cloning/can_scan(datum/dna/dna, mob/living/mob_occupant, experimental = FALSE, datum/bank_account/account) + // Check for DNC Order quirk + if(HAS_TRAIT(mob_occupant, TRAIT_DNC_ORDER)) + // Set scan failure reason + scantemp = "Subject has an active DNC order on file. Further operations terminated." + + // Play error sound + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + + // Return without scanning + return + + // Return normally + . = ..() diff --git a/modular_sand/code/game/machinery/cryptominers.dm b/modular_sand/code/game/machinery/cryptominers.dm index 33f87a8e9f..6738511b4f 100644 --- a/modular_sand/code/game/machinery/cryptominers.dm +++ b/modular_sand/code/game/machinery/cryptominers.dm @@ -1,3 +1,22 @@ +// Configuration defines +/* + * Some entries are currently unimplemented + * +#define CRYPTO_POWER_USE CONFIG_GET(number/crypto_power_use_process) +#define CRYPTO_POWER_IDLE CONFIG_GET(number/crypto_power_use_idle) +#define CRYPTO_POWER_ACTIVE CONFIG_GET(number/crypto_power_use_active) +#define CRYPTO_MININGTIME CONFIG_GET(number/crypto_mining_time) +#define CRYPTO_MININGPOINTS CONFIG_GET(number/crypto_payout_amount) +*/ +#define CRYPTO_TEMP_MIN CONFIG_GET(number/crypto_heat_threshold_min) +#define CRYPTO_TEMP_MID CONFIG_GET(number/crypto_heat_threshold_mid) +#define CRYPTO_TEMP_MAX CONFIG_GET(number/crypto_heat_threshold_max) +#define CRYPTO_MULT_MIN CONFIG_GET(number/crypto_multiplier_min) +#define CRYPTO_MULT_MID CONFIG_GET(number/crypto_multiplier_mid) +#define CRYPTO_MULT_MAX CONFIG_GET(number/crypto_multiplier_max) +#define CRYPTO_HEATING_POWER CONFIG_GET(number/crypto_heat_power) +#define CRYPTO_IGNORE_ATMOS CONFIG_GET(flag/crypto_ignore_atmos) + /obj/machinery/cryptominer name = "cryptocurrency miner" desc = "This handy-dandy machine will produce credits for your enjoyment." @@ -12,11 +31,6 @@ var/mining = FALSE var/miningtime = 3000 var/miningpoints = 50 - var/mintemp = TCRYO // 225K equals approximately -55F or -48C - var/midtemp = T0C // 273K equals 32F or 0C - var/maxtemp = 500 // 500K equals approximately 440F or 226C - var/heatingPower = 100 // Heat added each processing - var/require_conductivity = TRUE // Prevent use in space var/datum/bank_account/pay_me = null /obj/machinery/cryptominer/Initialize(mapload) @@ -59,7 +73,7 @@ return to_chat(user, span_notice("You link \the [CARD] to \the [src].")) pay_me = CARD.registered_account - say("Now using [pay_me.account_holder ? "[pay_me.account_holder]'s" : span_boldwarning("ERROR")] account.") + say("Now using [pay_me.account_holder ? "[pay_me.account_holder]s" : span_boldwarning("ERROR")] account.") return /obj/machinery/cryptominer/AltClick(mob/user) @@ -68,13 +82,13 @@ balloon_alert(user, "resetting") if(do_after(user, 5 SECONDS, target = src)) pay_me = SSeconomy.get_dep_account(ACCOUNT_CAR) - say("Now using [pay_me.account_holder]'s account.") + say("Now using [pay_me.account_holder]s account.") /obj/machinery/cryptominer/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += span_notice("A little screen on the machine reads: Currently the linked bank account is [pay_me.account_holder ? "[pay_me.account_holder]'s" : span_boldwarning("ERROR")].") - . += "Modify the destination of the credits using your id on it while it is inactive and has it's panel open." + . += span_notice("A little screen on the machine reads: Currently the linked bank account is [pay_me.account_holder ? "[pay_me.account_holder]s" : span_boldwarning("ERROR")].") + . += "Modify the destination of the credits using your id on it while it is inactive and has its panel open." . += "Alt-Click to reset to the Cargo budget." /obj/machinery/cryptominer/process() @@ -85,18 +99,19 @@ // Check for tiles with no conductivity (space) if(T.thermal_conductivity == 0) + // Cheat mode: Skip all atmos code and give points + // Placed first, as servers are more likely to use it + if(CRYPTO_IGNORE_ATMOS) + produce_points(CRYPTO_MULT_MAX) + return + // Normal mode: Warn the user and stop processing - if(require_conductivity) + else say("Invalid atmospheric conditions detected! Shutting off!") playsound(loc, 'sound/machines/beep.ogg', 50, TRUE, -1) set_mining(FALSE) return - // Cheat mode: Skip all atmos code and give points - else - produce_points(3) - return - // Get air var/datum/gas_mixture/env = T.return_air() if(!env) @@ -105,24 +120,29 @@ // Get temp var/env_temp = env.return_temperature() + // Define temperature settings + var/temp_min = CRYPTO_TEMP_MIN // 225K equals approximately -55F or -48C + var/temp_mid = CRYPTO_TEMP_MID // 273K equals 32F or 0C + var/temp_max = CRYPTO_TEMP_MAX // 500K equals approximately 440F or 226C + // Check for temperature effects // Minimum (most likely) - if(env_temp <= mintemp) - produce_points(3) + if(env_temp <= temp_min) + produce_points(CRYPTO_MULT_MAX) // Mid - else if((env_temp <= midtemp) && (env_temp >= mintemp)) - produce_points(1) + else if((env_temp <= temp_mid) && (env_temp >= temp_min)) + produce_points(CRYPTO_MULT_MID) // Maximum - else if((env_temp <= maxtemp) && (env_temp >= midtemp)) - produce_points(0.20) + else if((env_temp <= temp_max) && (env_temp >= temp_mid)) + produce_points(CRYPTO_MULT_MIN) // Overheat - else if(env_temp >= maxtemp) + else if(env_temp >= temp_max) say("Critical overheating detected! Shutting off!") playsound(loc, 'sound/machines/beep.ogg', 50, TRUE, -1) set_mining(FALSE) - // Increase heat by heatingPower - env.set_temperature(env_temp + heatingPower) + // Increase heat by heating_power + env.set_temperature(env_temp + CRYPTO_HEATING_POWER) // Update air air_update_turf() @@ -148,15 +168,25 @@ set_mining(TRUE) /obj/machinery/cryptominer/proc/set_mining(new_value) + // Check if status changed if(new_value == mining) return //No changes - mining = new_value - if(mining) - START_PROCESSING(SSmachines, src) - else - STOP_PROCESSING(SSmachines, src) - update_icon() + // Set status new value + mining = new_value + + // Check if mining should run + if(mining) + // Start processing + START_PROCESSING(SSmachines, src) + + // Mining should not run + else + // Stop processing + STOP_PROCESSING(SSmachines, src) + + // Update machine icon + update_icon() /obj/machinery/cryptominer/syndie name = "syndicate cryptocurrency miner" @@ -198,3 +228,21 @@ icon_state = "loop_nano" else icon_state = "on_nano" + +/* + * Some entries are currently unimplemented + * +#undef CRYPTO_POWER_USE +#undef CRYPTO_POWER_IDLE +#undef CRYPTO_POWER_ACTIVE +#undef CRYPTO_MININGTIME +#undef CRYPTO_MININGPOINTS +*/ +#undef CRYPTO_TEMP_MIN +#undef CRYPTO_TEMP_MID +#undef CRYPTO_TEMP_MAX +#undef CRYPTO_MULT_MIN +#undef CRYPTO_MULT_MID +#undef CRYPTO_MULT_MAX +#undef CRYPTO_HEATING_POWER +#undef CRYPTO_IGNORE_ATMOS diff --git a/modular_sand/code/game/objects/effects/contraband.dm b/modular_sand/code/game/objects/effects/contraband.dm index 0ec0d17ab9..6272882944 100644 --- a/modular_sand/code/game/objects/effects/contraband.dm +++ b/modular_sand/code/game/objects/effects/contraband.dm @@ -1,5 +1,5 @@ /obj/structure/sign/poster/contraband/yes_erp name = "Yes ERP" - desc = "This poster negates that Eroticism, Rape and Pornography should be banned from Nanotrasen stations." + desc = "This poster scrutinizes the banning of Eroticism, Rape and Pornography from Nanotrasen stations." icon = 'modular_sand/icons/obj/contraband.dmi' - icon_state = "poster1" //It is one because different file + icon_state = "poster_yeserp" diff --git a/modular_sand/code/game/objects/items/fleshlight.dm b/modular_sand/code/game/objects/items/fleshlight.dm index 344d3eecd2..1db9cbc504 100644 --- a/modular_sand/code/game/objects/items/fleshlight.dm +++ b/modular_sand/code/game/objects/items/fleshlight.dm @@ -625,6 +625,7 @@ var/targetting = CUM_TARGET_VAGINA equip_delay_self = 2 SECONDS equip_delay_other = 5 SECONDS + is_edible = 0 /obj/item/clothing/underwear/briefs/panties/portalpanties/attack_self(mob/user) . = ..() diff --git a/modular_sand/code/game/objects/items/plushes.dm b/modular_sand/code/game/objects/items/plushes.dm new file mode 100644 index 0000000000..fb50c80ce9 --- /dev/null +++ b/modular_sand/code/game/objects/items/plushes.dm @@ -0,0 +1,241 @@ +// Honestly, Saliith was just sad when he made this. Leave this file in the game to let people hug him. + +/obj/item/toy/plush/lizardplushie/saliith + name = "Saliith plushie" + desc = "He looks like he needs a friend." + icon = 'modular_sand/icons/obj/plushes.dmi' + icon_state = "saliith" + gender = MALE + can_random_spawn = FALSE + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Protected by a higher power + unstuffable = TRUE // Prevent grenades + +/obj/item/toy/plush/lizardplushie/saliith/Initialize(mapload, set_snowflake_id) + // Check if plush already exists + if(GLOB.saliith_plushie && (GLOB.saliith_plushie != src)) + return INITIALIZE_HINT_QDEL + + // Appear on orbit menu + GLOB.poi_list += src + + // Return normally + . = ..() + +/obj/item/toy/plush/lizardplushie/saliith/Destroy() + // Let's not keep the reference hanging around + GLOB.poi_list -= src + . = ..() + +/obj/item/toy/plush/lizardplushie/saliith/ComponentInitialize() + . = ..() + + // Add respawn component + AddComponent(/datum/component/stationloving) + + // Define pronouns + var/p_they = p_they() + var/p_s = p_s() + + // Add custom description + normal_desc = "[p_they] look[p_s] like [p_they] need[p_s] a friend." + +/obj/item/toy/plush/lizardplushie/saliith/examine(mob/user) + . = ..() + + // Define pronouns + var/p_them = p_them() + //var/p_they = p_they() + //var/p_are = p_are() + + // Check for stuffing + if(!stuffed) + // Update examine text and return + . += span_deadsay("[p_they(TRUE)] [p_are()] dead.") + return + + // Check if user is Saliith himself + if(user.ckey == "sandpoot") + // Update examine text and return + . += span_deadsay("You feel a sense of familiarity from [p_them].") + return + + // Check for antag datums + if((length(user?.mind?.antag_datums) >= 1)) + // Update examine text + . += span_warning("[src] gives you a menacing glare! Patting [p_them] would be a dangerous mistake.") + +/obj/item/toy/plush/lizardplushie/saliith/attack_self(mob/living/carbon/human/user) + // Check if user exists + if(!user) + // Return normally + return ..() + + // Check if user has a mind + if(!user.mind) + // Return normally + return ..() + + // Define pronouns + var/p_they = p_they() + //var/p_their = p_their() + var/p_s = p_s() + + // Check if user is Saliith himself + if(user.ckey == "sandpoot") + // Alert him and return + to_chat(user, span_notice("[p_they] give[p_s] you a hesitant gaze, but accept[p_s] the gesture anyhow.")) + return ..() + + // Check if user is an antagonist role + if((length(user?.mind?.antag_datums) >= 1)) + // Check if user is a xenobio changeling + if(user?.mind?.has_antag_datum(/datum/antagonist/changeling/xenobio)) + // Alert the user + to_chat(user, span_notice("[src] senses what you really are, but decides to spare you.")) + + // Check if user is a brainwashed victim + else if(user?.mind?.has_antag_datum(/datum/antagonist/brainwashed)) + // Alert the user + to_chat(user, span_notice("[src] senses that you're not in control of your actions, and offers [p_their()] sympathy.")) + + // User is not a whitelisted antagonist + else + // Drop the item + user.dropItemToGround(src) + + // Warn user + user.visible_message(span_warning("[src] smites [user] with an otherworldly wrath!"), span_boldwarning("You've made a grave mistake.")) + + // Get lightning location + var/turf/turf_target = get_step(get_step(user, NORTH), NORTH) + + // Perform lightning effect + turf_target.Beam(user, icon_state="lightning[rand(1,12)]", time = 5) + user.electrocution_animation(40) + + // Play sound effect + playsound(get_turf(user), 'sound/magic/lightningbolt.ogg', 50, 1) + + // Add fire damage + user.adjustFireLoss(120) + + // Return + return + + // User has no antagonist status + + // Alert the user + to_chat(user, span_notice("[p_they] give[p_s] you a hesitant gaze, but accepts the gesture anyhow.")) + + // Return + return ..() + +/obj/item/toy/plush/lizardplushie/saliith/attackby(obj/item/item_used, mob/living/user, params) + // Check for sharp object + if(item_used.get_sharpness()) + // Warn in local chat + visible_message(span_warning("[src] knocks \the [item_used] out of [user]'s hands!"), span_warning("[src] knocks \the [item_used] out of your hands!")) + + // Drop the item + user.dropItemToGround(item_used) + + // Throw the item away + item_used.throw_at(pick(oview(7,get_turf(src))),10,1) + + // Return + return + + // Check if user is Saliith himself + if(user.ckey == "sandpoot") + // Return with no effects + return ..() + + // Check for grenade + if(istype(item_used, /obj/item/grenade)) + // Warn in local chat + visible_message(span_warning("[src] forces \the [item_used] into [user]'s mouth!"), span_warning("[src] forces \the [item_used] into your mouth!")) + + // Define the grenade item + var/obj/item/grenade/item_grenade = item_used + + // Move grenade to the user + item_grenade.forceMove(user) + + // Set the detonation time + item_grenade.preprime(volume = 10) + + // Return + return + + // Return normally + return ..() + +/obj/item/toy/plush/lizardplushie/saliith/ex_act(severity, target, origin) + return + +/obj/item/toy/plush/plushling/plushie_absorb(obj/item/toy/plush/victim) + // Check if target is the Saliith plushie + if(istype(victim, /obj/item/toy/plush/lizardplushie/saliith)) + // Warn in local chat + visible_message(span_warning("[victim] violently parries the impostor! [src] is utterly annihilated!")) + + // Create a gib effect + new /obj/effect/gibspawner(get_turf(src)) + + // Delete the plushling + qdel(src) + + // Return + return + + // Return normally + return ..() + +/obj/item/toy/plush/love(obj/item/toy/plush/Kisser, mob/living/user) + // Define saliith plush + var/plush_saliith = /obj/item/toy/plush/lizardplushie/saliith + + // Check if interaction involves the Saliith plush + if(istype(src, plush_saliith) || istype(Kisser, plush_saliith)) + // Check if user is Saliith himself + if(user.ckey == "sandpoot") + // Return normally + return ..() + + // User is not Saliith + // Warn in local chat + user.visible_message(span_warning("[user] tried to force [Kisser] to kiss [src] against their will, and has been yeeted!"), span_warning("You try to force [Kisser] to kiss [src], but get yeeted instead!")) + + // Display voice of god message + say("YEET", spans = list("colossus","yell")) + + // Play sound + playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 200, TRUE, 5) + + // Drop the plushies if held + if(src in user.held_items) + user.dropItemToGround(src) + if(Kisser in user.held_items) + user.dropItemToGround(Kisser) + + // Launch user away + var/turf/yeet_target = get_edge_target_turf(user, pick(GLOB.alldirs)) + user.throw_at(yeet_target, 10, 14) + log_combat(src, user, "plush yeeted") + + // Return + return + + // Interaction does not involve Saliith + // Return normally + return ..() + +// Pinpointer for plushie toy +/obj/item/pinpointer/plushie_saliith + name = "Saliith plushie pinpointer" + desc = "A handheld tracking device that locates Saliith's plushie." + icon = 'modular_sand/icons/obj/device.dmi' + icon_state = "pinpointer_saliith" + +/obj/item/pinpointer/plushie_saliith/scan_for_target() + set_target(GLOB.saliith_plushie, src) diff --git a/modular_sand/code/modules/client/loadout/accessories.dm b/modular_sand/code/modules/client/loadout/accessories.dm index a317069bf4..61562dd38b 100644 --- a/modular_sand/code/modules/client/loadout/accessories.dm +++ b/modular_sand/code/modules/client/loadout/accessories.dm @@ -1,6 +1,5 @@ /datum/gear/accessories/ring - category = LOADOUT_CATEGORY_GLOVES - slot = ITEM_SLOT_HANDS + slot = ITEM_SLOT_ACCESSORY /datum/gear/accessories/ring/goldring name = "A gold ring" diff --git a/modular_sand/code/modules/client/loadout/backpack.dm b/modular_sand/code/modules/client/loadout/backpack.dm new file mode 100644 index 0000000000..c95cbab2c3 --- /dev/null +++ b/modular_sand/code/modules/client/loadout/backpack.dm @@ -0,0 +1,3 @@ +/datum/gear/backpack/pinpointer/plushie_saliith + name = "Saliith Plushie Pinpointer" + path = /obj/item/pinpointer/plushie_saliith diff --git a/modular_sand/code/modules/clothing/gloves/accessories.dm b/modular_sand/code/modules/clothing/gloves/accessories.dm index 1c3986de1f..e2afe193ff 100644 --- a/modular_sand/code/modules/clothing/gloves/accessories.dm +++ b/modular_sand/code/modules/clothing/gloves/accessories.dm @@ -3,7 +3,8 @@ desc = "A tiny gold ring, sized to wrap around a finger." gender = NEUTER w_class = WEIGHT_CLASS_TINY - slot_flags = ITEM_SLOT_GLOVES + slot_flags = ITEM_SLOT_ACCESSORY | ITEM_SLOT_GLOVES + slot_equipment_priority = ITEM_SLOT_ACCESSORY | ITEM_SLOT_GLOVES | ITEM_SLOT_BACKPACK icon = 'icons/obj/ring.dmi' mob_overlay_icon = 'icons/mob/clothing/hands.dmi' icon_state = "ringgold" diff --git a/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm b/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm index 63777f7482..a73639e808 100644 --- a/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm +++ b/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm @@ -136,7 +136,7 @@ "Conscript" = list( "name" = "Conscript suit", "desc" = "..and so he left, with new orders and new questions.", - "icon" = 'modular_sand/icons/mob/clothing/suit.dmi', + "icon" = 'modular_sand/icons/obj/clothing/suits.dmi', "icon_state" = "commando-armor", "mob_overlay_icon" = 'modular_sand/icons/mob/clothing/suit.dmi', "anthro_mob_worn_overlay" = 'modular_sand/icons/mob/clothing/suit_digi.dmi' @@ -151,10 +151,15 @@ . = ..() switch(current_skin) if("Conscript") - if(slot == ITEM_SLOT_OCLOTHING) - icon = 'modular_sand/icons/mob/clothing/suit.dmi' - else - icon = 'modular_sand/icons/obj/clothing/suits.dmi' + var/datum/component/armor_plate/armor_comp = GetComponent(/datum/component/armor_plate) + var/armor_level = 0 + var/armor_max = 0 + if(armor_comp) + armor_level = armor_comp.amount + armor_max = armor_comp.maxamount + + upgrade_icon(amount = armor_level, maxamount = armor_max) + else return @@ -171,37 +176,39 @@ if(istype(helmet)) mining_helmet = helmet + /// h suffix for helmet + var/datum/component/armor_plate/armor_comp_h = mining_helmet.GetComponent(/datum/component/armor_plate) + var/armor_level_h = 0 + var/armor_max_h = 0 + if(armor_comp_h) + armor_level_h = armor_comp_h.amount + armor_max_h = armor_comp_h.maxamount + switch(current_skin) if("Default") - if(armor_level != 0) - upgrade_icon(amount = armor_level, maxamount = armor_max) + upgrade_icon(amount = armor_level, maxamount = armor_max) if(mining_helmet) mining_helmet.name = initial(mining_helmet.name) mining_helmet.desc = initial(mining_helmet.desc) mining_helmet.icon = initial(mining_helmet.icon) mining_helmet.icon_state = initial(mining_helmet.icon_state) - if(armor_level != 0) - mining_helmet.upgrade_icon(amount = armor_level, maxamount = armor_max) + mining_helmet.upgrade_icon(amount = armor_level_h, maxamount = armor_max_h) mining_helmet.mob_overlay_icon = initial(mining_helmet.mob_overlay_icon) mining_helmet.anthro_mob_worn_overlay = initial(mining_helmet.anthro_mob_worn_overlay) /// Sprited by Dexxiol#3462 :) if("Conscript") - if(armor_level != 0) - upgrade_icon(amount = armor_level, maxamount = armor_max) + upgrade_icon(amount = armor_level, maxamount = armor_max) if(mining_helmet) mining_helmet.name = "Conscript helmet" mining_helmet.desc = "It shines briefly, full of life." - mining_helmet.icon = 'modular_sand/icons/mob/clothing/head.dmi' + mining_helmet.icon = 'modular_sand/icons/obj/clothing/hats.dmi' mining_helmet.icon_state = "commando-helmet" - if(armor_level != 0) - mining_helmet.upgrade_icon(amount = armor_level, maxamount = armor_max) + mining_helmet.upgrade_icon(amount = armor_level_h, maxamount = armor_max_h) mining_helmet.mob_overlay_icon = 'modular_sand/icons/mob/clothing/head.dmi' mining_helmet.anthro_mob_worn_overlay = 'modular_sand/icons/mob/clothing/head_muzzled.dmi' - if(current_equipped_slot != ITEM_SLOT_OCLOTHING) - icon = 'modular_sand/icons/obj/clothing/suits.dmi' /obj/item/clothing/head/helmet/space/hardsuit/mining/update_icon_state() switch(suit.current_skin) @@ -224,7 +231,7 @@ icon_state = "commando[hardsuit_type]" if(ishuman(loc)) var/mob/living/carbon/human/wearer = loc - if(wearer.head == src) + if(istype(wearer) && (wearer.head == src)) wearer.update_inv_head() else . = ..() @@ -238,10 +245,10 @@ hardsuit_type = "2-armor" if(amount == maxamount) hardsuit_type = "3-armor" - icon_state = "commando[hardsuit_type]" + icon_state = "commando[hardsuit_type][current_equipped_slot != ITEM_SLOT_OCLOTHING ? "-inhand" : ""]" if(ishuman(loc)) var/mob/living/carbon/human/wearer = loc - if(wearer.wear_suit == src) + if(istype(wearer) && (wearer.wear_suit == src)) wearer.update_inv_wear_suit() else . = ..() diff --git a/modular_sand/code/modules/clothing/under/_under.dm b/modular_sand/code/modules/clothing/under/_under.dm index fe6dcc8fba..7542a0c85a 100644 --- a/modular_sand/code/modules/clothing/under/_under.dm +++ b/modular_sand/code/modules/clothing/under/_under.dm @@ -1,7 +1,3 @@ -GLOBAL_LIST_INIT(skirt_peekable, list( - /obj/item/clothing/under/rank/civilian/janitor/maid = TRUE /* This one hangs about because no skirt in path */ - )) - /obj/item/clothing/under/Initialize(mapload) . = ..() if(!is_type_in_typecache(type, GLOB.skirt_peekable) && findlasttext("[type]", "skirt")) diff --git a/modular_sand/code/modules/clothing/under/color.dm b/modular_sand/code/modules/clothing/under/color.dm deleted file mode 100644 index 786fc955b3..0000000000 --- a/modular_sand/code/modules/clothing/under/color.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/clothing/under/color/jumpskirt - is_skirt = TRUE diff --git a/modular_sand/code/modules/clothing/under/misc.dm b/modular_sand/code/modules/clothing/under/misc.dm deleted file mode 100644 index 87cb52eefc..0000000000 --- a/modular_sand/code/modules/clothing/under/misc.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/item/clothing/under/rank/prisoner/skirt - is_skirt = TRUE - -/obj/item/clothing/under/misc/durathread/skirt - is_skirt = TRUE - -/obj/item/clothing/under/misc/cog/jumpskirt - is_skirt = TRUE diff --git a/modular_sand/code/modules/clothing/under/skirt_dress.dm b/modular_sand/code/modules/clothing/under/skirt_dress.dm deleted file mode 100644 index 79bf474a80..0000000000 --- a/modular_sand/code/modules/clothing/under/skirt_dress.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/clothing/under/dress/skirt //inb4 this breaks something - is_skirt = TRUE diff --git a/modular_sand/code/modules/clothing/under/suits.dm b/modular_sand/code/modules/clothing/under/suits.dm deleted file mode 100644 index 04a37b0471..0000000000 --- a/modular_sand/code/modules/clothing/under/suits.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/clothing/under/suit/white_on_white/skirt - is_skirt = TRUE - -/obj/item/clothing/under/suit/black/skirt - is_skirt = TRUE diff --git a/modular_sand/code/modules/clothing/under/syndicate.dm b/modular_sand/code/modules/clothing/under/syndicate.dm deleted file mode 100644 index 04f160c705..0000000000 --- a/modular_sand/code/modules/clothing/under/syndicate.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/item/clothing/under/syndicate/skirt - is_skirt = TRUE - -/obj/item/clothing/under/syndicate/tacticool/skirt - is_skirt = TRUE - -/obj/item/clothing/under/syndicate/cosmetic/skirt - is_skirt = TRUE diff --git a/modular_sand/code/modules/jobs/job_types/prisoner.dm b/modular_sand/code/modules/jobs/job_types/prisoner.dm new file mode 100644 index 0000000000..3921e11891 --- /dev/null +++ b/modular_sand/code/modules/jobs/job_types/prisoner.dm @@ -0,0 +1,3 @@ +// I'm letting you get 5 spawn positions because latejoin is broken, do not disappoint +/datum/job/prisoner + spawn_positions = 5 diff --git a/modular_sand/code/modules/mining/machine_bluespaceminer.dm b/modular_sand/code/modules/mining/machine_bluespaceminer.dm index 9241f8745e..80fd0dadd9 100644 --- a/modular_sand/code/modules/mining/machine_bluespaceminer.dm +++ b/modular_sand/code/modules/mining/machine_bluespaceminer.dm @@ -1,3 +1,7 @@ +// Configuration defines +#define BLUESPACE_MINER_BONUS_MULT CONFIG_GET(number/bluespaceminer_mult_output) +#define BLUESPACE_MINER_CRYSTAL_TIER CONFIG_GET(number/bluespaceminer_crystal_tier) + /obj/machinery/mineral/bluespace_miner name = "bluespace mining machine" desc = "A machine that uses the magic of Bluespace to slowly generate materials and add them to a linked ore silo." @@ -8,7 +12,16 @@ circuit = /obj/item/circuitboard/machine/bluespace_miner layer = BELOW_OBJ_LAYER init_process = TRUE - var/list/ore_rates = list(/datum/material/iron = 0.3, /datum/material/glass = 0.3, /datum/material/plasma = 0.1, /datum/material/silver = 0.1, /datum/material/gold = 0.05, /datum/material/titanium = 0.05, /datum/material/uranium = 0.05, /datum/material/diamond = 0.02) + var/list/ore_rates = list( + /datum/material/iron = 0.3, + /datum/material/glass = 0.3, + /datum/material/plasma = 0.1, + /datum/material/silver = 0.1, + /datum/material/gold = 0.05, + /datum/material/titanium = 0.05, + /datum/material/uranium = 0.05, + /datum/material/diamond = 0.02 + ) var/datum/component/remote_materials/materials var/multiplier = 0 //Multiplier by tier, has been made fair and everything @@ -16,11 +29,14 @@ . = ..() materials = AddComponent(/datum/component/remote_materials, "bsm", mapload) + // Set initial multiplier based on config + multiplier *= BLUESPACE_MINER_BONUS_MULT + /obj/machinery/mineral/bluespace_miner/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) . += span_notice("A small screen on the machine reads, \"Efficiency at [multiplier * 100]%\"") - if(multiplier >= 5) + if(multiplier >= BLUESPACE_MINER_CRYSTAL_TIER) . += span_notice("Bluespace generation is active.") if(!anchored) . += span_warning("The machine won't work while not firmly secured to the ground.") @@ -38,11 +54,14 @@ multiplier += L.rating stock_amt++ multiplier /= stock_amt - if(multiplier >= 5) + if(multiplier >= BLUESPACE_MINER_CRYSTAL_TIER) ore_rates[/datum/material/bluespace] = 0.01 else ore_rates -= /datum/material/bluespace + // Apply config multiplier here to not interfere with bluespace material check + multiplier *= BLUESPACE_MINER_BONUS_MULT + /obj/machinery/mineral/bluespace_miner/Destroy() materials = null return ..() @@ -108,3 +127,6 @@ if(default_unfasten_wrench(user, I)) return TRUE return FALSE + +#undef BLUESPACE_MINER_BONUS_MULT +#undef BLUESPACE_MINER_CRYSTAL_TIER diff --git a/modular_sand/code/modules/mob/living/carbon/human/examine.dm b/modular_sand/code/modules/mob/living/carbon/human/examine.dm deleted file mode 100644 index 5e0b39bce8..0000000000 --- a/modular_sand/code/modules/mob/living/carbon/human/examine.dm +++ /dev/null @@ -1,77 +0,0 @@ -GLOBAL_LIST_INIT(pairless_panties, list( - /obj/item/clothing/underwear/briefs/jockstrap = TRUE, - /obj/item/clothing/underwear/briefs/panties/thong = TRUE, - /obj/item/clothing/underwear/briefs/panties/thong/babydoll = TRUE, - /obj/item/clothing/underwear/briefs/mankini = TRUE -)) - -/mob/living/carbon/human/examine(mob/user) - . = ..() - var/mob/living/living = user - var/obj/item/clothing/under/worn_uniform = get_item_by_slot(ITEM_SLOT_ICLOTHING) - if(worn_uniform && is_type_in_typecache(worn_uniform.type, GLOB.skirt_peekable) && (isobserver(user) || (isliving(user) && (user != src) && !(living.mobility_flags & MOBILITY_STAND) && (mobility_flags & MOBILITY_STAND) && (loc == living.loc) && (istype(worn_uniform))))) - . += span_purple("[p_theyre(TRUE)] wearing a [worn_uniform.name]! You can probably give it a little peek by looking closer.") - -/mob/living/carbon/human/Initialize(mapload) - . = ..() - RegisterSignal(src, COMSIG_PARENT_EXAMINE_MORE, .proc/peek_skirt) - -/mob/living/carbon/human/proc/peek_skirt(mob/examined, mob/examiner, list/examine_content) - var/mob/living/living = examiner - var/obj/item/clothing/under/worn_uniform = get_item_by_slot(ITEM_SLOT_ICLOTHING) - if(worn_uniform && is_type_in_typecache(worn_uniform.type, GLOB.skirt_peekable) && (isobserver(examiner) || (isliving(examiner) && (examiner != src) && !(living.mobility_flags & MOBILITY_STAND) && (mobility_flags & MOBILITY_STAND) && (loc == living.loc) && (istype(worn_uniform))))) - var/string = "Peeking under [src]'s [worn_uniform.name], you can see " - var/obj/item/clothing/underwear/worn_underwear = get_item_by_slot(ITEM_SLOT_UNDERWEAR) - if(worn_underwear) - string += "a " - if(!is_type_in_typecache(worn_underwear.type, GLOB.pairless_panties)) //a pair of thong - string += "pair of " - if(worn_underwear.color) - string += "[worn_underwear.name]." - else - string += "[worn_underwear.name]." - - var/obj/item/organ/genital/penis/penis = getorganslot(ORGAN_SLOT_PENIS) - var/obj/item/organ/genital/vagina/vagina = getorganslot(ORGAN_SLOT_VAGINA) - if(penis?.aroused_state) - string += span_love(" There's a visible bulge on [p_their()] front.") - else if(vagina?.aroused_state) - string += span_love(" [p_theyre(TRUE)] wet with arousal.") - - else - string += "[p_theyre()] not wearing anything!\n[p_their(TRUE)]" - var/list/genitals = list() - for(var/obj/item/organ/genital/genital in internal_organs) - if(genital.genital_flags & (GENITAL_INTERNAL|GENITAL_HIDDEN)) - continue - - var/appended - switch(genital.type) - if(/obj/item/organ/genital/vagina) - if(genital.aroused_state) - appended += " wet" - if(lowertext(genital.shape) != "human") - appended += " [lowertext(genital.shape)]" - if(lowertext(genital.shape) != "cloaca") //their wet cloaca vagina - appended += " [lowertext(genital.name)]" // goodbye pussy - - if(/obj/item/organ/genital/testicles) - var/obj/item/organ/genital/testicles/nuts = genital - appended += " [lowertext(nuts.size_name)] [lowertext(nuts.name)]" - if(/obj/item/organ/genital/penis) - if(genital.aroused_state) - appended += " fully erect" - if(lowertext(genital.shape) != "human") - appended += " [lowertext(genital.shape)]" - appended += " [lowertext(genital.name)]" // Name it something funny, i dare you. - if(/obj/item/organ/genital/butt) - var/obj/item/organ/genital/butt/booty = genital - appended += " [booty.size_name] [lowertext(booty.name)]" // Maybe " average butt pair" isn't the best for now - else - continue - genitals += appended - - string += english_list(genitals, " featureless groin", " and", ",") - string += " on full display." - - examine_content += span_purple(string) diff --git a/modular_sand/code/modules/mob/living/carbon/human/human.dm b/modular_sand/code/modules/mob/living/carbon/human/human.dm index 4c4b8e7fc3..5abc5a899b 100644 --- a/modular_sand/code/modules/mob/living/carbon/human/human.dm +++ b/modular_sand/code/modules/mob/living/carbon/human/human.dm @@ -1,3 +1,4 @@ /mob/living/carbon/human/ComponentInitialize() . = ..() AddElement(/datum/element/mob_holder/micro, "micro") + AddElement(/datum/element/skirt_peeking) diff --git a/modular_sand/code/modules/mob/living/carbon/human/species_types/anthropomorph.dm b/modular_sand/code/modules/mob/living/carbon/human/species_types/anthropomorph.dm new file mode 100644 index 0000000000..66ba0e63e2 --- /dev/null +++ b/modular_sand/code/modules/mob/living/carbon/human/species_types/anthropomorph.dm @@ -0,0 +1,8 @@ +/datum/species/mammal/synthetic/New() + . = ..() + + // Define inherent traits to add + var/modular_inherent_traits = list(TRAIT_NOTHIRST) + + // Add new traits to list + LAZYADD(inherent_traits, modular_inherent_traits) diff --git a/modular_sand/code/modules/mob/living/carbon/human/species_types/ipc.dm b/modular_sand/code/modules/mob/living/carbon/human/species_types/ipc.dm new file mode 100644 index 0000000000..aa1ad76fbf --- /dev/null +++ b/modular_sand/code/modules/mob/living/carbon/human/species_types/ipc.dm @@ -0,0 +1,8 @@ +/datum/species/ipc/New() + . = ..() + + // Define inherent traits to add + var/modular_inherent_traits = list(TRAIT_NOTHIRST) + + // Add new traits to list + LAZYADD(inherent_traits, modular_inherent_traits) diff --git a/modular_sand/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/modular_sand/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 505aaeeeca..a238241b79 100644 --- a/modular_sand/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/modular_sand/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -1,3 +1,31 @@ +#define ESTROUS_CYCLE_LENGTH 32 +#define ESTROUS_CYCLE_OFFSET 11 + /datum/species/lizard/New() mutant_bodyparts += list("ears" = "None") . = ..() + +/datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species) + . = ..() + + // Add estrous detect quirk + C.add_quirk(/datum/quirk/estrous_detection, SPECIES_TRAIT) + + // Define round ID + // Requires a server database to use this + var/round_id = text2num(GLOB.round_id) || null + + // Define round mating season value + var/round_season = ((round_id + (ESTROUS_CYCLE_OFFSET + 2)) % ESTROUS_CYCLE_LENGTH) + + // Check for mating season + // Default to active without variable + if((!round_id) || round_season <= 2 && round_season >= 0) + // Alert user in chat + to_chat(C, span_userlove("It\'s that time again. Your loins lay restless as they await a potential mate.")) + + // Add estrous quirk + C.add_quirk(/datum/quirk/estrous_active, SPECIES_TRAIT) + +#undef ESTROUS_CYCLE_LENGTH +#undef ESTROUS_CYCLE_OFFSET diff --git a/modular_sand/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/modular_sand/code/modules/mob/living/carbon/human/species_types/synthliz.dm new file mode 100644 index 0000000000..6ae0536688 --- /dev/null +++ b/modular_sand/code/modules/mob/living/carbon/human/species_types/synthliz.dm @@ -0,0 +1,8 @@ +/datum/species/synthliz/New() + . = ..() + + // Define inherent traits to add + var/modular_inherent_traits = list(TRAIT_NOTHIRST) + + // Add new traits to list + LAZYADD(inherent_traits, modular_inherent_traits) diff --git a/modular_sand/code/modules/mob/living/silicon/robot/robot.dm b/modular_sand/code/modules/mob/living/silicon/robot/robot.dm index 1ae172a5c4..184b318d1e 100644 --- a/modular_sand/code/modules/mob/living/silicon/robot/robot.dm +++ b/modular_sand/code/modules/mob/living/silicon/robot/robot.dm @@ -18,3 +18,24 @@ /mob/living/silicon/robot/modules/roleplay/binarycheck() return 0 //Roleplay borgs aren't truly borgs + +/// Allows "cyborg" players to change gender at will +/mob/living/silicon/robot/verb/toggle_gender() + set name = "Set Gender" + set desc = "Allows you to set your gender." + + if(stat != CONSCIOUS) + to_chat(usr, span_warning("You cannot toggle your gender while unconcious!")) + return + + var/choice = tgui_alert(usr, "Select Gender.", "Gender", list("Both", "Male", "Female")) + switch(choice) + if("Both") + has_penis = TRUE + has_vagina = TRUE + if("Male") + has_penis = TRUE + has_vagina = FALSE + if("Female") + has_penis = FALSE + has_vagina = TRUE diff --git a/modular_sand/code/modules/mob/mob.dm b/modular_sand/code/modules/mob/mob.dm index 05b0920a20..7957645e54 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/projectiles/guns/energy/kinetic_accelerator.dm b/modular_sand/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index ac51d7e5ec..12189b10ba 100644 --- a/modular_sand/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/modular_sand/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -1,21 +1,3 @@ -//Kinetic accelerator charging meme bugfix -/obj/item/gun/energy/kinetic_accelerator/ - var/chargetimer = null - -/obj/item/gun/energy/kinetic_accelerator/proc/reload() - if(ismob(loc) || isturf(loc)) //Kinetic accelerators won't charge inside objects. Period. - cell.give(cell.maxcharge) - if(!suppressed) - playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) - else - to_chat(loc, span_warning("[src] silently charges up.")) - update_icon() - overheat = FALSE - else //this is a terrible solution, but it ensures that it wont be stuck on dischaged if it fails to reload in an obj - if(chargetimer) - deltimer(chargetimer) - chargetimer = addtimer(CALLBACK(src, .proc/reload), overheat_time * 2, TIMER_STOPPABLE) - //BDM pka /obj/item/gun/energy/kinetic_accelerator/premiumka/bdminer name = "bloody accelerator" @@ -568,3 +550,37 @@ /obj/item/borg/upgrade/modkit/aoe/heavy/modify_projectile(obj/item/projectile/kinetic/K) K.name = "heavy kinetic explosion" + +/obj/item/gun/energy/kinetic_accelerator/premiumka + unique_reskin = list( + "Default" = list( + "name" = "premium accelerator", + "desc" = "A premium kinetic accelerator fitted with an extended barrel and increased pressure tank.", + "icon" = 'icons/obj/guns/energy.dmi', + "icon_state" = "premiumgun", + "item_state" = "premiumgun", + "lefthand_file" = 'icons/mob/inhands/weapons/guns_lefthand.dmi', + "righthand_file" = 'icons/mob/inhands/weapons/guns_righthand.dmi' + ), + "Conscript's tapper" = list( + "name" = "Conscript's tapper", + "desc" = "Good 'ol kinetic handgun that has been revised to mining and killing tool, works better in pair.", // lies + "icon" = 'modular_sand/icons/obj/guns/energy.dmi', + "icon_state" = "commando-gun", + "item_state" = "commando-gun", + "lefthand_file" = 'modular_sand/icons/mob/inhands/weapons/guns_lefthand.dmi', + "righthand_file" = 'modular_sand/icons/mob/inhands/weapons/guns_righthand.dmi' + ) + ) + +/obj/item/gun/energy/kinetic_accelerator/premiumka/reskin_obj(mob/user) + . = ..() + if(ismob(loc) && current_equipped_slot == ITEM_SLOT_HANDS) + var/mob/update_hands = loc + update_hands.update_inv_hands() + +/obj/item/gun/energy/kinetic_accelerator/premiumka/update_overlays() + . = ..() + if(current_skin == "Conscript's tapper") + if(can_shoot()) + . += "[icon_state]_cocked" diff --git a/modular_sand/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_sand/code/modules/reagents/chemistry/reagents/fermi_reagents.dm new file mode 100644 index 0000000000..903dbbd43c --- /dev/null +++ b/modular_sand/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -0,0 +1,28 @@ +// Plushmium object reaction +/datum/reagent/fermi/plushmium/reaction_obj(obj/O, reac_volume) + // Check for Saliith plush + if(istype(O, /obj/item/toy/plush/lizardplushie/saliith)) + // Check if a carbon user exists + if((!usr) || (!iscarbon(usr))) + // Return without any effects + return + + // Warn in local chat + O.loc.visible_message(span_warning("[src] is sprayed with a strange chemical, and reacts with overwhelming hostility! [usr] is sprayed with a concoction of horrible chemicals!")) + + // Define user mob + var/mob/living/carbon/human/spray_user = usr + + // Add chemicals + spray_user.reagents.add_reagent(/datum/reagent/toxin/mutagen, 20) + spray_user.reagents.add_reagent(/datum/reagent/toxin/mindbreaker, 20) + spray_user.reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 20) + //spray_user.reagents.add_reagent(/datum/reagent/toxin/histamine, 30) + spray_user.reagents.add_reagent(/datum/reagent/toxin/bonehurtingjuice, 30) + spray_user.reagents.add_reagent(/datum/reagent/toxin/brainhurtingjuice, 30) + + // Return without further effects + return + + // Return normally + . = ..() diff --git a/modular_sand/code/modules/research/designs/machine_designs.dm b/modular_sand/code/modules/research/designs/machine_designs.dm index 64cd845088..e5a4887cd1 100644 --- a/modular_sand/code/modules/research/designs/machine_designs.dm +++ b/modular_sand/code/modules/research/designs/machine_designs.dm @@ -33,21 +33,21 @@ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL //Cryptocurrency Miners -// /datum/design/board/cryptominer -// name = "Machine Design (Cryptocurrency Miner)" -// desc = "The circuit board for a Cryptocurrency Miner." -// id = "cryptominer" -// build_path = /obj/item/circuitboard/machine/cryptominer -// category = list("Misc. Machinery") -// departmental_flags = DEPARTMENTAL_FLAG_CARGO +/datum/design/board/cryptominer + name = "Machine Design (Cryptocurrency Miner)" + desc = "The circuit board for a Cryptocurrency Miner." + id = "cryptominer" + build_path = /obj/item/circuitboard/machine/cryptominer + category = list("Misc. Machinery") + departmental_flags = DEPARTMENTAL_FLAG_CARGO -// /datum/design/board/cryptominer/syndie -// name = "Machine Design (Syndicate Cryptocurrency Miner)" -// desc = "The circuit board for a Syndicate Cryptocurrency Miner." -// id = "cryptominersyndie" -// build_path = /obj/item/circuitboard/machine/cryptominer/syndie -// category = list("Misc. Machinery") -// departmental_flags = DEPARTMENTAL_FLAG_CARGO +/datum/design/board/cryptominer/syndie + name = "Machine Design (Syndicate Cryptocurrency Miner)" + desc = "The circuit board for a Syndicate Cryptocurrency Miner." + id = "cryptominersyndie" + build_path = /obj/item/circuitboard/machine/cryptominer/syndie + category = list("Misc. Machinery") + departmental_flags = DEPARTMENTAL_FLAG_CARGO //BS miner /datum/design/board/bluespace_miner diff --git a/modular_sand/code/modules/research/techweb/nodes/bluespace_nodes.dm b/modular_sand/code/modules/research/techweb/nodes/bluespace_nodes.dm index 59abd0c034..e341a5c1ab 100644 --- a/modular_sand/code/modules/research/techweb/nodes/bluespace_nodes.dm +++ b/modular_sand/code/modules/research/techweb/nodes/bluespace_nodes.dm @@ -1,18 +1,18 @@ -// /datum/techweb_node/cryptominer -// id = "cryptominer" -// display_name = "Cryptocurrency Mining" -// description = "Harness the power of cryptocurrency to make credits for Cargo-- slowly." -// prereq_ids = list("bluespace_mining") -// design_ids = list("cryptominer") -// research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) +/datum/techweb_node/cryptominer + id = "cryptominer" + display_name = "Cryptocurrency Mining" + description = "Harness the power of cryptocurrency to make credits for Cargo-- slowly." + prereq_ids = list("bluespace_mining") + design_ids = list("cryptominer") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) -// /datum/techweb_node/cryptominersyndie -// id = "cryptominersyndie" -// display_name = "Illegal Cryptocurrency Mining" -// description = "Harness the power of bluespace to make credits for Cargo-- slowly." -// prereq_ids = list("cryptominer","syndicate_basic") -// design_ids = list("cryptominersyndie") -// research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) +/datum/techweb_node/cryptominersyndie + id = "cryptominersyndie" + display_name = "Illegal Cryptocurrency Mining" + description = "Harness the power of bluespace to make credits for Cargo-- slowly." + prereq_ids = list("cryptominer","syndicate_basic") + design_ids = list("cryptominersyndie") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) /datum/techweb_node/computermath id = "computermath" diff --git a/modular_sand/code/modules/resize/resizing.dm b/modular_sand/code/modules/resize/resizing.dm index 9d0302561d..913fcbb294 100644 --- a/modular_sand/code/modules/resize/resizing.dm +++ b/modular_sand/code/modules/resize/resizing.dm @@ -19,12 +19,12 @@ return TRUE //Doing messages - if(abs(get_size(user)/get_size(target) >= 2)) //if the initiator is twice the size of the micro + if(COMPARE_SIZES(user, target) >= 2) //if the initiator is twice the size of the micro now_pushing = 0 user.forceMove(target.loc) //Smaller person being stepped on - if(get_size(user) > get_size(target) && iscarbon(src)) + if(iscarbon(src)) if(istype(user) && user.dna.features["taur"] == "Naga" || user.dna.features["taur"] == "Tentacle") target.visible_message(span_notice("[src] carefully slithers around [target]."), span_notice("[src]'s huge tail slithers besides you.")) else @@ -32,7 +32,7 @@ return TRUE //Smaller person stepping under a larger person - if(abs(get_size(target)/get_size(user)) >= 2) + if(COMPARE_SIZES(target, user) >= 2) user.forceMove(target.loc) now_pushing = 0 micro_step_under(target) @@ -59,7 +59,7 @@ user.forceMove(target.loc) return TRUE - if(abs(get_size(user)/get_size(target)) >= 2) + if(COMPARE_SIZES(user, target) >= 2) log_combat(user, target, "stepped on", addition="[user.a_intent] trample") if(user.a_intent == "disarm" && CHECK_MOBILITY(user, MOBILITY_MOVE) && !user.buckled) now_pushing = 0 @@ -67,7 +67,7 @@ user.sizediffStamLoss(target) user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE) //Full stop addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 3) //0.3 seconds - if(get_size(user) > get_size(target) && iscarbon(user)) + if(iscarbon(user)) if(istype(user) && user.dna.features["taur"] == "Naga" || user.dna.features["taur"] == "Tentacle") target.visible_message(span_danger("[src] carefully rolls their tail over [target]!"), span_danger("[src]'s huge tail rolls over you!")) else @@ -83,7 +83,7 @@ user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE) addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 10) //1 second //user.Stun(20) - if(get_size(user) > get_size(target) && iscarbon(user)) + if(iscarbon(user)) if(istype(user) && (user.dna.features["taur"] == "Naga" || user.dna.features["taur"] == "Tentacle")) target.visible_message(span_danger("[src] mows down [target] under their tail!"), span_userdanger("[src] plows their tail over you mercilessly!")) else @@ -97,7 +97,7 @@ user.sizediffStun(target) user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE) addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 7)//About 3/4th a second - if(get_size(user) > get_size(target) && iscarbon(user)) + if(iscarbon(user)) var/feetCover = (user.wear_suit && (user.wear_suit.body_parts_covered & FEET)) || (user.w_uniform && (user.w_uniform.body_parts_covered & FEET) || (user.shoes && (user.shoes.body_parts_covered & FEET))) if(feetCover) if(user?.dna?.features["taur"] == "Naga" || user?.dna?.features["taur"] == "Tentacle") @@ -116,7 +116,7 @@ SEND_SIGNAL(target, COMSIG_MICRO_PICKUP_FEET, user) return TRUE - if(abs(get_size(target)/get_size(user)) >= 2) + if(COMPARE_SIZES(target, user) >= 2) user.forceMove(target.loc) now_pushing = 0 micro_step_under(target) @@ -141,17 +141,17 @@ //Proc for scaling stamina damage on size difference /mob/living/carbon/proc/sizediffStamLoss(mob/living/carbon/target) - var/S = (get_size(src)/get_size(target)*25) //macro divided by micro, times 25 + var/S = COMPARE_SIZES(src, target) * 25 //macro divided by micro, times 25 target.Knockdown(S) //final result in stamina knockdown //Proc for scaling stuns on size difference (for grab intent) /mob/living/carbon/proc/sizediffStun(mob/living/carbon/target) - var/T = (get_size(src)/get_size(target)*2) //Macro divided by micro, times 2 + var/T = COMPARE_SIZES(src, target) * 2 //Macro divided by micro, times 2 target.Stun(T) //Proc for scaling brute damage on size difference /mob/living/carbon/proc/sizediffBruteloss(mob/living/carbon/target) - var/B = (get_size(src)/get_size(target)*3) //macro divided by micro, times 3 + var/B = COMPARE_SIZES(src, target) * 3 //macro divided by micro, times 3 target.adjustBruteLoss(B) //final result in brute loss //Proc for instantly grabbing valid size difference. Code optimizations soon(TM) diff --git a/modular_sand/icons/UI_Icons/inventory/socks.png b/modular_sand/icons/UI_Icons/inventory/socks.png index 9a5be04056..51ce9251de 100644 Binary files a/modular_sand/icons/UI_Icons/inventory/socks.png and b/modular_sand/icons/UI_Icons/inventory/socks.png differ diff --git a/modular_sand/icons/UI_Icons/inventory/undershirt.png b/modular_sand/icons/UI_Icons/inventory/undershirt.png index 3f581ec749..4ff410e90b 100644 Binary files a/modular_sand/icons/UI_Icons/inventory/undershirt.png and b/modular_sand/icons/UI_Icons/inventory/undershirt.png differ diff --git a/modular_sand/icons/UI_Icons/inventory/underwear.png b/modular_sand/icons/UI_Icons/inventory/underwear.png index b03245044c..1862bee7ca 100644 Binary files a/modular_sand/icons/UI_Icons/inventory/underwear.png and b/modular_sand/icons/UI_Icons/inventory/underwear.png differ diff --git a/modular_sand/icons/mob/clothing/head.dmi b/modular_sand/icons/mob/clothing/head.dmi index e4e8b762c5..b0b9a34673 100644 Binary files a/modular_sand/icons/mob/clothing/head.dmi and b/modular_sand/icons/mob/clothing/head.dmi differ diff --git a/modular_sand/icons/mob/clothing/head_muzzled.dmi b/modular_sand/icons/mob/clothing/head_muzzled.dmi index 168b605f70..19eb0eaf85 100644 Binary files a/modular_sand/icons/mob/clothing/head_muzzled.dmi and b/modular_sand/icons/mob/clothing/head_muzzled.dmi differ diff --git a/modular_sand/icons/mob/clothing/suit.dmi b/modular_sand/icons/mob/clothing/suit.dmi index cf40ce721c..0cfaf655f8 100644 Binary files a/modular_sand/icons/mob/clothing/suit.dmi and b/modular_sand/icons/mob/clothing/suit.dmi differ diff --git a/modular_sand/icons/mob/inhands/weapons/guns_lefthand.dmi b/modular_sand/icons/mob/inhands/weapons/guns_lefthand.dmi index 8871ec5afd..1b9839a127 100644 Binary files a/modular_sand/icons/mob/inhands/weapons/guns_lefthand.dmi and b/modular_sand/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/modular_sand/icons/mob/inhands/weapons/guns_righthand.dmi b/modular_sand/icons/mob/inhands/weapons/guns_righthand.dmi index a07597f370..ac450ce359 100644 Binary files a/modular_sand/icons/mob/inhands/weapons/guns_righthand.dmi and b/modular_sand/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/modular_sand/icons/mob/screen_clockwork.dmi b/modular_sand/icons/mob/screen_clockwork.dmi index aa72185aeb..eefd18fdc5 100644 Binary files a/modular_sand/icons/mob/screen_clockwork.dmi and b/modular_sand/icons/mob/screen_clockwork.dmi differ diff --git a/modular_sand/icons/mob/screen_liteweb.dmi b/modular_sand/icons/mob/screen_liteweb.dmi index 15ad6f42c6..80223eaa84 100644 Binary files a/modular_sand/icons/mob/screen_liteweb.dmi and b/modular_sand/icons/mob/screen_liteweb.dmi differ diff --git a/modular_sand/icons/mob/screen_midnight.dmi b/modular_sand/icons/mob/screen_midnight.dmi index 1b991bb960..9366925181 100644 Binary files a/modular_sand/icons/mob/screen_midnight.dmi and b/modular_sand/icons/mob/screen_midnight.dmi differ diff --git a/modular_sand/icons/mob/screen_operative.dmi b/modular_sand/icons/mob/screen_operative.dmi index 70824ea898..a435e1bece 100644 Binary files a/modular_sand/icons/mob/screen_operative.dmi and b/modular_sand/icons/mob/screen_operative.dmi differ diff --git a/modular_sand/icons/mob/screen_plasmafire.dmi b/modular_sand/icons/mob/screen_plasmafire.dmi index 3a07a34232..61d501dbe2 100644 Binary files a/modular_sand/icons/mob/screen_plasmafire.dmi and b/modular_sand/icons/mob/screen_plasmafire.dmi differ diff --git a/modular_sand/icons/mob/screen_retro.dmi b/modular_sand/icons/mob/screen_retro.dmi index ba20a9e8bd..a25def4d11 100644 Binary files a/modular_sand/icons/mob/screen_retro.dmi and b/modular_sand/icons/mob/screen_retro.dmi differ diff --git a/modular_sand/icons/mob/screen_slimecore.dmi b/modular_sand/icons/mob/screen_slimecore.dmi index a4854f16c3..1b51613f97 100644 Binary files a/modular_sand/icons/mob/screen_slimecore.dmi and b/modular_sand/icons/mob/screen_slimecore.dmi differ diff --git a/modular_sand/icons/obj/clothing/hats.dmi b/modular_sand/icons/obj/clothing/hats.dmi index e393feeb57..b269f8d166 100644 Binary files a/modular_sand/icons/obj/clothing/hats.dmi and b/modular_sand/icons/obj/clothing/hats.dmi differ diff --git a/modular_sand/icons/obj/clothing/suits.dmi b/modular_sand/icons/obj/clothing/suits.dmi index f2b9bedc0e..05ba6f3f04 100644 Binary files a/modular_sand/icons/obj/clothing/suits.dmi and b/modular_sand/icons/obj/clothing/suits.dmi differ diff --git a/modular_sand/icons/obj/contraband.dmi b/modular_sand/icons/obj/contraband.dmi index 37d26caed6..81f26f8c34 100644 Binary files a/modular_sand/icons/obj/contraband.dmi and b/modular_sand/icons/obj/contraband.dmi differ diff --git a/modular_sand/icons/obj/device.dmi b/modular_sand/icons/obj/device.dmi index 555e379fb6..28b1b5503e 100644 Binary files a/modular_sand/icons/obj/device.dmi and b/modular_sand/icons/obj/device.dmi differ diff --git a/modular_sand/icons/obj/guns/energy.dmi b/modular_sand/icons/obj/guns/energy.dmi index 18cb252bd8..5b5e9867cf 100644 Binary files a/modular_sand/icons/obj/guns/energy.dmi and b/modular_sand/icons/obj/guns/energy.dmi differ diff --git a/modular_sand/icons/obj/plushes.dmi b/modular_sand/icons/obj/plushes.dmi index 55aeacf397..71bd3885c4 100644 Binary files a/modular_sand/icons/obj/plushes.dmi and b/modular_sand/icons/obj/plushes.dmi differ diff --git a/modular_splurt/code/_globalvars/lists/mobs.dm b/modular_splurt/code/_globalvars/lists/mobs.dm index 92a3c83791..22062af329 100644 --- a/modular_splurt/code/_globalvars/lists/mobs.dm +++ b/modular_splurt/code/_globalvars/lists/mobs.dm @@ -1 +1,2 @@ GLOBAL_LIST_EMPTY(discord_passthrough) +GLOBAL_LIST_EMPTY(ssd_mob_list) // Player mobs that are SSD diff --git a/modular_splurt/code/controllers/configuration/entries/splurt_autocryo.dm b/modular_splurt/code/controllers/configuration/entries/splurt_autocryo.dm new file mode 100644 index 0000000000..c94e2e3d98 --- /dev/null +++ b/modular_splurt/code/controllers/configuration/entries/splurt_autocryo.dm @@ -0,0 +1,8 @@ +// Time before sending the user to cryo +/datum/config_entry/number/autocryo_time_trigger + config_entry_value = 24000 + min_val = 600 + integer = TRUE + +// Should this system be used? +/datum/config_entry/flag/autocryo_enabled diff --git a/modular_splurt/code/controllers/configuration/entries/splurt_general.dm b/modular_splurt/code/controllers/configuration/entries/splurt_general.dm index 8c79ccfe15..cf0b983434 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 0000000000..70e213c269 --- /dev/null +++ b/modular_splurt/code/controllers/subsystem/afk.dm @@ -0,0 +1,43 @@ +// Define config entries for cryo +#define SUBSYSTEM_CRYO_CAN_RUN CONFIG_GET(flag/autocryo_enabled) +#define SUBSYSTEM_CRYO_TIME CONFIG_GET(number/autocryo_time_trigger) + +SUBSYSTEM_DEF(auto_cryo) + name = "Automated Cryogenics" + flags = SS_BACKGROUND + +/datum/controller/subsystem/auto_cryo/Initialize() + // Check config before running + if(!SUBSYSTEM_CRYO_CAN_RUN) + can_fire = FALSE + + return ..() + +/datum/controller/subsystem/auto_cryo/fire() + // Check for any targets + if(!GLOB.ssd_mob_list.len) + // No SSD mobs exist + return + + // Check possible targets + for(var/mob/living/cryo_mob in GLOB.ssd_mob_list) + // Get SSD time + // This is set when disconnecting + var/afk_time = world.time - cryo_mob.lastclienttime + + // Check if client meets the time requirement + if(afk_time < SUBSYSTEM_CRYO_TIME) + continue + + // Send to cryo + cryoMob(cryo_mob, effects = TRUE) + + // Remove from SSD list + GLOB.ssd_mob_list -= cryo_mob + + // Log cryo interaction + log_game("[cryo_mob] was sent to cryo after being SSD for [afk_time] ticks.") + +// Remove defines +#undef SUBSYSTEM_CRYO_CAN_RUN +#undef SUBSYSTEM_CRYO_TIME diff --git a/modular_splurt/code/datums/components/dullahan.dm b/modular_splurt/code/datums/components/dullahan.dm index a8558a5835..6fae1b981d 100644 --- a/modular_splurt/code/datums/components/dullahan.dm +++ b/modular_splurt/code/datums/components/dullahan.dm @@ -1,3 +1,15 @@ +#define HEAD_ACCESSORIES_PATHS list(\ + /obj/item/clothing/head = 'icons/mob/clothing/head.dmi',\ + /obj/item/clothing/glasses = 'icons/mob/clothing/eyes.dmi',\ + /obj/item/reagent_containers/glass/bucket = 'icons/mob/clothing/head.dmi',\ + /obj/item/reagent_containers/rag/towel = 'icons/mob/clothing/head.dmi',\ + /obj/item/paper = 'icons/mob/clothing/head.dmi',\ + /obj/item/nullrod/fedora = 'icons/mob/clothing/head.dmi',\ + ) + +/obj/item/organ/eyes/dullahan + tint = 0 + /datum/component/neckfire var/mutable_appearance/neck_fire @@ -30,7 +42,7 @@ neck_fire.icon_state = "neckfire" neck_fire.color = fire_color - neck_fire.plane = 19 // glowy i hope + //neck_fire.plane = 19 // glowy i hope var/datum/action/neckfire/A = new /datum/action/neckfire(src) A.Grant(M) @@ -72,3 +84,84 @@ var/mob/living/carbon/human/H = quirk_holder if(H.dna.features["neckfire"] && !istype(H, /mob/living/carbon/human/dummy)) H.AddComponent(/datum/component/neckfire, H.dna.features["neckfire_color"]) + +/datum/component/dullahan + var/obj/item/clothing/head_accessory + var/mutable_appearance/head_accessory_MA + +/datum/component/dullahan/Initialize() + . = ..() + RegisterSignal(dullahan_head, COMSIG_MOUSEDROPPED_ONTO, .proc/on_mouse_dropped) + RegisterSignal(dullahan_head, COMSIG_MOUSEDROP_ONTO, .proc/on_mouse_drop) + +/datum/component/dullahan/proc/add_head_accessory(obj/item/clothing/I, item_path) + head_accessory_MA = mutable_appearance(I.mob_overlay_icon || HEAD_ACCESSORIES_PATHS[item_path]) + head_accessory_MA.icon_state = I.icon_state + I.forceMove(dullahan_head) + + dullahan_head.add_overlay(head_accessory_MA) + head_accessory = I + +/datum/component/dullahan/proc/remove_head_accessory(obj/item/clothing/I) + dullahan_head.cut_overlay(head_accessory_MA) + head_accessory = null + +/datum/component/dullahan/proc/on_mouse_dropped(datum/source, obj/item/I, mob/living/user) + var/mob/living/carbon/owner = dullahan_head.owner + var/item_path + + for(var/type in HEAD_ACCESSORIES_PATHS) + if(istype(I, type)) + item_path = type + break + + if(item_path && !head_accessory) + if(istype(I, /obj/item/clothing)) + var/obj/item/organ/eyes/dullahan/eyes = owner.getorganslot(ORGAN_SLOT_EYES) + var/obj/item/clothing/clothing = I + + eyes.flash_protect = clothing.flash_protect + eyes.tint = clothing.tint + owner.update_tint() + + add_head_accessory(I, item_path) + else + to_chat(user, span_notice("You can't put \the [I.name] on the head of \the [owner.name]")) + return + +/datum/component/dullahan/proc/on_mouse_drop(datum/source, atom/A, mob/living/user) + var/mob/living/carbon/owner = dullahan_head.owner + + if(head_accessory) + if(istype(A, /turf/open)) + head_accessory.forceMove(A) + else if(istype(A, /atom/movable/screen/inventory/hand)) + var/atom/movable/screen/inventory/hand/H = A + + user.put_in_hand(head_accessory, H.held_index) + else + return + + var/obj/item/organ/eyes/dullahan/eyes = owner.getorganslot(ORGAN_SLOT_EYES) + eyes.flash_protect = 0 + eyes.tint = 0 + owner.update_tint() + + remove_head_accessory(head_accessory) + +/datum/action/item_action/organ_action/dullahan/proc/toggle_monochromacy() + var/obj/item/organ/eyes/eyes = owner.getorganslot(ORGAN_SLOT_EYES) + + if(eyes.monochromacy_on) + owner.remove_client_colour(/datum/client_colour/monochrome) + else + owner.add_client_colour(/datum/client_colour/monochrome) + + eyes.monochromacy_on = !eyes.monochromacy_on + +/obj/item/organ/eyes + var/monochromacy_on = FALSE + +/datum/action/item_action/organ_action/dullahan/Grant(mob/M) + . = ..() + toggle_monochromacy() diff --git a/modular_splurt/code/datums/elements/mob_holder.dm b/modular_splurt/code/datums/elements/mob_holder.dm new file mode 100644 index 0000000000..ff64372b70 --- /dev/null +++ b/modular_splurt/code/datums/elements/mob_holder.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/head/mob_holder + is_edible = -1 diff --git a/modular_splurt/code/datums/interactions/lewd/lewd_datums.dm b/modular_splurt/code/datums/interactions/lewd/lewd_datums.dm index ca6fddf6e8..896cc1c05f 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/mood_events/drug_events.dm b/modular_splurt/code/datums/mood_events/drug_events.dm index 3cbe25cf67..906326aab2 100644 --- a/modular_splurt/code/datums/mood_events/drug_events.dm +++ b/modular_splurt/code/datums/mood_events/drug_events.dm @@ -3,6 +3,6 @@ description = span_nicegreen("I feel like I\'m finally coping!") /datum/mood_event/moth_in_chief - description = span_nicegreen("The mantle rests well upon your shoulders?") + description = span_nicegreen("The mantle rests well upon your shoulders?\n") mood_change = 10 timeout = 5 MINUTES diff --git a/modular_splurt/code/datums/mood_events/generic_negative_events.dm b/modular_splurt/code/datums/mood_events/generic_negative_events.dm index 204bc9c5cd..7d63afe9f0 100644 --- a/modular_splurt/code/datums/mood_events/generic_negative_events.dm +++ b/modular_splurt/code/datums/mood_events/generic_negative_events.dm @@ -1,5 +1,5 @@ /datum/mood_event/masked_mook_incomplete - description = span_warning("I feel incomplete without a gas mask...") + description = span_warning("I feel incomplete without a gas mask...\n") mood_change = -4 /datum/mood_event/creampie/cheesed @@ -12,7 +12,7 @@ if(!ishuman(actual_owner)) return . if(iscatperson(actual_owner)) - description = span_warning("CHEESE!!! WAAAAAAAAAAAAAAAAAAAAAAAAAAAA!!!") + description = span_warning("CHEESE!!! WAAAAAAAAAAAAAAAAAAAAAAAAAAAA!!!\n") mood_change = -5 timeout = 5 MINUTES @@ -23,3 +23,14 @@ /datum/mood_event/dorsualiphobic_mood_negative description = span_warning("I can't let anyone find out if I'm wearing a backpack or not!\n") mood_change = -4 + +// Matches drinking synth blood (drankblood_synth) +/datum/mood_event/drankblood_slime + description = span_boldwarning("I drank liquid slime. What is wrong with me?\n") + mood_change = -7 + timeout = 15 MINUTES + +/datum/mood_event/drank_cursed_bad + description = span_warning("I can feel a pale curse from the blood I drank.\n") + mood_change = -1 + timeout = 2 MINUTES diff --git a/modular_splurt/code/datums/mood_events/generic_positive_events.dm b/modular_splurt/code/datums/mood_events/generic_positive_events.dm index 0696042bd2..161be9cd46 100644 --- a/modular_splurt/code/datums/mood_events/generic_positive_events.dm +++ b/modular_splurt/code/datums/mood_events/generic_positive_events.dm @@ -1,22 +1,35 @@ /datum/mood_event/lewd_headpat - description = span_nicegreen("I love headpats so much!") + description = span_nicegreen("I love headpats so much!\n") mood_change = 3 timeout = 2 MINUTES /datum/mood_event/qareen_bliss - description = span_umbra("So.. horny...") + description = span_umbra("So.. horny...\n") mood_change = 5 /datum/mood_event/qareen_bliss/add_effects() - description = span_umbra("Must.. breed. , [pick("Nngggghh", "Can't.. think.", "It feels so good.", "Need.. fuck.")]...") + description = span_umbra("Must.. breed. , [pick("Nngggghh", "Can't.. think.", "It feels so good.", "Need.. fuck.")]...\n") /datum/mood_event/masked_mook - description = span_nicegreen("I feel more complete with gas mask on.") + description = span_nicegreen("I feel more complete with gas mask on.\n") mood_change = 1 +/datum/mood_event/cloth_eaten + description = " That sure was a tasty outfit!\n" + mood_change = 3 + timeout = 2400 + +/datum/mood_event/cloth_eaten/add_effects(obj/item/clothing/eaten) + description = "That sure was a [pick("tasty","good","linty","amazing")] [eaten.name]!\n" + /datum/mood_event/nudist_positive - description = span_nicegreen("I'm delighted to not be constricted by clothing.") + description = span_nicegreen("I'm delighted to not be constricted by clothing.\n") mood_change = 1 /datum/mood_event/dorsualiphobic_mood_positive - description = span_nicegreen("Nobody will know if I'm wearing a backpack or not.") + description = span_nicegreen("Nobody will know if I'm wearing a backpack or not.\n") mood_change = 1 + +/datum/mood_event/drank_cursed_good + description = span_nicegreen("I\'ve tasted sympathy from a fellow curse bearer.\n") + mood_change = 1 + timeout = 2 MINUTES diff --git a/modular_splurt/code/datums/mood_events/needs_events.dm b/modular_splurt/code/datums/mood_events/needs_events.dm index 6b92548f72..046a796a19 100644 --- a/modular_splurt/code/datums/mood_events/needs_events.dm +++ b/modular_splurt/code/datums/mood_events/needs_events.dm @@ -3,14 +3,14 @@ var/mob/living/carbon/human/actual_owner = owner_mob() if(!HAS_TRAIT(actual_owner, TRAIT_VORACIOUS)) return - description = span_nicegreen("MORE FOOD!!! MORE FOOD!!! MORE FOOD!!!") + description = span_nicegreen("MORE FOOD!!! MORE FOOD!!! MORE FOOD!!!\n") mood_change = 8 /datum/mood_event/cum_craving - description = "I... NEED... CUM...\n" + description = span_warning("I... NEED... CUM...\n") mood_change = -20 /datum/mood_event/cum_stuffed - description = span_nicegreen("It feels so good inside me!") + description = span_nicegreen("It feels so good inside me!\n") mood_change = 8 timeout = 5 MINUTES diff --git a/modular_splurt/code/datums/mood_events/preg_events.dm b/modular_splurt/code/datums/mood_events/preg_events.dm index b5ccd1444f..628d10b089 100644 --- a/modular_splurt/code/datums/mood_events/preg_events.dm +++ b/modular_splurt/code/datums/mood_events/preg_events.dm @@ -1,8 +1,8 @@ /datum/mood_event/pregnant_negative - description = span_boldwarning("THE BABY IS COMING OUT...") + description = span_boldwarning("THE BABY IS COMING OUT...\n") mood_change = -7 /datum/mood_event/pregnant_positive - description = span_nicegreen("The baby came out...phew") + description = span_nicegreen("The baby came out...phew\n") mood_change = 3 timeout = 2 MINUTES diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm index b305c79997..70a84f4d82 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." @@ -143,3 +158,10 @@ desc = "You are able to move about freely in pressurized low-gravity environments be it through the use of wings, magic, or some other physiological nonsense." value = 1 mob_trait = TRAIT_FLUTTER + +/datum/quirk/cloth_eater + name = "Clothes Eater" + desc = "You can eat most apparel to gain a boost in mood, and to gain some nutrients. (Insects already have this.)" + value = 1 + var/mood_category ="cloth_eaten" + mob_trait = TRAIT_CLOTH_EATER diff --git a/modular_splurt/code/datums/traits/negative.dm b/modular_splurt/code/datums/traits/negative.dm index 04a1c1825d..a000de17ab 100644 --- a/modular_splurt/code/datums/traits/negative.dm +++ b/modular_splurt/code/datums/traits/negative.dm @@ -66,13 +66,6 @@ speech_args[SPEECH_MESSAGE] = message //Own stuff -/datum/quirk/no_clone - name = "DNC" - desc = "You have filed a Do Not Clone order, stating that you do not wish to be cloned. You can still be revived by other means." - value = -2 - mob_trait = TRAIT_NO_CLONE - medical_record_text = "Patient has a DNC (Do Not Clone) order and will be rejected by cloning mechanisms as a result." - /datum/quirk/no_guns name = "Fat-Fingered" desc = "Due to the shape of your hands, width of your fingers or just not having fingers at all, you're unable to fire guns without accommodation." diff --git a/modular_splurt/code/datums/traits/neutral.dm b/modular_splurt/code/datums/traits/neutral.dm index ef6552c70c..5fdca5e6f5 100644 --- a/modular_splurt/code/datums/traits/neutral.dm +++ b/modular_splurt/code/datums/traits/neutral.dm @@ -61,14 +61,6 @@ . = ..() quirk_holder.RemoveElement(/datum/element/wuv/headpat) -/datum/quirk/in_heat - name = "In Heat" - desc = "Your system burns with the desire to be bred. Satisfying your lust will make you happy, but ignoring it may cause you to become sad and needy." - value = 0 - mob_trait = TRAIT_IN_HEAT - gain_text = span_notice("You body burns with the desire to be bred.") - lose_text = span_notice("You feel more in control of your body and thoughts.") - /datum/quirk/Hypnotic_gaze name = "Hypnotic Gaze" desc = "Be it through mysterious patterns, flickering colors, or some genetic oddity, prolonged eye contact with you will place the viewer into a highly-suggestible hypnotic trance." @@ -84,14 +76,6 @@ spell.Grant(Hypno_eyes) spell.owner = Hypno_eyes -/datum/quirk/heat - name = "Estrus Detection" - desc = "You have a animalistic sense of detecting if someone is in heat." - value = 0 - mob_trait = TRAIT_HEAT_DETECT - gain_text = span_notice("You feel your senses adjust, allowing a animalistic sense of others' fertility.") - lose_text = span_notice("You feel your sense of others' fertility fade.") - /datum/quirk/overweight name = "Overweight" desc = "You're particularly fond of food, and join the shift being overweight." @@ -365,105 +349,204 @@ var/mob/living/carbon/human/H = quirk_holder H.adjust_nutrition(-0.09)//increases their nutrition loss rate to encourage them to gain a partner they can essentially leech off of -/datum/quirk/vampire//splurt change start - name = "Bloodsucker Fledgeling" - desc = "You are a fledgeling of an ancient Bloodsucker bloodline; your skin is incurably pale and your mouth glimmers with vampiric fangs. Only blood will sate your hungers, and holy energies will cause your flesh to char." - value = 0 - medical_record_text = "this person was partially infected by a bloodsucker" - mob_trait = BLOODFLEDGE - gain_text = span_notice("You feel an otherworldly thirst.") - lose_text = span_notice("you feel an otherworldy burden remove itself") +/datum/quirk/bloodfledge + name = "Bloodsucker Fledgling" + desc = "You are a fledgling belonging to ancient Bloodsucker bloodline. While the blessing has yet to fully convert you, some things have changed. Only blood will sate your hungers, and holy energies will cause your flesh to char. This is NOT an antagonist role!" + value = 2 + medical_record_text = "Patient exhibits onset symptoms of a sanguine curse." + mob_trait = TRAIT_BLOODFLEDGE + gain_text = span_notice("You feel a sanguine thirst.") + lose_text = span_notice("You feel the sanguine thirst fade away.") processing_quirk = TRUE -/datum/quirk/vampire/add() +/datum/quirk/bloodfledge/add() . = ..() - var/mob/living/carbon/human/H = quirk_holder - ADD_TRAIT(H,TRAIT_NO_PROCESS_FOOD,ROUNDSTART_TRAIT) - ADD_TRAIT(H,TRAIT_COLDBLOODED,ROUNDSTART_TRAIT) - ADD_TRAIT(H,TRAIT_NOBREATH,ROUNDSTART_TRAIT) - ADD_TRAIT(H,TRAIT_NOTHIRST,ROUNDSTART_TRAIT) - ADD_TRAIT(H,TRAIT_QUICKER_CARRY,ROUNDSTART_TRAIT) - ADD_TRAIT(H,TRAIT_AUTO_CATCH_ITEM,ROUNDSTART_TRAIT)//these two make the vampire fast and enables some sexy "bet you didnt think i could do this" romance - if(!H.dna.skin_tone_override) - H.skin_tone = "albino" - var/datum/action/vbite/B = new - var/datum/action/vrevive/R = new - B.Grant(H) - R.Grant(H) - H.grant_language(/datum/language/vampiric, TRUE, TRUE, LANGUAGE_BLOODSUCKER) -/datum/quirk/vampire/on_process() + // Define quirk mob + var/mob/living/carbon/human/quirk_mob = quirk_holder + + // Add quirk traits + ADD_TRAIT(quirk_mob,TRAIT_NO_PROCESS_FOOD,ROUNDSTART_TRAIT) + ADD_TRAIT(quirk_mob,TRAIT_NOTHIRST,ROUNDSTART_TRAIT) + + // Set skin tone, if possible + if(!quirk_mob.dna.skin_tone_override) + quirk_mob.skin_tone = "albino" + + // Add quirk ability action datums + var/datum/action/bloodfledge/bite/act_bite = new + var/datum/action/bloodfledge/revive/act_revive = new + act_bite.Grant(quirk_mob) + act_revive.Grant(quirk_mob) + + // Add quirk language + quirk_mob.grant_language(/datum/language/vampiric, TRUE, TRUE, LANGUAGE_BLOODSUCKER) + +/datum/quirk/bloodfledge/on_process() . = ..() - var/mob/living/carbon/human/H = quirk_holder - var/area/A = get_area(H) - if(istype(A, /area/service/chapel) && H.mind?.assigned_role != "Chaplain") - H.adjustStaminaLoss(2) - H.adjust_nutrition(-0.3)//changed these to be less deadly and more of an inconvinience - H.adjust_disgust(1) - if(istype(H.loc, /obj/structure/closet/crate/coffin))//heals the vampire if in a coffin, except burn which fire can be considered holy - H.heal_overall_damage(4,4) - H.adjust_disgust(-7) - H.adjustOxyLoss(-4) - H.adjustCloneLoss(-4) - H.adjustBruteLoss(-0.3) - H.adjustFireLoss(-0.3) - if(!is_species(H, /datum/species/jelly)) //checks species - H.adjustToxLoss(-5)//heals toxin if not slime + + // Check if the current area is a coffin + if(istype(quirk_holder.loc, /obj/structure/closet/crate/coffin)) + // Define quirk mob + var/mob/living/carbon/human/quirk_mob = quirk_holder + + // Quirk mob must be injured + if(quirk_mob.health >= quirk_mob.maxHealth) + return + + // Prevent healing for robots + // This caused numerous technical issues + if(quirk_mob.mob_biotypes & MOB_ROBOTIC) + // Display a warning chat message (10% chance) + if(prob(20)) + to_chat(quirk_mob, span_warning("Your mechanical body rejects the curse's healing properties!")) + + // Return without healing, due robotic nature + return + + // Nutrition (blood) level must be above STARVING + if(quirk_mob.nutrition <= NUTRITION_LEVEL_STARVING) + // Display a warning chat message (10% chance) + if(prob(20)) + to_chat(quirk_mob, span_warning("You need more blood before you can regenerate!")) + + // Return without healing, due to lack of blood + return + + // Define initial health + var/health_start = quirk_mob.health + + // Heal brute and burn + // Accounts for robotic limbs + quirk_mob.heal_overall_damage(2,2) + /* + // Heal brute + quirk_mob.adjustBruteLoss(-2) + // Heal burn + quirk_mob.adjustFireLoss(-2) + */ + // Heal oxygen + quirk_mob.adjustOxyLoss(-2) + // Heal clone + quirk_mob.adjustCloneLoss(-2) + + // Check for slime race + // NOT a slime + if(!isslimeperson(quirk_mob)) + // Heal toxin + quirk_mob.adjustToxLoss(-2) + // IS a slime else - H.adjustToxLoss(5)//heals toxin if slime - return - if(H.nutrition == 0) - if(H.staminaloss < 99)//makes them tired but dosent stun them - H.adjustStaminaLoss(3, FALSE, TRUE) - else - H.adjustStaminaLoss(-1,FALSE, FALSE)//this also helps with if someone is stuck in the chapel for way too long, and i tested with a stun sword that stunning for sec is still possible - if(prob(2)) //2 percent chance (if it was true randome D:<) - to_chat(H, span_warning("I need blood NOW!!!")) + // Grant toxin (heals slimes) + quirk_mob.adjustToxLoss(2) -/datum/quirk/vampire/remove() + // Update health + quirk_mob.updatehealth() + + // Determine healed amount + var/health_restored = quirk_mob.health - health_start + + // Remove nutrition (blood) as compensation for healing + // Amount is equal to 50% of healing done + quirk_mob.adjust_nutrition(health_restored*-1) + +/datum/quirk/bloodfledge/remove() . = ..() - var/mob/living/carbon/human/H = quirk_holder - var/datum/action/vbite/B = locate() in H.actions - var/datum/action/vrevive/R = locate() in H.actions - REMOVE_TRAIT(H, TRAIT_NO_PROCESS_FOOD, ROUNDSTART_TRAIT) - REMOVE_TRAIT(H, TRAIT_COLDBLOODED, ROUNDSTART_TRAIT) - REMOVE_TRAIT(H, TRAIT_NOBREATH, ROUNDSTART_TRAIT) - REMOVE_TRAIT(H, TRAIT_NOTHIRST, ROUNDSTART_TRAIT) - REMOVE_TRAIT(H,TRAIT_QUICKER_CARRY,ROUNDSTART_TRAIT) - REMOVE_TRAIT(H,TRAIT_AUTO_CATCH_ITEM,ROUNDSTART_TRAIT) - B.Remove(H) - R.Remove(H) - H.remove_language(/datum/language/vampiric, TRUE, TRUE, LANGUAGE_BLOODSUCKER) + + // Define quirk mob + var/mob/living/carbon/human/quirk_mob = quirk_holder -/datum/quirk/vampire/on_spawn() - var/mob/living/carbon/human/H = quirk_holder - var/obj/item/card/id/vampire/vcard = new /obj/item/card/id/vampire - H.equip_to_slot(vcard, ITEM_SLOT_BACKPACK) - vcard.registered_name = H.real_name - vcard.update_label(addtext(vcard.registered_name, " the vampire")) - //var/obj/item/card/id/I = H.get_idcard(FALSE) maybe later, hop can just give the extra card proper access if needed, as for banking, that can be set on spawn by the player using the card in hand - //vcard.access = I.access - H.regenerate_icons() + // Remove quirk traits + REMOVE_TRAIT(quirk_mob, TRAIT_NO_PROCESS_FOOD, ROUNDSTART_TRAIT) + REMOVE_TRAIT(quirk_mob, TRAIT_NOTHIRST, ROUNDSTART_TRAIT) + + // Remove quirk ability action datums + var/datum/action/bloodfledge/bite/act_bite = locate() in quirk_mob.actions + var/datum/action/bloodfledge/revive/act_revive = locate() in quirk_mob.actions + act_bite.Remove(quirk_mob) + act_revive.Remove(quirk_mob) + + // Remove quirk language + quirk_mob.remove_language(/datum/language/vampiric, TRUE, TRUE, LANGUAGE_BLOODSUCKER) + +/datum/quirk/bloodfledge/on_spawn() . = ..() + // Define quirk mob + var/mob/living/carbon/human/quirk_mob = quirk_holder + + // Create vampire ID card + var/obj/item/card/id/vampire/id_vampire = new /obj/item/card/id/vampire(get_turf(quirk_holder)) + + // Update card information + id_vampire.registered_name = quirk_mob.real_name + id_vampire.update_label(addtext(id_vampire.registered_name, "'s Bloodfledge")) + + // Determine banking ID information + for(var/bank_account in SSeconomy.bank_accounts) + // Define current iteration's account + var/datum/bank_account/account = bank_account + + // Check for match + if(account.account_id == quirk_mob.account_id) + // Add to cards list + account.bank_cards += src + + // Assign account + id_vampire.registered_account = account + + // Stop searching + break + + // Try to add ID to backpack + var/id_in_bag = quirk_mob.equip_to_slot_if_possible(id_vampire, ITEM_SLOT_BACKPACK) || FALSE + + // Text for where the item was sent + var/id_location = (id_in_bag ? "in your backpack" : "at your feet" ) + + // Alert user in chat + // This should not post_add, because the ID is added by on_spawn + to_chat(quirk_holder, span_boldnotice("There is a bloodfledge's ID card [id_location], linked to your station account. It functions as a spare ID, but lacks job access.")) /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" diff --git a/modular_splurt/code/datums/traits/trait_actions.dm b/modular_splurt/code/datums/traits/trait_actions.dm index 792f7b8e8f..da19988868 100644 --- a/modular_splurt/code/datums/traits/trait_actions.dm +++ b/modular_splurt/code/datums/traits/trait_actions.dm @@ -1,4 +1,5 @@ -#define BLOOD_DRAIN_NUM 50 +#define BLOODFLEDGE_DRAIN_NUM 50 +#define BLOODFLEDGE_COOLDOWN_BITE 60 // // Quirk: Hypnotic Gaze @@ -10,71 +11,205 @@ button_icon_state = "Hypno_eye" icon_icon = 'modular_splurt/icons/mob/actions/lewd_actions/lewd_icons.dmi' background_icon_state = "bg_alien" - var/mob/living/carbon/T //hypnosis target - var/mob/living/carbon/human/H //Person with the quirk /datum/action/innate/Hypnotize/Activate() - var/mob/living/carbon/human/H = owner + // Define action owner + var/mob/living/carbon/human/action_owner = owner - if(!H.pulling || !isliving(H.pulling) || H.grab_state < GRAB_AGGRESSIVE) - to_chat(H, span_warning("You need to aggressively grab someone to hypnotize them!")) + // Define target + var/grab_target = action_owner.pulling + + // Check for target + if(!grab_target) + // Warn the user, then return + to_chat(action_owner, span_warning("You you need to grab someone first!")) return - var/mob/living/carbon/T = H.pulling - - if(T.IsSleeping()) - to_chat(H, "You can't hypnotize [T] whilst they're asleep!") + // Check for cyborg + if(iscyborg(grab_target)) + // Warn the user, then return + to_chat(action_owner, span_warning("You can't hypnotize a cyborg!")) return - to_chat(H, span_notice("You stare deeply into [T]'s eyes...")) - to_chat(T, span_warning("[H] stares intensely into your eyes...")) - if(!do_mob(H, T, 12 SECONDS)) + // Check for alien + // Taken from eyedropper check + /* + if(isalien(grab_target)) + // Warn the user, then return + to_chat(action_owner, span_warning("[grab_target] doesn\'t seem to have any eyes!")) + return + */ + + // Check for carbon human target + if(!ishuman(grab_target)) + // Warn the user, then return + to_chat(action_owner, span_warning("That's not a valid creature!")) return - if(H.pulling !=T || H.grab_state < GRAB_AGGRESSIVE) + // Check if target is alive + if(!isliving(grab_target)) + // Warn the user, then return + to_chat(action_owner, span_warning("You can't hypnotize the dead!")) return - if(!(H in view(1, H.loc))) + // Check for aggressive grab + if(action_owner.grab_state < GRAB_AGGRESSIVE) + // Warn the user, then return + to_chat(action_owner, span_warning("You need a stronger grip before trying this!")) return - if(!(T.client?.prefs.cit_toggles & HYPNO)) + // Define target + var/mob/living/carbon/human/action_target = grab_target + + // Check if target has a mind + if(!action_target.mind) + // Warn the user, then return + to_chat(action_owner, span_warning("[grab_target] doesn\'t have a compatible mind!")) return - var/response = alert(T, "Do you wish to fall into a hypnotic sleep?(This will allow [H] to issue hypnotic suggestions)", "Hypnosis", "Yes", "No") - - if(response == "Yes") - T.visible_message(span_warning("[T] falls into a deep slumber!"), "Your eyelids gently shut as you fall into a deep slumber. All you can hear is [H]'s voice as you commit to following all of their suggestions.") - - T.SetSleeping(1200) - T.drowsyness = max(T.drowsyness, 40) - T = H.pulling - var/response2 = alert(H, "Would you like to release your subject or give them a suggestion?", "Hypnosis", "Suggestion", "Release") - - if(response2 == "Suggestion") - if(get_dist(H, T) > 1) - to_chat(H, "You must stand in whisper range of [T].") - return - - var/text = input("What would you like to suggest?", "Hypnotic suggestion", null, null) - text = sanitize(text) - if(!text) - return - - to_chat(H, "You whisper your suggestion in a smooth calming voice to [T]") - to_chat(T, span_hypnophrase("...[text]...")) - - T.visible_message(span_warning("[T] wakes up from their deep slumber!"), "Your eyelids gently open as you see [H]'s face staring back at you.") - T.SetSleeping(0) - T = null - return - - if(response2 == "Release") - T.SetSleeping(0) - return - else - T.visible_message(span_warning("[T]'s attention breaks, despite the attempt to hypnotize them! They clearly don't want this!"), "Your concentration breaks as you realise you have no interest in following [H]'s words!") + /* Unused: Replaced by get_eye_protection + // Check if target's eyes are obscured + // ... by headwear + if((action_target.head && action_target.head.flags_cover & HEADCOVERSEYES)) + // Warn the user, then return + to_chat(action_owner, span_warning("[action_target]'s eyes are obscured by [action_target.head].")) return + // ... by a mask + else if((action_target.wear_mask && action_target.wear_mask.flags_cover & MASKCOVERSEYES)) + // Warn the user, then return + to_chat(action_owner, span_warning("[action_target]'s eyes are obscured by [action_target.wear_mask].")) + return + + // ... by glasses + else if((action_target.glasses && action_target.glasses.flags_cover & GLASSESCOVERSEYES)) + // Warn the user, then return + to_chat(action_owner, span_warning("[action_target]'s eyes are obscured by [action_target.glasses].")) + return + */ + + // Check if target has eye protection + if(action_target.get_eye_protection()) + // Warn the user, then return + to_chat(action_owner, span_warning("You have difficulty focusing on [action_target]'s eyes due to some form of protection, and are left unable to hypnotize them.")) + to_chat(action_target, span_notice("[action_owner] stares intensely at you, but stops after a moment.")) + return + + // Check if target is blind + if(HAS_TRAIT(action_target, TRAIT_BLIND)) + // Warn the user, then return + to_chat(action_owner, span_warning("You stare deeply into [action_target]'s eyes, but see nothing but emptiness.")) + return + + // Check for anti-magic + // This does not include TRAIT_HOLY + if(action_target.anti_magic_check()) + // Warn the users, then return + to_chat(action_owner, span_warning("You stare deeply into [action_target]'s eyes. They stare back at you as if nothing had happened.")) + to_chat(action_target, span_notice("[action_owner] stares intensely into your eyes for a moment. You sense nothing out of the ordinary from them.")) + return + + // Check client pref for hypno + if(action_target.client?.prefs.cit_toggles & NEVER_HYPNO) + // Warn the users, then return + to_chat(action_owner, span_warning("You sense that [action_target] would rather not be hypnotized, and decide to respect their wishes.")) + to_chat(action_target, span_notice("[action_owner] stares into your eyes with a strange conviction, but turns away after a moment.")) + return + + // Check for mindshield implant + if(HAS_TRAIT(action_target, TRAIT_MINDSHIELD)) + // Warn the users, then return + to_chat(action_owner, span_warning("You stare deeply into [action_target]'s eyes, but hear a faint buzzing from [action_target.p_their()] head. It seems something is interfering.")) + to_chat(action_target, span_notice("[action_owner] stares intensely into your eyes for a moment, before a buzzing sound emits from your head.")) + return + + // Check for sleep immunity + // This is required for SetSleeping to trigger + if(HAS_TRAIT(action_target, TRAIT_SLEEPIMMUNE)) + // Warn the users, then return + to_chat(action_owner, span_warning("You stare deeply into [action_target]'s eyes, and see nothing but unrelenting energy. You won't be able to subdue [action_target.p_them()] in this state!")) + to_chat(action_target, span_notice("[action_owner] stares intensely into your eyes, but sees something unusual about you...")) + return + + // Check for sleep + if(action_target.IsSleeping()) + // Warn the user, then return + to_chat(action_owner, span_warning("You can't hypnotize [action_target] whilst [action_target.p_theyre()] asleep!")) + return + + // Check for combat mode + if(SEND_SIGNAL(action_target, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE)) + // Warn the users, then return + to_chat(action_owner, span_warning("[action_target] is acting too defensively! You'll need [action_target.p_them()] to lower [action_target.p_their()] guard first!")) + to_chat(action_target, span_notice("[action_owner] tries to stare into your eyes, but can't get a read on you.")) + return + + // Display chat messages + to_chat(action_owner, span_notice("You stare deeply into [action_target]'s eyes...")) + to_chat(action_target, span_warning("[action_owner] stares intensely into your eyes...")) + + // Try to perform action timer + if(!do_mob(action_owner, action_target, 5 SECONDS)) + // Action timer was interrupted + // Warn the user, then return + to_chat(action_owner, span_warning("You lose concentration on [action_target], and fail to hypnotize [action_target.p_them()]!")) + to_chat(action_target, span_notice("[action_owner]'s gaze is broken prematurely, freeing you from any potential effects.")) + return + + // Define blank response + var/input_consent + + // Check for non-consensual setting + if(action_target.client?.prefs.nonconpref != "Yes") + // Non-consensual is NOT enabled + // Prompt target for consent response + input_consent = alert(action_target, "Will you fall into a hypnotic stupor? This will allow [action_owner] to issue hypnotic suggestions.", "Hypnosis", "Yes", "No") + + // When consent is denied + if(input_consent == "No") + // Warn the users, then return + to_chat(action_owner, span_warning("[action_target]'s attention breaks, despite the attempt to hypnotize [action_target.p_them()]! [action_target.p_they()] clearly don't want this!")) + to_chat(action_target, span_notice("Your concentration breaks as you realize you have no interest in following [action_owner]'s words!")) + return + + // Display local message + action_target.visible_message(span_warning("[action_target] falls into a deep slumber!"), span_danger("Your eyelids gently shut as you fall into a deep slumber. All you can hear is [action_owner]'s voice as you commit to following all of their suggestions.")) + + // Set sleeping + action_target.SetSleeping(1200) + + // Set drowsiness + action_target.drowsyness = max(action_target.drowsyness, 40) + + // Prompt action owner for response + var/input_suggestion = input("What would you like to suggest [action_target] do? Leave blank to release [action_target.p_them()] instead.", "Hypnotic suggestion", null, null) + + // Check if input text exists + if(!input_suggestion) + // Alert user of no input + to_chat(action_owner, "You decide not to give [action_target] a suggestion.") + + // Remove sleep, then return + action_target.SetSleeping(0) + return + + // Sanitize input text + input_suggestion = sanitize(input_suggestion) + + // Display message to users + to_chat(action_owner, "You whisper your suggestion in a smooth calming voice to [action_target]") + to_chat(action_target, span_hypnophrase("...[input_suggestion]...")) + + // Play a sound effect + playsound(action_target, 'sound/magic/domain.ogg', 20, 1) + + // Display local message + action_target.visible_message(span_warning("[action_target] wakes up from their deep slumber!"), span_danger("Your eyelids gently open as you see [action_owner]'s face staring back at you.")) + + // Remove sleep, then return + action_target.SetSleeping(0) + return + // // Quirk: Hydra Heads // @@ -109,165 +244,650 @@ // Quirk: Bloodsucker Fledgling / Vampire // -/datum/action/vbite - name = "Bite" - button_icon_state = "power_feed" +// Basic action preset +/datum/action/bloodfledge + name = "Broken Bloodfledge Ability" + desc = "You shouldn't be seeing this!" + button_icon_state = "power_torpor" + background_icon_state = "vamp_power_off" + buttontooltipstyle = "cult" icon_icon = 'icons/mob/actions/bloodsucker.dmi' - desc = "Sink your vampiric fangs into the person you are grabbing." + button_icon = 'icons/mob/actions/bloodsucker.dmi' + +// Action: Bite +/datum/action/bloodfledge/bite + name = "Fledgling Bite" + desc = "Sink your vampiric fangs into the person you are grabbing, and attempt to drink their blood." + button_icon_state = "power_feed" var/drain_cooldown = 0 -/datum/action/vbite/Trigger() +/datum/action/bloodfledge/bite/Trigger() . = ..() - if(iscarbon(owner)) - var/mob/living/carbon/H = owner - if(H.nutrition >= 500) - to_chat(H, span_notice("You are too full to drain any more.")) - return - if(drain_cooldown >= world.time) - to_chat(H, span_notice("You just drained blood, wait a few seconds.")) - return - if(!H.pulling || !iscarbon(H.pulling)) - if(H.getStaminaLoss() >= 80 && H.nutrition > 20)//prevents being stunlocked in the chapel - to_chat(H,(span_notice("you use some of your power to energize"))) - H.adjustStaminaLoss(-20) - H.adjust_nutrition(-20) - H.resting = TRUE - if(H.pulling && (iscarbon(H.pulling) || (istype(H.pulling,/obj/structure/arachnid/cocoon) && locate(/mob/living/carbon) in H.pulling.contents))) - var/mob/living/carbon/victim - if(iscarbon(H.pulling)) - victim = H.pulling - else if(istype(H.pulling,/obj/structure/arachnid/cocoon)) - victim = locate(/mob/living/carbon) in H.pulling.contents - drain_cooldown = world.time + 25 - if(victim.anti_magic_check(FALSE, TRUE, FALSE, 0)) - to_chat(victim, span_warning("[H] tries to bite you, but stops before touching you!")) - to_chat(H, span_warning("[victim] is blessed! You stop just in time to avoid catching fire.")) - return - //Here we check now for both the garlic cloves on the neck and for blood in the victims bloodstream. - if(!blood_sucking_checks(victim, TRUE, TRUE)) - return - H.visible_message(span_danger("[H] bites down on [victim]'s neck!")) - victim.add_splatter_floor(get_turf(victim), TRUE) - to_chat(victim, span_userdanger("[H] is draining your blood!")) - if(!do_after(H, 30, target = victim)) - return - var/blood_volume_difference = BLOOD_VOLUME_MAXIMUM - H.blood_volume //How much capacity we have left to absorb blood - var/drained_blood = min(victim.blood_volume, BLOOD_DRAIN_NUM, blood_volume_difference) - H.reagents.add_reagent(/datum/reagent/blood/, drained_blood) - to_chat(victim, span_danger("[H] has taken some of your blood!")) - to_chat(H, span_notice("You drain some blood!")) - playsound(H, 'sound/items/drink.ogg', 30, 1, -2) - victim.blood_volume = clamp(victim.blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM) - log_combat(H,victim,"vampire bit")//logs the biting action for admins - if(!victim.blood_volume) - to_chat(H, span_warning("You finish off [victim]'s blood supply!")) + // Check for carbon owner + if(!iscarbon(owner)) + return -/datum/action/vrevive - name = "Resurrect" - button_icon_state = "power_strength" - icon_icon = 'icons/mob/actions/bloodsucker.dmi' - desc = "Use all your energy to come back to life!" + // Define action owner + var/mob/living/carbon/action_owner = owner -/datum/action/vrevive/Trigger() - . = ..() - var/mob/living/carbon/C = owner - var/mob/living/carbon/human/H = owner - if(H.stat == DEAD && istype(C.loc, /obj/structure/closet/crate/coffin)) - H.revive(TRUE, FALSE) - H.set_nutrition(0) - H.Daze(20) - H.drunkenness = 70 + // Check for cooldown + if(drain_cooldown >= world.time) + // Warn the user, then return + to_chat(action_owner, span_notice("That ability isn't ready yet.")) + return + + // Check for any grabbed target + if(!action_owner.pulling) + // Warn the user, then return + to_chat(action_owner, span_warning("You need a victim first!")) + return + + // Limit maximum nutrition + if(action_owner.nutrition >= NUTRITION_LEVEL_FAT) + // Warn the user, then return + to_chat(action_owner, span_notice("You are too full to drain any more.")) + return + + // Limit maximum potential nutrition + if(action_owner.nutrition + BLOODFLEDGE_DRAIN_NUM >= NUTRITION_LEVEL_FAT) + // Warn the user, then return + to_chat(action_owner, span_notice("You would become too full by draining any more blood.")) + return + + // Check for muzzle + if(action_owner.is_muzzled()) + // Warn the user, then return + to_chat(action_owner, span_notice("You can't bite things while muzzled!")) + return + + // Define pulled target + var/pull_target = action_owner.pulling + + // Define bite target + var/mob/living/carbon/bite_target + + // Check if the target is carbon + if(iscarbon(pull_target)) + // Set the bite target + bite_target = pull_target + + // Or cocooned carbon + else if(istype(pull_target,/obj/structure/arachnid/cocoon)) + // Define if cocoon has a valid target + // This cannot use pull_target + var/possible_cocoon_target = locate(/mob/living/carbon) in action_owner.pulling.contents + + // Check defined cocoon target + if(possible_cocoon_target) + // Set the bite target + bite_target = possible_cocoon_target + + // Or a blood tomato + else if(istype(pull_target,/obj/item/reagent_containers/food/snacks/grown/tomato/blood)) + // Warn the user, then return + to_chat(action_owner, span_danger("You plunge your fangs into [pull_target]! It's not very nutritious.")) + return + + // This doesn't actually interact with the item + + // Or none of the above else - to_chat(H,span_warning("You need to be dead and in a coffin to revive!")) + // Warn the user, then return + to_chat(action_owner, span_warning("You can't drain blood from [pull_target]!")) + return + + // Check for anti-magic + if(bite_target.anti_magic_check(FALSE, TRUE, FALSE, 0)) + // Warn the user and target, then return + to_chat(bite_target, span_warning("[action_owner] tries to bite you, but stops before touching you!")) + to_chat(action_owner, span_warning("[bite_target] is blessed! You stop just in time to avoid catching fire.")) + return + + // Check for garlic necklace or garlic in the bloodstream + if(!blood_sucking_checks(bite_target, TRUE, TRUE)) + // Warn the user and target, then return + to_chat(bite_target, span_warning("[action_owner] tries to bite you, but is warded off by your Allium Sativum!")) + to_chat(action_owner, span_warning("You sense that [bite_target] is protected by Allium Sativum, and refrain from biting them.")) + return + + // Define bite target's blood volume + var/target_blood_volume = bite_target.blood_volume + + // Check for sufficient blood volume + if(!target_blood_volume) + // Warn the user, then return + to_chat(action_owner, span_warning("There's not enough blood in [bite_target]!")) + return + + // Check if total blood would become too low + if((target_blood_volume - BLOODFLEDGE_DRAIN_NUM) <= BLOOD_VOLUME_OKAY) + // Check for aggressive grab + if(action_owner.grab_state < GRAB_AGGRESSIVE) + // Warn the user, then return + to_chat(action_owner, span_warning("You sense that [bite_target] is running low on blood. You'll need a tighter grip on [bite_target.p_them()] to continue.")) + return + + // Check for pacifist + if(HAS_TRAIT(action_owner, TRAIT_PACIFISM)) + // Warn the user, then return + to_chat(action_owner, span_warning("You can't drain any more blood from [bite_target] without hurting [bite_target.p_them()]!")) + return + + // Set cooldown and action times + var/time_cooldown = BLOODFLEDGE_COOLDOWN_BITE + var/time_interact = 30 + + // Check for voracious + if(HAS_TRAIT(action_owner, TRAIT_VORACIOUS)) + // Make times twice as fast + time_cooldown *= 0.5 + time_interact*= 0.5 + + // Set cooldown + drain_cooldown = world.time + time_cooldown + + // Display local chat message + action_owner.visible_message(span_danger("[action_owner] begins to bite down on [bite_target]'s neck!")) + + // Warn bite target + to_chat(bite_target, span_userdanger("[action_owner] has bitten your neck, and is trying to drain your blood!")) + + // Play a bite sound effect + playsound(action_owner, 'sound/weapons/bite.ogg', 30, 1, -2) + + // Try to perform action timer + if(!do_after(action_owner, time_interact, target = bite_target)) + // When failing + // Display a local chat message + action_owner.visible_message(span_danger("[action_owner]'s fangs are prematurely torn from [bite_target]'s neck, spilling [bite_target.p_their()] blood!")) + + // Bite target "drops" the blood + // This creates large blood splatter + bite_target.bleed(BLOODFLEDGE_DRAIN_NUM, FALSE) + + // Play splatter sound + playsound(get_turf(target), 'sound/effects/splat.ogg', 40, 1) + + // Check for masochism + if(!HAS_TRAIT(bite_target, TRAIT_MASO)) + // Force bite_target to play the scream emote + bite_target.emote("scream") + + // Log the biting action failure + log_combat(action_owner,bite_target,"bloodfledge bitten (interrupted)") + + // Return + return + + // Check if bite target species has blood + if(NOBLOOD in bite_target.dna.species.species_traits) + // Warn the user and target, then return + to_chat(bite_target, span_warning("[action_owner] tried to drain you, but didn't find any blood!")) + to_chat(action_owner, span_warning("[bite_target] doesn't have any blood to drink!")) + return + + // Create blood splatter + bite_target.add_splatter_floor(get_turf(bite_target), TRUE) + + // Checks for exotic species blood below + + // Variable for species with non-blood blood volumes + var/blood_valid = TRUE + + // Variable for gaining blood volume + var/blood_transfer = FALSE + + // Name of blood volume to be taken + // Action owner assumes blood until after drinking + var/blood_name = "blood" + + // Check bite target for synth blood + if(bite_target.mob_biotypes & MOB_ROBOTIC) + // Mark blood as invalid + blood_valid = FALSE + + // Set blood type name + blood_name = "coolant" + + // Check if the action owner is also a synth + if (action_owner.mob_biotypes & MOB_ROBOTIC) + // Allow gaining blood from this + blood_transfer = TRUE + + // Action owner is not a synth + else + // Warn the user + to_chat(action_owner, span_warning("That didn't taste like blood at all...")) + + // Add disgust + action_owner.adjust_disgust(2) + + // Cause negative mood + SEND_SIGNAL(action_owner, COMSIG_ADD_MOOD_EVENT, "bloodfledge_drank_synth", /datum/mood_event/drankblood_synth) + + // Check if bite target is a slime + if (isslimeperson(bite_target)) + // Mark blood as invalid + blood_valid = FALSE + + // Set blood type name + blood_name = "slime" + + // Check if the action owner is also a slime + if(isslimeperson(action_owner)) + // Allow gaining blood from this + blood_transfer = TRUE + + // Action owner is not a slime + else + // Warn the user + to_chat(action_owner, span_warning("You feel a sloshing presence inside you, but it dies out after a few moments.")) + + // Add disgust + action_owner.adjust_disgust(2) + + // Cause negative mood + SEND_SIGNAL(action_owner, COMSIG_ADD_MOOD_EVENT, "bloodfledge_drank_slime", /datum/mood_event/drankblood_slime) + + // End of species blood checks + + // Define user's remaining capacity to absorb blood + var/blood_volume_difference = BLOOD_VOLUME_MAXIMUM - action_owner.blood_volume + var/drained_blood = min(target_blood_volume, BLOODFLEDGE_DRAIN_NUM, blood_volume_difference) + + // Remove blood from bite target + bite_target.blood_volume = clamp(target_blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM) + + // Perform a blood transfer + // This is done to transfer compatible diseases + // Grants nothing, unless blood transfer variable is set + bite_target.transfer_blood_to(action_owner, (blood_transfer ? drained_blood : 0), TRUE) + + // Check if action owner received valid (nourishing) blood + if(blood_valid) + // Add blood reagent to the user + action_owner.reagents.add_reagent(/datum/reagent/blood/, drained_blood) + + // Alert the bite target and local user of success + // Yes, this is AFTER the message for non-valid blood + to_chat(bite_target, span_danger("[action_owner] has taken some of your [blood_name]!")) + to_chat(action_owner, span_notice("You've drained some of [bite_target]'s [blood_name]!")) + + // Alert the action holder if blood volume limit was exceeded + if(blood_transfer && (action_owner.blood_volume >= BLOOD_VOLUME_MAXIMUM)) + to_chat(action_owner, span_warning("You body fails to absorb any more [blood_name]. The remainder has been lost.")) + + // Play a heartbeat sound effect + // This was changed to match bloodsucker + playsound(action_owner, 'sound/effects/singlebeat.ogg', 30, 1, -2) + + // Log the biting action success + log_combat(action_owner,bite_target,"bloodfledge bitten (successfully), transferring [blood_name]") + + // Mood events + // Check if bite target is dead or undead + if((bite_target.stat >= DEAD) || (bite_target.mob_biotypes & MOB_UNDEAD)) + // Warn the user + to_chat(action_owner, span_warning("The rotten [blood_name] tasted foul.")) + + // Add disgust + action_owner.adjust_disgust(2) + + // Cause negative mood + SEND_SIGNAL(action_owner, COMSIG_ADD_MOOD_EVENT, "bloodfledge_drank_dead", /datum/mood_event/drankblood_dead) + + // Check if bite target's blood has been depleted + if(!bite_target.blood_volume) + // Warn the user + to_chat(action_owner, span_warning("You've depleted [bite_target]'s [blood_name] supply!")) + + // Cause negative mood + SEND_SIGNAL(action_owner, COMSIG_ADD_MOOD_EVENT, "bloodfledge_drank_killed", /datum/mood_event/drankkilled) + + // Check if bite target has cursed blood + if(HAS_TRAIT(bite_target, TRAIT_CURSED_BLOOD)) + // Check action owner for cursed blood + var/owner_cursed = HAS_TRAIT(action_owner, TRAIT_CURSED_BLOOD) + + // Set chat message based on action owner's trait status + var/warn_message = (owner_cursed ? "You taste the unholy touch of a familiar curse in [bite_target]\'s blood." : "You experience a sensation of intense dread just after drinking from [bite_target]. Something about their blood feels... wrong.") + + // Alert user in chat + to_chat(action_owner, span_notice(warn_message)) + + // Set mood type based on curse status + var/mood_type = (owner_cursed ? /datum/mood_event/drank_cursed_good : /datum/mood_event/drank_cursed_bad) + + // Cause mood event + SEND_SIGNAL(action_owner, COMSIG_ADD_MOOD_EVENT, "bloodfledge_drank_cursed_blood", mood_type) + +// Action: Revive +/datum/action/bloodfledge/revive + name = "Fledgling Revive" + desc = "Expend all of your remaining energy to escape death." + button_icon_state = "power_strength" + +/datum/action/bloodfledge/revive/Trigger() + . = ..() + + // Define mob + var/mob/living/carbon/human/action_owner = owner + + // Early check for being dead + // Users are most likely to click this while alive + if(action_owner.stat != DEAD) + // Warn user in chat + to_chat(action_owner, "You can't use this ability while alive!") + + // Return + return + + // Define failure message + var/revive_failed + + // Condition: Mob isn't in a closed coffin + if(!istype(action_owner.loc, /obj/structure/closet/crate/coffin)) + revive_failed += "\n- You need to be in a closed coffin!" + + // Condition: Insufficient nutrition (blood) + if(action_owner.nutrition <= NUTRITION_LEVEL_STARVING) + revive_failed += "\n- You don't have enough blood left!" + + // Condition: Can be revived + // This is used by revive(), and must be checked here to prevent false feedback + if(!action_owner.can_be_revived()) + revive_failed += "\n- Your body is too weak to sustain life!" + + // Condition: Damage limit, brute + if(action_owner.getBruteLoss() >= MAX_REVIVE_BRUTE_DAMAGE) + revive_failed += "\n- Your body is too battered!" + + // Condition: Damage limit, burn + if(action_owner.getFireLoss() >= MAX_REVIVE_FIRE_DAMAGE) + revive_failed += "\n- Your body is too badly burned!" + + // Condition: Suicide + if(action_owner.suiciding) + revive_failed += "\n- You chose this path." + + // Condition: No revivals + if(HAS_TRAIT(action_owner, TRAIT_NOCLONE)) + revive_failed += "\n- You only had one chance." + + // Condition: Demonic contract + if(action_owner.hellbound) + revive_failed += "\n- The soul pact must be honored." + + // Check for failure + if(revive_failed) + // Set combined message + revive_failed = span_warning("You can't revive right now because: [revive_failed]") + + // Alert user in chat of failure + to_chat(action_owner, revive_failed) + + // Return + return + + // Define time dead + // Used for revive policy + var/time_dead = world.time - action_owner.timeofdeath + + // Revive the action owner + action_owner.revive() + + // Alert the user in chat of success + action_owner.visible_message(span_notice("An ominous energy radiates from the [action_owner.loc]..."), span_warning("You've expended all remaining blood to bring your body back to life!")) + + // Play a haunted sound effect + playsound(action_owner, 'sound/hallucinations/growl1.ogg', 30, 1, -2) + + // Remove all nutrition (blood) + action_owner.set_nutrition(0) + + // Apply daze effect + action_owner.Daze(20) + + // Define time limit for revival + // Determines memory loss, using defib time and policies + var/revive_time_limit = CONFIG_GET(number/defib_cmd_time_limit) * 10 + + // Define revive time threshold + // Late causes memory loss, according to policy + var/time_late = revive_time_limit && (time_dead > revive_time_limit) + + // Define policy to use + var/list/policies = CONFIG_GET(keyed_list/policy) + var/time_policy = time_late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT] + + // Check if policy exists + if(time_policy) + // Alert user in chat of policy + to_chat(action_owner, time_policy) + + // Log the revival and effective policy + action_owner.log_message("revived using a vampire quirk ability after being dead for [time_dead] deciseconds. Considered [time_late? "late" : "memory-intact"] revival under configured policy limits.", LOG_GAME) // // 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" - var/transformed = FALSE - var/list/old_features = list("species" = SPECIES_HUMAN, "legs" = "Plantigrade", "size" = 1, "bark") + check_flags = AB_CHECK_RESTRAINED | AB_CHECK_STUN | AB_CHECK_CONSCIOUS | AB_CHECK_ALIVE + cooldown_time = 5 SECONDS + transparent_when_unavailable = TRUE -/datum/action/werewolf/Trigger() +/datum/action/cooldown/werewolf/transform + name = "Toggle Werewolf Form" + desc = "Transform in or out of your wolf form." + var/transformed = FALSE + var/species_changed = FALSE + var/werewolf_gender = "Lycan" + var/list/old_features + +/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" @@ -307,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 1d26983266..6825efe6ca 100644 --- a/modular_splurt/code/game/objects/effects/landmarks.dm +++ b/modular_splurt/code/game/objects/effects/landmarks.dm @@ -23,6 +23,12 @@ icon = 'modular_splurt/icons/mob/landmarks.dmi' icon_state = "Psychologist" +/obj/effect/landmark/start/stowaway + name = "Stowaway" + icon = 'modular_splurt/icons/mob/landmarks.dmi' + icon_state = "Stowaway" + jobspawn_override = TRUE //spawn in maint + delete_after_roundstart = FALSE //Landmark that creates destinations for the navigate verb to path to /obj/effect/landmark/navigate_destination diff --git a/modular_splurt/code/game/objects/items/cards_ids.dm b/modular_splurt/code/game/objects/items/cards_ids.dm index 0d24bd0085..69debcec83 100644 --- a/modular_splurt/code/game/objects/items/cards_ids.dm +++ b/modular_splurt/code/game/objects/items/cards_ids.dm @@ -8,9 +8,12 @@ desc = "A cheap ID used by slave traders. This guy seems to run the show." /obj/item/card/id/vampire - name = "Vampire ID" - desc = "An ID made to easily recognize vampires without needing to do tests" + name = "Bloodfledge ID" + desc = "An ID made to easily recognize bloodsucker fledglings without requiring medical scans." + icon = 'modular_splurt/icons/obj/card.dmi' icon_state = "vampire" + assignment = "Bloodsucker Fledgling" + uses_overlays = FALSE /obj/item/card/id/away/hotel/splurt name = "Staff ID" diff --git a/modular_splurt/code/game/objects/items/holy_weapons.dm b/modular_splurt/code/game/objects/items/holy_weapons.dm index 0af2838523..b14e87f890 100644 --- a/modular_splurt/code/game/objects/items/holy_weapons.dm +++ b/modular_splurt/code/game/objects/items/holy_weapons.dm @@ -9,3 +9,38 @@ slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_BULKY attack_verb = list("smacked", "struck", "cracked", "beaten") + +/obj/item/nullrod/papal_staff + name = "papal staff" + desc = "A staff used by traditional bishops and popes." + icon = 'modular_splurt/icons/obj/items_and_weapons.dmi' + icon_state = "papal_staff" + item_state = "papal_staff" + lefthand_file = 'modular_splurt/icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'modular_splurt/icons/mob/inhands/weapons/melee_righthand.dmi' + w_class = WEIGHT_CLASS_BULKY + attack_verb = list("smacked", "struck", "cracked", "beaten", "purified") + +/obj/item/clothing/head/mitre + name = "papal mitre" + desc = "A traditional headdress, worn by bishops and popes in traditional Christianity" + icon = 'modular_splurt/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/32x48_head.dmi' + icon_state = "mitre" + flags_inv = HIDEHAIR | HIDEFACIALHAIR + +/obj/item/clothing/suit/chaplain/papal + name = "papal robe" + desc = "A short cape over a cassock, worn by bishops and popes in traditional Christianity" + icon = 'modular_splurt/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'modular_splurt/icons/mobs/suits.dmi' + icon_state = "papalrobe" + body_parts_covered = CHEST|GROIN|LEGS|ARMS + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + +/obj/item/storage/box/holy/papal + name = "Papal Kit" + +/obj/item/storage/box/holy/papal/PopulateContents() + new /obj/item/clothing/head/mitre(src) + new /obj/item/clothing/suit/chaplain/papal(src) diff --git a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/condom.dm b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/condom.dm index 072ba15541..ec212f5015 100644 --- a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/condom.dm +++ b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/condom.dm @@ -9,6 +9,7 @@ icon_state = "b_condom_wrapped" var/unwrapped = 0 w_class = WEIGHT_CLASS_TINY + custom_price = PRICE_CHEAP_AS_FREE // 10 credits /obj/item/genital_equipment/condom/Initialize() create_reagents(300, DRAWABLE|NO_REACT) diff --git a/modular_splurt/code/game/objects/items/miscellaneous.dm b/modular_splurt/code/game/objects/items/miscellaneous.dm index 72cd6781e5..e01b30ceea 100644 --- a/modular_splurt/code/game/objects/items/miscellaneous.dm +++ b/modular_splurt/code/game/objects/items/miscellaneous.dm @@ -190,12 +190,12 @@ name = "security holo badge" desc = "A more futuristic hard-light badge" icon_state = "security_badge_holo" - + /obj/item/clothing/accessory/badge/deputy name = "security deputy badge" desc = "A shiny silver badge for deputies on the Security force" icon_state = "security_badge_deputy" - + /datum/design/sec_badge name = "Security Badge" desc = "A shiny badge to show the bearer is part of the Security force." @@ -215,3 +215,41 @@ build_path = /obj/item/clothing/accessory/badge/deputy category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/obj/item/handmirror/split_personality + name = "dissociative mirror" + desc = "An enchanted hand mirror. You may not recognize who stares back." + var/item_used + +/obj/item/handmirror/split_personality/attack_self(mob/user) + // Check if already used + if(item_used) + // Warn user, then return + to_chat(user, span_warning("[src] is no longer functional.")) + return + + // Check if human user exists + if(!ishuman(user)) + // Warn user, then return + to_chat(user, span_warning("You see nothing in [src].")) + return + + // Define human user + var/mob/living/carbon/human/mirror_user = user + + // Add brain trauma + mirror_user.gain_trauma(/datum/brain_trauma/severe/split_personality, TRAUMA_RESILIENCE_SURGERY) + + // Set item used variable + // This prevents future use + item_used = TRUE + + // Alert in local chat + mirror_user.visible_message(span_warning("The [src] shatters in [mirror_user]'s hands!"), span_warning("The mirror shatters in your hands!")) + + // Play mirror break sound + playsound(src, 'sound/effects/Glassbr3.ogg', 50, 1) + + // Set flavor text + name = "broken hand mirror" + desc = "You won\'t get much use out of it." diff --git a/modular_splurt/code/game/objects/items/robot/robot_items.dm b/modular_splurt/code/game/objects/items/robot/robot_items.dm index 9189c814e7..125f733903 100644 --- a/modular_splurt/code/game/objects/items/robot/robot_items.dm +++ b/modular_splurt/code/game/objects/items/robot/robot_items.dm @@ -79,3 +79,15 @@ source = /datum/robot_energy_storage/wrapping_paper /// End Cargo Borg Items /// + + +/obj/item/gripper/service + name = "service gripper" + desc = "A simple grasping tool for interacting with food and condiments." + can_hold = list( + /obj/item/reagent_containers/glass, + /obj/item/reagent_containers/food, + /obj/item/kitchen, + /obj/item/storage/bag/tray + ) + diff --git a/modular_splurt/code/game/objects/items/storage/boxes.dm b/modular_splurt/code/game/objects/items/storage/boxes.dm index 34d085605d..a205279caa 100644 --- a/modular_splurt/code/game/objects/items/storage/boxes.dm +++ b/modular_splurt/code/game/objects/items/storage/boxes.dm @@ -58,7 +58,7 @@ desc = "A large collection of condoms, suitable for the safest of sluts!" icon = 'modular_sand/icons/obj/fleshlight.dmi' icon_state = "box" - custom_price = PRICE_ALMOST_EXPENSIVE // Half the price of buying individually + custom_price = PRICE_BELOW_NORMAL // 20% discount from buying individually /obj/item/storage/box/bulk_condoms/ComponentInitialize() . = ..() diff --git a/modular_splurt/code/game/objects/items/toys.dm b/modular_splurt/code/game/objects/items/toys.dm index 1079de98bf..b131fd5c74 100644 --- a/modular_splurt/code/game/objects/items/toys.dm +++ b/modular_splurt/code/game/objects/items/toys.dm @@ -3,3 +3,106 @@ icon = 'modular_splurt/icons/obj/toy.dmi' icon_state = "savannahivanovtoy" desc = "Mini-Mecha action figure! Collect them all! 13/12." + +/obj/item/toy/figure/assistant/imaginary_friend + name = "imaginary friend action figure" + desc = "A toy that resembles a special friend." + toysay = "I'll always be your best friend!" + var/item_used + +/obj/item/toy/figure/assistant/imaginary_friend/attack_self(mob/user as mob) + // Check if already used + if(item_used) + // Warn user, then return + to_chat(user, span_warning("[src] does nothing. It must be broken.")) + return + + // Check if human user exists + if(!ishuman(user)) + // Warn user, then return + to_chat(user, span_warning("You refrain from handling [src].")) + return + + // Define human user + var/mob/living/carbon/human/mirror_user = user + + // Add brain trauma + mirror_user.gain_trauma(/datum/brain_trauma/special/imaginary_friend, TRAUMA_RESILIENCE_SURGERY) + + // Set item used variable + // This prevents future use + item_used = TRUE + + // Alert in local chat + mirror_user.visible_message(span_warning("[mirror_user] plays with [src]."), span_warning("You start to remember [src], as if they were a real person!")) + + // 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 610e12b74d..7638cc11f3 100644 --- a/modular_splurt/code/modules/antagonists/slaver/slaver.dm +++ b/modular_splurt/code/modules/antagonists/slaver/slaver.dm @@ -44,6 +44,7 @@ GLOBAL_LIST_INIT(slavers_ransom_values, list( "Scientist" = SLAVER_STANDARD_RANSOM, "Roboticist" = SLAVER_STANDARD_RANSOM, "Prisoner" = SLAVER_STANDARD_RANSOM, + "Stowaway" = SLAVER_STANDARD_RANSOM, "Curator" = SLAVER_STANDARD_RANSOM, "Lawyer" = SLAVER_STANDARD_RANSOM, "Chaplain" = SLAVER_STANDARD_RANSOM, diff --git a/modular_splurt/code/modules/client/loadout/accessory.dm b/modular_splurt/code/modules/client/loadout/accessory.dm new file mode 100644 index 0000000000..e2d2e6d8be --- /dev/null +++ b/modular_splurt/code/modules/client/loadout/accessory.dm @@ -0,0 +1,11 @@ +/datum/gear/accessory/shortcrop + name = "Short sleeved croptop" + path = /obj/item/clothing/accessory/shortcrop + +/datum/gear/accessory/longcrop + name = "Long sleeved croptop" + path = /obj/item/clothing/accessory/longcrop + +/datum/gear/accessory/formalcrop + name = "Formal croptop" + path = /obj/item/clothing/accessory/formalcrop diff --git a/modular_splurt/code/modules/client/loadout/shoes.dm b/modular_splurt/code/modules/client/loadout/shoes.dm index d10f823444..b75b1cd621 100644 --- a/modular_splurt/code/modules/client/loadout/shoes.dm +++ b/modular_splurt/code/modules/client/loadout/shoes.dm @@ -2,7 +2,7 @@ /datum/gear/shoes/footwraps name = "Cloth Footwraps" path= /obj/item/clothing/shoes/footwraps - + /datum/gear/shoes/invisiboots name = "Invisifiber Footwraps" path= /obj/item/clothing/shoes/invisiboots @@ -36,3 +36,7 @@ /datum/gear/shoes/puttee restricted_roles = list("Security Officer", "Warden", "Head of Security", "Brig Physician", "Blueshield") + +/datum/gear/shoes/highheel_sandals + name = "High-heel Sandals" + path = /obj/item/clothing/shoes/highheel_sandals diff --git a/modular_splurt/code/modules/client/loadout/uniform.dm b/modular_splurt/code/modules/client/loadout/uniform.dm index 29d91596d7..1333a8c764 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 683afd00cf..13b9bc882b 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/clothing.dm b/modular_splurt/code/modules/clothing/clothing.dm new file mode 100644 index 0000000000..d006aa26f1 --- /dev/null +++ b/modular_splurt/code/modules/clothing/clothing.dm @@ -0,0 +1,43 @@ +/obj/item/clothing + var/last_bites = 3 //Once clothes is shredded, this determines how many more bites till its deleted. + var/is_edible = 0 //Controls what can or can't be eaten by Clothes Eaters/Insects + +//Cloth eaters get some nutrients. A Jumpsuit will roughly give back 50 Nutrition. IF eaten fully. +/obj/item/reagent_containers/food/snacks/clothing + list_reagents = list(/datum/reagent/consumable/nutriment = 3) + +//A call on attemp_forcefeed() without async to properly know if it worked or not. In theory this shouldn't cause any issues as only a small part of the population should ever run this.VS normal eating. +/obj/item/reagent_containers/food/snacks/clothing/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) + if(user.a_intent == INTENT_HARM) + return ..() + return attempt_forcefeed(M, user) + + +//As a bonus for having the Cloth Eater trait. You gain extra mood from eatin clothes, but damage them at the same time. +/obj/item/clothing/attack(mob/M, mob/user, def_zone) + if(user.a_intent != INTENT_HARM) + if(HAS_TRAIT(M,TRAIT_CLOTH_EATER) || isinsect(M)) + if(is_edible == 0) //This checks if an item can be shredded. + to_chat(M, "This item is too tough to eat.") + return FALSE //Return False to prevent the player smacking themselves with the item. Didn't want to risk a player accidently hurting themselves trying to eat anything. + var/obj/item/reagent_containers/food/snacks/clothing/clothing_as_food = new + clothing_as_food.name = name + var/mob/living/H = M + if(clothing_as_food.attack(M, user, def_zone)) //Staggered as calling it in the original IF will cause anyone who lacks either to eat. + if(damaged_clothes == CLOTHING_SHREDDED) //Check if we need to start breaking clothes + last_bites -= 1 + to_chat(M, "There isn't much of the [name] left to eat.") + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "cloth_consumed", /datum/mood_event/cloth_eaten, src) + take_damage(20, sound_effect=FALSE) + qdel(clothing_as_food) + if(last_bites <= 0) + user.visible_message("[user] finishes eating the [name].") + qdel(src) + return TRUE + return ..() + +// Set the clothing's integrity back to 100%, remove all damage to bodyparts, and generally fix it up +/obj/item/clothing/repair(mob/user, params) + .=..() + last_bites = 3 + diff --git a/modular_splurt/code/modules/clothing/glasses/_glasses.dm b/modular_splurt/code/modules/clothing/glasses/_glasses.dm index f4c6811218..04d23745dc 100644 --- a/modular_splurt/code/modules/clothing/glasses/_glasses.dm +++ b/modular_splurt/code/modules/clothing/glasses/_glasses.dm @@ -8,3 +8,9 @@ flash_protect = 1 tint = 1 glass_colour_type = /datum/client_colour/glass_colour/gray + +/obj/item/clothing/glasses/eyepatch + is_edible = 1 + +/obj/item/clothing/glasses/sunglasses/blindfold + is_edible = 1 diff --git a/modular_splurt/code/modules/clothing/gloves.dm b/modular_splurt/code/modules/clothing/gloves.dm index 5f2731516c..74af3a9f02 100644 --- a/modular_splurt/code/modules/clothing/gloves.dm +++ b/modular_splurt/code/modules/clothing/gloves.dm @@ -14,6 +14,7 @@ rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE armor = list("melee" = 5, "bullet" = 0, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 100) strip_mod = 1.5 + is_edible = 0 /obj/item/clothing/gloves/cbrn/engineer name = "engineer CBRN gloves" diff --git a/modular_splurt/code/modules/clothing/gloves/_gloves.dm b/modular_splurt/code/modules/clothing/gloves/_gloves.dm new file mode 100644 index 0000000000..22f54d4075 --- /dev/null +++ b/modular_splurt/code/modules/clothing/gloves/_gloves.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/gloves + is_edible = 1 diff --git a/modular_splurt/code/modules/clothing/head/_head.dm b/modular_splurt/code/modules/clothing/head/_head.dm new file mode 100644 index 0000000000..281c24b862 --- /dev/null +++ b/modular_splurt/code/modules/clothing/head/_head.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/head + is_edible = 1 //Helment and Hardhats + some Special misc are unedible diff --git a/modular_splurt/code/modules/clothing/head/hardhat.dm b/modular_splurt/code/modules/clothing/head/hardhat.dm new file mode 100644 index 0000000000..24c83f606d --- /dev/null +++ b/modular_splurt/code/modules/clothing/head/hardhat.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/head/hardhat + is_edible = 0 diff --git a/modular_splurt/code/modules/clothing/head/helmet.dm b/modular_splurt/code/modules/clothing/head/helmet.dm index defe0f0fcc..aaad3a6243 100644 --- a/modular_splurt/code/modules/clothing/head/helmet.dm +++ b/modular_splurt/code/modules/clothing/head/helmet.dm @@ -1,4 +1,7 @@ // GWTB-inspired stuff wooo +/obj/item/clothing/head/helmet + is_edible = 0 + /obj/item/clothing/head/helmet/goner name = "trencher helmet" desc = "A No Man's Land-type helmet with purple paint applied." diff --git a/modular_splurt/code/modules/clothing/head/misc.dm b/modular_splurt/code/modules/clothing/head/misc.dm index dddc2f6b05..eb14ad475d 100644 --- a/modular_splurt/code/modules/clothing/head/misc.dm +++ b/modular_splurt/code/modules/clothing/head/misc.dm @@ -51,6 +51,7 @@ flags_inv = HIDEHAIR|HIDEEARS resistance_flags = ACID_PROOF rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE + is_edible = 0 /obj/item/clothing/head/helmet/cbrn/mopp name = "MOPP hood" @@ -59,6 +60,7 @@ item_state = "mopphood" can_flashlight = 1 armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 100) + is_edible = 0 /obj/item/clothing/head/helmet/cbrn/mopp/advance name = "advance MOPP hood" @@ -66,6 +68,7 @@ can_flashlight = 1 armor = list("melee" = 50, "bullet" = 40, "laser" = 40,"energy" = 20, "bomb" = 35, "bio" = 110, "rad" = 110, "fire" = 50, "acid" = 110) clothing_flags = NONE + is_edible = 0 // research nods diff --git a/modular_splurt/code/modules/clothing/head/misc_special.dm b/modular_splurt/code/modules/clothing/head/misc_special.dm new file mode 100644 index 0000000000..9a86ddcb53 --- /dev/null +++ b/modular_splurt/code/modules/clothing/head/misc_special.dm @@ -0,0 +1,5 @@ +/obj/item/clothing/head/welding + is_edible = 0 + +/obj/item/clothing/head/hardhat/cakehat + is_edible = 1 diff --git a/modular_splurt/code/modules/clothing/kinkyclothes.dm b/modular_splurt/code/modules/clothing/kinkyclothes.dm index a2bcaee4f6..4707c98cce 100644 --- a/modular_splurt/code/modules/clothing/kinkyclothes.dm +++ b/modular_splurt/code/modules/clothing/kinkyclothes.dm @@ -114,7 +114,10 @@ icon_state = "vaultsuit" mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' item_state = "b_suit" + item_state = "b_suit" can_adjust = FALSE + anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/uniform_digi.dmi' + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC var/firstpickup = TRUE var/pickupsound = TRUE diff --git a/modular_splurt/code/modules/clothing/masks/_mask.dm b/modular_splurt/code/modules/clothing/masks/_mask.dm new file mode 100644 index 0000000000..d5f6e0f180 --- /dev/null +++ b/modular_splurt/code/modules/clothing/masks/_mask.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/mask + is_edible = 1 diff --git a/modular_splurt/code/modules/clothing/masks/boxing.dm b/modular_splurt/code/modules/clothing/masks/boxing.dm new file mode 100644 index 0000000000..89015338f3 --- /dev/null +++ b/modular_splurt/code/modules/clothing/masks/boxing.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/mask/infiltrator + is_edible = 0 diff --git a/modular_splurt/code/modules/clothing/masks/gasmask.dm b/modular_splurt/code/modules/clothing/masks/gasmask.dm index 9405e3f315..7d7066ab86 100644 --- a/modular_splurt/code/modules/clothing/masks/gasmask.dm +++ b/modular_splurt/code/modules/clothing/masks/gasmask.dm @@ -1,3 +1,6 @@ +/obj/item/clothing/mask/gas + is_edible = 0 + /obj/item/clothing/mask/gas/radmask name = "radiation mask" desc = "An mask that somewhat protects the user from radiation. Not as effective like a radiation hood, but is better than nothing." diff --git a/modular_splurt/code/modules/clothing/masks/miscellaneous.dm b/modular_splurt/code/modules/clothing/masks/miscellaneous.dm index 4d8c1bad27..865d5633ea 100644 --- a/modular_splurt/code/modules/clothing/masks/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/masks/miscellaneous.dm @@ -35,6 +35,7 @@ visor_flags_inv = 0 flavor_adjust = FALSE armor = list("melee" = 5, "bullet" = 0, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 100) + is_edible = 0 /obj/item/clothing/mask/gas/cbrn/mopp name = "MOPP gas mask" diff --git a/modular_splurt/code/modules/clothing/neck/_neck.dm b/modular_splurt/code/modules/clothing/neck/_neck.dm index f17afa4e9f..40ae719af7 100644 --- a/modular_splurt/code/modules/clothing/neck/_neck.dm +++ b/modular_splurt/code/modules/clothing/neck/_neck.dm @@ -1,9 +1,16 @@ +/obj/item/clothing/neck + is_edible = 1 + +/obj/item/clothing/neck/stethoscope + is_edible = 2 + /obj/item/clothing/neck/petcollar/locked/security name = "security collar" desc = "For when you need to show everyone who your pet belongs to." icon = 'modular_splurt/icons/obj/clothing/neck.dmi' icon_state = "seccollar" poly_states = 0 + is_edible = 0 /obj/item/clothing/neck/petcollar/spike name = "Spiked Pet Collar" @@ -12,6 +19,7 @@ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' icon_state = "collar_spik" poly_states = 0 + is_edible = 0 /obj/item/clothing/neck/petcollar/locked/spike name = "Spiked Pet Collar" @@ -36,6 +44,7 @@ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' icon_state = "collar_holo" poly_states = 0 + is_edible = 0 /obj/item/clothing/neck/petcollar/casino name = "Casino Collar" @@ -52,6 +61,7 @@ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' icon_state = "casinoslave_available" poly_states = 0 + is_edible = 0 /obj/item/clothing/neck/petcollar/locked/casino/attackby(obj/item/K, mob/user, params) . = ..() diff --git a/modular_splurt/code/modules/clothing/shoes/_shoes.dm b/modular_splurt/code/modules/clothing/shoes/_shoes.dm new file mode 100644 index 0000000000..bc1fb9812f --- /dev/null +++ b/modular_splurt/code/modules/clothing/shoes/_shoes.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/shoes + is_edible = 1 diff --git a/modular_splurt/code/modules/clothing/shoes/magboots.dm b/modular_splurt/code/modules/clothing/shoes/magboots.dm new file mode 100644 index 0000000000..b3c8d6dff8 --- /dev/null +++ b/modular_splurt/code/modules/clothing/shoes/magboots.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/shoes/magboots + is_edible = 0 diff --git a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm index 5d50562d5a..d87fd74ce7 100644 --- a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm @@ -51,6 +51,7 @@ resistance_flags = ACID_PROOF rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE armor = list("melee" = 5, "bullet" = 0, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 100) + is_edible = 0 /obj/item/clothing/shoes/jackboots/cbrn/mopp name = "MOPP boots" @@ -83,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/suits/cloaks.dm b/modular_splurt/code/modules/clothing/suits/cloaks.dm index 8de8a40071..bbbf127829 100644 --- a/modular_splurt/code/modules/clothing/suits/cloaks.dm +++ b/modular_splurt/code/modules/clothing/suits/cloaks.dm @@ -31,6 +31,7 @@ mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' armor = list(MELEE = 35, BULLET = 40, LASER = 25, ENERGY = 10, BOMB = 25, BIO = 20, RAD = 20, FIRE = 60, ACID = 60) body_parts_covered = CHEST|GROIN|ARMS + is_edible = 0 /obj/item/clothing/neck/cloak/binary name = "Binary cloak" diff --git a/modular_splurt/code/modules/clothing/suits/utility.dm b/modular_splurt/code/modules/clothing/suits/utility.dm new file mode 100644 index 0000000000..8f7077a3c4 --- /dev/null +++ b/modular_splurt/code/modules/clothing/suits/utility.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/head/radiation + is_edible = 0 diff --git a/modular_splurt/code/modules/clothing/under/_under.dm b/modular_splurt/code/modules/clothing/under/_under.dm index 847ba40c3c..b9b28a778e 100644 --- a/modular_splurt/code/modules/clothing/under/_under.dm +++ b/modular_splurt/code/modules/clothing/under/_under.dm @@ -1,3 +1,6 @@ +/obj/item/clothing/under + is_edible = 1 //Most jumpsuits are made of cloth so this is a safe bet. + /obj/item/clothing/under/Initialize(mapload) . = ..() if(!is_type_in_typecache(type, GLOB.skirt_peekable)) diff --git a/modular_splurt/code/modules/clothing/under/accessories.dm b/modular_splurt/code/modules/clothing/under/accessories.dm new file mode 100644 index 0000000000..eafad46702 --- /dev/null +++ b/modular_splurt/code/modules/clothing/under/accessories.dm @@ -0,0 +1,26 @@ +/obj/item/clothing/accessory/shortcrop + name = "short sleeved crop top" + desc = "A short sleeved crop top, for when it gets too hot." + icon = 'modular_splurt/icons/obj/clothing/accessories.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/accessories.dmi' + icon_state = "shortcrop" + item_state = "shortcrop" + minimize_when_attached = FALSE + +/obj/item/clothing/accessory/longcrop + name = "long sleeved crop top" + desc = "A long sleeved crop top, now with long sleeves!" + icon = 'modular_splurt/icons/obj/clothing/accessories.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/accessories.dmi' + icon_state = "longcrop" + item_state = "longcrop" + minimize_when_attached = FALSE + +/obj/item/clothing/accessory/formalcrop + name = "formal crop top" + desc = "A 'formal' crop top. Not sure how this'll fool anyone." + icon = 'modular_splurt/icons/obj/clothing/accessories.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/accessories.dmi' + icon_state = "formalcrop" + item_state = "formalcrop" + minimize_when_attached = FALSE diff --git a/modular_splurt/code/modules/clothing/under/miscellaneous.dm b/modular_splurt/code/modules/clothing/under/miscellaneous.dm index 3f6b806260..990dedb2a8 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/clothing/underwear/_underwear.dm b/modular_splurt/code/modules/clothing/underwear/_underwear.dm new file mode 100644 index 0000000000..045d1f8ce7 --- /dev/null +++ b/modular_splurt/code/modules/clothing/underwear/_underwear.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/underwear/ + is_edible = 1 diff --git a/modular_splurt/code/modules/events/bruh_moment.dm b/modular_splurt/code/modules/events/bruh_moment.dm index 564c409c70..d05dff6e61 100644 --- a/modular_splurt/code/modules/events/bruh_moment.dm +++ b/modular_splurt/code/modules/events/bruh_moment.dm @@ -4,9 +4,10 @@ weight = 10 min_players = 1 max_occurrences = 0 + category = EVENT_CATEGORY_FRIENDLY /datum/round_event/bruh_moment - startWhen = 8 + start_when = 8 fakeable = FALSE /datum/round_event/bruh_moment/start() diff --git a/modular_splurt/code/modules/events/crystalline_reentry.dm b/modular_splurt/code/modules/events/crystalline_reentry.dm index 02f8ff68ae..2894e4a484 100644 --- a/modular_splurt/code/modules/events/crystalline_reentry.dm +++ b/modular_splurt/code/modules/events/crystalline_reentry.dm @@ -4,6 +4,7 @@ min_players = 15 max_occurrences = 0 //Deactivated for now var/atom/special_target + category = EVENT_CATEGORY_SPACE /datum/round_event_control/crystalline_reentry/admin_setup() if(!check_rights(R_FUN)) @@ -13,8 +14,8 @@ special_target = get_turf(usr) /datum/round_event/crystalline_reentry - announceWhen = 0 - startWhen = 10 + announce_when = 0 + start_when = 10 fakeable = FALSE /datum/round_event/crystalline_reentry/announce(fake) @@ -34,6 +35,7 @@ min_players = 35 max_occurrences = 0 //This is only an admin spawn. Ergo, wrath of the gods. var/atom/special_target + category = EVENT_CATEGORY_SPACE /datum/round_event_control/crystalline_wave/admin_setup() if(!check_rights(R_FUN)) @@ -47,9 +49,9 @@ message_admins("A crystalline asteroid wave has been triggered. Maybe you should add some music for the players? Consider this random selection: [randselect]") /datum/round_event/crystalline_wave - announceWhen = 0 - startWhen = 15 - endWhen = 60 //45 seconds of pain + announce_when = 0 + start_when = 15 + end_when = 60 //45 seconds of pain fakeable = FALSE /datum/round_event/crystalline_wave/announce(fake) 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 a587e9fc71..c388d8fe3c 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 @@ -189,3 +189,104 @@ /datum/reagent/consumable/ethanol/moonshine = 2, /datum/reagent/consumable/ethanol/brave_bull = 1 ) + +//Milkshakes +/datum/chemical_reaction/milkshake_base + name = "Plain Milkshake" + id = /datum/reagent/consumable/milkshake_base + results = list(/datum/reagent/consumable/milkshake_base = 3) + required_reagents = list( + /datum/reagent/consumable/milk = 1, + /datum/reagent/consumable/ice = 1, + /datum/reagent/consumable/cream =1 + ) + +/datum/chemical_reaction/milkshake_vanilla + name = "Vanilla Milkshake" + id = /datum/reagent/consumable/milkshake_vanilla + results = list(/datum/reagent/consumable/milkshake_vanilla = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base =1, + /datum/reagent/consumable/vanilla =1 + ) + +/datum/chemical_reaction/milkshake_choc + name = "Chocolate Milkshake" + id = /datum/reagent/consumable/milkshake_choc + results = list(/datum/reagent/consumable/milkshake_choc = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/coco = 1 + ) + +/datum/chemical_reaction/milkshake_strawberry + name = "Strawberry Milkshake" + id = /datum/reagent/consumable/milkshake_strawberry + results = list(/datum/reagent/consumable/milkshake_strawberry = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/strawberryjuice = 1 + ) + +/datum/chemical_reaction/milkshake_banana + name = "Banana Milkshake" + id = /datum/reagent/consumable/milkshake_banana + results = list(/datum/reagent/consumable/milkshake_banana = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/banana = 1 + ) + +/datum/chemical_reaction/milkshake_berry + name = "Berry Milkshake" + id = /datum/reagent/consumable/milkshake_berry + results = list(/datum/reagent/consumable/milkshake_berry = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/berryjuice = 1 + ) + +/datum/chemical_reaction/milkshake_cola + name = "Cola Milkshake" + id = /datum/reagent/consumable/milkshake_cola + results = list(/datum/reagent/consumable/milkshake_cola = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/space_cola = 1 + ) + +/datum/chemical_reaction/milkshake_gibb + name = "Dr. Gibb Milkshake" + id = /datum/reagent/consumable/milkshake_gibb + results = list(/datum/reagent/consumable/milkshake_gibb = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/dr_gibb = 1 + ) + +/datum/chemical_reaction/milkshake_peach + name = "Peach Milkshake" + id = /datum/reagent/consumable/milkshake_peach + results = list(/datum/reagent/consumable/milkshake_peach = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/peachjuice = 1 + ) + +/datum/chemical_reaction/milkshake_pineapple + name = "Pineapple Milkshake" + id = /datum/reagent/consumable/milkshake_pineapple + results = list(/datum/reagent/consumable/milkshake_pineapple = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/pineapplejuice = 1 + ) + +/datum/chemical_reaction/milkshake_melon + name = "Watermelon Milkshake" + id = /datum/reagent/consumable/milkshake_melon + results = list(/datum/reagent/consumable/milkshake_melon = 2) + required_reagents = list( + /datum/reagent/consumable/milkshake_base = 1, + /datum/reagent/consumable/watermelonjuice = 1 + ) diff --git a/modular_splurt/code/modules/jobs/job_types/stowaway.dm b/modular_splurt/code/modules/jobs/job_types/stowaway.dm new file mode 100644 index 0000000000..76056726d0 --- /dev/null +++ b/modular_splurt/code/modules/jobs/job_types/stowaway.dm @@ -0,0 +1,63 @@ +GLOBAL_LIST_EMPTY(roundstart_stowaway) + +/datum/job/stowaway + title = "Stowaway" + flag = STOWAWAY + department_head = NONE + department_flag = NONE + paycheck = 0 + paycheck_department = null + faction = "Station" + total_positions = 0 + spawn_positions = 3 + threat = 0.5 + supervisors = "no one" + minimal_player_age = 3 + exp_requirements = 100 + exp_type = EXP_TYPE_CREW + considered_combat_role = FALSE + custom_spawn_text = "You are a stowaway. You should NOT be starting fights or attempting to fight security for any reason. At best you should be actively on the run from them as you are on the station illegally." + outfit = /datum/outfit/job/stowaway + plasma_outfit = /datum/outfit/plasmaman/stowaway + display_order = JOB_DISPLAY_ORDER_STOWAWAY + +/datum/job/stowaway/get_latejoin_spawn_point() + return get_roundstart_spawn_point() + +/datum/outfit/job/stowaway/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) + ..() + var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT + uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random + +/obj/item/card/id/stowaway_stolen + name = "unknown ID card" + desc = "An strange-looking old ID card." + icon_state = "data_1" + uses_overlays = FALSE + registered_name = null + assignment = null + access = list(ACCESS_MAINT_TUNNELS) + bank_support = ID_NO_BANK_ACCOUNT + +/datum/outfit/job/stowaway + name = "Stowaway" + jobtype = /datum/job/stowaway + uniform = /obj/item/clothing/under/color/random + shoes = /obj/item/clothing/shoes/sneakers/black + id = /obj/item/card/id/stowaway_stolen + ears = null + belt = /obj/item/storage/belt/utility/atmostech + gloves = /obj/item/clothing/gloves/color/yellow + r_pocket = /obj/item/radio + l_pocket = /obj/item/flashlight + +/datum/outfit/plasmaman/stowaway + name = "Stowaway Plasmaman" + shoes = /obj/item/clothing/shoes/sneakers/black + id = /obj/item/card/id/stowaway_stolen + ears = null + belt = /obj/item/storage/belt/utility/full + gloves = /obj/item/clothing/gloves/color/yellow + r_pocket = /obj/item/radio + l_pocket = /obj/item/flashlight + diff --git a/modular_splurt/code/modules/keybindings/keybind/communication.dm b/modular_splurt/code/modules/keybindings/keybind/communication.dm new file mode 100644 index 0000000000..3aa6aeca1a --- /dev/null +++ b/modular_splurt/code/modules/keybindings/keybind/communication.dm @@ -0,0 +1,13 @@ +/datum/keybinding/client/communication/subtle + hotkey_keys = list("Ctrl5") + +/datum/keybinding/client/communication/subtle_indicator + hotkey_keys = list("5") + name = "Subtle_Indicator" + full_name = "Subtle Emote (with indicator)" + clientside = "subtle-indicator" + +/datum/keybinding/client/communication/subtle_indicator/down(client/user) + var/mob/living/mob_keybound = user.mob + mob_keybound.subtle_indicator() + return TRUE diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/body_markings.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/body_markings.dm index ac3b448ca1..1d38f77db0 100644 --- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/body_markings.dm +++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/body_markings.dm @@ -113,6 +113,18 @@ icon_state = "sloog" covered_limbs = list("Chest" = MATRIX_RED_GREEN) +/datum/sprite_accessory/mam_body_markings/pilot + name = "Pilot" + icon = 'modular_splurt/icons/mob/mam_markings.dmi' + icon_state = "pilot" + covered_limbs = list("Head" = MATRIX_ALL) + +/datum/sprite_accessory/mam_body_markings/pilot_jaw + name = "Pilot Jaw" + icon = 'modular_splurt/icons/mob/mam_markings.dmi' + icon_state = "pilotjaw" + covered_limbs = list("Head" = MATRIX_RED_BLUE) + /****************************************** ************* Insect Markings ************* *******************************************/ diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm index 6b87b38f09..549793e24f 100644 --- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm +++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm @@ -221,6 +221,12 @@ icon = 'modular_splurt/icons/mob/mam_snouts.dmi' color_src = MUTCOLORS +/datum/sprite_accessory/snouts/mam_snouts/corvidbeak + name = "Corvid Beak" + icon_state = "corvidbeak" + icon = 'modular_splurt/icons/mob/mam_snouts.dmi' + matrixed_sections = MATRIX_GREEN + /datum/sprite_accessory/snouts/mam_snouts/deoxys name = "Deoxys" icon_state = "deoxys" 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 f08fba7584..7f9eff453e 100644 --- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm +++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm @@ -235,6 +235,38 @@ icon_state = "fluffy" color_src = MUTCOLORS +/datum/sprite_accessory/tails/mam_tails/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/mam_tails_animated/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + 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" @@ -278,6 +310,38 @@ icon = 'modular_splurt/icons/mob/mam_tails.dmi' matrixed_sections = MATRIX_ALL +/datum/sprite_accessory/tails/lizard/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/lizard/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + 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" @@ -358,3 +422,35 @@ dimension_x = 64 center = TRUE color_src = MUTCOLORS + +/datum/sprite_accessory/tails/human/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/human/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + 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 0000000000..8877e15eab --- /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/carbon/human/species_types/zombies2.dm b/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm index 53e887e98c..e812380fbc 100644 --- a/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm +++ b/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm @@ -1,3 +1,4 @@ +/* //striked out for now because I dont know what the fuck was planned here but this is breaking blood regain. /mob/living/carbon/human/handle_blood() if(iszombie(src)) //We're basically pudding pops. return @@ -8,7 +9,7 @@ var/obj/item/organ/heart/decayed_heart/decaying = getorgan(/obj/item/organ/heart/decayed_heart) if(decaying) . += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]." - + */ /datum/species/mammal/undead // takes 30% more damage but doesn't crit id = SPECIES_UMAMMAL diff --git a/modular_splurt/code/modules/mob/living/login.dm b/modular_splurt/code/modules/mob/living/login.dm new file mode 100644 index 0000000000..2424653534 --- /dev/null +++ b/modular_splurt/code/modules/mob/living/login.dm @@ -0,0 +1,10 @@ +/mob/living/Login() + . = ..() + + // Check if mob is in SSD list + if(src in GLOB.ssd_mob_list) + // Remove from SSD list + GLOB.ssd_mob_list -= src + + // Log mob SSD removal + log_game("[src] was removed from the SSD list.") diff --git a/modular_splurt/code/modules/mob/living/logout.dm b/modular_splurt/code/modules/mob/living/logout.dm new file mode 100644 index 0000000000..e640cfbf18 --- /dev/null +++ b/modular_splurt/code/modules/mob/living/logout.dm @@ -0,0 +1,25 @@ +/mob/living/Logout() + . = ..() + + // Check for BORIS AI borgs + if(src in GLOB.available_ai_shells) + return + + // Check for the AI + if(isAI(src)) + return + + // Check for VR mob + if(src.GetComponent(/datum/component/virtual_reality)) + return + + // Check if mob is in a VR pod + // This is not an ideal solution + if(istype(src.loc, /obj/machinery/vr_sleeper)) + return + + // Add to SSD list + GLOB.ssd_mob_list |= src + + // Log mob SSD status + log_game("[src] was added to the SSD list.") diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm b/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm index 7532f3a8f7..65ece9be12 100644 --- a/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm +++ b/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm @@ -1,7 +1,7 @@ //Main code edits /// Allows "cyborg" players to change gender at will - Modularised here // FUNCTION MOVED TO living.dm AS PROC -/mob/living/silicon/robot/verb/toggle_gender() +/mob/living/silicon/robot/toggle_gender() set name = "Set Gender" set desc = "Allows you to set your gender." set category = "Robot Commands" @@ -41,3 +41,15 @@ laws = new /datum/ai_laws/slaver_override laws.associate(src) update_icons() + +/mob/living/silicon/robot/Initialize(mapload) + .=..() + AddComponent(/datum/component/personal_crafting) + + +/mob/living/silicon/robot/pick_module() + .=..() + var/datum/hud/R = hud_used + var/atom/movable/screen/craft/C = locate() in R.static_inventory + C.icon = 'icons/mob/screen_midnight.dmi' + C.screen_loc = "CENTER+5:5,SOUTH+1:5" diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm index 16ddbdc8f5..710f4d4745 100644 --- a/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -265,7 +265,13 @@ var/list/extra = list( /obj/item/dogborg/jaws/small, /obj/item/analyzer/nose, - /obj/item/soap/tongue/scrubpup + /obj/item/soap/tongue/scrubpup, + /obj/item/gripper/service, + /obj/item/kitchen/rollingpin, + /obj/item/kitchen/unrollingpin, + /obj/item/kitchen/knife/butcher, + /obj/item/kitchen/efink, + /obj/item/kitchen/knife ) LAZYADD(basic_modules, extra) . = ..() diff --git a/modular_splurt/code/modules/mob/say_vr.dm b/modular_splurt/code/modules/mob/say_vr.dm index 56be623e0f..7cb5e02a6f 100644 --- a/modular_splurt/code/modules/mob/say_vr.dm +++ b/modular_splurt/code/modules/mob/say_vr.dm @@ -48,3 +48,30 @@ return message = trim(html_encode(message), MAX_MESSAGE_LEN) emote("narrate", message=message) + +/datum/emote/living/subtle/subtle_indicator + key = "subtle-indicator" + key_third_person = "subtle-indicator" + +/mob/living/verb/subtle_indicator() + // Set data + set name = "Subtle (Indicator)" + set category = "IC" + + // Check if say is disabled + if(GLOB.say_disabled) + // Warn user and return + to_chat(usr, span_danger("Speech is currently admin-disabled.")) + return + + // Display typing indicator + display_typing_indicator() + + // Prompt user for text input + var/input_message = input(usr, "What would you like to subtly emote, with a typing indicator?", "Input subtle emote") as message|null + + // Remove typing indicator + clear_typing_indicator() + + // Run subtle emote with input + usr.emote("subtle", message = input_message) diff --git a/modular_splurt/code/modules/mob/splurt_emotes.dm b/modular_splurt/code/modules/mob/splurt_emotes.dm index e6af828c5f..b9d3412e50 100644 --- a/modular_splurt/code/modules/mob/splurt_emotes.dm +++ b/modular_splurt/code/modules/mob/splurt_emotes.dm @@ -212,8 +212,8 @@ /datum/emote/living/bruh key = "bruh" - key_third_person = "thinks this is a bruh moment" - message = "thinks this is a bruh moment" + key_third_person = "bruhs" + message = "thinks this is a bruh moment." emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE restraint_check = FALSE @@ -378,7 +378,7 @@ /datum/emote/living/swaos key = "swaos" key_third_person = "swaos" - message = "mutters swaos" + message = "mutters swaos." emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE @@ -411,7 +411,7 @@ /datum/emote/living/eyebrow3 key = "eyebrow3" key_third_person = "eyebrows3" - message = "raises an eyebrow quizzaciously." + message = "raises an eyebrow quizzaciously." /datum/emote/living/eyebrow3/run_emote(mob/user, params, type_override, intentional) if(!(. = ..())) @@ -467,7 +467,7 @@ /datum/emote/living/laugh4 key = "laugh4" key_third_person = "laughs4" - message = "burst out a laugh." + message = "burst into laughter!" emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE @@ -497,7 +497,7 @@ /datum/emote/living/laugh6 key = "laugh6" key_third_person = "laughs6" - message = "sounds like a tea kettle." + message = "laughs like a kettle!" emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE @@ -553,7 +553,7 @@ /datum/emote/living/spoonful key = "spoonful" key_third_person = "spoonfuls" - message = "draws a comically large spoon." + message = "asks for a spoonful." emote_type = EMOTE_AUDIBLE muzzle_ignore = TRUE @@ -583,7 +583,7 @@ /datum/emote/living/whatthehell key = "wth" key_third_person = "wths" - message = "condemns the abysses of hell." + message = "condemns the abysses of hell!" emote_type = EMOTE_AUDIBLE muzzle_ignore = TRUE @@ -637,7 +637,7 @@ /datum/emote/living/illuminati key = "illuminati" key_third_person = "illuminatis" - message = "emits some X-files vibe" + message = "exudes a mysterious aura!" /datum/emote/living/illuminati/run_emote(mob/user, params, type_override, intentional) if(!(. = ..())) @@ -650,7 +650,7 @@ /datum/emote/living/bonerif key = "bonerif" key_third_person = "bonerifs" - message = "riffs" + message = "riffs!" /datum/emote/living/bonerif/run_emote(mob/user, params, type_override, intentional) if(!(. = ..())) @@ -679,7 +679,7 @@ /datum/emote/living/choir key = "choir" key_third_person = "choirs" - message = "let out a choir." + message = "let out a choir!" emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE @@ -694,7 +694,7 @@ /datum/emote/living/sicko key = "sicko" key_third_person = "sickos" - message = "briefly goes sicko mode." + message = "briefly goes sicko mode!" emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE @@ -709,7 +709,7 @@ /datum/emote/living/chill key = "chill" key_third_person = "chills" - message = "felt a chill running down their spine..." + message = "feels a chill running down their spine..." /datum/emote/living/chill/run_emote(mob/user, params, type_override, intentional) if(!(. = ..())) @@ -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" @@ -766,7 +779,7 @@ /datum/emote/living/snore/snore2 key = "snore2" - key_third_person = "snores" + key_third_person = "snores2" message = "lets out an earthshaking snore" /datum/emote/living/snore/snore2/run_emote(mob/user, params, type_override, intentional) @@ -836,7 +849,7 @@ /datum/emote/living/ara_ara key = "ara" key_third_person = "aras" - message = "seems sultrily surprised~" + message = "coos with sultry surprise~..." emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE var/voicesound = 'modular_splurt/sound/voice/ara-ara.ogg' @@ -857,7 +870,7 @@ /datum/emote/living/missouri key = "missouri" key_third_person = "missouris" - message = "appears to believe %THEYRE in Missouri" + message = "appears to believe %THEYRE in Missouri." emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE 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 0000000000..f7795a670e --- /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 0000000000..3eb0f70752 --- /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/drink_reagents.dm b/modular_splurt/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 3b8aad9ea7..46ea1e07c5 100644 --- a/modular_splurt/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/modular_splurt/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -50,3 +50,118 @@ glass_name = "glass of töchtaüse syrup" glass_desc = "Not for drinking on its own." +/datum/reagent/consumable/milkshake_base + name = "Milkshake" + description = "A basic milkshake. Could use something else?" + color = "#FFFDD0" + nutriment_factor = 1 + taste_description = "thick, creamy, and sweet" + glass_icon_state = "vanillashake" + glass_name = "glass of plain milkshake" + glass_desc = "A glass of plain milkshake, a bit boring, but still good." + +/datum/reagent/consumable/milkshake_vanilla + name = "Vanilla Milkshake" + description = "A vanilla milkshake. Basic, but delicious." + color = "#FFFDD0" + nutriment_factor = 1 + taste_description = "thick, creamy, and sweet" + glass_icon_state = "vanillashake" + glass_name = "glass of vanilla milkshake" + glass_desc = "A glass of vanilla milkshake, a bit boring, but still good." + +/datum/reagent/consumable/milkshake_choc + name = "Chocolate Milkshake" + description = "A delicious Chocolate Milkshake" + color = "#7B3F00" + nutriment_factor = 1 + taste_description = "sweet, creamy chocolate" + glass_icon_state = "choccyshake" + glass_name = "glass of chocolate milkshake" + glass_desc = "A glass of chocolate milkshake, what a treat!" + +/datum/reagent/consumable/milkshake_strawberry + name = "Strawberry Milkshake" + description = "Frozen Strawberry Milk!" + color = "#F4E1EA" + nutriment_factor = 1 + taste_description = "summer memories" + glass_icon_state = "strawberryshake" + glass_name = "glass of strawberry milkshake" + glass_desc = "A glass of sweet, pink Strawberry Shake" + +/datum/reagent/consumable/milkshake_banana + name = "Banana Milkshake" + description = "Deliciously tricky!" + color = "#FFE135" + nutriment_factor = 1 + taste_description = "funny pranks and clowning around" + glass_icon_state = "bananashake" + glass_name = "glass of Banana Milkshake" + glass_desc = "A banana milkshake! Honk!" + +/datum/reagent/consumable/milkshake_berry + name = "Wild Berry Milkshake" + description = "A summer favorite!" + color = "#b17179" + nutriment_factor = 1 + taste_description = "warm summer days" + glass_icon = 'modular_splurt/icons/obj/drinks.dmi' + glass_icon_state = "berryshake" + glass_name = "glass of Wild Berry Milkshake" + glass_desc = "A berry milkshake" + +/datum/reagent/consumable/milkshake_cola + name = "Cola Milkshake" + description = "Sweet milkshake mixed with cola" + color = "#3c3024" + nutriment_factor = 1 + taste_description = "cola and milkshake" + glass_icon = 'modular_splurt/icons/obj/drinks.dmi' + glass_icon_state = "colashake" + glass_name = "glass of Cola Milkshake" + glass_desc = "A cola milkshake, it's like a ticker float!" + +/datum/reagent/consumable/milkshake_gibb + name = "Dr. Gibb Milkshake" + description = "Sweet milkshake mixed with Dr. Gibb" + color = "#5e312b" + nutriment_factor = 1 + taste_description = "cola and milkshake" + glass_icon = 'modular_splurt/icons/obj/drinks.dmi' + glass_icon_state = "gibbshake" + glass_name = "glass of Gibb Milkshake" + glass_desc = "A Dr. Gibb milkshake, it's like a ticker float!" + +/datum/reagent/consumable/milkshake_peach + name = "Peach Milkshake" + description = "A tasty Peach Milkshake" + color = "#5e312b" + nutriment_factor = 1 + taste_description = "peaches and cream" + glass_icon = 'modular_splurt/icons/obj/drinks.dmi' + glass_icon_state = "peachshake" + glass_name = "glass of Peace Milkshake" + glass_desc = "Peaches and Cream, Peaches and Cream!" + +/datum/reagent/consumable/milkshake_pineapple + name = "Pineapple Milkshake" + description = "A tangy Pineapple Milkshake" + color = "#feea63" + nutriment_factor = 1 + taste_description = "citrus and cream" + glass_icon = 'modular_splurt/icons/obj/drinks.dmi' + glass_icon_state = "pineappleshake" + glass_name = "glass of Pineapple Milkshake" + glass_desc = "A Pineapple milkshake, a bit sweet and a bit sour, but all delicious!" + +/datum/reagent/consumable/milkshake_melon + name = "Watermelon Milkshake" + description = "Delicous Watermelon Milkshake" + color = "#E37383" + nutriment_factor = 1 + taste_description = "warm sun and sweet cream" + glass_icon = 'modular_splurt/icons/obj/drinks.dmi' + glass_icon_state = "melonshake" + glass_name = "glass of Watermelon Milkshake" + glass_desc = "A Watermelon milkshake, it's like summer all over again!" 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 f483f1ec83..07917089d2 100644 --- a/modular_splurt/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/modular_splurt/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -1,10 +1,17 @@ -//Main code edits -/datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M) - if(M && M.client?.prefs.arousable && !(M.client?.prefs.cit_toggles & NO_APHRO)) - if(!HAS_TRAIT(M, TRAIT_IN_HEAT)) - to_chat(M, span_userlove("Your need for sex is overpowering!")) - M.log_message("Made In Heat by hexacrocin.", LOG_EMOTE) - ADD_TRAIT(M, TRAIT_IN_HEAT, APHRO_TRAIT) +/datum/reagent/drug/aphrodisiacplus/overdose_start(mob/living/M) + // 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) + + // Chat message is handled by the quirk + + // Log interaction + M.log_message("Given the In Estrous quirk by hexacrocin overdose.", LOG_EMOTE) + + // Return normally . = ..() //Own stuff diff --git a/modular_splurt/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_splurt/code/modules/reagents/chemistry/reagents/other_reagents.dm index 74d6eb5142..e327fc1409 100644 --- a/modular_splurt/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/modular_splurt/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -28,16 +28,18 @@ /datum/reagent/blood/on_mob_life(mob/living/carbon/C) . = ..() - if(HAS_TRAIT(C,BLOODFLEDGE)) - C.adjust_nutrition(6) //3/4ed this, felt it was a bit too much - C.adjust_disgust(-3) //makes the churches effects easily negated + if(HAS_TRAIT(C,TRAIT_BLOODFLEDGE)) + C.adjust_nutrition(6) + C.adjust_disgust(-2) // Negates the chapel's disgust effect + C.adjustStaminaLoss(1) // Mitigates the chapel's stamina effect /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M) . = ..() - //makes holy water slightly disgusting and hungering for vampires - if(HAS_TRAIT(M,BLOODFLEDGE)) - M.adjust_disgust(1) - M.adjust_nutrition(-0.1) + // Makes holy water disgusting and hungering for bloodfledges + // Directly antithetic to the effects of blood + if(HAS_TRAIT(M,TRAIT_BLOODFLEDGE)) + M.adjust_disgust(2) + M.adjust_nutrition(-6) // Cursed blood effect moved here if(HAS_TRAIT(M, TRAIT_CURSED_BLOOD)) diff --git a/modular_splurt/code/modules/reagents/reagent_containers/borghydro.dm b/modular_splurt/code/modules/reagents/reagent_containers/borghydro.dm new file mode 100644 index 0000000000..3c3e062b0e --- /dev/null +++ b/modular_splurt/code/modules/reagents/reagent_containers/borghydro.dm @@ -0,0 +1,12 @@ +/obj/item/reagent_containers/borghypo/borgshaker/beershaker/Initialize() + var/list/extra_reagents = list( + /datum/reagent/consumable/ethanol/amaretto, + /datum/reagent/consumable/ethanol/applejack, + /datum/reagent/consumable/ethanol/curacao, + /datum/reagent/consumable/ethanol/hcider, + /datum/reagent/consumable/ethanol/navy_rum, + /datum/reagent/consumable/ethanol/sake, + /datum/reagent/consumable/ethanol + ) + LAZYADD(reagent_ids, extra_reagents) + . = ..() 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 0000000000..e6105fd3f3 --- /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/misc_nodes.dm b/modular_splurt/code/modules/research/techweb/nodes/biotech_nodes.dm similarity index 51% rename from modular_splurt/code/modules/research/techweb/nodes/misc_nodes.dm rename to modular_splurt/code/modules/research/techweb/nodes/biotech_nodes.dm index 7db0714874..ff81163de3 100644 --- a/modular_splurt/code/modules/research/techweb/nodes/misc_nodes.dm +++ b/modular_splurt/code/modules/research/techweb/nodes/biotech_nodes.dm @@ -1,3 +1,3 @@ -/datum/techweb_node/datatheory/New() +/datum/techweb_node/biotech/New() design_ids += "sex_research" . = ..() 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 f90fac955d..9256485813 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/surgery/organs/augments_arms.dm b/modular_splurt/code/modules/surgery/organs/augments_arms.dm index d49fe172f5..aa7db49438 100644 --- a/modular_splurt/code/modules/surgery/organs/augments_arms.dm +++ b/modular_splurt/code/modules/surgery/organs/augments_arms.dm @@ -24,3 +24,17 @@ w_class = WEIGHT_CLASS_BULKY sharpness = SHARP_POINTY attack_verb = list("slashed", "cut") + +// Synth power cord interaction override +/obj/item/apc_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + // Define user + var/mob/living/carbon/human/cord_user = user + + // Check for bloodfledge + if(HAS_TRAIT(cord_user, TRAIT_BLOODFLEDGE)) + // Warn user and return + to_chat(cord_user, span_warning("You try to siphon energy from [target], but a sanguine force prevents you from absorbing any charge!")) + return + + // Return normally + . = ..() 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 0000000000..fe3de42d03 --- /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 d7d67e4011..d6dee6e947 100644 --- a/modular_splurt/code/modules/vending/clothesmate.dm +++ b/modular_splurt/code/modules/vending/clothesmate.dm @@ -16,7 +16,12 @@ /obj/item/clothing/under/officesexy = 3, /obj/item/clothing/suit/toggle/tunnelfox = 3, /obj/item/clothing/under/performer = 2, - /obj/item/clothing/under/bluedress = 3 + /obj/item/clothing/under/bluedress = 3, + /obj/item/clothing/accessory/shortcrop = 3, + /obj/item/clothing/accessory/longcrop = 3, + /obj/item/clothing/accessory/formalcrop = 3, + /obj/item/clothing/under/misc/leia_outfit = 2, + /obj/item/clothing/under/performer/polychromic = 2 ) var/list/extra_contraband = list( /obj/item/clothing/under/rank/civilian/lawyer/galaxy_red = 3, diff --git a/modular_splurt/code/modules/vending/kinkmate.dm b/modular_splurt/code/modules/vending/kinkmate.dm index 1d2f3c5a94..53b6abb542 100644 --- a/modular_splurt/code/modules/vending/kinkmate.dm +++ b/modular_splurt/code/modules/vending/kinkmate.dm @@ -29,7 +29,8 @@ /obj/item/restraints/bondage_rope = 5, /obj/item/clothing/under/domina = 5, /obj/item/clothing/under/performer = 3, - /obj/item/clothing/shoes/invisiboots = 10 // Added here to go with the Gear Harness + /obj/item/clothing/shoes/invisiboots = 10, // Added here to go with the Gear Harness + /obj/item/clothing/shoes/highheel_sandals = 3 ) var/list/extra_contraband = list( //Lewd-Clothes diff --git a/modular_splurt/icons/misc/beach.dmi b/modular_splurt/icons/misc/beach.dmi new file mode 100644 index 0000000000..0bc186df19 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 115d051436..71249b8896 100644 Binary files a/modular_splurt/icons/mob/64_mam_tails.dmi and b/modular_splurt/icons/mob/64_mam_tails.dmi differ diff --git a/modular_splurt/icons/mob/clothing/32x48_head.dmi b/modular_splurt/icons/mob/clothing/32x48_head.dmi new file mode 100644 index 0000000000..d34f1f1e0c Binary files /dev/null and b/modular_splurt/icons/mob/clothing/32x48_head.dmi differ diff --git a/modular_splurt/icons/mob/clothing/accessories.dmi b/modular_splurt/icons/mob/clothing/accessories.dmi new file mode 100644 index 0000000000..024e1d5443 Binary files /dev/null and b/modular_splurt/icons/mob/clothing/accessories.dmi differ diff --git a/modular_splurt/icons/mob/clothing/current_head_accessories.dmi b/modular_splurt/icons/mob/clothing/current_head_accessories.dmi new file mode 100644 index 0000000000..6d189aeba5 Binary files /dev/null and b/modular_splurt/icons/mob/clothing/current_head_accessories.dmi differ diff --git a/modular_splurt/icons/mob/clothing/shoes.dmi b/modular_splurt/icons/mob/clothing/shoes.dmi index 0956dfbdd1..005bdc7b7d 100644 Binary files a/modular_splurt/icons/mob/clothing/shoes.dmi and b/modular_splurt/icons/mob/clothing/shoes.dmi differ diff --git a/modular_splurt/icons/mob/clothing/shoes_digi.dmi b/modular_splurt/icons/mob/clothing/shoes_digi.dmi index a37e1178f1..755d9c92e9 100644 Binary files a/modular_splurt/icons/mob/clothing/shoes_digi.dmi and b/modular_splurt/icons/mob/clothing/shoes_digi.dmi differ diff --git a/modular_splurt/icons/mob/clothing/uniform.dmi b/modular_splurt/icons/mob/clothing/uniform.dmi index 1555bade4d..dccf18cc43 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/clothing/uniform_digi.dmi b/modular_splurt/icons/mob/clothing/uniform_digi.dmi index ce963b6af7..951d678785 100644 Binary files a/modular_splurt/icons/mob/clothing/uniform_digi.dmi and b/modular_splurt/icons/mob/clothing/uniform_digi.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 0000000000..cd59fe6d03 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 0000000000..a2fc3cc73b Binary files /dev/null and b/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi differ diff --git a/modular_splurt/icons/mob/inhands/weapons/melee_lefthand.dmi b/modular_splurt/icons/mob/inhands/weapons/melee_lefthand.dmi index 93508f584a..751e41c260 100644 Binary files a/modular_splurt/icons/mob/inhands/weapons/melee_lefthand.dmi and b/modular_splurt/icons/mob/inhands/weapons/melee_lefthand.dmi differ diff --git a/modular_splurt/icons/mob/inhands/weapons/melee_righthand.dmi b/modular_splurt/icons/mob/inhands/weapons/melee_righthand.dmi index 71d886823e..da23681d2a 100644 Binary files a/modular_splurt/icons/mob/inhands/weapons/melee_righthand.dmi and b/modular_splurt/icons/mob/inhands/weapons/melee_righthand.dmi differ diff --git a/modular_splurt/icons/mob/landmarks.dmi b/modular_splurt/icons/mob/landmarks.dmi index 7ee3942be1..5c596e0c95 100644 Binary files a/modular_splurt/icons/mob/landmarks.dmi and b/modular_splurt/icons/mob/landmarks.dmi differ diff --git a/modular_splurt/icons/mob/mam_markings.dmi b/modular_splurt/icons/mob/mam_markings.dmi index d2b389c66e..8d2ca68181 100644 Binary files a/modular_splurt/icons/mob/mam_markings.dmi and b/modular_splurt/icons/mob/mam_markings.dmi differ diff --git a/modular_splurt/icons/mob/mam_snouts.dmi b/modular_splurt/icons/mob/mam_snouts.dmi index 27bab79b2d..fb6071b8c2 100644 Binary files a/modular_splurt/icons/mob/mam_snouts.dmi and b/modular_splurt/icons/mob/mam_snouts.dmi differ diff --git a/modular_splurt/icons/mob/mam_tails.dmi b/modular_splurt/icons/mob/mam_tails.dmi index 4d4f4e6755..e2ec928443 100644 Binary files a/modular_splurt/icons/mob/mam_tails.dmi and b/modular_splurt/icons/mob/mam_tails.dmi differ diff --git a/modular_splurt/icons/mobs/suits.dmi b/modular_splurt/icons/mobs/suits.dmi index 1369bc912a..57f709fdbb 100644 Binary files a/modular_splurt/icons/mobs/suits.dmi and b/modular_splurt/icons/mobs/suits.dmi differ diff --git a/modular_splurt/icons/obj/card.dmi b/modular_splurt/icons/obj/card.dmi new file mode 100644 index 0000000000..6c7eaeb624 Binary files /dev/null and b/modular_splurt/icons/obj/card.dmi differ diff --git a/modular_splurt/icons/obj/clothing/accessories.dmi b/modular_splurt/icons/obj/clothing/accessories.dmi new file mode 100644 index 0000000000..c15501ea74 Binary files /dev/null and b/modular_splurt/icons/obj/clothing/accessories.dmi differ diff --git a/modular_splurt/icons/obj/clothing/hats.dmi b/modular_splurt/icons/obj/clothing/hats.dmi index 472ff0cb1b..7af75114a5 100644 Binary files a/modular_splurt/icons/obj/clothing/hats.dmi and b/modular_splurt/icons/obj/clothing/hats.dmi differ diff --git a/modular_splurt/icons/obj/clothing/shoes.dmi b/modular_splurt/icons/obj/clothing/shoes.dmi index 71b62b42bc..311174d23d 100644 Binary files a/modular_splurt/icons/obj/clothing/shoes.dmi and b/modular_splurt/icons/obj/clothing/shoes.dmi differ diff --git a/modular_splurt/icons/obj/clothing/suits.dmi b/modular_splurt/icons/obj/clothing/suits.dmi index 418f999575..de921cc6bd 100644 Binary files a/modular_splurt/icons/obj/clothing/suits.dmi and b/modular_splurt/icons/obj/clothing/suits.dmi differ diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi index 3880f77532..f6648a1fac 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 a1541fddb1..4ea6784f4e 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 b0c383513b..a5b3d02d5b 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 0000000000..accf4cab3c 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 0000000000..9e5ba7866f 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 0000000000..2d2f825a83 Binary files /dev/null and b/modular_splurt/sound/voice/whine.ogg differ diff --git a/tgstation.dme b/tgstation.dme index a00bce28c7..984621b38c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -109,6 +109,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" @@ -160,7 +161,9 @@ #include "code\__DEFINES\dcs\signals\signals_medical.dm" #include "code\__DEFINES\dcs\signals\signals_mod.dm" #include "code\__DEFINES\dcs\signals\signals_movable.dm" +#include "code\__DEFINES\dcs\signals\signals_painting.dm" #include "code\__DEFINES\dcs\signals\signals_reagent.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" @@ -215,6 +218,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" @@ -236,6 +240,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" @@ -251,6 +256,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" @@ -266,6 +272,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" @@ -765,6 +772,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" @@ -820,6 +831,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" @@ -1517,6 +1530,7 @@ #include "code\modules\admin\create_object.dm" #include "code\modules\admin\create_poll.dm" #include "code\modules\admin\create_turf.dm" +#include "code\modules\admin\force_event.dm" #include "code\modules\admin\fun_balloon.dm" #include "code\modules\admin\holder2.dm" #include "code\modules\admin\ipintel.dm" @@ -1995,6 +2009,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" @@ -2222,6 +2237,7 @@ #include "code\modules\events\processor_overload.dm" #include "code\modules\events\radiation_storm.dm" #include "code\modules\events\sentience.dm" +#include "code\modules\events\shuttle_catastrophe.dm" #include "code\modules\events\shuttle_loan.dm" #include "code\modules\events\space_dragon.dm" #include "code\modules\events\space_ninja.dm" @@ -2689,6 +2705,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" @@ -2744,6 +2761,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" @@ -3737,10 +3755,12 @@ #include "code\modules\tgui\states\debug.dm" #include "code\modules\tgui\states\deep_inventory.dm" #include "code\modules\tgui\states\default.dm" +#include "code\modules\tgui\states\fun.dm" #include "code\modules\tgui\states\hands.dm" #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" @@ -3885,6 +3905,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" @@ -3955,17 +3976,20 @@ #include "modular_citadel\code\modules\vectorcrafts\vectortruck.dm" #include "modular_citadel\code\modules\vectorcrafts\vectorvariants.dm" #include "modular_sand\code\_globalvars\bitfields.dm" +#include "modular_sand\code\_globalvars\lists\lewd_content.dm" #include "modular_sand\code\_globalvars\lists\misc.dm" #include "modular_sand\code\_globalvars\lists\objects.dm" #include "modular_sand\code\_onclick\hud\hud.dm" #include "modular_sand\code\_onclick\hud\screen_objects.dm" #include "modular_sand\code\controllers\configuration\entries\sandstorm.dm" +#include "modular_sand\code\controllers\configuration\entries\sandstorm_balance.dm" #include "modular_sand\code\controllers\subsystem\interactions.dm" #include "modular_sand\code\controllers\subsystem\job.dm" #include "modular_sand\code\controllers\subsystem\language.dm" #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" @@ -3974,8 +3998,8 @@ #include "modular_sand\code\datums\components\storage\concrete\dresser.dm" #include "modular_sand\code\datums\diseases\advance\symptoms\species.dm" #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" @@ -4017,6 +4041,7 @@ #include "modular_sand\code\game\machinery\cryopod.dm" #include "modular_sand\code\game\machinery\cryptominers.dm" #include "modular_sand\code\game\machinery\Sleeper.dm" +#include "modular_sand\code\game\machinery\computer\cloning.dm" #include "modular_sand\code\game\machinery\computer\arcade\tetris.dm" #include "modular_sand\code\game\machinery\pipe\construction.dm" #include "modular_sand\code\game\machinery\telecomms\machine_interactions.dm" @@ -4036,6 +4061,7 @@ #include "modular_sand\code\game\objects\items\extinguisher.dm" #include "modular_sand\code\game\objects\items\fleshlight.dm" #include "modular_sand\code\game\objects\items\miscellaneous.dm" +#include "modular_sand\code\game\objects\items\plushes.dm" #include "modular_sand\code\game\objects\items\circuitboards\computer_circuitboards.dm" #include "modular_sand\code\game\objects\items\circuitboards\machine_circuitboards.dm" #include "modular_sand\code\game\objects\items\devices\dogborg_sleeper.dm" @@ -4107,6 +4133,7 @@ #include "modular_sand\code\modules\client\preferences_savefile.dm" #include "modular_sand\code\modules\client\loadout\_security.dm" #include "modular_sand\code\modules\client\loadout\accessories.dm" +#include "modular_sand\code\modules\client\loadout\backpack.dm" #include "modular_sand\code\modules\client\loadout\boxers.dm" #include "modular_sand\code\modules\client\loadout\hands.dm" #include "modular_sand\code\modules\client\loadout\head.dm" @@ -4128,12 +4155,7 @@ #include "modular_sand\code\modules\clothing\spacesuits\hardsuit.dm" #include "modular_sand\code\modules\clothing\suits\miscellaneous.dm" #include "modular_sand\code\modules\clothing\under\_under.dm" -#include "modular_sand\code\modules\clothing\under\color.dm" #include "modular_sand\code\modules\clothing\under\costumes.dm" -#include "modular_sand\code\modules\clothing\under\misc.dm" -#include "modular_sand\code\modules\clothing\under\skirt_dress.dm" -#include "modular_sand\code\modules\clothing\under\suits.dm" -#include "modular_sand\code\modules\clothing\under\syndicate.dm" #include "modular_sand\code\modules\clothing\under\uniform.dm" #include "modular_sand\code\modules\clothing\underwear\_underwear.dm" #include "modular_sand\code\modules\clothing\underwear\boxers.dm" @@ -4150,6 +4172,7 @@ #include "modular_sand\code\modules\integrated_electronics\subtypes\output.dm" #include "modular_sand\code\modules\jobs\job_types\_job.dm" #include "modular_sand\code\modules\jobs\job_types\_job_alt_titles.dm" +#include "modular_sand\code\modules\jobs\job_types\prisoner.dm" #include "modular_sand\code\modules\keybindings\keybind\carbon.dm" #include "modular_sand\code\modules\language\dragon.dm" #include "modular_sand\code\modules\language\language.dm" @@ -4177,13 +4200,15 @@ #include "modular_sand\code\modules\mob\living\carbon\carbon.dm" #include "modular_sand\code\modules\mob\living\carbon\life.dm" #include "modular_sand\code\modules\mob\living\carbon\show.dm" -#include "modular_sand\code\modules\mob\living\carbon\human\examine.dm" #include "modular_sand\code\modules\mob\living\carbon\human\human.dm" #include "modular_sand\code\modules\mob\living\carbon\human\human_defines.dm" #include "modular_sand\code\modules\mob\living\carbon\human\human_stripping.dm" #include "modular_sand\code\modules\mob\living\carbon\human\life.dm" #include "modular_sand\code\modules\mob\living\carbon\human\species.dm" +#include "modular_sand\code\modules\mob\living\carbon\human\species_types\anthropomorph.dm" +#include "modular_sand\code\modules\mob\living\carbon\human\species_types\ipc.dm" #include "modular_sand\code\modules\mob\living\carbon\human\species_types\lizardpeople.dm" +#include "modular_sand\code\modules\mob\living\carbon\human\species_types\synthliz.dm" #include "modular_sand\code\modules\mob\living\silicon\silicon.dm" #include "modular_sand\code\modules\mob\living\silicon\ai\ai.dm" #include "modular_sand\code\modules\mob\living\silicon\ai\vox_sounds.dm" @@ -4231,6 +4256,7 @@ #include "modular_sand\code\modules\reagents\chemistry\reagents\alcohol_reagents.dm" #include "modular_sand\code\modules\reagents\chemistry\reagents\cit_reagents.dm" #include "modular_sand\code\modules\reagents\chemistry\reagents\drink_reagents.dm" +#include "modular_sand\code\modules\reagents\chemistry\reagents\fermi_reagents.dm" #include "modular_sand\code\modules\reagents\chemistry\reagents\medicine_reagents.dm" #include "modular_sand\code\modules\reagents\chemistry\reagents\other_reagents.dm" #include "modular_sand\code\modules\reagents\chemistry\recipes\others.dm" @@ -4305,6 +4331,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" @@ -4313,6 +4340,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" @@ -4336,6 +4364,7 @@ #include "modular_splurt\code\datums\components\crafting\recipes\recipes_robot.dm" #include "modular_splurt\code\datums\components\storage\concrete\pockets.dm" #include "modular_splurt\code\datums\elements\crawl_under.dm" +#include "modular_splurt\code\datums\elements\mob_holder.dm" #include "modular_splurt\code\datums\elements\smalltalk.dm" #include "modular_splurt\code\datums\elements\spooky.dm" #include "modular_splurt\code\datums\elements\wuv.dm" @@ -4552,6 +4581,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" @@ -4572,14 +4602,19 @@ #include "modular_splurt\code\modules\client\verbs\looc.dm" #include "modular_splurt\code\modules\client\verbs\ooc.dm" #include "modular_splurt\code\modules\clothing\back.dm" +#include "modular_splurt\code\modules\clothing\clothing.dm" #include "modular_splurt\code\modules\clothing\gloves.dm" #include "modular_splurt\code\modules\clothing\kinkyclothes.dm" #include "modular_splurt\code\modules\clothing\sizeaccessories.dm" #include "modular_splurt\code\modules\clothing\glasses\_glasses.dm" #include "modular_splurt\code\modules\clothing\glasses\hud.dm" +#include "modular_splurt\code\modules\clothing\gloves\_gloves.dm" +#include "modular_splurt\code\modules\clothing\head\_head.dm" +#include "modular_splurt\code\modules\clothing\head\hardhat.dm" #include "modular_splurt\code\modules\clothing\head\helmet.dm" #include "modular_splurt\code\modules\clothing\head\jobs.dm" #include "modular_splurt\code\modules\clothing\head\misc.dm" +#include "modular_splurt\code\modules\clothing\head\misc_special.dm" #include "modular_splurt\code\modules\clothing\lewd_clothing\collar\kink_collars.dm" #include "modular_splurt\code\modules\clothing\lewd_clothing\eyes\hypnogoggles.dm" #include "modular_splurt\code\modules\clothing\lewd_clothing\foot\lewd_shoes.dm" @@ -4587,11 +4622,15 @@ #include "modular_splurt\code\modules\clothing\lewd_clothing\head\deprivation_helmet.dm" #include "modular_splurt\code\modules\clothing\lewd_clothing\head\hats.dm" #include "modular_splurt\code\modules\clothing\lewd_clothing\uniform\latex_catsuit.dm" +#include "modular_splurt\code\modules\clothing\masks\_mask.dm" +#include "modular_splurt\code\modules\clothing\masks\boxing.dm" #include "modular_splurt\code\modules\clothing\masks\gasmask.dm" #include "modular_splurt\code\modules\clothing\masks\hailer.dm" #include "modular_splurt\code\modules\clothing\masks\miscellaneous.dm" #include "modular_splurt\code\modules\clothing\neck\_neck.dm" #include "modular_splurt\code\modules\clothing\outfits\ert.dm" +#include "modular_splurt\code\modules\clothing\shoes\_shoes.dm" +#include "modular_splurt\code\modules\clothing\shoes\magboots.dm" #include "modular_splurt\code\modules\clothing\shoes\miscellaneous.dm" #include "modular_splurt\code\modules\clothing\spacesuits\hardsuit.dm" #include "modular_splurt\code\modules\clothing\suits\armor.dm" @@ -4599,14 +4638,17 @@ #include "modular_splurt\code\modules\clothing\suits\heavy.dm" #include "modular_splurt\code\modules\clothing\suits\jobs.dm" #include "modular_splurt\code\modules\clothing\suits\miscellaneous.dm" +#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" #include "modular_splurt\code\modules\clothing\under\jobs\engineering.dm" #include "modular_splurt\code\modules\clothing\under\jobs\security.dm" #include "modular_splurt\code\modules\clothing\under\jobs\civilian\civilian.dm" +#include "modular_splurt\code\modules\clothing\underwear\_underwear.dm" #include "modular_splurt\code\modules\clothing\underwear\boxers.dm" #include "modular_splurt\code\modules\clothing\underwear\shirts.dm" #include "modular_splurt\code\modules\clothing\underwear\socks.dm" @@ -4651,6 +4693,8 @@ #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" #include "modular_splurt\code\modules\language\xenocommon.dm" @@ -4685,10 +4729,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" @@ -4721,6 +4768,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" @@ -4753,6 +4802,7 @@ #include "modular_splurt\code\modules\reagents\chemistry\reagents\other_reagents.dm" #include "modular_splurt\code\modules\reagents\chemistry\recipes\drugs.dm" #include "modular_splurt\code\modules\reagents\chemistry\recipes\lewd.dm" +#include "modular_splurt\code\modules\reagents\reagent_containers\borghydro.dm" #include "modular_splurt\code\modules\reagents\reagent_containers\bottle.dm" #include "modular_splurt\code\modules\reagents\reagent_containers\hypospray.dm" #include "modular_splurt\code\modules\reagents\reagent_containers\hypovial.dm" @@ -4766,15 +4816,16 @@ #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" #include "modular_splurt\code\modules\research\designs\autolathe_desings\autolathe_designs_sec_and_hacked.dm" #include "modular_splurt\code\modules\research\designs\machine_designs\machine_designs_all_misc.dm" +#include "modular_splurt\code\modules\research\techweb\nodes\biotech_nodes.dm" #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\misc_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/packages/common/collections.ts b/tgui/packages/common/collections.ts index a5ccd7003e..ae3f402b13 100644 --- a/tgui/packages/common/collections.ts +++ b/tgui/packages/common/collections.ts @@ -306,3 +306,24 @@ export const zip =