From 88a7a0af180a55e49d54bbcd201ae0e3bd19ddce Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:09:22 +0200 Subject: [PATCH] [MIRROR] Moves nitrium crystals to crystallizer_items.dm; Deletes nitrium_crystals.dm (#29063) * Moves nitrium crystals to crystallizer_items.dm; Deletes nitrium_crystals.dm (#85130) ## About The Pull Request Moves nitrium crystals to crystallizer_items.dm and deletes the now empty nitrium_crystals.dm file. ## Why It's Good For The Game Nitrium crystals can only be acquired through the crystallizer and they are undeserving of their own file. ## Changelog Not player facing Co-authored-by: afonamos * Moves nitrium crystals to crystallizer_items.dm; Deletes nitrium_crystals.dm --------- Co-authored-by: afonamos <74638922+afonamos2@users.noreply.github.com> Co-authored-by: afonamos --- code/game/objects/items/nitrium_crystals.dm | 18 ------------------ .../gas_recipe_machines/crystallizer_items.dm | 19 +++++++++++++++++++ tgstation.dme | 1 - 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 code/game/objects/items/nitrium_crystals.dm diff --git a/code/game/objects/items/nitrium_crystals.dm b/code/game/objects/items/nitrium_crystals.dm deleted file mode 100644 index 828f437ade2..00000000000 --- a/code/game/objects/items/nitrium_crystals.dm +++ /dev/null @@ -1,18 +0,0 @@ -/obj/item/nitrium_crystal - desc = "A weird brown crystal, it smokes when broken" - name = "nitrium crystal" - icon = 'icons/obj/pipes_n_cables/atmos.dmi' - icon_state = "nitrium_crystal" - var/cloud_size = 1 - -/obj/item/nitrium_crystal/attack_self(mob/user) - . = ..() - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new - var/turf/location = get_turf(src) - create_reagents(5) - reagents.add_reagent(/datum/reagent/nitrium_low_metabolization, 3) - reagents.add_reagent(/datum/reagent/nitrium_high_metabolization, 2) - smoke.attach(location) - smoke.set_up(cloud_size, holder = src, location = location, carry = reagents, silent = TRUE) - smoke.start() - qdel(src) diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm index 95b548998a1..26cb3951135 100644 --- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm +++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm @@ -38,3 +38,22 @@ if(uses <= 0) qdel(src) return ITEM_INTERACT_SUCCESS + +/obj/item/nitrium_crystal + desc = "A weird brown crystal, it smokes when broken" + name = "nitrium crystal" + icon = 'icons/obj/pipes_n_cables/atmos.dmi' + icon_state = "nitrium_crystal" + var/cloud_size = 1 + +/obj/item/nitrium_crystal/attack_self(mob/user) + . = ..() + var/datum/effect_system/fluid_spread/smoke/chem/smoke = new + var/turf/location = get_turf(src) + create_reagents(5) + reagents.add_reagent(/datum/reagent/nitrium_low_metabolization, 3) + reagents.add_reagent(/datum/reagent/nitrium_high_metabolization, 2) + smoke.attach(location) + smoke.set_up(cloud_size, holder = src, location = location, carry = reagents, silent = TRUE) + smoke.start() + qdel(src) diff --git a/tgstation.dme b/tgstation.dme index 5fd7c2cd5e1..36a7a651830 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2450,7 +2450,6 @@ #include "code\game\objects\items\maintenance_loot.dm" #include "code\game\objects\items\manuals.dm" #include "code\game\objects\items\mop.dm" -#include "code\game\objects\items\nitrium_crystals.dm" #include "code\game\objects\items\paint.dm" #include "code\game\objects\items\paiwire.dm" #include "code\game\objects\items\pet_carrier.dm"