diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm index 66928c21eae..faecbeae1d1 100644 --- a/code/game/objects/items/robot/items/hypo.dm +++ b/code/game/objects/items/robot/items/hypo.dm @@ -4,6 +4,7 @@ /datum/reagent/medicine/c2/convermol,\ /datum/reagent/medicine/epinephrine,\ /datum/reagent/medicine/c2/libital,\ + /datum/reagent/medicine/lidocaine, /* BUBBER EDIT ADD */ \ /datum/reagent/medicine/c2/multiver,\ /datum/reagent/medicine/salglu_solution,\ /datum/reagent/medicine/spaceacillin,\ diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 8a959aa3b63..407fd7ddec3 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -2,7 +2,7 @@ gender = PLURAL body_parts_covered = GROIN|LEGS female_sprite_flags = NO_FEMALE_UNIFORM - can_adjust = TRUE + can_adjust = FALSE // BUBBER EDIT CHANGE - ORIGINAL: TRUE custom_price = PAYCHECK_CREW icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi' worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index c1e8ec911ad..be830c27966 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -25,7 +25,7 @@ /obj/item/reagent_containers/condiment/update_icon_state() . = ..() - if(reagents.reagent_list.len) + if(length(reagents.reagent_list)) // BUBBER EDIT CHANGE - FIXES A RUNTIME I LITERALLY CANNOT FIGURE OUT IM SORRY - ORIGINAL: reagents.reagent_list.len if(icon_preempty) icon_state = icon_preempty icon_preempty = null diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 8ac7383b69b..a145a4cb735 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -275,6 +275,7 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE +/* BUBBER EDIT REMOVAL BEGIN /datum/design/mag_autorifle name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)" desc = "A 20 round magazine for the out of date WT-550 Autorifle." @@ -302,6 +303,7 @@ materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ammo_box/magazine/wt550m9/wtic departmental_flags = DEPARTMENT_BITFLAG_SECURITY +*/// BUBBER EDIT REMOVAL END /datum/design/pin_testing name = "Test-Range Firing Pin" diff --git a/code/modules/research/techweb/nodes/syndicate_nodes.dm b/code/modules/research/techweb/nodes/syndicate_nodes.dm index d031cf7c848..2220aa35e36 100644 --- a/code/modules/research/techweb/nodes/syndicate_nodes.dm +++ b/code/modules/research/techweb/nodes/syndicate_nodes.dm @@ -9,9 +9,11 @@ "borg_syndicate_module", "donksoft_refill", "largecrossbow", + /* BUBBER EDIT REMOVAL BEGIN "mag_autorifle", "mag_autorifle_ap", "mag_autorifle_ic", + */// BUBBER EDIT REMOVAL END "rapidsyringe", "suppressor", "super_pointy_tape", diff --git a/code/modules/surgery/operations/operation_filter.dm b/code/modules/surgery/operations/operation_filter.dm index c380d8f9d2f..a4af6ea2963 100644 --- a/code/modules/surgery/operations/operation_filter.dm +++ b/code/modules/surgery/operations/operation_filter.dm @@ -35,7 +35,7 @@ for(var/datum/reagent/chem as anything in limb.owner.reagents?.reagent_list) if(!length(bloodfilter.whitelist) || !(chem.type in bloodfilter.whitelist)) limb.owner.reagents.remove_reagent(chem.type, clamp(round(chem.volume * 0.22, 0.2), 0.4, 10)) - + limb.owner.adjust_tox_loss(clamp(round(limb.owner.get_tox_loss() * -0.07, 2), -2, -10), forced = TRUE) // BUBBER EDIT ADDITION - Filtration fixes toxins display_results( surgeon, limb.owner, @@ -58,6 +58,10 @@ limb.receive_damage(5, damage_source = tool) /datum/surgery_operation/limb/filter_blood/proc/has_filterable_chems(mob/living/carbon/target, obj/item/blood_filter/bloodfilter) + // BUBBER EDIT ADDITION BEGIN - Filtration fixes toxins + if(target.get_tox_loss() > 0) + return TRUE + // BUBBER EDIT ADDITION END if(!length(target.reagents?.reagent_list)) bloodfilter.audible_message(span_notice("[bloodfilter] pings as it reports no chemicals detected in [target]'s blood.")) playsound(target, 'sound/machines/ping.ogg', 75, TRUE, falloff_exponent = 12, falloff_distance = 1) diff --git a/icons/map_icons/clothing/under/dress.dmi b/icons/map_icons/clothing/under/dress.dmi index aa2e59e23b1..ee626a98ddf 100644 Binary files a/icons/map_icons/clothing/under/dress.dmi and b/icons/map_icons/clothing/under/dress.dmi differ diff --git a/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm b/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm index a1540583eb2..39c6a565224 100644 --- a/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -61,7 +61,7 @@ GLOBAL_LIST_INIT(skyrat_rod_recipes, list( new/datum/stack_recipe("towel bin", /obj/structure/towel_bin/empty, 2, time = 0.5 SECONDS, crafting_flags = CRAFT_ONE_PER_TURF, category = CAT_CONTAINERS), new/datum/stack_recipe("guard rail", /obj/structure/deployable_barricade/guardrail, 2, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_CHECK_DIRECTION, category = CAT_STRUCTURE), new/datum/stack_recipe("wrestling ropes", /obj/structure/railing/wrestling, 3, time = 1.8 SECONDS, crafting_flags = CRAFT_ON_SOLID_GROUND | CRAFT_CHECK_DIRECTION, category = CAT_STRUCTURE), - new/datum/stack_recipe("crutch", /obj/item/cane/crutch, 3, time = 1 SECONDS, category = CAT_TOOLS), + new/datum/stack_recipe("crutch", /obj/item/cane/crutch, 3, time = 1 SECONDS, category = CAT_TOOLS, crafting_flags = CRAFT_SKIP_MATERIALS_PARITY), )) /obj/item/stack/rods/get_main_recipes() diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi index 11f4729aa7c..27be7719bef 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi differ diff --git a/modular_skyrat/modules/aesthetics/storage/storage.dmi b/modular_skyrat/modules/aesthetics/storage/storage.dmi index 94a90b93600..62be14c8022 100644 Binary files a/modular_skyrat/modules/aesthetics/storage/storage.dmi and b/modular_skyrat/modules/aesthetics/storage/storage.dmi differ diff --git a/modular_skyrat/modules/barsigns/code/barsigns.dm b/modular_skyrat/modules/barsigns/code/barsigns.dm index 5e55451412f..d50d620b074 100644 --- a/modular_skyrat/modules/barsigns/code/barsigns.dm +++ b/modular_skyrat/modules/barsigns/code/barsigns.dm @@ -305,18 +305,6 @@ desc = "They're just missing the celestial body they belong to." neon_color = "" -/datum/barsign/skyrat/coldones - name = "Cold Ones" - icon_state = "cold-ones" - desc = "That's what they call the yogurt effect." - neon_color = "#dabd70" - -/datum/barsign/skyrat/doctorsorders - name = "Doctor's Orders" - icon_state = "doctors-orders" - desc = "For over-the-counter painkillers." - neon_color = "#3e92e0" - /datum/barsign/skyrat/lowhanginfruit name = "The Low Hangin Fruit" icon_state = "the-low-hangin-fruit" @@ -329,12 +317,6 @@ desc = "Twice, like a bird!" neon_color = "" -/datum/barsign/skyrat/wrongturn - name = "Wrong Turn" - icon_state = "wrong-turn" - desc = "You don't feel lost. Nothing a few drinks cant fix, though." - neon_color = "#c52121" - /datum/barsign/skyrat/o2n2 name = "02n2" icon_state = "02n2" diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/outfit.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/outfit.dm index baee62f0b75..0fc6b25bf31 100644 --- a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/outfit.dm +++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/outfit.dm @@ -54,6 +54,7 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/armadyne mask = /obj/item/clothing/mask/balaclava head = /obj/item/clothing/head/helmet/cin_surplus_helmet/forest + back = /obj/item/storage/backpack/industrial/cin_surplus/forest backpack_contents = list( /obj/item/gun/ballistic/automatic/pistol/plasma_marksman, /obj/item/ammo_box/magazine/recharge/plasma_battery = 3, diff --git a/modular_skyrat/modules/bitrunning/icons/health_station.dmi b/modular_skyrat/modules/bitrunning/icons/health_station.dmi index 441f705a44f..3f5a03cca64 100644 Binary files a/modular_skyrat/modules/bitrunning/icons/health_station.dmi and b/modular_skyrat/modules/bitrunning/icons/health_station.dmi differ diff --git a/modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm b/modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm index 9edcbaaec6e..61a8275f7ad 100644 --- a/modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm +++ b/modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm @@ -67,10 +67,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/space_heater/wall_mounted, 29) /// lazy-initialized cell stored in the actual heater (so that it can start with one without making a new one every placement) var/obj/item/stock_parts/power_store/cell = /obj/machinery/space_heater::cell -/obj/item/wallframe/wall_heater/Initialize(mapload) - . = ..() - register_context() - /obj/item/wallframe/wall_heater/after_attach(obj/machinery/space_heater/wall_mounted/attached_to) . = ..() if(!istype(attached_to)) diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts.dm b/modular_skyrat/modules/modular_implants/code/nifsofts.dm index 475932482ea..2c3ea190254 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsofts.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsofts.dm @@ -168,6 +168,7 @@ desc = "A datadisk that can be used to upload a loaded NIFSoft to the user's NIF" icon = 'modular_skyrat/modules/modular_implants/icons/obj/disks.dmi' icon_state = "base_disk" + sticker_icon_state = null ///What NIFSoft is currently loaded in? var/datum/nifsoft/loaded_nifsoft = /datum/nifsoft ///Is the datadisk reusable? diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm index 4de1f1822b2..d527e587c1d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm @@ -41,6 +41,8 @@ var/tagname = null /// Item path of on-init creation in the collar's storage var/treat_path = /obj/item/food/cookie + /// Whether to add reskin component in Initialize + var/reskins = TRUE //spawn thing in collar @@ -56,7 +58,8 @@ var/id = REF(src) var/obj/item/key/kink_collar/collar_key = key collar_key.key_id = id - AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kink_collar) + if(reskins) + AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kink_collar) /datum/atom_skin/kink_collar abstract_type = /datum/atom_skin/kink_collar @@ -131,7 +134,8 @@ /obj/item/clothing/neck/kink_collar/locked/Initialize(mapload) . = ..() create_storage(storage_type = /datum/storage/pockets/small/kink_collar/locked) - AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kink_collar_locked) + if(reskins) + AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kink_collar_locked) /datum/atom_skin/kink_collar_locked abstract_type = /datum/atom_skin/kink_collar_locked diff --git a/modular_skyrat/modules/modular_weapons/code/conversion_kits.dm b/modular_skyrat/modules/modular_weapons/code/conversion_kits.dm index a02fc10a94a..106e1ebdead 100644 --- a/modular_skyrat/modules/modular_weapons/code/conversion_kits.dm +++ b/modular_skyrat/modules/modular_weapons/code/conversion_kits.dm @@ -36,7 +36,7 @@ /datum/crafting_recipe/mosin_pro/New() . = ..() - blacklist |= subtypesof(/obj/item/gun/ballistic/rifle/boltaction) - list(/obj/item/gun/ballistic/rifle/boltaction/surplus) + LAZYOR(blacklist, subtypesof(/obj/item/gun/ballistic/rifle/boltaction) - list(/obj/item/gun/ballistic/rifle/boltaction/surplus)) /datum/crafting_recipe/mosin_pro/check_requirements(mob/user, list/collected_requirements) var/obj/item/gun/ballistic/rifle/boltaction/the_piece = collected_requirements[/obj/item/gun/ballistic/rifle/boltaction][1] diff --git a/modular_zubbers/code/datums/components/weatherannouncer.dm b/modular_zubbers/code/datums/components/weatherannouncer.dm index f34e280b2bc..9b2c9a76c44 100644 --- a/modular_zubbers/code/datums/components/weatherannouncer.dm +++ b/modular_zubbers/code/datums/components/weatherannouncer.dm @@ -2,7 +2,12 @@ var/warning_range_low = 60 var/warning_range_high = TIME_BLOODSUCKER_DAY_WARN -/datum/component/weather_announcer/Initialize(state_normal, state_warning, state_danger) +/datum/component/weather_announcer/Initialize( + state_normal, + state_warning, + state_danger, + radar_z_trait, +) . = ..() RegisterSignal(SSsunlight, COMSIG_SOL_NEAR_START, PROC_REF(on_daylight_warning)) diff --git a/modular_zubbers/code/game/machinery/burger_reactor/reactor_upgrades.dm b/modular_zubbers/code/game/machinery/burger_reactor/reactor_upgrades.dm index 72001bd3c7a..d30924c276d 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor/reactor_upgrades.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor/reactor_upgrades.dm @@ -2,7 +2,7 @@ /obj/item/rbmk_upgrade name = "\improper RB-MK2 software upgrade disk" desc = "It seems to be empty. Good fucking job, coders." - icon = 'icons/obj/devices/circuitry_n_data.dmi' + icon = 'icons/obj/devices/floppy_disks.dmi' icon_state = "datadisk2" /obj/item/rbmk_upgrade/proc/apply_upgrade(obj/machinery/power/rbmk2/machine) diff --git a/modular_zubbers/code/modules/bitrunning/disks.dm b/modular_zubbers/code/modules/bitrunning/disks.dm index a8c5338e862..ef768f1b342 100644 --- a/modular_zubbers/code/modules/bitrunning/disks.dm +++ b/modular_zubbers/code/modules/bitrunning/disks.dm @@ -1,9 +1,6 @@ /obj/item/disk/bitrunning/prefs name = "DeForest biological simulation disk" desc = "A disk containing the biological simulation data necessary to load custom characters into bitrunning domains." - icon = 'icons/obj/devices/circuitry_n_data.dmi' - base_icon_state = "datadisk" - icon_state = "datadisk0" w_class = WEIGHT_CLASS_SMALL diff --git a/modular_zubbers/code/modules/clothing/neck/collars.dm b/modular_zubbers/code/modules/clothing/neck/collars.dm index 4bf4321ca3b..b09425ed920 100644 --- a/modular_zubbers/code/modules/clothing/neck/collars.dm +++ b/modular_zubbers/code/modules/clothing/neck/collars.dm @@ -24,6 +24,7 @@ greyscale_colors = "#8B96B7#505665" flags_1 = IS_PLAYER_COLORABLE_1 resistance_flags = FIRE_PROOF + reskins = FALSE /obj/item/clothing/neck/kink_collar/locked/gps/Initialize(mapload) . = ..() @@ -32,9 +33,6 @@ register_context() update_icon(UPDATE_OVERLAYS) RegisterSignal(src, COMSIG_NAME_CHANGED, PROC_REF(on_update_name)) - var/list/reskin_components = GetComponents(/datum/component/reskinable_item) - for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) - qdel(reskin_component) /obj/item/clothing/neck/kink_collar/locked/gps/proc/on_update_name() SIGNAL_HANDLER diff --git a/modular_zubbers/code/modules/clothing/under/skirts_dresses.dm b/modular_zubbers/code/modules/clothing/under/skirts_dresses.dm index 26c55540606..c922e75a4fe 100644 --- a/modular_zubbers/code/modules/clothing/under/skirts_dresses.dm +++ b/modular_zubbers/code/modules/clothing/under/skirts_dresses.dm @@ -48,7 +48,7 @@ /datum/atom_skin/midnight_gown abstract_type = /datum/atom_skin/midnight_gown - reset_missing = FALSE + greyscale_item_path = /obj/item/clothing/under/dress/bubber/midnight_gown /datum/atom_skin/midnight_gown/right preview_name = "Right" @@ -64,7 +64,7 @@ /datum/atom_skin/giant_scarf abstract_type = /datum/atom_skin/giant_scarf - reset_missing = FALSE + greyscale_item_path = /obj/item/clothing/under/dress/bubber/giant_scarf /datum/atom_skin/giant_scarf/giant_scarf preview_name = "Plain" diff --git a/modular_zubbers/code/modules/hydroponics/gene_modder.dm b/modular_zubbers/code/modules/hydroponics/gene_modder.dm index 6058b47b20f..6dd4e4b7924 100644 --- a/modular_zubbers/code/modules/hydroponics/gene_modder.dm +++ b/modular_zubbers/code/modules/hydroponics/gene_modder.dm @@ -440,7 +440,7 @@ /obj/item/disk/computer/plantgene name = "plant data disk" desc = "A disk for storing plant genetic data." - icon_state = "datadisk_hydro" + icon_state = "datadisk4" custom_materials = list(/datum/material/iron=30, /datum/material/glass=10) var/datum/plant_gene/gene read_only = FALSE //Well, it's still a floppy disk @@ -448,7 +448,7 @@ /obj/item/disk/computer/plantgene/Initialize(mapload) . = ..() - add_overlay("datadisk_gene") + set_sticker_icon_state("o_dna1") src.pixel_x = rand(-5, 5) src.pixel_y = rand(-5, 5) diff --git a/modular_zubbers/code/modules/nanites/machines/nanite_chamber_computer.dm b/modular_zubbers/code/modules/nanites/machines/nanite_chamber_computer.dm index 0da5678e0fe..340f977073c 100644 --- a/modular_zubbers/code/modules/nanites/machines/nanite_chamber_computer.dm +++ b/modular_zubbers/code/modules/nanites/machines/nanite_chamber_computer.dm @@ -1,6 +1,7 @@ /obj/machinery/computer/nanite_chamber_control name = "nanite chamber control console" desc = "Controls a connected nanite chamber. Can inoculate nanites, load programs, and analyze existing nanite swarms." + icon = 'modular_zubbers/icons/obj/machines/computer.dmi' icon_screen = "nanite_chamber_control" circuit = /obj/item/circuitboard/computer/nanite_chamber_control var/obj/machinery/nanite_chamber/chamber diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm index 73bab13980d..f29306833cc 100644 --- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm +++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm @@ -174,9 +174,6 @@ . = ..() /datum/techweb_node/syndicate_basic/New() - design_ids -= "mag_autorifle" - design_ids -= "mag_autorifle_ap" - design_ids -= "mag_autorifle_ic" design_ids += "wt550_ammo_incendiary" design_ids += "mod_mind_transfer" . = ..() diff --git a/modular_zubbers/icons/obj/machines/computer.dmi b/modular_zubbers/icons/obj/machines/computer.dmi new file mode 100644 index 00000000000..37c4e087218 Binary files /dev/null and b/modular_zubbers/icons/obj/machines/computer.dmi differ diff --git a/modular_zubbers/modules/ammo_workbench/code/ammo_workbench.dm b/modular_zubbers/modules/ammo_workbench/code/ammo_workbench.dm index e660731e9c8..139137dd79f 100644 --- a/modular_zubbers/modules/ammo_workbench/code/ammo_workbench.dm +++ b/modular_zubbers/modules/ammo_workbench/code/ammo_workbench.dm @@ -69,7 +69,6 @@ /obj/machinery/ammo_workbench/Initialize(mapload) materials = new( \ src, \ - /datum/material_container, \ SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], \ 200000, \ MATCONTAINER_EXAMINE, \ @@ -462,6 +461,7 @@ . += "ammobench_loaded" /obj/machinery/ammo_workbench/Destroy() + QDEL_NULL(materials) QDEL_NULL(wires) if(timer_id) deltimer(timer_id)