cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 13:42:44 +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

22
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -14,7 +14,7 @@
possible_transfer_amounts = list(5,10,15,25,30,60)
volume = 60
w_class = ITEMSIZE_SMALL
atom_flags = OPENCONTAINER | NOCONDUCT
atom_flags = ATOM_REAGENTS_IS_OPEN | ATOM_IS_INSULATED
unacidable = 1 //glass doesn't dissolve in acid
drop_sound = 'sound/items/drop/bottle.ogg'
pickup_sound = 'sound/items/pickup/bottle.ogg'
@@ -74,10 +74,10 @@
..()
if(is_open_container())
to_chat(usr, "<span class = 'notice'>You put the lid on \the [src].</span>")
atom_flags ^= OPENCONTAINER
atom_flags ^= ATOM_REAGENTS_IS_OPEN
else
to_chat(usr, "<span class = 'notice'>You take the lid off \the [src].</span>")
atom_flags |= OPENCONTAINER
atom_flags |= ATOM_REAGENTS_IS_OPEN
update_icon()
/obj/item/reagent_containers/glass/attack(mob/M as mob, mob/user as mob, def_zone)
@@ -134,7 +134,7 @@
update_name_label()
if(istype(W,/obj/item/storage/bag))
..()
if(W && W.w_class <= w_class && (atom_flags & OPENCONTAINER) && user.a_intent != I_HELP)
if(W && W.w_class <= w_class && (atom_flags & ATOM_REAGENTS_IS_OPEN) && user.a_intent != I_HELP)
to_chat(user, "<span class='notice'>You dip \the [W] into \the [src].</span>")
reagents.touch_obj(W, reagents.total_volume)
@@ -209,7 +209,7 @@
volume = 120
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60,120)
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
@@ -219,7 +219,7 @@
matter = list("glass" = 500)
volume = 60
amount_per_transfer_from_this = 10
atom_flags = OPENCONTAINER | NOREACT
atom_flags = ATOM_REAGENTS_IS_OPEN | ATOM_REAGENTS_SKIP_REACTIONS
/obj/item/reagent_containers/glass/beaker/bluespace
name = "bluespace beaker"
@@ -230,7 +230,7 @@
volume = 300
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60,120,300)
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
/obj/item/reagent_containers/glass/beaker/vial
name = "vial"
@@ -242,7 +242,7 @@
w_class = ITEMSIZE_TINY
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,30)
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
/obj/item/reagent_containers/glass/beaker/cryoxadone
name = "beaker (cryoxadone)"
@@ -259,7 +259,7 @@
volume = 120
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60,120)
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
/obj/item/reagent_containers/glass/bucket
desc = "It's a bucket."
@@ -273,7 +273,7 @@
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120)
volume = 120
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
unacidable = 0
drop_sound = 'sound/items/drop/helm.ogg'
pickup_sound = 'sound/items/pickup/helm.ogg'
@@ -331,7 +331,7 @@
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120)
volume = 120
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
unacidable = 0
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'

8
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -12,7 +12,7 @@
unacidable = 1
volume = 30
possible_transfer_amounts = null
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
slot_flags = SLOT_BELT
drop_sound = 'sound/items/drop/gun.ogg'
pickup_sound = 'sound/items/pickup/gun.ogg'
@@ -115,7 +115,7 @@
if(!do_after(user,30) || loaded_vial || !(W in user))
return 0
if(W.is_open_container())
W.atom_flags ^= OPENCONTAINER
W.atom_flags ^= ATOM_REAGENTS_IS_OPEN
W.update_icon()
user.drop_item()
W.loc = src
@@ -152,13 +152,13 @@
/obj/item/reagent_containers/hypospray/autoinjector/used/Initialize()
. = ..()
atom_flags &= ~OPENCONTAINER
atom_flags &= ~ATOM_REAGENTS_IS_OPEN
icon_state = "[initial(icon_state)]0"
/obj/item/reagent_containers/hypospray/autoinjector/do_injection(mob/living/carbon/human/H, mob/living/user)
. = ..()
if(.) // Will occur if successfully injected.
atom_flags &= ~OPENCONTAINER
atom_flags &= ~ATOM_REAGENTS_IS_OPEN
update_icon()
/obj/item/reagent_containers/hypospray/autoinjector/update_icon()

2
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -5,7 +5,7 @@
icon_state = "cleaner"
item_state = "cleaner"
center_of_mass = list("x" = 16,"y" = 10)
atom_flags = OPENCONTAINER
atom_flags = ATOM_REAGENTS_IS_OPEN
item_flags = NOBLUDGEON
matter = list("glass" = 300, MAT_STEEL = 300)
slot_flags = SLOT_BELT