mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-28 23:51:17 +01:00
Split up and rename var/flags (#17794)
* 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:
co-authored by
Cody Brittain
parent
4b9303a1e9
commit
06601c9ec3
@@ -14,7 +14,7 @@
|
||||
mobdamagetype = DAMAGE_BURN
|
||||
cooking_coeff = 0
|
||||
cooking_power = 0
|
||||
flags = null
|
||||
// atom_flags = 0
|
||||
var/temperature = T20C
|
||||
var/starts_with = list()
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
update_cooking_power() // update!
|
||||
for(var/cooking_obj in cooking_objs)
|
||||
var/datum/cooking_item/CI = cooking_obj
|
||||
if((CI.container.flags && NOREACT) || isemptylist(CI.container?.reagents.reagent_volumes))
|
||||
if((CI.container.atom_flags && ATOM_FLAG_NO_REACT) || isemptylist(CI.container?.reagents.reagent_volumes))
|
||||
continue
|
||||
CI.container.reagents.set_temperature(min(temperature, CI.container.reagents.get_temperature() + 10*SIGN(temperature - CI.container.reagents.get_temperature()))) // max of 5C per second
|
||||
return ..()
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
var/place_verb = "into"
|
||||
var/max_space = 20//Maximum sum of w-classes of foods in this container at once
|
||||
volume = 80//Maximum units of reagents
|
||||
flags = OPENCONTAINER | NOREACT
|
||||
atom_flags = ATOM_FLAG_OPEN_CONTAINER | ATOM_FLAG_NO_REACT
|
||||
var/list/insertable = list(
|
||||
/obj/item/reagent_containers/food/snacks,
|
||||
/obj/item/holder,
|
||||
@@ -204,7 +204,7 @@
|
||||
volume = 30
|
||||
force = 11
|
||||
hitsound = 'sound/weapons/smash.ogg'
|
||||
flags = OPENCONTAINER // Will still react
|
||||
atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react
|
||||
appliancetype = SKILLET
|
||||
|
||||
/obj/item/reagent_containers/cooking_container/skillet/Initialize(var/mapload, var/mat_key)
|
||||
@@ -225,7 +225,7 @@
|
||||
slot_flags = SLOT_HEAD
|
||||
force = 8
|
||||
hitsound = 'sound/weapons/smash.ogg'
|
||||
flags = OPENCONTAINER // Will still react
|
||||
atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react
|
||||
appliancetype = SAUCEPAN
|
||||
|
||||
/obj/item/reagent_containers/cooking_container/saucepan/Initialize(var/mapload, var/mat_key)
|
||||
@@ -246,7 +246,7 @@
|
||||
volume = 180
|
||||
force = 8
|
||||
hitsound = 'sound/weapons/smash.ogg'
|
||||
flags = OPENCONTAINER // Will still react
|
||||
atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react
|
||||
appliancetype = POT
|
||||
w_class = ITEMSIZE_LARGE
|
||||
|
||||
@@ -292,7 +292,7 @@
|
||||
drop_sound = /singleton/sound_category/generic_drop_sound
|
||||
pickup_sound = /singleton/sound_category/generic_pickup_sound
|
||||
appliancetype = MIX
|
||||
flags = OPENCONTAINER // Will still react
|
||||
atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react
|
||||
volume = 15 // for things like jelly sandwiches etc
|
||||
max_space = 25
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
density = 1
|
||||
anchored = 0
|
||||
use_power = POWER_USE_OFF
|
||||
flags = OPENCONTAINER | NOREACT
|
||||
atom_flags = ATOM_FLAG_OPEN_CONTAINER | ATOM_FLAG_NO_REACT
|
||||
|
||||
var/list/product_types = list()
|
||||
var/dispense_flavour = ICECREAM_VANILLA
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
anchored = 1
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 100
|
||||
flags = NOREACT
|
||||
atom_flags = ATOM_FLAG_NO_REACT
|
||||
opacity = FALSE
|
||||
var/ui_sort_alphabetically = TRUE
|
||||
var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000.
|
||||
|
||||
@@ -16,7 +16,7 @@ Plates that can hold your cooking stuff
|
||||
fragile = 3
|
||||
shatter_material = DEFAULT_TABLE_MATERIAL // Slight typecasting abuse here, gets converted to a material in Initialize().
|
||||
can_be_placed_into = list()
|
||||
flags = OPENCONTAINER
|
||||
atom_flags = ATOM_FLAG_OPEN_CONTAINER
|
||||
var/grease = FALSE
|
||||
|
||||
/obj/item/reagent_containers/bowl/examine(mob/user, distance)
|
||||
@@ -101,7 +101,7 @@ Plates that can hold your cooking stuff
|
||||
/obj/item/reagent_containers/bowl/plate
|
||||
name = "plate"
|
||||
desc = "A plate for dishing up the finest of cuisine."
|
||||
flags = null
|
||||
atom_flags = 0
|
||||
icon_state = "plate"
|
||||
var/obj/item/holding
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
throw_speed = 1
|
||||
throw_range = 5
|
||||
w_class = 3.0
|
||||
flags = CONDUCT
|
||||
obj_flags = OBJ_FLAG_CONDUCTABLE
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 3000)
|
||||
recyclable = TRUE
|
||||
hitsound = /singleton/sound_category/bottle_hit_broken
|
||||
@@ -215,7 +215,7 @@
|
||||
icon_state = "l_plate"
|
||||
throwforce = 4
|
||||
force = 3
|
||||
flags = null
|
||||
atom_flags = 0
|
||||
matter = list(DEFAULT_TABLE_MATERIAL = 1000)
|
||||
recyclable = TRUE
|
||||
max_carry = 7 // That's 3 dishes, a knife, spoon and fork and a glass
|
||||
|
||||
Reference in New Issue
Block a user