shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-29940

Browse Source
This commit is contained in:
LetterJay
2017-08-21 23:29:24 -05:00
committed by GitHub
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/VR/vr_sleeper.dm
+1 -2
View File
@@ -52,8 +52,7 @@
/obj/machinery/vr_sleeper/Destroy()
open_machine()
cleanup_vr_human()
qdel(sparks)
sparks = null
QDEL_NULL(sparks)
return ..()
code/modules/admin/admin_verbs.dm
+2 -1
View File
@@ -12,6 +12,7 @@ GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
/client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/
/client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/
/client/proc/secrets,
/client/proc/toggle_hear_radio, /*allows admins to hide all radio output*/
/client/proc/reload_admins,
/client/proc/reestablish_db_connection, /*reattempt a connection to the database*/
/client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/
@@ -456,7 +457,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
mob.invisibility = INVISIBILITY_MAXIMUM //JUST IN CASE
mob.alpha = 0 //JUUUUST IN CASE
mob.name = " "
mob.mouse_opacity = 0
mob.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
SSblackbox.add_details("admin_verb","Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/verbs/debug.dm
+2 -1
View File
@@ -505,12 +505,13 @@ GLOBAL_PROTECT(AdminProcCallCount)
var/list/areas_with_LS = list()
var/list/areas_with_intercom = list()
var/list/areas_with_camera = list()
var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin))
for(var/area/A in world)
if(on_station)
var/turf/picked = safepick(get_area_turfs(A.type))
if(picked && (picked.z == ZLEVEL_STATION))
if(!(A.type in areas_all))
if(!(A.type in areas_all) && !is_type_in_typecache(A, station_areas_blacklist))
areas_all.Add(A.type)
else if(!(A.type in areas_all))
areas_all.Add(A.type)
code/modules/atmospherics/environmental/LINDA_fire.dm
+1 -1
View File
@@ -45,7 +45,7 @@
//This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile
/obj/effect/hotspot
anchored = TRUE
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
icon = 'icons/effects/fire.dmi'
icon_state = "1"
layer = ABOVE_OPEN_TURF_LAYER
code/modules/atmospherics/gasmixtures/gas_types.dm
+1 -1
View File
@@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou
/obj/effect/overlay/gas
icon = 'icons/effects/tile_effects.dmi'
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
layer = FLY_LAYER
appearance_flags = TILE_BOUND
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+4 -18
View File
@@ -9,9 +9,10 @@
max_integrity = 350
armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 30, acid = 30)
layer = ABOVE_WINDOW_LAYER
state_open = FALSE
circuit = /obj/item/weapon/circuitboard/machine/cryo_tube
var/on = FALSE
state_open = FALSE
var/autoeject = FALSE
var/volume = 100
@@ -35,8 +36,6 @@
/obj/machinery/atmospherics/components/unary/cryo_cell/Initialize()
. = ..()
initialize_directions = dir
var/obj/item/weapon/circuitboard/machine/cryo_tube/B = new
B.apply_default_parts(src)
radio = new(src)
radio.keyslot = new radio_key
@@ -44,16 +43,6 @@
radio.canhear_range = 0
radio.recalculateChannels()
/obj/item/weapon/circuitboard/machine/cryo_tube
name = "Cryotube (Machine Board)"
build_path = /obj/machinery/atmospherics/components/unary/cryo_cell
origin_tech = "programming=4;biotech=3;engineering=4;plasmatech=3"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 2)
/obj/machinery/atmospherics/components/unary/cryo_cell/on_construction()
..(dir, dir)
@@ -69,11 +58,8 @@
conduction_coefficient = initial(conduction_coefficient) * C
/obj/machinery/atmospherics/components/unary/cryo_cell/Destroy()
qdel(radio)
radio = null
if(beaker)
qdel(beaker)
beaker = null
QDEL_NULL(radio)
QDEL_NULL(beaker)
return ..()
/obj/machinery/atmospherics/components/unary/cryo_cell/contents_explosion(severity, target)
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+5 -60
View File
@@ -10,6 +10,7 @@
max_integrity = 300
armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 30)
layer = OBJ_LAYER
circuit = /obj/item/weapon/circuitboard/machine/thermomachine
var/on = FALSE
var/min_temperature = 0
@@ -18,49 +19,9 @@
var/heat_capacity = 0
var/interactive = TRUE // So mapmakers can disable interaction.
/obj/machinery/atmospherics/components/unary/thermomachine/New()
..()
initialize_directions = dir
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/thermomachine(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/thermomachine
name = "Thermomachine (Machine Board)"
desc = "You can use a screwdriver to switch between heater and freezer."
origin_tech = "programming=3;plasmatech=3"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 2,
/obj/item/weapon/stock_parts/micro_laser = 2,
/obj/item/stack/cable_coil = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
/obj/item/weapon/circuitboard/machine/thermomachine/Initialize()
/obj/machinery/atmospherics/components/unary/thermomachine/Initialize()
. = ..()
if(prob(50))
name = "Freezer (Machine Board)"
build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer
else
name = "Heater (Machine Board)"
build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater
/obj/item/weapon/circuitboard/machine/thermomachine/attackby(obj/item/I, mob/user, params)
var/obj/item/weapon/circuitboard/machine/freezer = /obj/item/weapon/circuitboard/machine/thermomachine/freezer
var/obj/item/weapon/circuitboard/machine/heater = /obj/item/weapon/circuitboard/machine/thermomachine/heater
var/obj/item/weapon/circuitboard/machine/newtype
if(istype(I, /obj/item/weapon/screwdriver))
var/new_setting = "Heater"
playsound(src.loc, I.usesound, 50, 1)
if(build_path == initial(heater.build_path))
newtype = freezer
new_setting = "Freezer"
else
newtype = heater
name = initial(newtype.name)
build_path = initial(newtype.build_path)
to_chat(user, "<span class='notice'>You change the circuitboard setting to \"[new_setting]\".</span>")
else
return ..()
initialize_directions = dir
/obj/machinery/atmospherics/components/unary/thermomachine/on_construction()
..(dir,dir)
@@ -202,15 +163,7 @@
icon_state_open = "freezer-o"
max_temperature = T20C
min_temperature = 170
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/thermomachine/freezer(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/thermomachine/freezer
name = "Freezer (Machine Board)"
build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer
circuit = /obj/item/weapon/circuitboard/machine/thermomachine/freezer
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/RefreshParts()
..()
@@ -227,15 +180,7 @@
icon_state_open = "heater-o"
max_temperature = 140
min_temperature = T20C
/obj/machinery/atmospherics/components/unary/thermomachine/heater/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/thermomachine/heater(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/thermomachine/heater
name = "Heater (Machine Board)"
build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater
circuit = /obj/item/weapon/circuitboard/machine/thermomachine/heater
/obj/machinery/atmospherics/components/unary/thermomachine/heater/RefreshParts()
..()
code/modules/atmospherics/machinery/portable/pump.dm
+2 -3
View File
@@ -16,7 +16,7 @@
volume = 1000
/obj/machinery/portable_atmospherics/pump/Initialize()
..()
. = ..()
pump = new(src, FALSE)
pump.on = TRUE
pump.stat = 0
@@ -26,8 +26,7 @@
var/turf/T = get_turf(src)
T.assume_air(air_contents)
air_update_turf()
qdel(pump)
pump = null
QDEL_NULL(pump)
return ..()
/obj/machinery/portable_atmospherics/pump/update_icon()
code/modules/awaymissions/capture_the_flag.dm
+3 -5
View File
@@ -30,13 +30,11 @@
var/reset_path = /obj/effect/ctf/flag_reset
/obj/item/weapon/twohanded/ctf/Destroy()
if(reset)
qdel(reset)
reset = null
. = ..()
QDEL_NULL(reset)
return ..()
/obj/item/weapon/twohanded/ctf/Initialize()
..()
. = ..()
SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
if(!reset)
reset = new reset_path(get_turf(src))
code/modules/awaymissions/gateway.dm
+7 -10
View File
@@ -22,7 +22,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
switch(dir)
if(SOUTH,SOUTHEAST,SOUTHWEST)
density = FALSE
..()
return ..()
/obj/machinery/gateway/proc/toggleoff()
for(var/obj/machinery/gateway/G in linked)
@@ -75,10 +75,13 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/obj/machinery/gateway/proc/toggleon(mob/user)
return FALSE
/obj/machinery/gateway/centerstation/New()
..()
/obj/machinery/gateway/centerstation/Initialize()
. = ..()
if(!GLOB.the_gateway)
GLOB.the_gateway = src
update_icon()
wait = world.time + config.gateway_delay //+ thirty minutes default
awaygate = locate(/obj/machinery/gateway/centeraway)
/obj/machinery/gateway/centerstation/Destroy()
if(GLOB.the_gateway == src)
@@ -96,12 +99,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
var/obj/machinery/gateway/centeraway/awaygate = null
can_link = TRUE
/obj/machinery/gateway/centerstation/Initialize()
..()
update_icon()
wait = world.time + config.gateway_delay //+ thirty minutes default
awaygate = locate(/obj/machinery/gateway/centeraway)
/obj/machinery/gateway/centerstation/update_icon()
if(active)
icon_state = "oncenter"
@@ -182,7 +179,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/obj/machinery/gateway/centeraway/Initialize()
..()
. = ..()
update_icon()
stationgate = locate(/obj/machinery/gateway/centerstation)
code/modules/cargo/console.dm
+2 -2
View File
@@ -18,8 +18,8 @@
circuit = /obj/item/weapon/circuitboard/computer/cargo/request
requestonly = TRUE
/obj/machinery/computer/cargo/New()
..()
/obj/machinery/computer/cargo/Initialize()
. = ..()
var/obj/item/weapon/circuitboard/computer/cargo/board = circuit
contraband = board.contraband
emagged = board.emagged
code/modules/cargo/packs.dm
+1 -3
View File
@@ -1778,9 +1778,7 @@
name = "Shield System Control Board"
cost = 5000
special = TRUE
contains = list(
/obj/item/weapon/circuitboard/machine/computer/sat_control
)
contains = list(/obj/item/weapon/circuitboard/computer/sat_control)
crate_name= "shield control board crate"
/datum/supply_pack/misc/bicycle
code/modules/client/client_procs.dm
+3 -3
View File
@@ -72,9 +72,9 @@
to_chat(src, "<span class='danger'>Your previous action was ignored because you've done too many in a second</span>")
return
//Logs all hrefs
WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
//Logs all hrefs, except chat pings
if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2))
WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
// Admin PM
if(href_list["priv_msg"])
cmd_admin_pm(href_list["priv_msg"],null)
code/modules/client/client_procs.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm (rejected hunks)
@@ -73,7 +73,7 @@
return
//Logs all hrefs, except chat pings
- if(href_list["proc"] != "ping")
+ if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2))
WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
// Admin PM
code/modules/client/preferences.dm
+1 -1
View File
@@ -431,7 +431,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("snout" in pref_species.mutant_bodyparts)
dat += "<b>Snout: </b><a href='?_src_=prefs;preference=snout;task=input'>[features["snout"]]</a><BR>"
if("horns" in pref_species.mutant_bodyparts)
dat += "<b>Snout: </b><a href='?_src_=prefs;preference=horns;task=input'>[features["horns"]]</a><BR>"
dat += "<b>Horns: </b><a href='?_src_=prefs;preference=horns;task=input'>[features["horns"]]</a><BR>"
if("frills" in pref_species.mutant_bodyparts)
dat += "<b>Frills: </b><a href='?_src_=prefs;preference=frills;task=input'>[features["frills"]]</a><BR>"
if("spines" in pref_species.mutant_bodyparts)
code/modules/clothing/spacesuits/chronosuit.dm
+1 -1
View File
@@ -245,7 +245,7 @@
anchored = TRUE
invisibility = INVISIBILITY_ABSTRACT
opacity = 0
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/mob/holder = null
var/phase_time = 0
var/phase_time_length = 3
code/modules/events/spacevine.dm
+1 -1
View File
@@ -314,7 +314,7 @@
anchored = TRUE
density = FALSE
layer = SPACEVINE_LAYER
mouse_opacity = 2 //Clicking anywhere on the turf is good enough
mouse_opacity = MOUSE_OPACITY_OPAQUE //Clicking anywhere on the turf is good enough
pass_flags = PASSTABLE | PASSGRILLE
max_integrity = 50
var/energy = 0
code/modules/fields/peaceborg_dampener.dm
+1 -1
View File
@@ -54,7 +54,7 @@
var/obj/effect/abstract/proximity_checker/advanced/F = edge_turfs[T]
F.appearance = I.appearance
F.invisibility = 0
F.mouse_opacity = 0
F.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
F.layer = 5
/datum/proximity_monitor/advanced/peaceborg_dampener/cleanup_edge_turf(turf/T)
code/modules/fields/turf_objects.dm
+1 -1
View File
@@ -7,7 +7,7 @@
alpha = 0
invisibility = INVISIBILITY_ABSTRACT
flags = ABSTRACT|ON_BORDER
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/datum/proximity_monitor/advanced/parent = null
/obj/effect/abstract/proximity_checker/advanced/Initialize(mapload, _monitor)
code/modules/food_and_drinks/drinks/drinks.dm
+29 -6
View File
@@ -31,7 +31,7 @@
if(!canconsume(M, user))
return 0
if (!is_open_container())
to_chat(user, "<span class='warning'>[src]'s lid hasn't been opened!</span>")
return 0
@@ -47,7 +47,9 @@
return // The drink might be empty after the delay, such as by spam-feeding
M.visible_message("<span class='danger'>[user] feeds the contents of [src] to [M].</span>", "<span class='userdanger'>[user] feeds the contents of [src] to [M].</span>")
add_logs(user, M, "fed", reagentlist(src))
var/fraction = min(gulp_size/reagents.total_volume, 1)
checkLiked(fraction, M)
reagents.reaction(M, INGEST, fraction)
reagents.trans_to(M, gulp_size)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
@@ -56,7 +58,7 @@
/obj/item/weapon/reagent_containers/food/drinks/afterattack(obj/target, mob/user , proximity)
if(!proximity) return
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if (!is_open_container())
to_chat(user, "<span class='warning'>[target]'s tab isn't open!</span>")
return
@@ -97,10 +99,10 @@
to_chat(user, "<span class='notice'>You heat [src] with [I].</span>")
reagents.handle_reactions()
..()
////////////////////////////////////////////////////////////////////////////////
@@ -200,19 +202,24 @@
name = "Dutch Hot Coco"
desc = "Made in Space South America."
list_reagents = list("hot_coco" = 30, "sugar" = 5)
foodtype = SUGAR
resistance_flags = FREEZE_PROOF
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen
name = "Cup Ramen"
desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
list_reagents = list("dry_ramen" = 30)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/drinks/beer
name = "Space Beer"
desc = "Beer. In space."
icon_state = "beer"
list_reagents = list("beer" = 30)
foodtype = GRAIN | ALCOHOL
/obj/item/weapon/reagent_containers/food/drinks/ale
name = "Magm-Ale"
@@ -220,6 +227,7 @@
icon_state = "alebottle"
item_state = "beer"
list_reagents = list("ale" = 30)
foodtype = GRAIN | ALCOHOL
/obj/item/weapon/reagent_containers/food/drinks/sillycup
name = "paper cup"
@@ -248,26 +256,32 @@
icon_state = "orangebox"
name = "orange juice box"
desc = "A great source of vitamins. Stay healthy!"
foodtype = FRUIT
if("milk")
icon_state = "milkbox"
name = "carton of milk"
desc = "An excellent source of calcium for growing space explorers."
foodtype = DAIRY
if("applejuice")
icon_state = "juicebox"
name = "apple juice box"
desc = "Sweet apple juice. Don't be late for school!"
foodtype = FRUIT
if("grapejuice")
icon_state = "grapebox"
name = "grape juice box"
desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
foodtype = FRUIT
if("chocolate_milk")
icon_state = "chocolatebox"
name = "carton of chocolate milk"
desc = "Milk for cool kids!"
foodtype = SUGAR
if("eggnog")
icon_state = "nog2"
name = "carton of eggnog"
desc = "For enjoying the most wonderful time of the year."
foodtype = MEAT
else
icon_state = "juicebox"
name = "small carton"
@@ -334,7 +348,7 @@
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
container_type = 0
spillable = FALSE
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
if(M == user && !src.reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_selected == "head")
user.visible_message("<span class='warning'>[user] crushes the can of [src] on [user.p_their()] forehead!</span>", "<span class='notice'>You crush the can of [src] on your forehead.</span>")
@@ -343,7 +357,7 @@
crushed_can.icon_state = icon_state
qdel(src)
..()
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack_self(mob/user)
if(!is_open_container())
@@ -359,12 +373,14 @@
desc = "Cola. in space."
icon_state = "cola"
list_reagents = list("cola" = 30)
foodtype = SUGAR
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic
name = "T-Borg's Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
icon_state = "tonic"
list_reagents = list("tonic" = 50)
foodtype = ALCOHOL
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater
name = "Soda Water"
@@ -377,6 +393,7 @@
desc = "You wanted ORANGE. It gave you Lemon Lime."
icon_state = "lemon-lime"
list_reagents = list("lemon_lime" = 30)
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime/New()
..()
@@ -387,30 +404,35 @@
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up"
list_reagents = list("space_up" = 30)
foodtype = SUGAR | JUNKFOOD
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist
name = "Star-kist"
desc = "The taste of a star in liquid form. And, a bit of tuna...?"
icon_state = "starkist"
list_reagents = list("cola" = 15, "orangejuice" = 15)
foodtype = SUGAR | FRUIT | JUNKFOOD
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind
name = "Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind"
list_reagents = list("spacemountainwind" = 30)
foodtype = SUGAR | JUNKFOOD
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko
name = "Thirteen Loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
icon_state = "thirteen_loko"
list_reagents = list("thirteenloko" = 30)
foodtype = SUGAR | JUNKFOOD
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb
name = "Dr. Gibb"
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb"
list_reagents = list("dr_gibb" = 30)
foodtype = SUGAR | JUNKFOOD
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game
name = "Pwr Game"
@@ -423,6 +445,7 @@
desc = "~Shake me up some of that Shambler's Juice!~"
icon_state = "shamblers"
list_reagents = list("shamblers" = 30)
foodtype = SUGAR | JUNKFOOD
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/air
name = "Canned Air"
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+10
View File
@@ -13,6 +13,7 @@
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
var/const/duration = 13 //Directly relates to the 'knockdown' duration. Lowered by armor (i.e. helmets)
var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
foodtype = ALCOHOL
/obj/item/weapon/reagent_containers/food/drinks/bottle/throw_impact(atom/target,mob/thrower)
..()
@@ -174,6 +175,7 @@
desc = "A bottle filled with nothing."
icon_state = "bottleofnothing"
list_reagents = list("nothing" = 100)
foodtype = NONE
/obj/item/weapon/reagent_containers/food/drinks/bottle/patron
name = "Wrapp Artiste Patron"
@@ -192,6 +194,7 @@
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
list_reagents = list("holywater" = 100)
foodtype = NONE
/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/hell
desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
@@ -208,6 +211,7 @@
desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK."
icon_state = "kahluabottle"
list_reagents = list("kahlua" = 100)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager
name = "College Girl Goldschlager"
@@ -226,6 +230,7 @@
desc = "A faint aura of unease and asspainery surrounds the bottle."
icon_state = "winebottle"
list_reagents = list("wine" = 100)
foodtype = FRUIT | ALCOHOL
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe
name = "Extra-Strong Absinthe"
@@ -285,6 +290,7 @@
desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff."
icon_state = "lizardwine"
list_reagents = list("lizardwine" = 100)
foodtype = FRUIT | ALCOHOL
/obj/item/weapon/reagent_containers/food/drinks/bottle/hcider
name = "Jian Hard Cider"
@@ -310,6 +316,7 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = 0
list_reagents = list("orangejuice" = 100)
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream
name = "Milk Cream"
@@ -320,6 +327,7 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = 0
list_reagents = list("cream" = 100)
foodtype = DAIRY
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice
name = "Tomato Juice"
@@ -330,6 +338,7 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = 0
list_reagents = list("tomatojuice" = 100)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice
name = "Lime Juice"
@@ -340,6 +349,7 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = 0
list_reagents = list("limejuice" = 100)
foodtype = FRUIT
////////////////////////// MOLOTOV ///////////////////////
code/modules/food_and_drinks/food.dm
+19 -1
View File
@@ -6,8 +6,26 @@
volume = 50 //Sets the default container amount for all food items.
container_type = INJECTABLE
resistance_flags = FLAMMABLE
var/foodtype = NONE
var/last_check_time
/obj/item/weapon/reagent_containers/food/New()
..()
pixel_x = rand(-5, 5) //Randomizes postion slightly.
pixel_y = rand(-5, 5)
pixel_y = rand(-5, 5)
/obj/item/weapon/reagent_containers/food/proc/checkLiked(var/fraction, mob/M)
if(last_check_time + 50 < world.time)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(foodtype & H.dna.species.toxic_food)
to_chat(H,"<span class='warning'>What the hell was that thing?!</span>")
H.adjust_disgust(25 + 30 * fraction)
else if(foodtype & H.dna.species.disliked_food)
to_chat(H,"<span class='notice'>That didn't taste very good...</span>")
H.adjust_disgust(11 + 15 * fraction)
else if(foodtype & H.dna.species.liked_food)
to_chat(H,"<span class='notice'>I love this taste!</span>")
H.adjust_disgust(-5 + -2.5 * fraction)
last_check_time = world.time
code/modules/food_and_drinks/food/customizables.dm
+8 -1
View File
@@ -53,6 +53,7 @@
ingredients += S
mix_filling_color(S)
S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume.
foodtype |= S.foodtype
update_overlays(S)
to_chat(user, "<span class='notice'>You add the [I.name] to the [name].</span>")
update_name(S)
@@ -158,6 +159,7 @@
ingredients_placement = INGREDIENTS_STACKPLUSTOP
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bun"
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/customizable/bread
@@ -167,6 +169,7 @@
slices_num = 5
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubread"
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/customizable/cake
@@ -176,6 +179,7 @@
slices_num = 5
icon = 'icons/obj/food/piecake.dmi'
icon_state = "plaincake"
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/customizable/kebab
@@ -187,7 +191,6 @@
ingMax = 6
icon_state = "rod"
/obj/item/weapon/reagent_containers/food/snacks/customizable/pasta
name = "spaghetti"
desc = "Noodles. With stuff. Delicious."
@@ -195,6 +198,7 @@
ingMax = 6
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "spaghettiboiled"
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/customizable/pie
@@ -202,6 +206,7 @@
ingMax = 6
icon = 'icons/obj/food/piecake.dmi'
icon_state = "pie"
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/customizable/pizza
@@ -213,6 +218,7 @@
slices_num = 6
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "pizzamargherita"
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/customizable/salad
@@ -231,6 +237,7 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "breadslice"
var/finished = 0
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/initialize_custom_food(obj/item/weapon/reagent_containers/BASE, obj/item/I, mob/user)
icon_state = BASE.icon_state
code/modules/food_and_drinks/food/snacks.dm
+3 -3
View File
@@ -70,7 +70,6 @@
if(junkiness && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
to_chat(M, "<span class='notice'>You don't feel like eating any more junk food at the moment.</span>")
return 0
else if(fullness <= 50)
to_chat(M, "<span class='notice'>You hungrily [eatverb] some of \the [src] and gobble it down!</span>")
else if(fullness > 50 && fullness < 150)
@@ -107,12 +106,13 @@
M.satiety -= junkiness
playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
if(reagents.total_volume)
var/fraction = min(bitesize/reagents.total_volume, 1)
var/fraction = min(bitesize / reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
reagents.trans_to(M, bitesize)
bitecount++
On_Consume()
return 1
checkLiked(fraction, M)
return 1
return 0
code/modules/food_and_drinks/food/snacks/dough.dm
+9 -1
View File
@@ -11,6 +11,7 @@
list_reagents = list("nutriment" = 6)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
foodtype = GRAIN
// Dough + rolling pin = flat dough
@@ -38,6 +39,7 @@
list_reagents = list("nutriment" = 6)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/pizzabread
name = "pizza bread"
@@ -48,6 +50,7 @@
list_reagents = list("nutriment" = 7)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("bread" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/doughslice
@@ -58,6 +61,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/bun
filling_color = "#CD853F"
tastes = list("dough" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/bun
@@ -69,6 +73,7 @@
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/burger
filling_color = "#CD853F"
tastes = list("bun" = 1) // the bun tastes of bun.
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/cakebatter
name = "cake batter"
@@ -79,6 +84,7 @@
list_reagents = list("nutriment" = 9)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("batter" = 1)
foodtype = GRAIN | DAIRY
// Cake batter + rolling pin = pie dough
/obj/item/weapon/reagent_containers/food/snacks/cakebatter/attackby(obj/item/I, mob/user, params)
@@ -103,6 +109,7 @@
list_reagents = list("nutriment" = 9)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/rawpastrybase
name = "raw pastry base"
@@ -113,6 +120,7 @@
filling_color = "#CD853F"
list_reagents = list("nutriment" = 1)
tastes = list("raw pastry" = 1)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pastrybase
name = "pastry base"
@@ -122,4 +130,4 @@
list_reagents = list("nutriment" = 1)
filling_color = "#CD853F"
tastes = list("pastry" = 1)
foodtype = GRAIN | DAIRY
code/modules/food_and_drinks/food/snacks/meat.dm
+36
View File
@@ -14,6 +14,7 @@
slices_num = 3
filling_color = "#FF0000"
tastes = list("meat" = 1)
foodtype = MEAT | RAW
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/slice, reagents_per_slice)
..()
@@ -36,6 +37,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human
tastes = list("tender meat" = 1)
foodtype = MEAT | RAW | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human/slice, reagents_per_slice)
..()
@@ -62,6 +64,7 @@
list_reagents = list("nutriment" = 3, "slimejelly" = 3)
filling_color = "#00FFFF"
tastes = list("slime" = 1, "jelly" = 1)
foodtype = MEAT | RAW | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem
icon_state = "golemmeat"
@@ -69,35 +72,41 @@
list_reagents = list("nutriment" = 3, "iron" = 3)
filling_color = "#A9A9A9"
tastes = list("rock" = 1)
foodtype = MEAT | RAW | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
icon_state = "agolemmeat"
desc = "From the slime pen to the rune to the kitchen, science."
filling_color = "#66CDAA"
foodtype = MEAT | RAW | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
icon_state = "lizardmeat"
desc = "Delicious dino damage"
filling_color = "#6B8E23"
tastes = list("meat" = 4, "scales" = 1)
foodtype = MEAT | RAW
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant
icon_state = "plantmeat"
desc = "All the joys of healthy eating with all the fun of cannibalism."
filling_color = "#E9967A"
tastes = list("salad" = 1, "wood" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
icon_state = "shadowmeat"
desc = "Ow, the edge"
filling_color = "#202020"
tastes = list("darkness" = 1, "meat" = 1)
foodtype = MEAT | RAW
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly
icon_state = "flymeat"
desc = "Nothing says tasty like maggot filled radioactive mutant flesh."
list_reagents = list("nutriment" = 3, "uranium" = 3)
tastes = list("maggots" = 1, "the inside of a reactor" = 1)
foodtype = MEAT | RAW | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
name = "-bone"
@@ -106,6 +115,7 @@
filling_color = "#F0F0F0"
tastes = list("bone" = 1)
slice_path = null //can't slice a bone into cutlets
foodtype = GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
name = " meat (rotten)"
@@ -113,6 +123,7 @@
desc = "Halfway to becoming fertilizer for your garden."
filling_color = "#6B8E23"
tastes = list("brains" = 1, "meat" = 1)
foodtype = RAW | MEAT | TOXIC
@@ -122,22 +133,27 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat
name = "synthmeat"
desc = "A synthetic slab of meat."
foodtype = RAW | MEAT //hurr durr chemicals we're harmed in the production of this meat thus its non-vegan.
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/meatproduct
name = "meat product"
desc = "A slab of station reclaimed and chemically processed meat product."
foodtype = RAW | MEAT
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
name = "monkey meat"
foodtype = RAW | MEAT
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi
name = "corgi meat"
desc = "Tastes like... well you know..."
tastes = list("meat" = 4, "a fondness for wearing hats" = 1)
foodtype = RAW | MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug
name = "pug meat"
desc = "Tastes like... well you know..."
foodtype = RAW | MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato
name = "killer tomato meat"
@@ -148,6 +164,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/killertomato
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/killertomato
tastes = list("tomato" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear
name = "bear meat"
@@ -158,6 +175,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/bear
tastes = list("meat" = 1, "salmon" = 1)
foodtype = RAW | MEAT
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
@@ -170,6 +188,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/xeno
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/xeno
tastes = list("meat" = 1, "acid" = 1)
foodtype = RAW | MEAT
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/spider
name = "spider meat"
@@ -180,6 +199,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/spider
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/spider
tastes = list("cobwebs" = 1)
foodtype = RAW | MEAT | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath
@@ -188,6 +208,7 @@
list_reagents = list("nutriment" = 3, "toxin" = 5)
icon_state = "goliathmeat"
tastes = list("meat" = 1)
foodtype = RAW | MEAT | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath/burn()
visible_message("[src] finishes cooking!")
@@ -202,6 +223,7 @@
icon_state = "meatwheat_clump"
bitesize = 4
tastes = list("meat" = 1, "wheat" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/meat/rawbacon
name = "raw piece of bacon"
@@ -212,6 +234,7 @@
list_reagents = list("nutriment" = 1)
filling_color = "#B22222"
tastes = list("bacon" = 1)
foodtype = RAW | MEAT
/obj/item/weapon/reagent_containers/food/snacks/meat/bacon
name = "piece of bacon"
@@ -221,6 +244,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
filling_color = "#854817"
tastes = list("bacon" = 1)
foodtype = MEAT
////////////////////////////////////// MEAT STEAKS ///////////////////////////////////////////////////////////
@@ -233,16 +257,20 @@
bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
trash = /obj/item/trash/plate
filling_color = "#B22222"
foodtype = MEAT
tastes = list("meat" = 1)
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human
tastes = list("tender meat" = 1)
foodtype = MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/killertomato
name = "killer tomato steak"
tastes = list("tomato" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear
name = "bear steak"
@@ -263,6 +291,7 @@
icon_state = "goliathsteak"
trash = null
tastes = list("meat" = 1, "rock" = 1)
foodtype = MEAT
//////////////////////////////// MEAT CUTLETS ///////////////////////////////////////////////////////
@@ -278,6 +307,7 @@
filling_color = "#B22222"
tastes = list("meat" = 1)
var/meat_type = "meat"
foodtype = MEAT | RAW
/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
..()
@@ -285,10 +315,12 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain/human
tastes = list("tender meat" = 1)
foodtype = MEAT | RAW | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
..()
@@ -301,6 +333,7 @@
name = "raw killer tomato cutlet"
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/killertomato
tastes = list("tomato" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/bear
name = "raw bear cutlet"
@@ -328,15 +361,18 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
filling_color = "#B22222"
tastes = list("meat" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain/human
tastes = list("tender meat" = 1)
foodtype = MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/killertomato
name = "killer tomato cutlet"
tastes = list("tomato" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/bear
name = "bear cutlet"
code/modules/food_and_drinks/food/snacks_bread.dm
+20
View File
@@ -4,6 +4,7 @@
volume = 80
slices_num = 5
tastes = list("bread" = 10)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/breadslice
@@ -14,6 +15,7 @@
list_reagents = list("nutriment" = 2)
slot_flags = SLOT_HEAD
customfoodfilling = 0 //to avoid infinite bread-ception
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain
name = "bread"
@@ -24,12 +26,14 @@
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/bread
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain
tastes = list("bread" = 10)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain
name = "bread slice"
desc = "A slice of home."
icon_state = "breadslice"
customfoodfilling = 1
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/store/bread/meat
name = "meatbread loaf"
@@ -39,11 +43,13 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 30, "vitamin" = 5)
tastes = list("bread" = 10, "meat" = 10)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/breadslice/meat
name = "meatbread slice"
desc = "A slice of delicious meatbread."
icon_state = "meatbreadslice"
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/store/bread/xenomeat
name = "xenomeatbread loaf"
@@ -53,6 +59,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 30, "vitamin" = 5)
tastes = list("bread" = 10, "acid" = 10)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/breadslice/xenomeat
name = "xenomeatbread slice"
@@ -60,6 +67,7 @@
icon_state = "xenobreadslice"
filling_color = "#32CD32"
list_reagents = list("nutriment" = 6, "vitamin" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/store/bread/spidermeat
name = "spider meat loaf"
@@ -69,6 +77,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 30, "toxin" = 15, "vitamin" = 5)
tastes = list("bread" = 10, "cobwebs" = 5)
foodtype = GRAIN | MEAT | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/breadslice/spidermeat
name = "spider meat bread slice"
@@ -76,6 +85,7 @@
icon_state = "xenobreadslice"
filling_color = "#7CFC00"
list_reagents = list("nutriment" = 6, "toxin" = 3, "vitamin" = 1)
foodtype = GRAIN | MEAT | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/store/bread/banana
name = "banana-nut bread"
@@ -85,6 +95,7 @@
bonus_reagents = list("nutriment" = 5, "banana" = 20)
list_reagents = list("nutriment" = 20, "banana" = 20)
tastes = list("bread" = 10) // bananjuice will also flavour
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/breadslice/banana
@@ -93,6 +104,7 @@
icon_state = "bananabreadslice"
filling_color = "#FFD700"
list_reagents = list("nutriment" = 4, "banana" = 4)
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/store/bread/tofu
name = "Tofubread"
@@ -102,6 +114,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "tofu" = 10)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/breadslice/tofu
name = "tofubread slice"
@@ -109,6 +122,7 @@
icon_state = "tofubreadslice"
filling_color = "#FF8C00"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/store/bread/creamcheese
name = "cream cheese bread"
@@ -118,6 +132,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "cheese" = 10)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/breadslice/creamcheese
name = "cream cheese bread slice"
@@ -125,6 +140,7 @@
icon_state = "creamcheesebreadslice"
filling_color = "#FF8C00"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/store/bread/mimana
name = "mimana bread"
@@ -134,6 +150,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 20, "mutetoxin" = 5, "nothing" = 5, "vitamin" = 5)
tastes = list("bread" = 10, "silence" = 10)
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/breadslice/mimana
name = "mimana bread slice"
@@ -141,11 +158,13 @@
icon_state = "mimanabreadslice"
filling_color = "#C0C0C0"
list_reagents = list("nutriment" = 2, "mutetoxin" = 1, "nothing" = 1, "vitamin" = 1)
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/breadslice/custom
name = "bread slice"
icon_state = "tofubreadslice"
filling_color = "#FFFFFF"
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/baguette
name = "baguette"
@@ -157,6 +176,7 @@
bitesize = 3
w_class = WEIGHT_CLASS_NORMAL
tastes = list("bread" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/deepfryholder
name = "Deep Fried Foods Holder Obj"
code/modules/food_and_drinks/food/snacks_burgers.dm
+31
View File
@@ -5,11 +5,13 @@
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/plain
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
bonus_reagents = list("vitamin" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/human
var/subjectname = ""
@@ -17,6 +19,7 @@
name = "human burger"
desc = "A bloody burger."
bonus_reagents = list("vitamin" = 4)
foodtype = MEAT | GRAIN | GROSS
/obj/item/weapon/reagent_containers/food/snacks/burger/human/CheckParts(list/parts_list)
..()
@@ -35,6 +38,7 @@
name = "corgi burger"
desc = "You monster."
bonus_reagents = list("vitamin" = 1)
foodtype = GRAIN | MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/burger/appendix
name = "appendix burger"
@@ -42,6 +46,7 @@
bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
icon_state = "appendixburger"
tastes = list("bun" = 4, "grass" = 2)
foodtype = GRAIN | MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/burger/fish
name = "fillet -o- carp sandwich"
@@ -49,6 +54,7 @@
icon_state = "fishburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
tastes = list("bun" = 4, "fish" = 4)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/tofu
name = "tofu burger"
@@ -56,6 +62,7 @@
icon_state = "tofuburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
tastes = list("bun" = 4, "tofu" = 4)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/burger/roburger
name = "roburger"
@@ -64,6 +71,7 @@
bonus_reagents = list("nutriment" = 2, "nanomachines" = 2, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "nanomachines" = 5, "vitamin" = 1)
tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
foodtype = GRAIN | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig
name = "roburger"
@@ -73,6 +81,7 @@
bonus_reagents = list("nutriment" = 5, "nanomachines" = 70, "vitamin" = 10)
list_reagents = list("nutriment" = 6, "nanomachines" = 70, "vitamin" = 5)
tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
foodtype = GRAIN | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/burger/xeno
name = "xenoburger"
@@ -80,24 +89,28 @@
icon_state = "xburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
tastes = list("bun" = 4, "acid" = 4)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/bearger
name = "bearger"
desc = "Best served rawr."
icon_state = "bearger"
bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/clown
name = "clown burger"
desc = "This tastes funny..."
icon_state = "clownburger"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6, "banana" = 6)
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/burger/mime
name = "mime burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6, "nothing" = 6)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/burger/brain
name = "brainburger"
@@ -106,6 +119,7 @@
bonus_reagents = list("nutriment" = 6, "mannitol" = 6, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "mannitol" = 5, "vitamin" = 1)
tastes = list("bun" = 4, "brains" = 2)
foodtype = GRAIN | MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/burger/ghost
name = "ghost burger"
@@ -113,6 +127,7 @@
alpha = 125
bonus_reagents = list("nutriment" = 5, "vitamin" = 12)
tastes = list("bun" = 4, "ectoplasm" = 2)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/burger/red
name = "red burger"
@@ -120,6 +135,7 @@
icon_state = "cburger"
color = "#DA0000FF"
bonus_reagents = list("redcrayonpowder" = 10, "vitamin" = 5)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/orange
name = "orange burger"
@@ -127,6 +143,7 @@
icon_state = "cburger"
color = "#FF9300FF"
bonus_reagents = list("orangecrayonpowder" = 10, "vitamin" = 5)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/yellow
name = "yellow burger"
@@ -134,6 +151,7 @@
icon_state = "cburger"
color = "#FFF200FF"
bonus_reagents = list("yellowcrayonpowder" = 10, "vitamin" = 5)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/green
name = "green burger"
@@ -141,6 +159,7 @@
icon_state = "cburger"
color = "#A8E61DFF"
bonus_reagents = list("greencrayonpowder" = 10, "vitamin" = 5)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/blue
name = "blue burger"
@@ -148,6 +167,7 @@
icon_state = "cburger"
color = "#00B7EFFF"
bonus_reagents = list("bluecrayonpowder" = 10, "vitamin" = 5)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/purple
name = "purple burger"
@@ -155,6 +175,7 @@
icon_state = "cburger"
color = "#DA00FFFF"
bonus_reagents = list("purplecrayonpowder" = 10, "vitamin" = 5)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/spell
name = "spell burger"
@@ -162,6 +183,7 @@
icon_state = "spellburger"
bonus_reagents = list("nutriment" = 6, "vitamin" = 10)
tastes = list("bun" = 4, "magic" = 2)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/bigbite
name = "big bite burger"
@@ -170,20 +192,24 @@
bonus_reagents = list("vitamin" = 6)
list_reagents = list("nutriment" = 10, "vitamin" = 2)
w_class = WEIGHT_CLASS_NORMAL
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly
name = "jelly burger"
desc = "Culinary delight..?"
icon_state = "jellyburger"
tastes = list("bun" = 4, "jelly" = 2)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime
bonus_reagents = list("slimejelly" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1)
foodtype = GRAIN | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry
bonus_reagents = list("cherryjelly" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1)
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/burger/superbite
name = "super bite burger"
@@ -195,6 +221,7 @@
bitesize = 7
volume = 100
tastes = list("bun" = 4, "type two diabetes" = 10)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm
name = "five alarm burger"
@@ -202,18 +229,21 @@
icon_state = "fivealarmburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "capsaicin" = 5, "condensedcapsaicin" = 5, "vitamin" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/burger/rat
name = "rat burger"
desc = "Pretty much what you'd expect..."
icon_state = "ratburger"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
foodtype = GRAIN | MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/burger/baseball
name = "home run baseball burger"
desc = "It's still warm. The steam coming off of it looks like baseball."
icon_state = "baseball"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
foodtype = GRAIN | GROSS
/obj/item/weapon/reagent_containers/food/snacks/burger/baconburger
name = "bacon burger"
@@ -221,3 +251,4 @@
icon_state = "baconburger"
bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
tastes = list("bun" = 4, "bacon" = 2)
foodtype = GRAIN | MEAT
code/modules/food_and_drinks/food/snacks_cake.dm
+28
View File
@@ -6,6 +6,7 @@
volume = 80
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 1)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/cakeslice
icon = 'icons/obj/food/piecake.dmi'
@@ -13,6 +14,7 @@
list_reagents = list("nutriment" = 4, "vitamin" = 1)
customfoodfilling = 0 //to avoid infinite cake-ception
tastes = list("cake" = 1)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain
name = "vanilla cake"
@@ -21,6 +23,7 @@
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/cake
bonus_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("vanilla" = 1, "sweetness" = 2,"cake" = 5)
foodtype = GRAIN | DAIRY | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/plain
name = "vanilla cake slice"
@@ -29,6 +32,7 @@
filling_color = "#FFD700"
customfoodfilling = 1
tastes = list("vanilla" = 1, "sweetness" = 2,"cake" = 5)
foodtype = GRAIN | DAIRY | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/carrot
name = "carrot cake"
@@ -39,6 +43,7 @@
bonus_reagents = list("nutriment" = 3, "oculine" = 5, "vitamin" = 10)
list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/carrot
name = "carrot cake slice"
@@ -47,6 +52,7 @@
filling_color = "#FFA500"
list_reagents = list("nutriment" = 4, "oculine" = 2, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/brain
@@ -58,6 +64,7 @@
bonus_reagents = list("nutriment" = 5, "mannitol" = 10, "vitamin" = 10)
list_reagents = list("nutriment" = 20, "mannitol" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/brain
@@ -67,6 +74,7 @@
filling_color = "#FF69B4"
list_reagents = list("nutriment" = 4, "mannitol" = 2, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/cheese
name = "cheese cake"
@@ -76,6 +84,7 @@
slices_num = 5
bonus_reagents = list("vitamin" = 10)
tastes = list("cake" = 4, "cream cheese" = 3)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/cheese
@@ -84,6 +93,7 @@
icon_state = "cheesecake_slice"
filling_color = "#FFFACD"
tastes = list("cake" = 4, "cream cheese" = 3)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/store/cake/orange
@@ -94,6 +104,7 @@
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/orange
name = "orange cake slice"
@@ -101,6 +112,7 @@
icon_state = "orangecake_slice"
filling_color = "#FFA500"
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/lime
name = "lime cake"
@@ -110,6 +122,7 @@
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/lime
name = "lime cake slice"
@@ -117,6 +130,7 @@
icon_state = "limecake_slice"
filling_color = "#00FF00"
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/lemon
@@ -127,6 +141,7 @@
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/lemon
@@ -135,6 +150,7 @@
icon_state = "lemoncake_slice"
filling_color = "#FFEE00"
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/chocolate
@@ -145,6 +161,7 @@
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/chocolate
@@ -153,6 +170,7 @@
icon_state = "chocolatecake_slice"
filling_color = "#A0522D"
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday
@@ -164,6 +182,7 @@
bonus_reagents = list("nutriment" = 7, "sprinkles" = 10, "vitamin" = 5)
list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 1)
foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday
name = "birthday cake slice"
@@ -172,6 +191,7 @@
filling_color = "#DC143C"
list_reagents = list("nutriment" = 4, "sprinkles" = 2, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 1)
foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/apple
@@ -182,6 +202,7 @@
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/apple
name = "apple cake slice"
@@ -189,11 +210,13 @@
icon_state = "applecakeslice"
filling_color = "#FF4500"
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/custom
name = "cake slice"
icon_state = "plaincake_slice"
filling_color = "#FFFFFF"
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/store/cake/slimecake
name = "Slime cake"
@@ -202,6 +225,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
foodtype = GRAIN | DAIRY | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake
name = "slime cake slice"
@@ -209,6 +233,7 @@
icon_state = "slimecake_slice"
filling_color = "#00FFFF"
tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
foodtype = GRAIN | DAIRY | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/store/cake/pumpkinspice
name = "pumpkin spice cake"
@@ -217,6 +242,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/pumpkinspice
bonus_reagents = list("nutriment" = 3, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/pumpkinspice
name = "pumpkin spice cake slice"
@@ -224,3 +250,5 @@
icon_state = "pumpkinspicecakeslice"
filling_color = "#FFD700"
tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
code/modules/food_and_drinks/food/snacks_egg.dm
+7
View File
@@ -9,6 +9,7 @@
list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
filling_color = "#A0522D"
tastes = list("chocolate" = 4, "sweetness" = 1)
foodtype = JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/egg
name = "egg"
@@ -18,6 +19,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
filling_color = "#F0E68C"
tastes = list("egg" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
if(!..()) //was it caught by a mob?
@@ -90,6 +92,7 @@
filling_color = "#FFFFF0"
list_reagents = list("nutriment" = 3)
tastes = list("egg" = 4, "salt" = 1, "pepper" = 1)
foodtype = MEAT | FRIED
/obj/item/weapon/reagent_containers/food/snacks/boiledegg
name = "boiled egg"
@@ -99,6 +102,7 @@
filling_color = "#FFFFF0"
list_reagents = list("nutriment" = 2, "vitamin" = 1)
tastes = list("egg" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS
name = "omelette du fromage"
@@ -110,6 +114,7 @@
bitesize = 1
w_class = WEIGHT_CLASS_NORMAL
tastes = list("egg" = 1, "cheese" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/kitchen/fork))
@@ -138,3 +143,5 @@
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list("nutriment" = 6, "vitamin" = 4)
tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
foodtype = MEAT
code/modules/food_and_drinks/food/snacks_meat.dm
+24
View File
@@ -13,6 +13,7 @@
filling_color = "#CD853F"
list_reagents = list("nutriment" = 6, "capsaicin" = 1)
tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
name = "carp fillet"
@@ -22,6 +23,7 @@
bitesize = 6
filling_color = "#FA8072"
tastes = list("fish" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/New()
..()
@@ -40,6 +42,7 @@
bitesize = 1
filling_color = "#CD853F"
tastes = list("fish" = 1, "breadcrumbs" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/fishandchips
name = "fish and chips"
@@ -49,6 +52,7 @@
list_reagents = list("nutriment" = 6)
filling_color = "#FA8072"
tastes = list("fish" = 1, "chips" = 1)
foodtype = MEAT | VEGETABLES | FRIED
////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
@@ -59,6 +63,7 @@
list_reagents = list("nutriment" = 2)
filling_color = "#F0E68C"
tastes = list("tofu" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/spiderleg
name = "spider leg"
@@ -68,6 +73,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg
filling_color = "#000000"
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/cornedbeef
name = "corned beef and cabbage"
@@ -77,6 +83,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 5)
tastes = list("meat" = 1, "cabbage" = 1)
foodtype = MEAT | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/bearsteak
name = "Filet migrawr"
@@ -86,6 +93,7 @@
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
list_reagents = list("nutriment" = 2, "vitamin" = 5, "manlydorf" = 5)
tastes = list("meat" = 1, "salmon" = 1)
foodtype = MEAT | ALCOHOL
/obj/item/weapon/reagent_containers/food/snacks/faggot
name = "faggot"
@@ -94,6 +102,7 @@
list_reagents = list("nutriment" = 4, "vitamin" = 1)
filling_color = "#800000"
tastes = list("meat" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/sausage
name = "sausage"
@@ -103,6 +112,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("meat" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/sausage/New()
..()
@@ -114,30 +124,35 @@
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list("nutriment" = 8)
tastes = list("meat" = 3, "metal" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/kebab/human
name = "human-kebab"
desc = "A human meat, on a stick."
bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
tastes = list("tender meat" = 3, "metal" = 1)
foodtype = MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/kebab/monkey
name = "meat-kebab"
desc = "Delicious meat, on a stick."
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
tastes = list("meat" = 3, "metal" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/kebab/tofu
name = "tofu-kebab"
desc = "Vegan meat, on a stick."
bonus_reagents = list("nutriment" = 1)
tastes = list("tofu" = 3, "metal" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/kebab/tail
name = "lizard-tail kebab"
desc = "Severed lizard tail on a stick."
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/rawkhinkali
name = "raw khinkali"
@@ -146,6 +161,7 @@
list_reagents = list("nutriment" = 1, "vitamin" = 1)
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/khinkali
tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/khinkali
name = "khinkali"
@@ -155,6 +171,7 @@
bitesize = 3
filling_color = "#F0F0F0"
tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
name = "monkey cube"
@@ -164,6 +181,7 @@
list_reagents = list("nutriment" = 2)
filling_color = "#CD853F"
tastes = list("the jungle" = 1, "bananas" = 1)
foodtype = MEAT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand()
visible_message("<span class='notice'>[src] expands!</span>")
@@ -179,6 +197,7 @@
filling_color = "#FFA07A"
list_reagents = list("nutriment" = 8, "capsaicin" = 6)
tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
name = "stewed soy meat"
@@ -189,6 +208,7 @@
list_reagents = list("nutriment" = 8)
filling_color = "#D2691E"
tastes = list("soy" = 1, "vegetables" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New()
..()
@@ -203,6 +223,7 @@
list_reagents = list("nutriment" = 3, "capsaicin" = 2)
filling_color = "#000000"
tastes = list("hot peppers" = 1, "cobwebs" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/spidereggsham
name = "green eggs and ham"
@@ -214,6 +235,7 @@
bitesize = 4
filling_color = "#7FFF00"
tastes = list("meat" = 1, "the colour green" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/sashimi
name = "carp sashimi"
@@ -223,6 +245,7 @@
list_reagents = list("nutriment" = 6, "capsaicin" = 5)
filling_color = "#FA8072"
tastes = list("fish" = 1, "hot peppers" = 1)
foodtype = MEAT | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/nugget
name = "chicken nugget"
@@ -230,6 +253,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 2)
tastes = list("\"chicken\"" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/nugget/New()
..()
code/modules/food_and_drinks/food/snacks_other.dm
+49 -1
View File
@@ -10,6 +10,7 @@
list_reagents = list("nutriment" = 15, "vitamin" = 5)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("cheese" = 1)
foodtype = DAIRY
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
name = "cheese wedge"
@@ -18,6 +19,7 @@
filling_color = "#FFD700"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
tastes = list("cheese" = 1)
foodtype = DAIRY
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice
name = "watermelon slice"
@@ -25,6 +27,7 @@
icon_state = "watermelonslice"
filling_color = "#FF1493"
tastes = list("watermelon" = 1)
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/candy_corn
name = "candy corn"
@@ -33,6 +36,7 @@
list_reagents = list("nutriment" = 4, "sugar" = 2)
filling_color = "#FF8C00"
tastes = list("candy corn" = 1)
foodtype = JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
name = "chocolate bar"
@@ -41,6 +45,7 @@
list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
filling_color = "#A0522D"
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
name = "huge mushroom slice"
@@ -48,6 +53,7 @@
icon_state = "hugemushroomslice"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
tastes = list("mushroom" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/popcorn
name = "popcorn"
@@ -58,6 +64,7 @@
bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
filling_color = "#FFEFD5"
tastes = list("popcorn" = 3, "butter" = 1)
foodtype = JUNKFOOD
/obj/item/weapon/reagent_containers/food/snacks/popcorn/New()
..()
@@ -71,6 +78,7 @@
list_reagents = list("nutriment" = 6)
filling_color = "#D2B48C"
tastes = list("potato" = 1)
foodtype = VEGETABLES | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/fries
name = "space fries"
@@ -80,6 +88,7 @@
list_reagents = list("nutriment" = 4)
filling_color = "#FFD700"
tastes = list("fries" = 3, "salt" = 1)
foodtype = VEGETABLES | GRAIN | FRIED
/obj/item/weapon/reagent_containers/food/snacks/tatortot
name = "tator tot"
@@ -88,6 +97,7 @@
list_reagents = list("nutriment" = 4)
filling_color = "FFD700"
tastes = list("potato" = 3, "valids" = 1)
foodtype = FRIED | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soydope
name = "soy dope"
@@ -97,6 +107,7 @@
list_reagents = list("nutriment" = 2)
filling_color = "#DEB887"
tastes = list("soy" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
name = "cheesy fries"
@@ -107,6 +118,7 @@
list_reagents = list("nutriment" = 6)
filling_color = "#FFD700"
tastes = list("fries" = 3, "cheese" = 1)
foodtype = VEGETABLES | GRAIN
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "burned mess"
@@ -114,6 +126,7 @@
icon_state = "badrecipe"
list_reagents = list("bad_food" = 30)
filling_color = "#8B4513"
foodtype = GROSS
/obj/item/weapon/reagent_containers/food/snacks/carrotfries
name = "carrot fries"
@@ -123,6 +136,7 @@
list_reagents = list("nutriment" = 3, "oculine" = 3, "vitamin" = 2)
filling_color = "#FFA500"
tastes = list("carrots" = 3, "salt" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
name = "candied apple"
@@ -133,6 +147,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 2)
filling_color = "#FF4500"
tastes = list("apple" = 2, "sweetness" = 2)
foodtype = JUNKFOOD | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/mint
name = "mint"
@@ -142,6 +157,7 @@
trash = /obj/item/trash/plate
list_reagents = list("minttoxin" = 1)
filling_color = "#800000"
foodtype = TOXIC | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/eggwrap
name = "egg wrap"
@@ -151,6 +167,7 @@
list_reagents = list("nutriment" = 5)
filling_color = "#F0E68C"
tastes = list("egg" = 1)
foodtype = MEAT | GRAIN
/obj/item/weapon/reagent_containers/food/snacks/beans
name = "tin of beans"
@@ -160,6 +177,7 @@
list_reagents = list("nutriment" = 10)
filling_color = "#B22222"
tastes = list("beans" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/spidereggs
name = "spider eggs"
@@ -168,6 +186,7 @@
list_reagents = list("nutriment" = 2, "toxin" = 2)
filling_color = "#008000"
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/chococoin
name = "chocolate coin"
@@ -177,6 +196,7 @@
list_reagents = list("nutriment" = 3, "cocoa" = 1)
filling_color = "#A0522D"
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/fudgedice
name = "fudge dice"
@@ -187,6 +207,7 @@
filling_color = "#A0522D"
trash = /obj/item/weapon/dice/fudge
tastes = list("fudge" = 1)
foodtype = JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/chocoorange
name = "chocolate orange"
@@ -196,6 +217,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 1)
filling_color = "#A0522D"
tastes = list("chocolate" = 3, "oranges" = 1)
foodtype = JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/eggplantparm
name = "eggplant parmigiana"
@@ -206,6 +228,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 2)
filling_color = "#BA55D3"
tastes = list("eggplant" = 3, "cheese" = 1)
foodtype = VEGETABLES | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/tortilla
name = "tortilla"
@@ -215,6 +238,7 @@
list_reagents = list("nutriment" = 3, "vitamin" = 1)
filling_color = "#FFEFD5"
tastes = list("tortilla" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/burrito
name = "burrito"
@@ -224,6 +248,7 @@
list_reagents = list("nutriment" = 4, "vitamin" = 1)
filling_color = "#FFEFD5"
tastes = list("torilla" = 2, "meat" = 3)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/cheesyburrito
name = "cheesy burrito"
@@ -233,6 +258,7 @@
list_reagents = list("nutriment" = 4, "vitamin" = 2)
filling_color = "#FFD800"
tastes = list("torilla" = 2, "meat" = 3, "cheese" = 1)
foodtype = GRAIN | MEAT | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/carneburrito
name = "carne asada burrito"
@@ -242,6 +268,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 1)
filling_color = "#A0522D"
tastes = list("torilla" = 2, "meat" = 4)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
name = "fuego plasma burrito"
@@ -251,6 +278,7 @@
list_reagents = list("nutriment" = 4, "capsaicin" = 5, "vitamin" = 3)
filling_color = "#FF2000"
tastes = list("torilla" = 2, "meat" = 3, "hot peppers" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/yakiimo
name = "yaki imo"
@@ -260,6 +288,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 4)
filling_color = "#8B1105"
tastes = list("sweet potato" = 1)
foodtype = GRAIN | VEGETABLES | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/roastparsnip
name = "roast parsnip"
@@ -269,6 +298,7 @@
list_reagents = list("nutriment" = 3, "vitamin" = 4)
filling_color = "#FF5500"
tastes = list("parsnip" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl
name = "melon fruit bowl"
@@ -279,6 +309,7 @@
filling_color = "#FF5500"
w_class = WEIGHT_CLASS_NORMAL
tastes = list("melon" = 1)
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/spacefreezy
name = "space freezy"
@@ -288,6 +319,7 @@
list_reagents = list("nutriment" = 6, "bluecherryjelly" = 5, "vitamin" = 4)
filling_color = "#87CEFA"
tastes = list("blue cherries" = 2, "ice cream" = 2)
foodtype = FRUIT | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/sundae
name = "sundae"
@@ -297,6 +329,7 @@
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
filling_color = "#FFFACD"
tastes = list("ice cream" = 1, "banana" = 1)
foodtype = FRUIT | DAIRY | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/honkdae
name = "honkdae"
@@ -306,6 +339,7 @@
list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4)
filling_color = "#FFFACD"
tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1)
foodtype = FRUIT | DAIRY | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/nachos
name = "nachos"
@@ -315,6 +349,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 2)
filling_color = "#F4A460"
tastes = list("nachos" = 1)
foodtype = VEGETABLES | FRIED
/obj/item/weapon/reagent_containers/food/snacks/cheesynachos
name = "cheesy nachos"
@@ -324,6 +359,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 3)
filling_color = "#FFD700"
tastes = list("nachos" = 2, "cheese" = 1)
foodtype = VEGETABLES | FRIED | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/cubannachos
name = "cuban nachos"
@@ -333,6 +369,7 @@
list_reagents = list("nutriment" = 7, "capsaicin" = 8, "vitamin" = 4)
filling_color = "#DC143C"
tastes = list("nachos" = 2, "hot pepper" = 1)
foodtype = VEGETABLES | FRIED | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/melonkeg
name = "melon keg"
@@ -344,6 +381,7 @@
volume = 80
bitesize = 5
tastes = list("grain alcohol" = 1, "fruit" = 1)
foodtype = FRUIT | ALCOHOL
/obj/item/weapon/reagent_containers/food/snacks/honeybar
name = "honey nut bar"
@@ -353,6 +391,7 @@
list_reagents = list("nutriment" = 5, "honey" = 5)
filling_color = "#F2CE91"
tastes = list("oats" = 3, "nuts" = 2, "honey" = 1)
foodtype = FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/stuffedlegion
name = "stuffed legion"
@@ -361,6 +400,7 @@
bonus_reagents = list("vitamin" = 3, "capsaicin" = 1, "tricordrazine" = 5)
list_reagents = list("nutriment" = 5, "vitamin" = 5, "capsaicin" = 2, "tricordrazine" = 10)
tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/powercrepe
@@ -376,6 +416,7 @@
attack_verb = list("slapped", "slathered")
w_class = WEIGHT_CLASS_BULKY
tastes = list("cherry" = 1, "crepe" = 1)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/lollipop
name = "lollipop"
@@ -386,6 +427,7 @@
var/mutable_appearance/head
var/headcolor = rgb(0, 0, 0)
tastes = list("candy" = 1)
foodtype = JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/lollipop/New()
..()
@@ -425,6 +467,7 @@
icon_state = "gumball"
list_reagents = list("sugar" = 5, "bicaridine" = 2, "kelotane" = 2) //Kek
tastes = list("candy")
foodtype = JUNKFOOD
/obj/item/weapon/reagent_containers/food/snacks/gumball/New()
..()
@@ -453,6 +496,7 @@
list_reagents = list("nutriment" = 4, "vitamin" = 2)
filling_color = "F0D830"
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
foodtype = MEAT | DAIRY | GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/taco/plain
desc = "A traditional taco with meat and cheese, minus the rabbit food."
@@ -460,6 +504,7 @@
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 3, "vitamin" = 1)
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2)
foodtype = MEAT | DAIRY | GRAIN
/obj/item/weapon/reagent_containers/food/snacks/branrequests
name = "Bran Requests Cereal"
@@ -468,6 +513,7 @@
list_reagents = list("nutriment" = 3, "vitamin" = 2, "sodiumchloride" = 5)
bonus_reagents = list("sodiumchloride" = 10)
tastes = list("bran" = 4, "raisins" = 3, "salt" = 1)
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/butter
name = "stick of butter"
@@ -476,6 +522,7 @@
list_reagents = list("nutriment" = 5)
filling_color = "#FFD700"
tastes = list("butter" = 1)
foodtype = DAIRY
/obj/item/weapon/reagent_containers/food/snacks/onionrings
name = "onion rings"
@@ -484,4 +531,5 @@
list_reagents = list("nutriment" = 3)
filling_color = "#C0C9A0"
gender = PLURAL
tastes = list("batter" = 3, "onion" = 1)
tastes = list("batter" = 3, "onion" = 1)
foodtype = VEGETABLES
code/modules/food_and_drinks/food/snacks_pastry.dm
+30
View File
@@ -12,6 +12,7 @@
var/extra_reagent = null
filling_color = "#D2691E"
tastes = list("donut" = 1)
foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/donut/Initialize()
. = ..()
@@ -47,6 +48,7 @@
bonus_reagents = list("sugar" = 1, "vitamin" = 1)
extra_reagent = "berryjuice"
tastes = list("jelly" = 1, "donut" = 3)
foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/Initialize()
. = ..()
@@ -64,12 +66,14 @@
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "slimejelly"
foodtype = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "cherryjelly"
foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT
////////////////////////////////////////////MUFFINS////////////////////////////////////////////
@@ -81,12 +85,14 @@
list_reagents = list("nutriment" = 6)
filling_color = "#F4A460"
tastes = list("muffin" = 1)
foodtype = GRAIN | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/muffin/berry
name = "berry muffin"
icon_state = "berrymuffin"
desc = "A delicious and spongy little cake, with berries."
tastes = list("muffin" = 3, "berry" = 1)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
name = "booberry muffin"
@@ -94,6 +100,7 @@
alpha = 125
desc = "My stomach is a graveyard! No living being can quench my bloodthirst!"
tastes = list("muffin" = 3, "spookiness" = 1)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
@@ -103,6 +110,7 @@
list_reagents = list("nutriment" = 5)
filling_color = "#FFE4E1"
tastes = list("custard" = 1)
foodtype = GRAIN | MEAT | VEGETABLES
////////////////////////////////////////////WAFFLES////////////////////////////////////////////
@@ -115,6 +123,7 @@
list_reagents = list("nutriment" = 8, "vitamin" = 1)
filling_color = "#D2691E"
tastes = list("waffles" = 1)
foodtype = GRAIN | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
name = "\improper Soylent Green"
@@ -125,6 +134,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 1)
filling_color = "#9ACD32"
tastes = list("waffles" = 7, "people" = 1)
foodtype = GRAIN | GROSS | MEAT
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
name = "\improper Soylent Virdians"
@@ -135,6 +145,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 1)
filling_color = "#9ACD32"
tastes = list("waffles" = 7, "the colour green" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
name = "roffle waffles"
@@ -146,6 +157,7 @@
list_reagents = list("nutriment" = 8, "mushroomhallucinogen" = 2, "vitamin" = 2)
filling_color = "#00BFFF"
tastes = list("waffle" = 1, "mushrooms" = 1)
foodtype = GRAIN | VEGETABLES | TOXIC | SUGAR
////////////////////////////////////////////OTHER////////////////////////////////////////////
@@ -158,6 +170,7 @@
list_reagents = list("nutriment" = 1)
filling_color = "#F0E68C"
tastes = list("cookie" = 1)
foodtype = GRAIN | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
name = "\improper Donk-pocket"
@@ -167,6 +180,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm
filling_color = "#CD853F"
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm
name = "warm Donk-pocket"
@@ -174,6 +188,7 @@
bonus_reagents = list("omnizine" = 3)
list_reagents = list("nutriment" = 4, "omnizine" = 3)
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/dankpocket
name = "\improper Dank-pocket"
@@ -182,6 +197,7 @@
list_reagents = list("lipolicide" = 3, "space_drugs" = 3, "nutriment" = 4)
filling_color = "#00FF00"
tastes = list("meat" = 2, "dough" = 2)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "fortune cookie"
@@ -191,6 +207,7 @@
list_reagents = list("nutriment" = 3)
filling_color = "#F4A460"
tastes = list("cookie" = 1)
foodtype = GRAIN | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
name = "poppy pretzel"
@@ -200,6 +217,7 @@
list_reagents = list("nutriment" = 5)
filling_color = "#F0E68C"
tastes = list("pretzel" = 1)
foodtype = GRAIN | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
@@ -209,6 +227,7 @@
list_reagents = list("nutriment" = 5)
filling_color = "#F0E68C"
tastes = list("mushroom" = 1, "biscuit" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize()
var/fey = prob(10)
@@ -229,6 +248,7 @@
list_reagents = list("nutriment" = 1)
filling_color = "#F0E68C"
tastes = list("cracker" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/hotdog
name = "hotdog"
@@ -239,6 +259,7 @@
list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3)
filling_color = "#8B0000"
tastes = list("bun" = 3, "meat" = 2)
foodtype = GRAIN | MEAT | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/meatbun
name = "meat bun"
@@ -248,6 +269,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 2)
filling_color = "#8B0000"
tastes = list("bun" = 3, "meat" = 2)
foodtype = GRAIN | MEAT | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/khachapuri
name = "khachapuri"
@@ -256,6 +278,7 @@
list_reagents = list("nutriment" = 12, "vitamin" = 2)
filling_color = "#FFFF4D"
tastes = list("bread" = 1, "egg" = 1, "cheese" = 1)
foodtype = GRAIN | MEAT | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie
@@ -266,6 +289,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 3)
filling_color = "#CD853F"
tastes = list("sweetness" = 1)
foodtype = GRAIN | JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/chococornet
name = "chocolate cornet"
@@ -275,6 +299,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 1)
filling_color = "#FFE4C4"
tastes = list("biscuit" = 3, "chocolate" = 1)
foodtype = GRAIN | JUNKFOOD
/obj/item/weapon/reagent_containers/food/snacks/oatmealcookie
name = "oatmeal cookie"
@@ -284,6 +309,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 1)
filling_color = "#D2691E"
tastes = list("cookie" = 2, "oat" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/raisincookie
name = "raisin cookie"
@@ -293,6 +319,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 1)
filling_color = "#F0E68C"
tastes = list("cookie" = 1, "raisins" = 1)
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/cherrycupcake
name = "cherry cupcake"
@@ -302,6 +329,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 1)
filling_color = "#F0E68C"
tastes = list("cake" = 3, "cherry" = 1)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake
name = "blue cherry cupcake"
@@ -311,6 +339,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 1)
filling_color = "#F0E68C"
tastes = list("cake" = 3, "blue cherry" = 1)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/honeybun
name = "honey bun"
@@ -320,3 +349,4 @@
list_reagents = list("nutriment" = 5, "honey" = 5)
filling_color = "#F2CE91"
tastes = list("pastry" = 1, "sweetness" = 1)
foodtype = GRAIN
code/modules/food_and_drinks/food/snacks_pie.dm
+21
View File
@@ -7,6 +7,7 @@
volume = 80
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/pie/plain
name = "plain pie"
@@ -15,6 +16,7 @@
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pie
bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
tastes = list("pie" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/pie/cream
name = "banana cream pie"
@@ -24,6 +26,7 @@
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
tastes = list("pie" = 1)
foodtype = GRAIN | DAIRY | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/pie/cream/throw_impact(atom/hit_atom)
. = ..()
@@ -58,6 +61,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2)
tastes = list("pie" = 1, "blackberries" = 1)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/pie/bearypie
name = "beary pie"
@@ -66,6 +70,7 @@
bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
list_reagents = list("nutriment" = 2, "vitamin" = 3)
tastes = list("pie" = 1, "meat" = 1, "salmon" = 1)
foodtype = GRAIN | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/pie/meatpie
name = "meat-pie"
@@ -73,6 +78,7 @@
desc = "An old barber recipe, very delicious!"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
tastes = list("pie" = 1, "meat" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/pie/tofupie
@@ -81,6 +87,7 @@
desc = "A delicious tofu pie."
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
tastes = list("pie" = 1, "tofu" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/pie/amanita_pie
@@ -91,6 +98,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 6, "amatoxin" = 3, "mushroomhallucinogen" = 1, "vitamin" = 4)
tastes = list("pie" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES | TOXIC | GROSS
/obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie
@@ -99,6 +107,7 @@
icon_state = "plump_pie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
tastes = list("pie" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie/New()
@@ -119,6 +128,7 @@
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
tastes = list("pie" = 1, "meat" = 1, "acid" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/pie/applepie
@@ -127,6 +137,7 @@
icon_state = "applepie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
tastes = list("pie" = 1, "apple" = 1)
foodtype = GRAIN | FRUIT | SUGAR
@@ -136,6 +147,7 @@
icon_state = "cherrypie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
tastes = list("pie" = 7, "Nicole Paige Brooks" = 2)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie
@@ -146,6 +158,7 @@
slices_num = 5
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
tastes = list("pie" = 1, "pumpkin" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
name = "pumpkin pie slice"
@@ -156,6 +169,7 @@
filling_color = "#FFA500"
list_reagents = list("nutriment" = 2)
tastes = list("pie" = 1, "pumpkin" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/pie/appletart
name = "golden apple streusel tart"
@@ -164,6 +178,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/pie/grapetart
name = "grape tart"
@@ -172,6 +187,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 4, "vitamin" = 4)
tastes = list("pie" = 1, "grape" = 1)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie
name = "blumpkin pie"
@@ -181,6 +197,7 @@
slices_num = 5
bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
tastes = list("pie" = 1, "a mouthful of pool water" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/blumpkinpieslice
name = "blumpkin pie slice"
@@ -191,6 +208,7 @@
filling_color = "#1E90FF"
list_reagents = list("nutriment" = 2)
tastes = list("pie" = 1, "a mouthful of pool water" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/pie/dulcedebatata
name = "dulce de batata"
@@ -200,6 +218,7 @@
slices_num = 5
bonus_reagents = list("nutriment" = 4, "vitamin" = 8)
tastes = list("jelly" = 1, "sweet potato" = 1)
foodtype = GRAIN | VEGETABLES | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/dulcedebatataslice
name = "dulce de batata slice"
@@ -210,6 +229,7 @@
filling_color = "#8B4513"
list_reagents = list("nutriment" = 2)
tastes = list("jelly" = 1, "sweet potato" = 1)
foodtype = GRAIN | VEGETABLES | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/pie/frostypie
name = "frosty pie"
@@ -217,3 +237,4 @@
icon_state = "frostypie"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
tastes = list("mint" = 1, "pie" = 1)
foodtype = GRAIN | FRUIT | SUGAR
code/modules/food_and_drinks/food/snacks_pizza.dm
+17
View File
@@ -8,10 +8,12 @@
volume = 80
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice
icon = 'icons/obj/food/pizzaspaghetti.dmi'
list_reagents = list("nutriment" = 5)
foodtype = GRAIN | DAIRY | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/pizza/margherita
name = "margherita"
@@ -20,6 +22,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita
name = "margherita slice"
@@ -27,6 +30,7 @@
icon_state = "pizzamargheritaslice"
filling_color = "#FFA500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/pizza/meat
name = "meatpizza"
@@ -36,6 +40,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 8)
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 8)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES| DAIRY | MEAT
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meat
name = "meatpizza slice"
@@ -43,6 +48,7 @@
icon_state = "meatpizzaslice"
filling_color = "#A52A2A"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
/obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom
name = "mushroom pizza"
@@ -52,6 +58,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 30, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom
name = "mushroom pizza slice"
@@ -59,6 +66,7 @@
icon_state = "mushroompizzaslice"
filling_color = "#FFE4C4"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable
name = "vegetable pizza"
@@ -68,6 +76,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/vegetable
name = "vegetable pizza slice"
@@ -75,6 +84,7 @@
icon_state = "vegetablepizzaslice"
filling_color = "#FFA500"
tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pizza/donkpocket
name = "donkpocket pizza"
@@ -84,6 +94,7 @@
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "omnizine" = 10, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/donkpocket
name = "donkpocket pizza slice"
@@ -91,6 +102,7 @@
icon_state = "donkpocketpizzaslice"
filling_color = "#FFA500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
/obj/item/weapon/reagent_containers/food/snacks/pizza/dank
name = "dank pizza"
@@ -100,6 +112,7 @@
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
list_reagents = list("nutriment" = 25, "doctorsdelight" = 5, "tomatojuice" = 6, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/dank
name = "dank pizza slice"
@@ -107,6 +120,7 @@
icon_state = "dankpizzaslice"
filling_color = "#2E8B57"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pizza/sassysage
name = "sassysage pizza"
@@ -115,6 +129,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/sassysage
bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/sassysage
name = "sassysage pizza slice"
@@ -122,8 +137,10 @@
icon_state = "sassysagepizzaslice"
filling_color = "#FF4500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/custom
name = "pizza slice"
icon_state = "pizzamargheritaslice"
filling_color = "#FFFFFF"
foodtype = GRAIN | VEGETABLES
code/modules/food_and_drinks/food/snacks_salad.dm
+13
View File
@@ -7,6 +7,7 @@
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("leaves" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/salad/New()
..()
@@ -19,6 +20,7 @@
bonus_reagents = list("omnizine" = 2, "vitamin" = 6)
list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6)
tastes = list("leaves" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad
name = "herb salad"
@@ -27,6 +29,7 @@
bonus_reagents = list("vitamin" = 4)
list_reagents = list("nutriment" = 8, "vitamin" = 2)
tastes = list("leaves" = 1, "apple" = 1)
foodtype = VEGETABLES | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/salad/validsalad
name = "valid salad"
@@ -35,6 +38,7 @@
bonus_reagents = list("doctorsdelight" = 5, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "doctorsdelight" = 5, "vitamin" = 2)
tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1)
foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/salad/oatmeal
name = "oatmeal"
@@ -43,6 +47,7 @@
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 7, "milk" = 10, "vitamin" = 2)
tastes = list("oats" = 1, "milk" = 1)
foodtype = DAIRY | GRAIN
/obj/item/weapon/reagent_containers/food/snacks/salad/fruit
name = "fruit salad"
@@ -50,6 +55,7 @@
icon_state = "fruitsalad"
bonus_reagents = list("nutriment" = 2, "vitamin" = 4)
tastes = list("fruit" = 1)
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/salad/jungle
name = "jungle salad"
@@ -58,6 +64,7 @@
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 7, "banana" = 5, "vitamin" = 4)
tastes = list("fruit" = 1, "the jungle" = 1)
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/salad/citrusdelight
name = "citrus delight"
@@ -66,6 +73,7 @@
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 7, "vitamin" = 5)
tastes = list("sourness" = 1, "leaves" = 1)
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl
name = "ricebowl"
@@ -74,6 +82,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice
list_reagents = list("nutriment" = 4)
tastes = list("rice" = 1)
foodtype = GRAIN | RAW
/obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice
name = "boiled rice"
@@ -82,6 +91,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
tastes = list("rice" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/salad/ricepudding
name = "rice pudding"
@@ -89,6 +99,7 @@
icon_state = "ricepudding"
bonus_reagents = list("nutriment" = 4, "vitamin" = 2)
tastes = list("rice" = 1, "sweetness" = 1)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/salad/ricepork
name = "rice and pork"
@@ -96,6 +107,7 @@
icon_state = "riceporkbowl"
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
tastes = list("rice" = 1, "meat" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/salad/eggbowl
name = "egg bowl"
@@ -103,3 +115,4 @@
icon_state = "eggbowl"
bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
tastes = list("rice" = 1, "egg" = 1)
foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+12
View File
@@ -8,6 +8,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
name = "toasted sandwich"
@@ -18,6 +19,7 @@
bonus_reagents = list("nutriment" = 1, "carbon" = 2)
list_reagents = list("nutriment" = 6, "carbon" = 2)
tastes = list("toast" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
name = "grilled cheese sandwich"
@@ -28,6 +30,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 7, "vitamin" = 1)
tastes = list("toast" = 1, "cheese" = 1)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
name = "jelly sandwich"
@@ -37,14 +40,17 @@
trash = /obj/item/trash/plate
bitesize = 3
tastes = list("bread" = 1, "jelly" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime
bonus_reagents = list("slimejelly" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
foodtype = GRAIN | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
foodtype = GRAIN | FRUIT
/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
name = "icecream sandwich"
@@ -54,6 +60,7 @@
bonus_reagents = list("nutriment" = 1, "ice" = 2)
list_reagents = list("nutriment" = 2, "ice" = 2)
tastes = list("ice cream" = 1)
foodtype = GRAIN | DAIRY
/obj/item/weapon/reagent_containers/food/snacks/notasandwich
name = "not-a-sandwich"
@@ -64,6 +71,7 @@
bonus_reagents = list("vitamin" = 6)
list_reagents = list("nutriment" = 6, "vitamin" = 6)
tastes = list("nothing suspicious" = 1)
foodtype = GRAIN | GROSS
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
name = "jellied toast"
@@ -73,14 +81,17 @@
trash = /obj/item/trash/plate
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2)
foodtype = GRAIN | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime
bonus_reagents = list("slimejelly" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2)
foodtype = GRAIN | TOXIC | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/twobread
name = "two bread"
@@ -90,3 +101,4 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "vitamin" = 2)
tastes = list("bread" = 2)
foodtype = GRAIN
code/modules/food_and_drinks/food/snacks_soup.dm
+22
View File
@@ -6,6 +6,7 @@
volume = 80
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("tasteless soup" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/New()
..()
@@ -27,6 +28,7 @@
if(wish_true)
reagents.add_reagent("nutriment", 9)
reagents.add_reagent("vitamin", 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/meatball
name = "meatball soup"
@@ -34,6 +36,7 @@
icon_state = "meatballsoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
tastes = list("meat" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/soup/slime
name = "slime soup"
@@ -42,6 +45,7 @@
bonus_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4)
tastes = list("slime" = 1)
foodtype = TOXIC | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/soup/blood
name = "tomato soup"
@@ -50,6 +54,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
tastes = list("iron" = 1)
foodtype = GROSS
/obj/item/weapon/reagent_containers/food/snacks/soup/wingfangchu
name = "wing fang chu"
@@ -59,6 +64,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
tastes = list("soy" = 1)
foodtype = MEAT
/obj/item/weapon/reagent_containers/food/snacks/soup/clownstears
name = "clown's tears"
@@ -67,6 +73,7 @@
bonus_reagents = list("nutriment" = 1, "banana" = 5, "vitamin" = 8)
list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8)
tastes = list("a bad joke" = 1)
foodtype = FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/soup/vegetable
name = "vegetable soup"
@@ -74,6 +81,7 @@
icon_state = "vegetablesoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
tastes = list("vegetables" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/nettle
name = "nettle soup"
@@ -81,6 +89,7 @@
icon_state = "nettlesoup"
bonus_reagents = list("nutriment" = 1, "omnizine" = 5, "vitamin" = 5)
tastes = list("nettles" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/mystery
name = "mystery soup"
@@ -103,6 +112,7 @@
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
tastes = list("hot peppers" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/coldchili
name = "cold chili"
@@ -111,6 +121,7 @@
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
tastes = list("tomato" = 1, "mint" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight
name = "monkey's delight"
@@ -119,6 +130,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5)
tastes = list("the jungle" = 1, "banana" = 1)
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/soup/tomato
name = "tomato soup"
@@ -127,6 +139,7 @@
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 10, "vitamin" = 3)
list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
tastes = list("tomato" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball
name = "eyeball soup"
@@ -134,6 +147,7 @@
icon_state = "eyeballsoup"
bonus_reagents = list("nutriment" = 1, "liquidgibs" = 3)
tastes = list("tomato" = 1, "squirming" = 1)
foodtype = MEAT | GROSS
/obj/item/weapon/reagent_containers/food/snacks/soup/milo
name = "milosoup"
@@ -141,6 +155,7 @@
icon_state = "milosoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
tastes = list("milo" = 1) // wtf is milo
foodtype = GROSS
/obj/item/weapon/reagent_containers/food/snacks/soup/mushroom
name = "chantrelle soup"
@@ -149,12 +164,14 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
list_reagents = list("nutriment" = 8, "vitamin" = 4)
tastes = list("mushroom" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/beet
name = "beet soup"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/beet/New()
..()
@@ -170,6 +187,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 6)
tastes = list("jelly" = 1, "mushroom" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/amanitajelly
name = "amanita jelly"
@@ -179,6 +197,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 3, "amatoxin" = 6)
tastes = list("jelly" = 1, "mushroom" = 1)
foodtype = VEGETABLES | TOXIC
/obj/item/weapon/reagent_containers/food/snacks/soup/stew
name = "stew"
@@ -189,6 +208,7 @@
bitesize = 7
volume = 100
tastes = list("tomato" = 1, "carrot" = 1)
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato
name = "sweet potato soup"
@@ -196,6 +216,7 @@
icon_state = "sweetpotatosoup"
bonus_reagents = list("nutriment" = 4, "vitamin" = 5)
tastes = list("sweet potato" = 1)
foodtype = VEGETABLES | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/soup/beet/red
name = "red beet soup"
@@ -203,3 +224,4 @@
icon_state = "redbeetsoup"
bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
tastes = list("beet" = 1)
foodtype = VEGETABLES
code/modules/food_and_drinks/food/snacks_spaghetti.dm
+9
View File
@@ -8,6 +8,7 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti
filling_color = "#F0E68C"
tastes = list("pasta" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti
name = "boiled spaghetti"
@@ -20,6 +21,7 @@
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pasta
filling_color = "#F0E68C"
tastes = list("pasta" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/pastatomato
name = "spaghetti"
@@ -32,6 +34,7 @@
list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4)
filling_color = "#DC143C"
tastes = list("pasta" = 1, "tomato" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/copypasta
name = "copypasta"
@@ -44,6 +47,7 @@
list_reagents = list("nutriment" = 12, "tomatojuice" = 20, "vitamin" = 8)
filling_color = "#DC143C"
tastes = list("pasta" = 1, "tomato" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti
name = "spaghetti and meatballs"
@@ -55,6 +59,7 @@
list_reagents = list("nutriment" = 8, "vitamin" = 4)
filling_color = "#F0E68C"
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
name = "spesslaw"
@@ -66,6 +71,7 @@
list_reagents = list("nutriment" = 8, "vitamin" = 6)
filling_color = "#F0E68C"
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/chowmein
name = "chow mein"
@@ -76,6 +82,7 @@
bonus_reagents = list("nutriment" = 3, "vitamin" = 4)
list_reagents = list("nutriment" = 7, "vitamin" = 6)
tastes = list("noodle" = 1, "tomato" = 1)
foodtype = GRAIN
/obj/item/weapon/reagent_containers/food/snacks/beefnoodle
name = "beef noodle"
@@ -85,6 +92,7 @@
trash = /obj/item/weapon/reagent_containers/glass/bowl
bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "liquidgibs" = 3)
tastes = list("noodle" = 1, "meat" = 1)
foodtype = GRAIN | MEAT
/obj/item/weapon/reagent_containers/food/snacks/butternoodles
name = "butter noodles"
@@ -94,3 +102,4 @@
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
tastes = list("noodle" = 1, "butter" = 1)
foodtype = GRAIN | DAIRY
code/modules/food_and_drinks/food/snacks_vend.dm
+8
View File
@@ -11,6 +11,7 @@
junkiness = 25
filling_color = "#D2691E"
tastes = list("candy" = 1)
foodtype = JUNKFOOD | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -21,6 +22,7 @@
junkiness = 25
filling_color = "#8B0000"
tastes = list("dried meat" = 1)
foodtype = JUNKFOOD | MEAT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/sosjerky/healthy
name = "homemade beef jerky"
@@ -38,6 +40,7 @@
junkiness = 20
filling_color = "#FFD700"
tastes = list("salt" = 1, "crisps" = 1)
foodtype = JUNKFOOD | FRIED
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
name = "4no raisins"
@@ -48,12 +51,14 @@
junkiness = 25
filling_color = "#8B0000"
tastes = list("dried raisins" = 1)
foodtype = JUNKFOOD | FRUIT | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
desc = "homemade raisins, the best in all of spess."
list_reagents = list("nutriment" = 3, "vitamin" = 2)
junkiness = 0
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
name = "space twinkie"
@@ -62,6 +67,7 @@
list_reagents = list("sugar" = 4)
junkiness = 25
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
name = "cheesie honkers"
@@ -72,6 +78,7 @@
junkiness = 25
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
foodtype = JUNKFOOD | DAIRY | SUGAR
/obj/item/weapon/reagent_containers/food/snacks/syndicake
name = "syndi-cakes"
@@ -81,3 +88,4 @@
list_reagents = list("nutriment" = 4, "doctorsdelight" = 5)
filling_color = "#F5F5DC"
tastes = list("sweetness" = 3, "cake" = 1)
foodtype = GRAIN | FRUIT | VEGETABLES
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+5 -10
View File
@@ -18,7 +18,7 @@ insert ascii eagle on american flag background here
container_type = OPENCONTAINER
var/obj/item/frying = null //What's being fried RIGHT NOW?
var/cook_time = 0
var/static/list/blacklisted_items = typecacheof(list(
var/static/list/deepfry_blacklisted_items = typecacheof(list(
/obj/item/weapon/screwdriver,
/obj/item/weapon/crowbar,
/obj/item/weapon/wrench,
@@ -28,14 +28,8 @@ insert ascii eagle on american flag background here
/obj/item/weapon/reagent_containers/glass,
/obj/item/weapon/storage/part_replacer))
/obj/item/weapon/circuitboard/machine/deep_fryer
name = "circuit board (Deep Fryer)"
build_path = /obj/machinery/deepfryer
origin_tech = "programming=1"
req_components = list(/obj/item/weapon/stock_parts/micro_laser = 1)
/obj/machinery/deepfryer/New()
..()
/obj/machinery/deepfryer/Initialize()
. = ..()
create_reagents(50)
reagents.add_reagent("nutriment", 25)
component_parts = list()
@@ -62,7 +56,7 @@ insert ascii eagle on american flag background here
else if(default_deconstruction_screwdriver(user, "fryer_off", "fryer_off" ,I)) //where's the open maint panel icon?!
return
else
if(is_type_in_typecache(I, blacklisted_items))
if(is_type_in_typecache(I, deepfry_blacklisted_items))
. = ..()
else if(user.drop_item() && !frying)
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
@@ -112,6 +106,7 @@ insert ascii eagle on american flag background here
S.name = "the physical manifestation of the very concept of fried foods"
S.desc = "A heavily fried...something. Who can tell anymore?"
S.filling_color = S.color
S.foodtype |= FRIED
if(istype(frying, /obj/item/weapon/reagent_containers/food/snacks/))
qdel(frying)
else
code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
+3 -5
View File
@@ -18,17 +18,15 @@
container_type = OPENCONTAINER
var/obj/item/weapon/reagent_containers/mixer
/obj/machinery/food_cart/New()
..()
/obj/machinery/food_cart/Initialize()
. = ..()
create_reagents(LIQUID_CAPACIY)
reagents.set_reacting(FALSE)
mixer = new /obj/item/weapon/reagent_containers(src, MIXER_CAPACITY)
mixer.name = "Mixer"
/obj/machinery/food_cart/Destroy()
if(mixer)
qdel(mixer)
mixer = null
QDEL_NULL(mixer)
return ..()
/obj/machinery/food_cart/attack_hand(mob/user)
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+34 -42
View File
@@ -6,58 +6,21 @@
icon_state = "grinder"
density = TRUE
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 500
circuit = /obj/item/weapon/circuitboard/machine/gibber
var/operating = FALSE //Is it on?
var/dirty = 0 // Does it need cleaning?
var/gibtime = 40 // Time from starting until meat appears
var/meat_produced = 0
var/ignore_clothing = 0
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 500
//auto-gibs anything that bumps into it
/obj/machinery/gibber/autogibber
var/turf/input_plate
/obj/machinery/gibber/autogibber/Initialize()
. = ..()
for(var/i in GLOB.cardinals)
var/obj/machinery/mineral/input/input_obj = locate() in get_step(loc, i)
if(input_obj)
if(isturf(input_obj.loc))
input_plate = input_obj.loc
qdel(input_obj)
break
if(!input_plate)
CRASH("Didn't find an input plate.")
return
/obj/machinery/gibber/autogibber/CollidedWith(atom/movable/AM)
if(!input_plate)
return
if(ismob(AM))
var/mob/M = AM
if(M.loc == input_plate)
M.loc = src
M.gib()
/obj/machinery/gibber/Initialize()
. = ..()
add_overlay("grjam")
var/obj/item/weapon/circuitboard/machine/gibber/B = new
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/gibber
name = "Gibber (Machine Board)"
build_path = /obj/machinery/gibber
origin_tech = "programming=2;engineering=2"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
/obj/machinery/gibber/RefreshParts()
var/gib_time = 40
@@ -234,3 +197,32 @@
pixel_x = initial(pixel_x) //return to its spot after shaking
operating = FALSE
update_icon()
//auto-gibs anything that bumps into it
/obj/machinery/gibber/autogibber
var/turf/input_plate
/obj/machinery/gibber/autogibber/Initialize()
. = ..()
for(var/i in GLOB.cardinals)
var/obj/machinery/mineral/input/input_obj = locate() in get_step(loc, i)
if(input_obj)
if(isturf(input_obj.loc))
input_plate = input_obj.loc
qdel(input_obj)
break
if(!input_plate)
CRASH("Didn't find an input plate.")
return
/obj/machinery/gibber/autogibber/CollidedWith(atom/movable/AM)
if(!input_plate)
return
if(ismob(AM))
var/mob/M = AM
if(M.loc == input_plate)
M.forceMove(src)
M.gib()
code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+15 -11
View File
@@ -14,11 +14,19 @@
anchored = FALSE
use_power = NO_POWER_USE
layer = BELOW_OBJ_LAYER
container_type = OPENCONTAINER
max_integrity = 300
var/list/product_types = list()
var/dispense_flavour = ICECREAM_VANILLA
var/flavour_name = "vanilla"
container_type = OPENCONTAINER
max_integrity = 300
var/static/list/icecream_vat_reagents = list(
"milk" = 5,
"flour" = 5,
"sugar" = 5,
"ice" = 5,
"cocoa" = 5,
"berryjuice" = 5,
"singulo" = 5)
/obj/machinery/icecream_vat/proc/get_ingredient_list(type)
switch(type)
@@ -52,19 +60,14 @@
return "vanilla"
/obj/machinery/icecream_vat/New()
..()
/obj/machinery/icecream_vat/Initialize()
. = ..()
while(product_types.len < 6)
product_types.Add(5)
create_reagents()
reagents.set_reacting(FALSE)
reagents.add_reagent("milk", 5)
reagents.add_reagent("flour", 5)
reagents.add_reagent("sugar", 5)
reagents.add_reagent("ice", 5)
reagents.add_reagent("cocoa", 5)
reagents.add_reagent("berryjuice", 5)
reagents.add_reagent("singulo", 5)
for(var/reagent in icecream_vat_reagents)
reagents.add_reagent(reagent, icecream_vat_reagents[reagent])
/obj/machinery/icecream_vat/attack_hand(mob/user)
user.set_machine(src)
@@ -177,6 +180,7 @@
var/ice_creamed = 0
var/cone_type
bitesize = 3
foodtype = DAIRY
/obj/item/weapon/reagent_containers/food/snacks/icecream/Initialize()
. = ..()
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+3 -15
View File
@@ -9,6 +9,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
circuit = /obj/item/weapon/circuitboard/machine/microwave
var/operating = FALSE // Is it on?
var/dirty = 0 // = {0..100} Does it need cleaning?
var/broken = 0 // ={0,1,2} How broken is it???
@@ -21,22 +22,9 @@
* Initialising
********************/
/obj/machinery/microwave/New()
/obj/machinery/microwave/Initialize()
. = ..()
create_reagents(100)
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/microwave(null)
B.apply_default_parts(src)
..()
/obj/item/weapon/circuitboard/machine/microwave
name = "Microwave (Machine Board)"
build_path = /obj/machinery/microwave
origin_tech = "programming=2;magnets=2"
req_components = list(
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/stack/cable_coil = 2,
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 1)
/obj/machinery/microwave/RefreshParts()
var/E
code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+1 -14
View File
@@ -9,24 +9,11 @@
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 50
circuit = /obj/item/weapon/circuitboard/machine/monkey_recycler
var/grinded = 0
var/required_grind = 5
var/cube_production = 1
/obj/machinery/monkey_recycler/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/monkey_recycler(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/monkey_recycler
name = "Monkey Recycler (Machine Board)"
build_path = /obj/machinery/monkey_recycler
origin_tech = "programming=1;biotech=2"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
/obj/machinery/monkey_recycler/RefreshParts()
var/req_grind = 5
var/cubes_made = 1
code/modules/food_and_drinks/kitchen_machinery/processor.dm
+6 -39
View File
@@ -7,44 +7,15 @@
layer = BELOW_OBJ_LAYER
density = TRUE
anchored = TRUE
var/broken = 0
var/processing = FALSE
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 50
circuit = /obj/item/weapon/circuitboard/machine/processor
var/broken = FALSE
var/processing = FALSE
var/rating_speed = 1
var/rating_amount = 1
/obj/machinery/processor/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/processor(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/processor
name = "Food Processor (Machine Board)"
build_path = /obj/machinery/processor
origin_tech = "programming=1"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
/obj/item/weapon/circuitboard/machine/processor
name = "Food Processor (Machine Board)"
build_path = /obj/machinery/processor
/obj/item/weapon/circuitboard/machine/processor/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
if(build_path == /obj/machinery/processor)
name = "Slime Processor (Machine Board)"
build_path = /obj/machinery/processor/slime
to_chat(user, "<span class='notice'>Name protocols successfully updated.</span>")
else
name = "Food Processor (Machine Board)"
build_path = /obj/machinery/processor
to_chat(user, "<span class='notice'>Defaulting name protocols.</span>")
else
return ..()
/obj/machinery/processor/RefreshParts()
for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
rating_amount = B.rating
@@ -300,11 +271,7 @@
name = "Slime processor"
desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."
/obj/machinery/processor/slime/New()
..()
/obj/machinery/processor/slime/Initialize()
. = ..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/processor/slime(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/processor/slime
name = "Slime Processor (Machine Board)"
build_path = /obj/machinery/processor/slime
B.apply_default_parts(src)
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+4 -37
View File
@@ -12,13 +12,14 @@
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
circuit = /obj/item/weapon/circuitboard/machine/smartfridge
var/max_n_of_items = 1500
var/icon_on = "smartfridge"
var/icon_off = "smartfridge-off"
var/list/initial_contents
/obj/machinery/smartfridge/Initialize()
..()
. = ..()
create_reagents()
reagents.set_reacting(FALSE)
@@ -30,40 +31,6 @@
for(var/i in 1 to amount)
load(new typekey(src))
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/smartfridge(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/smartfridge
name = "Smartfridge (Machine Board)"
build_path = /obj/machinery/smartfridge
origin_tech = "programming=1"
req_components = list(/obj/item/weapon/stock_parts/matter_bin = 1)
var/static/list/fridges = list(/obj/machinery/smartfridge = "plant produce",
/obj/machinery/smartfridge/food = "food",
/obj/machinery/smartfridge/drinks = "drinks",
/obj/machinery/smartfridge/extract = "slimes",
/obj/machinery/smartfridge/chemistry = "chems",
/obj/machinery/smartfridge/chemistry/virology = "viruses",
/obj/machinery/smartfridge/disks = "disks")
/obj/item/weapon/circuitboard/machine/smartfridge/New(loc, new_type)
if(new_type)
build_path = new_type
..()
/obj/item/weapon/circuitboard/machine/smartfridge/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
var/position = fridges.Find(build_path, fridges)
position = (position == fridges.len) ? 1 : (position + 1)
build_path = fridges[position]
to_chat(user, "<span class='notice'>You set the board to [fridges[build_path]].</span>")
else
return ..()
/obj/item/weapon/circuitboard/machine/smartfridge/examine(mob/user)
..()
to_chat(user, "<span class='info'>[src] is set to [fridges[build_path]]. You can use a screwdriver to reconfigure it.</span>")
/obj/machinery/smartfridge/RefreshParts()
for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
max_n_of_items = 1500 * B.rating
@@ -255,8 +222,8 @@
icon_off = "drying_rack"
var/drying = FALSE
/obj/machinery/smartfridge/drying_rack/New()
..()
/obj/machinery/smartfridge/drying_rack/Initialize()
. = ..()
if(component_parts && component_parts.len)
component_parts.Cut()
component_parts = null
code/modules/food_and_drinks/recipes/food_mixtures.dm
+3 -3
View File
@@ -13,7 +13,7 @@
id = "tofu"
required_reagents = list("soymilk" = 10)
required_catalysts = list("enzyme" = 5)
mob_react=1
mob_react = FALSE
/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
@@ -37,7 +37,7 @@
name = "Chocolate Bar"
id = "chocolate_bar"
required_reagents = list("chocolate_milk" = 4, "sugar" = 2)
mob_react = 1
mob_react = FALSE
/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
@@ -91,7 +91,7 @@
name = "synthmeat"
id = "synthmeat"
required_reagents = list("blood" = 5, "cryoxadone" = 1)
mob_react = 1
mob_react = FALSE
/datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+1 -1
View File
@@ -248,7 +248,7 @@
/datum/crafting_recipe/food/ratburger
name = "Rat burger"
reqs = list(
/obj/item/trash/deadmouse = 1,
/obj/item/weapon/reagent_containers/food/snacks/deadmouse = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/rat
code/modules/goonchat/browserassets/css/browserOutput.css
+3
View File
@@ -371,6 +371,9 @@ h1.alert, h2.alert {color: #000000;}
.swarmer {color: #2C75FF;}
.resonate {color: #298F85;}
.love {color: #FF69Bf;}
.lovebold {color: #FF69Bf; font-weight: bold;}
.connectionClosed, .fatalError {background: red; color: white; padding: 5px;}
.connectionClosed.restored {background: green;}
.internal.boldnshit {color: blue; font-weight: bold;}
code/modules/hydroponics/biogenerator.dm
+4 -17
View File
@@ -7,6 +7,7 @@
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 40
circuit = /obj/item/weapon/circuitboard/machine/biogenerator
var/processing = FALSE
var/obj/item/weapon/reagent_containers/glass/beaker = null
var/points = 0
@@ -18,17 +19,13 @@
var/list/show_categories = list("Food", "Botany Chemicals", "Leather and Cloth")
var/list/timesFiveCategories = list("Food", "Botany Chemicals")
/obj/machinery/biogenerator/New()
..()
/obj/machinery/biogenerator/Initialize()
. = ..()
files = new /datum/research/biogenerator(src)
create_reagents(1000)
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/biogenerator(null)
B.apply_default_parts(src)
/obj/machinery/biogenerator/Destroy()
if(beaker)
qdel(beaker)
beaker = null
QDEL_NULL(beaker)
return ..()
/obj/machinery/biogenerator/contents_explosion(severity, target)
@@ -43,16 +40,6 @@
update_icon()
updateUsrDialog()
/obj/item/weapon/circuitboard/machine/biogenerator
name = "Biogenerator (Machine Board)"
build_path = /obj/machinery/biogenerator
origin_tech = "programming=2;biotech=3;materials=3"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
/obj/machinery/biogenerator/RefreshParts()
var/E = 0
var/P = 0
code/modules/hydroponics/gene_modder.dm
+3 -31
View File
@@ -5,6 +5,7 @@
icon_state = "dnamod"
density = TRUE
anchored = TRUE
circuit = /obj/item/weapon/circuitboard/machine/plantgenes
var/obj/item/seeds/seed
var/obj/item/weapon/disk/plantgene/disk
@@ -22,21 +23,6 @@
var/min_wchance = 67
var/min_wrate = 10
/obj/machinery/plantgenes/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/plantgenes(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/plantgenes
name = "Plant DNA Manipulator (Machine Board)"
build_path = /obj/machinery/plantgenes
origin_tech = "programming=3;biotech=3"
req_components = list(
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/scanning_module = 1)
/obj/machinery/plantgenes/RefreshParts() // Comments represent the max you can set per tier, respectively. seeds.dm [219] clamps these for us but we don't want to mislead the viewer.
for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
if(M.rating > 3)
@@ -421,23 +407,9 @@
seed.name = "experimental " + seed.name
seed.icon_state = "seed-x"
// Gene modder for seed vault ship, built with high tech alien parts.
/obj/machinery/plantgenes/seedvault/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/plantgenes/vault(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/plantgenes/vault
name = "alien board (Plant DNA Manipulator)"
icon_state = "abductor_mod"
origin_tech = "programming=5;biotech=5"
// It wasn't made by actual abductors race, so no abductor tech here.
def_components = list(
/obj/item/weapon/stock_parts/manipulator = /obj/item/weapon/stock_parts/manipulator/femto,
/obj/item/weapon/stock_parts/micro_laser = /obj/item/weapon/stock_parts/micro_laser/quadultra,
/obj/item/weapon/stock_parts/scanning_module = /obj/item/weapon/stock_parts/scanning_module/triphasic)
/obj/machinery/plantgenes/seedvault
circuit = /obj/item/weapon/circuitboard/machine/plantgenes/vault
/*
* Plant DNA disk
code/modules/hydroponics/grown/ambrosia.dm
+1
View File
@@ -7,6 +7,7 @@
slot_flags = SLOT_HEAD
filling_color = "#008000"
bitesize_mod = 2
foodtype = VEGETABLES
// Ambrosia Vulgaris
/obj/item/seeds/ambrosia
code/modules/hydroponics/grown/apple.dm
+2
View File
@@ -23,6 +23,7 @@
icon_state = "apple"
filling_color = "#FF4500"
bitesize = 100 // Always eat the apple in one bite
foodtype = FRUIT
// Posioned Apple
/obj/item/seeds/apple/poisoned
@@ -33,6 +34,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned
seed = /obj/item/seeds/apple/poisoned
foodtype = FRUIT | TOXIC
// Gold Apple
/obj/item/seeds/apple/gold
code/modules/hydroponics/grown/banana.dm
+1
View File
@@ -23,6 +23,7 @@
trash = /obj/item/weapon/grown/bananapeel
filling_color = "#FFFF00"
bitesize = 5
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
code/modules/hydroponics/grown/beans.dm
+3 -1
View File
@@ -25,6 +25,7 @@
icon_state = "soybeans"
filling_color = "#F0E68C"
bitesize_mod = 2
foodtype = VEGETABLES
// Koibean
/obj/item/seeds/soya/koi
@@ -45,4 +46,5 @@
desc = "Something about these seems fishy."
icon_state = "koibeans"
filling_color = "#F0E68C"
bitesize_mod = 2
bitesize_mod = 2
foodtype = VEGETABLES
code/modules/hydroponics/grown/berries.dm
+7
View File
@@ -25,6 +25,7 @@
gender = PLURAL
filling_color = "#FF00FF"
bitesize_mod = 2
foodtype = FRUIT
// Poison Berries
/obj/item/seeds/berry/poison
@@ -44,6 +45,7 @@
desc = "Taste so good, you could die!"
icon_state = "poisonberrypile"
filling_color = "#C71585"
foodtype = FRUIT | TOXIC
// Death Berries
/obj/item/seeds/berry/death
@@ -65,6 +67,7 @@
desc = "Taste so good, you could die!"
icon_state = "deathberrypile"
filling_color = "#708090"
foodtype = FRUIT | TOXIC
// Glow Berries
/obj/item/seeds/berry/glow
@@ -88,6 +91,7 @@
icon_state = "glowberrypile"
filling_color = "#7CFC00"
origin_tech = "plasmatech=6"
foodtype = FRUIT
// Cherries
/obj/item/seeds/cherry
@@ -117,6 +121,7 @@
gender = PLURAL
filling_color = "#FF0000"
bitesize_mod = 2
foodtype = FRUIT
// Blue Cherries
/obj/item/seeds/cherry/blue
@@ -137,6 +142,7 @@
icon_state = "bluecherry"
filling_color = "#6495ED"
bitesize_mod = 2
foodtype = FRUIT
// Grapes
/obj/item/seeds/grape
@@ -167,6 +173,7 @@
dried_type = /obj/item/weapon/reagent_containers/food/snacks/no_raisin/healthy
filling_color = "#FF1493"
bitesize_mod = 2
foodtype = FRUIT
// Green Grapes
/obj/item/seeds/grape/green
code/modules/hydroponics/grown/cannabis.dm
+1
View File
@@ -90,6 +90,7 @@
icon_state = "cannabis"
filling_color = "#00FF00"
bitesize_mod = 2
foodtype = VEGETABLES //i dont really know what else weed could be to be honest
/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
code/modules/hydroponics/grown/cereals.dm
+4
View File
@@ -21,6 +21,7 @@
icon_state = "wheat"
filling_color = "#F0E68C"
bitesize_mod = 2
foodtype = GRAIN
// Oat
/obj/item/seeds/wheat/oat
@@ -40,6 +41,7 @@
icon_state = "oat"
filling_color = "#556B2F"
bitesize_mod = 2
foodtype = GRAIN
// Rice
/obj/item/seeds/wheat/rice
@@ -60,6 +62,7 @@
icon_state = "rice"
filling_color = "#FAFAD2"
bitesize_mod = 2
foodtype = GRAIN
//Meatwheat - grows into synthetic meat
/obj/item/seeds/wheat/meat
@@ -79,6 +82,7 @@
filling_color = rgb(150, 0, 0)
bitesize_mod = 2
seed = /obj/item/seeds/wheat/meat
foodtype = MEAT | GRAIN
/obj/item/weapon/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user)
user.visible_message("<span class='notice'>[user] crushes [src] into meat.</span>", "<span class='notice'>You crush [src] into something that resembles meat.</span>")
code/modules/hydroponics/grown/chili.dm
+3
View File
@@ -25,6 +25,7 @@
icon_state = "chilipepper"
filling_color = "#FF0000"
bitesize_mod = 2
foodtype = VEGETABLES
// Ice Chili
/obj/item/seeds/chili/ice
@@ -49,6 +50,7 @@
filling_color = "#0000CD"
bitesize_mod = 2
origin_tech = "biotech=4"
foodtype = VEGETABLES
// Ghost Chili
/obj/item/seeds/chili/ghost
@@ -75,6 +77,7 @@
filling_color = "#F8F8FF"
bitesize_mod = 4
origin_tech = "biotech=4;magnets=5"
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
..()
code/modules/hydroponics/grown/citrus.dm
+2
View File
@@ -5,6 +5,7 @@
desc = "It's so sour, your face will twist."
icon_state = "lime"
bitesize_mod = 2
foodtype = FRUIT
// Lime
/obj/item/seeds/lime
@@ -104,6 +105,7 @@
desc = "Made for burning houses down."
icon_state = "firelemon"
bitesize_mod = 2
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user)
var/area/A = get_area(user)
code/modules/hydroponics/grown/cocoa_vanilla.dm
+3 -1
View File
@@ -25,6 +25,7 @@
icon_state = "cocoapod"
filling_color = "#FFD700"
bitesize_mod = 2
foodtype = VEGETABLES
// Vanilla Pod
/obj/item/seeds/cocoapod/vanillapod
@@ -43,4 +44,5 @@
name = "vanilla pod"
desc = "Fattening... Mmmmm... vanilla."
icon_state = "vanillapod"
filling_color = "#FFD700"
filling_color = "#FFD700"
foodtype = VEGETABLES
code/modules/hydroponics/grown/corn.dm
+2 -1
View File
@@ -24,6 +24,7 @@
filling_color = "#FFFF00"
trash = /obj/item/weapon/grown/corncob
bitesize_mod = 2
foodtype = VEGETABLES
/obj/item/weapon/grown/corncob
name = "corn cob"
@@ -79,4 +80,4 @@
snap_pops -= 1
if(!snap_pops)
new /obj/item/weapon/grown/corncob(user.loc)
qdel(src)
qdel(src)
code/modules/hydroponics/grown/eggplant.dm
+3 -1
View File
@@ -22,6 +22,7 @@
icon_state = "eggplant"
filling_color = "#800080"
bitesize_mod = 2
foodtype = FRUIT
// Egg-Plant
/obj/item/seeds/eggplant/eggy
@@ -41,4 +42,5 @@
icon_state = "eggyplant"
trash = /obj/item/weapon/reagent_containers/food/snacks/egg
filling_color = "#F8F8FF"
bitesize_mod = 2
bitesize_mod = 2
foodtype = MEAT
code/modules/hydroponics/grown/flowers.dm
+1
View File
@@ -25,6 +25,7 @@
slot_flags = SLOT_HEAD
filling_color = "#FF6347"
bitesize_mod = 3
foodtype = VEGETABLES | GROSS
// Lily
/obj/item/seeds/poppy/lily
code/modules/hydroponics/grown/kudzu.dm
+2 -1
View File
@@ -99,4 +99,5 @@
desc = "<I>Pueraria Virallis</I>: An invasive species with vines that rapidly creep and wrap around whatever they contact."
icon_state = "kudzupod"
filling_color = "#6B8E23"
bitesize_mod = 2
bitesize_mod = 2
foodtype = VEGETABLES | GROSS
code/modules/hydroponics/grown/melon.dm
+1
View File
@@ -25,6 +25,7 @@
w_class = WEIGHT_CLASS_NORMAL
filling_color = "#008000"
bitesize_mod = 3
foodtype = FRUIT
// Holymelon
/obj/item/seeds/watermelon/holy
code/modules/hydroponics/grown/misc.dm
+4 -1
View File
@@ -54,6 +54,7 @@
icon_state = "cabbage"
filling_color = "#90EE90"
bitesize_mod = 2
foodtype = VEGETABLES
// Sugarcane
@@ -79,6 +80,7 @@
icon_state = "sugarcane"
filling_color = "#FFD700"
bitesize_mod = 2
foodtype = VEGETABLES | SUGAR
// Gatfruit
@@ -109,6 +111,7 @@
origin_tech = "combat=6"
trash = /obj/item/weapon/gun/ballistic/revolver
bitesize_mod = 2
foodtype = FRUIT
//Cherry Bombs
/obj/item/seeds/cherry/bomb
@@ -164,4 +167,4 @@
plantname = "Fruiting Cactus"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
growthstages = 2
growthstages = 2
code/modules/hydroponics/grown/mushrooms.dm
+4 -1
View File
@@ -1,6 +1,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom
name = "mushroom"
bitesize_mod = 2
foodtype = VEGETABLES
// Reishi
@@ -22,6 +23,9 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
name = "reishi"
@@ -29,7 +33,6 @@
icon_state = "reishi"
filling_color = "#FF4500"
// Fly Amanita
/obj/item/seeds/amanita
name = "pack of fly amanita mycelium"
code/modules/hydroponics/grown/potato.dm
+2 -1
View File
@@ -25,6 +25,7 @@
icon_state = "potato"
filling_color = "#E9967A"
bitesize = 100
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges
@@ -61,4 +62,4 @@
seed = /obj/item/seeds/potato/sweet
name = "sweet potato"
desc = "It's sweet."
icon_state = "sweetpotato"
icon_state = "sweetpotato"
code/modules/hydroponics/grown/pumpkin.dm
+2
View File
@@ -23,6 +23,7 @@
icon_state = "pumpkin"
filling_color = "#FFA500"
bitesize_mod = 2
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(W.is_sharp())
@@ -52,3 +53,4 @@
icon_state = "blumpkin"
filling_color = "#87CEFA"
bitesize_mod = 2
foodtype = VEGETABLES
code/modules/hydroponics/grown/root.dm
+4
View File
@@ -21,6 +21,7 @@
icon_state = "carrot"
filling_color = "#FFA500"
bitesize_mod = 2
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(I.is_sharp())
@@ -50,6 +51,7 @@
desc = "Closely related to carrots."
icon_state = "parsnip"
bitesize_mod = 2
foodtype = VEGETABLES
// White-Beet
@@ -75,6 +77,7 @@
icon_state = "whitebeet"
filling_color = "#F4A460"
bitesize_mod = 2
foodtype = VEGETABLES
// Red Beet
/obj/item/seeds/redbeet
@@ -98,3 +101,4 @@
desc = "You can't beat red beet."
icon_state = "redbeet"
bitesize_mod = 2
foodtype = VEGETABLES
code/modules/hydroponics/grown/tomato.dm
+2 -1
View File
@@ -22,6 +22,7 @@
splat_type = /obj/effect/decal/cleanable/tomato_smudge
filling_color = "#FF6347"
bitesize_mod = 2
foodtype = VEGETABLES
// Blood Tomato
/obj/item/seeds/tomato/blood
@@ -43,7 +44,7 @@
splat_type = /obj/effect/gibspawner/generic
filling_color = "#FF0000"
origin_tech = "biotech=5"
foodtype = VEGETABLES | GROSS
// Blue Tomato
/obj/item/seeds/tomato/blue
code/modules/hydroponics/hydroponics.dm
+1 -14
View File
@@ -6,6 +6,7 @@
anchored = TRUE
pixel_y = 8
unique_rename = 1
circuit = /obj/item/weapon/circuitboard/machine/hydroponics
var/waterlevel = 100 //The amount of water in the tray (max 100)
var/maxwater = 100 //The maximum amount of water in the tray
var/nutrilevel = 10 //The amount of nutrient in the tray (max 10)
@@ -37,20 +38,6 @@
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "hydrotray3"
/obj/machinery/hydroponics/constructable/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/hydroponics(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/hydroponics
name = "Hydroponics Tray (Machine Board)"
build_path = /obj/machinery/hydroponics/constructable
origin_tech = "programming=1;biotech=2"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 2,
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
/obj/machinery/hydroponics/constructable/RefreshParts()
var/tmp_capacity = 0
for (var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
code/modules/hydroponics/seed_extractor.dm
+1 -13
View File
@@ -44,23 +44,11 @@
icon_state = "sextractor"
density = TRUE
anchored = TRUE
circuit = /obj/item/weapon/circuitboard/machine/seed_extractor
var/piles = list()
var/max_seeds = 1000
var/seed_multiplier = 1
/obj/machinery/seed_extractor/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/seed_extractor(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/seed_extractor
name = "Seed Extractor (Machine Board)"
build_path = /obj/machinery/seed_extractor
origin_tech = "programming=1"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
/obj/machinery/seed_extractor/RefreshParts()
for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
max_seeds = 1000 * B.rating
code/modules/library/lib_machines.dm
+2 -2
View File
@@ -193,8 +193,8 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
libcomp_menu[page] = ""
libcomp_menu[page] += "<tr><td>[C.author]</td><td>[C.title]</td><td>[C.category]</td><td><A href='?src=\ref[src];targetid=[C.id]'>\[Order\]</A></td></tr>\n"
/obj/machinery/computer/libraryconsole/bookmanagement/New()
..()
/obj/machinery/computer/libraryconsole/bookmanagement/Initialize()
. = ..()
if(circuit)
circuit.name = "Book Inventory Management Console (Machine Board)"
circuit.build_path = /obj/machinery/computer/libraryconsole/bookmanagement
code/modules/lighting/lighting_object.dm
+1 -1
View File
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(all_lighting_objects) // Global list of lighting objects.
icon_state = "transparent"
color = LIGHTING_BASE_MATRIX
plane = LIGHTING_PLANE
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
layer = LIGHTING_LAYER
invisibility = INVISIBILITY_LIGHTING
code/modules/lighting/lighting_turf.dm
-8
View File
@@ -95,14 +95,6 @@
has_opaque_atom = TRUE
break
// If an opaque movable atom moves around we need to potentially update visibility.
/turf/Entered(var/atom/movable/Obj, var/atom/OldLoc)
. = ..()
if (Obj && Obj.opacity)
has_opaque_atom = TRUE // Make sure to do this before reconsider_lights(), incase we're on instant updates. Guaranteed to be on in this case.
reconsider_lights()
/turf/Exited(var/atom/movable/Obj, var/atom/newloc)
. = ..()
code/modules/mining/aux_base.dm
+3 -4
View File
@@ -26,10 +26,9 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
var/obj/item/device/gps/internal/base/locator
circuit = /obj/item/weapon/circuitboard/computer/auxillary_base
/obj/machinery/computer/auxillary_base/New(location, obj/item/weapon/circuitboard/computer/shuttle/C)
..()
locator = new /obj/item/device/gps/internal/base(src)
/obj/machinery/computer/auxillary_base/Initialize()
. = ..()
locator = new(src)
/obj/machinery/computer/auxillary_base/attack_hand(mob/user)
if(..(user))
code/modules/mining/aux_base_camera.dm
+3 -3
View File
@@ -49,9 +49,9 @@
light_color = LIGHT_COLOR_PINK
/obj/machinery/computer/camera_advanced/base_construction/New()
..()
RCD = new /obj/item/weapon/construction/rcd/internal(src)
/obj/machinery/computer/camera_advanced/base_construction/Initialize()
. = ..()
RCD = new(src)
/obj/machinery/computer/camera_advanced/base_construction/Initialize(mapload)
..()
code/modules/mining/equipment/survival_pod.dm
+10 -11
View File
@@ -199,18 +199,9 @@
max_n_of_items = 10
pixel_y = -4
flags = NODECONSTRUCT
var/empty = FALSE
/obj/machinery/smartfridge/survival_pod/empty
name = "dusty survival pod storage"
desc = "A heated storage unit. This one's seen better days."
/obj/machinery/smartfridge/survival_pod/empty/Initialize(mapload)
..(mapload, TRUE)
/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
return isitem(O)
/obj/machinery/smartfridge/survival_pod/Initialize(mapload, empty)
/obj/machinery/smartfridge/survival_pod/Initialize(mapload)
. = ..()
if(empty)
return
@@ -224,6 +215,14 @@
var/obj/item/device/instrument/guitar/G = new(src)
load(G)
/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
return isitem(O)
/obj/machinery/smartfridge/survival_pod/empty
name = "dusty survival pod storage"
desc = "A heated storage unit. This one's seen better days."
empty = TRUE
//Fans
/obj/structure/fans
icon = 'icons/obj/lavaland/survival_pod.dmi'
code/modules/mining/laborcamp/laborstacker.dm
+4 -4
View File
@@ -15,11 +15,11 @@
var/obj/item/device/radio/Radio //needed to send messages to sec radio
/obj/machinery/mineral/labor_claim_console/New()
..()
/obj/machinery/mineral/labor_claim_console/Initialize()
. = ..()
Radio = new/obj/item/device/radio(src)
Radio.listening = 0
addtimer(CALLBACK(src, .proc/locate_stacking_machine), 7)
Radio.listening = FALSE
locate_stacking_machine()
/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/card/id/prisoner))
code/modules/mining/lavaland/necropolis_chests.dm
+1 -1
View File
@@ -249,7 +249,7 @@
blue.linked = src
/obj/effect/warp_cube
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/obj/effect/warp_cube/ex_act(severity, target)
return
code/modules/mining/machine_input_output_plates.dm
+4 -2
View File
@@ -7,7 +7,8 @@
density = FALSE
anchored = TRUE
/obj/machinery/mineral/input/New()
/obj/machinery/mineral/input/Initialize()
. = ..()
icon_state = "blank"
/obj/machinery/mineral/output
@@ -17,7 +18,8 @@
density = FALSE
anchored = TRUE
/obj/machinery/mineral/output/New()
/obj/machinery/mineral/output/Initialize()
. = ..()
icon_state = "blank"
/obj/machinery/mineral
code/modules/mining/machine_redemption.dm
+2 -14
View File
@@ -11,6 +11,8 @@
input_dir = NORTH
output_dir = SOUTH
req_access = list(ACCESS_MINERAL_STOREROOM)
speed_process = 1
circuit = /obj/item/weapon/circuitboard/machine/ore_redemption
var/req_access_reclaim = ACCESS_MINING_STATION
var/obj/item/weapon/card/id/inserted_id
var/points = 0
@@ -18,7 +20,6 @@
var/sheet_per_ore = 1
var/point_upgrade = 1
var/list/ore_values = list(MAT_GLASS = 1, MAT_METAL = 1, MAT_PLASMA = 15, MAT_SILVER = 16, MAT_GOLD = 18, MAT_TITANIUM = 30, MAT_URANIUM = 30, MAT_DIAMOND = 50, MAT_BLUESPACE = 50, MAT_BANANIUM = 60)
speed_process = 1
var/message_sent = FALSE
var/list/ore_buffer = list()
var/datum/material_container/materials
@@ -27,8 +28,6 @@
/obj/machinery/mineral/ore_redemption/Initialize()
. = ..()
var/obj/item/weapon/circuitboard/machine/ore_redemption/B = new
B.apply_default_parts(src)
materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY)
files = new /datum/research/smelter(src)
@@ -37,17 +36,6 @@
QDEL_NULL(files)
return ..()
/obj/item/weapon/circuitboard/machine/ore_redemption
name = "Ore Redemption (Machine Board)"
build_path = /obj/machinery/mineral/ore_redemption
origin_tech = "programming=1;engineering=2"
req_components = list(
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/device/assembly/igniter = 1)
/obj/machinery/mineral/ore_redemption/RefreshParts()
var/ore_pickup_rate_temp = 15
var/point_upgrade_temp = 1
code/modules/mining/machine_vending.dm
+4 -23
View File
@@ -7,6 +7,7 @@
icon_state = "mining"
density = TRUE
anchored = TRUE
circuit = /obj/item/weapon/circuitboard/machine/mining_equipment_vendor
var/obj/item/weapon/card/id/inserted_id
var/list/prize_list = list( //if you add something to this, please, for the love of god, use tabs and not spaces.
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
@@ -67,19 +68,6 @@
src.equipment_path = path
src.cost = cost
/obj/machinery/mineral/equipment_vendor/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/mining_equipment_vendor(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/mining_equipment_vendor
name = "Mining Equipment Vendor (Machine Board)"
build_path = /obj/machinery/mineral/equipment_vendor
origin_tech = "programming=1;engineering=3"
req_components = list(
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/matter_bin = 3)
/obj/machinery/mineral/equipment_vendor/power_change()
..()
update_icon()
@@ -207,9 +195,10 @@
/obj/machinery/mineral/equipment_vendor/golem
name = "golem ship equipment vendor"
circuit = /obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem
/obj/machinery/mineral/equipment_vendor/golem/New()
..()
/obj/machinery/mineral/equipment_vendor/golem/Initialize()
. = ..()
desc += "\nIt seems a few selections have been added."
prize_list += list(
new /datum/data/mining_equipment("Extra Id", /obj/item/weapon/card/id/mining, 250),
@@ -223,14 +212,6 @@
new /datum/data/mining_equipment("Royal Cape of the Liberator", /obj/item/weapon/bedsheet/rd/royal_cape, 500)
)
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem
name = "Golem Ship Equipment Vendor (Machine Board)"
build_path = /obj/machinery/mineral/equipment_vendor/golem
/**********************Mining Equipment Vendor Items**************************/
/**********************Mining Equipment Voucher**********************/
code/modules/mining/minebot.dm
+1 -1
View File
@@ -9,7 +9,7 @@
icon_state = "mining_drone"
icon_living = "mining_drone"
status_flags = CANSTUN|CANKNOCKDOWN|CANPUSH
mouse_opacity = 1
mouse_opacity = MOUSE_OPACITY_ICON
faction = list("neutral")
a_intent = INTENT_HARM
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
code/modules/mining/mint.dm
+3 -5
View File
@@ -15,18 +15,16 @@
speed_process = 1
/obj/machinery/mineral/mint/New()
..()
/obj/machinery/mineral/mint/Initialize()
. = ..()
materials = new /datum/material_container(src,
list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM),
max_amt = MINERAL_MATERIAL_AMOUNT*50)
/obj/machinery/mineral/mint/Destroy()
qdel(materials)
materials = null
QDEL_NULL(materials)
return ..()
/obj/machinery/mineral/mint/process()
var/turf/T = get_step(src, input_dir)
if(!T)
code/modules/mob/camera/camera.dm
+1 -1
View File
@@ -5,7 +5,7 @@
density = FALSE
anchored = TRUE
status_flags = GODMODE // You can't damage it.
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
see_in_dark = 7
invisibility = INVISIBILITY_ABSTRACT // No one can see us
sight = SEE_SELF
code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm
+5 -6
View File
@@ -122,7 +122,7 @@
/datum/sprite_accessory/tails/human/shark
name = "Shark"
icon_state = "shark"
color_src = 0
color_src = MUTCOLORS
icon = 'icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/shark/datashark
@@ -150,8 +150,7 @@
/datum/sprite_accessory/ears/wolf
name = "Wolf"
icon_state = "wolf"
hasinner = 1
icon = 'icons/mob/mam_bodyparts.dmi'
extra = 1
/datum/sprite_accessory/tails/human/wolf
name = "Wolf"
@@ -191,6 +190,7 @@
/datum/sprite_accessory/mam_tails_animated
icon = 'icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/mam_tails_animated/none
name = "None"
@@ -326,7 +326,6 @@
/datum/sprite_accessory/mam_ears/husky
name = "Husky"
icon_state = "wolf"
hasinner = 1
icon = 'icons/mob/mam_bodyparts.dmi'
extra = 1
@@ -390,7 +389,7 @@
/datum/sprite_accessory/mam_tails/shark
name = "Shark"
icon_state = "shark"
color_src = 0
color_src = MUTCOLORS
/datum/sprite_accessory/mam_tails_animated/shark
name = "Shark"
@@ -436,7 +435,7 @@
/datum/sprite_accessory/mam_ears/wolf
name = "Wolf"
icon_state = "wolf"
hasinner = 1
extra = 1
/datum/sprite_accessory/mam_tails/wolf
name = "Wolf"
code/modules/mob/living/brain/posibrain.dm
+1 -1
View File
@@ -37,7 +37,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
/obj/item/device/mmi/posibrain/proc/ping_ghosts(msg, newlymade)
if(newlymade || GLOB.posibrain_notify_cooldown <= world.time)
notify_ghosts("[name] [msg] in [get_area(src)]!", ghost_sound = !newlymade ? 'sound/effects/ghost2.ogg':null, enter_link = "<a href=?src=\ref[src];activate=1>(Click to enter)</a>", source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
notify_ghosts("[name] [msg] in [get_area(src)]!", ghost_sound = !newlymade ? 'sound/misc/server-ready.ogg':null, enter_link = "<a href=?src=\ref[src];activate=1>(Click to enter)</a>", source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
if(!newlymade)
GLOB.posibrain_notify_cooldown = world.time + askDelay
code/modules/mob/living/carbon/carbon.dm
+1
View File
@@ -171,6 +171,7 @@
if(thrown_thing)
visible_message("<span class='danger'>[src] has thrown [thrown_thing].</span>")
add_logs(src, thrown_thing, "has thrown")
newtonian_move(get_dir(target, src))
thrown_thing.throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src)
code/modules/mob/living/carbon/carbon_defines.dm
+3 -1
View File
@@ -11,6 +11,8 @@
var/obj/item/handcuffed = null //Whether or not the mob is handcuffed
var/obj/item/legcuffed = null //Same as handcuffs but for legs. Bear traps use this.
var/disgust = 0
//inventory slots
var/obj/item/back = null
var/obj/item/clothing/mask/wear_mask = null
@@ -47,4 +49,4 @@
var/list/hand_bodyparts = list() //a collection of arms (or actually whatever the fug /bodyparts you monsters use to wreck my systems)
var/icon_render_key = ""
var/static/list/limb_icon_cache = list()
var/static/list/limb_icon_cache = list()
code/modules/mob/living/carbon/human/examine.dm
+8
View File
@@ -225,6 +225,14 @@
else
msg += "[t_He] [t_is] quite chubby.\n"
switch(disgust)
if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
msg += "[t_He] looks a bit grossed out.\n"
if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
msg += "[t_He] looks really grossed out.\n"
if(DISGUST_LEVEL_DISGUSTED to INFINITY)
msg += "[t_He] looks disgusted.\n"
if(blood_volume < BLOOD_VOLUME_SAFE)
msg += "[t_He] [t_has] pale skin.\n"
code/modules/mob/living/carbon/human/species.dm
+19 -17
View File
@@ -10,9 +10,9 @@
/datum/species
var/id = null // if the game needs to manually check your race to do something not included in a proc here, it will use this
var/limbs_id = null //this is used if you want to use a different species limb sprites. Mainly used for angels as they look like humans.
var/name = null // this is the fluff name. these will be left generic (such as 'Lizardperson' for the lizard race) so servers can change them to whatever
var/id // if the game needs to manually check your race to do something not included in a proc here, it will use this
var/limbs_id //this is used if you want to use a different species limb sprites. Mainly used for angels as they look like humans.
var/name // this is the fluff name. these will be left generic (such as 'Lizardperson' for the lizard race) so servers can change them to whatever
var/roundstart = 0 // can this mob be chosen at roundstart? (assuming the config option is checked?)
var/default_color = "#FFF" // if alien colors are disabled, this is the color that will be used by that race
@@ -21,17 +21,21 @@
var/face_y_offset = 0
var/hair_y_offset = 0
var/hair_color = null // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color
var/hair_color // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color
var/hair_alpha = 255 // the alpha used by the hair. 255 is completely solid, 0 is transparent.
var/use_skintones = 0 // does it use skintones or not? (spoiler alert this is only used by humans)
var/exotic_blood = "" // If your race wants to bleed something other than bog standard blood, change this to reagent id.
var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc)
var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
var/skinned_type = null
var/skinned_type
var/liked_food = NONE
var/disliked_food = GROSS
var/toxic_food = TOXIC
var/list/no_equip = list() // slots the race can't equip stuff to
var/nojumpsuit = 0 // this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids
var/blacklisted = 0 //Flag to exclude from green slime core species.
var/dangerous_existence = null //A flag for transformation spells that tells them "hey if you turn a person into one of these without preperation, they'll probably die!"
var/dangerous_existence //A flag for transformation spells that tells them "hey if you turn a person into one of these without preperation, they'll probably die!"
var/say_mod = "says" // affects the speech message
var/list/default_features = list() // Default mutant bodyparts for this species. Don't forget to set one for every mutant bodypart you allow this species to have.
var/list/mutant_bodyparts = list() // Parts of the body that are diferent enough from the standard human model that they cause clipping with some equipment
@@ -67,23 +71,21 @@
var/obj/item/organ/eyes/mutanteyes = /obj/item/organ/eyes
var/obj/item/organ/ears/mutantears = /obj/item/organ/ears
var/obj/item/mutanthands
var/obj/item/organ/tongue/mutanttongue = /obj/item/organ/tongue
var/obj/item/organ/liver/mutantliver
var/obj/item/organ/stomach/mutantstomach
//Hands
var/obj/item/mutanthands = null
//Citadel snowflake
var/fixed_mut_color2 = ""
var/fixed_mut_color3 = ""
var/whitelisted = 0 //Is this species restricted to certain players?
var/whitelist = list() //List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both.
///////////
// PROCS //
///////////
///////////
// PROCS //
///////////
/datum/species/New()
@@ -411,6 +413,7 @@
standing += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER)
else
standing += mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER)
if(H.socks && H.get_num_legs() >= 2 && !(DIGITIGRADE in species_traits))
var/datum/sprite_accessory/socks/socks = GLOB.socks_list[H.socks]
if(socks)
@@ -1321,7 +1324,6 @@
target.apply_effect(40, KNOCKDOWN, target.run_armor_check(affecting, "melee", "Your armor prevents your fall!", "Your armor softens your fall!"))
target.forcesay(GLOB.hit_appends)
add_logs(user, target, "disarmed", " pushing them to the ground")
return
if(randn <= 60)
@@ -1329,7 +1331,6 @@
if(target.pulling)
to_chat(target, "<span class='warning'>[user] has broken [target]'s grip on [target.pulling]!</span>")
target.stop_pulling()
else
I = target.get_active_held_item()
if(target.drop_item())
@@ -1587,6 +1588,7 @@
else
H.throw_alert("temp", /obj/screen/alert/cold, 3)
H.apply_damage(COLD_DAMAGE_LEVEL_3*coldmod, BURN)
else
H.clear_alert("temp")
@@ -1695,9 +1697,9 @@
return
////////
////////////
//Stun//
////////
////////////
/datum/species/proc/spec_stun(mob/living/carbon/human/H,amount)
. = stunmod * amount
code/modules/mob/living/carbon/human/species_types/flypeople.dm
+2
View File
@@ -6,6 +6,8 @@
mutantliver = /obj/item/organ/liver/fly
mutantstomach = /obj/item/organ/stomach/fly
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly
disliked_food = null
liked_food = GROSS
/datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
if(chem.id == "pestkiller")
code/modules/mob/living/carbon/human/species_types/humans.dm
+25 -23
View File
@@ -1,25 +1,27 @@
/datum/species/human
name = "Human"
id = "human"
default_color = "FFFFFF"
species_traits = list(MUTCOLORS_PARTSONLY,EYECOLOR,HAIR,FACEHAIR,LIPS)
mutant_bodyparts = list("tail_human", "ears", "taur")
default_features = list("tail_human" = "None", "ears" = "None", "taur" = "none")
use_skintones = 1
skinned_type = /obj/item/stack/sheet/animalhide/human
/datum/species/human/qualifies_for_rank(rank, list/features)
return TRUE
//Curiosity killed the cat's wagging tail.
/datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
/datum/species/human/space_move(mob/living/carbon/human/H)
var/obj/item/device/flightpack/F = H.get_flightpack()
if(istype(F) && (F.flight) && F.allow_thrust(0.01, src))
/datum/species/human
name = "Human"
id = "human"
default_color = "FFFFFF"
species_traits = list(MUTCOLORS_PARTSONLY,EYECOLOR,HAIR,FACEHAIR,LIPS)
mutant_bodyparts = list("tail_human", "ears", "taur")
default_features = list("tail_human" = "None", "ears" = "None", "taur" = "none")
use_skintones = 1
skinned_type = /obj/item/stack/sheet/animalhide/human
disliked_food = GROSS | RAW
liked_food = JUNKFOOD | FRIED
/datum/species/human/qualifies_for_rank(rank, list/features)
return TRUE
//Curiosity killed the cat's wagging tail.
/datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
/datum/species/human/space_move(mob/living/carbon/human/H)
var/obj/item/device/flightpack/F = H.get_flightpack()
if(istype(F) && (F.flight) && F.allow_thrust(0.01, src))
return TRUE
datum/species/human/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
@@ -28,4 +30,4 @@ datum/species/human/on_species_gain(mob/living/carbon/human/H, datum/species/old
if(H.dna.features["tail_human"] == "Cat")
var/tail = /obj/item/organ/tail/cat
mutant_organs += tail
..()
..()
code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+3 -1
View File
@@ -9,6 +9,8 @@
exotic_blood = "slimejelly"
damage_overlay_type = ""
var/datum/action/innate/regenerate_limbs/regenerate_limbs
toxic_food = MEAT | DAIRY
liked_food = TOXIC
/datum/species/jelly/on_species_loss(mob/living/carbon/C)
if(regenerate_limbs)
@@ -324,4 +326,4 @@
M.transfer_to(dupe)
dupe.visible_message("<span class='notice'>[dupe] blinks and looks \
around.</span>",
"<span class='notice'>...and move this one instead.</span>")
"<span class='notice'>...and move this one instead.</span>")
code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+2
View File
@@ -16,6 +16,8 @@
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
skinned_type = /obj/item/stack/sheet/animalhide/lizard
exotic_bloodtype = "L"
disliked_food = GRAIN | DAIRY
liked_food = GROSS | MEAT
/datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H)
H.grant_language(/datum/language/draconic)

Some files were not shown because too many files have changed in this diff Show More