cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] removes center of mass list (#10081)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-07 07:08:58 -07:00
committed by GitHub
parent 1001f0408b
commit 499e8e7ee9
44 changed files with 1417 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/objects/items.dm
View File

@@ -1062,12 +1062,11 @@ closest to where the cursor has clicked on.
Note: This proc can be overwritten to allow for different types of auto-alignment.
*/
///obj/item/var/list/center_of_mass = list("x" = 16,"y" = 16) CHOMPEdit NO STOP PLEASE -- center_of_mass - 52.0879 mb total
/obj/item/var/center_of_mass_x = 16 //CHOMPEdit
/obj/item/var/center_of_mass_y = 16 //CHOMPEdit
/obj/item/var/center_of_mass_x = 16
/obj/item/var/center_of_mass_y = 16
/proc/auto_align(obj/item/W, click_parameters, var/animate = FALSE)
if(!W.center_of_mass_x && !W.center_of_mass_y) //CHOMPEdit
if(!W.center_of_mass_x && !W.center_of_mass_y)
W.randpixel_xy()
return
@@ -1083,8 +1082,8 @@ Note: This proc can be overwritten to allow for different types of auto-alignmen
var/cell_x = max(0, min(CELLS-1, round(mouse_x/CELLSIZE)))
var/cell_y = max(0, min(CELLS-1, round(mouse_y/CELLSIZE)))
var/target_x = (CELLSIZE * (0.5 + cell_x)) - W.center_of_mass_x //CHOMPEdit
var/target_y = (CELLSIZE * (0.5 + cell_y)) - W.center_of_mass_y //CHOMPEdit
var/target_x = (CELLSIZE * (0.5 + cell_x)) - W.center_of_mass_x
var/target_y = (CELLSIZE * (0.5 + cell_y)) - W.center_of_mass_y
if(animate)
var/dist_x = abs(W.pixel_x - target_x)
var/dist_y = abs(W.pixel_y - target_y)

12
code/game/objects/items/devices/flashlight.dm
View File

@@ -313,8 +313,8 @@
desc = "A desk lamp with an adjustable mount."
icon_state = "lamp"
force = 10
center_of_mass_x = 13 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 13
center_of_mass_y = 11
light_range = 5
w_class = ITEMSIZE_LARGE
power_use = 0
@@ -333,16 +333,16 @@
/obj/item/flashlight/lamp/green
desc = "A classic green-shaded desk lamp."
icon_state = "lampgreen"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 11
light_color = "#FFC58F"
// clown lamp
/obj/item/flashlight/lamp/clown
desc = "A whacky banana peel shaped lamp."
icon_state = "bananalamp"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 11
/*

4
code/game/objects/items/stacks/stack.dm
View File

@@ -14,8 +14,8 @@
origin_tech = list(TECH_MATERIAL = 1)
icon = 'icons/obj/stacks_ch.dmi' //CHOMPedit - materials update
randpixel = 7
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
var/list/datum/stack_recipe/recipes
var/singular_name
var/amount = 1

4
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -25,8 +25,8 @@
icon = 'icons/obj/boxes.dmi'
icon_state = "box"
item_state = "syringe_kit"
center_of_mass_x = 13 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 13
center_of_mass_y = 10
var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
var/trash = null // if set, can be crushed into a trash item when empty
max_w_class = ITEMSIZE_SMALL

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

@@ -52,8 +52,8 @@
icon_state = "eggbox"
icon_type = REAGENT_ID_EGG
name = "egg box"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 7
storage_slots = 12
can_hold = list(
/obj/item/reagent_containers/food/snacks/egg,

4
code/game/objects/items/weapons/storage/misc.dm
View File

@@ -33,8 +33,8 @@ var/list/random_weighted_donuts = list(
icon_state = "donutbox"
name = "donut box"
desc = "A box that holds tasty donuts, if you're lucky."
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 9
max_storage_space = ITEMSIZE_COST_SMALL * 6
can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
foldable = /obj/item/stack/material/cardboard

4
code/game/objects/items/weapons/storage/toolbox.dm
View File

@@ -7,8 +7,8 @@
icon = 'icons/obj/storage_vr.dmi'
icon_state = "red"
item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red")
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 11
force = 10
throwforce = 10
throw_speed = 1

4
code/game/objects/items/weapons/tools/screwdriver.dm
View File

@@ -7,8 +7,8 @@
//description_fluff = "This could be used to engrave messages on suitable surfaces if you really put your mind to it! Alt-click a floor or wall to engrave with it." //This way it's not a completely hidden, arcane art to engrave. //CHOMP Remove
icon = 'icons/obj/tools.dmi'
icon_state = "screwdriver"
center_of_mass_x = 13 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 13
center_of_mass_y = 7
slot_flags = SLOT_BELT | SLOT_EARS
force = 6
w_class = ITEMSIZE_TINY

4
code/game/objects/items/weapons/tools/wirecutters.dm
View File

@@ -8,8 +8,8 @@
icon = 'icons/obj/tools.dmi'
icon_state = "cutters"
item_state = "cutters"
center_of_mass_x = 18 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 18
center_of_mass_y = 10
slot_flags = SLOT_BELT
force = 6
throw_speed = 2

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

@@ -13,8 +13,8 @@
icon_state = "beartrap0"
desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off."
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
throwforce = 0
w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1)

4
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -268,8 +268,8 @@
desc = "A collapsed roller bed that can be carried around."
icon = 'icons/obj/rollerbed.dmi'
icon_state = "folded_rollerbed"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 7
slot_flags = SLOT_BACK
w_class = ITEMSIZE_LARGE
var/rollertype = /obj/item/roller

4
code/game/objects/structures/stool_bed_chair_nest/stools.dm
View File

@@ -7,8 +7,8 @@ var/global/list/stool_cache = list() //haha stool
icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
icon_state = "stool_preview" //set for the map
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
force = 10
throwforce = 10
w_class = ITEMSIZE_HUGE

4
code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
View File

@@ -4,8 +4,8 @@
icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
icon_state = "bar_stool_preview" //set for the map
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
force = 10
throwforce = 10
w_class = ITEMSIZE_HUGE

4
code/modules/clothing/shoes/magboots.dm
View File

@@ -5,8 +5,8 @@
flags = PHORONGUARD
item_state_slots = list(slot_r_hand_str = "magboots", slot_l_hand_str = "magboots")
species_restricted = null
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 12 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 12
force = 3
overshoes = 1
shoes_under_pants = -1 //These things are huge

4
code/modules/clothing/spacesuits/spacesuits.dm
View File

@@ -7,8 +7,8 @@
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
flags = PHORONGUARD
item_flags = THICKMATERIAL | AIRTIGHT | ALLOW_SURVIVALFOOD
permeability_coefficient = 0 //Chompedit was 0.01, zeroed to test protecting those who are vulnerable to water.

4
code/modules/clothing/suits/bio.dm
View File

@@ -4,8 +4,8 @@
icon_state = "bio"
desc = "A hood that protects the head and face from biological comtaminants."
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR

4
code/modules/food/drinkingglass/drinkingglass.dm
View File

@@ -18,8 +18,8 @@
var/rim_pos
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5,10,15,30)

366
code/modules/food/drinkingglass/metaglass.dm
View File

@@ -5,8 +5,8 @@
amount_per_transfer_from_this = 5
volume = 30
unacidable = TRUE //glass
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
matter = list(MAT_GLASS = 500)
icon = 'icons/obj/drinks.dmi'
@@ -40,12 +40,12 @@
else
desc = "You can't really tell what this is."
if(R.glass_center_of_mass)
center_of_mass_x = R.glass_center_of_mass["x"] //CHOMPEdit
center_of_mass_y = R.glass_center_of_mass["x"] //CHOMPEdit
if(R.glass_center_of_mass_x || R.glass_center_of_mass_y)
center_of_mass_x = R.glass_center_of_mass_x
center_of_mass_y = R.glass_center_of_mass_y
else
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y= 10
if(R.price_tag)
price_tag = R.price_tag
@@ -56,14 +56,14 @@
icon_state = "pglass_empty"
name = "metamorphic pint glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y= 10
else
icon_state = "glass_empty"
name = "metamorphic glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y= 10
return
/*
@@ -73,7 +73,8 @@ Drinks Data
/datum/reagent
var/glass_icon_file = null
var/glass_icon_state = null
var/glass_center_of_mass = null
var/glass_center_of_mass_x = 0
var/glass_center_of_mass_y = 0
var/glass_icon_source = null //CHOMP A way for us to have metaglass identify and decide which dmi it wants to grab sprites from - Jack
/datum/reagent/adminordrazine
@@ -81,7 +82,8 @@ Drinks Data
/datum/reagent/chloralhydrate/beer2
glass_icon_state = "beerglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/blood
glass_icon_state = "glass_red"
@@ -145,7 +147,8 @@ Drinks Data
/datum/reagent/drink/tea/icetea
glass_icon_state = "icedteaglass"
glass_center_of_mass = list("x"=15, "y"=10)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 10
/datum/reagent/drink/coffee
glass_icon_state = "hot_coffee"
@@ -155,11 +158,13 @@ Drinks Data
/datum/reagent/drink/soy_latte
glass_icon_state = "soy_latte"
glass_center_of_mass = list("x"=15, "y"=9)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 9
/datum/reagent/drink/cafe_latte
glass_icon_state = "cafe_latte"
glass_center_of_mass = list("x"=15, "y"=9)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 9
/datum/reagent/drink/hot_coco
glass_icon_state = "chocolateglass"
@@ -178,26 +183,31 @@ Drinks Data
/datum/reagent/drink/soda/kiraspecial
glass_icon_state = "kiraspecial"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/drink/soda/brownstar
glass_icon_state = "brownstar"
/datum/reagent/drink/milkshake
glass_icon_state = "milkshake"
glass_center_of_mass = list("x"=16, "y"=7)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 7
/datum/reagent/drink/rewriter
glass_icon_state = "rewriter"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/drink/soda/nuka_cola
glass_icon_state = "nuka_colaglass"
glass_center_of_mass = list("x"=16, "y"=6)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 6
/datum/reagent/drink/grenadine
glass_icon_state = "grenadineglass"
glass_center_of_mass = list("x"=17, "y"=6)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 6
/datum/reagent/drink/soda/space_cola
glass_icon_state = "glass_brown"
@@ -216,7 +226,8 @@ Drinks Data
/datum/reagent/drink/doctor_delight
glass_icon_state = "doctorsdelightglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/ice
glass_icon_state = "iceglass"
@@ -226,140 +237,172 @@ Drinks Data
/datum/reagent/drink/oilslick
glass_icon_state = "jar_oil"
glass_center_of_mass = list("x"=15, "y"=12)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 12
/datum/reagent/drink/nuclearwaste
glass_icon_state = "jar_rad"
glass_center_of_mass = list("x"=15, "y"=12)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 12
/datum/reagent/drink/sodaoil
glass_icon_state = "jar_water"
glass_center_of_mass = list("x"=15, "y"=12)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 12
/datum/reagent/ethanol/absinthe
glass_icon_state = "absintheglass"
glass_center_of_mass = list("x"=16, "y"=5)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 5
/datum/reagent/ethanol/ale
glass_icon_state = "aleglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/beer
glass_icon_state = "beerglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/bluecuracao
glass_icon_state = "curacaoglass"
glass_center_of_mass = list("x"=16, "y"=5)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 5
/datum/reagent/ethanol/cognac
glass_icon_state = "cognacglass"
glass_center_of_mass = list("x"=16, "y"=6)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 6
/datum/reagent/ethanol/deadrum
glass_icon_state = "rumglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/gin
glass_icon_state = "ginvodkaglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/coffee/kahlua
glass_icon_state = "kahluaglass"
glass_center_of_mass = list("x"=15, "y"=7)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 7
/datum/reagent/ethanol/melonliquor
glass_icon_state = "emeraldglass"
glass_center_of_mass = list("x"=16, "y"=5)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 5
/datum/reagent/ethanol/rum
glass_icon_state = "rumglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/sake
glass_icon_state = "sakecup"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/godsake
glass_icon_state = "sakeporcelain"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/tequila
glass_icon_state = "tequillaglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/thirteenloko
glass_icon_state = "thirteen_loko_glass"
/datum/reagent/ethanol/vermouth
glass_icon_state = "vermouthglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/vodka
glass_icon_state = "ginvodkaglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/whiskey
glass_icon_state = "whiskeyglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/wine
glass_icon_state = "wineglass"
glass_center_of_mass = list("x"=15, "y"=7)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 7
/datum/reagent/ethanol/acid_spit
glass_icon_state = "acidspitglass"
glass_center_of_mass = list("x"=16, "y"=7)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 7
/datum/reagent/ethanol/alliescocktail
glass_icon_state = "alliescocktail"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/aloe
glass_icon_state = "aloe"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/amasec
glass_icon_state = "amasecglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/andalusia
glass_icon_state = "andalusia"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/antifreeze
glass_icon_state = "antifreeze"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/atomicbomb
glass_icon_state = "atomicbombglass"
glass_center_of_mass = list("x"=15, "y"=7)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 7
/datum/reagent/ethanol/coffee/b52
glass_icon_state = "b52glass"
/datum/reagent/ethanol/bahama_mama
glass_icon_state = "bahama_mama"
glass_center_of_mass = list("x"=16, "y"=5)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 5
/datum/reagent/ethanol/bananahonk
glass_icon_state = "bananahonkglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/barefoot
glass_icon_state = "b&p"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/beepsky_smash
glass_icon_state = "beepskysmashglass"
glass_center_of_mass = list("x"=18, "y"=10)
glass_center_of_mass_x = 18
glass_center_of_mass_y = 10
/datum/reagent/ethanol/bilk
glass_icon_state = "glass_brown"
/datum/reagent/ethanol/black_russian
glass_icon_state = "blackrussianglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/bloody_mary
glass_icon_state = "bloodymaryglass"
@@ -369,310 +412,385 @@ Drinks Data
/datum/reagent/ethanol/coffee/brave_bull
glass_icon_state = "bravebullglass"
glass_center_of_mass = list("x"=15, "y"=8)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 8
/datum/reagent/ethanol/changelingsting
glass_icon_state = "changelingsting"
/datum/reagent/ethanol/martini
glass_icon_state = "martiniglass"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/rum_and_cola
glass_icon_state = "rumcolaglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/cuba_libre
glass_icon_state = "cubalibreglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/demonsblood
glass_icon_state = "demonsblood"
glass_center_of_mass = list("x"=16, "y"=2)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 2
/datum/reagent/ethanol/devilskiss
glass_icon_state = "devilskiss"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/driestmartini
glass_icon_state = "driestmartiniglass"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/ginfizz
glass_icon_state = "ginfizzglass"
glass_center_of_mass = list("x"=16, "y"=7)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 7
/datum/reagent/ethanol/grog
glass_icon_state = "grogglass"
/datum/reagent/ethanol/erikasurprise
glass_icon_state = "erikasurprise"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/gargle_blaster
glass_icon_state = "gargleblasterglass"
glass_center_of_mass = list("x"=17, "y"=6)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 6
/datum/reagent/ethanol/gintonic
glass_icon_state = "gintonicglass"
/datum/reagent/ethanol/goldschlager
glass_icon_state = "goldschlagerglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/hippies_delight
glass_icon_state = "hippiesdelightglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/hooch
glass_icon_state = "glass_brown2"
/datum/reagent/ethanol/iced_beer
glass_icon_state = "iced_beerglass"
glass_center_of_mass = list("x"=16, "y"=7)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 7
/datum/reagent/ethanol/irishcarbomb
glass_icon_state = "irishcarbomb"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/coffee/irishcoffee
glass_icon_state = "irishcoffeeglass"
glass_center_of_mass = list("x"=15, "y"=10)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 10
/datum/reagent/ethanol/irish_cream
glass_icon_state = "irishcreamglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/longislandicedtea
glass_icon_state = "longislandicedteaglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/manhattan
glass_icon_state = "manhattanglass"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/manhattan_proj
glass_icon_state = "proj_manhattanglass"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/manly_dorf
glass_icon_state = "manlydorfglass"
/datum/reagent/ethanol/margarita
glass_icon_state = "margaritaglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/mead
glass_icon_state = "meadglass"
glass_center_of_mass = list("x"=17, "y"=10)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 10
/datum/reagent/ethanol/moonshine
glass_icon_state = "glass_clear"
/datum/reagent/ethanol/neurotoxin
glass_icon_state = "neurotoxinglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/patron
glass_icon_state = "patronglass"
glass_center_of_mass = list("x"=7, "y"=8)
glass_center_of_mass_x = 7
glass_center_of_mass_y = 8
/datum/reagent/ethanol/pwine
glass_icon_state = "pwineglass"
glass_center_of_mass = list("x"=16, "y"=5)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 5
/datum/reagent/ethanol/red_mead
glass_icon_state = "red_meadglass"
glass_center_of_mass = list("x"=17, "y"=10)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 10
/datum/reagent/ethanol/sbiten
glass_icon_state = "sbitenglass"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/screwdrivercocktail
glass_icon_state = "screwdriverglass"
glass_center_of_mass = list("x"=15, "y"=10)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 10
/datum/reagent/ethanol/silencer
glass_icon_state = "silencerglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/singulo
glass_icon_state = "singulo"
glass_center_of_mass = list("x"=17, "y"=4)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 4
/datum/reagent/ethanol/snowwhite
glass_icon_state = "snowwhite"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/suidream
glass_icon_state = "sdreamglass"
glass_center_of_mass = list("x"=16, "y"=5)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 5
/datum/reagent/ethanol/syndicatebomb
glass_icon_state = "syndicatebomb"
glass_center_of_mass = list("x"=16, "y"=4)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 4
/datum/reagent/ethanol/tequilla_sunrise
glass_icon_state = "tequillasunriseglass"
/datum/reagent/ethanol/threemileisland
glass_icon_state = "threemileislandglass"
glass_center_of_mass = list("x"=16, "y"=2)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 2
/datum/reagent/ethanol/toxins_special
glass_icon_state = "toxinsspecialglass"
/datum/reagent/ethanol/vodkamartini
glass_icon_state = "martiniglass"
glass_center_of_mass = list("x"=17, "y"=8)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 8
/datum/reagent/ethanol/vodkatonic
glass_icon_state = "vodkatonicglass"
glass_center_of_mass = list("x"=16, "y"=7)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 7
/datum/reagent/ethanol/white_russian
glass_icon_state = "whiterussianglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/whiskey_cola
glass_icon_state = "whiskeycolaglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/whiskeysoda
glass_icon_state = "whiskeysodaglass2"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/ethanol/specialwhiskey
glass_icon_state = "whiskeyglass"
glass_center_of_mass = list("x"=16, "y"=12)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 12
/datum/reagent/ethanol/godka
glass_icon_state = "godkabottle"
glass_center_of_mass = list("x"=17, "y"=15)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 15
/datum/reagent/ethanol/holywine
glass_icon_state = "holywineglass"
glass_center_of_mass = list("x"=15, "y"=7)
glass_center_of_mass_x = 15
glass_center_of_mass_y = 7
/datum/reagent/ethanol/holy_mary
glass_icon_state = "holymaryglass"
/datum/reagent/ethanol/angelswrath
glass_icon_state = "angelswrath"
glass_center_of_mass = list("x"=16, "y"=2)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 2
/datum/reagent/ethanol/angelskiss
glass_icon_state = "angelskiss"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/ichor_mead
glass_icon_state = "ichor_meadglass"
glass_center_of_mass = list("x"=17, "y"=10)
glass_center_of_mass_x = 17
glass_center_of_mass_y = 10
/datum/reagent/drink/eggnog
glass_icon_state = "eggnog"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/cider
glass_icon_state = "ciderglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/driverspunch
glass_icon_state = "driverspunch"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/coffee/elysiumfacepunch
glass_icon_state = "elysiumfacepunch"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/entdraught
glass_icon_state = "entdraught"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/erebusmoonrise
glass_icon_state = "erebusmoonrise"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/euphoria
glass_icon_state = "euphoria"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/collins_mix
glass_icon_state = "collinsmix"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/daiquiri
glass_icon_state = "daiquiri"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/dreamcream
glass_icon_state = "dreamcream"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/debugger
glass_icon_state = "debugger"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/binmanbliss
glass_icon_state = "binmanbliss"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/bitters
glass_icon_state = "bitters"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/chrysanthemum
glass_icon_state = "chrysanthemum"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/cloverclub
glass_icon_state = "cloverclub"
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/coldfront
glass_icon_state = "coldfront"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/balloon
glass_icon_state = "balloon"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/berrycordial
glass_icon_state = "berrycordial"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/milkshake/chocoshake
glass_icon_state = "chocoshake"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/milkshake/coffeeshake
glass_icon_state = "coffeeshake"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/milkshake/berryshake
glass_icon_state = "berryshake"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/soda/melonade
glass_icon_state = "melonade"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/soda/appleade
glass_icon_state = "appleade"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/mintapplesparkle
glass_icon_state = "mintapplesparkle"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/soda/pineappleade
glass_icon_state = "pineappleade"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/soda/lemonade
glass_icon_state = "lemonade"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/arnold_palmer
glass_icon_state = "arnoldpalmer"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/mojito
glass_icon_state = "mojito"

93
code/modules/food/drinkingglass/metaglass_vr.dm
View File

@@ -1,151 +1,181 @@
/datum/reagent/ethanol/ginzamary
glass_icon_state = "ginzamaryglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/deathbell
glass_icon_state = "deathbellglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/drink/brownstar
glass_icon_state = "brownstarglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/spacersbrew
glass_icon_state = "spacersbrewglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/galacticpanic
glass_icon_state = "galacticpanicglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/bulldog
glass_icon_state = "bulldogglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/sbagliato
glass_icon_state = "sbagliatoglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/italiancrisis
glass_icon_state = "italiancrisisglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/bigbeer
glass_icon_state = "bigbeerglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/sugarrush
glass_icon_state = "sugarrushglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/lotus
glass_icon_state = "lotusglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/shroomjuice
glass_icon_state = "shroomjuiceglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/russianroulette
glass_icon_state = "russianrouletteglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/lovepotion
glass_icon_state = "lovepotionglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/honeyshot
glass_icon_state = "honeyshotglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/appletini
glass_icon_state = "appletiniglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/glowingappletini
glass_icon_state = "glowingappletiniglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/scsatw
glass_icon_state = "slowcomfortablescrewagainstthewallglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/drink/choccymilk
glass_icon_state = "choccymilkglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/drink/sweettea
glass_icon_state = "sweetteaglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/redspaceflush
glass_icon_state = "redspaceflushglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/drink/graveyard
glass_icon_state = "graveyardglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/unsweettea
glass_icon_state = "unsweetteaglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/hairoftherat
glass_icon_state = "hairoftheratglass"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/pink_russian
glass_icon_state = "pinkrussianglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/originalsin
glass_icon_state = "originalsinglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/whiskeysour
glass_icon_state = "whiskeysourglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/newyorksour
glass_icon_state = "newyorksourglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/mudslide
glass_icon_state = "mudslideglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/windgarita
glass_icon_state = "windgaritaglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/drink/soda/kiraspecial
@@ -237,7 +267,8 @@
/datum/reagent/ethanol/burnout
glass_icon_state = "burnout"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/manager_summoner

8
code/modules/food/drinkingglass/mugs.dm
View File

@@ -15,8 +15,8 @@
desc = "A cup with the British flag emblazoned on it."
icon_state = "britcup"
volume = 30
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 13 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 13
/obj/item/reagent_containers/food/drinks/britcup/on_reagent_change()
..()
@@ -30,8 +30,8 @@
icon = 'icons/obj/drinks_vr.dmi'
icon_state = "textmug"
volume = 30
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 13 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 13
/*
* Coffee Mugs

6
code/modules/food/food.dm
View File

@@ -34,7 +34,7 @@
/obj/item/reagent_containers/food/Initialize()
. = ..()
if ((center_of_mass_x || center_of_mass_y) && !pixel_x && !pixel_y) //CHOMPEdit
if ((center_of_mass_x || center_of_mass_y) && !pixel_x && !pixel_y)
src.pixel_x = rand(-6.0, 6) //Randomizes postion
src.pixel_y = rand(-6.0, 6)
@@ -52,8 +52,8 @@
var/cell_x = max(0, min(CELLS-1, round(mouse_x/CELLSIZE)))
var/cell_y = max(0, min(CELLS-1, round(mouse_y/CELLSIZE)))
pixel_x = (CELLSIZE * (0.5 + cell_x)) - center_of_mass_x //CHOMPEdit
pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass_y //CHOMPEdit
pixel_x = (CELLSIZE * (0.5 + cell_x)) - center_of_mass_x
pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass_y
/obj/item/reagent_containers/food/container_resist(mob/living/M)
if(istype(M, /mob/living/voice)) return // CHOMPAdd - Stops sentient food from astral projecting

224
code/modules/food/food/cans.dm
View File

@@ -13,8 +13,8 @@
desc = "Reassuringly artificial. Contains caffeine."
description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
icon_state = "cola"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/cola/Initialize()
. = ..()
@@ -25,8 +25,8 @@
desc = "More reassuringly artificial than ever before."
description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
icon_state = "decafcola"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/decaf_cola/Initialize()
. = ..()
@@ -36,8 +36,8 @@
name = "bottled water"
desc = "Ice cold and utterly tasteless, this 'all-natural' mineral water comes 'fresh' from one of NanoTrasen's heavy-duty bottling plants in the Sivian poles."
icon_state = "waterbottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
drop_sound = 'sound/items/drop/disk.ogg'
pickup_sound = 'sound/items/pickup/disk.ogg'
cant_chance = 0
@@ -51,8 +51,8 @@
desc = "Blows right through you like a space wind. Contains caffeine."
description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
icon_state = "space_mountain_wind"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize()
. = ..()
@@ -62,8 +62,8 @@
name = "\improper Thirteen Loko"
desc = "The Vir Health Board has advised consumers that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
icon_state = "thirteen_loko"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/thirteenloko/Initialize()
. = ..()
@@ -74,8 +74,8 @@
desc = "A delicious mixture of 42 different flavors. Contains caffine."
description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'."
icon_state = "dr_gibb"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize()
. = ..()
@@ -86,8 +86,8 @@
desc = "A delicious mixture of 42 different flavors, one of which is water. Contains caffeine."
description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'."
icon_state = "dr_gibb_diet"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize()
. = ..()
@@ -98,8 +98,8 @@
desc = "The taste of a star in liquid form. And, a bit of tuna...? Contains caffeine."
description_fluff = "Brought back by popular demand in 2515 after a limited-run release in 2510, the cult success of this bizarre tasting soda has never truly been accounted for by economists."
icon_state = "starkist"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/starkist/Initialize()
. = ..()
@@ -110,8 +110,8 @@
desc = "The taste of a star in liquid form, in a special decaffineated blend. Still tastes faintly of tuna?"
description_fluff = "A special variant of the Starkist brand soda introduced after popular outcry following a reformulation of the basic drink decades ago. This decaffineated variant outsells 'New' Starkist in many markets."
icon_state = "decafstarkist"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/starkistdecaf/Initialize()
. = ..()
@@ -122,8 +122,8 @@
desc = "Tastes like a hull breach in your mouth."
description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
icon_state = "space-up"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/space_up/Initialize()
. = ..()
@@ -134,8 +134,8 @@
desc = "You wanted ORANGE. It gave you Lemon-Lime."
description_fluff = "Not to be confused with 'lemon & lime soda', Lemon-Lime is specially formulated using the highly propriatary Lemon-Lime Fruit. Growing the Lemon-Lime without a license is punishable by fines or jail time. Accept no immitations."
icon_state = "lemon-lime"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/lemon_lime/Initialize()
. = ..()
@@ -146,8 +146,8 @@
desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth? Contains caffeine."
description_fluff = "Produced exclusively on the planet Oasis, Vrisk Serket Iced Tea is not sold outside of the Golden Crescent, let alone Earth."
icon_state = "ice_tea_can"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/iced_tea/Initialize()
. = ..()
@@ -158,8 +158,8 @@
desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
description_fluff = "Strangely, this unassuming grape soda is a product of Hephaestus Industries."
icon_state = "purple_can"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/grape_juice/Initialize()
. = ..()
@@ -170,8 +170,8 @@
desc = "Quinine tastes funny, but at least it'll keep the Malaria away."
description_fluff = "Due to its technically medicinal properties and the complexities of chemical copyright law, T-Borg's Tonic Water is a rare product of Zeng-Hu's 'LifeWater' refreshments division."
icon_state = "tonic"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/tonic/Initialize()
. = ..()
@@ -181,8 +181,8 @@
name = "soda water"
desc = "A can of soda water. Still water's more refreshing cousin."
icon_state = "sodawater"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/sodawater/Initialize()
. = ..()
@@ -193,8 +193,8 @@
desc = "For when you need to be more retro than NanoTrasen already pays you for."
description_fluff = "'Classic' beverages is a registered trademark of the Centauri Provisions corporation."
icon_state = "gingerale"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/gingerale/Initialize()
. = ..()
@@ -205,8 +205,8 @@
desc = "Guaranteed to be both Rootin' and Tootin'."
description_fluff = "Despite centuries of humanity's expansion, this particular soda is still produced almost exclusively on Earth, in North America."
icon_state = "root_beer"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/root_beer/Initialize()
. = ..()
@@ -219,8 +219,8 @@
desc = "A true Slavic soda."
description_fluff = "A classic Slavic beverage which many space-faring Slavs still enjoy to this day. Fun fact, it is actually considered a weak beer by non-Russians."
icon_state = "kvass"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/kvass/Initialize()
. = ..()
@@ -231,8 +231,8 @@
desc = "A taste of Russia in the summertime - canned for you consumption."
description_fluff = "A sweet and fruity beverage that was traditionally used to preserve fruits in harsh Russian winters that is now available for widespread consumption."
icon_state = "kompot"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/kompot/Initialize()
. = ..()
@@ -242,8 +242,8 @@
name = "\improper Boda"
desc = "State regulated soda beverage. Enjoy comrades."
icon_state = "boda"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/boda/Initialize()
. = ..()
@@ -253,8 +253,8 @@
name = "\improper Boda-Plyus"
desc = "State regulated soda beverage, now with added surplus flavoring. Enjoy comrades."
icon_state = "bodaplus"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/bodaplus/Initialize()
. = ..()
@@ -273,8 +273,8 @@
name = "\improper Red Army Twist"
desc = "A taste of what keeps our glorious nation running! Served as Space Commissariat Stahlin prefers it! Luke warm."
icon_state = "red_army"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/redarmy/Initialize()
. = ..()
@@ -285,8 +285,8 @@
name = "\improper Arstotzka Brü"
desc = "Just what any bureaucrat needs to get through the day. Keep stamping those papers!"
icon_state = "arst_bru"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/arstbru/Initialize()
. = ..()
@@ -297,8 +297,8 @@
desc = "Made by the people. Served to the people."
description_fluff = "A can of the only soft drink state approved for the benefit of the people. Served at room temperature regardless of ambient temperatures thanks to innovative Terran insulation technology."
icon_state = "terra_cola"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/terra_cola/Initialize()
. = ..()
@@ -311,8 +311,8 @@
name = "\improper Superior Strawberry"
desc = "Feel superior above all with Superior Strawberry!"
icon_state = "strawcoke"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/straw_cola/Initialize()
. = ..()
@@ -322,8 +322,8 @@
name = "\improper Andromeda Apple"
desc = "Look to the stars and prepare to explore with Andromeda Apple!"
icon_state = "applecoke"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/apple_cola/Initialize()
. = ..()
@@ -333,8 +333,8 @@
name = "\improper Lunar Lemon"
desc = "Feel back at home on the Lunar Colonies with this classic beverage straight from the source!"
icon_state = "lemoncoke"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/lemon_cola/Initialize()
. = ..()
@@ -344,8 +344,8 @@
name = "\improper Starship Sarsaparilla"
desc = "Take off and shoot for the stars with this classic cowboy cola!"
icon_state = "sarsaparilla"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/sarsaparilla/Initialize()
. = ..()
@@ -355,8 +355,8 @@
name = "\improper Gravity Grape"
desc = "Get down with Newton's favorite carbonated science experiment!"
icon_state = "grapesoda"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/grape_cola/Initialize()
. = ..()
@@ -366,8 +366,8 @@
name = "\improper Orion Orange"
desc = "Take a taste-tastic trip to Orion's Belt with Orion Orange!"
icon_state = "orangesoda"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/orange_cola/Initialize()
. = ..()
@@ -377,8 +377,8 @@
name = "\improper Bacon Soda"
desc = "Taste something out of this world with Bacon Soda!"
icon_state = "porkcoke"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/baconsoda/Initialize()
. = ..()
@@ -392,8 +392,8 @@
popular as Space Cola, many people across known space enjoy the sweet beverage."
icon = 'icons/obj/drinks_vr.dmi'
icon_state = "bepis"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/bepis/Initialize()
. = ..()
@@ -404,8 +404,8 @@
desc = "A can of refreshing 'spring' water! Or so the can claims."
icon = 'icons/obj/drinks_vr.dmi'
icon_state = "watercan"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/astrodew/Initialize()
. = ..()
@@ -421,8 +421,8 @@
years now, however all attempts they've made have failed."
icon = 'icons/obj/drinks_vr.dmi'
icon_state = "coffeecan"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/icecoffee/Initialize()
. = ..()
@@ -433,8 +433,8 @@
desc = "Uses real honey, making it a sweet tooth's dream drink."
icon = 'icons/obj/drinks_vr.dmi'
icon_state = "buzzfuzz"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/buzz/Initialize()
. = ..()
@@ -445,8 +445,8 @@
desc = "~Shake me up some of that Shambler's Juice!~"
icon = 'icons/obj/drinks_vr.dmi'
icon_state = "shambler"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/shambler/Initialize()
. = ..()
@@ -457,8 +457,8 @@
desc = "A delicious blend of fresh cranberry juice and various spices, the perfect drink."
icon = 'icons/obj/drinks_vr.dmi'
icon_state = "cranberry"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/cans/cranberry/Initialize()
. = ..()
@@ -470,8 +470,8 @@
name = "\improper Sunshine Brew"
desc = "Beat the heat with this refreshing brewed beverage."
icon_state = "beercan"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/beercan/Initialize()
. = ..()
@@ -481,8 +481,8 @@
name = "\improper Spacecastle Pale Ale"
desc = "A delicious IPA that's canned for your pleasure. Drink up!"
icon_state = "alecan"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/cans/alecan/Initialize()
. = ..()
@@ -494,8 +494,8 @@
name = "\improper Nukies - Peach Blaster"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_peach"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_peach/Initialize()
@@ -506,8 +506,8 @@
name = "\improper Nukies - Great Pear"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_pear"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_pear/Initialize()
@@ -518,8 +518,8 @@
name = "\improper Nukies - Popping Cherry"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_cherry"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_cherry/Initialize()
@@ -530,8 +530,8 @@
name = "\improper Nukies - Melon Squirter"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_melon"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_melon/Initialize()
@@ -542,8 +542,8 @@
name = "\improper Nukies - Bursting Banana"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_banana"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_banana/Initialize()
@@ -554,8 +554,8 @@
name = "\improper Nukies - Insatiable Rose"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_rose"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_rose/Initialize()
@@ -566,8 +566,8 @@
name = "\improper Nukies - Citrus Got Real"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_lemon"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_lemon/Initialize()
@@ -578,8 +578,8 @@
name = "\improper Nukies - Swelling Fruit"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_fruit"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_fruit/Initialize()
@@ -590,8 +590,8 @@
name = "\improper Nukies - Limited Edition"
desc = "Harness the power of the atom with this over-caffinated energy drink."
icon_state = "nukie_special"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_special/Initialize()
@@ -605,8 +605,8 @@
name = "\improper Nukies Mega - Plum Peeper"
desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
icon_state = "nukie_mega_sight"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight/Initialize()
@@ -617,8 +617,8 @@
name = "\improper Nukies Mega - Juice Pumper"
desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
icon_state = "nukie_mega_heart"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart/Initialize()
@@ -629,8 +629,8 @@
name = "\improper Nukies Nega - Vibrating Nights"
desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
icon_state = "nukie_mega_sleep"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep/Initialize()
@@ -641,8 +641,8 @@
name = "\improper Nukies Mega - Jolt Railer"
desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
icon_state = "nukie_mega_strong"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock/Initialize()
@@ -653,8 +653,8 @@
name = "\improper Nukies Mega - Rapid Rager"
desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
icon_state = "nukie_mega_fast"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast/Initialize()
@@ -665,8 +665,8 @@
name = "\improper Nukies Mega - Diamond Sky"
desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
icon_state = "nukie_mega_high"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high/Initialize()
@@ -677,8 +677,8 @@
name = "\improper Nukies Mega - Shrinking Flower"
desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
icon_state = "nukie_mega_shrink"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink/Initialize()
@@ -689,8 +689,8 @@
name = "\improper Nukies Mega - Growing Geyser"
desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
icon_state = "nukie_mega_grow"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y = 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
volume = 60
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow/Initialize()

104
code/modules/food/food/condiment.dm
View File

@@ -12,8 +12,8 @@
icon_state = "emptycondiment"
flags = OPENCONTAINER
possible_transfer_amounts = list(1,5,10)
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
volume = 50
/obj/item/reagent_containers/food/condiment/attackby(var/obj/item/W as obj, var/mob/user as mob)
@@ -61,103 +61,103 @@
name = REAGENT_KETCHUP
desc = "You feel more American already."
icon_state = "ketchup"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_MUSTARD)
name = REAGENT_MUSTARD
desc = "A somewhat bitter topping."
icon_state = "mustard"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_CAPSAICIN)
name = "Hotsauce"
desc = "You can almost TASTE the stomach ulcers now!"
icon_state = "hotsauce"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_ENZYME)
name = REAGENT_ENZYME
desc = "Used in cooking various dishes."
icon_state = "enzyme"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_SOYSAUCE)
name = REAGENT_SOYSAUCE
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_VINEGAR)
name = REAGENT_VINEGAR
desc = "An acetic acid used in various dishes."
icon_state = "vinegar"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_FROSTOIL)
name = "Coldsauce"
desc = "Leaves the tongue numb in its passage."
icon_state = "coldsauce"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_SODIUMCHLORIDE)
name = "Salt Shaker"
desc = "Salt. From space oceans, presumably."
icon_state = "saltshaker"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 11
if(REAGENT_ID_BLACKPEPPER)
name = "Pepper Mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 11
if(REAGENT_ID_COOKINGOIL)
name = REAGENT_COOKINGOIL
desc = "A delicious oil used in cooking. General purpose."
icon_state = "oliveoil"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_SUGAR)
name = REAGENT_SUGAR
desc = "Tastey space sugar!"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_PEANUTBUTTER)
name = REAGENT_PEANUTBUTTER
desc = "A jar of smooth peanut butter."
icon_state = "peanutbutter"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_MAYO)
name = REAGENT_MAYO
desc = "A jar of mayonnaise!"
icon_state = "mayo"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_YEAST)
name = REAGENT_YEAST
desc = "This is what you use to make bread fluffy."
icon_state = "yeast"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_SPACESPICE)
name = "bottle of space spice"
desc = "An exotic blend of spices for cooking. Definitely not worms."
icon_state = "spacespicebottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_BARBECUE)
name = "barbecue sauce"
desc = "Barbecue sauce, it's labeled 'sweet and spicy'."
icon_state = "barbecue"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
if(REAGENT_ID_SPRINKLES)
name = REAGENT_ID_SPRINKLES
desc = "Bottle of sprinkles, colourful!"
icon_state= "sprinkles"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
else
name = "Misc Condiment Bottle"
if (reagents.reagent_list.len==1)
@@ -165,14 +165,14 @@
else
desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them."
icon_state = "mixedcondiments"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
else
icon_state = "emptycondiment"
name = "Condiment Bottle"
desc = "An empty condiment bottle."
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
return
/obj/item/reagent_containers/food/condiment/enzyme
@@ -244,8 +244,8 @@
possible_transfer_amounts = list(1,20)
amount_per_transfer_from_this = 1
volume = 20
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
/obj/item/reagent_containers/food/condiment/small/on_reagent_change()
return
@@ -254,8 +254,8 @@
name = "salt shaker" // a large one.
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 11
/obj/item/reagent_containers/food/condiment/small/saltshaker/Initialize()
. = ..()
@@ -265,8 +265,8 @@
name = "pepper shaker"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppershakersmall"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 11
/obj/item/reagent_containers/food/condiment/small/peppermill/Initialize()
. = ..()
@@ -276,8 +276,8 @@
name = "pepper mill"
desc = "Fancy way to season a dish or make people sneeze."
icon_state = "peppermill"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 11
/obj/item/reagent_containers/food/condiment/small/peppermill/Initialize()
. = ..()
@@ -490,8 +490,8 @@
icon = 'icons/obj/food.dmi'
icon_state = "flour"
volume = 220
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/condiment/carton/flour/on_reagent_change()
update_icon()
@@ -522,8 +522,8 @@
desc = "A big carton of sugar. Sweet!"
icon_state = REAGENT_ID_SUGAR
volume = 120
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/condiment/carton/sugar/on_reagent_change()
update_icon()

80
code/modules/food/food/drinks.dm
View File

@@ -246,8 +246,8 @@
description_fluff = "A product of NanoPastures. Who would have thought that cows would thrive in zero-G?"
icon_state = "milk"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 9
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
@@ -261,8 +261,8 @@
description_fluff = "A product of NanoPastures. For those skeptical that cows can thrive in zero-G."
icon_state = "soymilk"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 9
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
@@ -277,8 +277,8 @@
volume = 30
icon_state = "mini-milk"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 9
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
@@ -293,8 +293,8 @@
volume = 30
icon_state = "mini-milk_choco"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 9
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
@@ -308,8 +308,8 @@
description_fluff = "Fresh coffee is almost unheard of outside of planets and stations where it is grown. Robust Coffee proudly advertises the six separate times it is freeze-dried during the production process of every cup of instant."
icon_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 10
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -324,8 +324,8 @@
icon_state = "chai_vended"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -340,8 +340,8 @@
icon_state = "chai_vended"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -353,8 +353,8 @@
name = "cup of ice"
desc = "Careful, cold ice, do not chew."
icon_state = "ice"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/ice/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_ICE, 30)
@@ -366,8 +366,8 @@
icon_state = "coffee"
item_state = "hot_choc"
trash = /obj/item/trash/coffee
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 13 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 13
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -382,8 +382,8 @@
icon_state = "greentea_vended"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -398,8 +398,8 @@
icon_state = "chai_vended"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -414,8 +414,8 @@
icon_state = "coffee"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -429,8 +429,8 @@
description_fluff = "Konohagakure Brand Ramen has been an instant meal staple for centuries. Cheap, quick and available in over two hundred varieties - though most taste like artifical chicken."
icon_state = "ramen"
trash = /obj/item/trash/ramen
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 11
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -444,8 +444,8 @@
icon_state = "water_cup_e"
possible_transfer_amounts = null
volume = 10
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 12 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 12
drop_sound = 'sound/items/drop/papercup.ogg'
pickup_sound = 'sound/items/pickup/papercup.ogg'
@@ -482,8 +482,8 @@
icon_state = "shaker"
amount_per_transfer_from_this = 10
volume = 120
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/shaker/on_reagent_change()
..()
@@ -495,8 +495,8 @@
item_state = "teapot"
amount_per_transfer_from_this = 10
volume = 120
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 7
/obj/item/reagent_containers/food/drinks/teapot/on_reagent_change()
..()
@@ -507,8 +507,8 @@
icon_state = "flask"
volume = 60
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 7
/obj/item/reagent_containers/food/drinks/flask/on_reagent_change()
..()
@@ -528,21 +528,21 @@
desc = "A metal flask with a leather band and golden badge belonging to the detective."
icon_state = "detflask"
volume = 60
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/flask/barflask
name = "flask"
desc = "For those who can't be bothered to hang out at the bar to drink."
icon_state = "barflask"
volume = 60
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 7
/obj/item/reagent_containers/food/drinks/flask/vacuumflask
name = "vacuum flask"
desc = "Keeping your drinks at the perfect temperature since 1892."
icon_state = "vacuumflask"
volume = 60
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 4 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 4

192
code/modules/food/food/drinks/bottle.dm
View File

@@ -224,8 +224,8 @@
name = "Griffeater Gin"
desc = "A bottle of high quality gin, produced in Alpha Centauri."
icon_state = "ginbottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 4 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 4
/obj/item/reagent_containers/food/drinks/bottle/gin/Initialize()
. = ..()
@@ -235,8 +235,8 @@
name = "Uncle Git's Special Reserve"
desc = "A premium single-malt whiskey, gently matured in a highly classified location."
icon_state = "whiskeybottle1"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize()
. = ..()
@@ -246,8 +246,8 @@
name = REAGENT_SPECIALWHISKEY
desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
icon_state = "whiskeybottle2"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize()
. = ..()
@@ -257,8 +257,8 @@
name = "Tunguska Triple Distilled"
desc = "Aah, vodka. Prime choice of drink and fuel by Russians worldwide."
icon_state = "vodkabottle"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize()
. = ..()
@@ -268,8 +268,8 @@
name = "Caccavo Guaranteed Quality Tequilla"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
icon_state = "tequilabottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/tequilla/Initialize()
. = ..()
@@ -279,8 +279,8 @@
name = "Bottle of Nothing"
desc = "A bottle filled with nothing"
icon_state = "bottleofnothing"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 5 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 5
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize()
. = ..()
@@ -290,8 +290,8 @@
name = "Wrapp Artiste Patron"
desc = "Silver laced tequilla, served in night clubs across the galaxy."
icon_state = "patronbottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/patron/Initialize()
. = ..()
@@ -301,8 +301,8 @@
name = "Captain Pete's Cuban Spiced Rum"
desc = "This isn't just rum, oh no. It's practically Cuba in a bottle."
icon_state = "rumbottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
/obj/item/reagent_containers/food/drinks/bottle/rum/Initialize()
. = ..()
@@ -312,8 +312,8 @@
name = "Flask of Holy Water"
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/bottle/holywater/Initialize()
. = ..()
@@ -323,8 +323,8 @@
name = "Goldeneye Vermouth"
desc = "Sweet, sweet dryness~"
icon_state = "vermouthbottle"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize()
. = ..()
@@ -334,8 +334,8 @@
name = "Robert Robust's Coffee Liqueur"
desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936."
icon_state = "kahluabottle"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize()
. = ..()
@@ -345,8 +345,8 @@
name = "College Girl Goldschlager"
desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
icon_state = "goldschlagerbottle"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize()
. = ..()
@@ -356,8 +356,8 @@
name = "Chateau De Baton Premium Cognac"
desc = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing."
icon_state = "cognacbottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize()
. = ..()
@@ -367,8 +367,8 @@
name = "Jailbreaker Verte"
desc = "One sip of this and you just know you're gonna have a good time."
icon_state = "absinthebottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
. = ..()
@@ -378,8 +378,8 @@
name = "Emeraldine Melon Liqueur"
desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light."
icon_state = "melon_liqueur"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize()
. = ..()
@@ -389,8 +389,8 @@
name = "Miss Blue Curacao"
desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic."
icon_state = "blue_curacao"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize()
. = ..()
@@ -400,8 +400,8 @@
name = REAGENT_UNATHILIQUOR
desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart."
icon_state = "redeemersbrew"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew/Initialize()
. = ..()
@@ -411,8 +411,8 @@
name = "Dr. Bone's Peppermint Schnapps"
desc = "A flavoured grain liqueur with a fresh, minty taste."
icon_state = "schnapps_pep"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize()
. = ..()
@@ -422,8 +422,8 @@
name = "Dr. Bone's Peach Schnapps"
desc = "A flavoured grain liqueur with a fruity peach taste."
icon_state = "schnapps_pea"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/peachschnapps/Initialize()
. = ..()
@@ -433,8 +433,8 @@
name = "Dr. Bone's Lemonade Schnapps"
desc = "A flavoured grain liqueur with a sweetish, lemon taste."
icon_state = "schnapps_lem"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize()
. = ..()
@@ -444,8 +444,8 @@
name = "Schusskonig"
desc = "A complex tasting digestif. Thank god the original's trademark lapsed."
icon_state = "jager_bottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/jager/Initialize()
. = ..()
@@ -457,8 +457,8 @@
name = "Doublebeard Bearded Special Red"
desc = "Cheap cooking wine pretending to be drinkable."
icon_state = "winebottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 4 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 4
/obj/item/reagent_containers/food/drinks/bottle/wine/Initialize()
. = ..()
@@ -468,8 +468,8 @@
name = "Doublebeard Bearded Special White"
desc = "Cooking wine pretending to be drinkable."
icon_state = "whitewinebottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 4 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 4
/obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize()
. = ..()
@@ -479,8 +479,8 @@
name = "NanoTrasen Carnoth Red"
desc = "A NanoTrasen branded wine given to high ranking staff as gifts. Made special on the agricultural planet Carnoth."
icon_state = "carnoth"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 4 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 4
/obj/item/reagent_containers/food/drinks/bottle/carnoth/Initialize()
. = ..()
@@ -490,8 +490,8 @@
name = "Warlock's Velvet"
desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
icon_state = "pwinebottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 4 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 4
/obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize()
. = ..()
@@ -501,8 +501,8 @@
name = "Gilthari Luxury Champagne"
desc = "For those special occassions."
icon_state = "champagne"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/champagne/Initialize()
. = ..()
@@ -512,8 +512,8 @@
name = "Mono-No-Aware Luxury Sake"
desc = "Dry alcohol made from rice, a favorite of businessmen."
icon_state = "sakebottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
. = ..()
@@ -525,8 +525,8 @@
name = "\improper two-liter Space Cola"
desc = "Cola. In space. Contains caffeine."
icon_state = "colabottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/cola/Initialize()
. = ..()
@@ -536,8 +536,8 @@
name = "\improper two-liter Space Cola Free"
desc = "Cola. In space. Caffeine free."
icon_state = "decafcolabottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/decaf_cola/Initialize()
. = ..()
@@ -547,8 +547,8 @@
name = "\improper two-liter Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up_bottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize()
. = ..()
@@ -558,8 +558,8 @@
name = "\improper two-liter Space Mountain Wind"
desc = "Blows right through you like a space wind. Contains caffeine."
icon_state = "space_mountain_wind_bottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize()
. = ..()
@@ -569,8 +569,8 @@
name = "\improper two-liter Dr. Gibb"
desc = "A delicious mixture of 42 different flavors. Contains caffeine."
icon_state = "dr_gibb_bottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/dr_gibb/Initialize()
. = ..()
@@ -581,8 +581,8 @@
desc = "Full of vitamins and deliciousness!"
icon_state = "orangejuice"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 7
isGlass = 0
/obj/item/reagent_containers/food/drinks/bottle/orangejuice/Initialize()
@@ -594,8 +594,8 @@
desc = "Squeezed, pressed and ground to perfection!"
icon_state = "applejuice"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 7
isGlass = 0
/obj/item/reagent_containers/food/drinks/bottle/applejuice/Initialize()
@@ -607,8 +607,8 @@
desc = "It's milk. This carton's large enough to serve your biggest milk drinkers."
icon_state = "milk"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 9
isGlass = 0
/obj/item/reagent_containers/food/drinks/bottle/milk/Initialize()
@@ -620,8 +620,8 @@
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
icon_state = "cream"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
isGlass = 0
/obj/item/reagent_containers/food/drinks/bottle/cream/Initialize()
@@ -633,8 +633,8 @@
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
icon_state = "tomatojuice"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
isGlass = 0
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice/Initialize()
@@ -646,8 +646,8 @@
desc = "Sweet-sour goodness."
icon_state = "limejuice"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
isGlass = 0
/obj/item/reagent_containers/food/drinks/bottle/limejuice/Initialize()
@@ -659,8 +659,8 @@
desc = "Sweet-sour goodness. Minus the sweet."
icon_state = "lemonjuice"
item_state = "carton"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
isGlass = 0
/obj/item/reagent_containers/food/drinks/bottle/lemonjuice/Initialize()
@@ -671,8 +671,8 @@
name = "Briar Rose Grenadine Syrup"
desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
icon_state = "grenadinebottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize()
. = ..()
@@ -682,8 +682,8 @@
name = "Special Blend Grapejuice"
desc = "A delicious blend of various grape species in one succulent blend."
icon_state = "grapejuicebottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 3 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 3
/obj/item/reagent_containers/food/drinks/bottle/grapejuice/Initialize()
. = ..()
@@ -702,8 +702,8 @@
desc = "A remarkably unremarkable pale lager. Barley malt, hops and yeast."
description_fluff = "Identical to an earlier Earth-based variety of beer, Spacer beer was rebranded at the height of humanity's first extra-solar colonization boom in the 2130s and become the go-to cheap booze for those dreaming of a brighter future in the stars. Today, the beer is advertised as 'brewed in space, for space."
icon_state = "beer"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 12 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 12
/obj/item/reagent_containers/food/drinks/bottle/small/beer/Initialize()
. = ..()
@@ -735,8 +735,8 @@
name = "Crisp's Cider"
desc = "Fermented apples never tasted this good."
icon_state = "cider"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 12 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 12
/obj/item/reagent_containers/food/drinks/bottle/small/cider/Initialize()
. = ..()
@@ -747,8 +747,8 @@
desc = "A true dorf's drink of choice."
icon_state = "alebottle"
item_state = "beer"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/drinks/bottle/small/ale/Initialize()
. = ..()
@@ -770,8 +770,8 @@
name = REAGENT_COLA
desc = "Cola. In space."
icon_state = "colabottle2"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/small/cola/Initialize()
. = ..()
@@ -781,8 +781,8 @@
name = REAGENT_SPACEUP
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up_bottle2"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/small/space_up/Initialize()
. = ..()
@@ -792,8 +792,8 @@
name = "Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind_bottle2"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind/Initialize()
. = ..()
@@ -803,8 +803,8 @@
name = REAGENT_DRGIBB
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb_bottle2"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 6 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 6
/obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize()
. = ..()

18
code/modules/food/food/drinks/cup.dm
View File

@@ -4,8 +4,8 @@
icon_state = "cup_empty"
amount_per_transfer_from_this = 5
volume = 30
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
/obj/item/reagent_containers/food/drinks/cup/on_reagent_change()
..()
@@ -32,17 +32,17 @@
else
desc = "You can't really tell what this is."
if(R.cup_center_of_mass)
center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
center_of_mass_x = R.cup_center_of_mass_x
center_of_mass_y = R.cup_center_of_mass_y
else
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
else
icon_state = "cup_empty"
name = "coffee cup"
desc = "The container of oriental luxuries."
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
return

90
code/modules/food/food/drinks/drinkingglass.dm
View File

@@ -7,8 +7,8 @@
amount_per_transfer_from_this = 5
volume = 30
unacidable = TRUE //glass
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
matter = list(MAT_GLASS = 500)
/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
@@ -16,8 +16,8 @@
icon_state = "glass_empty"
name = "glass"
desc = "Your standard drinking glass."
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
return
var/datum/reagent/R = reagents.get_master_reagent()
@@ -36,12 +36,12 @@
else
desc = "You can't really tell what this is."
if(R.glass_center_of_mass)
center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
if(R.glass_center_of_mass_x || R.glass_center_of_mass_y)
center_of_mass_x = R.cup_center_of_mass_x
center_of_mass_y = R.cup_center_of_mass_y
else
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
if(R.price_tag)
price_tag = R.price_tag
@@ -54,16 +54,16 @@
icon_state = "cup_empty"
amount_per_transfer_from_this = 5
volume = 30
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
/obj/item/reagent_containers/food/drinks/cup/on_reagent_change()
if (!length(reagents?.reagent_list))
icon_state = "cup_empty"
name = "coffee cup"
desc = "The container of oriental luxuries."
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
return
var/datum/reagent/R = reagents.get_master_reagent()
@@ -87,12 +87,12 @@
else
desc = "You can't really tell what this is."
if(R.cup_center_of_mass)
center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
center_of_mass_x = R.cup_center_of_mass_x
center_of_mass_y = R.cup_center_of_mass_y
else
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
if(R.price_tag)
price_tag = R.price_tag
@@ -184,16 +184,16 @@
icon_state = "tall_cup_empty"
amount_per_transfer_from_this = 5
volume = 40
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
/obj/item/reagent_containers/food/drinks/tall/on_reagent_change()
if (!length(reagents?.reagent_list))
icon_state = "tall_cup_empty"
name = "tall cup"
desc = "A larger coffee cup."
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
return
var/datum/reagent/R = reagents.get_master_reagent()
@@ -217,12 +217,12 @@
else
desc = "You can't really tell what this is."
if(R.cup_center_of_mass)
center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
center_of_mass_x = R.cup_center_of_mass_x
center_of_mass_y = R.cup_center_of_mass_y
else
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
if(R.price_tag)
price_tag = R.price_tag
@@ -235,16 +235,16 @@
icon_state = "grande_cup_empty"
amount_per_transfer_from_this = 5
volume = 50
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
/obj/item/reagent_containers/food/drinks/grande/on_reagent_change()
if (!length(reagents?.reagent_list))
icon_state = "grande_cup_empty"
name = "grande cup"
desc = "A much taller coffee cup for people who really need their coffee."
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
return
var/datum/reagent/R = reagents.get_master_reagent()
@@ -268,12 +268,12 @@
else
desc = "You can't really tell what this is."
if(R.cup_center_of_mass)
center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
center_of_mass_x = R.cup_center_of_mass_x
center_of_mass_y = R.cup_center_of_mass_y
else
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
if(R.price_tag)
price_tag = R.price_tag
@@ -286,16 +286,16 @@
icon_state = "venti_cup_empty"
amount_per_transfer_from_this = 5
volume = 60
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
/obj/item/reagent_containers/food/drinks/venti/on_reagent_change()
if (!length(reagents?.reagent_list))
icon_state = "venti_cup_empty"
name = "venti cup"
desc = "A huge coffee cup for people who literally cannot function without it."
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
return
var/datum/reagent/R = reagents.get_master_reagent()
@@ -319,12 +319,12 @@
else
desc = "You can't really tell what this is."
if(R.cup_center_of_mass)
center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
center_of_mass_x = R.cup_center_of_mass_x
center_of_mass_y = R.cup_center_of_mass_y
else
center_of_mass_x = 16 // CHOMPEdit
center_of_mass_y = 16 // CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
if(R.price_tag)
price_tag = R.price_tag

4
code/modules/food/food/drinks/jar.dm
View File

@@ -4,8 +4,8 @@
desc = "A jar. You're not sure what it's supposed to hold."
icon_state = "jar"
item_state = "beaker"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 8
unacidable = TRUE
/obj/item/reagent_containers/food/drinks/jar/on_reagent_change()

1252
code/modules/food/food/snacks.dm
View File

File diff suppressed because it is too large Load Diff

32
code/modules/food/food/snacks/meat.dm
View File

@@ -4,8 +4,8 @@
icon_state = "meat"
health = 180
filling_color = "#FF1C1C"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
/obj/item/reagent_containers/food/snacks/meat/Initialize()
. = ..()
@@ -74,8 +74,8 @@
desc = "A slice from a huge mushroom."
icon_state = "hugemushroomslice"
filling_color = "#E0D7C5"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 16
nutriment_amt = 3
nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2)
bitesize = 6
@@ -89,8 +89,8 @@
desc = "A slice from a huge tomato"
icon_state = "tomatomeat"
filling_color = "#DB0000"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 16
nutriment_amt = 3
nutriment_desc = list("raw" = 2, PLANT_TOMATO = 3)
bitesize = 6
@@ -100,8 +100,8 @@
desc = "A very manly slab of meat."
icon_state = "bearmeat"
filling_color = "#DB0000"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
bitesize = 3
/obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
@@ -114,8 +114,8 @@
desc = "A slab of green meat. Smells like acid."
icon_state = "xenomeat"
filling_color = "#43DE18"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
bitesize = 6
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
@@ -128,8 +128,8 @@
desc = "A slab of green meat."
icon_state = "xenomeat"
filling_color = "#43DE18"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
bitesize = 6
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
@@ -156,8 +156,8 @@
desc = "A slab of grub meat, it gives a gentle shock if you touch it"
icon = 'icons/obj/food.dmi'
icon_state = "grubmeat"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
/obj/item/reagent_containers/food/snacks/meat/grubmeat/Initialize()
. = ..()
@@ -171,8 +171,8 @@
icon_state = "wormmeat"
health = 180
filling_color = "#551A8B"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
/obj/item/reagent_containers/food/snacks/meat/worm/Initialize()
. = ..()

12
code/modules/food/food/snacks_vr.dm
View File

@@ -459,8 +459,8 @@
flags = OPENCONTAINER
bitesize = 12
filling_color = "#ADAC7F"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
var/food_type = "/obj/item/reagent_containers/food/snacks/proteinslab"
@@ -583,8 +583,8 @@
desc = "The universes best soup! Yum!!!"
icon_state = "milosoup"
trash = /obj/item/trash/snack_bowl
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 7
nutriment_amt = 8
nutriment_desc = list("soy" = 8)
bitesize = 4
@@ -600,8 +600,8 @@
icon_state = "onionsoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#E0C367"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 7
bitesize = 3
eating_sound = 'sound/items/drink.ogg'

4
code/modules/food/food/superfoods.dm
View File

@@ -176,8 +176,8 @@
desc = "A slice from The Chaos Cake, it pulses weirdly, as if angry to be separated from the whole"
icon_state = "chaoscake_slice-1"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
nutriment_desc = list()
nutriment_amt = 4
volume = 80

4
code/modules/materials/sheets/_sheets.dm
View File

@@ -6,8 +6,8 @@
w_class = ITEMSIZE_NORMAL
throw_speed = 3
throw_range = 3
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
max_amount = 50
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi',

4
code/modules/mob/holder.dm
View File

@@ -6,8 +6,8 @@ var/list/holder_mob_icon_cache = list()
desc = "You shouldn't ever see this."
icon = 'icons/obj/objects.dmi'
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
slot_flags = SLOT_HEAD | SLOT_HOLSTER
show_messages = 1

4
code/modules/modular_computers/computers/modular_computer/variables.dm
View File

@@ -27,8 +27,8 @@
blocks_emissive = FALSE
var/overlay_icon = null // Icon file used for overlays
icon_state = null
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit // No pixelshifting by placing on tables, etc.
center_of_mass_x = 0
center_of_mass_y = 0 // No pixelshifting by placing on tables, etc.
randpixel = 0 // And no random pixelshifting on-creation either.
var/icon_state_unpowered = null // Icon state when the computer is turned off
var/icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen.

3
code/modules/reagents/readme.md
View File

@@ -191,7 +191,8 @@ About Reagents:
glass_desc
Ditto for glass desciption.
glass_center_of_mass
glass_center_of_mass_x
glass_center_of_mass_y
Used for glass placement on tables.
color

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

@@ -193,8 +193,8 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 11
matter = list(MAT_GLASS = 500)
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
@@ -250,8 +250,8 @@
name = "large beaker"
desc = "A large beaker."
icon_state = "beakerlarge"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 11
matter = list(MAT_GLASS = 5000)
volume = 120
amount_per_transfer_from_this = 10
@@ -263,8 +263,8 @@
name = "cryostasis beaker"
desc = "A cryostasis beaker that allows for chemical storage without reactions."
icon_state = "beakernoreact"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 13 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 13
matter = list(MAT_GLASS = 500)
volume = 60
amount_per_transfer_from_this = 10
@@ -274,8 +274,8 @@
name = "bluespace beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology."
icon_state = "beakerbluespace"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 11
matter = list(MAT_GLASS = 5000)
volume = 300
amount_per_transfer_from_this = 10
@@ -287,8 +287,8 @@
name = "vial"
desc = "A small glass vial."
icon_state = "vial"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 9
matter = list(MAT_GLASS = 250)
volume = 30
w_class = ITEMSIZE_TINY
@@ -307,8 +307,8 @@
name = "stoppered bottle"
desc = "A stoppered bottle for keeping beverages fresh."
icon_state = "stopperedbottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 13 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 13
volume = 120
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60,120)
@@ -320,8 +320,8 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "bucket"
item_state = "bucket"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
matter = list(MAT_STEEL = 200)
w_class = ITEMSIZE_NORMAL
amount_per_transfer_from_this = 20
@@ -383,8 +383,8 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "woodbucket"
item_state = "woodbucket"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
matter = list(MAT_WOOD = 50)
w_class = ITEMSIZE_LARGE
amount_per_transfer_from_this = 20

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

@@ -4,8 +4,8 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "cleaner"
item_state = "cleaner"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
flags = OPENCONTAINER|NOBLUDGEON
matter = list(MAT_GLASS = 300, MAT_STEEL = 300)
slot_flags = SLOT_BELT
@@ -126,8 +126,8 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "pepperspray"
item_state = "pepperspray"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
possible_transfer_amounts = null
volume = 40
var/safety = TRUE
@@ -175,8 +175,8 @@
icon_state = "chemsprayer"
item_state = "chemsprayer"
item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
throwforce = 3
w_class = ITEMSIZE_NORMAL
possible_transfer_amounts = null
@@ -222,8 +222,8 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "cleaner-industrial"
item_state = "cleaner"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
possible_transfer_amounts = list(5,10,20)

4
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -16,8 +16,8 @@
icon = 'icons/goonstation/objects/syringe_vr.dmi'
item_state = "syringe_0"
icon_state = "0"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
matter = list(MAT_GLASS = 150)
amount_per_transfer_from_this = 5
possible_transfer_amounts = null

3
code/modules/reagents/reagents/_reagents.dm
View File

@@ -32,7 +32,8 @@
var/cup_icon_state = null
var/cup_name = null
var/cup_desc = null
var/cup_center_of_mass = null
var/cup_center_of_mass_x = 0
var/cup_center_of_mass_y = 0
var/cup_prefix = null
var/color = "#000000"

4
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -1266,8 +1266,8 @@
base_name = "Clara's Vacuum Flask"
base_icon = "claraflask"
icon = 'icons/vore/custom_items_vr.dmi'
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 4 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 4
filling_states = list(15, 30, 50, 60, 80, 100)
volume = 60

4
code/modules/xenobio/items/slime_objects.dm
View File

@@ -118,8 +118,8 @@
desc = "A glob of slime that is thick as honey. For the brave " + JOB_XENOBIOLOGIST + "."
icon_state = "honeycomb"
filling_color = "#FFBB00"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 10
nutriment_amt = 25 // Very filling.
nutriment_desc = list("slime" = 10, "sweetness" = 10, REAGENT_ID_BLISS = 5)

24
modular_chomp/code/modules/food/drinkgglass/metaglass.dm
View File

@@ -3,7 +3,8 @@
/datum/reagent/ethanol/cloverclub
glass_icon_state = "cloverclub"
glass_icon_source = 'modular_chomp/icons/obj/drinks.dmi'
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/ethanol/spiderdrink
glass_icon_state = "glassofspiders"
@@ -33,27 +34,32 @@
/datum/reagent/drink/bubbleteawatermelon
glass_icon_state = "bubbleteawatermelonglass"
glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/drink/bubbleteastrawberry
glass_icon_state = "bubbleteastrawberryglass"
glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/drink/bubbleteacherry
glass_icon_state = "bubbleteacherryglass"
glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/drink/bubbleteacoffee
glass_icon_state = "bubbleteacoffeeglass"
glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/drink/bubbleteabanana
glass_icon_state = "bubbleteabananaglass"
glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 9
/datum/reagent/drink/tea/matcha_latte
glass_icon_state = "bigteacup"
@@ -61,12 +67,14 @@
/datum/reagent/drink/horchata
glass_icon_state = "horchata"
glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
glass_center_of_mass = list("x"=16, "y"=7)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 7
/datum/reagent/toxin/bluetrain
glass_icon_state = "bluetrain"
glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
/datum/reagent/drink/lovepotion
glass_icon_state = "lovepotion"

3
modular_chomp/code/modules/reagents/reagents/food_drinks.dm
View File

@@ -714,7 +714,8 @@
glass_name = "Worm blood"
glass_desc = "Who had the grand idea to bottle THE BLOOD OF A WORM."
glass_icon_state = "wormblood"
glass_center_of_mass = list("x"=16, "y"=8)
glass_center_of_mass_x = 16
glass_center_of_mass_y = 8
glass_icon_file = 'icons/obj/drinks_yw.dmi'
/datum/reagent/blondiemix