cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +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/effects/decals/Cleanable/humans.dm
+1 -1
View File
@@ -96,7 +96,7 @@
if(perp.shoes && !perp.buckled_to)//Adding blood to shoes
var/obj/item/clothing/shoes/S = perp.shoes
if(istype(S))
if(S.item_flags & LIGHTSTEP)
if(S.item_flags & ITEM_FLAG_LIGHT_STEP)
return
S.blood_color = basecolor
S.track_footprint = max(amount, S.track_footprint)
code/game/objects/effects/effect_system.dm
+2 -2
View File
@@ -128,11 +128,11 @@ steam.start() -- spawns the effect
if (istype(M))
return 0
if (M.internal != null)
if(M.wear_mask && (M.wear_mask.item_flags & AIRTIGHT))
if(M.wear_mask && (M.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT))
return 0
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.head && (H.head.item_flags & AIRTIGHT))
if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT))
return 0
return 0
return 1
code/game/objects/items.dm
+6 -6
View File
@@ -234,7 +234,7 @@
if(armor[type])
AddComponent(/datum/component/armor, armor)
break
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
set_initial_maptext()
check_maptext()
@@ -520,7 +520,7 @@
/obj/item/proc/pickup(mob/user)
pixel_x = 0
pixel_y = 0
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
addtimer(CALLBACK(src, PROC_REF(check_maptext)), 1) // invoke async does not work here
do_pickup_animation(user)
@@ -710,7 +710,7 @@ var/list/global/slot_flags_enumeration = list(
// override for give shenanigans
/obj/item/proc/on_give(var/mob/giver, var/mob/receiver)
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
check_maptext()
//This proc is executed when someone clicks the on-screen UI button. To make the UI button show, set the 'icon_action_button' to the icon_state of the image of the button in screen1_action.dmi
@@ -784,7 +784,7 @@ var/list/global/slot_flags_enumeration = list(
M.eye_blurry += rand(3,4)
/obj/item/proc/protects_eyestab(var/obj/stab_item, var/stabbed = FALSE) // if stabbed is set to true if we're being stabbed and not just checking
if((item_flags & THICKMATERIAL) && (body_parts_covered & EYES))
if((item_flags & ITEM_FLAG_THICK_MATERIAL) && (body_parts_covered & EYES))
return TRUE
return FALSE
@@ -1177,12 +1177,12 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
/obj/item/throw_at()
..()
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
check_maptext()
/obj/item/dropped(var/mob/user)
..()
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
check_maptext()
// used to check whether the item is capable of popping things like balloons, inflatable barriers, or cutting police tape.
code/game/objects/items/apc_frame.dm
+1 -1
View File
@@ -5,7 +5,7 @@
desc = "Used for repairing or building APCs"
icon = 'icons/obj/apc_repair.dmi'
icon_state = "apc_frame"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
/obj/item/frame/apc/attackby(obj/item/W as obj, mob/user as mob)
if (W.iswrench())
code/game/objects/items/contraband.dm
+8 -8
View File
@@ -47,7 +47,7 @@
starts_with = list(/obj/item/reagent_containers/pill/skrell_nootropic = 7)
/obj/item/reagent_containers/glass/beaker/vial/random
flags = 0
atom_flags = 0
var/list/random_reagent_list = list(list(/singleton/reagent/water = 15) = 1, list(/singleton/reagent/spacecleaner = 15) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/toxin
@@ -65,7 +65,7 @@
/obj/item/reagent_containers/glass/beaker/vial/random/Initialize()
. = ..()
if(is_open_container())
flags ^= OPENCONTAINER
atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
var/list/picked_reagents = pickweight(random_reagent_list)
for(var/reagent in picked_reagents)
@@ -81,34 +81,34 @@
/obj/item/reagent_containers/glass/beaker/vial/venenum
flags = 0
atom_flags = 0
/obj/item/reagent_containers/glass/beaker/vial/venenum/Initialize()
. = ..()
if(is_open_container())
flags ^= OPENCONTAINER
atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
reagents.add_reagent(/singleton/reagent/venenum,volume)
desc = "Contains venenum."
update_icon()
/obj/item/reagent_containers/glass/beaker/vial/nerveworm_eggs
flags = 0
atom_flags = 0
/obj/item/reagent_containers/glass/beaker/vial/nerveworm_eggs/Initialize()
. = ..()
if(is_open_container())
flags ^= OPENCONTAINER
atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
reagents.add_reagent(/singleton/reagent/toxin/nerveworm_eggs, 2)
desc = "<b>BIOHAZARDOUS! - Nerve Fluke eggs.</b> Purchased from <i>SciSupply Eridani</i>, recently incorporated into <i>Zeng-Hu Pharmaceuticals' Keiretsu</i>!"
update_icon()
/obj/item/reagent_containers/glass/beaker/vial/heartworm_eggs
flags = 0
atom_flags = 0
/obj/item/reagent_containers/glass/beaker/vial/heartworm_eggs/Initialize()
. = ..()
if(is_open_container())
flags ^= OPENCONTAINER
atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
reagents.add_reagent(/singleton/reagent/toxin/heartworm_eggs, 2)
desc = "<b>BIOHAZARDOUS! - Heart Fluke eggs.</b> Purchased from <i>SciSupply Eridani</i>, recently incorporated into <i>Zeng-Hu Pharmaceuticals' Keiretsu</i>!"
update_icon()
code/game/objects/items/defib.dm
+1 -1
View File
@@ -324,7 +324,7 @@
/obj/item/shockpaddles/proc/check_contact(mob/living/carbon/human/H)
if(!combat)
for(var/obj/item/clothing/cloth in list(H.wear_suit, H.w_uniform))
if((cloth.body_parts_covered & UPPER_TORSO) && (cloth.item_flags & THICKMATERIAL))
if((cloth.body_parts_covered & UPPER_TORSO) && (cloth.item_flags & ITEM_FLAG_THICK_MATERIAL))
return FALSE
return TRUE
code/game/objects/items/devices/binoculars.dm
+1 -1
View File
@@ -4,7 +4,7 @@
desc = "A pair of binoculars."
icon_state = "binoculars"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5.0
w_class = ITEMSIZE_SMALL
throwforce = 5.0
code/game/objects/items/devices/chameleonproj.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "A strange device."
desc_antag = "This device can let you disguise as common objects. Click on an object with this in your active hand to scan it, then activate it to use it in your hand."
icon_state = "shield0"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
item_state = "electronic"
throwforce = 5
code/game/objects/items/devices/debugger.dm
+1 -1
View File
@@ -4,7 +4,7 @@
desc = "Used to debug electronic equipment."
icon = 'icons/obj/hacktool.dmi'
icon_state = "hacktool-g"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5
w_class = ITEMSIZE_SMALL
throwforce = 5
code/game/objects/items/devices/flash.dm
+1 -1
View File
@@ -8,7 +8,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 10
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1)
var/times_used = 0 //Number of times it's been used.
code/game/objects/items/devices/holowarrant.dm
+1 -1
View File
@@ -8,7 +8,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 10
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
var/list/storedwarrant = list() //All the warrants currently stored
var/activename = null
var/activecharges = null
code/game/objects/items/devices/lighting/flashlight.dm
+4 -4
View File
@@ -10,7 +10,7 @@
icon_state = "flashlight"
item_state = "flashlight"
w_class = ITEMSIZE_SMALL
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
light_color = LIGHT_COLOR_HALOGEN
uv_intensity = 50
@@ -304,7 +304,7 @@
item_state = "pen"
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_EARS
brightness_on = 2
w_class = ITEMSIZE_TINY
@@ -315,7 +315,7 @@
desc = "A miniature lamp, that might be used by small robots."
icon_state = "penlight"
item_state = ""
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
brightness_on = 2
efficiency_modifier = 2
w_class = ITEMSIZE_TINY
@@ -375,7 +375,7 @@
desc = "Some nifty lamps drawing from internal battery sources to produce a light, though a dim one."
icon_state = "headlights"
item_state = "headlights"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_HEAD | SLOT_EARS
brightness_on = 2
w_class = ITEMSIZE_TINY
code/game/objects/items/devices/lighting/lamp.dm
+1 -1
View File
@@ -9,7 +9,7 @@
brightness_on = 4
flashlight_power = 1.0
w_class = ITEMSIZE_HUGE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
uv_intensity = 100
power_use = FALSE
on = TRUE
code/game/objects/items/devices/lightmeter.dm
+1 -1
View File
@@ -7,7 +7,7 @@
icon_state = "locator"
// Copied from debugger.dm
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5.0
w_class = ITEMSIZE_SMALL
throwforce = 5.0
code/game/objects/items/devices/lightreplacer.dm
+1 -1
View File
@@ -44,7 +44,7 @@
icon_state = "lightreplacer"
item_state = "lightreplacer"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
origin_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 2)
code/game/objects/items/devices/megaphone.dm
+1 -1
View File
@@ -8,7 +8,7 @@
item_state = "megaphone"
contained_sprite = TRUE
w_class = ITEMSIZE_SMALL
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
var/spamcheck = 0
var/emagged = 0
code/game/objects/items/devices/multitool.dm
+1 -1
View File
@@ -12,7 +12,7 @@
item_state = "multitool"
item_icons = null
contained_sprite = TRUE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5.0
w_class = ITEMSIZE_SMALL
throwforce = 5.0
code/game/objects/items/devices/pin_extractor.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "pin_extractor"
item_state = "pin_extractor"
w_class = ITEMSIZE_SMALL
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
action_button_name = "Toggle extractor"
var/on = 0
var/activation_sound = 'sound/effects/lighton.ogg'
code/game/objects/items/devices/powersink.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "powersink0"
item_state = "powersink0"
w_class = ITEMSIZE_LARGE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
throwforce = 5
throw_speed = 1
throw_range = 2
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Dance my monkeys! DANCE!!!"
icon_state = "electropack0"
item_state = "electropack"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BACK
w_class = ITEMSIZE_HUGE
code/game/objects/items/devices/radio/headset.dm
+2 -2
View File
@@ -202,7 +202,7 @@
desc_info = "This radio doubles as a pair of earmuffs by providing sound protection."
icon_state = "earset"
item_state = "earset"
item_flags = SOUNDPROTECTION
item_flags = ITEM_FLAG_SOUND_PROTECTION
slot_flags = SLOT_EARS | SLOT_TWOEARS
/obj/item/device/radio/headset/wrist
@@ -652,7 +652,7 @@
icon = 'icons/obj/clothing/ears/earmuffs.dmi'
icon_state = "earmuffs"
item_state = "earmuffs"
item_flags = SOUNDPROTECTION
item_flags = ITEM_FLAG_SOUND_PROTECTION
slot_flags = SLOT_EARS | SLOT_TWOEARS
/obj/item/device/radio/headset/syndicate
code/game/objects/items/devices/radio/intercom.dm
+2 -2
View File
@@ -27,8 +27,8 @@ pixel_x = 8;
appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall
w_class = ITEMSIZE_LARGE
canhear_range = 2
flags = CONDUCT | NOBLOODY
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
atom_flags = ATOM_FLAG_NO_BLOOD
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED | OBJ_FLAG_CONDUCTABLE
var/number = 0
var/obj/machinery/abstract/intercom_listener/power_interface
var/global/list/screen_overlays
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -42,7 +42,7 @@ var/global/list/default_interrogation_channels = list(
icon = 'icons/obj/radio.dmi'
icon_state = "walkietalkie"
item_state = "radio"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
throw_speed = 2
throw_range = 9
code/game/objects/items/devices/scanners.dm
+8 -7
View File
@@ -12,7 +12,7 @@ BREATH ANALYZER
desc = "A hand-held body scanner able to distinguish vital signs of the subject."
icon_state = "health"
item_state = "healthanalyzer"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
throwforce = 3
w_class = ITEMSIZE_SMALL
@@ -373,7 +373,7 @@ BREATH ANALYZER
item_state = "analyzer"
contained_sprite = TRUE
w_class = ITEMSIZE_SMALL
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
throwforce = 5
throw_speed = 4
@@ -407,7 +407,8 @@ BREATH ANALYZER
icon_state = "spectrometer"
item_state = "analyzer"
w_class = ITEMSIZE_SMALL
flags = CONDUCT | OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
throwforce = 5
throw_speed = 4
@@ -480,7 +481,7 @@ BREATH ANALYZER
icon_state = "reagent_scanner"
item_state = "analyzer"
w_class = ITEMSIZE_SMALL
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
throwforce = 5
throw_speed = 4
@@ -521,7 +522,7 @@ BREATH ANALYZER
item_state = "analyzer"
origin_tech = list(TECH_BIO = 1)
w_class = ITEMSIZE_SMALL
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
throwforce = 0
throw_speed = 3
throw_range = 7
@@ -562,7 +563,7 @@ BREATH ANALYZER
name = "price scanner"
desc = "Using an up-to-date database of various costs and prices, this device estimates the market price of an item up to 0.001% accuracy."
icon_state = "price_scanner"
flags = NOBLUDGEON
item_flags = ITEM_FLAG_NO_BLUDGEON
slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL
throwforce = 0
@@ -584,7 +585,7 @@ BREATH ANALYZER
icon_state = "breath_analyzer"
item_state = "analyzer"
w_class = ITEMSIZE_SMALL
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
throwforce = 0
throw_speed = 3
code/game/objects/items/devices/spy_bug.dm
+1 -1
View File
@@ -6,7 +6,7 @@
item_state = "nothing"
layer = TURF_LAYER+0.2
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5.0
w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
code/game/objects/items/devices/suit_cooling.dm
+1 -1
View File
@@ -10,7 +10,7 @@
slot_flags = SLOT_BACK //you can carry it on your back if you want, but it won't do anything unless attached to suit storage
//copied from tank.dm
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 5.0
throwforce = 10.0
throw_speed = 1
code/game/objects/items/devices/taperecorder.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/list/timestamp = list()
var/can_print = TRUE
var/obj/item/computer_hardware/hard_drive/portable/portable_drive
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
throwforce = 2
throw_speed = 4
throw_range = 20
code/game/objects/items/devices/traitordevices.dm
+1 -1
View File
@@ -22,7 +22,7 @@ effective or pretty fucking useless.
w_class = ITEMSIZE_TINY
throw_speed = 4
throw_range = 10
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
item_state = "electronic"
origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 3, TECH_ILLEGAL = 3)
code/game/objects/items/devices/transfer_valve.dm
+1 -1
View File
@@ -9,7 +9,7 @@
var/mob/attacher = null
var/valve_open = 0
var/toggle = 1
flags = PROXMOVE
movable_flags = MOVABLE_FLAG_PROXMOVE
/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
code/game/objects/items/devices/uplink.dm
+2 -2
View File
@@ -358,7 +358,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin
desc = "A small device used for access restricted sites in the remote corners of the Extranet."
icon = 'icons/obj/radio.dmi'
icon_state = "radio"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
w_class = ITEMSIZE_SMALL
/obj/item/device/contract_uplink/Initialize(var/mapload, var/mind)
@@ -403,7 +403,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin
desc_antag = "This is hidden uplink! Use it in-hand to access the uplink interface and spend telecrystals to beam in items. Make sure to do it in private, it could look suspicious!"
icon = 'icons/obj/radio.dmi'
icon_state = "radio"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
w_class = ITEMSIZE_SMALL
///Amount of starting telecrystals. Defaults to default amount if not set.
code/game/objects/items/devices/whistle.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "voice0"
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
w_class = ITEMSIZE_TINY
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
var/use_message = "Halt! Security!"
var/spamcheck = 0
code/game/objects/items/glassjar.dm
+1 -1
View File
@@ -20,7 +20,7 @@
w_class = ITEMSIZE_SMALL
matter = list(MATERIAL_GLASS = 200)
recyclable = TRUE
flags = NOBLUDGEON
item_flags = ITEM_FLAG_NO_BLUDGEON
var/contains = JAR_NOTHING // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling, 4 = gumballs, 5 = holder
var/list/contained = list()
drop_sound = 'sound/items/drop/glass.ogg'
code/game/objects/items/stacks/rods.dm
+2 -2
View File
@@ -22,7 +22,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list(
Clicking on a floor without any tiles will reinforce the floor. You can make reinforced glass by combining rods and normal glass sheets."
singular_name = "metal rod"
icon_state = "rods"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
w_class = ITEMSIZE_NORMAL
force = 9.0
throwforce = 15.0
@@ -141,7 +141,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list(
for(var/obj/O in user.loc) //Objects, we don't care about mobs. Turfs are checked elsewhere
if(O.density)
if(!(O.flags & ON_BORDER) || O.dir == user.dir)
if(!(O.atom_flags & ATOM_FLAG_CHECKS_BORDER) || O.dir == user.dir)
return
var/build_stack = amount
code/game/objects/items/stacks/stack.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/obj/item/stack
gender = PLURAL
origin_tech = list(TECH_MATERIAL = 1)
flags = HELDMAPTEXT
item_flags = ITEM_FLAG_HELD_MAP_TEXT
var/list/datum/stack_recipe/recipes
var/singular_name
var/amount = 1
code/game/objects/items/stacks/telecrystal.dm
+1 -1
View File
@@ -9,7 +9,7 @@
icon_state = "telecrystal"
w_class = ITEMSIZE_TINY
max_amount = 50
flags = NOBLUDGEON
item_flags = ITEM_FLAG_NO_BLUDGEON
origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
icon_has_variants = TRUE
var/crystal_type = CRYSTAL_TYPE_TELECRYSTAL
code/game/objects/items/stacks/tiles/tile_types.dm
+5 -7
View File
@@ -23,6 +23,8 @@
randpixel = 7
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
item_flags = 0
obj_flags = 0
/obj/item/stack/tile/New()
..()
@@ -40,7 +42,6 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
origin_tech = list(TECH_BIO = 1)
drop_sound = 'sound/items/drop/herb.ogg'
pickup_sound = 'sound/items/pickup/herb.ogg'
@@ -57,7 +58,6 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
@@ -108,7 +108,6 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
@@ -177,7 +176,6 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
matter = list(MATERIAL_PLASTIC = TILE_MATERIAL_AMOUNT)
@@ -200,7 +198,7 @@
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
/obj/item/stack/tile/circuit_green
name = "circuit tile"
@@ -212,7 +210,7 @@
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
/*
* Floors
@@ -228,7 +226,7 @@
throwforce = 6
throw_speed = 5
throw_range = 10
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
/obj/item/stack/tile/floor/full_stack/Initialize(mapload)
. = ..()
code/game/objects/items/sticker.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "It's a sticker."
icon = 'icons/obj/sticker.dmi'
icon_state = "sticker"
flags = NOBLUDGEON
item_flags = ITEM_FLAG_NO_BLUDGEON
w_class = ITEMSIZE_TINY
vis_flags = VIS_INHERIT_LAYER | VIS_INHERIT_DIR
code/game/objects/items/toys.dm
+2 -2
View File
@@ -571,7 +571,7 @@
drop_sound = 'sound/items/drop/gun.ogg'
pickup_sound = /singleton/sound_category/sword_pickup_sound
equip_sound = /singleton/sound_category/sword_equip_sound
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT | SLOT_BACK
force = 5
throwforce = 5
@@ -602,7 +602,7 @@
/obj/item/toy/snappop/Crossed(H as mob|obj)
if((ishuman(H))) //i guess carp and shit shouldn't set them off
var/mob/living/carbon/human/M = H
if(M.shoes?.item_flags & LIGHTSTEP)
if(M.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP)
return
if(M.m_intent == M_RUN)
to_chat(M, SPAN_WARNING("You step on the snap pop!"))
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
code/game/objects/structures.dm
+4 -4
View File
@@ -128,7 +128,7 @@
var/obj/structure/S = O
if(S.climbable)
continue
if(O && O.density && !(O.flags & ON_BORDER)) //ON_BORDER structures are handled by the Adjacent() check.
if(O && O.density && !(O.atom_flags & ATOM_FLAG_CHECKS_BORDER)) //ATOM_FLAG_CHECKS_BORDER structures are handled by the Adjacent() check.
if(exclude_self && O == src)
continue
return O
@@ -138,7 +138,7 @@
if (!can_climb(user))
return
user.visible_message(SPAN_WARNING("[user] starts [flags & ON_BORDER ? "leaping over" : "climbing onto"] \the [src]!"))
user.visible_message(SPAN_WARNING("[user] starts [atom_flags & ATOM_FLAG_CHECKS_BORDER ? "leaping over" : "climbing onto"] \the [src]!"))
LAZYADD(climbers, user)
if(!do_after(user, 5 SECONDS, src, DO_DEFAULT | DO_USER_UNIQUE_ACT))
@@ -150,12 +150,12 @@
return
var/turf/TT = get_turf(src)
if(flags & ON_BORDER)
if(atom_flags & ATOM_FLAG_CHECKS_BORDER)
TT = get_step(get_turf(src), dir)
if(user.loc == TT)
TT = get_turf(src)
user.visible_message("<span class='warning'>[user] [flags & ON_BORDER ? "leaps over" : "climbs onto"] \the [src]!</span>")
user.visible_message("<span class='warning'>[user] [atom_flags & ATOM_FLAG_CHECKS_BORDER ? "leaps over" : "climbs onto"] \the [src]!</span>")
user.forceMove(TT)
LAZYREMOVE(climbers, user)
code/game/objects/structures/barricades/_barricade.dm
+1 -1
View File
@@ -5,7 +5,7 @@
density = TRUE
throwpass = TRUE //You can throw objects over this, despite its density.
layer = BELOW_OBJ_LAYER
flags = ON_BORDER
atom_flags = ATOM_FLAG_CHECKS_BORDER
var/stack_type //The type of stack the barricade dropped when disassembled if any.
var/stack_amount = 5 //The amount of stack dropped when disassembled at full health
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -776,7 +776,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140)
w_class = ITEMSIZE_SMALL
item_state = "electronic"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
/obj/item/device/cratescanner/proc/print_contents(targetname, targetcontents, targetloc)
code/game/objects/structures/grille.dm
+2 -2
View File
@@ -8,7 +8,7 @@
icon_state = "grille"
density = TRUE
anchored = TRUE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
explosion_resistance = 1
layer = 2.98
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
@@ -215,7 +215,7 @@
return
//window placing end
else if(!(W.flags & CONDUCT) || !shock(user, 70))
else if(!(W.obj_flags & OBJ_FLAG_CONDUCTABLE) || !shock(user, 70))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
code/game/objects/structures/janicart.dm
+1 -1
View File
@@ -10,7 +10,7 @@
anchored = FALSE
density = TRUE
climbable = TRUE
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
build_amt = 15
slowdown = 0
code/game/objects/structures/mop_bucket.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "mopbucket"
density = 1
w_class = ITEMSIZE_NORMAL
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
var/bucketsize = 600 //about 2x the size relative to a regular bucket.
code/game/objects/structures/railing.dm
+2 -2
View File
@@ -9,7 +9,7 @@
layer = OBJ_LAYER
anchored = FALSE
flags = ON_BORDER
atom_flags = ATOM_FLAG_CHECKS_BORDER
obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED
build_amt = 2
@@ -300,7 +300,7 @@
return FALSE
for(var/atom/A in destination_turf.contents - src)
if(A.density && !(A.flags & ON_BORDER))
if(A.density && !(A.atom_flags & ATOM_FLAG_CHECKS_BORDER))
to_chat(user, SPAN_DANGER("You can't climb there, the way is blocked."))
return FALSE
code/game/objects/structures/therapy.dm
+1 -1
View File
@@ -57,7 +57,7 @@
matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
recyclable = TRUE
w_class = ITEMSIZE_TINY
flags = NOBLUDGEON
atom_flags = ITEM_FLAG_NO_BLUDGEON
var/datum/weakref/thrall = null
var/time_counter = 0
var/closed = FALSE
code/game/objects/structures/windoor_assembly.dm
+2 -2
View File
@@ -18,7 +18,7 @@
density = 0
dir = NORTH
w_class = ITEMSIZE_NORMAL
flags = ON_BORDER
atom_flags = ATOM_FLAG_CHECKS_BORDER
var/obj/item/airlock_electronics/electronics = null
@@ -271,7 +271,7 @@
if (obstacle == src)
continue
if((obstacle.flags & ON_BORDER) && obstacle.dir == targetdir)
if((obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) && obstacle.dir == targetdir)
to_chat(usr, SPAN_WARNING("You can't turn the windoor assembly that way, there's already something there!"))
return
code/game/objects/structures/window.dm
+5 -5
View File
@@ -14,7 +14,7 @@
w_class = ITEMSIZE_NORMAL
layer = WINDOW_PANE_LAYER
anchored = TRUE
flags = ON_BORDER
atom_flags = ATOM_FLAG_CHECKS_BORDER
obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED
var/hitsound = 'sound/effects/glass_hit.ogg'
var/maxhealth = 14
@@ -258,7 +258,7 @@
grab_smash_attack(G, DAMAGE_BRUTE)
return
if(W.flags & NOBLUDGEON)
if(W.item_flags & ITEM_FLAG_NO_BLUDGEON)
return
if(W.isscrewdriver() && user.a_intent != I_HURT)
@@ -538,7 +538,7 @@
icon = 'icons/obj/smooth/shuttle_window.dmi'
icon_state = "shuttle_window"
basestate = "window"
flags = 0
atom_flags = 0
obj_flags = null
maxhealth = 40
reinf = TRUE
@@ -614,7 +614,7 @@
/obj/structure/window/full
name = "window"
desc = "You aren't supposed to see this."
flags = 0
atom_flags = 0
obj_flags = null
dir = 5
maxhealth = 28 // Two glass panes worth of health, since that's the minimum you need to break through to get to the other side.
@@ -665,7 +665,7 @@
grab_smash_attack(G, DAMAGE_BRUTE)
return
if(W.flags & NOBLUDGEON)
if(W.item_flags & ITEM_FLAG_NO_BLUDGEON)
return
if(W.isscrewdriver() && user.a_intent != I_HURT)