cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kitchen Resprites (#17311)

Browse Source 
* Kitchen Resprites

* for ata

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* admiral ackbar cereal

* walter j hartwell

* for real?

* hank schrader

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Wowzewow (Wezzy)
2023-09-19 09:58:22 +00:00
committed by GitHub
co-authored by Fluffy
parent 8d17f98dca
commit 1b51600ca6
31 changed files with 208 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/kitchen.dm
+23 -13
View File
@@ -1,9 +1,6 @@
/obj/item/material/kitchen
icon = 'icons/obj/kitchen.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_kitchen.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_kitchen.dmi',
)
contained_sprite = TRUE
/*
* Utensils
@@ -25,6 +22,8 @@
var/scoop_food = 1
var/transfer_amt = 1
var/list/bite_sizes = list(1,2,3,4,5)
use_material_name = FALSE
applies_material_colour = FALSE
/obj/item/material/kitchen/utensil/Initialize(newloc, material_key)
. = ..()
@@ -98,7 +97,10 @@
sharp = TRUE
/obj/item/material/kitchen/utensil/fork/plastic
icon_state = "plastic_fork"
default_material = MATERIAL_PLASTIC
use_material_name = TRUE
applies_material_colour = TRUE
/obj/item/material/kitchen/utensil/spork
name = "spork"
@@ -106,21 +108,21 @@
icon_state = "spork"
/obj/item/material/kitchen/utensil/spork/plastic
icon_state = "plastic_spork"
default_material = MATERIAL_PLASTIC
use_material_name = TRUE
applies_material_colour = TRUE
/obj/item/material/kitchen/utensil/fork/chopsticks
name = "chopsticks"
desc = "A pair of chopsticks. The most challenging utensil in the Spur."
desc = "A pair of chopsticks. An extension of one's fingers, one might say."
icon_state = "chopsticks"
default_material = MATERIAL_WOOD
transfer_amt = 2 //Chopsticks are hard to grab stuff with
bite_sizes = list(1,2)
/obj/item/material/kitchen/utensil/fork/chopsticks/cheap
name = "cheap chopsticks"
desc = "A pair of cheap, disposable chopsticks."
use_material_name = 0
applies_material_colour = 0
/obj/item/material/kitchen/utensil/fork/chopsticks/bamboo
icon_state = "plastic_chopsticks"
default_material = MATERIAL_BAMBOO
use_material_name = TRUE
applies_material_colour = TRUE
/obj/item/material/kitchen/utensil/spoon
name = "spoon"
@@ -130,7 +132,10 @@
force_divisor = 0.1 //2 when wielded with weight 20 (steel)
/obj/item/material/kitchen/utensil/spoon/plastic
icon_state = "plastic_spoon"
default_material = MATERIAL_PLASTIC
use_material_name = TRUE
applies_material_colour = TRUE
/*
* Knives
@@ -163,7 +168,10 @@
return ..()
/obj/item/material/kitchen/utensil/knife/plastic
icon_state = "plastic_knife"
default_material = MATERIAL_PLASTIC
use_material_name = TRUE
applies_material_colour = TRUE
/*
* Rolling Pins
@@ -177,6 +185,8 @@
default_material = "wood"
force_divisor = 0.7 // 10 when wielded with weight 15 (wood)
thrown_force_divisor = 1 // as above
use_material_name = TRUE
applies_material_colour = TRUE
/obj/item/material/kitchen/rollingpin/attack(mob/living/M, mob/living/user, var/target_zone)
if ((user.is_clumsy()) && prob(50))
code/game/objects/items/weapons/material/knives.dm
+1 -4
View File
@@ -4,10 +4,7 @@
/obj/item/material/knife
name = "kitchen knife"
icon = 'icons/obj/kitchen.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_kitchen.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_kitchen.dmi',
)
contained_sprite = TRUE
icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
flags = CONDUCT
code/game/objects/items/weapons/material/misc.dm
+2 -8
View File
@@ -53,10 +53,7 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "butch"
item_state = "butch"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_kitchen.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_kitchen.dmi',
)
contained_sprite = TRUE
desc = "A huge thing used for chopping and chopping up meat."
force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
slot_flags = SLOT_BELT
@@ -133,10 +130,7 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "hook_knife"
item_state = "hook_knife"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_kitchen.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_kitchen.dmi',
)
contained_sprite = TRUE
sharp = 1
edge = TRUE
force_divisor = 0.25