diff --git a/code/__DEFINES/_flags/item_flags.dm b/code/__DEFINES/_flags/item_flags.dm index ad0235d88fd..27fa374779a 100644 --- a/code/__DEFINES/_flags/item_flags.dm +++ b/code/__DEFINES/_flags/item_flags.dm @@ -5,7 +5,7 @@ /// When dropped, it calls qdel on itself #define ITEM_DROPDEL (1<<1) /// cannot be used to do normal melee hits - this INCLUDES user overrides of it! -#define ITEM_NOBLUDGEON (1<<2) +#define ITEM_NO_BLUDGEON (1<<2) /// for all things that are technically items but used for various different stuff #define ITEM_ABSTRACT (1<<3) /// is this item in a storage datum? @@ -33,7 +33,7 @@ DEFINE_BITFIELD(item_flags, list( BITFIELD(ITEM_IN_INVENTORY), BITFIELD(ITEM_DROPDEL), - BITFIELD(ITEM_NOBLUDGEON), + BITFIELD(ITEM_NO_BLUDGEON), BITFIELD(ITEM_ABSTRACT), BITFIELD(ITEM_IN_STORAGE), BITFIELD(ITEM_THROW_UNCATCHABLE), diff --git a/code/game/click/items.dm b/code/game/click/items.dm index 81fe4cf2f51..07c9754168c 100644 --- a/code/game/click/items.dm +++ b/code/game/click/items.dm @@ -144,7 +144,7 @@ if(isnull(intent)) intent = user.a_intent // end - if(item_flags & ITEM_NOBLUDGEON) + if(item_flags & ITEM_NO_BLUDGEON) return NONE if(clickchain_flags & CLICKCHAIN_DO_NOT_ATTACK) return NONE diff --git a/code/game/click/telekinesis.dm b/code/game/click/telekinesis.dm index b9ec3b51eef..f469340b09e 100644 --- a/code/game/click/telekinesis.dm +++ b/code/game/click/telekinesis.dm @@ -65,7 +65,7 @@ var/const/tk_maxrange = 15 desc = "Magic" icon = 'icons/obj/magic.dmi'//Needs sprites icon_state = "2" - item_flags = ITEM_DROPDEL | ITEM_NOBLUDGEON + item_flags = ITEM_DROPDEL | ITEM_NO_BLUDGEON //item_state = null w_class = WEIGHT_CLASS_HUGE layer = HUD_LAYER_BASE diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 51ca8536c17..787a021bcc5 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(PDAs) w_class = WEIGHT_CLASS_SMALL slot_flags = SLOT_ID | SLOT_BELT rad_flags = RAD_BLOCK_CONTENTS - item_flags = ITEM_NOBLUDGEON + item_flags = ITEM_NO_BLUDGEON //Main variables var/pdachoice = 1 diff --git a/code/game/objects/items/devices/body_snatcher_vr.dm b/code/game/objects/items/devices/body_snatcher_vr.dm index b09c6ebd798..527775b11ec 100644 --- a/code/game/objects/items/devices/body_snatcher_vr.dm +++ b/code/game/objects/items/devices/body_snatcher_vr.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/device_alt.dmi' icon_state = "sleevemate" //Give this a fancier sprite later. item_state = "healthanalyzer" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD slot_flags = SLOT_BELT w_class = WEIGHT_CLASS_SMALL materials_base = list(MAT_STEEL = 200) diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm index c59f50d59e0..4cdd0742561 100644 --- a/code/game/objects/items/devices/holowarrant.dm +++ b/code/game/objects/items/devices/holowarrant.dm @@ -4,7 +4,7 @@ desc = "The practical paperwork replacement for the officer on the go." icon_state = "holowarrant" item_state = "flashtool" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD throw_force = 5 w_class = WEIGHT_CLASS_SMALL throw_speed = 4 diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index edd1fd15864..ab0d9e64d91 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -5,7 +5,7 @@ icon_state = "jar" w_class = WEIGHT_CLASS_SMALL materials_base = list(MAT_GLASS = 200) - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD var/list/accept_mobs = list(/mob/living/simple_mob/animal/passive/lizard, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/sif/leech, /mob/living/simple_mob/animal/sif/frostfly, /mob/living/simple_mob/animal/sif/glitterfly) var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling drop_sound = 'sound/items/drop/glass.ogg' diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm index a0150adb782..837cf17aa93 100644 --- a/code/game/objects/items/holosign_creator.dm +++ b/code/game/objects/items/holosign_creator.dm @@ -9,7 +9,7 @@ throw_force = 0 throw_speed = 3 throw_range = 7 - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD var/list/signs = list() var/max_signs = 10 var/creation_time = 0 //time to create a holosign in deciseconds. diff --git a/code/game/objects/items/offhand.dm b/code/game/objects/items/offhand.dm index fd1cd2d38fa..489f2cecb6d 100644 --- a/code/game/objects/items/offhand.dm +++ b/code/game/objects/items/offhand.dm @@ -6,7 +6,7 @@ /obj/item/offhand name = "broken offhand" desc = "fire coderbus" - item_flags = ITEM_DROPDEL | ITEM_ABSTRACT | ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_DROPDEL | ITEM_ABSTRACT | ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD icon = 'icons/obj/item/abstract.dmi' icon_state = "offhand" drop_sound = null diff --git a/code/game/objects/items/robot/gripper.dm b/code/game/objects/items/robot/gripper.dm index d5970b5940a..c9711b4d3b1 100644 --- a/code/game/objects/items/robot/gripper.dm +++ b/code/game/objects/items/robot/gripper.dm @@ -7,7 +7,7 @@ Using an object on the gripper will interact with the item inside it, if it exists, instead." icon = 'icons/obj/device.dmi' icon_state = "gripper" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD //Has a list of items that it can hold. var/list/can_hold = list( diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 1d0327170c3..948ba30ba6f 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -11,7 +11,7 @@ SLOT_ID_LEFT_HAND = 'icons/mob/items/lefthand.dmi', SLOT_ID_RIGHT_HAND = 'icons/mob/items/righthand.dmi', ) - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD damage_force = 10 throw_force = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index ac4f097b1d8..15dfa207739 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -17,7 +17,7 @@ SLOT_ID_LEFT_HAND = 'icons/mob/items/lefthand.dmi', SLOT_ID_RIGHT_HAND = 'icons/mob/items/righthand.dmi', ) - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD damage_force = 10 throw_force = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/duct_tape.dm b/code/game/objects/items/weapons/duct_tape.dm index fd572daf27f..581df4a5a90 100644 --- a/code/game/objects/items/weapons/duct_tape.dm +++ b/code/game/objects/items/weapons/duct_tape.dm @@ -162,7 +162,7 @@ icon_state = "tape" w_class = WEIGHT_CLASS_TINY plane = MOB_PLANE - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD anchored = FALSE var/obj/item/stuck = null diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 1c1824e45e7..b29fd2080f0 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "plastic-explosive0" item_state = "plasticx" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD w_class = WEIGHT_CLASS_SMALL origin_tech = list(TECH_ILLEGAL = 2) var/datum/wires/explosive/c4/wires = null diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 3e97be72950..3c22fbb8c8c 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -31,7 +31,7 @@ possible_transfer_amounts = list(3) volume = 4 can_be_placed_into = null - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD atom_flags = OPENCONTAINER integrity_flags = NONE drop_sound = 'sound/items/drop/cloth.ogg' diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm index 28f9281fa78..2bda471ce0f 100644 --- a/code/modules/detectivework/tools/scanner.dm +++ b/code/modules/detectivework/tools/scanner.dm @@ -6,7 +6,7 @@ var/list/stored = list() w_class = WEIGHT_CLASS_SMALL item_state = "electronic" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD slot_flags = SLOT_BELT var/reveal_fingerprints = TRUE diff --git a/code/modules/economy/items/retail_scanner.dm b/code/modules/economy/items/retail_scanner.dm index 3aa58b72415..1ff2453f717 100644 --- a/code/modules/economy/items/retail_scanner.dm +++ b/code/modules/economy/items/retail_scanner.dm @@ -3,7 +3,7 @@ desc = "Swipe your ID card to make purchases electronically." icon = 'icons/obj/device.dmi' icon_state = "retail_idle" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD slot_flags = SLOT_BELT req_access = list(ACCESS_COMMAND_BRIDGE) w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/frames/item.dm b/code/modules/frames/item.dm index 7233ee693f7..4049da46955 100644 --- a/code/modules/frames/item.dm +++ b/code/modules/frames/item.dm @@ -7,7 +7,7 @@ icon = 'icons/modules/frames/base.dmi' icon_state = "item" - item_flags = ITEM_NOBLUDGEON + item_flags = ITEM_NO_BLUDGEON obj_rotation_flags = OBJ_ROTATION_ENABLED | OBJ_ROTATION_DEFAULTING /// frame datum - set to typepath for initialization diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm index a140eaf7774..19b7ae2a09e 100644 --- a/code/modules/hydroponics/trays/tray_reagents.dm +++ b/code/modules/hydroponics/trays/tray_reagents.dm @@ -1,7 +1,7 @@ /obj/item/plantspray icon = 'icons/obj/hydroponics_machines.dmi' item_state = "spraycan" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD slot_flags = SLOT_BELT throw_force = 4 w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index e6f06374f3d..ee7df0cc9b3 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -7,7 +7,7 @@ w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/integrated_electronics/electronic_setups.dmi' icon_state = "setup_small" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD show_messages = TRUE datum_flags = DF_USE_TAG var/list/assembly_components = list() diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index 20da320a5ba..2f2ee738343 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -3,7 +3,7 @@ desc = "A combination autopainter and flash anodizer designed to give electronic assemblies a colorful, wear-resistant finish." icon = 'icons/obj/integrated_electronics/electronic_tools.dmi' icon_state = "detailer" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD w_class = WEIGHT_CLASS_SMALL var/detail_color = COLOR_ASSEMBLY_WHITE var/list/color_list = list( diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 7ef21c6729a..6fc4a1f3553 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -55,7 +55,7 @@ icon_state = "nose" desc = "The BOOP module, a simple reagent and atmosphere sniffer." damage_force = 0 - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD throw_force = 0 attack_verb = list("nuzzled", "nosed", "booped") w_class = WEIGHT_CLASS_TINY @@ -174,7 +174,7 @@ icon = 'icons/mob/dogborg_vr.dmi' icon_state = "synthtongue" attack_sound = 'sound/effects/attackblob.ogg' - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD var/emagged = 0 var/datum/matter_synth/water = null @@ -296,7 +296,7 @@ desc = "Toggles floor scrubbing." icon = 'icons/mob/dogborg_vr.dmi' icon_state = "scrub0" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD var/enabled = FALSE /obj/item/pupscrubber/attack_self(mob/user, datum/event_args/actor/actor) @@ -374,7 +374,7 @@ icon_state = "pounce" desc = "Leap at your target to momentarily stun them." damage_force = 0 - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD throw_force = 0 /obj/item/dogborg/pounce/attack_self(mob/user, datum/event_args/actor/actor) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 40a5a99c387..7b84d99840d 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -5,7 +5,7 @@ icon = 'icons/mob/dogborg_vr.dmi' icon_state = "sleeper" w_class = WEIGHT_CLASS_TINY - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD var/mob/living/carbon/patient = null var/mob/living/silicon/robot/hound = null var/inject_amount = 10 diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index b402ceb10fe..1d603dd5458 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -59,7 +59,7 @@ icon_state = "[initial(icon_state)]-open" sleep(0.5 SECONDS) icon_state = initial(icon_state) - else if(user.a_intent == INTENT_HELP || (P.item_flags & ITEM_NOBLUDGEON)) + else if(user.a_intent == INTENT_HELP || (P.item_flags & ITEM_NO_BLUDGEON)) to_chat(user, SPAN_WARNING("You can't put [P] in [src]!")) else return ..() diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 4a7547f8c6d..16b023aaf44 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -3,7 +3,7 @@ desc = "A combined label printer, applicator, and remover, all in a single portable device. Designed to be easy to operate and use." icon = 'icons/obj/bureaucracy.dmi' icon_state = "labeler0" - item_flags = ITEM_NOBLUDGEON + item_flags = ITEM_NO_BLUDGEON w_class = WEIGHT_CLASS_SMALL drop_sound = 'sound/items/handling/tape_drop.ogg' pickup_sound = 'sound/items/handling/tape_pickup.ogg' diff --git a/code/modules/photography/camera.dm b/code/modules/photography/camera.dm index 3a2edbb82f3..68b32eec2c7 100644 --- a/code/modules/photography/camera.dm +++ b/code/modules/photography/camera.dm @@ -7,7 +7,7 @@ worn_state = "camera" worn_render_flags = NONE desc = "A polaroid camera. 10 photos left." - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD w_class = WEIGHT_CLASS_SMALL slot_flags = SLOT_BELT materials_base = list(MAT_STEEL = 2000) diff --git a/code/modules/reagents/items/spray.dm b/code/modules/reagents/items/spray.dm index ca4a7078ce8..fa7b112957e 100644 --- a/code/modules/reagents/items/spray.dm +++ b/code/modules/reagents/items/spray.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/janitor.dmi' icon_state = "cleaner" item_state = "cleaner" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD atom_flags = OPENCONTAINER slot_flags = SLOT_BELT | SLOT_HOLSTER throw_force = 3 diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 8fcfeaec906..9bf25114410 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -17,7 +17,7 @@ damage_mode = DAMAGE_MODE_SHARP integrity_flags = INTEGRITY_ACIDPROOF rad_flags = RAD_NO_CONTAMINATE - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT var/mode = SYRINGE_DRAW var/image/filling //holds a reference to the current filling overlay var/visible_name = "a syringe" diff --git a/code/modules/resleeving/mirror.dm b/code/modules/resleeving/mirror.dm index bae809a6497..f2d05ea4825 100644 --- a/code/modules/resleeving/mirror.dm +++ b/code/modules/resleeving/mirror.dm @@ -11,7 +11,7 @@ integrity_flags = INTEGRITY_INDESTRUCTIBLE var/stored_mind = null var/tmp/mob/living/carbon/human/human - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD //holder to prevent having to find it each time /mob/living/carbon/human/var/obj/item/implant/mirror/mirror @@ -112,7 +112,7 @@ throw_range = 10 materials_base = list(MAT_STEEL = 200) origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD /obj/item/mirrortool name = "Mirror Installation Tool" @@ -127,7 +127,7 @@ throw_range = 10 materials_base = list(MAT_STEEL = 200) origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD var/obj/item/implant/mirror/imp = null /obj/item/mirrortool/afterattack(atom/target, mob/user, clickchain_flags, list/params) diff --git a/code/modules/vore/fluffstuff/custom_items.dm b/code/modules/vore/fluffstuff/custom_items.dm index 8a7098489a6..d8414b03e50 100644 --- a/code/modules/vore/fluffstuff/custom_items.dm +++ b/code/modules/vore/fluffstuff/custom_items.dm @@ -551,7 +551,7 @@ desc = "Seems absurd, doesn't it? Yet, here we are. Generally considered dangerous contraband unless the user has permission from Central Command." icon = 'icons/obj/device_alt.dmi' icon_state = "hand_tele" - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD w_class = WEIGHT_CLASS_SMALL origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_ILLEGAL = 7) @@ -847,7 +847,7 @@ icon = 'icons/obj/device_alt.dmi' icon_state = "motion2" w_class = WEIGHT_CLASS_TINY - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NO_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD var/tele_name var/obj/item/perfect_tele/tele_hand