cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 12:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

A few more items consolidated

Browse Source
This commit is contained in:
SatinIsle
2023-09-22 22:47:06 +01:00
parent ff5c25b61b
commit 1479907300
5 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/miscellaneous_vr.dm
-6
View File
@@ -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)
code/modules/projectiles/guns/energy/bsharpoon_vr.dm
-18
View File
@@ -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
code/modules/projectiles/guns/energy/stun.dm
-11
View File
@@ -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"
code/modules/reagents/machinery/dispenser/dispenser_presets.dm
-30
View File
@@ -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
)