diff --git a/GainStation13/code/modules/research/techweb/nutritech_nodes.dm b/GainStation13/code/modules/research/techweb/nutritech_nodes.dm index f172faedb5..ee972bbf4b 100644 --- a/GainStation13/code/modules/research/techweb/nutritech_nodes.dm +++ b/GainStation13/code/modules/research/techweb/nutritech_nodes.dm @@ -5,7 +5,7 @@ display_name = "Nutri-Tech Tools" description = "Ending world hunger was never made easier!" prereq_ids = list("biotech", "adv_engi") - design_ids = list("calorite_collar", "ci-nutrimentturbo", "bluespace_belt", "primitive_bluespace_belt", "adipoelectric_transformer", "cookie_synthesizer", "borg_upgrade_cookiesynthesizer", "borg_upgrade_feedingtube", "ci-fatmobility","bluespace_collar_receiver","bluespace_collar_transmitter") + design_ids = list("calorite_collar", "ci-nutrimentturbo", "bluespace_belt", "adipoelectric_transformer", "adipoelectric_generator", "cookie_synthesizer", "borg_upgrade_cookiesynthesizer", "borg_upgrade_feedingtube", "ci-fatmobility","bluespace_collar_receiver","bluespace_collar_transmitter") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) hidden = TRUE diff --git a/GainStation13/code/obj/items/bluespace_belt.dm b/GainStation13/code/obj/items/bluespace_belt.dm index 932bbdbc45..25721dee73 100644 --- a/GainStation13/code/obj/items/bluespace_belt.dm +++ b/GainStation13/code/obj/items/bluespace_belt.dm @@ -45,8 +45,7 @@ var/cell_type = /obj/item/stock_parts/cell/high var/obj/item/stock_parts/cell/cell - var/maximum_power_drain = 10 - var/fatness_to_power_coefficient = 27.2 // FATNESS_LEVEL_BLOB BFI divided by this equals 10, our maximum power drain + var/power_drain = 3 var/mob/living/carbon/user // the fatass who's weight we must track for power drain calcs var/overloaded = FALSE // is it EMP'ed? @@ -137,7 +136,6 @@ equipped = FALSE to_chat(user, "The belt is opened, letting your mass flow out!") user.hider_remove(src) - // user = null /obj/item/bluespace_belt/primitive/attackby(obj/item/W, mob/person) if (istype(W, /obj/item/stock_parts/cell)) @@ -150,26 +148,10 @@ person.put_in_hands(cell) cell = W - // if (cell.charge) - // icon_state = "primitive_belt" - // else - // icon_state = "primitive_belt_off" - - // START_PROCESSING(SSprocessing, src) - - // if(cell.charge) - // if(equipped) - // to_chat(person, "Your mass begins to shrink as the belt is powered again...") - // user = person - // activate() - - - if (equipped && cell.charge) to_chat(person, "Your mass begins to shrink as the belt is powered again...") user = person - - // // user.hider_add(src) + activate() @@ -178,14 +160,10 @@ if (!cell) return - // if(!isnull(user)) - // user.hider_remove(src) - to_chat(person, "You take the cell out of the belt, letting your mass flow out!") person.put_in_hands(cell) cell = null deactivate() - // user = null /obj/item/bluespace_belt/primitive/AltClick(mob/person) . = ..() @@ -193,15 +171,9 @@ if (!cell) return - // if(!isnull(user)) - // user.hider_remove(src) - to_chat(person, "You take the cell out of the belt, letting your mass flow out!") - // icon_state = "primitive_belt_off" - // user = null person.put_in_hands(cell) cell = null - // STOP_PROCESSING(SSprocessing, src) deactivate() @@ -218,16 +190,11 @@ return if (!cell.charge) - // icon_state = "primitive_belt_off" - // user.hider_remove(src) to_chat(user, "The belt beeps as it's battery runs out, and your mass starts flowing out!") - // user = null - // STOP_PROCESSING(SSprocessing, src) deactivate() return - var/power_drain = clamp(user.fatness_real / fatness_to_power_coefficient, 0, maximum_power_drain) - power_drain = min(power_drain, cell.charge) - cell.use(power_drain) + var/power_drained = min(power_drain, cell.charge) + cell.use(power_drained) cell.update_icon() diff --git a/code/modules/research/techweb/nodes/bluespace_nodes.dm b/code/modules/research/techweb/nodes/bluespace_nodes.dm index 28cda2cfa3..2d1bef02bf 100644 --- a/code/modules/research/techweb/nodes/bluespace_nodes.dm +++ b/code/modules/research/techweb/nodes/bluespace_nodes.dm @@ -13,7 +13,7 @@ display_name = "Applied Bluespace Research" description = "Using bluespace to make things faster and better." prereq_ids = list("bluespace_basic", "engineering") - design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "bluespacesmartdart", "xenobio_slimebasic", "bluespace_tray", "light_replacer_blue") + design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "bluespacesmartdart", "xenobio_slimebasic", "bluespace_tray", "light_replacer_blue"/* GS13 EDIT */, "primitive_bluespace_belt" /* GS13 END EDIT */) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) /datum/techweb_node/adv_bluespace