cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split up and rename var/flags (#17794)

Browse Source 
* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2023-11-22 16:27:51 +00:00
committed by GitHub
co-authored by Cody Brittain
parent 4b9303a1e9
commit 06601c9ec3
335 changed files with 763 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/AI_modules.dm
+1 -1
View File
@@ -12,7 +12,7 @@ AI MODULES
icon_state = "std_mod"
item_state = "electronic"
desc = "An AI Module for transmitting encrypted instructions to the AI."
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5.0
w_class = ITEMSIZE_SMALL
throwforce = 5.0
code/game/objects/items/weapons/RFD.dm
+1 -1
View File
@@ -22,7 +22,7 @@
opacity = FALSE
density = FALSE
anchored = FALSE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5
throwforce = 10
throw_speed = 1
code/game/objects/items/weapons/autopsy.dm
+1 -1
View File
@@ -7,7 +7,7 @@
desc = "Extracts information on wounds."
icon = 'icons/obj/device.dmi'
icon_state = "autopsy"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
var/list/datum/autopsy_data_scanner/wdata = list()
code/game/objects/items/weapons/chaplain_items.dm
+1 -1
View File
@@ -260,7 +260,7 @@
icon_state = "urn"
applies_material_colour = TRUE
w_class = ITEMSIZE_SMALL
flags = NOBLUDGEON
item_flags = ITEM_FLAG_NO_BLUDGEON
/obj/item/material/urn/afterattack(var/obj/A, var/mob/user, var/proximity)
if(!istype(A, /obj/effect/decal/cleanable/ash))
code/game/objects/items/weapons/chewables.dm
+1 -1
View File
@@ -32,7 +32,7 @@
/obj/item/clothing/mask/chewable/Initialize()
create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
. = ..()
flags |= NOREACT // so it doesn't react until you light it
atom_flags |= ATOM_FLAG_NO_REACT // so it doesn't react until you light it
if(wrapped)
slot_flags = null
update_icon()
code/game/objects/items/weapons/cigs_lighters.dm
+3 -3
View File
@@ -172,7 +172,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/Initialize()
. = ..()
flags |= NOREACT // so it doesn't react until you light it
atom_flags |= ATOM_FLAG_NO_REACT // so it doesn't react until you light it
create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
/obj/item/clothing/mask/smokable/process()
@@ -213,7 +213,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
e.start()
qdel(src)
return
flags &= ~NOREACT // allowing reagents to react after being lit
atom_flags &= ~ATOM_FLAG_NO_REACT // allowing reagents to react after being lit
reagents.handle_reactions()
icon_state = icon_on
item_state = icon_on
@@ -705,7 +705,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
)
w_class = ITEMSIZE_TINY
throwforce = 4
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
attack_verb = list("burnt", "singed")
var/base_state
code/game/objects/items/weapons/circuitboards/circuitboard.dm
+1 -1
View File
@@ -12,7 +12,7 @@
item_state = "electronic"
origin_tech = list(TECH_DATA = 2)
w_class = ITEMSIZE_SMALL
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5
throwforce = 5
throw_speed = 3
code/game/objects/items/weapons/cloaking_device.dm
+1 -1
View File
@@ -9,7 +9,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "shield0"
var/active = 0.0
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
item_state = "electronic"
throwforce = 10.0
throw_speed = 2
code/game/objects/items/weapons/ecigs.dm
+1 -1
View File
@@ -246,7 +246,7 @@
icon_state = "ecartridge"
matter = list(MATERIAL_STEEL = 50, MATERIAL_GLASS = 10)
volume = 20
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
/obj/item/reagent_containers/ecig_cartridge/examine(mob/user)
. = ..()
code/game/objects/items/weapons/explosives.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon = 'icons/obj/assemblies.dmi'
icon_state = "plastic-explosive0"
item_state = "plasticx"
flags = NOBLUDGEON
item_flags = ITEM_FLAG_NO_BLUDGEON
w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_ILLEGAL = 2)
var/datum/wires/explosive/c4/wires = null
code/game/objects/items/weapons/extinguisher.dm
+8 -7
View File
@@ -5,7 +5,8 @@
icon_state = "metal_canister"
item_state = "metal_canister"
hitsound = 'sound/weapons/smash.ogg'
flags = CONDUCT | OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
obj_flags = OBJ_FLAG_CONDUCTABLE
throwforce = 8
w_class = ITEMSIZE_NORMAL
throw_speed = 2
@@ -22,9 +23,9 @@
/obj/item/reagent_containers/extinguisher_refill/attackby(obj/item/O, mob/user)
if(O.isscrewdriver())
if(is_open_container())
flags &= ~OPENCONTAINER
atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER
else
flags |= OPENCONTAINER
atom_flags |= ATOM_FLAG_OPEN_CONTAINER
to_chat(user, SPAN_NOTICE("Using \the [O], you [is_open_container() ? "unsecure" : "secure"] the cartridge's lid!"))
return TRUE
@@ -48,7 +49,7 @@
if(is_open_container())
if(LAZYLEN(reagents.reagent_volumes))
to_chat(user,"<span class='notice'>With a quick twist of the cartridge's lid, you secure the reagents inside \the [src].</span>")
flags &= ~OPENCONTAINER
atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER
else
to_chat(user,"<span class='notice'>You can't secure the cartridge without putting reagents in!</span>")
else
@@ -78,7 +79,7 @@
/obj/item/reagent_containers/extinguisher_refill/filled/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/toxin/fertilizer/monoammoniumphosphate, volume)
flags &= ~OPENCONTAINER
atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER
/obj/item/extinguisher
name = "fire extinguisher"
@@ -87,7 +88,7 @@
icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg'
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
throwforce = 10
w_class = ITEMSIZE_HUGE
throw_speed = 2
@@ -112,7 +113,7 @@
icon_state = "miniFE0"
item_state = "miniFE"
hitsound = null //it is much lighter, after all.
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
throwforce = 2
w_class = ITEMSIZE_SMALL
force = 2.0
code/game/objects/items/weapons/flamethrower.dm
+1 -1
View File
@@ -7,7 +7,7 @@
contained_sprite = TRUE
w_class = ITEMSIZE_LARGE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 3
throwforce = 10
throw_speed = 1
code/game/objects/items/weapons/grenades/grenade.dm
+1 -1
View File
@@ -11,7 +11,7 @@
item_state = "grenade"
throw_speed = 4
throw_range = 20
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
contained_sprite = 1
var/active = 0
code/game/objects/items/weapons/handcuffs.dm
+1 -1
View File
@@ -7,7 +7,7 @@
sprite_sheets = list(
BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/cuff.dmi'
)
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
throwforce = 5
w_class = ITEMSIZE_SMALL
code/game/objects/items/weapons/improvised_components.dm
+1 -1
View File
@@ -44,7 +44,7 @@
desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
icon_state = "wiredrod"
item_state = "rods"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 8
throwforce = 10
w_class = ITEMSIZE_NORMAL
code/game/objects/items/weapons/ipc_scanner.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "ipc_tag_scanner"
item_state = "ipc_tag_scanner"
contained_sprite = TRUE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
throwforce = 3
w_class = ITEMSIZE_SMALL
code/game/objects/items/weapons/landmines.dm
+1 -1
View File
@@ -59,7 +59,7 @@
if(deployed || ignore_deployment)
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
if(H.shoes?.item_flags & LIGHTSTEP)
if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP)
..()
return
if(isliving(AM))
code/game/objects/items/weapons/material/caltrops.dm
+1 -1
View File
@@ -24,7 +24,7 @@
return
if(H.resting)
return
if(H.shoes?.item_flags & LIGHTSTEP)
if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP)
return
to_chat(H, SPAN_DANGER("You step on \the [src]!"))
code/game/objects/items/weapons/material/knives.dm
+1 -1
View File
@@ -7,7 +7,7 @@
contained_sprite = TRUE
icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
sharp = 1
edge = TRUE
var/active = 1 // For butterfly knives
code/game/objects/items/weapons/material/twohanded.dm
+1 -1
View File
@@ -351,7 +351,7 @@
desc = "A robust tree-cutting chainsaw intended to cut down various types of invasive spaceplants that grow on the station."
icon_state = "chainsaw_off"
base_icon = "chainsaw_off"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 10
force_unwielded = 10
force_wielded = 20
code/game/objects/items/weapons/melee/energy.dm
+7 -5
View File
@@ -6,7 +6,7 @@
sharp = 0
edge = FALSE
armor_penetration = 20
flags = NOBLOODY
atom_flags = ATOM_FLAG_NO_BLOOD
can_embed = 0//No embedding pls
var/base_reflectchance = 40
var/base_block_chance = 25
@@ -141,7 +141,8 @@
throw_speed = 5
throw_range = 10
w_class = ITEMSIZE_HUGE
flags = CONDUCT | NOBLOODY
atom_flags = ATOM_FLAG_NO_BLOOD
obj_flags = OBJ_FLAG_CONDUCTABLE
origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_MATERIAL = 7, TECH_ILLEGAL = 4)
attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
sharp = 1
@@ -189,7 +190,8 @@
throw_speed = 1
throw_range = 5
w_class = ITEMSIZE_NORMAL
flags = CONDUCT | NOBLOODY
atom_flags = ATOM_FLAG_NO_BLOOD
obj_flags = OBJ_FLAG_CONDUCTABLE
origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4)
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
sharp = 1
@@ -236,7 +238,7 @@
throw_speed = 1
throw_range = 5
w_class = ITEMSIZE_SMALL
flags = NOBLOODY
atom_flags = ATOM_FLAG_NO_BLOOD
origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
sharp = 1
edge = TRUE
@@ -402,7 +404,7 @@
throw_speed = 1
throw_range = 1
w_class = ITEMSIZE_LARGE//So you can't hide it in your pocket or some such.
flags = NOBLOODY
atom_flags = ATOM_FLAG_NO_BLOOD
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
var/mob/living/creator
base_reflectchance = 140
code/game/objects/items/weapons/melee/misc.dm
+3 -3
View File
@@ -13,7 +13,7 @@
desc = "A tool used by great men to placate the frothing masses."
icon_state = "chain"
item_state = "chain"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
force = 10
throwforce = 7
@@ -27,7 +27,7 @@
desc = "A deadly chainsaw in the shape of a sword."
icon = 'icons/obj/weapons.dmi'
icon_state = "chainswordoff"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
force = 15
throwforce = 7
@@ -183,7 +183,7 @@
icon_state = "officersword"
item_state = "officersword"
contained_sprite = TRUE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
force = 15
throwforce = 5
code/game/objects/items/weapons/paint.dm
+1 -1
View File
@@ -13,7 +13,7 @@
possible_transfer_amounts = list(10,20,30,60)
volume = 60
unacidable = 0
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
fragile = 0
var/paint_reagent = null //name of the reagent responsible for colouring the paint
var/paint_type = null //used for colouring detective technicolor coat and hat
code/game/objects/items/weapons/shields.dm
+2 -2
View File
@@ -60,7 +60,7 @@
name = "riot shield"
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
icon_state = "riot"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BACK
force = 5.0
throwforce = 5.0
@@ -130,7 +130,7 @@
name = "energy combat shield"
desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
icon_state = "eshield0"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 3.0
throwforce = 5.0
throw_speed = 1
code/game/objects/items/weapons/soap.dm
+2 -2
View File
@@ -15,7 +15,7 @@
throwforce = 0
throw_speed = 4
throw_range = 20
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
var/key_data
var/clean_msg
var/last_clean
@@ -50,7 +50,7 @@
if(isliving(AM))
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
if(H.shoes?.item_flags & LIGHTSTEP)
if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP)
return
var/mob/living/M = AM
M.slip("the [src.name]",3)
code/game/objects/items/weapons/storage/bags.dm
+1 -1
View File
@@ -275,7 +275,7 @@
desc = "A bag for carrying lots of money. It's got a big dollar sign printed on the front."
icon_state = "moneybag"
item_state = "moneybag"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
max_storage_space = 100
w_class = ITEMSIZE_LARGE
can_hold = list(/obj/item/coin,/obj/item/spacecash)
code/game/objects/items/weapons/storage/briefcase.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "briefcase"
item_state = "briefcase"
contained_sprite = TRUE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 8.0
throw_speed = 1
throw_range = 4
code/game/objects/items/weapons/storage/fancy.dm
+1 -1
View File
@@ -304,7 +304,7 @@
var/cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette
/obj/item/storage/box/fancy/cigarettes/Initialize()
flags |= NOREACT
atom_flags |= ATOM_FLAG_NO_REACT
create_reagents(15 * storage_slots) //so people can inject cigarettes without opening a packet, now with being able to inject the whole one
. = ..()
code/game/objects/items/weapons/storage/toolbox.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "red"
item_state = "red"
center_of_mass = list("x" = 16,"y" = 11)
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5
throwforce = 10
throw_speed = 1
code/game/objects/items/weapons/surgery_tools.dm
+6 -6
View File
@@ -28,7 +28,7 @@
item_state = "retractor"
surgerysound = 'sound/items/surgery/retractor.ogg'
matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 5000)
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
/*
@@ -41,7 +41,7 @@
item_state = "hemostat"
surgerysound = 'sound/items/surgery/hemostat.ogg'
matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("attacked", "pinched")
@@ -55,7 +55,7 @@
item_state = "cautery"
surgerysound = 'sound/items/surgery/cautery.ogg'
matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("burnt")
@@ -70,7 +70,7 @@
surgerysound = 'sound/items/surgery/surgicaldrill.ogg'
hitsound = /singleton/sound_category/drillhit_sound
matter = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 10000)
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 15
w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
@@ -87,7 +87,7 @@
icon_state = "scalpel"
item_state = "scalpel"
surgerysound = 'sound/items/surgery/scalpel.ogg'
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 10
sharp = 1
edge = TRUE
@@ -145,7 +145,7 @@
item_state = "saw"
surgerysound = 'sound/items/surgery/circularsaw.ogg'
hitsound = 'sound/weapons/saw/circsawhit.ogg'
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 15
w_class = ITEMSIZE_NORMAL
throwforce = 9
code/game/objects/items/weapons/syndie.dm
+1 -1
View File
@@ -106,7 +106,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "pen"
item_state = "pen"
flags = HELDMAPTEXT
item_flags = ITEM_FLAG_HELD_MAP_TEXT
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 0
w_class = ITEMSIZE_TINY
code/game/objects/items/weapons/tanks/tank_types.dm
+3 -3
View File
@@ -90,7 +90,7 @@
icon_state = "phoron"
item_state = "phoron"
gauge_icon = null
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = null //they have no straps!
/obj/item/tank/phoron/adjust_initial_gas()
@@ -119,7 +119,7 @@
desc = "Contains gaseous hydrogen. Do not inhale. Warning: extremely flammable."
icon_state = "hydrogen"
item_state = "hydrogen"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
/obj/item/tank/hydrogen/adjust_initial_gas()
air_contents.adjust_gas(GAS_HYDROGEN, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
@@ -138,7 +138,7 @@
item_state = "emergency"
gauge_icon = "indicator_emergency"
gauge_cap = 4
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL
force = 4.0
code/game/objects/items/weapons/tanks/tanks.dm
+5 -5
View File
@@ -9,7 +9,7 @@
var/last_gauge_pressure
var/gauge_cap = 6
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BACK
w_class = ITEMSIZE_NORMAL
@@ -135,11 +135,11 @@
mask_check = 1
if(mask_check)
if(location.wear_mask && (location.wear_mask.item_flags & AIRTIGHT))
if(location.wear_mask && (location.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT))
data["maskConnected"] = 1
else if(istype(location, /mob/living/carbon/human))
var/mob/living/carbon/human/H = location
if(H.head && (H.head.item_flags & AIRTIGHT))
if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT))
data["maskConnected"] = 1
return data
@@ -159,11 +159,11 @@
location.internals.icon_state = "internal0"
else
var/can_open_valve
if(location.wear_mask && (location.wear_mask.item_flags & AIRTIGHT))
if(location.wear_mask && (location.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT))
can_open_valve = 1
else if(istype(location,/mob/living/carbon/human))
var/mob/living/carbon/human/H = location
if(H.head && (H.head.item_flags & AIRTIGHT))
if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT))
can_open_valve = 1
if(can_open_valve)
code/game/objects/items/weapons/tape.dm
+3 -3
View File
@@ -98,9 +98,9 @@
drop_sound = null
var/obj/item/stuck = null
/obj/item/ducttape/New()
..()
flags |= NOBLUDGEON
/obj/item/ducttape/Initialize()
. = ..()
item_flags |= ITEM_FLAG_NO_BLUDGEON
/obj/item/ducttape/examine(mob/user)
return stuck.examine(user)
code/game/objects/items/weapons/teleportation.dm
+3 -3
View File
@@ -32,7 +32,7 @@
var/frequency = 1451
var/broadcasting = null
var/listening = TRUE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
w_class = ITEMSIZE_SMALL
item_state = "electronic"
throw_speed = 4
@@ -146,7 +146,7 @@ Frequency:
icon_state = "hand_tele"
item_state = "electronic"
throwforce = 5
flags = HELDMAPTEXT
item_flags = ITEM_FLAG_HELD_MAP_TEXT
w_class = ITEMSIZE_SMALL
throw_speed = 3
throw_range = 5
@@ -266,7 +266,7 @@ Frequency:
desc_antag = "Click a closet with this to install. Step into the closet and close the door to teleport to the linked closet. It has a one minute cooldown after a batch teleport."
icon = 'icons/obj/modular_components.dmi'
icon_state = "cpu_normal_photonic"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MAGNET = 2, TECH_BLUESPACE = 3)
matter = list(DEFAULT_WALL_MATERIAL = 400)
code/game/objects/items/weapons/tools.dm
+10 -10
View File
@@ -25,7 +25,7 @@
)
icon_state = "wrench"
item_state = "wrench"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
force = 8
throwforce = 7
@@ -54,7 +54,7 @@
)
icon_state = "screwdriver"
item_state = "screwdriver"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT | SLOT_EARS
force = 8
throwforce = 5
@@ -128,7 +128,7 @@
)
icon_state = "wirecutters"
item_state = "wirecutters"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
force = 6
throw_speed = 2
@@ -218,7 +218,7 @@
item_state = "welder"
var/welding_state = "welding_sparks"
contained_sprite = TRUE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
drop_sound = 'sound/items/drop/weldingtool.ogg'
pickup_sound = 'sound/items/pickup/weldingtool.ogg'
@@ -688,7 +688,7 @@
)
icon_state = "crowbar"
item_state = "crowbar"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
force = 8
throwforce = 7
@@ -717,7 +717,7 @@
w_class = ITEMSIZE_NORMAL
force = 12
throwforce = 12
flags = null //Handle is insulated, so this means it won't conduct electricity and hurt you.
obj_flags = null //Handle is insulated, so this means it won't conduct electricity and hurt you.
sharp = TRUE
edge = TRUE
origin_tech = list(TECH_ENGINEERING = 2)
@@ -752,7 +752,7 @@
)
icon_state = "pipewrench"
item_state = "pipewrench"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
force = 8
throwforce = 7
@@ -835,7 +835,7 @@
icon_state = "impact_wrench-screw"
item_state = "impact_wrench"
contained_sprite = TRUE
flags = HELDMAPTEXT
item_flags = ITEM_FLAG_HELD_MAP_TEXT
force = 8
attack_verb = list("gored", "drilled", "screwed", "punctured")
w_class = ITEMSIZE_SMALL
@@ -908,7 +908,7 @@
desc = "Harvested from the finest NanoTrasen steel sheep."
icon = 'icons/obj/tools.dmi'
icon_state = "steel_wool"
flags = NOBLUDGEON
item_flags = ITEM_FLAG_NO_BLUDGEON
w_class = ITEMSIZE_SMALL
var/lit
matter = list(MATERIAL_STEEL = 40)
@@ -972,7 +972,7 @@
)
icon_state = "hammer"
item_state = "hammer"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
force = 8
throwforce = 5
code/game/objects/items/weapons/traps.dm
+1 -1
View File
@@ -125,7 +125,7 @@
/obj/item/trap/Crossed(atom/movable/AM)
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
if(H.shoes?.item_flags & LIGHTSTEP)
if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP)
return
if(deployed && isliving(AM))
var/mob/living/L = AM
code/game/objects/items/weapons/vaurca_items.dm
+6 -4
View File
@@ -104,7 +104,8 @@
throw_speed = 5
throw_range = 10
w_class = ITEMSIZE_TINY
flags = CONDUCT | NOBLOODY
atom_flags = ATOM_FLAG_NO_BLOOD
obj_flags = OBJ_FLAG_CONDUCTABLE
attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
sharp = 1
edge = TRUE
@@ -277,7 +278,7 @@
magpulse = 1
slowdown = 3
action_button_name = null
item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT|NOSLIP
item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_AIRTIGHT|ITEM_FLAG_INJECTION_PORT|ITEM_FLAG_NO_SLIP
canremove = FALSE
/obj/item/clothing/shoes/magboots/vaurca/aug/throw_at()
@@ -367,7 +368,7 @@
/obj/item/clothing/mask/gas/vaurca/tactical
name = "tactical garment"
desc = "A tactical mandible garment with state of the art air filtration."
item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | FLEXIBLEMATERIAL | THICKMATERIAL
item_flags = ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT | ITEM_FLAG_AIRTIGHT | ITEM_FLAG_FLEXIBLE_MATERIAL | ITEM_FLAG_THICK_MATERIAL
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
body_parts_covered = FACE|EYES
gas_filter_strength = 3
@@ -400,7 +401,8 @@
throw_speed = 5
throw_range = 10
w_class = ITEMSIZE_LARGE
flags = CONDUCT | NOBLOODY
atom_flags = ATOM_FLAG_NO_BLOOD
obj_flags = OBJ_FLAG_CONDUCTABLE
attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
sharp = 1
edge = TRUE