From 1479907300f052e537a34ee55fc84b44f3ac27ef Mon Sep 17 00:00:00 2001 From: SatinIsle Date: Fri, 22 Sep 2023 22:47:06 +0100 Subject: [PATCH] A few more items consolidated --- .../clothing/under/miscellaneous_vr.dm | 6 -- .../projectiles/guns/energy/bsharpoon_vr.dm | 18 ----- code/modules/projectiles/guns/energy/stun.dm | 11 --- .../machinery/dispenser/dispenser_presets.dm | 30 -------- maps/redgate/fantasy_items.dm | 71 +++++++++++++++++++ 5 files changed, 71 insertions(+), 65 deletions(-) diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 8c862dec8d9..9d4633bcf86 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -187,12 +187,6 @@ if(target_size < 0.1) target_size = 0.1 -/obj/item/clothing/gloves/bluespace/magic - name = "bracer of resilience" - desc = "A bracer that is said to make one resistent to size changing magic." - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_state = "bs_magic" - //Same as Nanotrasen Security Uniforms /obj/item/clothing/under/ert armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0) diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index 51dded41539..5874f65640f 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -232,21 +232,3 @@ flick("harpoon-1-change",src) icon_state = "harpoon-2" transforming = 0 - -/obj/item/weapon/bluespace_harpoon/wand - name = "teleportation wand" - desc = "An odd wand that weighs more than it looks like it should. It has a wire protruding from it and a glass-like tip, suggesting there may be more tech behind this than magic." - - icon = 'icons/obj/gun_vr.dmi' - icon_state = "harpoonwand-2" - -/obj/item/weapon/bluespace_harpoon/wand/update_icon() - if(transforming) - switch(mode) - if(0) - flick("harpoonwand-2-change", src) - icon_state = "harpoonwand-1" - if(1) - flick("harpoonwand-1-change",src) - icon_state = "harpoonwand-2" - transforming = 0 \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 9fbf09c2306..daea8a63da8 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -210,14 +210,3 @@ item_state = "stunrevolver" w_class = ITEMSIZE_SMALL //small pistol is small origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) - -/* - * magic orb - */ - -/obj/item/weapon/gun/energy/taser/magic - name = "orb of lightning" - desc = "An orb filled with electrical energy, it looks oddly like a toy plasma orb..." - description_fluff = "" - icon_state = "orb" - diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm index 40039f29d36..916c506a2e8 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm @@ -148,33 +148,3 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/chaitea, /obj/item/weapon/reagent_containers/chem_disp_cartridge/decafchai ) - -/obj/machinery/chemical_dispenser/kettle //reskin of coffee dispenser - name = "kettle" - desc = "A kettle used for making hot drinks." - icon_state = "kettle" - ui_title = "kettle" - accept_drinking = 1 - -/obj/machinery/chemical_dispenser/kettle/full - spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mint, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/berry, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/chaitea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/decafchai - ) - diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm index 4ac58c2d46d..07abaf4de1d 100644 --- a/maps/redgate/fantasy_items.dm +++ b/maps/redgate/fantasy_items.dm @@ -389,3 +389,74 @@ src.operating = 0 // Turn it off again aferwards SStgui.update_uis(src) soundloop.stop() + +// Magic bluespace stuff + + +/obj/item/clothing/gloves/bluespace/magic + name = "bracer of resilience" + desc = "A bracer that is said to make one resistent to size changing magic." + icon = 'icons/inventory/accessory/item_vr.dmi' + icon_state = "bs_magic" + +//harpoon + +/obj/item/weapon/bluespace_harpoon/wand + name = "teleportation wand" + desc = "An odd wand that weighs more than it looks like it should. It has a wire protruding from it and a glass-like tip, suggesting there may be more tech behind this than magic." + + icon = 'icons/obj/gun_vr.dmi' + icon_state = "harpoonwand-2" + +/obj/item/weapon/bluespace_harpoon/wand/update_icon() + if(transforming) + switch(mode) + if(0) + flick("harpoonwand-2-change", src) + icon_state = "harpoonwand-1" + if(1) + flick("harpoonwand-1-change",src) + icon_state = "harpoonwand-2" + transforming = 0 + +/* + * magic orb + */ + +/obj/item/weapon/gun/energy/taser/magic + name = "orb of lightning" + desc = "An orb filled with electrical energy, it looks oddly like a toy plasma orb..." + description_fluff = "" + icon_state = "orb" + +//Kettle + +/obj/machinery/chemical_dispenser/kettle //reskin of coffee dispenser + name = "kettle" + desc = "A kettle used for making hot drinks." + icon_state = "kettle" + ui_title = "kettle" + accept_drinking = 1 + +/obj/machinery/chemical_dispenser/kettle/full + spawn_cartridges = list( + /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/mint, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/berry, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/chaitea, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/decafchai + ) +