General Settings
" dat += "UI Style: [UI_style]" dat += "Fancy NanoUI: [(nanoui_fancy) ? "Yes" : "No"]
" + dat += "Ghost-Item Attack Animation: [(show_ghostitem_attack) ? "Yes" : "No"]
" dat += "Custom UI settings:
" dat += "Color: [UI_style_color]
| __ |
" dat += "Alpha (transparency): [UI_style_alpha]
" @@ -1187,8 +1189,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if("hair") if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Vulpkanin") var/input = "Choose your character's hair colour:" - if(species == "Machine" && !("head" in rlimb_data)) - input = "Choose your character's frame colour:" var/new_hair = input(user, input, "Character Preference", rgb(r_hair, g_hair, b_hair)) as color|null if(new_hair) r_hair = hex2num(copytext(new_hair, 2, 4)) @@ -1200,18 +1200,25 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] if(species == "Machine") //Species that can use prosthetic heads. - if(species in S.species_allowed) - if(!rlimb_data["head"]) - valid_hairstyles[hairstyle] = S - continue - else - continue + var/obj/item/organ/external/head/H = new() + if(S.name == "Bald") + valid_hairstyles[hairstyle] = S + if(!rlimb_data["head"]) //Handle situations where the head is default. + H.model = "Morpheus Cyberkinetics" else - if(!rlimb_data["head"]) + H.model = rlimb_data["head"] + var/datum/robolimb/robohead = all_robolimbs[H.model] + if(species in S.species_allowed) + if(robohead.is_monitor && (robohead.company in S.models_allowed)) //If the Machine character has the default Morpheus screen head or another screen head + //and said head is in the hair style's allowed models list... + valid_hairstyles[hairstyle] = S //Allow them to select the hairstyle. + continue + else + if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human hairstyles). continue - else if("Human" in S.species_allowed) + else if(!robohead.is_monitor && ("Human" in S.species_allowed)) valid_hairstyles[hairstyle] = S - continue + continue else if(!(species in S.species_allowed)) continue @@ -1223,7 +1230,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts h_style = new_h_style if("headaccessory") - if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with head accessories + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories. var/input = "Choose the colour of your your character's head accessory:" var/new_head_accessory = input(user, input, "Character Preference", rgb(r_headacc, g_headacc, b_headacc)) as color|null if(new_head_accessory) @@ -1232,7 +1239,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts b_headacc = hex2num(copytext(new_head_accessory, 6, 8)) if("ha_style") - if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with head accessories + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories. var/list/valid_head_accessory_styles = list() for(var/head_accessory_style in head_accessory_styles_list) var/datum/sprite_accessory/H = head_accessory_styles_list[head_accessory_style] @@ -1246,7 +1253,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts ha_style = new_head_accessory_style if("markings") - if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with markings + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with markings. var/input = "Choose the colour of your your character's markings:" var/new_markings = input(user, input, "Character Preference", rgb(r_markings, g_markings, b_markings)) as color|null if(new_markings) @@ -1255,7 +1262,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts b_markings = hex2num(copytext(new_markings, 6, 8)) if("m_style") - if(species in list("Unathi", "Vulpkanin", "Tajaran")) // Species with markings + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with markings. var/list/valid_markings = list() for(var/markingstyle in marking_styles_list) var/datum/sprite_accessory/M = marking_styles_list[markingstyle] @@ -1263,10 +1270,17 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts continue if(species == "Machine") //Species that can use prosthetic heads. - if(!("head" in rlimb_data) && M.name != "None") //If the character can have prosthetic heads and they have the default head (with screen), no optic markings. - continue - else if(("head" in rlimb_data) && M.name == "None") //Otherwise, if they DON'T have the default head and since they must have optics, give them a list of styles excluding the "None" option. + var/obj/item/organ/external/head/H = new() + if(!rlimb_data["head"]) //Handle situations where the head is default. + H.model = "Morpheus Cyberkinetics" + else + H.model = rlimb_data["head"] + var/datum/robolimb/robohead = all_robolimbs[H.model] + if(robohead.is_monitor && M.name != "None") //If the character can have prosthetic heads and they have the default Morpheus head (or another monitor-head), no optic markings. continue + else if(!robohead.is_monitor && M.name != "None") //Otherwise, if they DON'T have the default head and the head's not a monitor but the head's not in the style's list of allowed models, skip. + if(!(robohead.company in M.models_allowed)) + continue valid_markings[markingstyle] = marking_styles_list[markingstyle] @@ -1302,25 +1316,29 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] + if(S.name == "Shaved") + valid_facialhairstyles[facialhairstyle] = S if(gender == MALE && S.gender == FEMALE) continue if(gender == FEMALE && S.gender == MALE) continue if(species == "Machine") //Species that can use prosthetic heads. - if(species in S.species_allowed) - if(!rlimb_data["head"]) - valid_facialhairstyles[facialhairstyle] = S - continue - else - continue + var/obj/item/organ/external/head/H = new() + if(!rlimb_data["head"]) //Handle situations where the head is default. + H.model = "Morpheus Cyberkinetics" else - if(!rlimb_data["head"]) - continue - else if("Human" in S.species_allowed) + H.model = rlimb_data["head"] + var/datum/robolimb/robohead = all_robolimbs[H.model] + if(species in S.species_allowed) + if(robohead.is_monitor) //If the Machine character has the default Morpheus screen head or another screen head and they're allowed to have the style, let them have it. valid_facialhairstyles[facialhairstyle] = S + continue + else + if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human facial hairstyles). continue - else - continue + else if(!robohead.is_monitor && ("Human" in S.species_allowed)) + valid_facialhairstyles[facialhairstyle] = S + continue else if(!(species in S.species_allowed)) continue @@ -1491,18 +1509,51 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts organ_data[second_limb] = "amputated" rlimb_data[second_limb] = null if("Prosthesis") - var/choice = input(user, "Which manufacturer do you wish to use for this limb?") as null|anything in chargen_robolimbs + var/choice + var/subchoice + var/datum/robolimb/R = new() + var/in_model + var/robolimb_companies = list() + for(var/limb_type in typesof(/datum/robolimb)) //This loop populates a list of companies that offer the limb the user selected previously as one of their cybernetic products. + R = new limb_type() + if(!R.unavailable_at_chargen && (limb in R.parts) && R.has_subtypes) //Ensures users can only choose companies that offer the parts they want, that singular models get added to the list as well companies that offer more than one model, and... + robolimb_companies[R.company] = R //List only main brands that have the parts we're looking for. + R = new() //Re-initialize R. + + choice = input(user, "Which manufacturer do you wish to use for this limb?") as null|anything in robolimb_companies //Choose from a list of companies that offer the part the user wants. if(!choice) return + R.company = choice + R = all_robolimbs[R.company] + if(R.has_subtypes == 1) //If the company the user selected provides more than just one base model, lets handle it. + var/list/robolimb_models = list() + for(var/limb_type in typesof(R)) //Handling the different models of parts that manufacturers can provide. + var/datum/robolimb/L = new limb_type() + if(limb in L.parts) //Make sure that only models that provide the parts the user needs populate the list. + robolimb_models[L.company] = L + if(robolimb_models.len == 1) //If there's only one model available in the list, autoselect it to avoid having to bother the user with a dialog that provides only one option. + subchoice = L.company //If there ends up being more than one model populating the list, subchoice will be overwritten later anyway, so this isn't a problem. + if(second_limb in L.parts) //If the child limb of the limb the user selected is also present in the model's parts list, state it's been found so the second limb can be set later. + in_model = 1 + if(robolimb_models.len > 1) //If there's more than one model in the list that can provide the part the user wants, let them choose. + subchoice = input(user, "Which model of [choice] [limb_name] do you wish to use?") as null|anything in robolimb_models + if(subchoice) + choice = subchoice if(limb == "head") - m_style = "Humanoid Optics" ha_style = "None" h_style = hair_styles_list["Bald"] + f_style = facial_hair_styles_list["Shaved"] + m_style = "None" rlimb_data[limb] = choice organ_data[limb] = "cyborg" if(second_limb) - rlimb_data[second_limb] = choice - organ_data[second_limb] = "cyborg" + if(subchoice) + if(in_model) + rlimb_data[second_limb] = choice + organ_data[second_limb] = "cyborg" + else + rlimb_data[second_limb] = choice + organ_data[second_limb] = "cyborg" if("organs") var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes") @@ -1561,23 +1612,46 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if("ui") switch(UI_style) if("Midnight") + UI_style = "Plasmafire" + if("Plasmafire") + UI_style = "Retro" + if("Retro") + UI_style = "Slimecore" + if("Slimecore") + UI_style = "Operative" + if("Operative") UI_style = "White" else UI_style = "Midnight" + if(ishuman(usr)) //mid-round preference changes, for aesthetics + var/mob/living/carbon/human/H = usr + H.remake_hud() + if("nanoui") nanoui_fancy = !nanoui_fancy + if("ghost_att_anim") + show_ghostitem_attack = !show_ghostitem_attack + if("UIcolor") var/UI_style_color_new = input(user, "Choose your UI color, dark colors are not recommended!", UI_style_color) as color|null if(!UI_style_color_new) return UI_style_color = UI_style_color_new + if(ishuman(usr)) //mid-round preference changes, for aesthetics + var/mob/living/carbon/human/H = usr + H.remake_hud() + if("UIalpha") var/UI_style_alpha_new = input(user, "Select a new alpha(transparence) parameter for UI, between 50 and 255", UI_style_alpha) as num if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return UI_style_alpha = UI_style_alpha_new + if(ishuman(usr)) //mid-round preference changes, for aesthetics + var/mob/living/carbon/human/H = usr + H.remake_hud() + if("be_special") var/r = href_list["role"] if(!(r in special_roles)) @@ -1666,9 +1740,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.name = character.real_name character.flavor_text = flavor_text - character.med_record = med_record - character.sec_record = sec_record - character.gen_record = gen_record + if(character.ckey && !jobban_isbanned(character, "Records")) + character.med_record = med_record + character.sec_record = sec_record + character.gen_record = gen_record character.change_gender(gender) character.age = age diff --git a/code/modules/client/preferences_mysql.dm b/code/modules/client/preferences_mysql.dm index 9b873baec73..cb2e3116526 100644 --- a/code/modules/client/preferences_mysql.dm +++ b/code/modules/client/preferences_mysql.dm @@ -11,7 +11,8 @@ sound, randomslot, volume, - nanoui_fancy + nanoui_fancy, + show_ghostitem_attack FROM [format_table_name("player")] WHERE ckey='[C.ckey]'"} ) @@ -36,6 +37,7 @@ randomslot = text2num(query.item[9]) volume = text2num(query.item[10]) nanoui_fancy = text2num(query.item[11]) + show_ghostitem_attack = text2num(query.item[12]) //Sanitize ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor)) @@ -49,6 +51,7 @@ randomslot = sanitize_integer(randomslot, 0, 1, initial(randomslot)) volume = sanitize_integer(volume, 0, 100, initial(volume)) nanoui_fancy = sanitize_integer(nanoui_fancy, 0, 1, initial(nanoui_fancy)) + show_ghostitem_attack = sanitize_integer(show_ghostitem_attack, 0, 1, initial(show_ghostitem_attack)) return 1 /datum/preferences/proc/save_preferences(client/C) @@ -71,7 +74,8 @@ sound='[sound]', randomslot='[randomslot]', volume='[volume]', - nanoui_fancy='[nanoui_fancy]' + nanoui_fancy='[nanoui_fancy]', + show_ghostitem_attack='[show_ghostitem_attack]' WHERE ckey='[C.ckey]'"} ) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 9b53e95b586..04f0f3ed42d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -119,7 +119,7 @@ /obj/item/clothing/ears/offear name = "Other ear" w_class = 5.0 - icon = 'icons/mob/screen1_Midnight.dmi' + icon = 'icons/mob/screen_gen.dmi' icon_state = "block" slot_flags = SLOT_EARS | SLOT_TWOEARS diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 0c8d127a596..1654198d9c9 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -446,3 +446,54 @@ icon_state = "cybereye-red" item_state = "eyepatch" flags = NODROP + +/obj/item/clothing/glasses/proc/chameleon(var/mob/user) + var/input_glasses = input(user, "Choose a piece of eyewear to disguise as.", "Choose glasses style.") as null|anything in list("Sunglasses", "Medical HUD", "Mesons", "Science Goggles", "Glasses", "Security Sunglasses","Eyepatch","Welding","Gar") + + if(user && src in user.contents) + switch(input_glasses) + if("Sunglasses") + desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes." + name = "sunglasses" + icon_state = "sun" + item_state = "sunglasses" + if("Medical HUD") + name = "Health Scanner HUD" + desc = "A heads-up display that scans the humans in view and provides accurate data about their health status." + icon_state = "healthhud" + item_state = "healthhud" + if("Mesons") + name = "Optical Meson Scanner" + desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." + icon_state = "meson" + item_state = "meson" + if("Science Goggles") + name = "Science Goggles" + desc = "A pair of snazzy goggles used to protect against chemical spills." + icon_state = "purple" + item_state = "glasses" + if("Glasses") + name = "Prescription Glasses" + desc = "Made by Nerd. Co." + icon_state = "glasses" + item_state = "glasses" + if("Security Sunglasses") + name = "HUDSunglasses" + desc = "Sunglasses with a HUD." + icon_state = "sunhud" + item_state = "sunglasses" + if("Eyepatch") + name = "eyepatch" + desc = "Yarr." + icon_state = "eyepatch" + item_state = "eyepatch" + if("Welding") + name = "welding goggles" + desc = "Protects the eyes from welders; approved by the mad scientist association." + icon_state = "welding-g" + item_state = "welding-g" + if("Gar") + desc = "Just who the hell do you think I am?!" + name = "gar glasses" + icon_state = "gar" + item_state = "gar" \ No newline at end of file diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 7d57902d4fd..44138b8e907 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -68,6 +68,14 @@ flash_protect = 1 HUDType = DATA_HUD_SECURITY_ADVANCED +/obj/item/clothing/glasses/hud/security/chameleon + name = "Chamleon Security HUD" + desc = "A stolen security HUD integrated with Syndicate chameleon technology. Toggle to disguise the HUD. Provides flash protection." + flash_protect = 1 + +/obj/item/clothing/glasses/hud/security/chameleon/attack_self(mob/user) + chameleon(user) + /obj/item/clothing/glasses/hud/security/jensenshades name = "augmented shades" desc = "Polarized bioneural eyewear, designed to augment your vision." diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 1e6ef08edf6..88af8bf4dd3 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -202,9 +202,14 @@ desc = "Woof!" icon_state = "corgihead" item_state = "chickensuit" + flags = BLOCKHAIR + +/obj/item/clothing/head/corgi/super_hero + name = "super-hero corgi suit head" + desc = "Woof! This one seems to pulse with a strange power" flags = BLOCKHAIR | NODROP -/obj/item/clothing/head/corgi/en +/obj/item/clothing/head/corgi/super_hero/en name = "E-N suit head" icon_state = "enhead" diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 066c4893f73..6e3fcffa7cf 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -190,112 +190,217 @@ piece.flags &= ~(STOPSPRESSUREDMAGE|AIRTIGHT) update_icon(1) -/obj/item/weapon/rig/proc/toggle_seals(var/mob/living/carbon/human/M, var/mob/living/user, var/instant) - - if(sealing) return - - if(!check_power_cost(M, 1)) //costs tiny amount of power to unseal/seal +/obj/item/weapon/rig/proc/seal(mob/living/user) + if(sealing) return 0 - deploy(M, instant) + if(!wearer || !user) + return - var/seal_target = (flags & NODROP) - var/failed_to_seal + var/sealed = (flags & NODROP) + if(sealed) + to_chat(user, "\The [src] is already sealed!") + return 0 - flags |= NODROP // No removing the suit while unsealing. - sealing = 1 + if(!check_power_cost(user, 1)) //need power to seal the suit + return 0 - if(!seal_target && !suit_is_deployed()) - M.visible_message("[M]'s suit flashes an error light.","Your suit flashes an error light. It can't function properly without being fully deployed.") - failed_to_seal = 1 + var/failed_to_seal = FALSE + + if(!suit_is_deployed()) + to_chat(user, "\The [src] cannot seal, as it is not fully deployed!") + return 0 + + flags |= NODROP + sealing = TRUE + + to_chat(user, "\The [src] begins to tighten it's seals.") + wearer.visible_message("\The [wearer]'s suit emits a quiet hum as it begins to tighten it's seals.", + "With a quiet hum, your suit begins to seal.") + + if(seal_delay && !do_after(user, seal_delay, target = wearer)) + to_chat(user, "You must remain still to seal \the [src]!") + failed_to_seal = TRUE if(!failed_to_seal) + deploy(user) - if(!instant) - M.visible_message("[M]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") - if(seal_delay && !do_after(user, seal_delay, target = M)) - if(user) - to_chat(user, "You must remain still while the suit is adjusting the components.") - failed_to_seal = 1 + var/list/pieces_data = list(list(wearer.shoes, boots, "boots", boot_type), + list(wearer.gloves, gloves, "gloves", glove_type), + list(wearer.head, helmet, "helmet", helm_type), + list(wearer.wear_suit, chest, "chest", chest_type)) - if(!M) - failed_to_seal = 1 - else - for(var/list/piece_data in list(list(M.shoes,boots,"boots",boot_type),list(M.gloves,gloves,"gloves",glove_type),list(M.head,helmet,"helmet",helm_type),list(M.wear_suit,chest,"chest",chest_type))) + for(var/list/piece_data in pieces_data) + var/obj/item/user_piece = piece_data[1] + var/obj/item/correct_piece = piece_data[2] + var/msg_type = piece_data[3] + var/piece_type = piece_data[4] - var/obj/item/piece = piece_data[1] - var/obj/item/compare_piece = piece_data[2] - var/msg_type = piece_data[3] - var/piece_type = piece_data[4] + if(!user_piece || !piece_type) + continue - if(!piece || !piece_type) - continue + if(user_piece != correct_piece) + to_chat(user, "\The [user_piece] is blocking \the [src] from deploying.") + failed_to_seal = TRUE - if(!istype(M) || !istype(piece) || !istype(compare_piece) || !msg_type) - if(M) - to_chat(M, "You must remain still while the suit is adjusting the components.") - failed_to_seal = 1 - break + if(seal_delay && !do_after(user, seal_delay, needhand = 0, target = wearer)) + to_chat(user, "You must remain still to seal \the [src]!") + failed_to_seal = TRUE - if(!failed_to_seal && M.back == src && piece == compare_piece) + if(failed_to_seal) + break - if(seal_delay && !instant && !do_after(user, seal_delay, needhand = 0, target = M)) - failed_to_seal = 1 + correct_piece.icon_state = "[initial(icon_state)]_sealed" + switch(msg_type) + if("boots") + to_chat(wearer, "\The [correct_piece] seal around your feet.") + if(user != wearer) + to_chat(user, "\The [correct_piece] has been sealed.") + wearer.update_inv_shoes() + if("gloves") + to_chat(wearer, "\The [correct_piece] tighten around your fingers and wrists.") + if(user != wearer) + to_chat(user, "\The [correct_piece] has been sealed.") + wearer.update_inv_gloves() + if("chest") + to_chat(wearer, "\The [correct_piece] cinches tight again your chest.") + if(user != wearer) + to_chat(user, "\The [correct_piece] has been sealed.") + wearer.update_inv_wear_suit() + if("helmet") + to_chat(wearer, "\The [correct_piece] hisses closed.") + if(user != wearer) + to_chat(user, "\The [correct_piece] has been sealed.") + wearer.update_inv_head() + if(helmet) + helmet.update_light(wearer) - piece.icon_state = "[initial(icon_state)][!seal_target ? "_sealed" : ""]" - switch(msg_type) - if("boots") - to_chat(M, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") - M.update_inv_shoes() - if("gloves") - to_chat(M, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") - M.update_inv_gloves() - if("chest") - to_chat(M, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") - M.update_inv_wear_suit() - if("helmet") - to_chat(M, "\The [piece] hisses [!seal_target ? "closed" : "open"].") - M.update_inv_head() - if(helmet) - helmet.update_light(wearer) + correct_piece.armor["bio"] = 100 - //sealed pieces become airtight, protecting against diseases - if (!seal_target) - piece.armor["bio"] = 100 - else - piece.armor["bio"] = src.armor["bio"] - - else - failed_to_seal = 1 - - if((M && !(istype(M) && M.back == src) && !istype(M,/mob/living/silicon)) || (!seal_target && !suit_is_deployed())) - failed_to_seal = 1 - - sealing = null + sealing = FALSE if(failed_to_seal) - for(var/obj/item/piece in list(helmet,boots,gloves,chest)) - if(!piece) continue - piece.icon_state = "[initial(icon_state)][!seal_target ? "" : "_sealed"]" - if(seal_target) - flags |= NODROP - else - flags &= ~NODROP + for(var/obj/item/piece in list(helmet, boots, gloves, chest)) + if(!piece) + continue + piece.icon_state = "[initial(icon_state)]" + flags &= ~NODROP if(airtight) update_component_sealed() update_icon(1) return 0 - // Success! - if(seal_target) - flags &= ~NODROP - else - flags |= NODROP - to_chat(M, "Your entire suit [!(flags & NODROP) ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + if(user != wearer) + to_chat(user, "\The [src] has been loosened.") + to_chat(wearer, "Your entire suit tightens around you as the components lock into place.") + if(airtight) + update_component_sealed() + update_icon(1) + +/obj/item/weapon/rig/proc/unseal(mob/living/user) + if(sealing) + return 0 + + if(!wearer || !user) + return + + var/sealed = (flags & NODROP) + if(!sealed) + to_chat(user, "\The [src] is already unsealed!") + return 0 + + sealing = TRUE + + var/failed_to_seal = FALSE + + if(!suit_is_deployed()) + to_chat(user, "\The [src] cannot unseal, as it is not fully deployed!") + failed_to_seal = TRUE + + if(!failed_to_seal) + if(user != wearer) + to_chat(user, "\The [src] begins to loosen it's seals.") + wearer.visible_message("\The [wearer]'s suit emits a quiet hum as it begins to loosen it's seals.", + "With a quiet hum, your suit begins to unseal.") + + if(seal_delay && !do_after(user, seal_delay, target = wearer)) + to_chat(user, "You must remain still to unseal \the [src]!") + failed_to_seal = TRUE + + if(!failed_to_seal) + var/list/pieces_data = list(list(wearer.shoes, boots, "boots", boot_type), + list(wearer.gloves, gloves, "gloves", glove_type), + list(wearer.head, helmet, "helmet", helm_type), + list(wearer.wear_suit, chest, "chest", chest_type)) + + for(var/list/piece_data in pieces_data) + var/obj/item/user_piece = piece_data[1] + var/obj/item/correct_piece = piece_data[2] + var/msg_type = piece_data[3] + var/piece_type = piece_data[4] + + if(!correct_piece || !piece_type) + continue + + if(user_piece != correct_piece) + to_chat(user, "\The [user_piece] is blocking \the [src] from deploying.") + failed_to_seal = TRUE + + if(seal_delay && !do_after(user, seal_delay, needhand = 0, target = wearer)) + to_chat(user, "You must remain still to unseal \the [src]!") + failed_to_seal = TRUE + + if(failed_to_seal) + break + + correct_piece.icon_state = "[initial(icon_state)]" + switch(msg_type) + if("boots") + to_chat(wearer, "\The [correct_piece] relax their grip on your legs.") + if(user != wearer) + to_chat(user, "\The [correct_piece] has been unsealed.") + wearer.update_inv_shoes() + if("gloves") + to_chat(wearer, "\The [correct_piece] become loose around your fingers.") + if(user != wearer) + to_chat(user, "\The [correct_piece] has been unsealed.") + wearer.update_inv_gloves() + if("chest") + to_chat(wearer, "\The [correct_piece] releases your chest.") + if(user != wearer) + to_chat(user, "\The [correct_piece] has been unsealed.") + wearer.update_inv_wear_suit() + if("helmet") + to_chat(wearer, "\The [correct_piece] hisses open.") + if(user != wearer) + to_chat(user, "\The [correct_piece] has been unsealed.") + wearer.update_inv_head() + if(helmet) + helmet.update_light(wearer) + + correct_piece.armor["bio"] = armor["bio"] + + sealing = FALSE + + if(failed_to_seal) + for(var/obj/item/piece in list(helmet, boots, gloves, chest)) + if(!piece) + continue + piece.icon_state = "[initial(icon_state)]_sealed" + if(airtight) + update_component_sealed() + update_icon(1) + return 0 + + if(user != wearer) + to_chat(user, "\The [src] has been unsealed.") + to_chat(wearer, "Your entire suit loosens as the components relax.") + + flags &= ~NODROP + + for(var/obj/item/rig_module/module in installed_modules) + module.deactivate() - if(!(flags & NODROP)) - for(var/obj/item/rig_module/module in installed_modules) - module.deactivate() if(airtight) update_component_sealed() update_icon(1) @@ -310,7 +415,6 @@ piece.flags |= AIRTIGHT /obj/item/weapon/rig/process() - // If we've lost any parts, grab them back. var/mob/living/M for(var/obj/item/piece in list(gloves,boots,helmet,chest)) @@ -367,7 +471,6 @@ cell.use(module.process()*10) /obj/item/weapon/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconcious, var/obj/item/rig_module/mod, var/user_is_ai) - if(!istype(user)) return 0 @@ -524,7 +627,6 @@ return 1 -//TODO: Fix Topic vulnerabilities for malfunction and AI override. /obj/item/weapon/rig/Topic(href,href_list) if(!check_suit_access(usr)) return 0 @@ -532,11 +634,13 @@ if(href_list["toggle_piece"]) if(ishuman(usr) && (usr.stat || usr.stunned || usr.lying)) return 0 - toggle_piece(href_list["toggle_piece"], wearer, user = usr) + toggle_piece(href_list["toggle_piece"], usr) else if(href_list["toggle_seals"]) - toggle_seals(wearer, usr) + if(flags & NODROP) + unseal(usr) + else + seal(usr) else if(href_list["interact_module"]) - var/module_index = text2num(href_list["interact_module"]) if(module_index > 0 && module_index <= installed_modules.len) @@ -559,7 +663,7 @@ locked = !locked usr.set_machine(src) - src.add_fingerprint(usr) + add_fingerprint(usr) return 0 /obj/item/weapon/rig/proc/notify_ai(var/message) @@ -570,8 +674,11 @@ if(ai && ai.client && !ai.stat) to_chat(ai, "[message]") -/obj/item/weapon/rig/equipped(mob/living/carbon/human/M) +/obj/item/weapon/rig/equipped(mob/living/carbon/human/M, slot) ..() + if(!istype(M) || slot != slot_back) + return //we don't care about picking up/nonhumans + spawn(1) //equipped() is called BEFORE the item is actually set as the slot if(seal_delay > 0 && istype(M) && M.back == src) @@ -588,115 +695,108 @@ wearer.wearing_rig = src update_icon() -/obj/item/weapon/rig/proc/toggle_piece(var/piece, var/mob/living/carbon/human/H, var/deploy_mode, var/force, var/mob/living/user) +/obj/item/weapon/rig/proc/toggle_piece(var/piece, var/mob/living/user, var/deploy_mode, var/force) + if(!istype(wearer) || wearer.back != src) + if(force) //can only force retracting sorry + for(var/obj/item/uneq_piece in list(helmet, gloves, boots, chest)) + if(uneq_piece) + if(isliving(uneq_piece.loc)) + var/mob/living/L = uneq_piece.loc + L.unEquip(uneq_piece, 1) + uneq_piece.flags &= ~NODROP + uneq_piece.forceMove(src) + return 0 - if(!force) //forces the hardsuit to ignore most checks, as the suit being dropped should retract all pieces regardless of power status - if(sealing || !cell || !cell.charge) //or else you have issues with shit getting stuck - return + if(sealing || !cell || !cell.charge) + return 0 - if(!istype(wearer) || !wearer.back == src) - return - - if(usr == wearer && (usr.stat||usr.paralysis||usr.stunned)) // If the usr isn't wearing the suit it's probably an AI. - return + if(user == wearer && user.incapacitated()) // If the user isn't wearing the suit it's probably an AI. + return 0 var/obj/item/check_slot var/equip_to var/obj/item/use_obj - if(!H) - return - switch(piece) if("helmet") equip_to = slot_head use_obj = helmet - check_slot = H.head + check_slot = wearer.head if("gauntlets") equip_to = slot_gloves use_obj = gloves - check_slot = H.gloves + check_slot = wearer.gloves if("boots") equip_to = slot_shoes use_obj = boots - check_slot = H.shoes + check_slot = wearer.shoes if("chest") equip_to = slot_wear_suit use_obj = chest - check_slot = H.wear_suit + check_slot = wearer.wear_suit if(use_obj) - if(check_slot == use_obj && deploy_mode != ONLY_DEPLOY) - - var/mob/living/carbon/human/holder - - if(use_obj) - holder = use_obj.loc - if(istype(holder)) - if(use_obj && check_slot == use_obj) - to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") - use_obj.flags &= ~NODROP - holder.unEquip(use_obj, 1) - use_obj.forceMove(src) - - else if (deploy_mode != ONLY_RETRACT) - if(check_slot) - if(check_slot != use_obj) - to_chat(H, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.") + if(check_slot == use_obj && deploy_mode != ONLY_DEPLOY) //user is wearing it, retract it if not forced to deploy + if((flags & NODROP) && equip_to != slot_head && !force) //you can only retract the helmet if the suit isn't unsealed + to_chat(user, "You can't retract \the [use_obj] while the suit is sealed!") return + + var/mob/living/to_strip + if(wearer) + to_strip = wearer + else if(isliving(use_obj.loc)) + to_strip = use_obj.loc + + if(to_strip) + to_strip.unEquip(use_obj, 1) + + use_obj.flags &= ~NODROP + use_obj.forceMove(src) + if(wearer) + to_chat(wearer, "Your [use_obj] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") + + else if(deploy_mode != ONLY_RETRACT) + if(check_slot && check_slot != use_obj) + to_chat(wearer, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.") + return + use_obj.forceMove(wearer) + use_obj.flags &= ~NODROP + if(!wearer.equip_to_slot_if_possible(use_obj, equip_to, 0, 1)) + use_obj.forceMove(src) else - use_obj.forceMove(H) - use_obj.flags &= ~NODROP - if(!H.equip_to_slot_if_possible(use_obj, equip_to, 0, 1)) - use_obj.forceMove(src) - else - to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") - use_obj.flags |= NODROP + if(wearer) + to_chat(wearer, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") + use_obj.flags |= NODROP if(piece == "helmet" && helmet) - helmet.update_light(H) + helmet.update_light(wearer) -/obj/item/weapon/rig/proc/deploy(mob/M,var/sealed, mob/user) +/obj/item/weapon/rig/proc/deploy(mob/user) + if(!wearer || !user) + return 0 - var/mob/living/carbon/human/H = M + if(flags & NODROP) + if(wearer.head && wearer.head != helmet) + to_chat(user, "\The [wearer.head] is blocking \the [src] from deploying!") + return 0 + if(wearer.gloves && wearer.gloves != gloves) + to_chat(user, "\The [wearer.gloves] is preventing \the [src] from deploying!") + return 0 + if(wearer.shoes && wearer.shoes != boots) + to_chat(user, "\The [wearer.shoes] is preventing \the [src] from deploying!") + return 0 + if(wearer.wear_suit && wearer.wear_suit != chest) + to_chat(user, "\The [wearer.wear_suit] is preventing \the [src] from deploying!") + return 0 - if(!H || !istype(H)) return - if(H.back != src) - return - - if(sealed) - if(H.head) - var/obj/item/garbage = H.head - H.unEquip(garbage) - H.head = null - qdel(garbage) - - if(H.gloves) - var/obj/item/garbage = H.gloves - H.unEquip(garbage) - H.gloves = null - qdel(garbage) - - if(H.shoes) - var/obj/item/garbage = H.shoes - H.unEquip(garbage) - H.shoes = null - qdel(garbage) - - if(H.wear_suit) - var/obj/item/garbage = H.wear_suit - H.unEquip(garbage) - H.wear_suit = null - qdel(garbage) - - for(var/piece in list("helmet","gauntlets","chest","boots")) - toggle_piece(piece, wearer, ONLY_DEPLOY, user = user) + for(var/piece in list("helmet", "gauntlets", "chest", "boots")) + toggle_piece(piece, user, ONLY_DEPLOY) /obj/item/weapon/rig/dropped(var/mob/user) ..() for(var/piece in list("helmet","gauntlets","chest","boots")) - toggle_piece(piece, wearer, ONLY_RETRACT, 1, user = user) + toggle_piece(piece, user, ONLY_RETRACT, 1) if(wearer) wearer.wearing_rig = null wearer = null @@ -871,7 +971,6 @@ return 0 // AIs are a bit slower than regular and ignore move intent. - wearer.last_move_intent = world.time + ai_controlled_move_delay wearer_move_delay = world.time + ai_controlled_move_delay var/tickcomp = 0 diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index f4769eddf0b..5214ea919f6 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -1,6 +1,5 @@ // Interface for humans. /obj/item/weapon/rig/verb/hardsuit_interface() - set name = "Open Hardsuit Interface" set desc = "Open the hardsuit system interface." set category = "Hardsuit" @@ -10,7 +9,6 @@ ui_interact(usr) /obj/item/weapon/rig/verb/toggle_vision() - set name = "Toggle Visor" set desc = "Turns your rig visor off or on." set category = "Hardsuit" @@ -44,7 +42,6 @@ visor.deactivate() /obj/item/weapon/rig/proc/toggle_helmet() - set name = "Toggle Helmet" set desc = "Deploys or retracts your helmet." set category = "Hardsuit" @@ -61,10 +58,9 @@ if(M.incapacitated()) return - toggle_piece("helmet",wearer, user = usr) + toggle_piece("helmet", usr) /obj/item/weapon/rig/proc/toggle_chest() - set name = "Toggle Chestpiece" set desc = "Deploys or retracts your chestpiece." set category = "Hardsuit" @@ -77,10 +73,9 @@ if(M.incapacitated()) return - toggle_piece("chest",wearer, user = usr) + toggle_piece("chest", usr) /obj/item/weapon/rig/proc/toggle_gauntlets() - set name = "Toggle Gauntlets" set desc = "Deploys or retracts your gauntlets." set category = "Hardsuit" @@ -97,10 +92,9 @@ if(M.incapacitated()) return - toggle_piece("gauntlets",wearer, user = usr) + toggle_piece("gauntlets", usr) /obj/item/weapon/rig/proc/toggle_boots() - set name = "Toggle Boots" set desc = "Deploys or retracts your boots." set category = "Hardsuit" @@ -117,10 +111,9 @@ if(M.incapacitated()) return - toggle_piece("boots",wearer, user = usr) + toggle_piece("boots", usr) /obj/item/weapon/rig/verb/deploy_suit() - set name = "Deploy Hardsuit" set desc = "Deploys helmet, gloves and boots." set category = "Hardsuit" @@ -143,7 +136,6 @@ deploy(wearer, usr) /obj/item/weapon/rig/verb/toggle_seals_verb() - set name = "Toggle Hardsuit" set desc = "Activates or deactivates your rig." set category = "Hardsuit" @@ -160,10 +152,12 @@ if(M.incapacitated()) return - toggle_seals(wearer) + if(flags & NODROP) + unseal(usr) + else + seal(usr) /obj/item/weapon/rig/verb/switch_vision_mode() - set name = "Switch Vision Mode" set desc = "Switches between available vision modes." set category = "Hardsuit" @@ -197,7 +191,6 @@ visor.engage() /obj/item/weapon/rig/verb/alter_voice() - set name = "Configure Voice Synthesiser" set desc = "Toggles or configures your voice synthesizer." set category = "Hardsuit" @@ -225,7 +218,6 @@ speech.engage() /obj/item/weapon/rig/verb/select_module() - set name = "Select Module" set desc = "Selects a module as your primary system." set category = "Hardsuit" @@ -265,7 +257,6 @@ to_chat(usr, "Primary system is now: [selected_module.interface_name].") /obj/item/weapon/rig/verb/toggle_module() - set name = "Toggle Module" set desc = "Toggle a system module." set category = "Hardsuit" @@ -307,7 +298,6 @@ module.activate() /obj/item/weapon/rig/verb/engage_module() - set name = "Engage Module" set desc = "Engages a system module." set category = "Hardsuit" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c8b62d446be..5abc5e86cbf 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -152,17 +152,25 @@ item_state = "chickensuit" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET flags_inv = HIDESHOES|HIDEJUMPSUIT + +/obj/item/clothing/suit/corgisuit/super_hero + name = "super-hero corgi suit" + desc = "A suit made long ago by the ancient empire KFC. This one pulses with a strange power." flags = NODROP -/obj/item/clothing/suit/corgisuit/en - name = "\improper E-N suit" +/obj/item/clothing/suit/corgisuit/super_hero/en + name = "\improper super-hero E-N suit" icon_state = "ensuit" -/obj/item/clothing/suit/corgisuit/en/New() +/obj/item/clothing/suit/corgisuit/super_hero/en/New() ..() processing_objects.Add(src) -/obj/item/clothing/suit/corgisuit/en/process() +/obj/item/clothing/suit/corgisuit/super_hero/en/Destroy() + processing_objects.Remove(src) + return ..() + +/obj/item/clothing/suit/corgisuit/super_hero/en/process() if(prob(2)) for(var/obj/M in orange(2,src)) if(!M.anchored && (M.flags & CONDUCT)) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 23c15a258d7..b6dc4eee727 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -293,7 +293,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/attack(var/mob/living/carbon/M, var/mob/user, var/def_zone) if(awakening) - user << "The [src] is twitching and shaking, preventing you from eating it." + to_chat(user, "The [src] is twitching and shaking, preventing you from eating it.") return if(user == M) return ..() @@ -334,8 +334,7 @@ var/turf/simulated/location = get_turf(M) if(istype(location)) location.add_blood_floor(M) if("fire") - if (!(RESIST_COLD in M.mutations)) - M.take_organ_damage(0, force) + M.take_organ_damage(0, force) M.updatehealth() if(seed && seed.get_trait(TRAIT_CARNIVOROUS)) @@ -452,7 +451,7 @@ if("killertomato") if(awakening || istype(user.loc,/turf/space)) return - user << "You begin to awaken the Killer Tomato..." + to_chat(user, "You begin to awaken the Killer Tomato...") awakening = 1 spawn(30) diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index dee87d848d3..2649b04c3e4 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -307,3 +307,6 @@ var/global/list/plant_seed_sprites = list() /obj/item/seeds/coffeerseed seed_type = "coffeer" + +/obj/item/seeds/cash + seed_type = "cashtree" \ No newline at end of file diff --git a/code/modules/martial_arts/adminfu.dm b/code/modules/martial_arts/adminfu.dm new file mode 100644 index 00000000000..6f8df44f53f --- /dev/null +++ b/code/modules/martial_arts/adminfu.dm @@ -0,0 +1,117 @@ +///Adminfu +//Help act:Heal/revie GP //p is for help +//Disarm:Stun +//Grab:Neck +//Harm:Gib +#define HEAL_COMBO "GP" + +/datum/martial_art/adminfu + name = "Way of the Dancing Admin" + help_verb = /mob/living/carbon/human/proc/adminfu_help + +/datum/martial_art/adminfu/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) + if(findtext(streak,HEAL_COMBO)) + streak = "" + healPalm(A,D) + return 1 + return 0 + +/datum/martial_art/adminfu/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) + + if(!D.stat)//do not kill what is dead... + A.do_attack_animation(D) + D.visible_message("[A] manifests a large glowing toolbox and shoves it in [D]'s chest!", \ + "
| t |
","
"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d