cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 18:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict fix

Browse Source
This commit is contained in:
Kelenius
2015-02-03 20:57:16 +03:00
parent 0e7ed6aef4 72d04a0169
commit 536388978f
615 changed files with 2813 additions and 39921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/reagents/reagent_containers/borghydro.dm
View File

@@ -8,7 +8,6 @@
amount_per_transfer_from_this = 5
volume = 30
possible_transfer_amounts = null
flags = FPRINT
var/mode = 1
var/charge_cost = 50
var/charge_tick = 0

2
code/modules/reagents/reagent_containers/food/condiment.dm
View File

@@ -10,7 +10,7 @@
desc = "Just your average condiment container."
icon = 'icons/obj/food.dmi'
icon_state = "emptycondiment"
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
possible_transfer_amounts = list(1,5,10)
center_of_mass = list("x"=16, "y"=6)
volume = 50

4
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -6,7 +6,7 @@
desc = "yummy"
icon = 'icons/obj/drinks.dmi'
icon_state = null
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
possible_transfer_amounts = list(5,10,25)
volume = 50
@@ -152,7 +152,7 @@
amount_per_transfer_from_this = 20
possible_transfer_amounts = null
volume = 150
flags = FPRINT | CONDUCT | TABLEPASS | OPENCONTAINER
flags = CONDUCT | OPENCONTAINER
/obj/item/weapon/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011
desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it."

181
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -471,7 +471,7 @@
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("protein", 2)
throw_impact(atom/hit_atom)
..()
@@ -535,7 +535,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 3)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("blackpepper", 1)
bitesize = 1
@@ -548,7 +548,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/flour
name = "flour"
@@ -568,7 +568,7 @@
New()
..()
reagents.add_reagent("nutriment", rand(3,5))
reagents.add_reagent("protein", rand(3,5))
reagents.add_reagent("toxin", rand(1,3))
src.bitesize = 3
@@ -614,7 +614,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
reagents.add_reagent("carpotoxin", 3)
src.bitesize = 6
@@ -626,7 +626,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 4)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3
@@ -661,7 +661,7 @@
New()
..()
reagents.add_reagent("nutriment", 12)
reagents.add_reagent("protein", 12)
reagents.add_reagent("hyperzine", 5)
src.bitesize = 3
@@ -673,7 +673,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/meatball
@@ -684,7 +684,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -695,7 +695,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
@@ -706,7 +706,8 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
var/warm = 0
proc/cooltime() //Not working, derp?
@@ -725,7 +726,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
reagents.add_reagent("alkysine", 6)
bitesize = 2
@@ -752,7 +753,7 @@
icon_state = "hburger"
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger
@@ -761,6 +762,7 @@
icon_state = "cheeseburger"
New()
..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("nutriment", 2)
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger
@@ -771,7 +773,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fishburger
@@ -782,7 +785,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3
@@ -830,7 +833,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/clownburger
@@ -841,11 +844,6 @@
New()
..()
/*
var/datum/disease/F = new /datum/disease/pierrot_throat(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 4, data)
*/
reagents.add_reagent("nutriment", 6)
bitesize = 2
@@ -870,7 +868,7 @@
//var/herp = 0
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/muffin
@@ -947,7 +945,7 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
@@ -972,7 +970,7 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofupie
@@ -1027,7 +1025,7 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
@@ -1039,7 +1037,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
bitesize = 2
@@ -1052,7 +1050,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
@@ -1064,7 +1062,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofukabob
@@ -1081,14 +1079,15 @@
/obj/item/weapon/reagent_containers/food/snacks/cubancarp
name = "Cuban Carp"
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
desc = "A sandwich that burns your tongue and then leaves it numb!"
icon_state = "cubancarp"
trash = /obj/item/trash/plate
filling_color = "#E9ADFF"
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("carpotoxin", 3)
reagents.add_reagent("capsaicin", 3)
bitesize = 3
@@ -1122,7 +1121,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
@@ -1180,7 +1179,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fries
@@ -1227,7 +1227,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 2)
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
@@ -1262,7 +1263,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 4)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("blackpepper", 1)
bitesize = 3
@@ -1316,7 +1317,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
reagents.add_reagent("water", 5)
bitesize = 5
@@ -1334,13 +1335,13 @@
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
name = "Tomato soup"
desc = "Smells like copper"
desc = "Smells like copper."
icon_state = "tomatosoup"
filling_color = "#FF0000"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
reagents.add_reagent("blood", 10)
reagents.add_reagent("water", 5)
bitesize = 5
@@ -1456,7 +1457,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
bitesize = 5
@@ -1471,7 +1473,8 @@
trash = /obj/item/trash/snack_bowl
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("frostoil", 3)
reagents.add_reagent("tomatojuice", 2)
bitesize = 5
@@ -1505,7 +1508,7 @@
New()
..()
reagents.add_reagent("nutriment",10)
reagents.add_reagent("protein", 10)
afterattack(obj/O as obj, mob/user as mob, proximity)
if(!proximity) return
@@ -1570,24 +1573,18 @@
desc = "Still wrapped in some paper."
icon_state = "monkeycubewrap"
wrapped = 1
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube
name = "farwa cube"
monkey_type = /mob/living/carbon/monkey/tajara
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube
name = "farwa cube"
monkey_type =/mob/living/carbon/monkey/tajara
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube
name = "stok cube"
monkey_type = /mob/living/carbon/monkey/unathi
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube
name = "stok cube"
monkey_type =/mob/living/carbon/monkey/unathi
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
name = "neaera cube"
monkey_type = /mob/living/carbon/monkey/skrell
@@ -1615,7 +1612,8 @@
New()
..()
reagents.add_reagent("nutriment", 14)
reagents.add_reagent("protein", 10)
reagents.add_reagent("nutriment", 4)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/enchiladas
@@ -1627,7 +1625,8 @@
New()
..()
reagents.add_reagent("nutriment",8)
reagents.add_reagent("protein", 6)
reagents.add_reagent("nutriment",2)
reagents.add_reagent("capsaicin", 6)
bitesize = 4
@@ -1640,7 +1639,7 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 10)
reagents.add_reagent("banana", 5)
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
@@ -1667,7 +1666,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3
@@ -1680,7 +1680,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
@@ -1692,7 +1693,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("carbon", 2)
bitesize = 2
@@ -1705,7 +1707,8 @@
New()
..()
reagents.add_reagent("nutriment", 7)
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
@@ -1742,7 +1745,8 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
reagents.add_reagent("water", 5)
@@ -1838,7 +1842,7 @@
/obj/item/weapon/reagent_containers/food/snacks/ricepudding
name = "Rice Pudding"
desc = "Where's the Jam!"
desc = "Where's the jam?"
icon_state = "rpudding"
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
@@ -1870,7 +1874,8 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -1881,7 +1886,8 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
@@ -1916,7 +1922,8 @@
New()
..()
reagents.add_reagent("nutriment", 50)
reagents.add_reagent("protein", 25)
reagents.add_reagent("nutriment", 25)
bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
@@ -2045,7 +2052,7 @@
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("protein", 5)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
@@ -2057,19 +2064,7 @@
New()
..()
switch(rand(1,6))
if(1)
name = "borsch"
if(2)
name = "bortsch"
if(3)
name = "borstch"
if(4)
name = "borsh"
if(5)
name = "borshch"
if(6)
name = "borscht"
name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
reagents.add_reagent("nutriment", 8)
bitesize = 2
@@ -2094,7 +2089,8 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 2)
reagents.add_reagent("nutriment", 6)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appletart
@@ -2127,7 +2123,8 @@
filling_color = "#FF7575"
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 20)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
@@ -2147,7 +2144,8 @@
filling_color = "#8AFF75"
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 20)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
@@ -2230,7 +2228,8 @@
filling_color = "#E6AEDB"
New()
..()
reagents.add_reagent("nutriment", 25)
reagents.add_reagent("protein", 25)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("alkysine", 10)
bitesize = 2
@@ -2251,7 +2250,8 @@
filling_color = "#FAF7AF"
New()
..()
reagents.add_reagent("nutriment", 25)
reagents.add_reagent("protein", 15)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
@@ -2366,7 +2366,7 @@
filling_color = "#FFF700"
New()
..()
reagents.add_reagent("nutriment", 20)
reagents.add_reagent("protein", 20)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
@@ -2391,7 +2391,7 @@
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
name = "Birthday Cake slice"
desc = "A slice of your birthday"
desc = "A slice of your birthday."
icon_state = "birthdaycakeslice"
trash = /obj/item/trash/plate
filling_color = "#FFD6D6"
@@ -2428,7 +2428,8 @@
filling_color = "#FFF896"
New()
..()
reagents.add_reagent("nutriment", 20)
reagents.add_reagent("protein", 15)
reagents.add_reagent("nutriment", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
@@ -2513,7 +2514,8 @@
slices_num = 6
New()
..()
reagents.add_reagent("nutriment", 40)
reagents.add_reagent("nutriment", 35)
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
bitesize = 2
@@ -2532,7 +2534,7 @@
slices_num = 6
New()
..()
reagents.add_reagent("nutriment", 50)
reagents.add_reagent("protein", 50)
reagents.add_reagent("tomatojuice", 6)
bitesize = 2
@@ -2552,6 +2554,7 @@
New()
..()
reagents.add_reagent("nutriment", 35)
reagents.add_reagent("protein", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
@@ -2570,6 +2573,7 @@
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
reagents.add_reagent("imidazoline", 12)
bitesize = 2
@@ -2801,6 +2805,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("nutriment", 3)
// Dough + rolling pin = flat dough
@@ -2820,6 +2825,7 @@
slices_num = 3
New()
..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("nutriment", 3)
/obj/item/weapon/reagent_containers/food/snacks/doughslice
@@ -2893,7 +2899,8 @@
bitesize = 3
New()
..()
reagents.add_reagent("nutriment", 7)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 4)
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
name = "raw cutlet"
@@ -2903,7 +2910,7 @@
bitesize = 1
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/cutlet
name = "cutlet"
@@ -2913,7 +2920,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/rawmeatball
name = "raw meatball"
@@ -2923,7 +2930,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/hotdog
name = "hotdog"
@@ -2932,7 +2939,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/flatbread
name = "flatbread"

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

@@ -12,7 +12,7 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60)
volume = 60
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
var/label_text = ""
@@ -137,7 +137,7 @@
attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text))
var/tmp_label = sanitize(copytext(input(user, "Enter a label for [src.name]","Label",src.label_text), 1, MAX_NAME_LEN))
if(length(tmp_label) > 10)
user << "\red The label can be at most 10 characters long."
else
@@ -209,7 +209,7 @@
volume = 120
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60,120)
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
@@ -218,7 +218,7 @@
matter = list("glass" = 500)
volume = 60
amount_per_transfer_from_this = 10
flags = FPRINT | TABLEPASS | OPENCONTAINER | NOREACT
flags = OPENCONTAINER | NOREACT
/obj/item/weapon/reagent_containers/glass/beaker/bluespace
name = "bluespace beaker"
@@ -228,7 +228,7 @@
volume = 300
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60,120,300)
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/glass/beaker/vial
@@ -239,7 +239,7 @@
volume = 30
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25)
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
New()
@@ -270,7 +270,7 @@
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120)
volume = 120
flags = FPRINT | OPENCONTAINER
flags = OPENCONTAINER
attackby(var/obj/D, mob/user as mob)
if(isprox(D))
@@ -297,7 +297,7 @@
volume = 15
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,5,15)
flags = FPRINT | TABLEPASS | OPENCONTAINER */
flags = OPENCONTAINER */
/*
/obj/item/weapon/reagent_containers/glass/blender_jug
@@ -329,7 +329,6 @@
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60)
volume = 120
flags = FPRINT
/obj/item/weapon/reagent_containers/glass/dispenser
name = "reagent glass"
@@ -337,7 +336,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker0"
amount_per_transfer_from_this = 10
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/glass/dispenser/surfactant
name = "reagent glass (surfactant)"

2
code/modules/reagents/reagent_containers/glass/bottle.dm
View File

@@ -9,7 +9,7 @@
item_state = "atoxinbottle"
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60)
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
volume = 60
on_reagent_change()

2
code/modules/reagents/reagent_containers/glass/bottle/robot.dm
View File

@@ -2,7 +2,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/robot
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100)
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
volume = 60
var/reagent = ""

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

@@ -11,7 +11,7 @@
amount_per_transfer_from_this = 5
volume = 30
possible_transfer_amounts = null
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
slot_flags = SLOT_BELT
/obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty

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

@@ -4,7 +4,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "cleaner"
item_state = "cleaner"
flags = TABLEPASS|OPENCONTAINER|FPRINT|NOBLUDGEON
flags = OPENCONTAINER|NOBLUDGEON
slot_flags = SLOT_BELT
throwforce = 3
w_class = 2.0