From f99c17012c446375c34ff09493166ea5df93c1a7 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Mon, 15 Mar 2021 22:26:05 +0100 Subject: [PATCH] removes jars from techweb --- code/game/objects/items/pet_carrier.dm | 11 +++++++++++ code/modules/events/travelling_trader.dm | 2 +- code/modules/research/designs/bluespace_designs.dm | 10 ---------- .../modules/research/techweb/nodes/bluespace_nodes.dm | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index f0d66d9097..724a5be106 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -332,6 +332,7 @@ to_chat(occupant, "You pop out of the [src], slightly dazed!") occupant.Stun(5 SECONDS) + /obj/item/pet_carrier/bluespace/return_air() if(!occupant_gas_supply) occupant_gas_supply = new @@ -353,4 +354,14 @@ if(..()) name = "[initial(name)] ([target])" +/obj/item/pet_carrier/bluespace/single_use + desc = "A jar, that seems to be bigger on the inside, somehow allowing lifeforms to fit through its narrow entrance. This one looks exceptionally fragile." + +/obj/item/pet_carrier/bluespace/single_use/remove_occupant(mob/living/occupant) + . = ..() + + if(!QDELETING(src)) + playsound(src, "shatter", 70, 1) + qdel(src) + #undef pet_carrier_full diff --git a/code/modules/events/travelling_trader.dm b/code/modules/events/travelling_trader.dm index 2f7b9dbea5..f7cbba2e4a 100644 --- a/code/modules/events/travelling_trader.dm +++ b/code/modules/events/travelling_trader.dm @@ -200,7 +200,7 @@ return FALSE /mob/living/carbon/human/dummy/travelling_trader/animal_hunter/give_reward(mob/giver) //the reward is actually given in a jar, because releasing it onto the station might be a bad idea - var/obj/item/pet_carrier/bluespace/jar = new(get_turf(src)) + var/obj/item/pet_carrier/bluespace/single_use/jar = new(get_turf(src)) var/chosen_animal = pickweight(possible_rewards) var/mob/living/new_animal = new chosen_animal(jar) if(giver && giver.tag) diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm index 235abd2005..a70449b035 100644 --- a/code/modules/research/designs/bluespace_designs.dm +++ b/code/modules/research/designs/bluespace_designs.dm @@ -105,13 +105,3 @@ materials = list(/datum/material/iron = 2000, /datum/material/bluespace = 500) category = list("Bluespace Designs") departmental_flags = DEPARTMENTAL_FLAG_SERVICE - -/datum/design/bluespace_carrier - name = "Bluespace Jar" - desc = "A jar used to contain creatures, using the power of bluespace." - id = "bluespace_carrier" - build_type = PROTOLATHE - build_path = /obj/item/pet_carrier/bluespace - materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 600) - category = list("Bluespace Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE diff --git a/code/modules/research/techweb/nodes/bluespace_nodes.dm b/code/modules/research/techweb/nodes/bluespace_nodes.dm index ae9fdd6485..703b81fd02 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", "bluespace_carrier") + design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "bluespacesmartdart", "xenobio_slimebasic", "bluespace_tray") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) /datum/techweb_node/adv_bluespace