mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Kitchen Resprites (#17311)
* 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)
co-authored by
Fluffy
Fluffy
parent
8d17f98dca
commit
1b51600ca6
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -16,30 +16,31 @@
|
||||
if(!istype(G, /obj/item/grab) || !G.affecting)
|
||||
return
|
||||
if(occupied)
|
||||
to_chat(user, "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>")
|
||||
to_chat(user, SPAN_DANGER("The spike already has something on it, finish collecting its meat first!"))
|
||||
else
|
||||
if(spike(G.affecting))
|
||||
visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>")
|
||||
visible_message(SPAN_DANGER("[user] has forced [G.affecting] onto the spike, killing them instantly!"))
|
||||
qdel(G.affecting)
|
||||
qdel(G)
|
||||
else
|
||||
to_chat(user, "<span class='danger'>They are too big for the spike, try something smaller!</span>")
|
||||
to_chat(user, SPAN_DANGER("They are too big for the spike, try something smaller!"))
|
||||
|
||||
/obj/structure/kitchenspike/proc/spike(var/mob/living/victim)
|
||||
|
||||
if(!istype(victim))
|
||||
return
|
||||
|
||||
cut_overlays()
|
||||
if(istype(victim, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = victim
|
||||
if(!issmall(H))
|
||||
return 0
|
||||
meat_type = H.species.meat_type
|
||||
icon_state = "spikebloody"
|
||||
add_overlay(overlay_image(icon, "spikebloody"))
|
||||
else if(istype(victim, /mob/living/carbon/alien))
|
||||
var/mob/living/carbon/alien/A = victim
|
||||
meat_type = A.meat_type
|
||||
icon_state = "spikebloodygreen"
|
||||
add_overlay(overlay_image(icon, "spikebloodygreen"))
|
||||
else
|
||||
return 0
|
||||
|
||||
@@ -60,7 +61,6 @@
|
||||
icon_state = "spike"
|
||||
occupied = 0
|
||||
|
||||
|
||||
/obj/structure/kitchenspike/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
|
||||
if (!mover)
|
||||
return 1
|
||||
@@ -74,4 +74,4 @@
|
||||
else if(mover.checkpass(PASSTABLE))
|
||||
//Animals can run under them, lots of empty space
|
||||
return 1
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user