Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit642
This commit is contained in:
Ghommie
@@ -24,6 +24,7 @@
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 30, "acid" = 30)
|
||||
resistance_flags = FIRE_PROOF | ACID_PROOF
|
||||
mutantrace_variation = STYLE_MUZZLE
|
||||
var/voice_unknown = TRUE ///This makes it so that your name shows up as unknown when wearing the mask.
|
||||
|
||||
/obj/item/clothing/mask/luchador
|
||||
|
||||
@@ -189,12 +189,11 @@
|
||||
GLOBAL_VAR_INIT(frying_hardmode, TRUE)
|
||||
GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE)
|
||||
GLOBAL_LIST_INIT(frying_bad_chems, list(
|
||||
/datum/reagent/toxin/bad_food = 10,
|
||||
/datum/reagent/clf3 = 2,
|
||||
/datum/reagent/toxin/bad_food = 3,
|
||||
/datum/reagent/drug/aranesp = 2,
|
||||
/datum/reagent/blackpowder = 10,
|
||||
/datum/reagent/phlogiston = 3,
|
||||
/datum/reagent/toxin/cyanide = 3,
|
||||
/datum/reagent/toxin = 2,
|
||||
/datum/reagent/lithium = 2,
|
||||
/datum/reagent/mercury = 2,
|
||||
))
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried)
|
||||
@@ -227,8 +226,10 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
|
||||
var/bad_chem = GLOB.frying_bad_chems[R]
|
||||
var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem]
|
||||
if(GLOB.frying_bad_chem_add_volume)
|
||||
reagents.maximum_volume += bad_chem_amount
|
||||
reagents.maximum_volume += bad_chem_amount + 2 //Added room for condensed cooking oil
|
||||
reagents.add_reagent(bad_chem, bad_chem_amount)
|
||||
//All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage
|
||||
reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
|
||||
if(trash)
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
suit = /obj/item/clothing/suit/toggle/chef
|
||||
head = /obj/item/clothing/head/chefhat
|
||||
mask = /obj/item/clothing/mask/fakemoustache/italian
|
||||
backpack_contents = list(/obj/item/sharpener = 1)
|
||||
backpack_contents = list(/obj/item/sharpener = 1, /obj/item/choice_beacon/ingredients = 1)
|
||||
|
||||
/datum/outfit/job/cook/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
|
||||
..()
|
||||
@@ -43,10 +43,6 @@
|
||||
..()
|
||||
if(visualsOnly)
|
||||
return
|
||||
var/list/possible_boxes = subtypesof(/obj/item/storage/box/ingredients)
|
||||
var/chosen_box = pick(possible_boxes)
|
||||
var/obj/item/storage/box/I = new chosen_box(src)
|
||||
H.equip_to_slot_or_del(I,SLOT_IN_BACKPACK)
|
||||
var/datum/martial_art/cqc/under_siege/justacook = new
|
||||
justacook.teach(H)
|
||||
|
||||
|
||||
@@ -702,8 +702,8 @@
|
||||
|
||||
/mob/living/do_resist_grab(moving_resist, forced, silent = FALSE)
|
||||
. = ..()
|
||||
if(pulledby.grab_state)
|
||||
if(CHECK_MOBILITY(src, MOBILITY_STAND) && prob(30/pulledby.grab_state))
|
||||
if(pulledby.grab_state > GRAB_PASSIVE)
|
||||
if(CHECK_MOBILITY(src, MOBILITY_RESIST) && prob(30/pulledby.grab_state))
|
||||
visible_message("<span class='danger'>[src] has broken free of [pulledby]'s grip!</span>")
|
||||
pulledby.stop_pulling()
|
||||
return TRUE
|
||||
|
||||
@@ -495,6 +495,24 @@
|
||||
toxpwr = 0.5
|
||||
taste_description = "bad cooking"
|
||||
|
||||
/datum/reagent/toxin/condensed_cooking_oil
|
||||
name = "Condensed Cooking Oil"
|
||||
description = "Taste the consequences of your mistakes."
|
||||
reagent_state = LIQUID
|
||||
color = "#d6d6d8"
|
||||
metabolization_rate = 0.25 * REAGENTS_METABOLISM
|
||||
toxpwr = 0
|
||||
taste_mult = -2
|
||||
taste_description = "awful cooking"
|
||||
|
||||
/datum/reagent/toxin/condensed_cooking_oil/on_mob_life(mob/living/carbon/M)
|
||||
if(prob(15))
|
||||
M.vomit()
|
||||
else
|
||||
if(prob(40))
|
||||
M.adjustOrganLoss(ORGAN_SLOT_HEART, 0.5) //For reference, bungotoxin does 3
|
||||
..()
|
||||
|
||||
/datum/reagent/toxin/itching_powder
|
||||
name = "Itching Powder"
|
||||
description = "A powder that induces itching upon contact with the skin. Causes the victim to scratch at their itches and has a very low chance to decay into Histamine."
|
||||
|
||||
@@ -388,3 +388,67 @@
|
||||
|
||||
/obj/item/reagent_containers/glass/get_belt_overlay()
|
||||
return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle")
|
||||
|
||||
//Mortar & Pestle
|
||||
|
||||
/obj/item/pestle
|
||||
name = "pestle"
|
||||
desc = "An ancient, simple tool used in conjunction with a mortar to grind or juice items."
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "pestle"
|
||||
force = 4
|
||||
|
||||
/obj/item/reagent_containers/glass/mortar
|
||||
name = "mortar"
|
||||
desc = "A specially formed bowl of ancient design. It is possible to crush or juice items placed in it using a pestle; however the process, unlike modern methods, is slow and physically exhausting. Alt click to eject the item."
|
||||
icon_state = "mortar"
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
|
||||
item_flags = NO_MAT_REDEMPTION
|
||||
reagent_flags = OPENCONTAINER
|
||||
spillable = TRUE
|
||||
var/obj/item/grinded
|
||||
|
||||
/obj/item/reagent_containers/glass/mortar/AltClick(mob/user)
|
||||
. = ..()
|
||||
if(grinded)
|
||||
grinded.forceMove(drop_location())
|
||||
grinded = null
|
||||
to_chat(user, "<span class='notice'>You eject the item inside.</span>")
|
||||
return TRUE
|
||||
|
||||
/obj/item/reagent_containers/glass/mortar/attackby(obj/item/I, mob/living/carbon/human/user)
|
||||
..()
|
||||
if(istype(I,/obj/item/pestle))
|
||||
if(grinded)
|
||||
if(IS_STAMCRIT(user))
|
||||
to_chat(user, "<span class='warning'>You are too tired to work!</span>")
|
||||
return
|
||||
to_chat(user, "<span class='notice'>You start grinding...</span>")
|
||||
if((do_after(user, 25, target = src)) && grinded)
|
||||
user.adjustStaminaLoss(20)
|
||||
if(grinded.juice_results) //prioritize juicing
|
||||
grinded.on_juice()
|
||||
reagents.add_reagent_list(grinded.juice_results)
|
||||
to_chat(user, "<span class='notice'>You juice [grinded] into a fine liquid.</span>")
|
||||
QDEL_NULL(grinded)
|
||||
return
|
||||
grinded.on_grind()
|
||||
reagents.add_reagent_list(grinded.grind_results)
|
||||
if(grinded.reagents) //food and pills
|
||||
grinded.reagents.trans_to(src, grinded.reagents.total_volume)
|
||||
to_chat(user, "<span class='notice'>You break [grinded] into powder.</span>")
|
||||
QDEL_NULL(grinded)
|
||||
return
|
||||
return
|
||||
else
|
||||
to_chat(user, "<span class='warning'>There is nothing to grind!</span>")
|
||||
return
|
||||
if(grinded)
|
||||
to_chat(user, "<span class='warning'>There is something inside already!</span>")
|
||||
return
|
||||
if(I.juice_results || I.grind_results)
|
||||
I.forceMove(src)
|
||||
grinded = I
|
||||
return
|
||||
to_chat(user, "<span class='warning'>You can't grind this!</span>")
|
||||
|
||||
Reference in New Issue
Block a user