cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename a bunch of atom flags

Browse Source
This commit is contained in:
spookerton
2022-10-17 17:38:20 +01:00
parent bb472b4832
commit ffba11e5ab
76 changed files with 156 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/contraband.dm
View File

@@ -28,7 +28,7 @@
/obj/item/reagent_containers/glass/beaker/vial/random/Initialize()
. = ..()
if(is_open_container())
atom_flags ^= OPENCONTAINER
atom_flags ^= ATOM_REAGENTS_IS_OPEN
var/list/picked_reagents = pickweight(random_reagent_list)
for(var/reagent in picked_reagents)
reagents.add_reagent(reagent, picked_reagents[reagent])

4
code/game/objects/items/devices/scanners.dm
View File

@@ -381,7 +381,7 @@ HALOGEN COUNTER - Radcount on mobs
drop_sound = 'sound/items/drop/device.ogg'
icon_state = "spectrometer"
w_class = ITEMSIZE_SMALL
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
slot_flags = SLOT_BELT
throwforce = 5
throw_speed = 4
@@ -463,7 +463,7 @@ HALOGEN COUNTER - Radcount on mobs
return
if(!isnull(O.reagents))
if(!(O.atom_flags & OPENCONTAINER)) // The idea is that the scanner has to touch the reagents somehow. This is done to prevent cheesing unidentified autoinjectors.
if(!(O.atom_flags & ATOM_REAGENTS_IS_OPEN)) // The idea is that the scanner has to touch the reagents somehow. This is done to prevent cheesing unidentified autoinjectors.
to_chat(user, span("warning", "\The [O] is sealed, and cannot be scanned by \the [src] until unsealed."))
return

2
code/game/objects/items/weapons/chewables.dm
View File

@@ -27,7 +27,7 @@
/obj/item/clothing/mask/chewable/Initialize()
. = ..()
atom_flags |= NOREACT // so it doesn't react until you light it
atom_flags |= ATOM_REAGENTS_SKIP_REACTIONS // 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
for(var/R in filling)
reagents.add_reagent(R, filling[R])

4
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -105,7 +105,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/Initialize()
. = ..()
atom_flags |= NOREACT // so it doesn't react until you light it
atom_flags |= ATOM_REAGENTS_SKIP_REACTIONS // 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
if(smoketime && !max_smoketime)
max_smoketime = smoketime
@@ -183,7 +183,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
e.start()
qdel(src)
return
atom_flags &= ~NOREACT // allowing reagents to react after being lit
atom_flags &= ~ATOM_REAGENTS_SKIP_REACTIONS // allowing reagents to react after being lit
reagents.handle_reactions()
var/turf/T = get_turf(src)
T.visible_message(flavor_text)

2
code/game/objects/items/weapons/ecigs.dm
View File

@@ -153,7 +153,7 @@
icon_state = "ecartridge"
matter = list("metal" = 50, "glass" = 10)
volume = 20
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
/obj/item/reagent_containers/ecig_cartridge/Initialize()
. = ..()

2
code/game/objects/items/weapons/material/material_weapons.dm
View File

@@ -44,7 +44,7 @@
matter[material_type] *= force_divisor // May require a new var instead.
if(!(material.conductive))
atom_flags |= NOCONDUCT
atom_flags |= ATOM_IS_INSULATED
/obj/item/material/get_material()
return material

2
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -7,7 +7,7 @@
sharp = 0
edge = 0
armor_penetration = 50
atom_flags = NOCONDUCT
atom_flags = ATOM_IS_INSULATED
item_flags = NOBLOODY
var/lrange = 2
var/lpower = 2

2
code/game/objects/items/weapons/mop.dm
View File

@@ -10,7 +10,7 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
throw_speed = 5
throw_range = 10
w_class = ITEMSIZE_NORMAL
atom_flags = NOCONDUCT
atom_flags = ATOM_IS_INSULATED
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
var/mopping = 0
var/mopcount = 0

2
code/game/objects/items/weapons/paint.dm
View File

@@ -15,7 +15,7 @@ var/global/list/cached_icons = list()
possible_transfer_amounts = list(10,20,30,60)
volume = 60
unacidable = 0
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
var/paint_type = "red"
/obj/item/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity)

2
code/game/objects/items/weapons/shields.dm
View File

@@ -118,7 +118,7 @@
icon_state = "eshield"
item_state = "eshield"
slot_flags = SLOT_EARS
atom_flags = NOCONDUCT
atom_flags = ATOM_IS_INSULATED
force = 3.0
throwforce = 5.0
throw_speed = 1

6
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -219,9 +219,9 @@
/obj/item/storage/fancy/cigarettes/Initialize()
. = ..()
atom_flags |= NOREACT
atom_flags |= ATOM_REAGENTS_SKIP_REACTIONS
create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
atom_flags |= OPENCONTAINER
atom_flags |= ATOM_REAGENTS_IS_OPEN
if(brand)
for(var/obj/item/clothing/mask/smokable/cigarette/C in src)
C.brand = brand
@@ -333,7 +333,7 @@
/obj/item/storage/fancy/cigar/Initialize()
. = ..()
atom_flags |= NOREACT
atom_flags |= ATOM_REAGENTS_SKIP_REACTIONS
create_reagents(15 * storage_slots)
/obj/item/storage/fancy/cigar/update_icon()

2
code/game/objects/items/weapons/stunbaton.dm
View File

@@ -9,7 +9,7 @@
sharp = 0
edge = 0
throwforce = 7
atom_flags = NOCONDUCT
atom_flags = ATOM_IS_INSULATED
w_class = ITEMSIZE_NORMAL
drop_sound = 'sound/items/drop/metalweapon.ogg'
pickup_sound = 'sound/items/pickup/metalweapon.ogg'

2
code/game/objects/items/weapons/traps.dm
View File

@@ -237,7 +237,7 @@
if(!istype(W))
return
if((W.atom_flags & NOCONDUCT) || !shock(user, 70, pick(BP_L_HAND, BP_R_HAND)))
if((W.atom_flags & ATOM_IS_INSULATED) || !shock(user, 70, pick(BP_L_HAND, BP_R_HAND)))
user.setClickCooldown(user.get_attack_speed(W))
user.do_attack_animation(src)
playsound(src, 'sound/effects/grillehit.ogg', 40, 1)

2
code/game/objects/structures.dm
View File

@@ -93,7 +93,7 @@
if(istype(O,/obj/structure))
var/obj/structure/S = O
if(S.climbable) continue
if(O && O.density && !(O.atom_flags & ON_BORDER)) //ON_BORDER structures are handled by the Adjacent() check.
if(O && O.density && !(O.atom_flags & ATOM_HAS_TRANSITION_PRIORITY)) //ATOM_HAS_TRANSITION_PRIORITY structures are handled by the Adjacent() check.
return O
return 0

2
code/game/objects/structures/grille.dm
View File

@@ -150,7 +150,7 @@
return
//window placing end
else if((W.atom_flags & NOCONDUCT) || !shock(user, 70))
else if((W.atom_flags & ATOM_IS_INSULATED) || !shock(user, 70))
user.setClickCooldown(user.get_attack_speed(W))
user.do_attack_animation(src)
playsound(src, 'sound/effects/grillehit.ogg', 80, 1)

4
code/game/objects/structures/janicart.dm
View File

@@ -8,7 +8,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
icon_state = "cart"
anchored = 0
density = 1
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
climbable = TRUE
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
@@ -304,7 +304,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
icon_state = "pussywagon"
anchored = 1
density = 1
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
var/obj/item/storage/bag/trash/mybag = null

2
code/game/objects/structures/ledges.dm
View File

@@ -7,7 +7,7 @@
climbable = 1
anchored = 1
var/solidledge = 1
atom_flags = ON_BORDER
atom_flags = ATOM_HAS_TRANSITION_PRIORITY
layer = STAIRS_LAYER
icon_state = "ledge"

2
code/game/objects/structures/mop_bucket.dm
View File

@@ -7,7 +7,7 @@
climbable = 1
w_class = ITEMSIZE_NORMAL
pressure_resistance = 5
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket)

4
code/game/objects/structures/railing.dm
View File

@@ -8,7 +8,7 @@
climbable = 1
layer = WINDOW_LAYER
anchored = 1
atom_flags = ON_BORDER
atom_flags = ATOM_HAS_TRANSITION_PRIORITY
icon_state = "railing0"
var/broken = FALSE
var/health = 70
@@ -326,5 +326,5 @@
if(istype(O,/obj/structure))
var/obj/structure/S = O
if(S.climbable) continue
if(O && O.density && !(O.atom_flags & ON_BORDER && !(turn(O.dir, 180) & dir)))
if(O && O.density && !(O.atom_flags & ATOM_HAS_TRANSITION_PRIORITY && !(turn(O.dir, 180) & dir)))
return O

2
code/game/objects/structures/window.dm
View File

@@ -9,7 +9,7 @@
layer = WINDOW_LAYER
pressure_resistance = 4*ONE_ATMOSPHERE
anchored = 1.0
atom_flags = ON_BORDER
atom_flags = ATOM_HAS_TRANSITION_PRIORITY
var/maxhealth = 14.0
var/maximal_heat = T0C + 100 // Maximal heat before this window begins taking damage from fire
var/damage_per_fire_tick = 2.0 // Amount of damage per fire tick. Regular windows are not fireproof so they might as well break quickly.