Ports table item autoalign from Bay (#6946)

Made it so items get their pixel x/y reset on pickup.
    Thrown items now also get their pixel placement slightly randomized.
    Tweaked the center of mass on a boatload of items to be more accurate to their sprite art.
    Replaced a bunch of randomized pixel placement code into a unifying proc; randpixel_xy() that uses an item's randpixel var.
This commit is contained in:
fernerr
2019-09-08 21:51:49 +02:00
committed by Erki
parent de748e0607
commit 2a2cc7d52e
57 changed files with 286 additions and 159 deletions

View File

@@ -11,7 +11,6 @@
w_class = 1
slot_flags = SLOT_EARS
volume = 5
center_of_mass = null
drop_sound = 'sound/items/drop/glass.ogg'
afterattack(var/obj/target, var/mob/user, var/flag)

View File

@@ -20,7 +20,7 @@
name = "bottled water"
desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles."
icon_state = "waterbottle"
center_of_mass = list("x"=15, "y"=8)
center_of_mass = list("x"=16, "y"=8)
drop_sound = 'sound/items/drop/food.ogg'
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle/Initialize()
@@ -41,7 +41,7 @@
name = "thirteen loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly."
icon_state = "thirteen_loko"
center_of_mass = list("x"=16, "y"=8)
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko/Initialize()
. = ..()
@@ -131,7 +131,7 @@
name = "\improper Phoron Punch!"
desc = "A radical looking can of <span class='warning'>Phoron Punch!</span> Phoron poisoning has never been more extreme!"
icon_state = "phoron_punch"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/koispunch/Initialize()
. = ..()
@@ -154,7 +154,7 @@
name = "\improper Zo'ra Soda Cherry"
desc = "A can of cherry energy drink, with V'krexi additives. All good colas come in cherry."
icon_state = "zoracherry"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zorasoda/Initialize()
. = ..()
@@ -165,7 +165,7 @@
name = "\improper Zo'ra Soda Kois Twist"
desc = "A can of K'ois flavored energy drink, with V'krexi additives. Contains no K'ois, probably contains no palatable flavor."
icon_state = "koistwist"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zorakois/Initialize()
. = ..()
@@ -176,7 +176,7 @@
name = "\improper Zo'ra Soda Phoron Passion"
desc = "A can of grape flavored energy drink, with V'krexi additives. Tastes nothing like phoron according to Unbound taste testers."
icon_state = "phoronpassion"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zoraphoron/Initialize()
. = ..()
@@ -187,7 +187,7 @@
name = "\improper High Octane Zorane Might"
desc = "A can of fizzy, acidic energy, with plenty V'krexi additives. It tastes like the bottom of your mouth is being impaled by a freezing cold spear, a spear laced with bees and salt."
icon_state = "hozm"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zorahozm/Initialize()
. = ..()
@@ -198,7 +198,7 @@
name = "\improper Zo'ra Soda Sour Venom Grass (Diet!)"
desc = "A diet can of Venom Grass flavored energy drink, with V'krexi additives. It still tastes like a cloud of stinging polytrinic bees, but calories are nowhere to be found."
icon_state = "sourvenomgrass"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zoravenom/Initialize()
. = ..()
@@ -209,7 +209,7 @@
name = "\improper Klaxan Energy Crush"
desc = "A can of orange cream flavored energy drink, with V'krexi additives. Engineered nearly to perfection."
icon_state = "klaxancrush"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zoraklax/Initialize()
. = ..()
@@ -220,7 +220,7 @@
name = "\improper C'thur Rockin' Raspberry"
desc = "A can of blue raspberry flavored energy drink, with V'krexi additives. You're pretty sure this was shipped by mistake, the previous K'laxan Energy Crush wrapper is still partly visible underneath the current one."
icon_state = "cthurberry"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zoracthur/Initialize()
. = ..()
@@ -231,7 +231,7 @@
name = "\improper Drone Fuel"
desc = "A can of some kind of industrial fluid flavored energy drink, with V'krexi additives meant for Vaurca. <span class='warning'>Known to induce vomiting in humans!</span>."
icon_state = "dronefuel"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zoradrone/Initialize()
. = ..()
@@ -242,7 +242,7 @@
name = "\improper Royal Jelly"
desc = "A can of... You aren't sure, but it smells pleasant already."
icon_state = "royaljelly"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/zorajelly/Initialize()
. = ..()
@@ -263,7 +263,7 @@
name = "\improper Hakhma Milk"
desc = "A can of Hakhma beetle milk, sourced from Scarab and Drifter communities."
icon_state = "beetlemilk"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=17, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk/Initialize()
. = ..()

View File

@@ -55,12 +55,12 @@
name = "salt shaker"
desc = "Salt. From space oceans, presumably."
icon_state = "saltshaker"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=17, "y"=11)
if("blackpepper")
name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=17, "y"=11)
if("cornoil")
name = "corn oil"
desc = "A delicious oil used in cooking. Made from corn."
@@ -74,7 +74,7 @@
name = "bottle of space spice"
desc = "An exotic blend of spices for cooking. It must flow."
icon_state = "spacespicebottle"
center_of_mass = list("x"=16, "y"=6)
center_of_mass = list("x"=16, "y"=10)
if("barbecue")
name = "barbecue sauce"
desc = "Barbecue sauce, it's labeled 'sweet and spicy'."
@@ -99,6 +99,7 @@
name = "universal enzyme"
desc = "Used in cooking various dishes."
icon_state = "enzyme"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/condiment/enzyme/Initialize()
. = ..()
@@ -107,6 +108,7 @@
/obj/item/weapon/reagent_containers/food/condiment/sugar
name = "sugar"
desc = "Tastey space sugar!"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/condiment/sugar/Initialize()
. = ..()
@@ -116,6 +118,7 @@
name = "salt shaker" // a large one.
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
center_of_mass = list("x"=17, "y"=11)
possible_transfer_amounts = list(1,20) //for clown turning the lid off
amount_per_transfer_from_this = 1
volume = 20
@@ -128,6 +131,7 @@
name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
center_of_mass = list("x"=17, "y"=11)
possible_transfer_amounts = list(1,20) //for clown turning the lid off
amount_per_transfer_from_this = 1
volume = 20
@@ -142,18 +146,19 @@
icon = 'icons/obj/food.dmi'
icon_state = "flour"
item_state = "flour"
center_of_mass = list("x"=16, "y"=8)
volume = 220
/obj/item/weapon/reagent_containers/food/condiment/flour/Initialize()
. = ..()
reagents.add_reagent("flour", 200)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
randpixel_xy()
/obj/item/weapon/reagent_containers/food/condiment/spacespice
name = "space spices"
desc = "An exotic blend of spices for cooking. It must flow."
icon_state = "spacespicebottle"
center_of_mass = list("x"=16, "y"=10)
possible_transfer_amounts = list(1,40) //for clown turning the lid off
amount_per_transfer_from_this = 1
volume = 40
@@ -166,6 +171,7 @@
name = "barbecue sauce"
desc = "Barbecue sauce, it's labeled 'sweet and spicy'."
icon_state = "barbecue"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/condiment/barbecue/Initialize()
..()
@@ -174,6 +180,7 @@
/obj/item/weapon/reagent_containers/food/condiment/garlicsauce
name = "garlic sauce"
desc = "Garlic sauce, perfect for spicing up a plate of garlic."
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/condiment/garlicsauce/Initialize()
..()

View File

@@ -133,7 +133,7 @@
icon_state = "coffee"
item_state = "cont_vapour"
drop_sound = 'sound/items/drop/box.ogg'
center_of_mass = list("x"=15, "y"=10)
center_of_mass = list("x"=16, "y"=11)
Initialize()
. = ..()
reagents.add_reagent("coffee", 30)
@@ -143,7 +143,7 @@
desc = "A limited edition pumpkin spice coffee drink!"
icon_state = "psl_vended"
drop_sound = 'sound/items/drop/box.ogg'
center_of_mass = list("x"=15, "y"=10)
center_of_mass = list("x"=16, "y"=11)
Initialize()
. = ..()
reagents.add_reagent("sadpslatte", 30)
@@ -254,7 +254,7 @@
icon_state = "shaker"
amount_per_transfer_from_this = 10
volume = 120
center_of_mass = list("x"=17, "y"=10)
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/teapot
name = "teapot"

View File

@@ -6,6 +6,7 @@
name = "empty bottle"
desc = "A sad empty bottle."
icon_state = "alco-clear"
center_of_mass = list("x" = 16,"y" = 6)
amount_per_transfer_from_this = 5//Smaller sip size for more BaRP and less guzzling a litre of vodka before you realise it
volume = 100
item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
@@ -204,7 +205,7 @@
name = "Uncle Git's Special Reserve"
desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
icon_state = "whiskeybottle"
center_of_mass = list("x"=16, "y"=3)
center_of_mass = list("x"=16, "y"=4)
Initialize()
. = ..()
reagents.add_reagent("whiskey", 100)
@@ -213,7 +214,7 @@
name = "Uncle Git's Cinnamon Fireball"
desc = "A premium single-malt whiskey, infused with cinnamon and hot pepper inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
icon_state = "fireballbottle"
center_of_mass = list("x"=16, "y"=3)
center_of_mass = list("x"=16, "y"=4)
Initialize()
. = ..()
reagents.add_reagent("fireball", 100)
@@ -222,7 +223,7 @@
name = "Tunguska Triple Distilled"
desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
icon_state = "vodkabottle"
center_of_mass = list("x"=17, "y"=3)
center_of_mass = list("x"=17, "y"=4)
Initialize()
. = ..()
reagents.add_reagent("vodka", 100)
@@ -231,7 +232,7 @@
name = "Caccavo Guaranteed Quality tequila"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
icon_state = "tequillabottle"
center_of_mass = list("x"=16, "y"=3)
center_of_mass = list("x"=16, "y"=4)
Initialize()
. = ..()
reagents.add_reagent("tequilla", 100)
@@ -240,7 +241,7 @@
name = "bottle of nothing"
desc = "A bottle filled with nothing"
icon_state = "bottleofnothing"
center_of_mass = list("x"=17, "y"=5)
center_of_mass = list("x"=16, "y"=5)
Initialize()
. = ..()
reagents.add_reagent("nothing", 100)
@@ -249,7 +250,7 @@
name = "Angstra Aromatic Bitters"
desc = "Only the finest and highest quality herbs find their way into our cocktail bitters."
icon_state = "bitters"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=9)
Initialize()
. = ..()
reagents.add_reagent("bitters",40)
@@ -276,7 +277,7 @@
name = "Wrapp Artiste patron"
desc = "Silver laced tequilla, served in space night clubs across the galaxy."
icon_state = "patronbottle"
center_of_mass = list("x"=16, "y"=6)
center_of_mass = list("x"=16, "y"=7)
Initialize()
. = ..()
reagents.add_reagent("patron", 100)
@@ -285,7 +286,7 @@
name = "Captain Pete's Cuban Spiced rum"
desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
icon_state = "rumbottle"
center_of_mass = list("x"=16, "y"=8)
center_of_mass = list("x"=16, "y"=4)
Initialize()
. = ..()
reagents.add_reagent("rum", 100)
@@ -303,7 +304,7 @@
name = "Goldeneye vermouth"
desc = "Sweet, sweet dryness~"
icon_state = "vermouthbottle"
center_of_mass = list("x"=17, "y"=3)
center_of_mass = list("x"=16, "y"=4)
Initialize()
. = ..()
reagents.add_reagent("vermouth", 100)
@@ -312,7 +313,7 @@
name = "Robert Robust's coffee liqueur"
desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK"
icon_state = "kahluabottle"
center_of_mass = list("x"=17, "y"=3)
center_of_mass = list("x"=16, "y"=5)
Initialize()
. = ..()
reagents.add_reagent("kahlua", 100)
@@ -321,7 +322,7 @@
name = "College Girl goldschlager"
desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
icon_state = "goldschlagerbottle"
center_of_mass = list("x"=15, "y"=3)
center_of_mass = list("x"=16, "y"=4)
Initialize()
. = ..()
reagents.add_reagent("goldschlager", 100)
@@ -330,7 +331,7 @@
name = "Chateau De Baton Premium cognac"
desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
icon_state = "cognacbottle"
center_of_mass = list("x"=16, "y"=6)
center_of_mass = list("x"=16, "y"=4)
Initialize()
. = ..()
reagents.add_reagent("cognac", 100)
@@ -348,7 +349,7 @@
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 = list("x"=16, "y"=6)
center_of_mass = list("x"=16, "y"=7)
Initialize()
. = ..()
reagents.add_reagent("absinthe", 100)
@@ -423,7 +424,7 @@
desc = "Full of vitamins and deliciousness!"
icon_state = "orangejuice"
item_state = "carton"
center_of_mass = list("x"=16, "y"=7)
center_of_mass = list("x"=16, "y"=6)
isGlass = 0
Initialize()
. = ..()
@@ -434,7 +435,7 @@
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 = list("x"=16, "y"=8)
center_of_mass = list("x"=16, "y"=6)
isGlass = 0
Initialize()
. = ..()
@@ -445,7 +446,7 @@
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 = list("x"=16, "y"=8)
center_of_mass = list("x"=16, "y"=6)
isGlass = 0
Initialize()
. = ..()
@@ -456,7 +457,7 @@
desc = "Sweet-sour goodness."
icon_state = "limejuice"
item_state = "carton"
center_of_mass = list("x"=16, "y"=8)
center_of_mass = list("x"=16, "y"=4)
isGlass = 0
Initialize()
. = ..()
@@ -467,7 +468,7 @@
desc = "This juice is VERY sour."
icon_state = "lemoncarton"
item_state = "carton"
center_of_mass = list("x"=16, "y"=8)
center_of_mass = list("x"=16, "y"=6)
isGlass = 0
Initialize()
. = ..()
@@ -478,7 +479,7 @@
desc = "Juice from a Skrell medicinal herb. It's supposed to be diluted."
icon_state = "dyncarton"
item_state = "carton"
center_of_mass = list("x"=16, "y"=8)
center_of_mass = list("x"=16, "y"=6)
isGlass = 0
Initialize()
. = ..()
@@ -489,7 +490,7 @@
desc = "Juice from an apple. Yes."
icon_state = "applejuice"
item_state = "carton"
center_of_mass = list("x"=16, "y"=8)
center_of_mass = list("x"=16, "y"=4)
isGlass = 0
Initialize()
. = ..()
@@ -509,7 +510,7 @@
name = "space beer"
desc = "Contains only water, malt and hops."
icon_state = "beer"
center_of_mass = list("x"=16, "y"=12)
center_of_mass = list("x"=16, "y"=8)
Initialize()
. = ..()
reagents.add_reagent("beer", 30)
@@ -519,7 +520,7 @@
desc = "A true dorf's drink of choice."
icon_state = "alebottle"
item_state = "beer"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
Initialize()
. = ..()
reagents.add_reagent("ale", 30)
@@ -530,6 +531,7 @@
name = "green chartreuse"
desc = "A green, strong liqueur."
icon_state = "chartreusegreenbottle"
center_of_mass = list("x" = 15,"y" = 5)
Initialize()
. = ..()
reagents.add_reagent("chartreusegreen", 100)
@@ -538,6 +540,7 @@
name = "yellow chartreuse"
desc = "A yellow, strong liqueur."
icon_state = "chartreuseyellowbottle"
center_of_mass = list("x" = 15,"y" = 5)
Initialize()
. = ..()
reagents.add_reagent("chartreuseyellow", 100)
@@ -546,6 +549,7 @@
name = "white creme de menthe"
desc = "Mint-flavoured alcohol, in a bottle."
icon_state = "whitecremebottle"
center_of_mass = list("x" = 16,"y" = 5)
Initialize()
. = ..()
reagents.add_reagent("cremewhite", 100)
@@ -554,6 +558,7 @@
name = "Creme de Yvette"
desc = "Berry-flavoured alcohol, in a bottle."
icon_state = "cremedeyvettebottle"
center_of_mass = list("x" = 16,"y" = 6)
Initialize()
. = ..()
reagents.add_reagent("cremeyvette", 100)
@@ -562,6 +567,7 @@
name = "brandy"
desc = "Cheap knock off for cognac."
icon_state = "brandybottle"
center_of_mass = list("x" = 15,"y" = 8)
Initialize()
. = ..()
reagents.add_reagent("brandy", 100)
@@ -570,6 +576,7 @@
name = "Guinness"
desc = "A bottle of good old Guinness."
icon_state = "guinnes_bottle"
center_of_mass = list("x" = 15,"y" = 4)
Initialize()
. = ..()
reagents.add_reagent("guinnes", 100)
@@ -578,6 +585,7 @@
name = "Drambuie"
desc = "A bottle of Drambuie."
icon_state = "drambuie_bottle"
center_of_mass = list("x" = 16,"y" = 6)
Initialize()
. = ..()
reagents.add_reagent("drambuie", 100)
@@ -586,6 +594,7 @@
name = "sbiten"
desc = "A bottle full of sweet sbiten."
icon_state = "sbitenbottle"
center_of_mass = list("x" = 16,"y" = 7)
Initialize()
. = ..()
reagents.add_reagent("sbiten", 100)
@@ -594,6 +603,7 @@
name = "messa's mead"
desc = "A bottle of Messa's mead. Bottled somewhere in the icy world of Adhomai."
icon_state = "messa_mead"
center_of_mass = list("x" = 16,"y" = 5)
description_fluff = "Adhomian beverages are commonly made with fermented grains or vegetables, if alcoholic, or juices mixed with sugar or honey. Victory gin is the most \
widespread alcoholic drink in Adhomai, the result of the fermentation of honey extracted from Messa's tears, but its production and consumption is slowly declining due to the \
People's Republic situation in the current conflict. Messa's mead is also another more traditional alternative, made with honey and fermented Earthen-Root juice."
@@ -609,7 +619,7 @@
name = "Xuizi Juice"
desc = "Blended flower buds from the Xuizi cactus. It smells faintly of vanilla. Bottled by the Arizi Guild for over 200 years."
icon_state = "xuizibottle"
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=8)
Initialize()
. = ..()
reagents.add_reagent("xuizijuice", 30)
@@ -618,6 +628,7 @@
name = "Sarezhi Wine"
desc = "A premium Moghean wine made from Sareszhi berries. Bottled by the Arizi Guild for over 200 years."
icon_state = "sarezhibottle"
center_of_mass = list("x" = 16,"y" = 6)
Initialize()
. = ..()
reagents.add_reagent("sarezhiwine", 100)

View File

@@ -3804,6 +3804,7 @@
desc = "A box suited for pizzas."
icon = 'icons/obj/food.dmi'
icon_state = "pizzabox1"
center_of_mass = list("x" = 16,"y" = 6)
var/open = 0 // Is the box open?
var/ismessy = 0 // Fancy mess on the lid

View File

@@ -75,6 +75,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
center_of_mass = list("x" = 15,"y" = 11)
matter = list("glass" = 500)
drop_sound = 'sound/items/drop/glass.ogg'
@@ -126,6 +127,7 @@
name = "large beaker"
desc = "A large beaker."
icon_state = "beakerlarge"
center_of_mass = list("x" = 16,"y" = 11)
matter = list("glass" = 5000)
volume = 120
amount_per_transfer_from_this = 10
@@ -137,6 +139,7 @@
desc = "A large mixing bowl."
icon = 'icons/obj/kitchen.dmi'
icon_state = "mixingbowl"
center_of_mass = list("x" = 17,"y" = 7)
matter = list(DEFAULT_WALL_MATERIAL = 300)
volume = 180
amount_per_transfer_from_this = 10
@@ -148,6 +151,7 @@
name = "cryostasis beaker"
desc = "A cryostasis beaker that allows for chemical storage without reactions."
icon_state = "beakernoreact"
center_of_mass = list("x" = 16,"y" = 13)
matter = list("glass" = 500)
volume = 60
amount_per_transfer_from_this = 10
@@ -157,6 +161,7 @@
name = "bluespace beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology."
icon_state = "beakerbluespace"
center_of_mass = list("x" = 16,"y" = 11)
matter = list("glass" = 5000)
volume = 300
amount_per_transfer_from_this = 10
@@ -167,6 +172,7 @@
name = "vial"
desc = "A small glass vial."
icon_state = "vial"
center_of_mass = list("x" = 15,"y" = 9)
matter = list("glass" = 250)
volume = 30
amount_per_transfer_from_this = 10
@@ -191,6 +197,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "bucket"
item_state = "bucket"
center_of_mass = list("x" = 16,"y" = 10)
accuracy = 1
matter = list(DEFAULT_WALL_MATERIAL = 200)
w_class = 3.0
@@ -246,6 +253,7 @@ obj/item/weapon/reagent_containers/glass/bucket/wood
icon = 'icons/obj/janitor.dmi'
icon_state = "woodbucket"
item_state = "woodbucket"
center_of_mass = list("x" = 16,"y" = 8)
matter = list("wood" = 50)
drop_sound = 'sound/items/drop/wooden.ogg'
carving_weapon = /obj/item/weapon/material/hatchet

View File

@@ -6,6 +6,7 @@
icon = 'icons/obj/syringe.dmi'
item_state = "autoinjector"
icon_state = "inhaler1"
center_of_mass = list("x" = 16,"y" = 11)
var/empty_state = "inhaler0"
unacidable = 1
amount_per_transfer_from_this = 5

View File

@@ -4,6 +4,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "cleaner"
item_state = "cleaner"
center_of_mass = list("x" = 16,"y" = 10)
flags = OPENCONTAINER|NOBLUDGEON
slot_flags = SLOT_BELT
throwforce = 3
@@ -143,6 +144,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "pepperspray"
item_state = "pepperspray"
center_of_mass = list("x" = 16,"y" = 16)
possible_transfer_amounts = null
volume = 40
safety = 1
@@ -190,6 +192,7 @@
icon = 'icons/obj/gun.dmi'
icon_state = "chemsprayer"
item_state = "chemsprayer"
center_of_mass = list("x" = 16,"y" = 16)
throwforce = 3
w_class = 3.0
possible_transfer_amounts = null

View File

@@ -12,6 +12,7 @@
icon = 'icons/obj/syringe.dmi'
item_state = "syringe_0"
icon_state = "0"
center_of_mass = list("x" = 16,"y" = 14)
matter = list("glass" = 150)
amount_per_transfer_from_this = 5
possible_transfer_amounts = null