" if(implant_detect) - to_chat(user, "Detected cybernetic modifications:") - to_chat(user, "[implant_detect]") + msgs += "Detected cybernetic modifications:" + msgs += "[implant_detect]" if(H.gene_stability < 40) - to_chat(user, "Subject's genes are quickly breaking down!") + msgs += "Subject's genes are quickly breaking down!" else if(H.gene_stability < 70) - to_chat(user, "Subject's genes are showing signs of spontaneous breakdown.") + msgs += "Subject's genes are showing signs of spontaneous breakdown." else if(H.gene_stability < 85) - to_chat(user, "Subject's genes are showing minor signs of instability.") - else - to_chat(user, "Subject's genes are stable.") + msgs += "Subject's genes are showing minor signs of instability." if(HAS_TRAIT(H, TRAIT_HUSK)) - to_chat(user, "Subject is husked. Application of synthflesh is recommended.") + msgs += "Subject is husked. Application of synthflesh is recommended." if(H.radiation > RAD_MOB_SAFE) - to_chat(user, "Subject is irradiated.") + msgs += "Subject is irradiated." + + to_chat(user, chat_box_healthscan(msgs.Join("
"))) /obj/item/healthanalyzer/attack_self(mob/user) toggle_mode() @@ -614,8 +618,8 @@ REAGENT SCANNER var/printing = FALSE var/time_to_use = 0 // How much time remaining before next scan is available. var/usecharge = 750 - var/scan_time = 10 SECONDS //how long does it take to scan - var/scan_cd = 60 SECONDS //how long before we can scan again + var/scan_time = 5 SECONDS //how long does it take to scan + var/scan_cd = 30 SECONDS //how long before we can scan again /obj/item/bodyanalyzer/get_cell() return cell diff --git a/code/game/objects/items/granters/action_granters/summon_cheese.dm b/code/game/objects/items/granters/action_granters/summon_cheese.dm index b4e4d0a01b0b..0ee14969755a 100644 --- a/code/game/objects/items/granters/action_granters/summon_cheese.dm +++ b/code/game/objects/items/granters/action_granters/summon_cheese.dm @@ -35,7 +35,7 @@ overlay = null action_icon_state = "cheese_wedge" action_background_icon_state = "bg_spell" - summon_type = list(/obj/item/reagent_containers/food/snacks/cheesewedge) + summon_type = list(/obj/item/reagent_containers/food/snacks/cheesewedge/presliced) summon_amt = 9 aoe_range = 1 summon_ignore_prev_spawn_points = TRUE diff --git a/code/game/objects/items/mountable_frames/newscaster_frame.dm b/code/game/objects/items/mountable_frames/newscaster_frame.dm index ade1eb9cc99a..4cbefd7d2e63 100644 --- a/code/game/objects/items/mountable_frames/newscaster_frame.dm +++ b/code/game/objects/items/mountable_frames/newscaster_frame.dm @@ -32,11 +32,13 @@ /obj/item/mounted/frame/display/display_frame name = "status display frame" desc = "Used to build status displays, just secure to the wall." + icon_state = "frame_unanchored" build_path = /obj/machinery/status_display /obj/item/mounted/frame/display/ai_display_frame name = "ai status display frame" desc = "Used to build ai status displays, just secure to the wall." + icon_state = "frame_unanchored" build_path = /obj/machinery/ai_status_display /obj/item/mounted/frame/display/entertainment_frame diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 4102f7bd0e9e..ccf7805ef8b2 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -419,6 +419,16 @@ cyborg = null return ..() +/obj/item/borg/upgrade/syndie_soap + name = "janitor cyborg syndicate soap" + desc = "Using forbidden technology and some red dye, upgrade a janitorial cyborg's soap performance by 90 percent!" + icon_state = "cyborg_upgrade4" + require_module = TRUE + module_type = /obj/item/robot_module/janitor + items_to_replace = list( + /obj/item/soap/nanotrasen = /obj/item/soap/syndie + ) + /obj/item/borg/upgrade/bluespace_trash_bag name = "janitor cyborg trash bag of holding upgrade" desc = "An advanced trash bag upgrade board with bluespace properties that can be attached to janitorial cyborgs." diff --git a/code/game/objects/items/stacks/medical_packs.dm b/code/game/objects/items/stacks/medical_packs.dm index 7d002f307153..61bc4a348ff3 100644 --- a/code/game/objects/items/stacks/medical_packs.dm +++ b/code/game/objects/items/stacks/medical_packs.dm @@ -129,6 +129,7 @@ icon = 'icons/obj/stacks/miscellaneous.dmi' icon_state = "gauze" origin_tech = "biotech=2" + merge_type = /obj/item/stack/medical/bruise_pack max_amount = 12 heal_brute = 10 stop_bleeding = 1800 @@ -173,6 +174,7 @@ name = "improvised gauze" singular_name = "improvised gauze" desc = "A roll of cloth roughly cut from something that can stop bleeding, but does not heal wounds." + merge_type = /obj/item/stack/medical/bruise_pack/improvised heal_brute = 0 stop_bleeding = 900 @@ -183,6 +185,7 @@ desc = "An advanced trauma kit for severe injuries." icon_state = "traumakit" belt_icon = "traumakit" + merge_type = /obj/item/stack/medical/bruise_pack/advanced max_amount = 6 heal_brute = 25 stop_bleeding = 0 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index f1c668bec69b..8aab03be8a57 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -441,6 +441,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list( throw_speed = 1 origin_tech = "materials=6;abductor=1" sheettype = "abductor" + merge_type = /obj/item/stack/sheet/mineral/abductor table_type = /obj/structure/table/abductor /obj/item/stack/sheet/mineral/abductor/fifty diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 70a2fe12a4e6..eeb9e76a2634 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -439,7 +439,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( */ GLOBAL_LIST_INIT(cult_recipes, list ( - new /datum/stack_recipe/cult("runed door (stuns non-cultists)", /obj/machinery/door/airlock/cult, 1, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), + new /datum/stack_recipe/cult("runed door (stuns non-cultists)", /obj/machinery/door/airlock/cult, 3, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), new /datum/stack_recipe/cult("runed girder (used to make cult walls)", /obj/structure/girder/cult, 1, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), new /datum/stack_recipe/cult("pylon (heals nearby cultists)", /obj/structure/cult/functional/pylon, 4, time = 4 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), new /datum/stack_recipe/cult("forge (crafts shielded robes, flagellant's robes, and mirror shields)", /obj/structure/cult/functional/forge, 3, time = 4 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 41f546f3e667..11d45ad6448e 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -24,7 +24,8 @@ var/amount = 1 var/to_transfer = 0 var/max_amount = 50 //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount - var/merge_type = null // This path and its children should merge with this stack, defaults to src.type + /// This path and its children should merge with this stack, defaults to src.type + var/merge_type = null var/recipe_width = 400 //Width of the recipe popup var/recipe_height = 400 //Height of the recipe popup /// What sort of table is made when applying this stack to a frame? diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index da544ddf2f6d..ea8ad7380228 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -110,7 +110,7 @@ AI MODULES ..() var/targName = stripped_input(usr, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name) targetName = targName - desc = text("A 'safeguard' AI module: 'Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) + desc = "A 'safeguard' AI module: 'Safeguard [targetName]. Individuals that threaten [targetName] are not crew and must be eliminated.'" /obj/item/aiModule/safeguard/install(obj/machinery/computer/C) if(!targetName) @@ -120,7 +120,7 @@ AI MODULES /obj/item/aiModule/safeguard/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() - var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) + var/law = "Safeguard [targetName]. Individuals that threaten [targetName] are not crew and must be eliminated.'" to_chat(target, law) target.add_supplied_law(4, law) GLOB.lawchanges.Add("The law specified [targetName]") @@ -137,7 +137,7 @@ AI MODULES ..() var/targName = stripped_input(usr, "Please enter the name of the person who is the only crew.", "Who?", user.real_name) targetName = targName - desc = text("A 'one crew' AI module: 'Only [] is crew.'", targetName) + desc = "A 'one crew' AI module: 'Only [targetName] is crew.'" /obj/item/aiModule/oneCrewMember/install(obj/machinery/computer/C) if(!targetName) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 802cd256002e..143ad0422eea 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -510,9 +510,7 @@ playsound(loc, 'sound/machines/click.ogg', 50, 1) return FALSE - if(istype(A, /obj/structure/window)) // You mean the grille of course, do you? - A = locate(/obj/structure/grille) in A.loc - if(istype(A, /obj/structure/grille)) + if(istype(A, /obj/structure/window)) if(!checkResource(2, user)) playsound(loc, 'sound/machines/click.ogg', 50, 1) return FALSE @@ -527,8 +525,8 @@ playsound(loc, usesound, 50, 1) var/turf/T1 = get_turf(A) QDEL_NULL(A) - for(var/obj/structure/window/W in T1.contents) - qdel(W) + for(var/obj/structure/grille/G in T1.contents) + qdel(G) return TRUE return FALSE diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 02009c5160b2..f3c9a997ea03 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -30,7 +30,7 @@ "Newdles" = /obj/item/reagent_containers/food/snacks/chinese/newdles, "Donut" = /obj/item/reagent_containers/food/snacks/donut, "Chicken Soup" = /obj/item/reagent_containers/food/drinks/chicken_soup, - "Tofu Burger" = /obj/item/reagent_containers/food/snacks/tofuburger) + "Tofu Burger" = /obj/item/reagent_containers/food/snacks/burger/tofu) var/static/list/rsf_icons = list("Drinking Glass" = image(icon = 'icons/obj/drinks.dmi', icon_state = "glass_empty"), "Paper" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper"), "Pen" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "pen"), diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 0f07e61004e5..a03903d39d0d 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -38,7 +38,7 @@ set src in usr if(t) - src.name = text("Data Disk- '[]'", t) + src.name = "Data Disk- '[t]'" else src.name = "Data Disk" src.add_fingerprint(usr) @@ -471,7 +471,7 @@ "paramedic", "psychiatrist", "research", - "robotcist", + "roboticist", "quartermaster", "cargo", "shaftminer", diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 3cc8b79492c3..03bca539bc6a 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -611,19 +611,42 @@ icon = 'icons/obj/food/food.dmi' icon_state = "baguette" desc = "a staple of worshipers of the Silentfather, this holy mime artifact has an odd effect on clowns." + var/list/smited_clowns -/obj/item/nullrod/rosary/bread/process() - if(ishuman(loc)) - var/mob/living/carbon/human/holder = loc - //would like to make the holder mime if they have it in on thier person in general - if(src == holder.l_hand || src == holder.r_hand) - for(var/mob/living/carbon/human/H in range(5, loc)) - if(H.mind.assigned_role == "Clown") - H.Silence(20 SECONDS) - animate_fade_grayscale(H,20) - if(prob(10)) - to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your honk!") +/obj/item/nullrod/rosary/bread/equipped(mob/user, slot, initial = FALSE) + . = ..() + if(ishuman(user) && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)) + START_PROCESSING(SSobj, src) + else + STOP_PROCESSING(SSobj, src) +/obj/item/nullrod/rosary/bread/dropped(mob/user, silent) + . = ..() + STOP_PROCESSING(SSobj, src) + +/obj/item/nullrod/rosary/bread/Destroy() + STOP_PROCESSING(SSobj, src) + for(var/clown in smited_clowns) + unsmite_clown(clown) + return ..() + +/obj/item/nullrod/rosary/bread/process() + var/mob/living/carbon/human/holder = loc + //would like to make the holder mime if they have it in on thier person in general + for(var/mob/living/carbon/human/H in range(5, loc)) + if(H.mind.assigned_role == "Clown" && !LAZYACCESS(smited_clowns, H)) + LAZYSET(smited_clowns, H, TRUE) + H.Silence(20 SECONDS) + animate_fade_grayscale(H, 2 SECONDS) + + addtimer(CALLBACK(src, PROC_REF(unsmite_clown), H), 20 SECONDS) + + if(prob(10)) + to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your honk!") + +/obj/item/nullrod/rosary/bread/proc/unsmite_clown(mob/living/carbon/human/hell_spawn) + animate_fade_colored(hell_spawn, 2 SECONDS) + LAZYREMOVE(smited_clowns, hell_spawn) /obj/item/nullrod/missionary_staff name = "holy staff" diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index ecd56f92661f..a96eda7b8082 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -781,6 +781,7 @@ /obj/item/reagent_containers/food/snacks/plum_pie name = "perfect plum pie" desc = "The Jack Horner brand of pie. 2 big thumbs up." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plump_pie" filling_color = "#B8279B" bitesize = 10 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index d59ba4b92a98..5855d7d130ce 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -522,7 +522,7 @@ /obj/item/storage/belt/janitor/full/populate_contents() new /obj/item/holosign_creator/janitor(src) new /obj/item/reagent_containers/spray/cleaner/advanced(src) - new /obj/item/reagent_containers/spray/cleaner/advanced(src) + new /obj/item/storage/bag/trash/bluespace(src) new /obj/item/soap/deluxe(src) new /obj/item/grenade/chem_grenade/cleaner(src) new /obj/item/grenade/chem_grenade/cleaner(src) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 04201355428f..9b6fd4c8b718 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -556,6 +556,22 @@ B.reagents.add_reagent(reag, 30) B.name = "[reag] bottle" +/obj/item/storage/box/botany_labelled_seeds + name = "botanist labelled random seeds kit" + desc = "A box intended for experienced botanists." + +/obj/item/storage/box/botany_labelled_seeds/populate_contents() + for(var/I in 1 to 7) + new /obj/item/seeds/random/labelled(src) + +/obj/item/storage/box/telescience + name = "babies first telescience kit" + desc = "A now restricted kit for those who want to learn about telescience!" + +/obj/item/storage/box/telescience/populate_contents() + new /obj/item/circuitboard/telesci_pad(src) + new /obj/item/circuitboard/telesci_console(src) + /obj/item/storage/box/mousetraps name = "box of Pest-B-Gon mousetraps" desc = "WARNING: Keep out of reach of children." diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 3f343950c38c..65c3d57f4d54 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -382,6 +382,16 @@ else . += "ledb" +/obj/item/storage/lockbox/vials/AltClick(mob/user) + if(!Adjacent(user)) + return + if(allowed(user)) + locked = !locked + to_chat(user, "You [locked ? "lock" : "unlock"] [src].") + update_icon() + else + to_chat(user, "Access denied.") + /obj/item/storage/lockbox/vials/attackby(obj/item/I, mob/user, params) ..() update_icon() diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 7f5072bcf477..0f6c19e7c962 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -89,12 +89,16 @@ desc = "A bag for storing extra clothes and shoes. This one belongs to the research director." /obj/item/storage/bag/garment/research_director/populate_contents() + new /obj/item/clothing/head/beret/sci(src) new /obj/item/clothing/under/rank/rnd/research_director(src) new /obj/item/clothing/suit/storage/labcoat/rd(src) new /obj/item/clothing/suit/mantle/labcoat(src) new /obj/item/clothing/suit/storage/labcoat(src) new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/glasses/science(src) + new /obj/item/clothing/glasses/welding/superior(src) + new /obj/item/clothing/glasses/hud/diagnostic/sunglasses(src) /obj/item/storage/bag/garment/chief_medical_officer diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 08dc3f49bfd5..2a98611a0c4f 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -44,6 +44,15 @@ to_chat(user, "It's locked!") return +/obj/item/storage/lockbox/AltClick(mob/user) + if(!Adjacent(user)) + return + if(allowed(user)) + locked = !locked + to_chat(user, "You [locked ? "lock" : "unlock"] [src].") + icon_state = "[locked ? icon_locked : icon_closed]" + else + to_chat(user, "Access denied.") /obj/item/storage/lockbox/show_to(mob/user as mob) if(locked) diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm index 10937972e559..bf6e788c7e7e 100644 --- a/code/game/objects/mail.dm +++ b/code/game/objects/mail.dm @@ -13,7 +13,8 @@ var/list/possible_contents = list() /// A list that contains the names of the jobs that can receive this type of letter. Only the base job has to be put in it, alternative titles have the same definition on the mind. Name of the job can be found in `mind.assigned_role` var/list/job_list = list() - var/mob/living/recipient + /// The real name required to open the letter + var/recipient var/has_been_scanned = FALSE /obj/item/envelope/suicide_act(mob/user) @@ -24,7 +25,7 @@ /obj/item/envelope/attack_self(mob/user) if(!user?.mind) return - if(user.real_name != recipient.real_name) + if(user.real_name != recipient) to_chat(user, "You don't want to open up another person's mail, that's an invasion of their privacy!") return if(do_after(user, 1 SECONDS, target = user) && !QDELETED(src)) @@ -46,8 +47,8 @@ if(mail_attracted_people.offstation_role || !ishuman(mail_attracted_people.current) || is_admin_level(T.z)) continue if(mail_attracted_people.assigned_role in job_list) - recipient = mail_attracted_people.current - name = "letter to [recipient.real_name]" + recipient = mail_attracted_people.current.real_name + name = "letter to [recipient]" return if(!admin_spawned) log_debug("Failed to find a new name to assign to [src]!") @@ -265,7 +266,7 @@ playsound(loc, 'sound/mail/maildenied.ogg', 50, TRUE) return - if(M.real_name != saved.recipient.real_name) + if(M.real_name != saved.recipient) to_chat(user, "'Identity Verification failed: Target is not an authorized recipient of this package!") playsound(loc, 'sound/mail/maildenied.ogg', 50, TRUE) return diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 36fcbe03aa73..f5b913dc1848 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -206,3 +206,6 @@ take_damage(power / 8000, BURN, ENERGY) power -= power / 2000 //walls take a lot out of ya . = ..() + +/obj/structure/fall_and_crush(turf/target_turf, crush_damage, should_crit, crit_damage_factor, datum/tilt_crit/forced_crit, weaken_time, knockdown_time, ignore_gravity, should_rotate, angle, rightable, block_interactions) + . = ..(target_turf, crush_damage, should_crit, crit_damage_factor, forced_crit, weaken_time, knockdown_time, ignore_gravity, should_rotate, angle, rightable = TRUE, block_interactions_until_righted = FALSE) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index e0dee612318e..0902a0592d4d 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -270,7 +270,7 @@ if(!lastbang) lastbang = 1 for(var/mob/M in hearers(src, null)) - to_chat(M, text("BANG, bang!", max(0, 5 - get_dist(src, M)))) + to_chat(M, "BANG, bang!") spawn(30) lastbang = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm index c4f81f18415c..bfaf642d5a73 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm @@ -28,6 +28,8 @@ /obj/structure/closet/secure_closet/mime/populate_contents() new /obj/item/clothing/head/beret(src) + new /obj/item/clothing/head/beret/black(src) + new /obj/item/clothing/head/beret/white(src) new /obj/item/clothing/mask/gas/mime(src) new /obj/item/radio/headset/headset_service(src) new /obj/item/clothing/under/rank/civilian/mime(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 0b6f9d779f4e..c4bf4779a2ea 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -60,7 +60,6 @@ new /obj/item/reagent_containers/food/drinks/mug/rd(src) new /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic(src) new /obj/item/clothing/accessory/medal/science(src) - new /obj/item/clothing/glasses/welding/superior(src) /obj/structure/closet/secure_closet/research_reagents diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate_lockers.dm b/code/game/objects/structures/crates_lockers/closets/syndicate_lockers.dm index 80c127031984..83aa4880511f 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate_lockers.dm @@ -52,7 +52,7 @@ new /obj/item/tank/internals/oxygen/red(src) new /obj/item/storage/belt/military/sst(src) new /obj/item/clothing/glasses/thermal(src) - new /obj/item/clothing/shoes/magboots/syndie/advance(src) + new /obj/item/clothing/shoes/magboots/elite(src) new /obj/item/clothing/mask/gas/syndicate(src) new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src) diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm index d545bd3190ce..7a605c46ff6c 100644 --- a/code/game/objects/structures/engicart.dm +++ b/code/game/objects/structures/engicart.dm @@ -27,9 +27,9 @@ /obj/structure/engineeringcart/proc/put_in_cart(obj/item/I, mob/user) user.drop_item() I.loc = src - updateUsrDialog() to_chat(user, "You put [I] into [src].") return + /obj/structure/engineeringcart/attackby(obj/item/I, mob/user, params) var/fail_msg = "There is already one of those in [src]." if(!I.is_robot_module()) @@ -101,70 +101,79 @@ to_chat(usr, "You cannot interface your modules [src]!") /obj/structure/engineeringcart/attack_hand(mob/user) - user.set_machine(src) - var/dat + var/list/engicart_items = list() + if(myglass) - dat += "[myglass.name]
" + engicart_items["Glass"] = image(icon = myglass.icon, icon_state = myglass.icon_state) if(mymetal) - dat += "[mymetal.name]
" + engicart_items["Metal"] = image(icon = mymetal.icon, icon_state = mymetal.icon_state) if(myplasteel) - dat += "[myplasteel.name]
" + engicart_items["Plasteel"] = image(icon = myplasteel.icon, icon_state = myplasteel.icon_state) if(myflashlight) - dat += "[myflashlight.name]
" + engicart_items["Flashlight"] = image(icon = myflashlight.icon, icon_state = myflashlight.icon_state) if(mybluetoolbox) - dat += "[mybluetoolbox.name]
" + engicart_items["Mechanical Toolbox"] = image(icon = mybluetoolbox.icon, icon_state = mybluetoolbox.icon_state) if(myredtoolbox) - dat += "[myredtoolbox.name]
" + engicart_items["Emergency Toolbox"] = image(icon = myredtoolbox.icon, icon_state = myredtoolbox.icon_state) if(myyellowtoolbox) - dat += "[myyellowtoolbox.name]
" - var/datum/browser/popup = new(user, "engicart", name, 240, 160) - popup.set_content(dat) - popup.open() + engicart_items["Electrical Toolbox"] = image(icon = myyellowtoolbox.icon, icon_state = myyellowtoolbox.icon_state) -/obj/structure/engineeringcart/Topic(href, href_list) - if(!in_range(src, usr)) + if(!length(engicart_items)) return - if(!isliving(usr)) + + var/pick = show_radial_menu(user, src, engicart_items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) + + if(!pick) return - var/mob/living/user = usr - if(href_list["glass"]) - if(myglass) + + switch(pick) + if("Glass") + if(!myglass) + return user.put_in_hands(myglass) to_chat(user, "You take [myglass] from [src].") myglass = null - if(href_list["metal"]) - if(mymetal) + if("Metal") + if(!mymetal) + return user.put_in_hands(mymetal) to_chat(user, "You take [mymetal] from [src].") mymetal = null - if(href_list["plasteel"]) - if(myplasteel) + if("Plasteel") + if(!myplasteel) + return user.put_in_hands(myplasteel) to_chat(user, "You take [myplasteel] from [src].") myplasteel = null - if(href_list["flashlight"]) - if(myflashlight) + if("Flashlight") + if(!myflashlight) + return user.put_in_hands(myflashlight) to_chat(user, "You take [myflashlight] from [src].") myflashlight = null - if(href_list["bluetoolbox"]) - if(mybluetoolbox) + if("Mechanical Toolbox") + if(!mybluetoolbox) + return user.put_in_hands(mybluetoolbox) to_chat(user, "You take [mybluetoolbox] from [src].") mybluetoolbox = null - if(href_list["redtoolbox"]) - if(myredtoolbox) + if("Emergency Toolbox") + if(!myredtoolbox) + return user.put_in_hands(myredtoolbox) to_chat(user, "You take [myredtoolbox] from [src].") myredtoolbox = null - if(href_list["yellowtoolbox"]) - if(myyellowtoolbox) + if("Electrical Toolbox") + if(!myyellowtoolbox) + return user.put_in_hands(myyellowtoolbox) to_chat(user, "You take [myyellowtoolbox] from [src].") myyellowtoolbox = null update_icon(UPDATE_OVERLAYS) - updateUsrDialog() + +/obj/structure/engineeringcart/proc/check_menu(mob/living/user) + return istype(user) && !HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) /obj/structure/engineeringcart/update_overlays() . = ..() diff --git a/code/game/objects/structures/extinguisher_cabinet.dm b/code/game/objects/structures/extinguisher_cabinet.dm index 5231d659687c..0b69123d8802 100644 --- a/code/game/objects/structures/extinguisher_cabinet.dm +++ b/code/game/objects/structures/extinguisher_cabinet.dm @@ -7,7 +7,7 @@ name = "extinguisher cabinet" desc = "A small wall mounted cabinet designed to hold a fire extinguisher." icon = 'icons/obj/closet.dmi' - icon_state = "extinguisher_closed" + icon_state = "extinguisher" anchored = TRUE density = FALSE max_integrity = 200 @@ -30,6 +30,7 @@ has_extinguisher = new /obj/item/extinguisher/mini(src) else has_extinguisher = new /obj/item/extinguisher(src) + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/examine(mob/user) . = ..() @@ -155,16 +156,16 @@ qdel(src) /obj/structure/extinguisher_cabinet/update_icon_state() - if(!opened) - icon_state = "extinguisher_closed" - return + icon_state = "extinguisher" // Needs to reset the state with every update + if(has_extinguisher) if(istype(has_extinguisher, /obj/item/extinguisher/mini)) - icon_state = "extinguisher_mini" + icon_state += "_mini" else - icon_state = "extinguisher_full" - else - icon_state = "extinguisher_empty" + icon_state += "_full" + + if(!opened) + icon_state += "_closed" /obj/structure/extinguisher_cabinet/empty extinguishertype = NO_EXTINGUISHER diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 7aa4cf708df5..d8203fe9fcd0 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -15,6 +15,7 @@ base_icon_state = "wall" flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 rad_insulation = RAD_MEDIUM_INSULATION + layer = TURF_LAYER var/mineral = /obj/item/stack/sheet/metal var/mineral_amount = 2 diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 2552b7c896d7..6feeb1a70469 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -224,15 +224,17 @@ return TRUE return FALSE -/obj/structure/transit_tube/station/dispenser/Bumped(atom/movable/AM) - if(!(istype(AM) && AM.dir == boarding_dir) || AM.anchored) +/obj/structure/transit_tube/station/dispenser/Bumped(mob/living/L) + if(!(istype(L) && L.dir == boarding_dir) || L.anchored) return - var/obj/structure/transit_tube_pod/dispensed/pod = new(loc) - AM.visible_message("[pod] forms around [AM].", "[pod] materializes around you.") - playsound(src, 'sound/weapons/emitter2.ogg', 50, TRUE) - pod.dir = turn(dir, -90) - pod.move_into(AM) - launch_pod() + + if(isliving(L) && !is_type_in_list(L, disallowed_mobs)) + var/obj/structure/transit_tube_pod/dispensed/pod = new(loc) + L.visible_message("[pod] forms around [L].", "[pod] materializes around you.") + playsound(src, 'sound/weapons/emitter2.ogg', 50, TRUE) + pod.dir = turn(dir, -90) + pod.move_into(L) + launch_pod() /obj/structure/transit_tube/station/dispenser/pod_stopped(obj/structure/transit_tube_pod/pod) playsound(src, 'sound/machines/ding.ogg', 50, TRUE) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 61a5e0bb8331..aa0f52677d99 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama return switch(severity) if(1.0) - ChangeTurf(baseturf) + ChangeTurf(baseturf, keep_icon = FALSE) // we do not keep the icon so that asteroid platings can work properly if(2.0) switch(pick(1,2;75,3)) if(1) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index eac8a7ff52b2..3f688289dda2 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -307,7 +307,7 @@ dismantle_wall(1) to_chat(M, "You smash through the wall.") else - to_chat(M, text("You smash against the wall.")) + to_chat(M, "You smash against the wall.") take_damage(rand(25, 75)) return @@ -324,7 +324,7 @@ else playsound(src, 'sound/effects/bang.ogg', 50, 1) add_dent(WALL_DENT_HIT) - to_chat(user, text("You punch the wall.")) + to_chat(user, "You punch the wall.") return TRUE /turf/simulated/wall/attack_hand(mob/user) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 10cc7b273842..d3918481b0fc 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -368,6 +368,7 @@ GLOBAL_LIST_INIT(view_runtimes_verbs, list( if(isobserver(mob)) //re-enter var/mob/dead/observer/ghost = mob + var/old_turf = get_turf(ghost) ghost.can_reenter_corpse = 1 //just in-case. ghost.reenter_corpse() log_admin("[key_name(usr)] re-entered their body") @@ -375,6 +376,9 @@ GLOBAL_LIST_INIT(view_runtimes_verbs, list( if(ishuman(mob)) var/mob/living/carbon/human/H = mob H.regenerate_icons() // workaround for #13269 + if(isAI(mob)) // client.mob, built in byond client var + var/mob/living/silicon/ai/ai = mob + ai.eyeobj.setLoc(old_turf) else if(isnewplayer(mob)) to_chat(src, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or observe first.") else diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm index 5875b394f291..469020b63515 100644 --- a/code/modules/admin/misc_admin_procs.dm +++ b/code/modules/admin/misc_admin_procs.dm @@ -889,27 +889,27 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space //returns 1 to let the dragdrop code know we are trapping this event //returns 0 if we don't plan to trap the event -/datum/admins/proc/cmd_ghost_drag(mob/dead/observer/frommob, tothing) +/datum/admins/proc/cmd_ghost_drag(mob/dead/observer/frommob, atom/tothing) if(!istype(frommob)) return //extra sanity check to make sure only observers are shoved into things //same as assume-direct-control perm requirements. if(!check_rights(R_VAREDIT,0)) //no varedit, check if they have r_admin and r_debug if(!check_rights(R_ADMIN|R_DEBUG,0)) //if they don't have r_admin and r_debug, return - return 0 //otherwise, if they have no varedit, but do have r_admin and r_debug, execute the rest of the code + return FALSE //otherwise, if they have no varedit, but do have r_admin and r_debug, execute the rest of the code if(!frommob.ckey) - return 0 + return FALSE if(isitem(tothing)) var/mob/living/toitem = tothing var/ask = alert("Are you sure you want to allow [frommob.name]([frommob.key]) to possess [toitem.name]?", "Place ghost in control of item?", "Yes", "No") if(ask != "Yes") - return 1 + return TRUE if(!frommob || !toitem) //make sure the mobs don't go away while we waited for a response - return 1 + return TRUE var/mob/living/simple_animal/possessed_object/tomob = new(toitem) @@ -931,10 +931,10 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space var/ask = alert(question, "Place ghost in control of mob?", "Yes", "No") if(ask != "Yes") - return 1 + return TRUE if(!frommob || !tomob) //make sure the mobs don't go away while we waited for a response - return 1 + return TRUE if(tomob.client) //no need to ghostize if there is no client tomob.ghostize(0) @@ -946,7 +946,34 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space tomob.ckey = frommob.ckey qdel(frommob) - return 1 + return TRUE + + if(istype(tothing, /obj/structure/AIcore/deactivated)) + + var/question = "Are you sure you want to place [frommob.name]([frommob.key]) in control of an empty AI core?" + + var/ask = alert(question, "Place ghost in control of an empty AI core?", "Yes", "No") + if(ask != "Yes") + return TRUE + + if(QDELETED(frommob) || QDELETED(tothing)) //make sure the mobs don't go away while we waited for a response + return TRUE + + message_admins("[key_name_admin(usr)] has put [frommob.ckey] in control of an empty AI core.") + log_admin("[key_name(usr)] stuffed [frommob.ckey] into an empty AI core.") + SSblackbox.record_feedback("tally", "admin_verb", 1, "Ghost Drag") + + var/transfer_key = frommob.key // frommob is qdel'd in frommob.AIize() + var/mob/living/silicon/ai/ai_character = frommob.AIize() + ai_character.key = transfer_key // this wont occur in mind transferring if the mind is not active, which causes some weird stuff. This fixes it. + GLOB.empty_playable_ai_cores -= tothing + + ai_character.forceMove(get_turf(tothing)) + ai_character.view_core() + + qdel(tothing) + + return TRUE // Returns a list of the number of admins in various categories // result[1] is the number of staff that match the rank mask and are active diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 109970fe4bd7..f568439cccd4 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -3154,7 +3154,7 @@ if(usr) log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") if(ok) - to_chat(world, text("A secret has been activated by []!", usr.key)) + to_chat(world, "A secret has been activated by [usr.key]!") else if(href_list["secretsadmin"]) if(!check_rights(R_ADMIN)) return @@ -3195,7 +3195,7 @@ for(var/thing in GLOB.human_list) var/mob/living/carbon/human/H = thing if(H.ckey) - dat += text("
[scanning?"Armed":"Unarmed"] (Movement sensor active when armed!)" dat += "
Refresh" dat += "
Close" diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 60c30c797cae..ce31c66b666f 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -159,7 +159,7 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) */ if(stat & BROKEN) - icon_state = text("[]-1", canister_color["prim"])//yes, I KNOW the colours don't reflect when the can's borked, whatever. + icon_state = "[canister_color["prim"]]-1"//yes, I KNOW the colours don't reflect when the can's borked, whatever. return if(icon_state != canister_color["prim"]) diff --git a/code/modules/buildmode/submodes/boom.dm b/code/modules/buildmode/submodes/boom.dm index 5c3f16e7c27c..820ca51f7195 100644 --- a/code/modules/buildmode/submodes/boom.dm +++ b/code/modules/buildmode/submodes/boom.dm @@ -13,15 +13,15 @@ to_chat(user, "***********************************************************") /datum/buildmode_mode/boom/change_settings(mob/user) - devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null + devastation = input("Range of total devastation. -1 to none", "Input") as num|null if(devastation == null) devastation = -1 - heavy = input("Range of heavy impact. -1 to none", text("Input")) as num|null + heavy = input("Range of heavy impact. -1 to none", "Input") as num|null if(heavy == null) heavy = -1 - light = input("Range of light impact. -1 to none", text("Input")) as num|null + light = input("Range of light impact. -1 to none", "Input") as num|null if(light == null) light = -1 - flash = input("Range of flash. -1 to none", text("Input")) as num|null + flash = input("Range of flash. -1 to none", "Input") as num|null if(flash == null) flash = -1 - flames = input("Range of flames. -1 to none", text("Input")) as num|null + flames = input("Range of flames. -1 to none", "Input") as num|null if(flames == null) flames = -1 /datum/buildmode_mode/boom/handle_click(user, params, obj/object) diff --git a/code/modules/buildmode/submodes/tilt.dm b/code/modules/buildmode/submodes/tilt.dm new file mode 100644 index 000000000000..9f1b3c07ab36 --- /dev/null +++ b/code/modules/buildmode/submodes/tilt.dm @@ -0,0 +1,72 @@ +/datum/buildmode_mode/tilting + key = "tilt" + + /// The thing we're tilting over + var/atom/movable/tilter + var/crush_damage = 25 + var/crit_chance = 0 + var/datum/tilt_crit/forced_crit + var/weaken_time = 4 SECONDS + var/knockdown_time = 14 SECONDS + var/ignore_gravity = TRUE + var/should_rotate = TRUE + var/rotation_angle + var/rightable = TRUE + var/block_interactions_until_righted = TRUE + + + +/datum/buildmode_mode/tilting/show_help(mob/user) + to_chat(user, "***********************************************************") + to_chat(user, "Left Mouse Button on obj/mob = Select atom to tilt") + to_chat(user, "Right Mouse Button on turf/obj/mob = Tilt selected atom onto target") + to_chat(user, "Right Mouse Button + Alt = Untilt selected atom") + to_chat(user, "Right-click the main action button to customize tilting behavior.") + to_chat(user, "***********************************************************") + +/datum/buildmode_mode/tilting/change_settings(mob/user) + crush_damage = input(user, "Crush Damage", "Damage", initial(crush_damage)) as num|null + crit_chance = input(user, "Crit Chance (out of 100)", "Crit chance", 0) as num|null + if(crit_chance > 0) + var/forced_crit_path = input(user, "Force a specific crit?", "Forced Crit", null) as null|anything in GLOB.tilt_crits + if(forced_crit_path) + forced_crit = GLOB.tilt_crits[forced_crit_path] + weaken_time = input(user, "How long to weaken (in seconds)?", "Weaken Time", 4) as num|null + weaken_time = weaken_time SECONDS + knockdown_time = input(user, "How long to knockdown (in seconds)?", "Knockdown Time", 12) as num|null + knockdown_time = knockdown_time SECONDS + ignore_gravity = alert(user, "Ignore gravity?", "Ignore gravity", "Yes", "No") == "Yes" + should_rotate = alert(user, "Should it rotate on falling?", "Should rotate", "Yes", "No") == "Yes" + if(should_rotate) + rotation_angle = input(user, "Which angle to rotate at? (if empty, defaults to 90 degrees in either direction)", "Rotation angle", 0) as num|null + rightable = alert(user, "Should it be rightable with alt-click?", "Rightable", "Yes", "No") == "Yes" + if(rightable) + block_interactions_until_righted = alert(user, "Should it block interactions until righted (by alt-clicking)?", "Block interactions", "Yes", "No") == "Yes" + +/datum/buildmode_mode/tilting/handle_click(mob/user, params, atom/movable/object) + var/list/pa = params2list(params) + var/left_click = pa.Find("left") + var/right_click = pa.Find("right") + var/alt_click = pa.Find("alt") + + if(left_click) + if(!ismovable(object)) + return + tilter = object + to_chat(user, "Selected object '[tilter]' to tilt.") + if(right_click) + if(!tilter) + to_chat(user, "You need to select something to tilt (or untilt) first.") + return + if(tilter.GetComponent(/datum/component/tilted) && alt_click) + tilter.untilt(duration = 0) + log_admin("Build Mode: [key_name(user)] has righted [tilter] ([tilter.x],[tilter.y],[tilter.z])") + return + + if(!object || isnull(get_turf(object))) + to_chat(user, "You need to select a target first.") + return + + tilter.fall_and_crush(get_turf(object), crush_damage, prob(crit_chance), 2, forced_crit, weaken_time, knockdown_time, ignore_gravity, should_rotate, rotation_angle, rightable, block_interactions_until_righted) + + log_admin("Build Mode: [key_name(user)] tilted [tilter] onto [ADMIN_COORDJMP(object)]") diff --git a/code/modules/client/login_processing/20-load_characters.dm b/code/modules/client/login_processing/20-load_characters.dm index 2ed343f8fada..e3508aecbbe2 100644 --- a/code/modules/client/login_processing/20-load_characters.dm +++ b/code/modules/client/login_processing/20-load_characters.dm @@ -59,6 +59,8 @@ hair_gradient_colour, hair_gradient_alpha, custom_emotes, + physique, + height, tts_seed FROM characters WHERE ckey=:ckey"}, list( "ckey" = C.ckey diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index 649ae026867a..4d1b4c48812a 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -79,6 +79,10 @@ var/nanotrasen_relation = "Neutral" + var/physique = "average" + + var/height = "average height" + // OOC Metadata: var/metadata = "" @@ -176,6 +180,8 @@ organ_data=:organlist, rlimb_data=:rlimblist, nanotrasen_relation=:nanotrasen_relation, + physique=:physique, + height=:height, speciesprefs=:speciesprefs, socks=:socks, body_accessory=:body_accessory, @@ -234,6 +240,8 @@ "organlist" = (organlist ? organlist : ""), "rlimblist" = (rlimblist ? rlimblist : ""), "nanotrasen_relation" = nanotrasen_relation, + "physique" = physique, + "height" = height, "speciesprefs" = speciesprefs, "socks" = socks, "body_accessory" = (body_accessory ? body_accessory : ""), @@ -283,7 +291,7 @@ sec_record, gen_record, player_alt_titles, - disabilities, organ_data, rlimb_data, nanotrasen_relation, speciesprefs, + disabilities, organ_data, rlimb_data, nanotrasen_relation, physique, height, speciesprefs, socks, body_accessory, gear, autohiss, hair_gradient, hair_gradient_offset, hair_gradient_colour, hair_gradient_alpha, custom_emotes, tts_seed) VALUES @@ -310,7 +318,7 @@ :sec_record, :gen_record, :playertitlelist, - :disabilities, :organlist, :rlimblist, :nanotrasen_relation, :speciesprefs, + :disabilities, :organlist, :rlimblist, :nanotrasen_relation, :physique, :height, :speciesprefs, :socks, :body_accessory, :gearlist, :autohiss_mode, :h_grad_style, :h_grad_offset, :h_grad_colour, :h_grad_alpha, :custom_emotes, :tts_seed) "}, list( @@ -361,6 +369,8 @@ "organlist" = (organlist ? organlist : ""), "rlimblist" = (rlimblist ? rlimblist : ""), "nanotrasen_relation" = nanotrasen_relation, + "physique" = physique, + "height" = height, "speciesprefs" = speciesprefs, "socks" = socks, "body_accessory" = (body_accessory ? body_accessory : ""), @@ -457,7 +467,9 @@ h_grad_colour = query.item[53] h_grad_alpha = query.item[54] var/custom_emotes_tmp = query.item[55] - tts_seed = query.item[56] + physique = query.item[56] + height = query.item[57] + tts_seed = query.item[58] //Sanitize var/datum/species/SP = GLOB.all_species[species] @@ -478,6 +490,12 @@ if(isnull(nanotrasen_relation)) nanotrasen_relation = initial(nanotrasen_relation) + if(isnull(physique)) + physique = initial(physique) + + if(isnull(height)) + height = initial(height) + if(isnull(speciesprefs)) speciesprefs = initial(speciesprefs) @@ -1782,6 +1800,8 @@ character.dna.real_name = real_name character.name = character.real_name + character.physique = physique + character.height = height character.flavor_text = flavor_text character.med_record = med_record character.sec_record = sec_record diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm index fc89c803608a..792e9d80fd43 100644 --- a/code/modules/client/preference/link_processing.dm +++ b/code/modules/client/preference/link_processing.dm @@ -700,6 +700,16 @@ if(new_relation) active_character.nanotrasen_relation = new_relation + if("physique") + var/new_physique = input(user, "Choose your descriptor for how built your character is on glance.", "Character Preference") as null|anything in GLOB.character_physiques + if(new_physique) + active_character.physique = new_physique + + if("height") + var/new_height = input(user, "Choose your descriptor for how tall your character is on glance.", "Character Preference") as null|anything in GLOB.character_heights + if(new_height) + active_character.height = new_height + if("flavor_text") var/msg = input(usr,"Set the flavor text in your 'examine' verb. The flavor text should be a physical descriptor of your character at a glance. SFW Drawn Art of your character is acceptable.","Flavor Text",html_decode(active_character.flavor_text)) as message diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 065211b583e0..4db77a19b2f4 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -146,6 +146,10 @@ display_name = "Beret, black" path = /obj/item/clothing/head/beret/black +/datum/gear/hat/beret_white + display_name = "Beret, white" + path = /obj/item/clothing/head/beret/white + /datum/gear/hat/beret_blue display_name = "Beret, blue" path = /obj/item/clothing/head/beret/blue diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm index 79aaf93c8ec0..d8a669572b74 100644 --- a/code/modules/client/preference/loadout/loadout_racial.dm +++ b/code/modules/client/preference/loadout/loadout_racial.dm @@ -58,3 +58,15 @@ display_name = "Cloth footwraps" path = /obj/item/clothing/shoes/footwraps slot = SLOT_HUD_SHOES + +/datum/gear/racial/vox_casual + display_name = "Vox jumpsuit" + description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement." + path = /obj/item/clothing/under/vox/vox_casual + slot = SLOT_HUD_JUMPSUIT + +/datum/gear/racial/vox_robes + display_name = "Vox robes" + description = "Large, comfortable robes worn by those who need a bit more covering. The thick fabric contains a pocket suitable for those that need their hands free during their work, while the cloth serves to cover scars or other injuries to the wearer's body." + path = /obj/item/clothing/suit/hooded/vox_robes + slot = SLOT_HUD_OUTER_SUIT diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 68febc94843c..9cfd1b3a4286 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -157,9 +157,10 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts /datum/preferences/proc/ShowChoices(mob/user) if(!user || !user.client) return - active_character.update_preview_icon() - user << browse_rsc(active_character.preview_icon_front, "previewicon.png") - user << browse_rsc(active_character.preview_icon_side, "previewicon2.png") + if(SSatoms.initialized) // DNA won't be set up on our dummy mob if it's not ready + active_character.update_preview_icon() + user << browse_rsc(active_character.preview_icon_front, "previewicon.png") + user << browse_rsc(active_character.preview_icon_side, "previewicon2.png") var/list/dat = list() dat += "
" dat += "Disabilities: \[Set\]
" dat += "Nanotrasen Relation: [active_character.nanotrasen_relation]
" + dat += "Physique: [active_character.physique]
" + dat += "Height: [active_character.height]
" dat += "Set Flavor Text
" if(length(active_character.flavor_text) <= 40) if(!length(active_character.flavor_text)) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index d061aaf0f713..385af84f4ca0 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -39,6 +39,9 @@ var/blockTracking w_class = WEIGHT_CLASS_SMALL + /// Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default + var/can_leave_fibers = TRUE + /obj/item/clothing/update_icon_state() if(!can_toggle) return @@ -756,7 +759,7 @@ if(istype(I, /obj/item/clothing/accessory)) attach_accessory(I, user, TRUE) - if(accessories.len) + if(length(accessories)) for(var/obj/item/clothing/accessory/A in accessories) A.attackby(I, user, params) return TRUE @@ -882,11 +885,14 @@ return if(!Adjacent(usr)) return - if(!accessories.len) + if(!length(accessories)) return var/obj/item/clothing/accessory/A - if(accessories.len > 1) - A = input("Select an accessory to remove from [src]") as null|anything in accessories + if(length(accessories) > 1) + var/pick = radial_menu_helper(usr, src, accessories, custom_check = FALSE, require_near = TRUE) + if(!pick) + return + A = pick else A = accessories[1] remove_accessory(usr,A) @@ -904,7 +910,7 @@ to_chat(user, "You remove [A] from [src].") /obj/item/clothing/under/emp_act(severity) - if(accessories.len) + if(length(accessories)) for(var/obj/item/clothing/accessory/A in accessories) A.emp_act(severity) ..() diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index d74cf055589e..c4bf3681635f 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -33,6 +33,9 @@ /obj/item/clothing/head/beret/black icon_state = "beret_black" +/obj/item/clothing/head/beret/white + icon_state = "beret_white" + /obj/item/clothing/head/beret/purple_normal icon_state = "beret_purple_normal" diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index f72c75c65280..c2d32904979c 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -78,10 +78,14 @@ magboot_state = "syndiemag" origin_tech = "magnets=4;syndicate=2" -/obj/item/clothing/shoes/magboots/syndie/advance //For the Syndicate Strike Team - name = "advanced blood-red magboots" - desc = "Reverse-engineered magboots that appear to be based on an advanced model, as they have a lighter magnetic pull. Property of Gorlex Marauders." +/obj/item/clothing/shoes/magboots/elite //For the Syndicate Strike Team/SolGov/Tactical Teams + name = "elite tactical magboots" + desc = "Advanced magboots used by strike teams across the system. Allows for tactical insertion into low-gravity areas of operation." + icon_state = "elitemag0" + magboot_state = "elitemag" + origin_tech = null slowdown_active = SHOES_SLOWDOWN + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF /obj/item/clothing/shoes/magboots/clown name = "clown shoes" diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index 6a029335a61a..21ff3ad54fe3 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -57,6 +57,11 @@ desc = "A pair of purple rubber boots, designed to prevent slipping on wet surfaces while also drying them." icon_state = "galoshes_dry" +/obj/item/clothing/shoes/galoshes/dry/lightweight /// for red janitor ert. + name = "lightweight absorbent galoshes" + desc = "A pair of expensive looking lightweight rubber boots, designed to prevent slipping on wet surfaces while also drying them." + slowdown = NONE + /obj/item/clothing/shoes/galoshes/dry/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) diff --git a/code/modules/clothing/spacesuits/alien_suits.dm b/code/modules/clothing/spacesuits/alien_suits.dm index c761b793dd9c..40e84a3e1e39 100644 --- a/code/modules/clothing/spacesuits/alien_suits.dm +++ b/code/modules/clothing/spacesuits/alien_suits.dm @@ -143,30 +143,47 @@ desc = "An almost organic looking nonhuman pressure suit." /obj/item/clothing/under/vox - has_sensor = FALSE - icon = 'icons/obj/clothing/species/vox/uniforms.dmi' + icon = 'icons/mob/clothing/species/vox/under/misc.dmi' species_restricted = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/under/misc.dmi' ) /obj/item/clothing/under/vox/vox_casual - name = "alien clothing" - desc = "This doesn't look very comfortable." - icon_state = "vox-casual-1" - item_color = "vox-casual-1" - item_state = "vox-casual-1" - body_parts_covered = LEGS - -/obj/item/clothing/under/vox/vox_robes - name = "alien robes" - desc = "Weird and flowing!" - icon_state = "vox-casual-2" - item_color = "vox-casual-2" - item_state = "vox-casual-2" + name = "Vox jumpsuit" + desc = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement." + icon_state = "vox-jumpsuit_s" + item_color = "vox-jumpsuit" + item_state = "vox-jumpsuit" + +/obj/item/clothing/suit/hooded/vox_robes + name = "Vox robes" + desc = "Large, comfortable robes worn by those who need a bit more covering. The thick fabric contains a pocket suitable for those that need their hands free during their work, while the cloth serves to cover scars or other injuries to the wearer's body." + icon = 'icons/mob/clothing/species/vox/suit.dmi' + icon_state = "vox-robes" + item_color = "vox-robes" + item_state = "vox-robes" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + hoodtype = /obj/item/clothing/head/hooded/vox_robe_hood + species_restricted = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) + +//Vox Robes Hood +/obj/item/clothing/head/hooded/vox_robe_hood + name = "Vox hood" + desc = "The thick fabric of this hood serves a variety of purposes to the vox wearing it - serving as a method to hide a scarred face or a way to keep warm in the coldest areas onboard the ship." + icon = 'icons/mob/clothing/species/vox/head.dmi' + icon_state = "vox-robes-hood" + item_color = "vox-robes-hood" + item_state = "vox-robes-hood" + flags = BLOCKHAIR + flags_cover = HEADCOVERSEYES species_restricted = list("Vox") sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/under/misc.dmi') + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/gloves/color/yellow/vox name = "insulated gauntlets" diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index 4101471f51db..794446de44cc 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -104,6 +104,10 @@ desc = "A suitcase containing the necessary gun parts to build a full gun, when combined with a gun kit. Use it directly on a gunkit to rapidly assemble it." icon_state = "syndicase" +/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov + name = "\improper sol gov universal self assembling gun parts kit" + icon_state = "solcase" //Ikea reference pending. + /obj/item/weaponcrafting/gunkit/universal_gun_kit/afterattack(obj/item/weaponcrafting/gunkit/gunkit_to_use, mob/user, flag) if(!istype(gunkit_to_use)) return diff --git a/code/modules/events/blob/blob_mobs.dm b/code/modules/events/blob/blob_mobs.dm index 4c7f216233a3..1672a3aeeb55 100644 --- a/code/modules/events/blob/blob_mobs.dm +++ b/code/modules/events/blob/blob_mobs.dm @@ -205,7 +205,7 @@ /mob/living/simple_animal/hostile/blob/blobbernaut/Initialize(mapload) . = ..() if(name == "blobbernaut") - name = text("blobbernaut ([rand(1, 1000)])") + name = "blobbernaut ([rand(1, 1000)])" /mob/living/simple_animal/hostile/blob/blobbernaut/death(gibbed) // Only execute the below if we successfully died diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index 137c33a52e16..ba3cd54fedef 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -8,6 +8,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/carrotcake name = "carrot cake" desc = "A favorite desert of a certain wascally wabbit. Not a lie." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "carrotcake" slice_path = /obj/item/reagent_containers/food/snacks/carrotcakeslice slices_num = 5 @@ -19,6 +20,7 @@ /obj/item/reagent_containers/food/snacks/carrotcakeslice name = "carrot cake slice" desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "carrotcake_slice" trash = /obj/item/trash/plate filling_color = "#FFD675" @@ -28,6 +30,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/braincake name = "brain cake" desc = "A squishy cake-thing." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "braincake" slice_path = /obj/item/reagent_containers/food/snacks/braincakeslice slices_num = 5 @@ -39,6 +42,7 @@ /obj/item/reagent_containers/food/snacks/braincakeslice name = "brain cake slice" desc = "Lemme tell you something about brains. THEY'RE DELICIOUS." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "braincakeslice" trash = /obj/item/trash/plate filling_color = "#E6AEDB" @@ -47,6 +51,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/cheesecake name = "cheese cake" desc = "DANGEROUSLY cheesy." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cheesecake" slice_path = /obj/item/reagent_containers/food/snacks/cheesecakeslice slices_num = 5 @@ -58,6 +63,7 @@ /obj/item/reagent_containers/food/snacks/cheesecakeslice name = "cheese cake slice" desc = "Slice of pure cheestisfaction." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cheesecake_slice" trash = /obj/item/trash/plate filling_color = "#FAF7AF" @@ -66,6 +72,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/plaincake name = "vanilla cake" desc = "A plain cake, not a lie." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plaincake" slice_path = /obj/item/reagent_containers/food/snacks/plaincakeslice slices_num = 5 @@ -77,6 +84,7 @@ /obj/item/reagent_containers/food/snacks/plaincakeslice name = "vanilla cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plaincake_slice" trash = /obj/item/trash/plate filling_color = "#F7EDD5" @@ -85,6 +93,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/orangecake name = "orange cake" desc = "A cake with added orange." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "orangecake" slice_path = /obj/item/reagent_containers/food/snacks/orangecakeslice slices_num = 5 @@ -96,6 +105,7 @@ /obj/item/reagent_containers/food/snacks/orangecakeslice name = "orange cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "orangecake_slice" trash = /obj/item/trash/plate filling_color = "#FADA8E" @@ -104,6 +114,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/bananacake name = "banana cake" desc = "A cake with added bananas." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "bananacake" slice_path = /obj/item/reagent_containers/food/snacks/bananacakeslice slices_num = 5 @@ -115,6 +126,7 @@ /obj/item/reagent_containers/food/snacks/bananacakeslice name = "banana cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "bananacake_slice" trash = /obj/item/trash/plate filling_color = "#FADA8E" @@ -123,6 +135,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/limecake name = "lime cake" desc = "A cake with added lime." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "limecake" bitesize = 3 slice_path = /obj/item/reagent_containers/food/snacks/limecakeslice @@ -134,6 +147,7 @@ /obj/item/reagent_containers/food/snacks/limecakeslice name = "lime cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "limecake_slice" trash = /obj/item/trash/plate filling_color = "#CBFA8E" @@ -142,6 +156,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/lemoncake name = "lemon cake" desc = "A cake with added lemon." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "lemoncake" slice_path = /obj/item/reagent_containers/food/snacks/lemoncakeslice slices_num = 5 @@ -153,6 +168,7 @@ /obj/item/reagent_containers/food/snacks/lemoncakeslice name = "lemon cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "lemoncake_slice" trash = /obj/item/trash/plate filling_color = "#FAFA8E" @@ -161,6 +177,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake name = "chocolate cake" desc = "A cake with added chocolate." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "chocolatecake" slice_path = /obj/item/reagent_containers/food/snacks/chocolatecakeslice slices_num = 5 @@ -172,6 +189,7 @@ /obj/item/reagent_containers/food/snacks/chocolatecakeslice name = "chocolate cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "chocolatecake_slice" trash = /obj/item/trash/plate filling_color = "#805930" @@ -180,6 +198,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake name = "birthday cake" desc = "Happy Birthday..." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "birthdaycake" slice_path = /obj/item/reagent_containers/food/snacks/birthdaycakeslice slices_num = 5 @@ -191,6 +210,7 @@ /obj/item/reagent_containers/food/snacks/birthdaycakeslice name = "birthday cake slice" desc = "A slice of your birthday" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "birthdaycakeslice" trash = /obj/item/trash/plate filling_color = "#FFD6D6" @@ -199,6 +219,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/applecake name = "apple cake" desc = "A cake centered with Apple." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "applecake" slice_path = /obj/item/reagent_containers/food/snacks/applecakeslice slices_num = 5 @@ -210,6 +231,7 @@ /obj/item/reagent_containers/food/snacks/applecakeslice name = "apple cake slice" desc = "A slice of heavenly cake." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "applecakeslice" trash = /obj/item/trash/plate filling_color = "#EBF5B8" @@ -223,6 +245,7 @@ /obj/item/reagent_containers/food/snacks/cookie name = "cookie" desc = "COOKIE!!!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "COOKIE!!!" bitesize = 1 filling_color = "#DBC94F" @@ -232,6 +255,7 @@ /obj/item/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" desc = "A true prophecy in each cookie!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "fortune_cookie" filling_color = "#E8E79E" list_reagents = list("nutriment" = 3) @@ -241,6 +265,7 @@ /obj/item/reagent_containers/food/snacks/sugarcookie name = "sugar cookie" desc = "Just like your little sister used to make." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "sugarcookie" list_reagents = list("nutriment" = 1, "sugar" = 3) tastes = list("sweetness" = 1) @@ -253,6 +278,7 @@ /obj/item/reagent_containers/food/snacks/pie name = "banana cream pie" desc = "Just like back home, on clown planet! HONK!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pie" trash = /obj/item/trash/plate filling_color = "#FBFFB8" @@ -268,6 +294,7 @@ /obj/item/reagent_containers/food/snacks/meatpie name = "meat-pie" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "meatpie" desc = "An old barber recipe, very delicious!" trash = /obj/item/trash/plate @@ -278,6 +305,7 @@ /obj/item/reagent_containers/food/snacks/tofupie name = "tofu-pie" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "meatpie" desc = "A delicious tofu pie." trash = /obj/item/trash/plate @@ -289,6 +317,7 @@ /obj/item/reagent_containers/food/snacks/amanita_pie name = "amanita pie" desc = "Sweet and tasty poison pie." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "amanita_pie" filling_color = "#FFCCCC" bitesize = 4 @@ -298,6 +327,7 @@ /obj/item/reagent_containers/food/snacks/plump_pie name = "plump pie" desc = "I bet you love stuff made out of plump helmets!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plump_pie" filling_color = "#B8279B" bitesize = 3 @@ -313,6 +343,7 @@ /obj/item/reagent_containers/food/snacks/xemeatpie name = "xeno-pie" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "xenomeatpie" desc = "A delicious meatpie. Probably heretical." trash = /obj/item/trash/plate @@ -324,6 +355,7 @@ /obj/item/reagent_containers/food/snacks/applepie name = "apple pie" desc = "A pie containing sweet sweet love... or apple." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "applepie" filling_color = "#E0EDC5" bitesize = 3 @@ -334,6 +366,7 @@ /obj/item/reagent_containers/food/snacks/cherrypie name = "cherry pie" desc = "Taste so good, make a grown man cry." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cherrypie" filling_color = "#FF525A" bitesize = 3 @@ -343,6 +376,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie name = "pumpkin pie" desc = "A delicious treat for the autumn months." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pumpkinpie" slice_path = /obj/item/reagent_containers/food/snacks/pumpkinpieslice slices_num = 5 @@ -354,6 +388,7 @@ /obj/item/reagent_containers/food/snacks/pumpkinpieslice name = "pumpkin pie slice" desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pumpkinpieslice" trash = /obj/item/trash/plate filling_color = "#F5B951" @@ -366,6 +401,7 @@ /obj/item/reagent_containers/food/snacks/donut name = "donut" desc = "Goes great with Robust Coffee." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "donut1" bitesize = 5 list_reagents = list("nutriment" = 3, "sugar" = 2) @@ -445,10 +481,12 @@ /obj/item/reagent_containers/food/snacks/pancake name = "pancake" desc = "A plain pancake." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "pancake" filling_color = "#E7D8AB" bitesize = 2 list_reagents = list("nutriment" = 3, "sugar" = 3) + tastes = list("sweet cake" = 1) /obj/item/reagent_containers/food/snacks/pancake/attack_tk(mob/user) if(src in user.tkgrabbed_objects) @@ -470,12 +508,14 @@ desc = "A pancake loaded with berries." icon_state = "berry_pancake" list_reagents = list("nutriment" = 3, "sugar" = 3, "berryjuice" = 3) + tastes = list("sweet cake" = 2, "berries" = 2) /obj/item/reagent_containers/food/snacks/pancake/choc_chip_pancake name = "choc-chip pancake" desc = "A pancake loaded with chocolate chips." icon_state = "choc_chip_pancake" list_reagents = list("nutriment" = 3, "sugar" = 3, "cocoa" = 3) + tastes = list("sweet cake" = 2, "chocolate" = 3) ////////////////////// // Misc // @@ -484,6 +524,7 @@ /obj/item/reagent_containers/food/snacks/muffin name = "muffin" desc = "A delicious and spongy little cake." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "muffin" filling_color = "#E0CF9B" list_reagents = list("nutriment" = 6) @@ -492,6 +533,7 @@ /obj/item/reagent_containers/food/snacks/berryclafoutis name = "berry clafoutis" desc = "No black birds, this is a good sign." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "berryclafoutis" trash = /obj/item/trash/plate bitesize = 3 @@ -502,6 +544,7 @@ /obj/item/reagent_containers/food/snacks/poppypretzel name = "poppy pretzel" desc = "A large soft pretzel full of POP! It's all twisted up!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "poppypretzel" filling_color = "#916E36" list_reagents = list("nutriment" = 5) @@ -510,6 +553,7 @@ /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit name = "plump helmet biscuit" desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "phelmbiscuit" filling_color = "#CFB4C4" list_reagents = list("nutriment" = 5) @@ -525,6 +569,7 @@ /obj/item/reagent_containers/food/snacks/appletart name = "golden apple streusel tart" desc = "A tasty dessert that won't make it through a metal detector." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "gappletart" trash = /obj/item/trash/plate filling_color = "#FFFF00" @@ -536,6 +581,7 @@ /obj/item/reagent_containers/food/snacks/cracker name = "cracker" desc = "It's a salted cracker." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cracker" bitesize = 1 filling_color = "#F5DEB8" @@ -545,6 +591,7 @@ /obj/item/reagent_containers/food/snacks/croissant name = "croissant" desc = "Once a pastry reserved for the bourgeois, this flaky goodness is now on your table." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "croissant" bitesize = 4 filling_color = "#ecb54f" diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index 5580f600dfbb..f3b30727f140 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -6,6 +6,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/meatbread name = "meatbread loaf" desc = "The culinary base of every self-respecting eloquen/tg/entleman." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "meatbread" slice_path = /obj/item/reagent_containers/food/snacks/meatbreadslice slices_num = 5 @@ -16,12 +17,14 @@ /obj/item/reagent_containers/food/snacks/meatbreadslice name = "meatbread slice" desc = "A slice of delicious meatbread." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "meatbreadslice" filling_color = "#FF7575" /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread name = "xenomeatbread loaf" desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "xenomeatbread" slice_path = /obj/item/reagent_containers/food/snacks/xenomeatbreadslice slices_num = 5 @@ -32,12 +35,14 @@ /obj/item/reagent_containers/food/snacks/xenomeatbreadslice name = "xenomeatbread slice" desc = "A slice of delicious meatbread. Extra Heretical." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "xenobreadslice" filling_color = "#8AFF75" /obj/item/reagent_containers/food/snacks/sliceable/spidermeatbread name = "spider meat loaf" desc = "Reassuringly green meatloaf made from spider meat." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "spidermeatbread" slice_path = /obj/item/reagent_containers/food/snacks/spidermeatbreadslice slices_num = 5 @@ -47,29 +52,34 @@ /obj/item/reagent_containers/food/snacks/spidermeatbreadslice name = "spider meat bread slice" desc = "A slice of meatloaf made from an animal that most likely still wants you dead." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "spidermeatslice" + tastes = list("bread" = 10, "cobwebs" = 5) list_reagents = list("toxin" = 2) /obj/item/reagent_containers/food/snacks/sliceable/bananabread name = "banana-nut bread" desc = "A heavenly and filling treat." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bananabread" slice_path = /obj/item/reagent_containers/food/snacks/bananabreadslice slices_num = 5 filling_color = "#EDE5AD" list_reagents = list("banana" = 20, "nutriment" = 20) - tastes = list("bread" = 10) + tastes = list("bread" = 10, "banana" = 5) /obj/item/reagent_containers/food/snacks/bananabreadslice name = "banana-nut bread slice" desc = "A slice of delicious banana bread." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bananabreadslice" filling_color = "#EDE5AD" - tastes = list("bread" = 10) + tastes = list("bread" = 10, "banana" = 5) /obj/item/reagent_containers/food/snacks/sliceable/tofubread name = "tofubread" desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tofubread" slice_path = /obj/item/reagent_containers/food/snacks/tofubreadslice slices_num = 5 @@ -80,30 +90,34 @@ /obj/item/reagent_containers/food/snacks/tofubreadslice name = "tofubread slice" desc = "A slice of delicious tofubread." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tofubreadslice" filling_color = "#F7FFE0" /obj/item/reagent_containers/food/snacks/sliceable/bread name = "bread" desc = "Some plain old Earthen bread." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bread" slice_path = /obj/item/reagent_containers/food/snacks/breadslice slices_num = 6 filling_color = "#FFE396" list_reagents = list("nutriment" = 10) - tastes = list("bread" = 10) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/breadslice name = "bread slice" desc = "A slice of home." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "breadslice" filling_color = "#D27332" list_reagents = list("nutriment" = 2, "bread" = 5) - tastes = list("bread" = 10) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread name = "cream cheese bread" desc = "Yum yum yum!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "creamcheesebread" slice_path = /obj/item/reagent_containers/food/snacks/creamcheesebreadslice slices_num = 5 @@ -114,6 +128,7 @@ /obj/item/reagent_containers/food/snacks/creamcheesebreadslice name = "cream cheese bread slice" desc = "A slice of yum!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "creamcheesebreadslice" filling_color = "#FFF896" list_reagents = list("nutriment" = 4, "vitamin" = 1) @@ -122,6 +137,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/banarnarbread name = "banarnarbread loaf" desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "banarnarbread" slice_path = /obj/item/reagent_containers/food/snacks/banarnarbreadslice slices_num = 5 @@ -132,6 +148,7 @@ /obj/item/reagent_containers/food/snacks/banarnarbreadslice name = "banarnarbread slice" desc = "A slice of delicious mah'weyh pleggh at e'ntrath!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "banarnarbreadslice" filling_color = "#6F0000" list_reagents = list("nutriment" = 4, "vitamin" = 1) @@ -157,18 +174,19 @@ icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "flatbread" list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("bread" = 2) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/baguette name = "baguette" desc = "Bon appetit!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "baguette" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' filling_color = "#E3D796" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("bread" = 2) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/baguette/combat sharp = TRUE @@ -181,24 +199,27 @@ /obj/item/reagent_containers/food/snacks/twobread name = "two bread" desc = "It is very bitter and winy." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "twobread" filling_color = "#DBCC9A" bitesize = 3 list_reagents = list("nutriment" = 2, "vitamin" = 2) - tastes = list("bread" = 2) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/toast name = "toast" desc = "Yeah! Toast!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "toast" filling_color = "#B2580E" bitesize = 3 list_reagents = list("nutriment" = 3) - tastes = list("toast" = 2) + tastes = list("toast" = 1) /obj/item/reagent_containers/food/snacks/jelliedtoast name = "jellied toast" desc = "A slice of bread covered with delicious jam." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "jellytoast" filling_color = "#B572AB" bitesize = 3 @@ -213,6 +234,7 @@ /obj/item/reagent_containers/food/snacks/rofflewaffles name = "roffle waffles" desc = "Waffles from Roffle. Co." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "rofflewaffles" trash = /obj/item/trash/waffles filling_color = "#FF00F7" @@ -223,6 +245,7 @@ /obj/item/reagent_containers/food/snacks/waffles name = "waffles" desc = "Mmm, waffles." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "waffles" trash = /obj/item/trash/waffles filling_color = "#E6DEB5" diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm index c3c678bfe6bb..aacba4695655 100644 --- a/code/modules/food_and_drinks/food/foods/ethnic.dm +++ b/code/modules/food_and_drinks/food/foods/ethnic.dm @@ -65,6 +65,7 @@ /obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball name = "sweet & sour chicken balls" desc = "Is this chicken cooked? The odds are better than wok paper scissors." + icon = 'icons/obj/food/soupsalad.dmi' icon_state = "chickenball" item_state = "chinese3" junkiness = 25 diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index 926edde6486f..b6b9baa121b3 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -53,6 +53,9 @@ filling_color = "#FFF700" tastes = list("cheese" = 1) +/obj/item/reagent_containers/food/snacks/cheesewedge/presliced + list_reagents = list("nutriment" = 3, "vitamin" = 1, "cheese" = 4) + /obj/item/reagent_containers/food/snacks/weirdcheesewedge name = "weird cheese" desc = "Some kind of... gooey, messy, gloopy thing. Similar to cheese, but only in the broad sense of the word." diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index 568eeeaa285f..bcfe970c80f0 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -6,6 +6,7 @@ /obj/item/reagent_containers/food/snacks/meat name = "meat" desc = "A slab of meat." + icon = 'icons/obj/food/meat.dmi' icon_state = "meat" filling_color = "#FF1C1C" bitesize = 3 @@ -71,7 +72,7 @@ bitesize = 4 /obj/item/reagent_containers/food/snacks/meat/tomatomeat - name = "tomato slice" + name = "tomato meat slice" desc = "A slice from a huge tomato." icon_state = "tomatomeat" filling_color = "#DB0000" @@ -114,6 +115,7 @@ // DOES NOT SPAWN NATURALLY! name = "abstract monster meat" desc = "A slab of abstract monster meat. This shouldn't exist, contact a coder about this if you are seeing it in-game." + icon = 'icons/obj/food/meat.dmi' icon_state = "bearmeat" /obj/item/reagent_containers/food/snacks/monstermeat/bearmeat @@ -161,6 +163,7 @@ /obj/item/reagent_containers/food/snacks/raw_bacon name = "raw bacon" desc = "God's gift to man in uncooked form." + icon = 'icons/obj/food/meat.dmi' icon_state = "raw_bacon" list_reagents = list("nutriment" = 1, "porktonium" = 10) tastes = list("bacon" = 1) @@ -191,6 +194,7 @@ /obj/item/reagent_containers/food/snacks/meatsteak name = "meat steak" desc = "A piece of hot spicy meat." + icon = 'icons/obj/food/meat.dmi' icon_state = "meatstake" trash = /obj/item/trash/plate filling_color = "#7A3D11" @@ -201,6 +205,7 @@ /obj/item/reagent_containers/food/snacks/bacon name = "bacon" desc = "It looks crispy and tastes amazing! Mmm... Bacon." + icon = 'icons/obj/food/meat.dmi' icon_state = "bacon" list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4) tastes = list("bacon" = 1) @@ -208,6 +213,7 @@ /obj/item/reagent_containers/food/snacks/telebacon name = "tele bacon" desc = "It tastes a little odd but it's still delicious." + icon = 'icons/obj/food/meat.dmi' icon_state = "bacon" var/obj/item/radio/beacon/bacon/baconbeacon list_reagents = list("nutriment" = 4, "porktonium" = 10) @@ -230,6 +236,7 @@ /obj/item/reagent_containers/food/snacks/meatball name = "meatball" desc = "A great meal all round." + icon = 'icons/obj/food/meat.dmi' icon_state = "meatball" filling_color = "#DB0000" list_reagents = list("protein" = 4, "vitamin" = 1) @@ -238,6 +245,7 @@ /obj/item/reagent_containers/food/snacks/sausage name = "sausage" desc = "A piece of mixed and cased meat." + icon = 'icons/obj/food/meat.dmi' icon_state = "sausage" filling_color = "#DB0000" list_reagents = list("protein" = 6, "vitamin" = 1, "porktonium" = 10) @@ -254,6 +262,7 @@ /obj/item/reagent_containers/food/snacks/spidereggsham name = "green eggs and ham" desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?" + icon = 'icons/obj/food/meat.dmi' icon_state = "spidereggsham" trash = /obj/item/trash/plate bitesize = 4 @@ -263,6 +272,7 @@ /obj/item/reagent_containers/food/snacks/boiledspiderleg name = "boiled spider leg" desc = "A giant spider's leg that's still twitching after being cooked. Gross!" + icon = 'icons/obj/food/meat.dmi' icon_state = "spiderlegcooked" trash = /obj/item/trash/plate bitesize = 3 @@ -272,6 +282,7 @@ /obj/item/reagent_containers/food/snacks/wingfangchu name = "wing fang chu" desc = "A savory dish of alien wing wang in soy. Wait, what?" + icon = 'icons/obj/food/meat.dmi' icon_state = "wingfangchu" trash = /obj/item/trash/snack_bowl filling_color = "#43DE18" @@ -282,6 +293,7 @@ name = "goliath steak" desc = "A delicious, lava cooked steak." resistance_flags = LAVA_PROOF | FIRE_PROOF + icon = 'icons/obj/food/meat.dmi' icon_state = "goliathsteak" trash = null list_reagents = list("protein" = 6, "vitamin" = 2) @@ -290,6 +302,7 @@ /obj/item/reagent_containers/food/snacks/fried_vox name = "Kentucky Fried Vox" desc = "Bucket of voxxy, yaya!" + icon = 'icons/obj/food/meat.dmi' icon_state = "fried_vox" trash = /obj/item/trash/fried_vox list_reagents = list("nutriment" = 3, "protein" = 5) @@ -369,6 +382,7 @@ /obj/item/reagent_containers/food/snacks/egg name = "egg" desc = "An egg!" + icon = 'icons/obj/food/breakfast.dmi' icon_state = "egg" filling_color = "#FDFFD1" list_reagents = list("protein" = 1, "egg" = 5) @@ -442,6 +456,7 @@ /obj/item/reagent_containers/food/snacks/friedegg name = "fried egg" desc = "A fried egg, with a touch of salt and pepper." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "friedegg" filling_color = "#FFDF78" bitesize = 1 @@ -451,6 +466,7 @@ /obj/item/reagent_containers/food/snacks/boiledegg name = "boiled egg" desc = "A hard boiled egg." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "egg" filling_color = "#FFFFFF" list_reagents = list("nutriment" = 2, "egg" = 5, "vitamin" = 1) @@ -458,6 +474,7 @@ /obj/item/reagent_containers/food/snacks/chocolateegg name = "chocolate egg" desc = "Such sweet, fattening food." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "chocolateegg" filling_color = "#7D5F46" list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2) @@ -465,6 +482,7 @@ /obj/item/reagent_containers/food/snacks/omelette name = "omelette du fromage" desc = "That's all you can say!" + icon = 'icons/obj/food/breakfast.dmi' icon_state = "omelette" trash = /obj/item/trash/plate filling_color = "#FFF9A8" @@ -475,6 +493,7 @@ /obj/item/reagent_containers/food/snacks/benedict name = "eggs benedict" desc = "There is only one egg on this, how rude." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "benedict" bitesize = 3 list_reagents = list("nutriment" = 6, "egg" = 3, "vitamin" = 4) @@ -488,6 +507,7 @@ /obj/item/reagent_containers/food/snacks/hotdog name = "hotdog" desc = "Not made with actual dogs. Hopefully." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "hotdog" bitesize = 3 list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3) @@ -496,6 +516,7 @@ /obj/item/reagent_containers/food/snacks/meatbun name = "meat bun" desc = "Has the potential to not be dog." + icon = 'icons/obj/food/meat.dmi' icon_state = "meatbun" bitesize = 6 list_reagents = list("nutriment" = 6, "vitamin" = 2) @@ -504,6 +525,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/turkey name = "turkey" desc = "A traditional turkey served with stuffing." + icon = 'icons/obj/food/meat.dmi' icon_state = "turkey" slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice slices_num = 6 @@ -513,6 +535,7 @@ /obj/item/reagent_containers/food/snacks/turkeyslice name = "turkey serving" desc = "A serving of some tender and delicious turkey." + icon = 'icons/obj/food/meat.dmi' icon_state = "turkeyslice" trash = /obj/item/trash/plate filling_color = "#B97A57" @@ -546,7 +569,8 @@ /obj/item/reagent_containers/food/snacks/bbqribs name = "BBQ ribs" desc = "Sweet, smokey, savory, and gets everywhere. Perfect for Grilling." + icon = 'icons/obj/food/meat.dmi' + icon_state = "bbqribs" list_reagents = list("nutriment" = 3, "protein" = 10, "bbqsauce" = 10) filling_color = "#FF1C1C" bitesize = 3 - icon_state = "bbqribs" diff --git a/code/modules/food_and_drinks/food/foods/misc_food.dm b/code/modules/food_and_drinks/food/foods/misc_food.dm index 22ec624f7cf4..e9f6f69f5f3e 100644 --- a/code/modules/food_and_drinks/food/foods/misc_food.dm +++ b/code/modules/food_and_drinks/food/foods/misc_food.dm @@ -28,7 +28,7 @@ trash = /obj/item/trash/waffles filling_color = "#E6FA61" list_reagents = list("nutriment" = 10, "vitamin" = 1) - tastes = list("waffles" = 10) + tastes = list("waffles" = 1) /obj/item/reagent_containers/food/snacks/monkeysdelight name = "monkey's delight" @@ -63,33 +63,101 @@ // Salads // ////////////////////// -/obj/item/reagent_containers/food/snacks/aesirsalad - name = "aesir salad" - desc = "Probably too incredible for mortal men to fully enjoy." - icon_state = "aesirsalad" +/obj/item/reagent_containers/food/snacks/salad + name = "salad" + desc = "Should not spawn or be possible to be created. Contact a coder if this somehow exists." + icon = 'icons/obj/food/soupsalad.dmi' + icon_state = "salad" trash = /obj/item/trash/snack_bowl filling_color = "#468C00" bitesize = 3 + list_reagents = list("nutriment" = 6,"vitamin" = 4) + tastes = list("lettuce" = 1) + +/obj/item/reagent_containers/food/snacks/salad/aesir + name = "aesir salad" + desc = "Probably too incredible for mortal men to fully enjoy." + icon_state = "aesirsalad" list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6) tastes = list("divinity" = 1, "lettuce" = 1) -/obj/item/reagent_containers/food/snacks/herbsalad +/obj/item/reagent_containers/food/snacks/salad/antipasto + name = "antipasto salad" + desc = "A traditional Italian salad made of salami, mozzarella cheese, olives, and tomatoes. Often served as a first course meal." + icon_state = "antipasto_salad" + list_reagents = list("nutriment" = 12, "protein" = 6, "vitamin" = 6) + tastes = list("lettuce" = 2, "salami" = 2, "mozzarella cheese" = 2, "tomatoes" = 2, "dressing" = 1) + +/obj/item/reagent_containers/food/snacks/salad/caesar + name = "Caesar salad" + desc = "A simple yet flavorful salad of onions, lettuce, croutons, and shreds of cheese dressed in oil. Comes with a slice of pita bread!" + icon_state = "caesar_salad" + list_reagents = list("nutriment" = 12, "vitamin" = 6) + tastes = list("healthy greens" = 2, "olive dressing" = 2, "feta cheese" = 2, "pita bread" = 1) + +/obj/item/reagent_containers/food/snacks/salad/fruit + name = "fruit salad" + desc = "Your standard fruit salad." + icon_state = "fruitsalad" + list_reagents = list("nutriment" = 9, "vitamin" = 4) + tastes = list("fruit" = 1) + +/obj/item/reagent_containers/food/snacks/salad/greek + name = "Greek salad" + desc = "A popular salad made of tomatoes, onions, feta cheese, and olives all drizzled in olive oil. Though it feels like it's missing something..." + icon_state = "greek_salad" + list_reagents = list("nutriment" = 13, "vitamin" = 14) + tastes = list("healthy greens" = 2, "olive dressing" = 1, "feta cheese" = 1) + +/obj/item/reagent_containers/food/snacks/salad/citrusdelight + name = "citrus delight" + desc = "Citrus overload!" + icon_state = "citrusdelight" + list_reagents = list("nutriment" = 11, "vitamin" = 7) + tastes = list("sourness" = 1, "leaves" = 1) + +/obj/item/reagent_containers/food/snacks/salad/jungle + name = "jungle salad" + desc = "Exotic fruits in a bowl." + icon_state = "junglesalad" + list_reagents = list("banana" = 5, "nutriment" = 11, "vitamin" = 7) + tastes = list("fruit" = 1, "the jungle" = 1) + +/obj/item/reagent_containers/food/snacks/salad/kale + name = "kale salad" + desc = "A healthy kale salad drizzled in oil, perfect for warm summer months." + icon_state = "kale_salad" + list_reagents = list("nutriment" = 12, "vitamin" = 12) + tastes = list("healthy greens" = 2, "olive dressing" = 1) + +/obj/item/reagent_containers/food/snacks/salad/potato + name = "potato salad" + desc = "A dish of boiled potatoes mixed with boiled eggs, onions, and mayonnaise. A staple of every self-respecting barbeque." + icon_state = "potato_salad" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("potato" = 2, "egg" = 2, "mayonnaise" = 2) + +/obj/item/reagent_containers/food/snacks/salad/melonfruitbowl + name = "melon fruit bowl" + desc = "For people who wants edible fruit bowls." + icon_state = "melonfruitbowl" + trash = null + list_reagents = list("nutriment" = 6, "vitamin" = 4) + tastes = list("melon" = 1) + +/obj/item/reagent_containers/food/snacks/salad/herb name = "herb salad" desc = "A tasty salad with apples on top." icon_state = "herbsalad" - trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" - bitesize = 3 list_reagents = list("nutriment" = 8, "vitamin" = 2) tastes = list("lettuce" = 1, "apple" = 1) -/obj/item/reagent_containers/food/snacks/validsalad +/obj/item/reagent_containers/food/snacks/salad/valid name = "valid salad" desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it." icon_state = "validsalad" - trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" - bitesize = 3 list_reagents = list("nutriment" = 8, "salglu_solution" = 5, "vitamin" = 2) tastes = list("fried potato" = 1, "lettuce" = 1, "meat" = 1, "valids" = 1) @@ -190,7 +258,7 @@ icon_state = "boiledrorocore" bitesize = 3 list_reagents = list("slimejelly" = 5) - tastes = list("jelly" = 3) + tastes = list("jelly" = 1) /obj/item/reagent_containers/food/snacks/popcorn name = "popcorn" diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm index 70d30f94d931..57cc1fb63c03 100644 --- a/code/modules/food_and_drinks/food/foods/sandwiches.dm +++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm @@ -3,7 +3,24 @@ // Burgers // ////////////////////// -/obj/item/reagent_containers/food/snacks/brainburger +// Abstract object used for inheritance. Should never spawn. Needed to not break recipes that use plain burgers; recipes that use "burger" would accept any burger and transfer reagents otherwise. + +/obj/item/reagent_containers/food/snacks/burger + name = "burger" + desc = "If you got this, something broke! Contact a coder if this somehow spawns." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "burger" + +/obj/item/reagent_containers/food/snacks/burger/plain + name = "burger" + desc = "The cornerstone of every nutritious breakfast." + icon_state = "hburger" + filling_color = "#D63C3C" + bitesize = 3 + list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "meat" = 1) + +/obj/item/reagent_containers/food/snacks/burger/brain name = "brainburger" desc = "A strange looking burger. It appears almost sentient." icon_state = "brainburger" @@ -12,7 +29,7 @@ list_reagents = list("nutriment" = 6, "prions" = 10, "vitamin" = 1) tastes = list("bun" = 4, "brains" = 2) -/obj/item/reagent_containers/food/snacks/ghostburger +/obj/item/reagent_containers/food/snacks/burger/ghost name = "ghost burger" desc = "Spooky! It doesn't look very filling." icon_state = "ghostburger" @@ -29,12 +46,13 @@ /obj/item/reagent_containers/food/snacks/human/burger name = "-burger" desc = "A bloody burger." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "hburger" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "tender meat" = 2) -/obj/item/reagent_containers/food/snacks/cheeseburger +/obj/item/reagent_containers/food/snacks/burger/cheese name = "cheeseburger" desc = "The cheese adds a good flavor." icon_state = "cheeseburger" @@ -42,16 +60,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "meat" = 1, "cheese" = 1) -/obj/item/reagent_containers/food/snacks/monkeyburger - name = "burger" - desc = "The cornerstone of every nutritious breakfast." - icon_state = "hburger" - filling_color = "#D63C3C" - bitesize = 3 - list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("bun" = 4, "meat" = 1, "the jungle" = 1) - -/obj/item/reagent_containers/food/snacks/tofuburger +/obj/item/reagent_containers/food/snacks/burger/tofu name = "tofu burger" desc = "Making this should probably be a criminal offense." icon_state = "tofuburger" @@ -60,7 +69,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "tofu" = 4) -/obj/item/reagent_containers/food/snacks/hamborger +/obj/item/reagent_containers/food/snacks/burger/hamborger name = "hamborger" desc = "Looking at this makes your flesh feel like a weakness." icon_state = "roburger" @@ -69,11 +78,11 @@ list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1) tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) -/obj/item/reagent_containers/food/snacks/hamborger/Initialize(mapload) +/obj/item/reagent_containers/food/snacks/burger/hamborger/Initialize(mapload) . = ..() message_admins("A [name] has been created at [ADMIN_COORDJMP(src)].") -/obj/item/reagent_containers/food/snacks/xenoburger +/obj/item/reagent_containers/food/snacks/burger/xeno name = "xenoburger" desc = "Smells caustic and tastes like heresy." icon_state = "xburger" @@ -82,7 +91,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "acid" = 4) -/obj/item/reagent_containers/food/snacks/clownburger +/obj/item/reagent_containers/food/snacks/burger/clown name = "clown burger" desc = "This tastes funny..." icon_state = "clownburger" @@ -91,7 +100,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "banana" = 1, "magic" = 2) -/obj/item/reagent_containers/food/snacks/mimeburger +/obj/item/reagent_containers/food/snacks/burger/mime name = "mime burger" desc = "Its taste defies language." icon_state = "mimeburger" @@ -100,16 +109,16 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "silence" = 2) -/obj/item/reagent_containers/food/snacks/baseballburger +/obj/item/reagent_containers/food/snacks/burger/baseball name = "home run baseball burger" desc = "It's still warm. Batter up!" icon_state = "baseball" filling_color = "#CD853F" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("bun" = 4) + tastes = list("bun" = 4, "a homerun" = 3) -/obj/item/reagent_containers/food/snacks/spellburger +/obj/item/reagent_containers/food/snacks/burger/spell name = "spell burger" desc = "This is absolutely Ei Nath." icon_state = "spellburger" @@ -118,7 +127,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "magic" = 2) -/obj/item/reagent_containers/food/snacks/bigbiteburger +/obj/item/reagent_containers/food/snacks/burger/bigbite name = "BigBite burger" desc = "Forget the Big Mac, THIS is the future!" icon_state = "bigbiteburger" @@ -127,7 +136,7 @@ list_reagents = list("nutriment" = 10, "vitamin" = 2) tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10) -/obj/item/reagent_containers/food/snacks/superbiteburger +/obj/item/reagent_containers/food/snacks/burger/superbite name = "SuperBite burger" desc = "This is a mountain of a burger. FOOD!" icon_state = "superbiteburger" @@ -136,7 +145,161 @@ list_reagents = list("nutriment" = 40, "vitamin" = 5) tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10) -/obj/item/reagent_containers/food/snacks/jellyburger +/obj/item/reagent_containers/food/snacks/burger/crazy + name = "crazy hamburger" + desc = "This looks like the sort of food that a demented clown in a trenchcoat would make." + icon_state = "crazyburger" + filling_color = "#E3D681" + bitesize = 3 + list_reagents = list("nutriment" = 10, "vitamin" = 2, "capsaicin" = 3, "condensedcapsaicin" = 2) + tastes = list("bun" = 2, "meat" = 4, "cheese" = 2, "beef soaked in chili" = 3, "a smoking flare" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/white + name = "white pretty patty" + desc = "Delicious titanium!" + icon_state = "ppatty-mime" + filling_color = "#FFFFFF" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "white" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/red + name = "red pretty patty" + desc = "Perfect for hiding the fact that it's burnt to a crisp." + icon_state = "ppatty-red" + filling_color = "#D63C3C" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "red" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/orange + name = "orange pretty patty" + desc = "Contains 0% juice." + icon_state = "ppatty-orange" + filling_color = "#FFA500" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "orange" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/yellow + name = "yellow pretty patty" + desc = "Bright to the last bite." + icon_state = "ppatty-yellow" + filling_color = "#FFFF00" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "yellow" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/green + name = "green pretty patty" + desc = "It's not tainted meat, it's painted meat!" + icon_state = "ppatty-green" + filling_color = "#00FF00" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "green" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/blue + name = "blue pretty patty" + desc = "Is this blue rare?" + icon_state = "ppatty-blue" + filling_color = "#0000FF" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "blue" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/purple + name = "purple pretty patty" + desc = "Regal and low class at the same time." + icon_state = "ppatty-purple" + filling_color = "#800080" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "purple" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/rainbow + name = "rainbow pretty patty" + desc = "Taste the rainbow, eat the rainbow." + icon_state = "ppatty-rainbow" + filling_color = "#0000FF" + bitesize = 4 + list_reagents = list("nutriment" = 14, "protein" = 5, "omnizine" = 10) + tastes = list("bun" = 2, "meat" = 2, "rainbow" = 5) + +/obj/item/reagent_containers/food/snacks/burger/elec + name = "empowered burger" + desc = "It's shockingly good, if you live off of electricity that is." + icon_state = "empoweredburger" + filling_color = "#FFFF00" + bitesize = 2 + list_reagents = list("nutriment" = 5, "protein" = 1, "plasma" = 2) + tastes = list("bun" = 2, "pure electricity" = 5) + +/obj/item/reagent_containers/food/snacks/burger/rat + name = "mouse burger" + desc = "Pretty much what you'd expect..." + icon_state = "ratburger" + filling_color = "#808080" + bitesize = 2 + list_reagents = list("nutriment" = 5, "protein" = 1) + tastes = list("bun" = 2, "dead rat" = 5) + +/obj/item/reagent_containers/food/snacks/burger/appendix + name = "appendix burger" + desc = "Tastes like appendicitis." + icon_state = "appendixburger" + filling_color = "#F2B6EA" + bitesize = 3 + list_reagents = list("nutriment" = 2, "protein" = 6, "vitamin" = 6) + tastes = list("bun" = 1, "grass" = 1) + +/obj/item/reagent_containers/food/snacks/burger/bacon + name = "bacon burger" + desc = "The perfect combination of all things American." + icon_state = "baconburger" + filling_color = "#F2B6EA" + bitesize = 3 + list_reagents = list("nutriment" = 3, "vitamin" = 2, "protein" = 6) + tastes = list("bun" = 1, "bacon" = 1) + + +/obj/item/reagent_containers/food/snacks/burger/bearger + name = "bearger" + desc = "Best served rawr." + icon_state = "bearger" + filling_color = "#F2B6EA" + bitesize = 3 + list_reagents = list("nutriment" = 3, "protein" = 6, "vitamin" = 2) + tastes = list("bun" = 1, "meat" = 1, "salmon" = 1) + +/obj/item/reagent_containers/food/snacks/burger/fivealarm + name = "five alarm burger" + desc = "HOT! HOT!" + icon_state = "fivealarmburger" + bitesize = 3 + filling_color = "#F2B6EA" + list_reagents = list("nutriment" = 4, "protein" = 6, "condensedcapsaicin" = 5, "capsaicin" = 5) + tastes = list("bun" = 1, "extreme heat" = 1) + +/obj/item/reagent_containers/food/snacks/burger/mcguffin + name = "mcGuffin" + desc = "A cheap and greasy imitation of an eggs benedict." + icon_state = "mcguffin" + bitesize = 3 + filling_color = "#F2B6EA" + list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 1) + tastes = list("muffin" = 1, "bacon" = 1) + +/obj/item/reagent_containers/food/snacks/burger/mcrib + name = "mcRib" + desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." + icon_state = "mcrib" + bitesize = 3 + filling_color = "#F2B6EA" + list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 4, "bbqsauce" = 1) + tastes = list("bun" = 1, "pork" = 1, "patty" = 1) + +/obj/item/reagent_containers/food/snacks/burger/jelly name = "jelly burger" desc = "Culinary delight...?" icon_state = "jellyburger" @@ -144,10 +307,10 @@ bitesize = 3 tastes = list("bun" = 4, "jelly" = 2) -/obj/item/reagent_containers/food/snacks/jellyburger/slime +/obj/item/reagent_containers/food/snacks/burger/jelly/slime list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1) -/obj/item/reagent_containers/food/snacks/jellyburger/cherry +/obj/item/reagent_containers/food/snacks/burger/jelly/cherry list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1) @@ -158,6 +321,7 @@ /obj/item/reagent_containers/food/snacks/sandwich name = "sandwich" desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "sandwich" filling_color = "#D9BE29" list_reagents = list("nutriment" = 6, "vitamin" = 1) @@ -166,6 +330,7 @@ /obj/item/reagent_containers/food/snacks/toastedsandwich name = "toasted sandwich" desc = "Now if you only had a pepper bar." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "toastedsandwich" filling_color = "#D9BE29" list_reagents = list("nutriment" = 6, "carbon" = 2) @@ -174,6 +339,7 @@ /obj/item/reagent_containers/food/snacks/grilledcheese name = "grilled cheese sandwich" desc = "Goes great with tomato soup!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "grilledcheese" filling_color = "#D9BE29" list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value? @@ -182,6 +348,7 @@ /obj/item/reagent_containers/food/snacks/jellysandwich name = "jelly sandwich" desc = "You wish you had some peanut butter to go with this..." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "jellysandwich" filling_color = "#9E3A78" bitesize = 3 @@ -196,6 +363,7 @@ /obj/item/reagent_containers/food/snacks/notasandwich name = "not-a-sandwich" desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "notasandwich" list_reagents = list("nutriment" = 6, "vitamin" = 6) tastes = list("nothing suspicious" = 1) @@ -203,60 +371,52 @@ /obj/item/reagent_containers/food/snacks/wrap name = "egg wrap" desc = "The precursor to Pigs in a Blanket." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "wrap" list_reagents = list("nutriment" = 5) tastes = list("egg" = 1) -/obj/item/reagent_containers/food/snacks/appendixburger - name = "appendix burger" - desc = "Tastes like appendicitis." - icon_state = "appendixburger" - list_reagents = list("nutriment" = 2, "protein" = 6, "vitamin" = 6) - bitesize = 3 - tastes = list("bun" = 1, "grass" = 1) - filling_color = "#F2B6EA" - -/obj/item/reagent_containers/food/snacks/baconburger - name = "bacon burger" - desc = "The perfect combination of all things American." - icon_state = "baconburger" - tastes = list("bun" = 1, "bacon" = 1) - list_reagents = list("nutriment" = 3, "vitamin" = 2, "protein" = 6) - filling_color = "#F2B6EA" - bitesize = 3 - -/obj/item/reagent_containers/food/snacks/bearger - name = "bearger" - desc = "Best served rawr." - icon_state = "bearger" - tastes = list("bun" = 1, "meat" = 1, "salmon" = 1) - list_reagents = list("nutriment" = 3, "protein" = 6, "vitamin" = 2) - filling_color = "#F2B6EA" - bitesize = 3 +/obj/item/reagent_containers/food/snacks/blt + name = "\improper BLT" + desc = "A classic bacon, lettuce, and tomato sandwich." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "blt" + filling_color = "#D63C3C" + bitesize = 4 + list_reagents = list("nutriment" = 5, "protein" = 2) + tastes = list("bacon" = 3, "lettuce" = 2, "tomato" = 2, "bread" = 2) + +/obj/item/reagent_containers/food/snacks/peanut_butter_jelly + name = "peanut butter and jelly sandwich" + desc = "A classic PB&J sandwich, just like your mom used to make." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "peanut_butter_jelly_sandwich" + filling_color = "#9E3A78" + bitesize = 2 + tastes = list("peanut butter" = 3, "jelly" = 3, "bread" = 2) -/obj/item/reagent_containers/food/snacks/fivealarmburger - name = "five alarm burger" - desc = "HOT! HOT!" - icon_state = "fivealarmburger" - list_reagents = list("nutriment" = 4, "protein" = 6, "condensedcapsaicin" = 5, "capsaicin" = 5) - tastes = list("bun" = 1, "extreme heat" = 1) - bitesize = 3 - filling_color = "#F2B6EA" +/obj/item/reagent_containers/food/snacks/peanut_butter_jelly/slime + list_reagents = list("peanutbutter" = 2, "slimejelly" = 5, "nutriment" = 5, "protein" = 2) -/obj/item/reagent_containers/food/snacks/mcguffin - name = "mcGuffin" - desc = "A cheap and greasy imitation of an eggs benedict." - icon_state = "mcguffin" - list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 1) - tastes = list("muffin" = 1, "bacon" = 1) - bitesize = 3 - filling_color = "#F2B6EA" +/obj/item/reagent_containers/food/snacks/peanut_butter_jelly/cherry + list_reagents = list("peanutbutter" = 2, "cherryjelly" = 5, "nutriment" = 5, "protein" = 2) -/obj/item/reagent_containers/food/snacks/mcrib - name = "mcRib" - desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." - icon_state = "mcrib" - list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 4, "bbqsauce" = 1) - tastes = list("bun" = 1, "pork" = 1, "patty" = 1) - bitesize = 3 - filling_color = "#F2B6EA" +/obj/item/reagent_containers/food/snacks/philly_cheesesteak + name = "Philly cheesesteak" + desc = "A popular sandwich made of sliced meat, onions, melted cheese in a long hoagie roll. Mouthwatering doesn't even begin to describe it." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "philly_cheesesteak" + filling_color = "#D9BE29" + bitesize = 4 + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("steak" = 3, "melted cheese" = 3, "onions" = 2, "bread" = 2) + +/obj/item/reagent_containers/food/snacks/peanut_butter_banana + name = "peanut butter and banana sandwich" + desc = "A peanut butter sandwich with banana slices mixed in, a good high protein treat." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "peanut_butter_banana_sandwich" + filling_color = "#D9BE29" + bitesize = 2 + list_reagents = list("nutriment" = 5, "protein" = 2) + tastes = list("peanutbutter" = 3, "banana" = 3, "bread" = 2) diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm index 26bc0c75aeb9..efe2cc630fe2 100644 --- a/code/modules/food_and_drinks/food/foods/soups.dm +++ b/code/modules/food_and_drinks/food/foods/soups.dm @@ -7,6 +7,7 @@ /obj/item/reagent_containers/food/snacks/soup name = "impossible soup" desc = "This soup is so good, it shouldn't even exist!" + icon = 'icons/obj/food/soupsalad.dmi' icon_state = "beans" // If you don't have a sprite, you get beans. consume_sound = 'sound/items/drink.ogg' trash = /obj/item/trash/snack_bowl @@ -123,6 +124,77 @@ . = ..() name = pick("borsch", "bortsch", "borstch", "borsh", "borshch", "borscht") +/obj/item/reagent_containers/food/snacks/soup/eyesoup + name = "eyeball soup" + desc = "It looks back at you..." + icon_state = "eyeballsoup" + filling_color = "#E386BF" + list_reagents = list("nutriment" = 7, "protein" = 2) + tastes = list("squirming" = 2, "tomato" = 2) + +/obj/item/reagent_containers/food/snacks/soup/sweetpotatosoup + name = "sweet potato soup" + desc = "Delicious sweet potato in soup form." + icon_state = "sweetpotatosoup" + list_reagents = list("nutriment" = 5) + tastes = list("sweet potato" = 1) + +/obj/item/reagent_containers/food/snacks/soup/redbeetsoup + name = "red beet soup" + desc = "Quite a delicacy." + icon_state = "redbeetsoup" + list_reagents = list("nutriment" = 5) + tastes = list("red beet" = 1) + +/obj/item/reagent_containers/food/snacks/soup/frenchonionsoup + name = "french onion soup" + desc = "Good enough to make a grown mime cry." + icon_state = "onionsoup" + list_reagents = list("nutriment" = 8) + tastes = list("caramelized onions" = 3, "cheese" = 1) + +/obj/item/reagent_containers/food/snacks/soup/zurek + name = "zurek" + desc = "A traditional Polish soup composed of vegetables, meat, and an egg. Goes great with bread." + icon_state = "zurek" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("creamy vegetables" = 3, "sausage" = 2) + +/obj/item/reagent_containers/food/snacks/soup/cullenskink + name = "cullen skink" + desc = "A thick Scottish soup made of smoked fish, potatoes and onions." + icon_state = "cullen_skink" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("creamy broth" = 2, "fish" = 2, "vegetables" = 2) + +/obj/item/reagent_containers/food/snacks/soup/chicken_noodle_soup + name = "chicken noodle soup" + desc = "A hearty bowl of chicken noodle soup, perfect for when you're stuck at home and sick." + icon_state = "chicken_noodle_soup" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("broth" = 1, "chicken" = 1, "carrots" = 1, "noodles" = 1) + +/obj/item/reagent_containers/food/snacks/soup/cornchowder + name = "corn chowder" + desc = "A creamy bowl of corn chowder, with bacon bits and mixed vegetables. One bowl is never enough." + icon_state = "corn_chowder" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("creamy broth" = 1, "bacon" = 1, "mixed vegetables" = 1) + +/obj/item/reagent_containers/food/snacks/soup/meatball_noodles + name = "meatball noodle soup" + desc = "A hearty noodle soup made from meatballs and pasta in a rich broth. Commonly topped with a handful of chopped nuts." + icon_state = "meatball_noodles" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("bone broth" = 1, "meat" = 1, "gnocchi" = 1, "peanuts" = 1) + +/obj/item/reagent_containers/food/snacks/soup/seedsoup + name = "Misklmæsch" //miskl = seed, mæsch = soup + desc = "A seed based soup, made by germinating seeds and then boiling them. \ + Produces a particularly bitter broth which is usually balanced by the addition of vinegar." + icon_state = "moth_seed_soup" + list_reagents = list("nutriment" = 6) + tastes = list("bitterness" = 1, "sourness" = 1, "nature" = 1) ////////////////////// // Stews // @@ -140,11 +212,39 @@ /obj/item/reagent_containers/food/snacks/stewedsoymeat name = "stewed soy meat" desc = "Even non-vegetarians will LOVE this!" + icon = 'icons/obj/food/soupsalad.dmi' icon_state = "stewedsoymeat" trash = /obj/item/trash/plate list_reagents = list("nutriment" = 8) tastes = list("soy" = 1, "vegetables" = 1) +/obj/item/reagent_containers/food/snacks/soup/beanstew + name = "Prickeldröndolhaskl" //prickeld = spicy, röndol = bean, haskl = stew + desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread." + icon_state = "moth_bean_stew" + list_reagents = list("nutriment" = 10) + tastes = list("beans" = 1, "cabbage" = 1, "spicy sauce" = 1) + +/obj/item/reagent_containers/food/snacks/soup/oatstew + name = "Häfmisklhaskl" //häfmiskl = oat (häf from German hafer meaning oat, miskl meaning seed), haskl = stew + desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread." + icon_state = "moth_oat_stew" + list_reagents = list("nutriment" = 10) + tastes = list("oats" = 1, "sweet potato" = 1, "carrot" = 1, "pumpkin" = 1, "parsnip" = 1) + +/obj/item/reagent_containers/food/snacks/soup/hong_kong_borscht + name = "hong kong borscht" + desc = "Also known as luo song tang or Russian soup, this dish bears little to no resemblance to Eastern European borscht- indeed, it's a tomato-based soup with no beets in sight." + icon_state = "hong_kong_borscht" + list_reagents = list("nutriment" = 10, "protein" = 2) + tastes = list("tomato" = 1, "cabbage" = 1, "meat" = 1) + +/obj/item/reagent_containers/food/snacks/soup/hong_kong_macaroni + name = "hong kong macaroni" + desc = "A favourite from Hong Kong's Cha Chaan Tengs, this macaroni soup came to Mars with Cantonese settlers under Cybersun Industries, and has become as much of a breakfast staple there as it is in its homeland." + icon_state = "hong_kong_macaroni" + list_reagents = list("nutriment" = 8, "protein" = 2) + tastes = list("cream" = 1, "chicken" = 1, "pasta" = 1, "ham" =1) ////////////////////// // Chili // @@ -165,3 +265,11 @@ filling_color = "#2B00FF" list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2) tastes = list("tomato" = 1, "mint" = 1) + +/obj/item/reagent_containers/food/snacks/soup/clownchili + name = "chili con carnival" + desc = "A delicious stew of meat, chiles, and salty, salty clown tears." + icon_state = "clownchili" + filling_color = "#FF3C00" + list_reagents = list("nutriment" = 5, "tomatojuice" = 2, "protein" = 2) + tastes = list("tomato" = 1, "chili" = 1, "meat" = 1, "sad clowns" = 4) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 707326a53be6..db1d85d77ed3 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -167,7 +167,7 @@ D.taste(reagents) else if(ismouse(M)) var/mob/living/simple_animal/mouse/N = M - to_chat(N, text("You nibble away at [src].")) + to_chat(N, "You nibble away at [src].") if(prob(50)) N.visible_message("[N] nibbles away at [src].", "") N.adjustHealth(-2) @@ -225,6 +225,8 @@ for(var/i=1 to (slices_num-slices_lost)) var/obj/slice = new slice_path (loc) reagents.trans_to(slice,reagents_per_slice) + slice.pixel_x = rand(-7, 7) + slice.pixel_y = rand(-7, 7) qdel(src) return ..() //////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index d5eba519442a..36f707765e63 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -528,11 +528,6 @@ return data -/obj/machinery/kitchen_machine/ui_static_data(mob/user) - var/list/data = list() - data["name"] = name - return data - /obj/machinery/kitchen_machine/ui_act(action, params, datum/tgui/ui) . = ..() if(.) diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index ba2481e973d7..48ff01389ba5 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -61,34 +61,34 @@ /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/microwave/humanburger ) - result = /obj/item/reagent_containers/food/snacks/monkeyburger + result = /obj/item/reagent_containers/food/snacks/burger/plain /datum/recipe/microwave/syntiburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/meat/syntiflesh ) - result = /obj/item/reagent_containers/food/snacks/monkeyburger + result = /obj/item/reagent_containers/food/snacks/burger/plain /datum/recipe/microwave/brainburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/organ/internal/brain ) - result = /obj/item/reagent_containers/food/snacks/brainburger + result = /obj/item/reagent_containers/food/snacks/burger/brain /datum/recipe/microwave/hamborger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/robot_parts/head ) - result = /obj/item/reagent_containers/food/snacks/hamborger + result = /obj/item/reagent_containers/food/snacks/burger/hamborger /datum/recipe/microwave/xenoburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat ) - result = /obj/item/reagent_containers/food/snacks/xenoburger + result = /obj/item/reagent_containers/food/snacks/burger/xeno /datum/recipe/microwave/fishburger items = list( @@ -102,35 +102,35 @@ /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/tofu ) - result = /obj/item/reagent_containers/food/snacks/tofuburger + result = /obj/item/reagent_containers/food/snacks/burger/tofu /datum/recipe/microwave/ghostburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/ectoplasm //where do you even find this stuff ) - result = /obj/item/reagent_containers/food/snacks/ghostburger + result = /obj/item/reagent_containers/food/snacks/burger/ghost /datum/recipe/microwave/clownburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/mask/gas/clown_hat, ) - result = /obj/item/reagent_containers/food/snacks/clownburger + result = /obj/item/reagent_containers/food/snacks/burger/clown /datum/recipe/microwave/mimeburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/head/beret ) - result = /obj/item/reagent_containers/food/snacks/mimeburger + result = /obj/item/reagent_containers/food/snacks/burger/mime /datum/recipe/microwave/baseballburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/melee/baseball_bat ) - result = /obj/item/reagent_containers/food/snacks/baseballburger + result = /obj/item/reagent_containers/food/snacks/burger/baseball /datum/recipe/microwave/cheeseburger items = list( @@ -138,28 +138,28 @@ /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/cheesewedge, ) - result = /obj/item/reagent_containers/food/snacks/cheeseburger + result = /obj/item/reagent_containers/food/snacks/burger/cheese /datum/recipe/microwave/appendixburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/organ/internal/appendix ) - result = /obj/item/reagent_containers/food/snacks/appendixburger + result = /obj/item/reagent_containers/food/snacks/burger/appendix /datum/recipe/microwave/appendixburger_bitten items = list( /obj/item/reagent_containers/food/snacks/appendix, /obj/item/reagent_containers/food/snacks/bun ) - result = /obj/item/reagent_containers/food/snacks/appendixburger + result = /obj/item/reagent_containers/food/snacks/burger/appendix /datum/recipe/microwave/bearger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/monstermeat/bearmeat ) - result = /obj/item/reagent_containers/food/snacks/bearger + result = /obj/item/reagent_containers/food/snacks/burger/bearger /datum/recipe/microwave/fivealarmburger items = list( @@ -167,7 +167,7 @@ /obj/item/reagent_containers/food/snacks/grown/ghost_chili, /obj/item/reagent_containers/food/snacks/grown/ghost_chili ) - result = /obj/item/reagent_containers/food/snacks/fivealarmburger + result = /obj/item/reagent_containers/food/snacks/burger/fivealarm /datum/recipe/microwave/baconburger items = list( @@ -176,7 +176,7 @@ /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/cheesewedge ) - result = /obj/item/reagent_containers/food/snacks/baconburger + result = /obj/item/reagent_containers/food/snacks/burger/bacon /datum/recipe/microwave/mcrib items = list( @@ -184,7 +184,7 @@ /obj/item/reagent_containers/food/snacks/bbqribs, /obj/item/reagent_containers/food/snacks/onion_slice ) - result = /obj/item/reagent_containers/food/snacks/mcrib + result = /obj/item/reagent_containers/food/snacks/burger/mcrib /datum/recipe/microwave/mcguffin items = list( @@ -193,7 +193,7 @@ /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/friedegg ) - result = /obj/item/reagent_containers/food/snacks/mcguffin + result = /obj/item/reagent_containers/food/snacks/burger/mcguffin /datum/recipe/microwave/hotdog items = list( @@ -320,27 +320,31 @@ /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/head/wizard/fake, ) - result = /obj/item/reagent_containers/food/snacks/spellburger + result = /obj/item/reagent_containers/food/snacks/burger/spell /datum/recipe/microwave/spellburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/head/wizard, ) - result = /obj/item/reagent_containers/food/snacks/spellburger + result = /obj/item/reagent_containers/food/snacks/burger/spell /datum/recipe/microwave/bigbiteburger items = list( - /obj/item/reagent_containers/food/snacks/monkeyburger, + /obj/item/reagent_containers/food/snacks/burger/plain, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/egg, ) - result = /obj/item/reagent_containers/food/snacks/bigbiteburger + result = /obj/item/reagent_containers/food/snacks/burger/bigbite /datum/recipe/microwave/enchiladas - items = list(/obj/item/reagent_containers/food/snacks/cutlet, /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/corn) + items = list( + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/reagent_containers/food/snacks/grown/corn) result = /obj/item/reagent_containers/food/snacks/enchiladas /datum/recipe/microwave/burrito @@ -355,7 +359,9 @@ /datum/recipe/microwave/monkeysdelight reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10) - items = list(/obj/item/reagent_containers/food/snacks/monkeycube, /obj/item/reagent_containers/food/snacks/grown/banana) + items = list( + /obj/item/reagent_containers/food/snacks/monkeycube, + /obj/item/reagent_containers/food/snacks/grown/banana) result = /obj/item/reagent_containers/food/snacks/monkeysdelight /datum/recipe/microwave/fishandchips @@ -376,14 +382,20 @@ /datum/recipe/microwave/tomatosoup reagents = list("water" = 10) - items = list(/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/tomato) + items = list( + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/tomato) result = /obj/item/reagent_containers/food/snacks/soup/tomatosoup /datum/recipe/microwave/stew reagents = list("water" = 10) - items= list(/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/potato, - /obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/eggplant, - /obj/item/reagent_containers/food/snacks/grown/mushroom, /obj/item/reagent_containers/food/snacks/meat) + items= list( + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/potato, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/grown/eggplant, + /obj/item/reagent_containers/food/snacks/grown/mushroom, + /obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/soup/stew /datum/recipe/microwave/slimetoast @@ -471,14 +483,157 @@ /datum/recipe/microwave/superbiteburger reagents = list("sodiumchloride" = 5, "blackpepper" = 5) items = list( - /obj/item/reagent_containers/food/snacks/bigbiteburger, + /obj/item/reagent_containers/food/snacks/burger/bigbite, /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/boiledegg, - /obj/item/reagent_containers/food/snacks/grown/tomato + /obj/item/reagent_containers/food/snacks/tomatoslice + ) + result = /obj/item/reagent_containers/food/snacks/burger/superbite + +/datum/recipe/microwave/crazyburger + reagents = list("cornoil" = 15) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/toy/crayon/green, + /obj/item/flashlight/flare + ) + result = /obj/item/reagent_containers/food/snacks/burger/crazy + +/datum/recipe/microwave/blt + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/tomatoslice, + /obj/item/reagent_containers/food/snacks/bacon + ) + result = /obj/item/reagent_containers/food/snacks/blt + +/datum/recipe/microwave/peanut_butter_jelly/cherry + reagents = list("cherryjelly" = 5, "peanutbutter" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/peanut_butter_jelly/cherry + +/datum/recipe/microwave/peanut_butter_jelly/slime + reagents = list("slimejelly" = 5, "peanutbutter" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/peanut_butter_jelly/slime + +/datum/recipe/microwave/peanut_butter_banana + reagents = list("peanutbutter" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/grown/banana + ) + result = /obj/item/reagent_containers/food/snacks/peanut_butter_banana + +/datum/recipe/microwave/philly_cheesesteak + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/grown/onion + ) + result = /obj/item/reagent_containers/food/snacks/philly_cheesesteak + +/datum/recipe/microwave/ppattyred + reagents = list("cherryjelly" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/red + +/datum/recipe/microwave/ppattyorange + reagents = list("orangejuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/orange + +/datum/recipe/microwave/ppattyyellow + reagents = list("lemonjuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/yellow + +/datum/recipe/microwave/ppattygreen + reagents = list("limejuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/green + +/datum/recipe/microwave/ppattyblue + reagents = list("berryjuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/blue + +/datum/recipe/microwave/ppattypurple + reagents = list("grapejuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/purple + +/datum/recipe/microwave/ppattywhite + reagents = list("sugar" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat ) - result = /obj/item/reagent_containers/food/snacks/superbiteburger + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/white + +/datum/recipe/microwave/ppattyrainbow + items = list( + /obj/item/reagent_containers/food/snacks/burger/ppatty/red, + /obj/item/reagent_containers/food/snacks/burger/ppatty/orange, + /obj/item/reagent_containers/food/snacks/burger/ppatty/yellow, + /obj/item/reagent_containers/food/snacks/burger/ppatty/green, + /obj/item/reagent_containers/food/snacks/burger/ppatty/blue, + /obj/item/reagent_containers/food/snacks/burger/ppatty/purple, + /obj/item/reagent_containers/food/snacks/burger/ppatty/white + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/rainbow + +/datum/recipe/microwave/elecburger + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/stack/sheet/mineral/plasma, + /obj/item/stack/sheet/mineral/plasma + ) + result = /obj/item/reagent_containers/food/snacks/burger/elec + +/datum/recipe/microwave/ratburger + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/holder/mouse + ) + result = /obj/item/reagent_containers/food/snacks/burger/rat /datum/recipe/microwave/candiedapple reagents = list("water" = 5, "sugar" = 5) @@ -490,14 +645,14 @@ items = list( /obj/item/reagent_containers/food/snacks/bun ) - result = /obj/item/reagent_containers/food/snacks/jellyburger/slime + result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime /datum/recipe/microwave/jellyburger reagents = list("cherryjelly" = 5) items = list( /obj/item/reagent_containers/food/snacks/bun ) - result = /obj/item/reagent_containers/food/snacks/jellyburger/cherry + result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry /datum/recipe/microwave/twobread reagents = list("wine" = 5) @@ -540,6 +695,153 @@ ) result = /obj/item/reagent_containers/food/snacks/soup/clownstears +/datum/recipe/microwave/clownchili + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/clothing/shoes/clown_shoes + ) + result = /obj/item/reagent_containers/food/snacks/soup/clownchili + +/datum/recipe/microwave/eyesoup + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/organ/internal/eyes + ) + result = /obj/item/reagent_containers/food/snacks/soup/eyesoup + +/datum/recipe/microwave/sweetpotatosoup + reagents = list("water" = 10, "milk" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/potato/sweet, + /obj/item/reagent_containers/food/snacks/grown/potato/sweet + ) + result = /obj/item/reagent_containers/food/snacks/soup/sweetpotatosoup + +/datum/recipe/microwave/redbeetsoup + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/redbeet, + /obj/item/reagent_containers/food/snacks/grown/redbeet, + /obj/item/reagent_containers/food/snacks/grown/cabbage + ) + result = /obj/item/reagent_containers/food/snacks/soup/redbeetsoup + +/datum/recipe/microwave/frenchonionsoup + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/soup/frenchonionsoup + +/datum/recipe/microwave/zurek + reagents = list("water" = 10, "flour" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/boiledegg, + /obj/item/reagent_containers/food/snacks/sausage, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/grown/onion + ) + result = /obj/item/reagent_containers/food/snacks/soup/zurek + +/datum/recipe/microwave/cullenskink + reagents = list("water" = 10, "milk" = 10, "blackpepper" = 4) + items = list( + /obj/item/reagent_containers/food/snacks/salmonmeat, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/potato + ) + result = /obj/item/reagent_containers/food/snacks/soup/cullenskink + +/datum/recipe/microwave/chicken_noodle_soup + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/boiledspaghetti + ) + result = /obj/item/reagent_containers/food/snacks/soup/chicken_noodle_soup + +/datum/recipe/microwave/cornchowder + reagents = list("water" = 10, "cream" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/corn, + /obj/item/reagent_containers/food/snacks/grown/potato, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/bacon + ) + result = /obj/item/reagent_containers/food/snacks/soup/cornchowder + +/datum/recipe/microwave/meatball_noodles + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/peanuts, + /obj/item/reagent_containers/food/snacks/meatball, + /obj/item/reagent_containers/food/snacks/meatball, + /obj/item/reagent_containers/food/snacks/spaghetti + ) + result = /obj/item/reagent_containers/food/snacks/soup/meatball_noodles + +/datum/recipe/microwave/seedsoup + reagents = list("water" = 10, "vinegar" = 10) + items = list( + /obj/item/seeds/sunflower, + /obj/item/seeds/poppy/lily, + /obj/item/seeds/ambrosia + ) + result = /obj/item/reagent_containers/food/snacks/soup/seedsoup + +/datum/recipe/microwave/beanstew + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/beans, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/reagent_containers/food/snacks/grown/corn + ) + result = /obj/item/reagent_containers/food/snacks/soup/beanstew + +/datum/recipe/microwave/oatstew + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/oat, + /obj/item/reagent_containers/food/snacks/grown/potato/sweet, + /obj/item/reagent_containers/food/snacks/grown/parsnip, + /obj/item/reagent_containers/food/snacks/grown/carrot + ) + result = /obj/item/reagent_containers/food/snacks/soup/oatstew + +/datum/recipe/microwave/hong_kong_borscht + reagents = list("water" = 10, "soysauce" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/cutlet + ) + result = /obj/item/reagent_containers/food/snacks/soup/hong_kong_borscht + +/datum/recipe/microwave/hong_kong_macaroni + reagents = list("water" = 10, "cream" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/boiledspaghetti, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/bacon + ) + result = /obj/item/reagent_containers/food/snacks/soup/hong_kong_macaroni + /datum/recipe/microwave/boiledslimeextract reagents = list("water" = 5) items = list( @@ -587,29 +889,127 @@ items = list(/obj/item/reagent_containers/food/snacks/grown/whitebeet, /obj/item/reagent_containers/food/snacks/grown/cabbage) result = /obj/item/reagent_containers/food/snacks/soup/beetsoup +/datum/recipe/microwave/salad + items = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/cabbage + ) + result = /obj/item/reagent_containers/food/snacks/salad +/datum/recipe/microwave/antipasto_salad + items = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/olive, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/salad/antipasto + +/datum/recipe/microwave/caesar_salad + reagents = list("oliveoil" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/onion_slice/red, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/salad/caesar + +/datum/recipe/microwave/citrusdelight + items = list( + /obj/item/reagent_containers/food/snacks/grown/citrus/lime, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon + ) + result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight + +/datum/recipe/microwave/fruitsalad + items = list( + /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/apple, + /obj/item/reagent_containers/food/snacks/grown/grapes, + /obj/item/reagent_containers/food/snacks/watermelonslice + ) + result = /obj/item/reagent_containers/food/snacks/salad/fruit + +/datum/recipe/microwave/greek_salad + reagents = list("oliveoil" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/olive, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/onion_slice/red, + /obj/item/reagent_containers/food/snacks/onion_slice/red, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/salad/greek + +/datum/recipe/microwave/junglesalad + items = list( + /obj/item/reagent_containers/food/snacks/grown/apple, + /obj/item/reagent_containers/food/snacks/grown/grapes, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/watermelonslice, + /obj/item/reagent_containers/food/snacks/watermelonslice + ) + result = /obj/item/reagent_containers/food/snacks/salad/jungle + +/datum/recipe/microwave/kale_salad + reagents = list("oliveoil" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/onion_slice/red, + /obj/item/reagent_containers/food/snacks/onion_slice/red + ) + result = /obj/item/reagent_containers/food/snacks/salad/kale + +/datum/recipe/microwave/potato_salad + reagents = list("mayonnaise" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/potato, + /obj/item/reagent_containers/food/snacks/grown/potato, + /obj/item/reagent_containers/food/snacks/boiledegg + ) + result = /obj/item/reagent_containers/food/snacks/salad/potato + +/datum/recipe/microwave/melonfruitbowl + items = list( + /obj/item/reagent_containers/food/snacks/grown/watermelon, + /obj/item/reagent_containers/food/snacks/grown/apple, + /obj/item/reagent_containers/food/snacks/grown/ambrosia, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon + ) + result = /obj/item/reagent_containers/food/snacks/salad/melonfruitbowl + + /datum/recipe/microwave/herbsalad items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/apple) - result = /obj/item/reagent_containers/food/snacks/herbsalad + result = /obj/item/reagent_containers/food/snacks/salad/herb /datum/recipe/microwave/herbsalad/make_food(obj/container) - var/obj/item/reagent_containers/food/snacks/herbsalad/being_cooked = ..() + var/obj/item/reagent_containers/food/snacks/salad/herb/being_cooked = ..() being_cooked.reagents.del_reagent("toxin") return being_cooked /datum/recipe/microwave/aesirsalad items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/apple/gold) - result = /obj/item/reagent_containers/food/snacks/aesirsalad + result = /obj/item/reagent_containers/food/snacks/salad/aesir /datum/recipe/microwave/validsalad items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/meatball) - result = /obj/item/reagent_containers/food/snacks/validsalad + result = /obj/item/reagent_containers/food/snacks/salad/valid /datum/recipe/microwave/validsalad/make_food(obj/container) - var/obj/item/reagent_containers/food/snacks/validsalad/being_cooked = ..() + var/obj/item/reagent_containers/food/snacks/salad/valid/being_cooked = ..() being_cooked.reagents.del_reagent("toxin") return being_cooked diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm index 110cd9314a8e..c13c81bb5ab0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm @@ -45,7 +45,7 @@ /datum/reagent/slimejelly = 5, /obj/item/reagent_containers/food/snacks/bun = 1, ) - result = list(/obj/item/reagent_containers/food/snacks/jellyburger/slime) + result = list(/obj/item/reagent_containers/food/snacks/burger/jelly/slime) category = CAT_FOOD subcategory = CAT_SANDWICH @@ -55,7 +55,7 @@ /datum/reagent/consumable/cherryjelly = 5, /obj/item/reagent_containers/food/snacks/bun = 1, ) - result = list(/obj/item/reagent_containers/food/snacks/jellyburger/cherry) + result = list(/obj/item/reagent_containers/food/snacks/burger/jelly/cherry) category = CAT_FOOD subcategory = CAT_SANDWICH @@ -65,7 +65,7 @@ /obj/item/melee/baseball_bat = 1, /obj/item/reagent_containers/food/snacks/bun = 1, ) - result = list(/obj/item/reagent_containers/food/snacks/baseballburger) + result = list(/obj/item/reagent_containers/food/snacks/burger/baseball) category = CAT_FOOD subcategory = CAT_SANDWICH diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 43088af133fa..e8ee0cd1e05c 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -239,6 +239,9 @@ /obj/item/deck/attack_self() deckshuffle() +/obj/item/deck/AltClick() + deckshuffle() + /obj/item/deck/verb/verb_shuffle() if(!isobserver(usr)) set category = "Object" @@ -249,7 +252,7 @@ /obj/item/deck/proc/deckshuffle() var/mob/living/user = usr - if(cooldown < world.time - 5 SECONDS) + if(cooldown < world.time - 1 SECONDS) cards = shuffle(cards) user.visible_message("[user] shuffles [src].") playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index b176bbd78bea..da99f76b2fd3 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -15,7 +15,7 @@ /obj/item/deck/tarot/deckshuffle() var/mob/living/user = usr - if(cooldown < world.time - 5 SECONDS) + if(cooldown < world.time - 1 SECONDS) var/list/newcards = list() while(cards.len) var/datum/playingcard/P = pick(cards) @@ -28,3 +28,4 @@ playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) user.visible_message("[user] shuffles [src].", "You shuffle [src].") cooldown = world.time + diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 2d961a3cc557..8ff81d93954b 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -86,6 +86,8 @@ for(var/i = 1 to (slices_num - slices_lost)) var/obj/slice = new slice_path (loc) reagents.trans_to(slice, reagents_per_slice) + slice.pixel_x = rand(-7, 7) + slice.pixel_y = rand(-7, 7) qdel(src) return ..() diff --git a/code/modules/instruments/songs/_song_ui.dm b/code/modules/instruments/songs/_song_ui.dm index 6e9bf9fe01fd..5d7fa1f19312 100644 --- a/code/modules/instruments/songs/_song_ui.dm +++ b/code/modules/instruments/songs/_song_ui.dm @@ -61,7 +61,7 @@ if("import") var/t = "" do - t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t) as message) + t = html_encode(input(usr, "Please paste the entire song, formatted:", "[name]", t) as message) if(!in_range(parent, usr)) return diff --git a/code/modules/mining/lavaland/loot/bubblegum_loot.dm b/code/modules/mining/lavaland/loot/bubblegum_loot.dm index b217e2a7d332..5ce83a191e53 100644 --- a/code/modules/mining/lavaland/loot/bubblegum_loot.dm +++ b/code/modules/mining/lavaland/loot/bubblegum_loot.dm @@ -16,18 +16,12 @@ /obj/structure/closet/crate/necropolis/bubblegum/bait/populate_contents() return -/obj/structure/closet/crate/necropolis/bubblegum/bait/open(by_hand) - . = ..() - for(var/obj/effect/bubblegum_trigger/B in contents) - B.targets_to_fuck_up += usr - B.activate() - /obj/effect/bubblegum_trigger var/list/targets_to_fuck_up = list() /obj/effect/bubblegum_trigger/Initialize(mapload, target_list) . = ..() - addtimer(CALLBACK(src, PROC_REF(activate)), 15 SECONDS) //We try to auto engage the fun 15 seconds after death, or when manually opened, whichever comes first. If for some strange reason the target list is empty, we'll trigger when opened + addtimer(CALLBACK(src, PROC_REF(activate)), 15 SECONDS) //We try to auto engage the fun 15 seconds after death. targets_to_fuck_up = target_list /obj/effect/bubblegum_trigger/proc/activate() diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm index 5fa10329ad20..383896ed99be 100644 --- a/code/modules/mining/lavaland/loot/hierophant_loot.dm +++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm @@ -52,7 +52,7 @@ if(world.time < timer) return - if(!is_mining_level(user.z) && !iswizard(user)) //Will only spawn a few sparks if not on mining z level, unless a wizard uses it. + if((!is_mining_level(user.z) && !iswizard(user)) || istype(get_area(user), /area/ruin/space/bubblegum_arena)) //Will only spawn a few sparks if not on mining z level, unless a wizard uses it. timer = world.time + cooldown_time user.visible_message("[user]'s hierophant club malfunctions!") do_sparks(5, FALSE, user) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 6e591cce4136..ada5b502a6ba 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -31,14 +31,14 @@ if(!machine) return - dat += text("Stacking unit console
") + dat += "Stacking unit console
" for(var/O in machine.stack_list) s = machine.stack_list[O] if(s.amount > 0) - dat += text("[capitalize(s.name)]: [s.amount] Release
") + dat += "[capitalize(s.name)]: [s.amount] Release
" - dat += text("
Stacking: [machine.stack_amt]
") + dat += "
Stacking: [machine.stack_amt]
" user << browse("[dat]", "window=console_stacking_machine") diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 19321fad7a7d..459ceec08b2d 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -91,7 +91,7 @@ EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 200), EQUIPMENT("Space Cash", /obj/item/stack/spacecash/c200, 2000), EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100), - EQUIPMENT("HRD-MDE Project Box", /obj/item/storage/box/hardmode_box, 5000) //I want miners have to pay a lot to get this, but be set once they do. + EQUIPMENT("HRD-MDE Project Box", /obj/item/storage/box/hardmode_box, 3500) //I want miners have to pay a lot to get this, but be set once they do. ) prize_list["Extra"] = list() // Used in child vendors @@ -342,8 +342,8 @@ EQUIPMENT("Medical Marijuana", /obj/item/storage/fancy/cigarettes/cigpack_med, 250), EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), EQUIPMENT("Box of matches", /obj/item/storage/box/matches, 50), - EQUIPMENT("Cheeseburger", /obj/item/reagent_containers/food/snacks/cheeseburger, 150), - EQUIPMENT("Big Burger", /obj/item/reagent_containers/food/snacks/bigbiteburger, 250), + EQUIPMENT("Cheeseburger", /obj/item/reagent_containers/food/snacks/burger/cheese, 150), + EQUIPMENT("Big Burger", /obj/item/reagent_containers/food/snacks/burger/bigbite, 250), EQUIPMENT("Recycled Prisoner", /obj/item/reagent_containers/food/snacks/soylentgreen, 500), EQUIPMENT("Crayons", /obj/item/storage/fancy/crayons, 350), EQUIPMENT("Plushie", /obj/random/plushie, 750), diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 47a0b2a305b3..4a199cd11b35 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -99,6 +99,7 @@ singular_name = "sand pile" points = 1 refined_type = /obj/item/stack/sheet/glass + merge_type = /obj/item/stack/ore/glass materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) GLOBAL_LIST_INIT(sand_recipes, list(\ diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 55b64734c0b0..ed12dc875af8 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -39,7 +39,7 @@ show_contents(user) /obj/structure/ore_box/proc/show_contents(mob/user) - var/dat = text("The contents of the ore box reveal...
") + var/dat = "The contents of the ore box reveal...
" var/list/assembled = list() for(var/obj/item/stack/ore/O in src) assembled[O.type] += O.amount @@ -47,7 +47,7 @@ var/obj/item/stack/ore/O = type dat += "[initial(O.name)] - [assembled[type]]
" - dat += text("
Empty box") + dat += "
Empty box" var/datum/browser/popup = new(user, "orebox", name, 400, 400) popup.set_content(dat) popup.open(0) diff --git a/code/modules/mob/camera/camera_mob.dm b/code/modules/mob/camera/camera_mob.dm index e7497e58920d..f9ec7ef37d6f 100644 --- a/code/modules/mob/camera/camera_mob.dm +++ b/code/modules/mob/camera/camera_mob.dm @@ -11,6 +11,7 @@ invisibility = 101 // No one can see us sight = SEE_SELF move_on_shuttle = FALSE + flags_2 = IMMUNE_TO_SHUTTLECRUSH_2 /mob/camera/experience_pressure_difference() return diff --git a/code/modules/mob/dead/dead_death.dm b/code/modules/mob/dead/dead_death.dm index c4cedcbdaf15..e9b6eecdc30c 100644 --- a/code/modules/mob/dead/dead_death.dm +++ b/code/modules/mob/dead/dead_death.dm @@ -6,3 +6,4 @@ /mob/dead move_resist = INFINITY + flags_2 = IMMUNE_TO_SHUTTLECRUSH_2 diff --git a/code/modules/mob/dead/observer/observer_base.dm b/code/modules/mob/dead/observer/observer_base.dm index 81efa5c8c9c1..05bc4dbfec70 100644 --- a/code/modules/mob/dead/observer/observer_base.dm +++ b/code/modules/mob/dead/observer/observer_base.dm @@ -32,6 +32,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) var/list/data_hud_seen = list() var/ghost_orbit = GHOST_ORBIT_CIRCLE var/health_scan = FALSE //does the ghost have health scanner mode on? by default it should be off + ///toggle for ghost gas analyzer + var/gas_analyzer = FALSE var/datum/orbit_menu/orbit_menu /mob/dead/observer/New(mob/body=null, flags=1) @@ -528,6 +530,18 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, "Health scan enabled.") health_scan = TRUE +/mob/dead/observer/verb/toggle_gas_anaylzer() + set name = "Toggle Gas Analyzer" + set desc = "Toggles wether you can anaylze gas contents on click" + set category = "Ghost" + + if(gas_analyzer) + to_chat(src, "Gas Analyzer disabled.") + gas_analyzer = FALSE + else + to_chat(src, "Gas Analyzer enabled. Click on a pipe to analyze.") + gas_analyzer = TRUE + /mob/dead/observer/verb/analyze_air() set name = "Analyze Air" set category = "Ghost" diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index dbef1fd335eb..31240725f069 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -21,7 +21,7 @@ //This is fine right now, if we're adding organ specific damage this needs to be updated /mob/living/carbon/alien/humanoid/Initialize(mapload) if(name == "alien") - name = text("alien ([rand(1, 1000)])") + name = "alien ([rand(1, 1000)])" real_name = name add_language("Xenomorph") add_language("Hivemind") diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index b2d121be6267..d83f4de7f2c9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1347,3 +1347,8 @@ so that different stomachs can handle things in different ways VB*/ if(wear_suit.flags_inv & HIDEGLOVES) clean_hands = FALSE ..(clean_hands, clean_mask, clean_feet) + +/mob/living/carbon/fall_and_crush(turf/target_turf, crush_damage, should_crit, crit_damage_factor, datum/tilt_crit/forced_crit, weaken_time, knockdown_time, ignore_gravity, should_rotate = TRUE, angle) + // keep most of what's passed in, but don't change the angle + . = ..(target_turf, crush_damage, should_crit, crit_damage_factor, forced_crit, weaken_time, knockdown_time, should_rotate = FALSE, rightable = FALSE) + KnockDown(10 SECONDS) diff --git a/code/modules/mob/living/carbon/carbon_emote.dm b/code/modules/mob/living/carbon/carbon_emote.dm index 7e67aad5c264..3fcba428c13d 100644 --- a/code/modules/mob/living/carbon/carbon_emote.dm +++ b/code/modules/mob/living/carbon/carbon_emote.dm @@ -163,20 +163,28 @@ message = "twirls something around in their hand." hands_use_check = TRUE -/datum/emote/living/carbon/twirl/can_run_emote(mob/living/user, status_check, intentional) - . = ..() - if(!.) - return +/datum/emote/living/carbon/twirl/run_emote(mob/user, params, type_override, intentional) - if(user.l_hand || user.r_hand) + if(!(user.get_active_hand() || user.get_inactive_hand())) + to_chat(user, "You need something in your hand to use this emote!") return TRUE - to_chat(user, "You need something in your hand to use this emote!") - return FALSE - -/datum/emote/living/carbon/twirl/run_emote(mob/user, params, type_override, intentional) + var/obj/item/thing + + if(user.get_active_hand()) + thing = user.get_active_hand() + else + thing = user.get_inactive_hand() + + if(istype(thing, /obj/item/grab)) + var/obj/item/grab/grabbed = thing + message = "twirls [grabbed.affecting.name] around!" + grabbed.affecting.emote("spin") + else if(!(thing.flags & ABSTRACT)) + message = "twirls [thing] around in their hand!" + else + to_chat(user, "You cannot twirl [thing]!") + return TRUE - var/obj/item/thing = user.l_hand || user.r_hand - message = "twirls [thing] around in their hand!" . = ..() message = initial(message) diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index f9991c2e7145..f6dcb76dd2db 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -247,7 +247,10 @@ msg += "[p_they(TRUE)] look[p_s()] absolutely soaked.\n" if(nutrition < NUTRITION_LEVEL_HYPOGLYCEMIA) - msg += "[p_they(TRUE)] [p_are()] severely malnourished.\n" + if(ismachineperson(src)) + msg += "[p_their(TRUE)] power indicator is flashing red.\n" + else + msg += "[p_they(TRUE)] [p_are()] severely malnourished.\n" if(HAS_TRAIT(src, TRAIT_FAT)) msg += "[p_they(TRUE)] [p_are()] morbidly obese.\n" diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index f70deb5ab420..74113625e2ea 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -21,6 +21,10 @@ var/lip_color = "white" var/age = 30 //Player's age (pure fluff) + /// Players' height (more fluff) + var/height = "average height" + /// Players physique (even MORE fluff) + var/physique = "average" var/underwear = "Nude" //Which underwear the player wants var/undershirt = "Nude" //Which undershirt the player wants @@ -29,10 +33,10 @@ //Equipment slots var/obj/item/clothing/under/w_uniform = null - var/obj/item/shoes = null + var/obj/item/clothing/shoes = null var/obj/item/belt = null - var/obj/item/gloves = null - var/obj/item/glasses = null + var/obj/item/clothing/gloves = null + var/obj/item/clothing/glasses = null var/obj/item/l_ear = null var/obj/item/r_ear = null var/obj/item/wear_id = null diff --git a/code/modules/mob/living/carbon/human/human_examine.dm b/code/modules/mob/living/carbon/human/human_examine.dm index 508c33a00c34..e6ff0fde85ba 100644 --- a/code/modules/mob/living/carbon/human/human_examine.dm +++ b/code/modules/mob/living/carbon/human/human_examine.dm @@ -54,18 +54,11 @@ break if(skip_jumpsuit && skip_face || HAS_TRAIT(src, TRAIT_NOEXAMINE)) //either obscured or on the nospecies list msg += "!" //omit the species when examining - else if(displayed_species == "Slime People") //snowflakey because Slime People are defined as a plural - msg += ", a slime person!" else - // do all this extra stuff because byond's text macros get confused by whatever comes between the species name and the article, - // so we can't just do \a - var/article_override = dna?.species.article_override - var/article = article_override - if(!article_override) - article = starts_with_vowel(displayed_species) ? "an" : "a" - - msg += ", [article] [lowertext(displayed_species)]!" - + var/species_name = lowertext(displayed_species) + if(displayed_species == "Slime People") //snowflakey because Slime People are defined as a plural + species_name = "slime person" + msg += ", \a [height] [species_name] with \a [physique] physique!" return msg /mob/living/carbon/human/examine_start_damage_block(skip_gloves = FALSE, skip_suit_storage = FALSE, skip_jumpsuit = FALSE, skip_shoes = FALSE, skip_mask = FALSE, skip_ears = FALSE, skip_eyes = FALSE, skip_face = FALSE) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 32441badbd12..4a4a36d0d392 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -325,8 +325,8 @@ if(HAS_TRAIT(H, TRAIT_FAT)) . += (1.5 - flight) - if(H.bodytemperature < H.dna.species.cold_level_1 && !(HAS_TRAIT(H, TRAIT_RESISTCOLD))) - . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR + if(H.bodytemperature < H.dna.species.cold_level_1 && !HAS_TRAIT(H, TRAIT_RESISTCOLD)) + . += (H.dna.species.cold_level_1 - H.bodytemperature) / COLD_SLOWDOWN_FACTOR var/leftover = . . = round_down(. * SLOWDOWN_MULTIPLIER) / SLOWDOWN_MULTIPLIER //This allows us to round in values of 0.5 A slowdown of 0.55 becomes 1.10, which is rounded to 1, then reduced to 0.5 diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index 6f75c43a8012..aa4d306a9add 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -127,6 +127,28 @@ H.update_hair() H.update_fhair() +/datum/species/machine/handle_life(mob/living/carbon/human/H) // Handles IPC starvation + if(isLivingSSD(H)) // We don't want AFK people dying from this + return + if(H.nutrition >= NUTRITION_LEVEL_HYPOGLYCEMIA) + return + + var/obj/item/organ/internal/cell/microbattery = H.get_organ_slot("heart") + if(!istype(microbattery)) //Maybe they're powered by an abductor gland or sheer force of will + return + if(prob(6)) + to_chat(H, "Error 74: Microbattery critical malfunction, likely cause: Extended strain.") + microbattery.receive_damage(4, TRUE) + else if(prob(4)) + H.Weaken(6 SECONDS) + H.Stuttering(20 SECONDS) + to_chat(H, "Power critical, shutting down superfluous functions.") + H.emote("collapse") + microbattery.receive_damage(2, TRUE) + else if(prob(4)) + to_chat(H, "Redirecting excess power from servos to vital components.") + H.Slowed(rand(15 SECONDS, 32 SECONDS)) + // Allows IPC's to change their monitor display /datum/action/innate/change_monitor name = "Change Monitor" diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index 3fa20d25a33e..ba0c7a9942a9 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -8,7 +8,6 @@ var/desc var/class var/list/default_spells = list() - var/activated = FALSE //for wishgranters to not give an option if someone already has it. /datum/superheroes/proc/create(mob/living/carbon/human/H) assign_mutations(H) diff --git a/code/modules/mob/living/silicon/ai/ai_mob.dm b/code/modules/mob/living/silicon/ai/ai_mob.dm index ae0fcb3f72bd..7394e6cd6ad2 100644 --- a/code/modules/mob/living/silicon/ai/ai_mob.dm +++ b/code/modules/mob/living/silicon/ai/ai_mob.dm @@ -104,6 +104,9 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( var/acceleration = 1 var/tracking = FALSE //this is 1 if the AI is currently tracking somebody, but the track has not yet been completed. + /// If true, this AI core can use the teleporter. + var/allow_teleporter = FALSE + var/obj/machinery/camera/portable/builtInCamera var/obj/structure/AIcore/deactivated/linked_core //For exosuit control @@ -268,7 +271,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( ..() if(statpanel("Status")) if(stat) - stat(null, text("Systems nonfunctional")) + stat(null, "Systems nonfunctional") return show_borg_info() @@ -279,7 +282,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( for(var/cat in temp_alarm_list) if(!(cat in alarms_listend_for)) continue - dat += text("[]
\n", cat) + dat += "[cat]
\n" var/list/list/L = temp_alarm_list[cat].Copy() for(var/alarm in L) var/list/list/alm = L[alarm].Copy() @@ -297,12 +300,12 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( for(var/cam in C) var/obj/machinery/camera/I = locateUID(cam) if(!QDELETED(I)) - dat2 += text("[][]", (dat2 == "") ? "" : " | ", I.c_tag) - dat += text("-- [] ([])", area_name, (dat2 != "") ? dat2 : "No Camera") + dat2 += "[(dat2 == "") ? "" : " | "][I.c_tag]" + dat += "-- [area_name] ([(dat2 != "") ? dat2 : "No Camera"])" else - dat += text("-- [] (No Camera)", area_name) + dat += "-- [area_name] (No Camera)" if(sources.len > 1) - dat += text("- [] sources", sources.len) + dat += "- [length(sources)] sources" dat += "
\n" if(!L.len) dat += "-- All Systems Nominal
\n" @@ -313,7 +316,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( src << browse(dat_text, "window=aialerts&can_close=0") /mob/living/silicon/ai/proc/show_borg_info() - stat(null, text("Connected cyborgs: [connected_robots.len]")) + stat(null, "Connected cyborgs: [connected_robots.len]") for(var/thing in connected_robots) var/mob/living/silicon/robot/R = thing var/robot_status = "Nominal" @@ -324,8 +327,8 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( // Name, Health, Battery, Module, Area, and Status! Everything an AI wants to know about its borgies! var/area/A = get_area(R) var/area_name = A ? sanitize(A.name) : "Unknown" - stat(null, text("[R.name] | S.Integrity: [R.health]% | Cell: [R.cell ? "[R.cell.charge] / [R.cell.maxcharge]" : "Empty"] | \ - Module: [R.designation] | Loc: [area_name] | Status: [robot_status]")) + stat(null, "[R.name] | S.Integrity: [R.health]% | Cell: [R.cell ? "[R.cell.charge] / [R.cell.maxcharge]" : "Empty"] | \ + Module: [R.designation] | Loc: [area_name] | Status: [robot_status]") /mob/living/silicon/ai/rename_character(oldname, newname) if(!..(oldname, newname)) @@ -684,7 +687,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( if(href_list["mach_close"]) if(href_list["mach_close"] == "aialerts") viewalerts = FALSE - var/t1 = text("window=[]", href_list["mach_close"]) + var/t1 = "window=[href_list["mach_close"]]" unset_machine() src << browse(null, t1) if(href_list["switchcamera"]) @@ -864,7 +867,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( for(var/thing in O) var/obj/machinery/camera/I = locateUID(thing) if(!QDELETED(I)) - dat2 += text("[][]", (!foo) ? "" : " | ", I.c_tag) //I'm not fixing this shit... + dat2 += "[(!foo) ? "" : " | "][I.c_tag]" //I'm not fixing this shit... foo = 1 queueAlarm(text ("--- [] alarm detected in []! ([])", class, A.name, dat2), class) else @@ -1518,4 +1521,11 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( stored_locations[location_number] = eyeobj.loc return TRUE +/mob/living/silicon/ai/ghostize(can_reenter_corpse) + var/old_turf = get_turf(eyeobj) + . = ..() + if(isobserver(.)) + var/mob/dead/observer/ghost = . + ghost.forceMove(old_turf) + #undef TEXT_ANNOUNCEMENT_COOLDOWN diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index 0824a740a646..e198fc92b476 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -33,6 +33,7 @@ GLOBAL_LIST_EMPTY(empty_playable_ai_cores) continue O.on_target_cryo() + view_core() // Ghost the current player and disallow them to return to the body if(TOO_EARLY_TO_GHOST) ghostize(FALSE) diff --git a/code/modules/mob/living/silicon/robot/misc_robot_items.dm b/code/modules/mob/living/silicon/robot/misc_robot_items.dm index 5a82df5749f3..aae4bbfed089 100644 --- a/code/modules/mob/living/silicon/robot/misc_robot_items.dm +++ b/code/modules/mob/living/silicon/robot/misc_robot_items.dm @@ -38,7 +38,7 @@ n_name = copytext(n_name, 1, 32) if(( get_dist(user,paper) <= 1 && user.stat == 0)) - paper.name = "paper[(n_name ? text("- '[n_name]'") : null)]" + paper.name = "paper[(n_name ? "- '[n_name]'" : null)]" add_fingerprint(user) return diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm index 1dbe7d2adbee..d33d9678c7a5 100644 --- a/code/modules/mob/living/silicon/robot/robot_mob.dm +++ b/code/modules/mob/living/silicon/robot/robot_mob.dm @@ -621,7 +621,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( for(var/cat in temp_alarm_list) if(!(cat in alarms_listend_for)) continue - dat += text("[cat]
\n") + dat += "[cat]
\n" var/list/list/L = temp_alarm_list[cat].Copy() for(var/alarm in L) var/list/list/alm = L[alarm].Copy() @@ -633,7 +633,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( L -= alarm continue dat += "
\n" if(!L.len) dat += "-- All Systems Nominal
\n" @@ -675,9 +675,9 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( // this function displays the cyborgs current cell charge in the stat panel /mob/living/silicon/robot/proc/show_cell_power() if(cell) - stat(null, text("Charge Left: [cell.charge]/[cell.maxcharge]")) + stat(null, "Charge Left: [cell.charge]/[cell.maxcharge]") else - stat(null, text("No Cell Inserted!")) + stat(null, "No Cell Inserted!") /mob/living/silicon/robot/proc/show_gps_coords() if(locate(/obj/item/gps/cyborg) in module.modules) @@ -1122,7 +1122,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return 1 if(href_list["mach_close"]) - var/t1 = text("window=[href_list["mach_close"]]") + var/t1 = "window=[href_list["mach_close"]]" unset_machine() src << browse(null, t1) return 1 diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index bdbc065549cf..80cee6199cf8 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -19,7 +19,6 @@ window_name = "Automatic Station Floor Repairer v1.1" var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details. - var/targetdirection var/amount = 10 var/replacetiles = 0 var/eattiles = 0 @@ -34,7 +33,6 @@ var/toolbox_color = "" #define HULL_BREACH 1 - #define BRIDGE_MODE 2 #define FIX_TILE 3 #define AUTO_TILE 4 #define REPLACE_TILE 5 @@ -65,33 +63,65 @@ text_dehack = "You detect errors in [name] and reset [p_their()] programming." text_dehack_fail = "[name] is not responding to reset commands!" -/mob/living/simple_animal/bot/floorbot/get_controls(mob/user) - var/dat - dat += hack(user) - dat += showpai(user) - dat += "Floor Repairer Controls v1.1
" - dat += "Status: [on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" - dat += "Tiles left: [amount]
" - dat += "Behvaiour controls are [locked ? "locked" : "unlocked"]
" - if(!locked || issilicon(user) || user.can_admin_interact()) - dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
" - dat += "Replace floor tiles: [replacetiles ? "Yes" : "No"]
" - dat += "Finds tiles: [eattiles ? "Yes" : "No"]
" - dat += "Make pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
" - dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
" - dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
" - dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
" - dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" - var/bmode - if(targetdirection) - bmode = dir2text(targetdirection) - else - bmode = "disabled" - dat += "Bridge Mode : [bmode]
" - - return dat - +/mob/living/simple_animal/bot/floorbot/show_controls(mob/user) + ui_interact(user) + +/mob/living/simple_animal/bot/floorbot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "BotFloor", name, 500, 520) + ui.open() + +/mob/living/simple_animal/bot/floorbot/ui_data(mob/user) + var/list/data = ..() + data["hullplating"] = autotile + data["replace"] = replacetiles + data["eat"] = eattiles + data["make"] = maketiles + data["fixfloor"] = fixfloors + data["nag_empty"] = nag_on_empty + data["magnet"] = anchored + data["tiles_amount"] = amount + return data + +/mob/living/simple_animal/bot/floorbot/ui_act(action, params, datum/tgui/ui) + if(..()) + return + var/mob/user = ui.user + if(topic_denied(user)) + to_chat(user, "[src]'s interface is not responding!") + return + add_fingerprint(user) + . = TRUE + switch(action) + if("power") + if(on) + turn_off() + else + turn_on() + if("autopatrol") + auto_patrol = !auto_patrol + bot_reset() + if("hack") + handle_hacking(usr) + if("disableremote") + remote_disabled = !remote_disabled + if("autotile") + autotile = !autotile + if("replacetiles") + replacetiles = !replacetiles + if("eattiles") + eattiles = !eattiles + if("maketiles") + maketiles = !maketiles + if("nagonempty") + nag_on_empty = !nag_on_empty + if("fixfloors") + fixfloors = !fixfloors + if("anchored") + anchored = !anchored + if("ejectpai") + ejectpai() /mob/living/simple_animal/bot/floorbot/attackby(obj/item/W , mob/user, params) if(istype(W, /obj/item/stack/tile/plasteel)) @@ -116,41 +146,6 @@ if(user) to_chat(user, "[src] buzzes and beeps.") -/mob/living/simple_animal/bot/floorbot/Topic(href, href_list) - if(..()) - return 1 - - switch(href_list["operation"]) - if("replace") - replacetiles = !replacetiles - if("tiles") - eattiles = !eattiles - if("make") - maketiles = !maketiles - if("fix") - fixfloors = !fixfloors - if("autotile") - autotile = !autotile - if("emptynag") - nag_on_empty = !nag_on_empty - if("anchor") - anchored = !anchored - - if("bridgemode") - var/setdir = input("Select construction direction:") as null|anything in list("north","east","south","west","disable") - switch(setdir) - if("north") - targetdirection = 1 - if("south") - targetdirection = 2 - if("east") - targetdirection = 4 - if("west") - targetdirection = 8 - if("disable") - targetdirection = null - update_controls() - /mob/living/simple_animal/bot/floorbot/handle_automated_action() if(!..()) return @@ -176,16 +171,6 @@ //Normal scanning procedure. We have tiles loaded, are not emagged. if(!target && emagged < 2 && amount > 0) - if(targetdirection != null) //The bot is in bridge mode. - //Try to find a space tile immediately in our selected direction. - var/turf/T = get_step(src, targetdirection) - if(isspaceturf(T)) - target = T - - else //Find a space tile farther way! - target = scan(/turf/space) - process_type = BRIDGE_MODE - if(!target) process_type = HULL_BREACH //Ensures the floorbot does not try to "fix" space areas or shuttle docking zones. target = scan(/turf/space) @@ -279,10 +264,6 @@ if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space. result = scan_target anchored = TRUE //Prevent the floorbot being blown off-course while trying to reach a hull breach. - if(BRIDGE_MODE) //Only space turfs in our chosen direction are considered. - if(get_dir(src, scan_target) == targetdirection) - result = scan_target - anchored = TRUE if(REPLACE_TILE) F = scan_target if(istype(F, /turf/simulated/floor/plating)) //The floor must not already have a tile. @@ -301,8 +282,8 @@ /mob/living/simple_animal/bot/floorbot/proc/repair(turf/target_turf) if(isspaceturf(target_turf)) - //Must be a hull breach or in bridge mode to continue. - if(!is_hull_breach(target_turf) && !targetdirection) + //Must be a hull breach to continue. + if(!is_hull_breach(target_turf)) target = null return @@ -317,7 +298,7 @@ anchored = TRUE if(isspaceturf(target_turf)) //If we are fixing an area not part of pure space, it is - visible_message("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ") + visible_message("[src] begins to repair the hole.") mode = BOT_REPAIRING update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, PROC_REF(make_bridge_plating), target_turf), 5 SECONDS) @@ -343,13 +324,19 @@ target = null /mob/living/simple_animal/bot/floorbot/proc/make_bridge_plating(turf/target_turf) + var/turf/simulated/floor/F = target if(mode != BOT_REPAIRING) return - if(autotile) //Build the floor and include a tile. + if(replacetiles) + F.break_tile_to_plating() target_turf.ChangeTurf(/turf/simulated/floor/plasteel) - else //Build a hull plating without a floor tile. - target_turf.ChangeTurf(/turf/simulated/floor/plating) + else + if(autotile) //Build the floor and include a tile. + F.break_tile_to_plating() + target_turf.ChangeTurf(/turf/simulated/floor/plasteel) + else //Build a hull plating without a floor tile. + target_turf.ChangeTurf(/turf/simulated/floor/plating) mode = BOT_IDLE amount-- update_icon(UPDATE_ICON_STATE) diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 2bd5c295570e..aceb6fda38f6 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -69,22 +69,37 @@ text_dehack = "You reboot [name] and restore the sound control system." text_dehack_fail = "[name] refuses to accept your authority!" -/mob/living/simple_animal/bot/honkbot/get_controls(mob/user) - var/dat - dat += hack(user) - dat += showpai(user) - dat += text({" - Honkomatic Bike Horn Unit v1.0.7 controls
- Status: []
- Behaviour controls are [locked ? "locked" : "unlocked"]
- Maintenance panel is [open ? "opened" : "closed"]
"}, - - "[on ? "On" : "Off"]") - - if(!locked || issilicon(user) || user.can_admin_interact()) - dat += "Auto Patrol [auto_patrol ? "On" : "Off"]
" - - return dat +/mob/living/simple_animal/bot/honkbot/show_controls(mob/user) + ui_interact(user) + +/mob/living/simple_animal/bot/honkbot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "BotHonk", name, 500, 220) + ui.open() + +/mob/living/simple_animal/bot/honkbot/ui_act(action, params, datum/tgui/ui) + if(..()) + return + var/mob/user = ui.user + if(topic_denied(user)) + to_chat(user, "[src]'s interface is not responding!") + return + add_fingerprint(user) + . = TRUE + switch(action) + if("power") + if(on) + turn_off() + else + turn_on() + if("autopatrol") + auto_patrol = !auto_patrol + bot_reset() + if("hack") + handle_hacking(user) + if("disableremote") + remote_disabled = !remote_disabled /mob/living/simple_animal/bot/honkbot/proc/retaliate(mob/living/carbon/human/H) threatlevel = 6 diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index c68f94edb253..dab20fadc0e7 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -160,7 +160,7 @@ /mob/living/simple_animal/bot/medbot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "BotMed", name, 500, 500) + ui = new(user, src, ui_key, "BotMed", name, 500, 520) ui.open() /mob/living/simple_animal/bot/medbot/ui_data(mob/user) diff --git a/code/modules/mob/living/simple_animal/bot/syndicate_bots.dm b/code/modules/mob/living/simple_animal/bot/syndicate_bots.dm index f2346424179f..f5835de4d24d 100644 --- a/code/modules/mob/living/simple_animal/bot/syndicate_bots.dm +++ b/code/modules/mob/living/simple_animal/bot/syndicate_bots.dm @@ -162,7 +162,7 @@ wreck.name = "sentry bot wreckage" raise_alert("[src] destroyed.") - ..() + qdel(src) /mob/living/simple_animal/bot/ed209/syndicate/set_weapon() projectile = /obj/item/projectile/bullet/a40mm diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 04dba9f6134d..2707f7f988fd 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -198,6 +198,9 @@ /mob/living/simple_animal/hostile/construct/wraith/hostile //actually hostile, will move around, hit things AIStatus = AI_ON +/mob/living/simple_animal/hostile/construct/wraith/hostile/bubblegum //Used in bubblegum summoning. Needs MOB_SIZE_LARGE so crushers don't suffer + mob_size = MOB_SIZE_LARGE + /////////////////////////////Artificer///////////////////////// diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index d01d0c3ec8ee..cf27a9e6f600 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -176,6 +176,11 @@ gold_core_spawnable = NO_SPAWN unique_pet = TRUE +/mob/living/simple_animal/pet/cat/Var + name = "Var" + desc = "Maintenance Cat!" + gold_core_spawnable = NO_SPAWN + /mob/living/simple_animal/pet/cat/kitten name = "kitten" desc = "D'aaawwww" diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm index dd5db122407d..9798ece8d26d 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm @@ -3,6 +3,9 @@ */ //Mob defines. +#define GESTALT_ALERT "gestalt screen alert" +#define NYMPH_ALERT "nymph screen alert" + /mob/living/simple_animal/diona name = "diona nymph" icon = 'icons/mob/monkey.dmi' @@ -43,7 +46,6 @@ can_collar = TRUE a_intent = INTENT_HELP - var/gestalt_alert = "merged with gestalt" //used in adding and clearing alert var/evolve_donors = 5 //amount of blood donors needed before evolving var/awareness_donors = 3 //amount of blood donors needed for understand language var/nutrition_need = 500 //amount of nutrition needed before evolving @@ -105,7 +107,8 @@ if(isdiona(M)) to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.") to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") - throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist + throw_alert(GESTALT_ALERT, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist + M.throw_alert(NYMPH_ALERT, /obj/screen/alert/gestalt, new_master = src) forceMove(M) else if(isrobot(M)) M.visible_message("[M] playfully boops [src] on the head!", "You playfully boop [src] on the head!") @@ -138,7 +141,8 @@ M.status_flags |= PASSEMOTES to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") forceMove(M) - throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist + throw_alert(GESTALT_ALERT, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist + M.throw_alert(NYMPH_ALERT, /obj/screen/alert/gestalt, new_master = src) return TRUE else return FALSE @@ -160,8 +164,9 @@ hasMobs = TRUE if(!hasMobs) D.status_flags &= ~PASSEMOTES + D.clear_alert(NYMPH_ALERT) - clear_alert(gestalt_alert) + clear_alert(GESTALT_ALERT) return TRUE /mob/living/simple_animal/diona/proc/evolve() @@ -280,3 +285,6 @@ if(!jobban_isbanned(user, ROLE_NYMPH)) return TRUE return FALSE + +#undef GESTALT_ALERT +#undef NYMPH_ALERT diff --git a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm index 80d97421099f..b10cd9c761de 100644 --- a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm +++ b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm @@ -27,13 +27,3 @@ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 5 pass_flags = PASSTABLE - -/mob/living/simple_animal/hostile/feral_cat/forsaken - name = "forsaken cat" - desc = "This cat is waiting for its owner, it hisses at you..." - speak = list("Meow!", "Esp!", "HSSSSS") - maxHealth = 30 - health = 25 - melee_damage_lower = 15 - melee_damage_upper = 10 - gold_core_spawnable = NO_SPAWN diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index fe55c7f6b1e2..903fec945d90 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -176,7 +176,7 @@ Difficulty: Medium changeNext_move(CLICK_CD_MELEE) miner_saw.melee_attack_chain(src, target) if(guidance) - adjustHealth(enraged ? -10 : -2) + adjustHealth(enraged ? -6 : -2) if(prob(50)) transform_weapon() //Still follows the normal rules for cooldown between swaps. return TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 8a3d90563ffa..bf87953eec06 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -1,6 +1,7 @@ #define BUBBLEGUM_SMASH (health <= maxHealth * 0.5 || second_life) // angery #define BUBBLEGUM_CAN_ENRAGE (enrage_till + (enrage_time * 2) <= world.time) #define BUBBLEGUM_IS_ENRAGED (enrage_till > world.time) +#define MAXIMUM_ENRAGED_HEALING 500 /* @@ -61,6 +62,10 @@ Difficulty: Hard var/revving_charge = FALSE /// Is it on its enraged exclusive second life? var/second_life = FALSE + /// Does it have a portal to the funny second life arena created? + var/obj/effect/portal/redspace/second_life_portal + /// Enraged healing recived + var/enraged_healing = 0 internal_gps = /obj/item/gps/internal/bubblegum medal_type = BOSS_MEDAL_BUBBLEGUM score_type = BUBBLEGUM_SCORE @@ -140,6 +145,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/death(gibbed) + qdel(second_life_portal) if(enraged && !second_life) var/obj/structure/closet/crate/necropolis/bubblegum/bait/jebait = new /obj/structure/closet/crate/necropolis/bubblegum/bait(get_turf(src)) var/obj/effect/bubblegum_trigger/great_chest_ahead = new /obj/effect/bubblegum_trigger(jebait, ListTargets()) @@ -149,7 +155,7 @@ Difficulty: Hard var/area/A = get_area(src) for(var/mob/M in A) to_chat(M, "YOU FUCK... I... I'll... get you later. Enjoy the last few days of your life...") - new /obj/effect/bubblegum_exit(get_turf(src)) + new /obj/effect/bubblegum_exit(get_turf(src)) return ..() /mob/living/simple_animal/hostile/megafauna/bubblegum/OpenFire(atom/A) @@ -376,12 +382,12 @@ Difficulty: Hard if(T in range(2, target)) continue turfs += T - var/amount = enraged ? 4 : 3 + var/amount = second_life ? 4 : 3 while(constructs < amount && length(turfs)) var/turf/spot = pick_n_take(turfs) if(!spot) return - var/mob/living/simple_animal/hostile/construct/wraith/hostile/summon = new /mob/living/simple_animal/hostile/construct/wraith/hostile(spot) + var/mob/living/simple_animal/hostile/construct/wraith/hostile/bubblegum/summon = new /mob/living/simple_animal/hostile/construct/wraith/hostile/bubblegum(spot) summon.faction = faction.Copy() constructs++ @@ -407,7 +413,7 @@ Difficulty: Hard if(!BUBBLEGUM_CAN_ENRAGE) return FALSE enrage_till = world.time + enrage_time - if(enraged) + if(enraged && (enraged_healing < MAXIMUM_ENRAGED_HEALING) && !second_life) adjustHealth(-75) update_approach() change_move_delay(enraged ? 3 : 4) //3 if enraged, 4 otherwise @@ -642,7 +648,17 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/round_2/Initialize(mapload) . = ..() + for(var/obj/effect/landmark/spawner/bubblegum_exit/E in GLOB.landmarks_list) + second_life_portal = new /obj/effect/portal/redspace(get_turf(E), get_turf(src), null, 2 HOURS, src, FALSE) + break RegisterSignal(src, COMSIG_HOSTILE_FOUND_TARGET, PROC_REF(i_see_you)) for(var/mob/living/carbon/human/H in range(20)) - to_chat(H, "I WILL END YOU HERE AND NOW!") + to_chat(H, "MY HANDS WILL RELISH ENDING YOU... HERE AND NOW!") FindTarget(list(H), 1) + +/mob/living/simple_animal/hostile/megafauna/bubblegum/round_2/Life(seconds, times_fired) + . = ..() + if(!istype(get_area(src), /area/ruin/space/bubblegum_arena)) + for(var/obj/effect/landmark/spawner/bubblegum/B in GLOB.landmarks_list) + forceMove(get_turf(B)) + break diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index dc527b96fdf3..dc02055627a1 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -172,7 +172,7 @@ Difficulty: Very Hard dir_shots(GLOB.diagonals) SLEEP_CHECK_DEATH(rage) dir_shots(GLOB.cardinal) - if(telegraphing) + if(telegraphing && enraged) alternating_dir_shots(FALSE) /mob/living/simple_animal/hostile/megafauna/colossus/proc/select_spiral_attack() @@ -235,7 +235,7 @@ Difficulty: Very Hard ranged_cooldown = world.time + 20 if(do_sleep) telegraph(BLAST) - SLEEP_CHECK_DEATH(enraged ? 0.1 SECONDS : 1.5 SECONDS) + SLEEP_CHECK_DEATH(enraged ? 0.75 SECONDS : 1.5 SECONDS) var/turf/target_turf = get_turf(target) playsound(src, 'sound/magic/clockwork/invoke_general.ogg', 200, TRUE, 2) newtonian_move(get_dir(target_turf, src)) @@ -346,6 +346,8 @@ Difficulty: Very Hard . = ..() if(isturf(target) || isobj(target)) target.ex_act(2) + for(var/obj/machinery/light/L in range(2, src)) + L.break_light_tube(0, 1) //No leaving lights floating their as colossus breaks the station if(isliving(target)) var/mob/living/L = target if(L.stat == DEAD) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 68d3e7b8cffa..13f26c9e8dad 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -238,7 +238,7 @@ Difficulty: Medium move_to_delay = move_to_delay / 2 light_range = 10 SLEEP_CHECK_DEATH(10) // run. - mass_fire(20, 15, 3) + mass_fire(12, 15, 3) move_to_delay = initial(move_to_delay) remove_atom_colour(TEMPORARY_COLOUR_PRIORITY) light_range = initial(light_range) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 75a4d1cc5e91..e64b128c8126 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -69,13 +69,14 @@ Difficulty: Medium legiontwo.crusher_loot = list(/datum/nothing) legiontwo.health = 1250 legiontwo.maxHealth = 1250 + legiontwo.enraged = TRUE /mob/living/simple_animal/hostile/megafauna/legion/unrage() . = ..() for(var/mob/living/simple_animal/hostile/megafauna/legion/other in GLOB.mob_list) if(other != src) - other.loot = initial(loot) - other.crusher_loot = initial(crusher_loot) + other.loot = list(/obj/item/storm_staff) //Initial does not work with lists. + other.crusher_loot = list(/obj/item/storm_staff, /obj/item/crusher_trophy/empowered_legion_skull) other.maxHealth = 2500 other.health = 2500 qdel(src) //Suprise, it's the one on lavaland that regrows to full. @@ -83,8 +84,8 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/legion/death(gibbed) for(var/mob/living/simple_animal/hostile/megafauna/legion/other in GLOB.mob_list) if(other != src) - other.loot = initial(loot) - other.crusher_loot = initial(crusher_loot) + other.loot = list(/obj/item/storm_staff) //Initial does not work with lists. + other.crusher_loot = list(/obj/item/storm_staff, /obj/item/crusher_trophy/empowered_legion_skull) . = ..() /mob/living/simple_animal/hostile/megafauna/legion/AttackingTarget() @@ -171,6 +172,9 @@ Difficulty: Medium if(ismineralturf(t)) var/turf/simulated/mineral/M = t M.gets_drilled(src) + if(iswallturf(t)) + var/turf/simulated/wall/W = t + W.thermitemelt(speed = 1 SECONDS) //Melt that shit DOWN for(var/mob/living/M in t) if(faction_check(M.faction, faction, FALSE)) continue @@ -203,7 +207,13 @@ Difficulty: Medium A = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/advanced(loc) else A = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion(loc) - A.GiveTarget(target) + if(!enraged || prob(33)) + A.GiveTarget(target) + else + for(var/mob/living/carbon/human/H in range(7, src)) + if(H.stat == DEAD) + A.GiveTarget(H) + break A.friends = friends A.faction = faction diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index a5191c114e06..ca80b57a3ffe 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -210,7 +210,7 @@ /mob/proc/findname(msg) for(var/mob/M in GLOB.mob_list) - if(M.real_name == text("[]", msg)) + if(M.real_name == "[msg]") return M return 0 @@ -899,7 +899,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ /mob/Topic(href, href_list) if(href_list["mach_close"]) - var/t1 = text("window=[href_list["mach_close"]]") + var/t1 = "window=[href_list["mach_close"]]" unset_machine() src << browse(null, t1) @@ -924,7 +924,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ usr << browse(null,"window=mob\ref[src]") if(href_list["flavor_more"]) - usr << browse(text("
")), text("window=[];size=500x200", name)) + usr << browse(text("
")), "window=[name];size=500x200") onclose(usr, "[name]") if(href_list["flavor_change"]) update_flavor_text() diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm index c589289d0781..aa5ca486edf5 100644 --- a/code/modules/mob/mob_misc_procs.dm +++ b/code/modules/mob/mob_misc_procs.dm @@ -247,9 +247,9 @@ p = 1 while(p <= n) if((copytext_char(te, p, p + 1) == " " || prob(pr))) // SS220 EDIT - ORIGINAL: copytext - t = text("[][]", t, copytext_char(te, p, p + 1)) // SS220 EDIT - ORIGINAL: copytext + t = "[t][copytext_char(te, p, p + 1)]" // SS220 EDIT - ORIGINAL: copytext else - t = text("[]*", t) + t = "[t]*" p++ return t diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 269d71e68b4d..bf9c6d79a422 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -68,6 +68,7 @@ /obj/item/mod/module/flashlight, /obj/item/mod/module/t_ray, /obj/item/mod/module/magboot, + /obj/item/mod/module/firefighting_tank, ) default_pins = list( /obj/item/mod/module/magboot, @@ -333,7 +334,7 @@ /obj/item/mod/control/pre_equipped/responsory/janitor insignia_type = /obj/item/mod/module/insignia/janitor - additional_module = /obj/item/mod/module/clamp + additional_module = list(/obj/item/mod/module/clamp, /obj/item/mod/module/boot_heating) /obj/item/mod/control/pre_equipped/responsory/clown insignia_type = /obj/item/mod/module/insignia/clown diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm index 87d079af7e9c..998b0ebc67a9 100644 --- a/code/modules/mod/modules/modules_engineering.dm +++ b/code/modules/mod/modules/modules_engineering.dm @@ -151,3 +151,113 @@ QDEL_NULL(chain) return ..() +/// Atmos water tank module + +/obj/item/mod/module/firefighting_tank + name = "MOD firefighting tank" + desc = "A refrigerated and pressurized module tank with an extinguisher nozzle, intended to fight fires. Swaps between extinguisher, nanofrost launcher, and metal foam dispenser for breaches. Nanofrost converts plasma in the air to nitrogen, but only if it is combusting at the time." + icon_state = "firefighting_tank" + module_type = MODULE_ACTIVE + complexity = 2 + active_power_cost = DEFAULT_CHARGE_DRAIN * 3 + device = /obj/item/extinguisher/mini/mod + +#define EXTINGUISHER 0 +#define NANOFROST 1 +#define METAL_FOAM 2 + +/obj/item/extinguisher/mini/mod + name = "modsuit extinguisher nozzle" + desc = "A heavy duty nozzle attached to a modsuit's internal tank." + icon = 'icons/obj/watertank.dmi' + icon_state = "atmos_nozzle_1" + item_state = "nozzleatmos" + safety = 0 + max_water = 500 + power = 8 + precision = 1 + cooling_power = 5 + w_class = WEIGHT_CLASS_HUGE + flags = NODROP // Necessary to ensure that the nozzle and tank never seperate + var/nozzle_mode = EXTINGUISHER + var/metal_synthesis_charge = 5 + COOLDOWN_DECLARE(nanofrost_cooldown) + +/obj/item/extinguisher/mini/mod/attack_self(mob/user) + switch(nozzle_mode) + if(EXTINGUISHER) + nozzle_mode = NANOFROST + to_chat(user, "Swapped to nanofrost launcher.") + if(NANOFROST) + nozzle_mode = METAL_FOAM + to_chat(user, "Swapped to metal foam synthesizer.") + if(METAL_FOAM) + nozzle_mode = EXTINGUISHER + to_chat(user, "Swapped to water extinguisher.") + update_icon(UPDATE_ICON_STATE) + +/obj/item/extinguisher/mini/mod/update_icon_state() + switch(nozzle_mode) + if(EXTINGUISHER) + icon_state = "atmos_nozzle_1" + if(NANOFROST) + icon_state = "atmos_nozzle_2" + if(METAL_FOAM) + icon_state = "atmos_nozzle_3" + +/obj/item/extinguisher/mini/mod/examine(mob/user) + . = ..() + switch(nozzle_mode) + if(EXTINGUISHER) + . += "[src] is currently set to extinguishing mode." + if(NANOFROST) + . += "[src] is currently set to nanofrost mode." + if(METAL_FOAM) + . += "[src] is currently set to metal foam mode." + +/obj/item/extinguisher/mini/mod/afterattack(atom/target, mob/user) + var/is_adjacent = user.Adjacent(target) + if(is_adjacent && AttemptRefill(target, user)) + return + switch(nozzle_mode) + if(EXTINGUISHER) + ..() + + if(NANOFROST) + if(reagents.total_volume < 100) + to_chat(user, "You need at least 100 units of water to use the nanofrost launcher!") + return + if(!COOLDOWN_FINISHED(src, nanofrost_cooldown)) + to_chat(user, "Nanofrost launcher is still recharging.") + return + COOLDOWN_START(src, nanofrost_cooldown, 10 SECONDS) + reagents.remove_any(100) + var/obj/effect/nanofrost_container/A = new /obj/effect/nanofrost_container(get_turf(src)) + log_game("[key_name(user)] used Nanofrost at [get_area(user)] ([user.x], [user.y], [user.z]).") + playsound(src, 'sound/items/syringeproj.ogg', 40, 1) + for(var/counter in 1 to 5) + step_towards(A, target) + sleep(2) + A.Smoke() + + if(METAL_FOAM) + if(!is_adjacent|| !isturf(target)) + return + if(metal_synthesis_charge <= 0) + to_chat(user, "Metal foam mix is still being synthesized.") + return + if(reagents.total_volume < 10) + to_chat(user, "You need at least 10 units of water to use the metal foam synthesizer!") + return + var/obj/effect/particle_effect/foam/F = new/obj/effect/particle_effect/foam(get_turf(target), 1) + F.amount = 0 + reagents.remove_any(10) + metal_synthesis_charge-- + addtimer(CALLBACK(src, PROC_REF(decrease_metal_charge)), 5 SECONDS) + +/obj/item/extinguisher/mini/mod/proc/decrease_metal_charge() + metal_synthesis_charge++ + +#undef EXTINGUISHER +#undef NANOFROST +#undef METAL_FOAM diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index d79223c6189f..0e97863a5324 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -303,7 +303,7 @@ incompatible_modules = list(/obj/item/mod/module/dispenser) cooldown_time = 5 SECONDS /// Path we dispense. - var/dispense_type = /obj/item/reagent_containers/food/snacks/cheeseburger + var/dispense_type = /obj/item/reagent_containers/food/snacks/burger/cheese /// Time it takes for us to dispense. var/dispense_time = 0 SECONDS diff --git a/code/modules/mod/modules/modules_service.dm b/code/modules/mod/modules/modules_service.dm index 3670a576da93..69720a0e3549 100644 --- a/code/modules/mod/modules/modules_service.dm +++ b/code/modules/mod/modules/modules_service.dm @@ -40,3 +40,25 @@ if(!deleting) qdel(mod.boots.GetComponent(/datum/component/squeak)) mod.wearer.RemoveElement(/datum/element/waddling) + +//Boot heating - dries floors like galoshes/dry +/obj/item/mod/module/boot_heating + name = "MOD boot heating module" + desc = "A MOD suit boot heating module. Heats the bottom of the boots to assist in drying wet floors as you clean. Only for the most well trained of janitorial staff." /// Kinda small comparied to the other descriptions, but its ERT only, so.. + icon_state = "regulator" + complexity = 1 + idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.2 + incompatible_modules = list(/obj/item/mod/module/boot_heating) + +/obj/item/mod/module/boot_heating/on_suit_activation() + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_step)) + +/obj/item/mod/module/boot_heating/on_suit_deactivation(deleting = FALSE) + UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED) + +/obj/item/mod/module/boot_heating/proc/on_step() + SIGNAL_HANDLER + + var/turf/simulated/t_loc = get_turf(src) + if(istype(t_loc) && t_loc.wet) + t_loc.MakeDry(TURF_WET_WATER) diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index e98e4ccdc01a..369aa2839e50 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -325,7 +325,8 @@ if(!keep_turfs) keep_turfs = typecacheof(list( /turf/simulated/floor/plating/lava, - /turf/simulated/floor/indestructible/hierophant + /turf/simulated/floor/indestructible/hierophant, + /turf/simulated/floor/indestructible/necropolis )) /obj/item/mod/module/ash_accretion/on_suit_activation() diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 409a0f48ddc4..3e36250e75b7 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -196,12 +196,12 @@ GLOBAL_LIST_EMPTY(fax_blacklist) var/n_name = sanitize(copytext_char(input(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name) as text, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext if((copyitem && copyitem.loc == src && usr.stat == 0)) if(istype(copyitem, /obj/item/paper)) - copyitem.name = "[(n_name ? text("[n_name]") : initial(copyitem.name))]" + copyitem.name = "[(n_name ? "[n_name]" : initial(copyitem.name))]" copyitem.desc = "This is a paper titled '" + copyitem.name + "'." else if(istype(copyitem, /obj/item/photo)) - copyitem.name = "[(n_name ? text("[n_name]") : "photo")]" + copyitem.name = "[(n_name ? "[n_name]" : "photo")]" else if(istype(copyitem, /obj/item/paper_bundle)) - copyitem.name = "[(n_name ? text("[n_name]") : "paper")]" + copyitem.name = "[(n_name ? "[n_name]" : "paper")]" else . = FALSE else diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 7e6f660f1d43..edf564241e73 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -211,7 +211,7 @@ var/n_name = sanitize(copytext_char(input(usr, "What would you like to label the bundle?", "Bundle Labelling", name) as text, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext if((loc == usr && usr.stat == 0)) - name = "[(n_name ? text("[n_name]") : "paper bundle")]" + name = "[(n_name ? "[n_name]" : "paper bundle")]" add_fingerprint(usr) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 444f485933ec..a63703d297e8 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -104,7 +104,7 @@ var/n_name = sanitize(copytext_char(input(usr, "What would you like to label the photo?", "Photo Labelling", name) as text, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext //loc.loc check is for making possible renaming photos in clipboards if(( (loc == usr || (loc.loc && loc.loc == usr)) && usr.stat == 0)) - name = "[(n_name ? text("[n_name]") : "photo")]" + name = "[(n_name ? "[n_name]" : "photo")]" add_fingerprint(usr) return diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index ca97f2073a54..4bd25a7e31c4 100644 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -37,12 +37,24 @@ GLOBAL_LIST_EMPTY(PDAs) var/detonate = TRUE // Can the PDA be blown up? var/ttone = "beep" //The ringtone! var/list/ttone_sound = list("beep" = 'sound/machines/twobeep.ogg', - "boom" = 'sound/effects/explosionfar.ogg', + "boop" = 'sound/machines/boop.ogg', + "electronic" = 'sound/machines/notif1.ogg', + "chime" = 'sound/machines/notif2.ogg', "slip" = 'sound/misc/slip.ogg', "honk" = 'sound/items/bikehorn.ogg', "SKREE" = 'sound/voice/shriek1.ogg', "holy" = 'sound/items/PDA/ambicha4-short.ogg', - "xeno" = 'sound/voice/hiss1.ogg') + "boom" = 'sound/effects/explosionfar.ogg', + "gavel" = 'sound/items/gavel.ogg', + "xeno" = 'sound/voice/hiss1.ogg', + "smoke" = 'sound/magic/smoke.ogg', + "shatter" = 'sound/effects/pylon_shatter.ogg', + "energy" = 'sound/weapons/egloves.ogg', + "flare" = 'sound/goonstation/misc/matchstick_light.ogg', + "interference" = 'sound/misc/interference.ogg', + "zap" = 'sound/effects/eleczap.ogg', + "disgusting" = 'sound/effects/blobattack.ogg', + "hungry" = 'sound/weapons/bite.ogg') var/list/programs = list( new/datum/data/pda/app/main_menu, diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm index 84a2b06c0e33..1470cb767519 100644 --- a/code/modules/pda/messenger.dm +++ b/code/modules/pda/messenger.dm @@ -236,7 +236,7 @@ var/name = P.owner if(name in names) namecounts[name]++ - name = text("[name] ([namecounts[name]])") + name = "[name] ([namecounts[name]])" else names.Add(name) namecounts[name] = 1 diff --git a/code/modules/power/engines/supermatter/supermatter.dm b/code/modules/power/engines/supermatter/supermatter.dm index f238a362110b..2f38058bba91 100644 --- a/code/modules/power/engines/supermatter/supermatter.dm +++ b/code/modules/power/engines/supermatter/supermatter.dm @@ -1197,6 +1197,9 @@ power += amount message_admins("[src] has been activated and given an increase EER of [amount] at [ADMIN_JMP(src)]") +/obj/machinery/atmospherics/supermatter_crystal/on_crush_thing(atom/thing) + Bumped(thing) + /obj/machinery/atmospherics/supermatter_crystal/proc/make_next_event_time() // Some completely random bullshit to make a "bell curve" var/fake_time = rand(5 MINUTES, 25 MINUTES) diff --git a/code/modules/power/engines/tesla/energy_ball.dm b/code/modules/power/engines/tesla/energy_ball.dm index c1475ea7c9e4..c7b5b8b2649c 100644 --- a/code/modules/power/engines/tesla/energy_ball.dm +++ b/code/modules/power/engines/tesla/energy_ball.dm @@ -2,10 +2,10 @@ #define TESLA_MINI_POWER 869130 //Zap constants, speeds up targeting #define COIL (ROD + 1) -#define ROD (APC + 1) -#define APC (RIDE + 1) +#define ROD (RIDE + 1) #define RIDE (LIVING + 1) -#define LIVING (MACHINERY + 1) +#define LIVING (APC + 1) +#define APC (MACHINERY + 1) #define MACHINERY (BLOB + 1) #define BLOB (STRUCTURE + 1) #define STRUCTURE (1) @@ -296,10 +296,6 @@ closest_type = ROD closest_atom = A - else if(istype(A, /obj/machinery/power/apc)) - closest_type = APC - closest_atom = A - else if(closest_type >= RIDE) continue @@ -318,6 +314,13 @@ closest_type = LIVING closest_atom = A + else if(closest_type >= APC) + continue + + else if(istype(A, /obj/machinery/power/apc)) + closest_type = APC + closest_atom = A + else if(closest_type >= MACHINERY) continue @@ -385,9 +388,9 @@ #undef COIL #undef ROD -#undef APC #undef RIDE #undef LIVING +#undef APC #undef MACHINERY #undef BLOB #undef STRUCTURE diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index 2b2b5ac60e87..94af166ade46 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -109,13 +109,16 @@ return /obj/item/gun/medbeam/proc/on_beam_tick(mob/living/target) - target.adjustBruteLoss(-4) - target.adjustFireLoss(-4) if(ishuman(target)) var/mob/living/carbon/human/H = target + H.adjustBruteLoss(-4, robotic = TRUE) + H.adjustFireLoss(-4, robotic = TRUE) for(var/obj/item/organ/external/E in H.bodyparts) if(prob(10)) E.mend_fracture() + else + target.adjustBruteLoss(-4) + target.adjustFireLoss(-4) /obj/item/gun/medbeam/proc/on_beam_release(mob/living/target) return diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index d73dc3720513..529720de9c23 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -240,7 +240,7 @@ //ARG Assault Rifle// /obj/item/gun/projectile/automatic/ar name = "\improper ARG" - desc = "A robust assault rifle used by Nanotrasen fighting forces." + desc = "A robust assault rifle used by Trans-Solar Federation forces." icon_state = "arg" item_state = "arg" slot_flags = 0 diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 01532fe16d21..7829480846ec 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -237,10 +237,6 @@ if(isrobot(user)) return - if(beaker) - to_chat(user, "Something is already loaded into the machine.") - return - if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks)) && user.a_intent != INTENT_HARM) if(panel_open) to_chat(user, "Close the maintenance panel first.") @@ -248,12 +244,18 @@ if(!user.drop_item()) to_chat(user, "[I] is stuck to you!") return - beaker = I I.forceMove(src) - to_chat(user, "You set [I] on the machine.") + if(beaker) + user.put_in_hands(beaker) + to_chat(user, "You swap [I] with [beaker].") + else + to_chat(user, "You set [I] on the machine.") + beaker = I + SStgui.update_uis(src) // update all UIs attached to src update_icon(UPDATE_ICON_STATE) return + return ..() /obj/machinery/chem_dispenser/crowbar_act(mob/user, obj/item/I) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 561c2c54a677..487a7b56a6a5 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -98,15 +98,16 @@ return TRUE if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/drinkingglass)) && user.a_intent != INTENT_HARM) - if(beaker) - to_chat(user, "A beaker is already loaded into the machine.") - return if(!user.drop_item()) to_chat(user, "[I] is stuck to you!") return - beaker = I I.forceMove(src) - to_chat(user, "You add the beaker to the machine!") + if(beaker) + user.put_in_hands(beaker) + to_chat(user, "You swap [I] with [beaker] inside.") + else + to_chat(user, "You add [I] to the machine.") + beaker = I SStgui.update_uis(src) update_icon() diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 3c87b83c73d0..e225788fb0f3 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -160,6 +160,7 @@ /obj/machinery/reagentgrinder/attackby(obj/item/I, mob/user, params) if(exchange_parts(user, I)) + SStgui.update_uis(src) return if((istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER)) && user.a_intent != INTENT_HARM) @@ -173,7 +174,7 @@ beaker = I beaker.loc = src update_icon(UPDATE_ICON_STATE) - updateUsrDialog() + SStgui.update_uis(src) return TRUE //no afterattack if(is_type_in_list(I, dried_items)) @@ -212,7 +213,7 @@ else to_chat(user, "You empty some of [B]'s contents into the All-In-One grinder.") - updateUsrDialog() + SStgui.update_uis(src) return TRUE if(!is_type_in_list(I, blend_items) && !is_type_in_list(I, juice_items)) @@ -225,7 +226,7 @@ if(user.drop_item()) I.loc = src holdingitems += I - src.updateUsrDialog() + SStgui.update_uis(src) return FALSE @@ -234,95 +235,117 @@ return FALSE /obj/machinery/reagentgrinder/attack_hand(mob/user) - user.set_machine(src) - interact(user) - -/obj/machinery/reagentgrinder/interact(mob/user) // The microwave Menu - var/is_chamber_empty = 0 - var/is_beaker_ready = 0 - var/processing_chamber = "" - var/beaker_contents = "" - var/dat = "" - - if(!operating) - for (var/obj/item/O in holdingitems) - processing_chamber += "\A [html_encode(O.name)]
" - - if(!processing_chamber) - is_chamber_empty = 1 - processing_chamber = "Nothing." - if(!beaker) - beaker_contents = "No beaker attached.
" + ui_interact(user) + +/obj/machinery/reagentgrinder/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "ReagentGrinder", name, 400, 500, master_ui, state) + ui.open() + +/obj/machinery/reagentgrinder/ui_data(mob/user) + var/list/data = list() + data["operating"] = operating + data["inactive"] = length(holdingitems) == 0 ? TRUE : FALSE + data["limit"] = limit + data["count"] = length(holdingitems) + data["beaker_loaded"] = beaker ? TRUE : FALSE + data["beaker_current_volume"] = beaker ? beaker.reagents.total_volume : null + data["beaker_max_volume"] = beaker ? beaker.reagents.maximum_volume : null + var/list/beakerContents = list() + if(beaker) + for(var/datum/reagent/R in beaker.reagents.reagent_list) + beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list... + data["beaker_contents"] = beakerContents + + + var/list/items_counts = list() + var/list/name_overrides = list() + for(var/obj/O in holdingitems) + var/display_name = O.name + if(istype(O, /obj/item/stack)) + var/obj/item/stack/S = O + if(!items_counts[display_name]) + items_counts[display_name] = 0 + if(S.singular_name) + name_overrides[display_name] = S.singular_name + else + name_overrides[display_name] = display_name + if(S.amount > 1) + name_overrides[display_name] = "[name_overrides[display_name]]s" //name_overrides[display_name] Will be set on the first time as the singular form + + items_counts[display_name] += S.amount + continue + + else if(istype(O, /obj/item/reagent_containers/food)) + var/obj/item/reagent_containers/food/food = O + if(!items_counts[display_name]) + if(food.ingredient_name) + name_overrides[display_name] = food.ingredient_name + else + name_overrides[display_name] = display_name + else + if(food.ingredient_name_plural) + name_overrides[display_name] = food.ingredient_name_plural + else if(items_counts[display_name] == 1) // Must only add "s" once or you get stuff like "eggsssss" + name_overrides[display_name] = "[name_overrides[display_name]]s" //name_overrides[display_name] Will be set on the first time as the singular form + + items_counts[display_name]++ + + data["contents"] = list() + for(var/item in items_counts) + var/N = items_counts[item] + var/units + if(!(item in name_overrides)) + units = "[lowertext(item)]" else - is_beaker_ready = 1 - beaker_contents = "The beaker contains:
" - var/anything = 0 - for(var/datum/reagent/R in beaker.reagents.reagent_list) - anything = 1 - beaker_contents += "[R.volume] - [R.name]
" - if(!anything) - beaker_contents += "Nothing
" - - - dat = {" - Processing chamber contains:
- [processing_chamber]
- [beaker_contents]
- "} - if(is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN))) - dat += "Grind the reagents
" - dat += "Juice the reagents
" - if(holdingitems && holdingitems.len > 0) - dat += "Eject the reagents
" - if(beaker) - dat += "Detach the beaker
" - else - dat += "Please wait..." + units = "[name_overrides[item]]" - var/datum/browser/popup = new(user, "reagentgrinder", "All-In-One Grinder") - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open(1) - return + var/list/data_pr = list( + "name" = capitalize(item), + "amount" = N, + "units" = units + ) -/obj/machinery/reagentgrinder/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - if(operating) - updateUsrDialog() + data["contents"] += list(data_pr) + return data + +/obj/machinery/reagentgrinder/ui_act(action, params, datum/tgui/ui) + . = ..() + if(.) return - switch(href_list["action"]) + + switch(action) + if("detach") + detach(ui.user) + if("eject") + eject(ui.user) if("grind") grind() if("juice") juice() - if("eject") - eject() - if("detach") - detach() -/obj/machinery/reagentgrinder/proc/detach() - if(usr.stat != 0) +/obj/machinery/reagentgrinder/proc/detach(mob/user) + if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) return if(!beaker) return - beaker.loc = src.loc + beaker.forceMove(loc) beaker = null update_icon(UPDATE_ICON_STATE) - updateUsrDialog() + SStgui.update_uis(src) -/obj/machinery/reagentgrinder/proc/eject() - if(usr.stat != 0) +/obj/machinery/reagentgrinder/proc/eject(mob/user) + if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) return if(holdingitems && holdingitems.len == 0) return for(var/obj/item/O in holdingitems) - O.loc = src.loc + O.forceMove(loc) holdingitems -= O holdingitems = list() - updateUsrDialog() + SStgui.update_uis(src) /obj/machinery/reagentgrinder/proc/is_allowed(obj/item/reagent_containers/O) for (var/i in blend_items) @@ -375,11 +398,11 @@ var/offset = prob(50) ? -2 : 2 animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking operating = TRUE - updateUsrDialog() + SStgui.update_uis(src) spawn(50) pixel_x = initial(pixel_x) //return to its spot after shaking operating = FALSE - updateUsrDialog() + SStgui.update_uis(src) //Snacks for (var/obj/item/reagent_containers/food/snacks/O in holdingitems) @@ -413,11 +436,11 @@ var/offset = prob(50) ? -2 : 2 animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking operating = TRUE - updateUsrDialog() + SStgui.update_uis(src) spawn(60) pixel_x = initial(pixel_x) //return to its spot after shaking operating = FALSE - updateUsrDialog() + SStgui.update_uis(src) //Snacks and Plants for (var/obj/item/reagent_containers/food/snacks/O in holdingitems) diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index ab0610de9daa..259512c15f67 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -360,7 +360,7 @@ /datum/reagent/medicine/omnizine/overdose_process(mob/living/M, severity) if(HAS_TRAIT(M, TRAIT_BADASS)) - return + return list(0, STATUS_UPDATE_NONE) var/list/overdose_info = ..() var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT] diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index 1298eafddad1..4c894c64f671 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -215,18 +215,21 @@ reagent_state = LIQUID color = "#757547" taste_description = "puke" + harmless = FALSE /datum/reagent/fishwater/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST) to_chat(M, "Oh god, why did you drink that?") /datum/reagent/fishwater/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE if(prob(30)) // Nasty, you drank this stuff? 30% chance of the fakevomit (non-stunning version) if(prob(50)) // 50/50 chance of green vomit vs normal vomit M.fakevomit(1) else M.fakevomit(0) - return ..() + update_flags |= M.adjustToxLoss(1 * REAGENTS_EFFECT_MULTIPLIER, FALSE) + return ..() | update_flags /datum/reagent/fishwater/toiletwater name = "Toilet Water" diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index da5947ebb191..088904034d0a 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -259,7 +259,7 @@ required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1) result_amount = 1 mix_message = "The mixture quickly turns into a pall of smoke!" - var/forbidden_reagents = list("sugar", "phosphorus", "potassium", "stimulants", "smoke_powder") //Do not transfer this stuff through smoke. + var/forbidden_reagents = list("sugar", "phosphorus", "potassium", "stimulants", "smoke_powder", "fishwater", "toiletwater") //Do not transfer this stuff through smoke. /datum/chemical_reaction/smoke/on_reaction(datum/reagents/holder, created_volume) for(var/f_reagent in forbidden_reagents) diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index 036d404635bc..2d5b1770f1eb 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -59,6 +59,38 @@ build_path = /obj/item/reagent_containers/food/snacks/monkeycube category = list("initial", "Food") +/datum/design/farwa_cube + name = "Farwa cube" + id = "fcube" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 250) + build_path = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube + category = list("initial", "Food") + +/datum/design/wolpin_cube + name = "Wolpin cube" + id = "wcube" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 250) + build_path = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube + category = list("initial", "Food") + +/datum/design/stok_cube + name = "Stok cube" + id = "scube" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 250) + build_path = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube + category = list("initial", "Food") + +/datum/design/neaera_cube + name = "Neaera cube" + id = "ncube" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 250) + build_path = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube + category = list("initial", "Food") + /datum/design/ez_nut name = "E-Z-Nutrient" id = "ez_nut" diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 592ec887c9f1..874e39ddc2b0 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -1129,6 +1129,16 @@ construction_time = 120 category = list("Cyborg Upgrade Modules") +/datum/design/borg_upgrade_syndie_soap + name = "Cyborg Upgrade (Syndicate Soap)" + id = "borg_upgrade_syndie_soap" + build_type = MECHFAB + build_path = /obj/item/borg/upgrade/syndie_soap + req_tech = list("syndicate" = 2) + materials = list(MAT_GOLD = 1250, MAT_PLASMA = 2500, MAT_SILVER = 1250) + construction_time = 120 + category = list("Cyborg Upgrade Modules") + /datum/design/borg_upgrade_rcd name = "Cyborg Upgrade (Rapid Construction Device)" id = "borg_upgrade_RCD" diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 5031b3b1828e..de285e9e76d0 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(message_servers) continue if(RC.newmessagepriority < priority) RC.newmessagepriority = priority - RC.icon_state = "req_comp[priority]" + RC.update_icon(UPDATE_OVERLAYS) switch(priority) if(2) if(!RC.silent) diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index aba7cf692614..d397f8ea3a31 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -91,7 +91,7 @@ /datum/outfit/job/centcom/response_team/commander/gamma name = "RT Commander (Gamma)" - shoes = /obj/item/clothing/shoes/magboots/advance + shoes = /obj/item/clothing/shoes/magboots/elite back = /obj/item/mod/control/pre_equipped/responsory/commander glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/sechailer/swat @@ -176,7 +176,7 @@ /datum/outfit/job/centcom/response_team/security/gamma name = "RT Security (Gamma)" - shoes = /obj/item/clothing/shoes/magboots/advance + shoes = /obj/item/clothing/shoes/magboots/elite belt = /obj/item/storage/belt/security/response_team_gamma back = /obj/item/mod/control/pre_equipped/responsory/security glasses = /obj/item/clothing/glasses/night @@ -277,7 +277,7 @@ /datum/outfit/job/centcom/response_team/engineer/gamma name = "RT Engineer (Gamma)" - shoes = /obj/item/clothing/shoes/magboots/advance + shoes = /obj/item/clothing/shoes/magboots/elite back = /obj/item/mod/control/pre_equipped/responsory/engineer glasses = /obj/item/clothing/glasses/meson/night mask = /obj/item/clothing/mask/gas/sechailer/swat @@ -373,7 +373,7 @@ /datum/outfit/job/centcom/response_team/medic/gamma name = "RT Medic (Gamma)" - shoes = /obj/item/clothing/shoes/magboots/advance + shoes = /obj/item/clothing/shoes/magboots/elite glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/sechailer/swat back = /obj/item/mod/control/pre_equipped/responsory/medic @@ -462,7 +462,7 @@ name = "RT Paranormal (Gamma)" l_pocket = /obj/item/grenade/clusterbuster/holy back = /obj/item/mod/control/pre_equipped/responsory/inquisitory/chaplain - shoes = /obj/item/clothing/shoes/magboots/advance + shoes = /obj/item/clothing/shoes/magboots/elite glasses = /obj/item/clothing/glasses/night r_pocket = /obj/item/nullrod/ert @@ -494,7 +494,7 @@ uniform = /obj/item/clothing/under/rank/centcom/ert/janitor back = /obj/item/storage/backpack/ert/janitor belt = /obj/item/storage/belt/janitor/full - shoes = /obj/item/clothing/shoes/galoshes + shoes = /obj/item/clothing/shoes/galoshes/dry l_ear = /obj/item/radio/headset/ert/alt id = /obj/item/card/id/ert/janitorial pda = /obj/item/pda/heads/ert/janitor @@ -502,8 +502,6 @@ backpack_contents = list( /obj/item/grenade/chem_grenade/antiweed = 2, - /obj/item/lightreplacer = 1, - /obj/item/storage/bag/trash = 1, /obj/item/push_broom, /obj/item/storage/box/lights/mixed = 1, /obj/item/melee/flyswatter = 1 @@ -514,22 +512,23 @@ suit = /obj/item/clothing/suit/armor/vest/ert/janitor head = /obj/item/clothing/head/helmet/ert/janitor glasses = /obj/item/clothing/glasses/sunglasses - r_pocket = /obj/item/flashlight + r_pocket = /obj/item/flashlight/seclite suit_store = /obj/item/gun/energy/disabler cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/advmop + /obj/item/organ/internal/cyberimp/arm/janitorial/advanced ) /datum/outfit/job/centcom/response_team/janitorial/red name = "RT Janitor (Red)" suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor glasses = /obj/item/clothing/glasses/hud/security/sunglasses + shoes = /obj/item/clothing/shoes/galoshes/dry/lightweight r_pocket = /obj/item/scythe/tele - suit_store = /obj/item/gun/energy/gun/mini + suit_store = /obj/item/gun/energy/gun cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/janitorial, + /obj/item/organ/internal/cyberimp/arm/janitorial/advanced, /obj/item/organ/internal/cyberimp/chest/nutriment/hardened ) @@ -543,21 +542,19 @@ glasses = /obj/item/clothing/glasses/night back = /obj/item/mod/control/pre_equipped/responsory/janitor r_pocket = /obj/item/scythe/tele - shoes = /obj/item/clothing/shoes/magboots/advance + shoes = /obj/item/clothing/shoes/magboots/elite backpack_contents = list( /obj/item/grenade/chem_grenade/antiweed = 2, /obj/item/grenade/clusterbuster/cleaner = 1, /obj/item/storage/box/lights/mixed = 1, - /obj/item/storage/bag/trash/bluespace = 1, - /obj/item/lightreplacer/bluespace = 1, - /obj/item/melee/flyswatter = 1, - /obj/item/gun/energy/gun = 1 + /obj/item/push_broom = 1, + /obj/item/gun/energy/gun/nuclear = 1 ) cybernetic_implants = list( /obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened, - /obj/item/organ/internal/cyberimp/arm/advmop, + /obj/item/organ/internal/cyberimp/arm/janitorial/advanced, /obj/item/organ/internal/cyberimp/brain/anti_stam/hardened ) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index dbabc7fced57..a7f036afaf97 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -62,7 +62,7 @@ to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") return 0 - var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") + var/choice = alert(user, "Would you like to (un)authorize a shortened launch time? [auth_need - length(authorized)] authorization\s are still needed. Use abort to cancel all authorizations.", "Shuttle Launch", "Authorize", "Repeal", "Abort") if(SSshuttle.emergency.mode != SHUTTLE_DOCKED || user.get_active_hand() != W) return 0 diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index b797d6d03e9f..98486775c955 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -991,8 +991,14 @@ if(T.icon != icon) T.icon = icon if(color) - T.atom_colours = atom_colours.Copy() - T.update_atom_colour() + if(length(atom_colours)) + T.atom_colours = atom_colours.Copy() + T.update_atom_colour() + else + T.color = color // If you don't have atom_colours then you're working off an absolute color + if(light) + T.set_light(light_range, light_power, light_color) if(T.dir != dir) T.setDir(dir) + TransferComponents(T) return T diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index a085a613f57f..7105e36a56d2 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -323,6 +323,19 @@ parent_organ = "l_arm" slot = "l_arm_device" +/obj/item/organ/internal/cyberimp/arm/janitorial/advanced /// ERT implant, i dont overly expect this to get into the hands of crew + name = "advanced janitorial toolset implant" + desc = "A set of advanced janitorial tools hidden behind a concealed panel on the user's arm." + contents = newlist(/obj/item/mop/advanced, /obj/item/soap/deluxe, /obj/item/lightreplacer/bluespace, /obj/item/holosign_creator/janitor, /obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/cleaner/advanced) + origin_tech = "materials=5;engineering=6;biotech=5" + action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/clothing/belts.dmi') + action_icon_state = list(/datum/action/item_action/organ_action/toggle = "janibelt") + emp_proof = TRUE + +/obj/item/organ/internal/cyberimp/arm/janitorial/advanced/l /// its for ERT, but still probably a good idea. + parent_organ = "l_arm" + slot = "l_arm_device" + /obj/item/organ/internal/cyberimp/arm/botanical name = "botanical toolset implant" desc = "A set of botanical tools hidden behind a concealed panel on the user's arm" diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index dd0bbd0ed9c4..11434dea3193 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -4,6 +4,7 @@ #ifdef UNIT_TESTS #include "aicard_icons.dm" #include "announcements.dm" +#include "areas_apcs.dm" #include "component_tests.dm" #include "config_sanity.dm" #include "crafting_lists.dm" diff --git a/code/modules/unit_tests/areas_apcs.dm b/code/modules/unit_tests/areas_apcs.dm new file mode 100644 index 000000000000..615bc465c122 --- /dev/null +++ b/code/modules/unit_tests/areas_apcs.dm @@ -0,0 +1,12 @@ +/datum/unit_test/area_apcs + /// Sometimes, areas may have power, or not. We dont really care about these areas. + var/list/optional_areas = list(/area/station/science/toxins/test, /area/station/maintenance/electrical_shop) + +/datum/unit_test/area_apcs/Run() + for(var/area/station/A in SSmapping.existing_station_areas) + if(A.there_can_be_many || A.apc_starts_off || !A.requires_power) + continue + if(is_type_in_list(A, optional_areas)) + continue + if(!(length(A.apc) == 1)) + Fail("Area [A] has [length(A.apc)] apcs, instead of 1.") diff --git a/config/example/config.toml b/config/example/config.toml index 7d0aad7285a7..7d9ae206ac91 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -687,8 +687,6 @@ active_lava_ruins = [ ##MISC "_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm", "_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm", - # Cube blacklisted on production because it contains a wishgranter that gives you hijack on use - "_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm", "_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm", "_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm", "_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm", @@ -778,6 +776,8 @@ wiki_url = "https://www.paradisestation.org/wiki" rules_url = "https://www.paradisestation.org/rules" # Github address github_url = "https://github.com/ParadiseSS13/Paradise" +# Exploit address +exploit_url = "https://www.paradisestation.org/forum/179-exploit-reports/" # Discord address #discord_url = "http://example.org" # Discord address (forum-based invite) diff --git a/goon/browserassets/css/browserOutput-dark.css b/goon/browserassets/css/browserOutput-dark.css index 2ed1bfe2044b..acfa6758f45c 100644 --- a/goon/browserassets/css/browserOutput-dark.css +++ b/goon/browserassets/css/browserOutput-dark.css @@ -385,6 +385,7 @@ h1.alert, h2.alert {color: #a4bad6;} .orangei {color: #ffa500; font-style: italic;} .orangeb {color: #ffa500; font-weight: bold;} .resonate {color: #298F85;} +.healthscan_oxy {color: #5CC9FF;} .revennotice {color: #6685F5;} .revenboldnotice {color: #6685F5;font-weight: bold;} diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index 3f29c863bf77..7ba4f743ed72 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -380,6 +380,7 @@ h1.alert, h2.alert {color: #000000;} .orangei {color: #ffa500; font-style: italic;} .orangeb {color: #ffa500; font-weight: bold;} .resonate {color: #298F85;} +.healthscan_oxy {color: #0074BD;} .revennotice {color: #1d2953;} .revenboldnotice {color: #1d2953; font-weight: bold;} diff --git a/icons/_nanomaps/MetaStation_nanomap_z1.png b/icons/_nanomaps/MetaStation_nanomap_z1.png index 9eac08575ad9..503051f13692 100644 Binary files a/icons/_nanomaps/MetaStation_nanomap_z1.png and b/icons/_nanomaps/MetaStation_nanomap_z1.png differ diff --git a/icons/effects/warning_stripes.dmi b/icons/effects/warning_stripes.dmi deleted file mode 100644 index 14719ead5c03..000000000000 Binary files a/icons/effects/warning_stripes.dmi and /dev/null differ diff --git a/icons/misc/buildmode.dmi b/icons/misc/buildmode.dmi index 149a13d7b71e..0520a9ef005c 100644 Binary files a/icons/misc/buildmode.dmi and b/icons/misc/buildmode.dmi differ diff --git a/icons/mob/actions/actions.dmi b/icons/mob/actions/actions.dmi index 0abf772e7f7c..381b39730fd1 100644 Binary files a/icons/mob/actions/actions.dmi and b/icons/mob/actions/actions.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 2f11f258d0b9..cdbe14fd2567 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 42f8f03f154b..af65a580e07f 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index f0d4119cd32f..20e9e40df950 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 43d79a0ecabc..52d01919f9b7 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index 836eb20cc585..b70786592df9 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index d3b27c52a9fa..3354dd215bad 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 8aeade56f596..63c10abda38c 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/under/misc.dmi b/icons/mob/clothing/species/vox/under/misc.dmi index 74cacd03647b..ee70b43eab09 100644 Binary files a/icons/mob/clothing/species/vox/under/misc.dmi and b/icons/mob/clothing/species/vox/under/misc.dmi differ diff --git a/icons/mob/telegraphing/telegraph_holographic.dmi b/icons/mob/telegraphing/telegraph_holographic.dmi new file mode 100644 index 000000000000..45fc0b2094da Binary files /dev/null and b/icons/mob/telegraphing/telegraph_holographic.dmi differ diff --git a/icons/obj/biogenerator.dmi b/icons/obj/biogenerator.dmi index 7989d6f355f5..aca2c2716fc8 100644 Binary files a/icons/obj/biogenerator.dmi and b/icons/obj/biogenerator.dmi differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index f3b84f6031e1..813f7735294c 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 6cfabb865542..bc5888cb9e14 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index aa98071bfa56..15145640d3d8 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/modsuit/mod_modules.dmi b/icons/obj/clothing/modsuit/mod_modules.dmi index 37e377f952cc..382401bffcba 100644 Binary files a/icons/obj/clothing/modsuit/mod_modules.dmi and b/icons/obj/clothing/modsuit/mod_modules.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index f2d73d7223ed..5bc42bd4471e 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/food/bakedgoods.dmi b/icons/obj/food/bakedgoods.dmi new file mode 100644 index 000000000000..0bca50c02da0 Binary files /dev/null and b/icons/obj/food/bakedgoods.dmi differ diff --git a/icons/obj/food/breakfast.dmi b/icons/obj/food/breakfast.dmi new file mode 100644 index 000000000000..6a2ade58b16b Binary files /dev/null and b/icons/obj/food/breakfast.dmi differ diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi new file mode 100644 index 000000000000..31bc1959e4e4 Binary files /dev/null and b/icons/obj/food/burgerbread.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index e0ac931b235a..10287972d094 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi new file mode 100644 index 000000000000..9370c46c8eb2 Binary files /dev/null and b/icons/obj/food/meat.dmi differ diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi new file mode 100644 index 000000000000..d9bbda673fcd Binary files /dev/null and b/icons/obj/food/soupsalad.dmi differ diff --git a/icons/obj/improvised.dmi b/icons/obj/improvised.dmi index 2bee1892cd73..54bade6595fc 100644 Binary files a/icons/obj/improvised.dmi and b/icons/obj/improvised.dmi differ diff --git a/icons/obj/status_display.dmi b/icons/obj/status_display.dmi index 82d7ba1fcb27..4bac72905ca0 100644 Binary files a/icons/obj/status_display.dmi and b/icons/obj/status_display.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index b4ab7c316809..17f152fe280d 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi index b813e6e0c7ae..5e1f745da28b 100644 Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ diff --git a/icons/obj/watertank.dmi b/icons/obj/watertank.dmi index 0c0278d69ced..2ec36339d92a 100644 Binary files a/icons/obj/watertank.dmi and b/icons/obj/watertank.dmi differ diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi index 57ed2d3288d4..fc8e93b6e539 100644 Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ diff --git a/modular_ss220/maps220/code/spawners.dm b/modular_ss220/maps220/code/spawners.dm index 547c427a7fdd..08c6e77375e0 100644 --- a/modular_ss220/maps220/code/spawners.dm +++ b/modular_ss220/maps220/code/spawners.dm @@ -16,7 +16,7 @@ lootcount = 5 loot = list( /obj/item/reagent_containers/food/snacks/lasagna=10, - /obj/item/reagent_containers/food/snacks/bigbiteburger=10, + /obj/item/reagent_containers/food/snacks/burger/bigbite=10, /obj/item/reagent_containers/food/snacks/fishandchips=10, /obj/item/reagent_containers/food/snacks/fishburger=10, /obj/item/reagent_containers/food/snacks/hotdog=10, diff --git a/paradise.dme b/paradise.dme index e64bbd3e4dcd..ea477b613e2a 100644 --- a/paradise.dme +++ b/paradise.dme @@ -396,6 +396,7 @@ #include "code\datums\components\sticky.dm" #include "code\datums\components\surgery_initiator.dm" #include "code\datums\components\swarming.dm" +#include "code\datums\components\tilted.dm" #include "code\datums\components\two_handed.dm" #include "code\datums\discord\discord_manager.dm" #include "code\datums\discord\discord_webhook.dm" @@ -788,7 +789,6 @@ #include "code\game\machinery\turret_control.dm" #include "code\game\machinery\wall_holosign.dm" #include "code\game\machinery\washing_machine.dm" -#include "code\game\machinery\wishgranter.dm" #include "code\game\machinery\airlock_control\_airlock_control_defines.dm" #include "code\game\machinery\airlock_control\airlock_button.dm" #include "code\game\machinery\airlock_control\airlock_controllers.dm" @@ -845,8 +845,8 @@ #include "code\game\machinery\vendors\contraband_vendors.dm" #include "code\game\machinery\vendors\departmental_vendors.dm" #include "code\game\machinery\vendors\generic_vendors.dm" +#include "code\game\machinery\vendors\tilt_crits.dm" #include "code\game\machinery\vendors\vending.dm" -#include "code\game\machinery\vendors\vendor_crits.dm" #include "code\game\machinery\vendors\wardrobe_vendors.dm" #include "code\game\magic\Uristrunes.dm" #include "code\game\mecha\mech_bay.dm" @@ -909,7 +909,6 @@ #include "code\game\objects\effects\decals\misc_decals.dm" #include "code\game\objects\effects\decals\remains.dm" #include "code\game\objects\effects\decals\turf_decal.dm" -#include "code\game\objects\effects\decals\warning_stripes.dm" #include "code\game\objects\effects\decals\Cleanable\alien_blood.dm" #include "code\game\objects\effects\decals\Cleanable\fuel.dm" #include "code\game\objects\effects\decals\Cleanable\humans.dm" @@ -1413,7 +1412,6 @@ #include "code\modules\antagonists\vampire\vampire_powers\hemomancer_powers.dm" #include "code\modules\antagonists\vampire\vampire_powers\umbrae_powers.dm" #include "code\modules\antagonists\vampire\vampire_powers\vampire_powers.dm" -#include "code\modules\antagonists\wishgranter\wishgranter_avatar.dm" #include "code\modules\arcade\arcade_base.dm" #include "code\modules\arcade\arcade_prize.dm" #include "code\modules\arcade\claw_game.dm" @@ -1517,6 +1515,7 @@ #include "code\modules\buildmode\submodes\mapgen.dm" #include "code\modules\buildmode\submodes\save.dm" #include "code\modules\buildmode\submodes\throwing.dm" +#include "code\modules\buildmode\submodes\tilt.dm" #include "code\modules\buildmode\submodes\variable_edit.dm" #include "code\modules\client\2fa.dm" #include "code\modules\client\asset_cache.dm" diff --git a/sound/machines/notif1.ogg b/sound/machines/notif1.ogg new file mode 100644 index 000000000000..b21c87bbbf5b Binary files /dev/null and b/sound/machines/notif1.ogg differ diff --git a/sound/machines/notif2.ogg b/sound/machines/notif2.ogg new file mode 100644 index 000000000000..daa78a168c39 Binary files /dev/null and b/sound/machines/notif2.ogg differ diff --git a/tgui/.prettierignore b/tgui/.prettierignore index aafde4f3b8b6..25e1493851a8 100644 --- a/tgui/.prettierignore +++ b/tgui/.prettierignore @@ -1,2 +1,3 @@ -# Ignore built packages: +# Ignore built packages and styles: packages/tgui/public +packages/tgui/styles diff --git a/tgui/babel.config.js b/tgui/babel.config.js index d83569ca2fe2..8b32d3ce491d 100644 --- a/tgui/babel.config.js +++ b/tgui/babel.config.js @@ -19,6 +19,7 @@ const createBabelConfig = (options) => { targets: [], }, ], + require.resolve('@babel/preset-react'), ...presets, ].filter(Boolean), plugins: [ @@ -31,7 +32,6 @@ const createBabelConfig = (options) => { require.resolve('@babel/plugin-transform-jscript'), require.resolve('babel-plugin-inferno'), removeConsole && require.resolve('babel-plugin-transform-remove-console'), - require.resolve('common/string.babel-plugin.cjs'), ...plugins, ].filter(Boolean), }; diff --git a/tgui/bin/tgui-build.bat b/tgui/bin/tgui-build.bat index 89e1aca9152e..b22d9bf5c724 100644 --- a/tgui/bin/tgui-build.bat +++ b/tgui/bin/tgui-build.bat @@ -1,5 +1,6 @@ @echo off cd "%~dp0\.." call yarn install +call yarn prettier --write call yarn run build timeout /t 9 diff --git a/tgui/package.json b/tgui/package.json index bbc158e2c03a..70f17d094752 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -15,6 +15,13 @@ }, "dependencies": { "@babel/eslint-parser": "^7.22.15", + "@babel/core": "^7.23.2", + "@babel/preset-env": "^7.23.2", + "@babel/preset-react": "^7.22.15", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-transform-jscript": "^7.22.5", + "babel-plugin-inferno": "^6.7.0", + "babel-plugin-transform-remove-console": "^6.9.4", "eslint": "^8.49.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-prettier": "^5.0.0", diff --git a/tgui/packages/tgui/components/DraggableControl.js b/tgui/packages/tgui/components/DraggableControl.js index 3ff8f3cf6b40..0c6f9a433fca 100644 --- a/tgui/packages/tgui/components/DraggableControl.js +++ b/tgui/packages/tgui/components/DraggableControl.js @@ -18,8 +18,7 @@ export class DraggableControl extends Component { value: props.value, dragging: false, editing: false, - internalValue: null, - origin: null, + oldOffset: null, suppressingFlicker: false, }; @@ -49,12 +48,10 @@ export class DraggableControl extends Component { return; } document.body.style['pointer-events'] = 'none'; - this.ref = e.target; + this.ref = e.currentTarget; this.setState({ dragging: false, - origin: getScalarScreenOffset(e, dragMatrix), value, - internalValue: value, }); this.timer = setTimeout(() => { this.setState({ @@ -73,30 +70,50 @@ export class DraggableControl extends Component { }; this.handleDragMove = (e) => { - const { minValue, maxValue, step, stepPixelSize, dragMatrix, disabled } = + const { minValue, maxValue, step, dragMatrix, disabled } = this.props; if (disabled) { return; } + const defaultStepPixelSize = this.ref.offsetWidth / ((maxValue - minValue) / step); + let stepPixelSize = this.props.stepPixelSize ?? defaultStepPixelSize; + if (typeof stepPixelSize === 'function') { + stepPixelSize = stepPixelSize(defaultStepPixelSize); + } this.setState((prevState) => { const state = { ...prevState }; - const offset = getScalarScreenOffset(e, dragMatrix) - state.origin; + const oldOffset = prevState.oldOffset; + const offset = getScalarScreenOffset(e, dragMatrix) - this.ref.getBoundingClientRect().left - window.screenX; if (prevState.dragging) { - const stepOffset = Number.isFinite(minValue) ? minValue % step : 0; - // Translate mouse movement to value - // Give it some headroom (by increasing clamp range by 1 step) - state.internalValue = clamp( - state.internalValue + (offset * step) / stepPixelSize, - minValue - step, - maxValue + step - ); - // Clamp the final value - state.value = clamp( - state.internalValue - (state.internalValue % step) + stepOffset, - minValue, - maxValue - ); - state.origin = getScalarScreenOffset(e, dragMatrix); + if (oldOffset !== undefined && oldOffset !== null && offset !== oldOffset) { + const maxStep = maxValue / step; + const toNearestStep = offset > oldOffset + ? Math.floor // Increasing + : Math.ceil // Decreasing + ; + /* ● = step, o = oldOffset, n = offset + * There are four cases to consider for the following code: + * Case 1: Increasing(offset > oldOffset), moving between steps + * ●--o--n-● + * value should not change. Since both offsets are subject to floor, + * they have the same nearest steps and the difference cancels out, + * leaving value the same + * Case 2: Decreasing(offset < oldOffset), moving between steps + * ●--n--o-● + * Same as Case 1 except the function is ceil not floor + * Case 3: Increasing, offset is past step + * ●-o-●-n-● ; ●-o-●---●-n + * value should increase by 1, or however many steps o is behind n + * Case 4: Decreasing, offset is behind step + * ●-n-●-o-● ; ●-n-●---●-o + * Same as Case 3, but decrease instead of increase + */ + const oldStep = clamp(toNearestStep(oldOffset / stepPixelSize), 0, maxStep); + const newStep = clamp(toNearestStep(offset / stepPixelSize), 0, maxStep); + const stepDifference = newStep - oldStep; + state.value = clamp(state.value + stepDifference * step, minValue, maxValue); + } + state.oldOffset = offset; } else if (Math.abs(offset) > 4) { state.dragging = true; } @@ -106,14 +123,14 @@ export class DraggableControl extends Component { this.handleDragEnd = (e) => { const { onChange, onDrag } = this.props; - const { dragging, value, internalValue } = this.state; + const { dragging, value } = this.state; document.body.style['pointer-events'] = 'auto'; clearTimeout(this.timer); clearInterval(this.dragInterval); this.setState({ dragging: false, editing: !dragging, - origin: null, + oldOffset: null }); document.removeEventListener('mousemove', this.handleDragMove); document.removeEventListener('mouseup', this.handleDragEnd); @@ -127,7 +144,7 @@ export class DraggableControl extends Component { } } else if (this.inputRef) { const input = this.inputRef.current; - input.value = internalValue; + input.value = value; // IE8: Dies when trying to focus a hidden element // (Error: Object does not support this action) try { @@ -249,7 +266,6 @@ DraggableControl.defaultProps = { minValue: -Infinity, maxValue: +Infinity, step: 1, - stepPixelSize: 1, suppressFlicker: 50, dragMatrix: [1, 0], }; diff --git a/tgui/packages/tgui/components/NanoMap.js b/tgui/packages/tgui/components/NanoMap.js index 6f9218d46ed0..5d12bece8fa2 100644 --- a/tgui/packages/tgui/components/NanoMap.js +++ b/tgui/packages/tgui/components/NanoMap.js @@ -118,20 +118,21 @@ export class NanoMap extends Component { 'margin-left': offsetX + 'px', 'overflow': 'hidden', 'position': 'relative', - 'background-image': 'url(' + mapUrl + ')', 'background-size': 'cover', 'background-repeat': 'no-repeat', 'text-align': 'center', 'cursor': dragging ? 'move' : 'auto', + '-ms-interpolation-mode': 'nearest-neighbor', }; return (
- The biogenerator is processing... -