From 3e30c9409b825ef5c627c83631f4489e13cbc031 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:11:26 -0700
Subject: [PATCH 001/101] riot staves
---
code/__DEFINES/movespeed_modification.dm | 4 +-
code/__DEFINES/status_effects.dm | 3 +
code/datums/status_effects/debuffs.dm | 13 +
code/game/machinery/recharger.dm | 3 +-
code/game/objects/items/twohanded.dm | 237 ++++++++++++++++++
.../crates_lockers/closets/secure/security.dm | 3 +
icons/mob/inhands/weapons/estaff_lefthand.dmi | Bin 0 -> 9301 bytes
.../mob/inhands/weapons/estaff_righthand.dmi | Bin 0 -> 9435 bytes
icons/obj/estaff.dmi | Bin 0 -> 1580 bytes
sound/weapons/staff.ogg | Bin 0 -> 20026 bytes
10 files changed, 261 insertions(+), 2 deletions(-)
create mode 100644 icons/mob/inhands/weapons/estaff_lefthand.dmi
create mode 100644 icons/mob/inhands/weapons/estaff_righthand.dmi
create mode 100644 icons/obj/estaff.dmi
create mode 100644 sound/weapons/staff.ogg
diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm
index 1883df6e8e..2db40cc988 100644
--- a/code/__DEFINES/movespeed_modification.dm
+++ b/code/__DEFINES/movespeed_modification.dm
@@ -68,4 +68,6 @@
#define MOVESPEED_ID_SHOVE "SHOVE"
-#define MOVESPEED_ID_MKULTRA "MKULTRA"
\ No newline at end of file
+#define MOVESPEED_ID_MKULTRA "MKULTRA"
+
+#define MOVESPEED_ID_ELECTROSTAFF "ELECTROSTAFF"
diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
index 6d52f4640c..859e361250 100644
--- a/code/__DEFINES/status_effects.dm
+++ b/code/__DEFINES/status_effects.dm
@@ -88,6 +88,9 @@
#define STATUS_EFFECT_NO_COMBAT_MODE /datum/status_effect/no_combat_mode //Wont allow combat mode and will disable it
#define STATUS_EFFECT_MESMERIZE /datum/status_effect/no_combat_mode/mesmerize //Just reskinned no_combat_mode
+
+#define STATUS_EFFECT_ELECTROSTAFF /datum/status_effect/electrostaff //slows down victim
+
/////////////
// NEUTRAL //
/////////////
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 2e46046a7e..335bdfac6e 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -587,6 +587,19 @@
icon_state = "ichorial_stain"
alerttooltipstyle = "clockcult"
+/datum/status_effect/electrostaff
+ id = "electrostaff"
+ alert_type = null
+ status_type = STATUS_EFFECT_REPLACE
+
+/datum/status_effect/electrostaff/on_creation(mob/living/new_owner, set_duration)
+ if(isnum(set_duration))
+ duration = set_duration
+ . = ..()
+ owner.add_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF, multiplicative_slowdown = 1, movetypes = GROUND, blacklisted_movetypes = CRAWLING)
+
+/datum/status_effect/electrostaff/on_remove()
+ owner.remove_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF)
//GOLEM GANG
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index f777c893f8..29116b5a7c 100755
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -17,7 +17,8 @@
/obj/item/ammo_box/magazine/recharge,
/obj/item/modular_computer,
/obj/item/gun/ballistic/automatic/magrifle_e,
- /obj/item/gun/ballistic/automatic/pistol/mag_e))
+ /obj/item/gun/ballistic/automatic/pistol/mag_e,
+ /obj/item/twohanded/required/electrostaff))
/obj/machinery/recharger/RefreshParts()
for(var/obj/item/stock_parts/capacitor/C in component_parts)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 28a6fd66ee..44fe9e3a0e 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1017,3 +1017,240 @@
C.change_view(CONFIG_GET(string/default_view))
user.client.pixel_x = 0
user.client.pixel_y = 0
+
+/obj/item/twohanded/required/electrostaff
+ icon = 'icons/obj/estaff.dmi'
+ icon_state = "electrostaff_3"
+ item_state = "electrostaff_3"
+ lefthand_file = 'icons/mob/inhands/weapons/estaff_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/estaff_righthand.dmi'
+ name = "riot suppression electrostaff"
+ desc = "A large quarterstaff, with massive silver electrodes mounted at the end."
+ force = 10
+ damtype = BRUTE
+ w_class = WEIGHT_CLASS_GIGANTIC
+ slot_flags = ITEM_SLOT_BACK
+ sharpness = FALSE
+ force_unwielded = 0
+ force_wielded = 10
+ throwforce = 1
+ throw_speed = 1
+ block_chance = 50
+ materials = list(MAT_METAL=1000)
+ hitsound = 'sound/weapons/staff.ogg'
+ attack_verb = list("suppresed", "struck", "beaten", "thwacked", "pulped", "shocked")
+ total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors.
+ var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
+ var/lethal_cost = 400 //10000/333*15 = 450. decent enough?? kinda?
+ var/lethal_damage = 15
+ var/lethal_stam_cost = 3.5
+ var/stun_cost = 333 //10000/500*25 = 500. stunbatons are at time of writing 10000/1000*49 = 490. This doesn't stun as fast but has block. Also, this does..
+ var/stun_status_effect = STATUS_EFFECT_ELECTROSTAFF //a small slowdown effect
+ var/stun_stamdmg = 25
+ var/stun_status_duration = 25
+ var/stun_stam_cost = 3.5
+
+/obj/item/twohanded/required/electrostaff/Initialize(mapload)
+ . = ..()
+ if(ispath(cell))
+ cell = new cell
+
+/obj/item/twohanded/required/electrostaff/get_cell()
+ . = cell
+ if(iscyborg(loc))
+ var/mob/living/silicon/robot/R = loc
+ . = R.get_cell()
+
+/obj/item/twohanded/required/electrostaff/proc/min_hitcost()
+ return min(stun_cost, lethal_cost)
+
+/obj/item/twohanded/required/electrostaff/proc/turn_on(mob/user, silent = FALSE)
+ if(on)
+ return
+ if(!cell)
+ if(user)
+ to_chat(user, "[src] has no cell.")
+ return
+ if(cell.charge < min_hitcost())
+ if(user)
+ to_chat(user, "[src] is out of charge.")
+ return
+ on = TRUE
+ START_PROCESSING(SSobj, src)
+ if(user)
+ to_chat(user, "You turn [src] on.")
+ update_icon()
+ if(!silent)
+ playsound(src, "sparks", 75, 1, -1)
+
+/obj/item/twohanded/required/electrostaff/proc/turn_off(mob/user, silent = FALSE)
+ if(!on)
+ return
+ if(user)
+ to_chat(user, "You turn [src] off.")
+ on = FALSE
+ STOP_PROCESSING(SSobj, src)
+ update_icon()
+ if(!silent)
+ playsound(src, "sparks", 75, 1, -1)
+
+/obj/item/twohanded/required/electrostaff/proc/toggle(mob/user, silent = FALSE)
+ if(on)
+ turn_off(user, silent)
+ else
+ turn_on(user, silent)
+
+/obj/item/twohanded/required/electrostaff/attack_self(mob/user)
+ . = ..()
+ if(.)
+ return
+ toggle(user)
+ add_fingerprint(user)
+
+/obj/item/twohanded/required/electrostaff/update_icon()
+ . = ..()
+ var/final = on? "electrostaff_1" : "electrostaff_3"
+ icon_state = final
+ item_state = final
+ set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
+
+/obj/item/twohanded/required/electrostaff/examine(mob/living/user)
+ . = ..()
+ if(cell)
+ . += "The cell charge is [round(cell.percent())]%."
+ else
+ . += "There is no cell installed!"
+
+/obj/item/twohanded/required/electrostaff/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/stock_parts/cell))
+ var/obj/item/stock_parts/cell/C = W
+ if(cell)
+ to_chat(user, "[src] already has a cell!")
+ else
+ if(C.maxcharge < hitcost)
+ to_chat(user, "[src] requires a higher capacity cell.")
+ return
+ if(!user.transferItemToLoc(W, src))
+ return
+ cell = C
+ to_chat(user, "You install a cell in [src].")
+
+ else if(W.tool_behaviour == TOOL_SCREWDRIVER)
+ if(cell)
+ cell.update_icon()
+ cell.forceMove(get_turf(src))
+ cell= null
+ to_chat(user, "You remove the cell from [src].")
+ depower(user)
+ else
+ return ..()
+
+/obj/item/melee/twohanded/required/electrostaff/process()
+ deductcharge(50) //Wasteful!
+
+/obj/item/melee/twohanded/required/electrostaff/proc/deductcharge(amount)
+ var/obj/item/stock_parts/cell/C = get_cell()
+ if(!C)
+ turn_off()
+ return FALSE
+ C.use(min(amount, C.charge))
+ if(QDELETED(src))
+ return FALSE
+ if(C.charge < min_hit_cost())
+ turn_off()
+
+/obj/item/twohanded/required/electrostaff/attack(mob/living/target, mob/living/user)
+ if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes it impossible to baton in stamina softcrit
+ to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto
+ return //CIT CHANGE - ditto
+ if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
+ if(on)
+ clowning_around(user) //ouch!
+ return
+ else
+ return ..(user, user) //beat yourself
+ if(iscyborg(target))
+ ..()
+ return
+ if(target.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
+ playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
+ return FALSE
+ if(user.a_intent != INTENT_HARM)
+ if(stun_act(target, user))
+ user.do_attack_animation(M)
+ user.adjustStaminaLossBuffered(stun_stam_cost)
+ return
+ else if(!harm_act(target, user))
+ return ..() //if you can't fry them just beat them with it
+ else //we did harm act them
+ user.do_attack_animation(M)
+ user.adjustStaminaLossBuffered(harm_stam_cost)
+
+/obj/item/twohanded/required/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
+ var/stunforce = stun_stamdmg
+ if(!no_charge_and_force)
+ if(!on)
+ target.visible_message("[user] has bapped [target] with [src]. Luckily it was off.", \
+ "[user] has bapped you with [src]. Luckily it was off")
+ turn_off() //if it wasn't already off
+ return FALSE
+ var/obj/item/stock_parts/cell/C = get_cell()
+ var/chargeleft = C.charge
+ deductcharge(stun_cost)
+ if(QDELETED(src) || QDELETED(C)) //boom
+ return FALSE
+ if(chargeleft < stun_cost)
+ stunforce *= round(chargeleft/stun_cost, 0.1)
+ target.adjustStaminaLoss(stunforce)
+ target.apply_effect(EFFECT_STUTTER, stunforce)
+ SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
+ if(user)
+ target.lastattacker = user.real_name
+ target.lastattackerckey = user.ckey
+ target.visible_message("[user] has shocked [user] with [src]!", \
+ "[user] has shocked you with [src]!")
+ log_combat(user, user, "stunned with an electrostaff")
+ playsound(src, 'sound/weapons/staff.ogg', 50, 1, -1)
+ target.apply_status_effect(stun_status_effect, stun_status_duration)
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ H.forcesay(GLOB.hit_appends)
+ return TRUE
+
+/obj/item/twohanded/required/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
+ var/lethal_force = lethal_damage
+ if(!no_charge_and_force)
+ if(!on)
+ return FALSE //standard item attack
+ var/obj/item/stock_parts/cell/C = get_cell()
+ var/chargeleft = C.charge
+ deductcharge(lethal_cost)
+ if(QDELETED(src) || QDELETED(C)) //boom
+ return FALSE
+ if(chargeleft < stun_cost)
+ lethal_force *= round(chargeleft/lethal_cost, 0.1)
+ target.adjustBurnLoss(lethal_force) //good against ointment spam
+ SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
+ if(user)
+ target.lastattacker = user.real_name
+ target.lastattackerckey = user.ckey
+ target.visible_message("[user] has seared [user] with [src]!", \
+ "[user] has seared you with [src]!")
+ log_combat(user, user, "burned with an electrostaff")
+ playsound(src, 'sound/weapons/sear.ogg', 50, 1, -1)
+ return TRUE
+
+/obj/item/twohanded/required/electrostaff/proc/clowning_around(mob/living/user)
+ user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \
+ "You accidentally hit yourself with [src]!")
+ SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
+ lethal_act(user, user, TRUE)
+ stun_act(user, user, TRUE)
+ deductcharge(lethal_cost)
+
+/obj/item/twohanded/required/electrostaff/emp_act(severity)
+ . = ..()
+ if (!(. & EMP_PROTECT_SELF))
+ turn_off()
+ if(!iscyborg(loc))
+ deductcharge(1000 / severity, TRUE, FALSE)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 1517b30d9c..43021f3528 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -282,12 +282,15 @@
new /obj/item/clothing/head/helmet/alt(src)
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/clothing/suit/armor/bulletproof(src)
+
/obj/structure/closet/secure_closet/lethalshots
name = "shotgun lethal rounds"
req_access = list(ACCESS_ARMORY)
icon_state = "tac"
/obj/structure/closet/secure_closet/lethalshots/PopulateContents()
..()
+ new /obj/item/twohanded/required/electrostaff(src)
+ new /obj/item/twohanded/required/electrostaff(src)
for(var/i in 1 to 3)
new /obj/item/storage/box/lethalshot(src)
diff --git a/icons/mob/inhands/weapons/estaff_lefthand.dmi b/icons/mob/inhands/weapons/estaff_lefthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..8b9ef642a40d3e1506089c8864f9ecac4327df53
GIT binary patch
literal 9301
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
PfnL5)mMwYq&hI|}&OVN2
literal 0
HcmV?d00001
diff --git a/icons/obj/estaff.dmi b/icons/obj/estaff.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..4c1a6788023ebac8b2cc67660efacc8325b2e2f0
GIT binary patch
literal 1580
zcmV+{2GjY8P)005u}0{{R3yb+fl0000mP)t-s|NsAQ
ze~;wn>aV-TMo@GA{{Y^$Js>ndP*r3wHAaq)m>?r9O~e0j^Z)+<0FVFxo&lW%00001
zbW%=J06^y0W&i*Hje1mAbVOxyV{&P5bZKvH004NLQ&w;!Mdb
zDh5gza&e{=CFZ7r*cL$1)SSdhkg%SS4jzodTtga}YeXY+jj@|+$fc~{>gNIuX8`T!
zVO6NsY7+ne1rbR^K~#90?VH_pq#zK4MTME!@bms}yGY3HO{$6`I+zo={b;&D2dx^M
zCf1Chcs!q%6(HNkUFk#Ow?58NzKw6pgXSmPQeH-IjF<7Pu{eAie?{>w_h5YM;yAaI
z=K}1;QGvOFm56b7%onjwbNMVTXhCuSFTE
zeuN9`7GpEV7ii`AkKxQfuvwoIfj&(SI{slC)~MoP+h#S~|Kr@b*$ID6`FFdyZ;QwN
z+$UH5-fr%j;;p6kzneK{`>z)~nYEP
zy?TClPk$d_COkCmUnGCw(7e#&=lO^3{fp&q;q3Xb_=fs$f;P_bi}{P|U;Q~)K;^K2
zMy~R+4&0w>0eco6WUVoc^#|(t5U-9XO%mdZ$
zjs9Q*hc&juvkEWk4<5qzpZ|+}Je58=|L*gDQSvCp&phe;@cxa0r`$vA-zjk(1)sQo
znfm_!NR9quBz*Mwzl|r%z1TmGsSg*R`19pgws{@&{V^<{a(smk^7mkZUf$&2B|N{+
z_yiZIj=w+uCG-=%0guc7{SsYc{^#-0{@?8n{%$_n|GWLcoA2f6{QMX82TSArT}+h6
z#NvxS>i@pj@AvQG$$a|sm#F_G^b6N-sgdK?D-+Br&aX81g9*KVCZ#|1_r?7DLfiR2
zyugO*pZKQlixo!`h?T<$D1YuC{TopUpF9!)I{19x%I}Y9{Q1DjX^pTke=Z5G;`@0@
zk^6Hg&1uy4$CXFJR$lYdzCSLvL{!g@80r0=X3l&6A1eD3@xRpmmu8a$@BhA-)hC`G
z>k?^w$Ly~xzlaytKQ1Qr)TjKpet$5o~yaH
literal 0
HcmV?d00001
diff --git a/sound/weapons/staff.ogg b/sound/weapons/staff.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..35b42dfd8d8636f933f3338295757a21d7dc4aa3
GIT binary patch
literal 20026
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
FG65_fXtMwS
literal 0
HcmV?d00001
From e9ec314cf6c30df58f5acbad5ec295d625f73870 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:15:12 -0700
Subject: [PATCH 002/101] yo this is a horrible idea
---
code/__DEFINES/movespeed_modification.dm | 2 +-
code/datums/status_effects/debuffs.dm | 2 +-
code/game/objects/items/twohanded.dm | 11 ++++++-----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm
index 2db40cc988..5d35da5382 100644
--- a/code/__DEFINES/movespeed_modification.dm
+++ b/code/__DEFINES/movespeed_modification.dm
@@ -70,4 +70,4 @@
#define MOVESPEED_ID_MKULTRA "MKULTRA"
-#define MOVESPEED_ID_ELECTROSTAFF "ELECTROSTAFF"
+#define MOVESPEED_ID_ELECTROSTAFF "ELECTROSTAFF"
\ No newline at end of file
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 335bdfac6e..864dd5893f 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -596,7 +596,7 @@
if(isnum(set_duration))
duration = set_duration
. = ..()
- owner.add_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF, multiplicative_slowdown = 1, movetypes = GROUND, blacklisted_movetypes = CRAWLING)
+ owner.add_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF, multiplicative_slowdown = 1, movetypes = GROUND)
/datum/status_effect/electrostaff/on_remove()
owner.remove_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 44fe9e3a0e..bba8bd4774 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1041,6 +1041,7 @@
attack_verb = list("suppresed", "struck", "beaten", "thwacked", "pulped", "shocked")
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors.
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
+ var/on = FALSE
var/lethal_cost = 400 //10000/333*15 = 450. decent enough?? kinda?
var/lethal_damage = 15
var/lethal_stam_cost = 3.5
@@ -1159,7 +1160,7 @@
if(C.charge < min_hit_cost())
turn_off()
-/obj/item/twohanded/required/electrostaff/attack(mob/living/target, mob/living/user)
+/obj/item/melee/twohanded/required/electrostaff/attack(mob/living/target, mob/living/user)
if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes it impossible to baton in stamina softcrit
to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto
return //CIT CHANGE - ditto
@@ -1186,7 +1187,7 @@
user.do_attack_animation(M)
user.adjustStaminaLossBuffered(harm_stam_cost)
-/obj/item/twohanded/required/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
+/obj/item/melee/twohanded/required/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
var/stunforce = stun_stamdmg
if(!no_charge_and_force)
if(!on)
@@ -1217,7 +1218,7 @@
H.forcesay(GLOB.hit_appends)
return TRUE
-/obj/item/twohanded/required/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
+/obj/item/melee/twohanded/required/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
var/lethal_force = lethal_damage
if(!no_charge_and_force)
if(!on)
@@ -1240,7 +1241,7 @@
playsound(src, 'sound/weapons/sear.ogg', 50, 1, -1)
return TRUE
-/obj/item/twohanded/required/electrostaff/proc/clowning_around(mob/living/user)
+/obj/item/melee/twohanded/required/electrostaff/proc/clowning_around(mob/living/user)
user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \
"You accidentally hit yourself with [src]!")
SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
@@ -1248,7 +1249,7 @@
stun_act(user, user, TRUE)
deductcharge(lethal_cost)
-/obj/item/twohanded/required/electrostaff/emp_act(severity)
+/obj/item/melee/twohanded/required/electrostaff/emp_act(severity)
. = ..()
if (!(. & EMP_PROTECT_SELF))
turn_off()
From 70beec5985343c90c723c5c25ffd91aeeb396dc5 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:30:41 -0700
Subject: [PATCH 003/101] woops
---
code/game/objects/items/twohanded.dm | 57 ++++++++++++++++++----------
1 file changed, 36 insertions(+), 21 deletions(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index bba8bd4774..afc25293bb 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -24,7 +24,7 @@
* Twohanded
*/
/obj/item/twohanded
- var/wielded = 0
+ var/wielded = FALSE
var/force_unwielded // default to null, the number force will be set to on unwield()
var/force_wielded // same as above but for wield()
var/wieldsound = null
@@ -1018,7 +1018,7 @@
user.client.pixel_x = 0
user.client.pixel_y = 0
-/obj/item/twohanded/required/electrostaff
+/obj/item/twohanded/electrostaff
icon = 'icons/obj/estaff.dmi'
icon_state = "electrostaff_3"
item_state = "electrostaff_3"
@@ -1031,7 +1031,7 @@
w_class = WEIGHT_CLASS_GIGANTIC
slot_flags = ITEM_SLOT_BACK
sharpness = FALSE
- force_unwielded = 0
+ force_unwielded = 5
force_wielded = 10
throwforce = 1
throw_speed = 1
@@ -1042,6 +1042,7 @@
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors.
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
var/on = FALSE
+ var/can_block_projectiles = FALSE //can't block guns
var/lethal_cost = 400 //10000/333*15 = 450. decent enough?? kinda?
var/lethal_damage = 15
var/lethal_stam_cost = 3.5
@@ -1051,21 +1052,30 @@
var/stun_status_duration = 25
var/stun_stam_cost = 3.5
-/obj/item/twohanded/required/electrostaff/Initialize(mapload)
+/obj/item/twohanded/electrostaff/Initialize(mapload)
. = ..()
if(ispath(cell))
cell = new cell
-/obj/item/twohanded/required/electrostaff/get_cell()
+/obj/item/twohanded/electrostaff/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/obj/item/twohanded/electrostaff/get_cell()
. = cell
if(iscyborg(loc))
var/mob/living/silicon/robot/R = loc
. = R.get_cell()
-/obj/item/twohanded/required/electrostaff/proc/min_hitcost()
+/obj/item/twohanded/electrostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if((attack_type == PROJECTILE_ATTACK) && !can_block_projectiles)
+ return FALSE
+ return ..()
+
+/obj/item/twohanded/electrostaff/proc/min_hitcost()
return min(stun_cost, lethal_cost)
-/obj/item/twohanded/required/electrostaff/proc/turn_on(mob/user, silent = FALSE)
+/obj/item/twohanded/electrostaff/proc/turn_on(mob/user, silent = FALSE)
if(on)
return
if(!cell)
@@ -1084,7 +1094,7 @@
if(!silent)
playsound(src, "sparks", 75, 1, -1)
-/obj/item/twohanded/required/electrostaff/proc/turn_off(mob/user, silent = FALSE)
+/obj/item/twohanded/electrostaff/proc/turn_off(mob/user, silent = FALSE)
if(!on)
return
if(user)
@@ -1095,34 +1105,39 @@
if(!silent)
playsound(src, "sparks", 75, 1, -1)
-/obj/item/twohanded/required/electrostaff/proc/toggle(mob/user, silent = FALSE)
+/obj/item/twohanded/electrostaff/proc/toggle(mob/user, silent = FALSE)
if(on)
turn_off(user, silent)
else
turn_on(user, silent)
-/obj/item/twohanded/required/electrostaff/attack_self(mob/user)
+/obj/item/twohanded/electrostaff/attack_self(mob/user)
+ var/oldwielded = wielded
. = ..()
if(.)
return
- toggle(user)
+ if(oldwielded != wielded)
+ if(wielded)
+ turn_on(user)
+ else
+ turn_off(user)
add_fingerprint(user)
-/obj/item/twohanded/required/electrostaff/update_icon()
+/obj/item/twohanded/electrostaff/update_icon()
. = ..()
var/final = on? "electrostaff_1" : "electrostaff_3"
icon_state = final
item_state = final
set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
-/obj/item/twohanded/required/electrostaff/examine(mob/living/user)
+/obj/item/twohanded/electrostaff/examine(mob/living/user)
. = ..()
if(cell)
. += "The cell charge is [round(cell.percent())]%."
else
. += "There is no cell installed!"
-/obj/item/twohanded/required/electrostaff/attackby(obj/item/W, mob/user, params)
+/obj/item/twohanded/electrostaff/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stock_parts/cell))
var/obj/item/stock_parts/cell/C = W
if(cell)
@@ -1146,10 +1161,10 @@
else
return ..()
-/obj/item/melee/twohanded/required/electrostaff/process()
+/obj/item/twohanded/electrostaff/process()
deductcharge(50) //Wasteful!
-/obj/item/melee/twohanded/required/electrostaff/proc/deductcharge(amount)
+/obj/item/twohanded/electrostaff/proc/deductcharge(amount)
var/obj/item/stock_parts/cell/C = get_cell()
if(!C)
turn_off()
@@ -1160,7 +1175,7 @@
if(C.charge < min_hit_cost())
turn_off()
-/obj/item/melee/twohanded/required/electrostaff/attack(mob/living/target, mob/living/user)
+/obj/item/twohanded/electrostaff/attack(mob/living/target, mob/living/user)
if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes it impossible to baton in stamina softcrit
to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto
return //CIT CHANGE - ditto
@@ -1187,7 +1202,7 @@
user.do_attack_animation(M)
user.adjustStaminaLossBuffered(harm_stam_cost)
-/obj/item/melee/twohanded/required/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
+/obj/item/twohanded/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
var/stunforce = stun_stamdmg
if(!no_charge_and_force)
if(!on)
@@ -1218,7 +1233,7 @@
H.forcesay(GLOB.hit_appends)
return TRUE
-/obj/item/melee/twohanded/required/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
+/obj/item/twohanded/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
var/lethal_force = lethal_damage
if(!no_charge_and_force)
if(!on)
@@ -1241,7 +1256,7 @@
playsound(src, 'sound/weapons/sear.ogg', 50, 1, -1)
return TRUE
-/obj/item/melee/twohanded/required/electrostaff/proc/clowning_around(mob/living/user)
+/obj/item/twohanded/electrostaff/proc/clowning_around(mob/living/user)
user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \
"You accidentally hit yourself with [src]!")
SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
@@ -1249,7 +1264,7 @@
stun_act(user, user, TRUE)
deductcharge(lethal_cost)
-/obj/item/melee/twohanded/required/electrostaff/emp_act(severity)
+/obj/item/twohanded/electrostaff/emp_act(severity)
. = ..()
if (!(. & EMP_PROTECT_SELF))
turn_off()
From 8556bcf2b34d19d75cd58ea80b9e898561a9aff7 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:36:10 -0700
Subject: [PATCH 004/101] compile
---
code/game/machinery/recharger.dm | 2 +-
code/game/objects/items/twohanded.dm | 15 +++++++++------
.../crates_lockers/closets/secure/security.dm | 4 ++--
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 29116b5a7c..20594a674d 100755
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -18,7 +18,7 @@
/obj/item/modular_computer,
/obj/item/gun/ballistic/automatic/magrifle_e,
/obj/item/gun/ballistic/automatic/pistol/mag_e,
- /obj/item/twohanded/required/electrostaff))
+ /obj/item/twohanded/electrostaff))
/obj/machinery/recharger/RefreshParts()
for(var/obj/item/stock_parts/capacitor/C in component_parts)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index afc25293bb..e04ec75345 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1155,15 +1155,18 @@
if(cell)
cell.update_icon()
cell.forceMove(get_turf(src))
- cell= null
+ cell = null
to_chat(user, "You remove the cell from [src].")
- depower(user)
+ turn_off(user, TRUE)
else
return ..()
/obj/item/twohanded/electrostaff/process()
deductcharge(50) //Wasteful!
+/obj/item/twohanded/electrostaff/proc/min_hit_cost()
+ return min(lethal_cost, stun_cost)
+
/obj/item/twohanded/electrostaff/proc/deductcharge(amount)
var/obj/item/stock_parts/cell/C = get_cell()
if(!C)
@@ -1193,14 +1196,14 @@
return FALSE
if(user.a_intent != INTENT_HARM)
if(stun_act(target, user))
- user.do_attack_animation(M)
+ user.do_attack_animation(target)
user.adjustStaminaLossBuffered(stun_stam_cost)
return
else if(!harm_act(target, user))
return ..() //if you can't fry them just beat them with it
else //we did harm act them
- user.do_attack_animation(M)
- user.adjustStaminaLossBuffered(harm_stam_cost)
+ user.do_attack_animation(target)
+ user.adjustStaminaLossBuffered(lethal_stam_cost)
/obj/item/twohanded/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
var/stunforce = stun_stamdmg
@@ -1245,7 +1248,7 @@
return FALSE
if(chargeleft < stun_cost)
lethal_force *= round(chargeleft/lethal_cost, 0.1)
- target.adjustBurnLoss(lethal_force) //good against ointment spam
+ target.adjustFireLoss(lethal_force) //good against ointment spam
SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
if(user)
target.lastattacker = user.real_name
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 43021f3528..85fcb49e16 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -289,8 +289,8 @@
icon_state = "tac"
/obj/structure/closet/secure_closet/lethalshots/PopulateContents()
..()
- new /obj/item/twohanded/required/electrostaff(src)
- new /obj/item/twohanded/required/electrostaff(src)
+ new /obj/item/twohanded/electrostaff(src)
+ new /obj/item/twohanded/electrostaff(src)
for(var/i in 1 to 3)
new /obj/item/storage/box/lethalshot(src)
From e1ed34dcdec0edc4da03abcaff28ef88664e1428 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:38:18 -0700
Subject: [PATCH 005/101] s
---
code/game/objects/items/twohanded.dm | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index e04ec75345..f22f885753 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1143,7 +1143,7 @@
if(cell)
to_chat(user, "[src] already has a cell!")
else
- if(C.maxcharge < hitcost)
+ if(C.maxcharge < min_hit_cost())
to_chat(user, "[src] requires a higher capacity cell.")
return
if(!user.transferItemToLoc(W, src))
@@ -1182,12 +1182,9 @@
if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes it impossible to baton in stamina softcrit
to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto
return //CIT CHANGE - ditto
- if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- if(on)
- clowning_around(user) //ouch!
- return
- else
- return ..(user, user) //beat yourself
+ if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
+ clowning_around(user) //ouch!
+ return
if(iscyborg(target))
..()
return
@@ -1263,7 +1260,7 @@
user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \
"You accidentally hit yourself with [src]!")
SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
- lethal_act(user, user, TRUE)
+ harm_act(user, user, TRUE)
stun_act(user, user, TRUE)
deductcharge(lethal_cost)
From dd113f5c7193a00c195b3c42db52417bc31c854e Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:39:36 -0700
Subject: [PATCH 006/101] L
---
code/game/objects/items/twohanded.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index f22f885753..9cd37099e1 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1189,7 +1189,7 @@
..()
return
if(target.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
- playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
+ playsound(target, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
if(user.a_intent != INTENT_HARM)
if(stun_act(target, user))
From c69446d2d11575138c251564da73730dfd75d80b Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:46:54 -0700
Subject: [PATCH 007/101] woops miscalculated
---
code/game/objects/items/twohanded.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 9cd37099e1..e395452d3a 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1029,7 +1029,7 @@
force = 10
damtype = BRUTE
w_class = WEIGHT_CLASS_GIGANTIC
- slot_flags = ITEM_SLOT_BACK
+ slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
sharpness = FALSE
force_unwielded = 5
force_wielded = 10
@@ -1043,10 +1043,10 @@
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
var/on = FALSE
var/can_block_projectiles = FALSE //can't block guns
- var/lethal_cost = 400 //10000/333*15 = 450. decent enough?? kinda?
- var/lethal_damage = 15
- var/lethal_stam_cost = 3.5
- var/stun_cost = 333 //10000/500*25 = 500. stunbatons are at time of writing 10000/1000*49 = 490. This doesn't stun as fast but has block. Also, this does..
+ var/lethal_cost = 400 //10000/400*20 = 500. decent enough?
+ var/lethal_damage = 20
+ var/lethal_stam_cost = 4
+ var/stun_cost = 333 //10000/333*25 = 750. stunbatons are at time of writing 10000/1000*49 = 490.
var/stun_status_effect = STATUS_EFFECT_ELECTROSTAFF //a small slowdown effect
var/stun_stamdmg = 25
var/stun_status_duration = 25
From 9b4e40e3a76f1697ecbee3e597430f940ee1a3ca Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:48:03 -0700
Subject: [PATCH 008/101] on second thought, fitting on OCLOTHING slot is a bad
idea
---
code/game/objects/items/twohanded.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index e395452d3a..27b0baa70d 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1029,7 +1029,7 @@
force = 10
damtype = BRUTE
w_class = WEIGHT_CLASS_GIGANTIC
- slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
+ slot_flags = ITEM_SLOT_BACK
sharpness = FALSE
force_unwielded = 5
force_wielded = 10
From 09bb223af027efd193f4950a8aaf59e66a7410e9 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 3 Feb 2020 15:49:41 -0700
Subject: [PATCH 009/101] eh fine
---
code/game/objects/items/twohanded.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 27b0baa70d..564cca60fb 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1028,7 +1028,7 @@
desc = "A large quarterstaff, with massive silver electrodes mounted at the end."
force = 10
damtype = BRUTE
- w_class = WEIGHT_CLASS_GIGANTIC
+ w_class = WEIGHT_CLASS_HUGE
slot_flags = ITEM_SLOT_BACK
sharpness = FALSE
force_unwielded = 5
@@ -1036,7 +1036,7 @@
throwforce = 1
throw_speed = 1
block_chance = 50
- materials = list(MAT_METAL=1000)
+ materials = list(MAT_METAL = 4000, MAT_SILVER = 2000)
hitsound = 'sound/weapons/staff.ogg'
attack_verb = list("suppresed", "struck", "beaten", "thwacked", "pulped", "shocked")
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors.
From 477853891d616fcd6adc050550e223f5476740ed Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 4 Feb 2020 23:54:10 -0700
Subject: [PATCH 010/101] Update twohanded.dm
---
code/game/objects/items/twohanded.dm | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index b142b9d6a7..364a114751 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1032,13 +1032,12 @@
sharpness = FALSE
force_unwielded = 5
force_wielded = 10
- throwforce = 1
+ throwforce = 15 //if you are a madman and finish someone off with this, power to you.
throw_speed = 1
block_chance = 50
materials = list(MAT_METAL = 4000, MAT_SILVER = 2000)
- hitsound = 'sound/weapons/staff.ogg'
- attack_verb = list("suppresed", "struck", "beaten", "thwacked", "pulped", "shocked")
- total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors.
+ attack_verb = list("struck", "beaten", "thwacked", "pulped")
+ total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors. (to curb stun-kill rampaging without it being on)
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
var/on = FALSE
var/can_block_projectiles = FALSE //can't block guns
@@ -1110,16 +1109,16 @@
else
turn_on(user, silent)
-/obj/item/twohanded/electrostaff/attack_self(mob/user)
- var/oldwielded = wielded
+/obj/item/twohanded/electrostaff/wield(mob/user)
. = ..()
- if(.)
- return
- if(oldwielded != wielded)
- if(wielded)
- turn_on(user)
- else
- turn_off(user)
+ if(wielded)
+ turn_on(user)
+ add_fingerprint(user)
+
+/obj/item/twohanded/electrostaff/unwield(mob/user)
+ . = ..()
+ if(!wielded)
+ turn_off(user)
add_fingerprint(user)
/obj/item/twohanded/electrostaff/update_icon()
From 77667dc1d2a72e6f2c5fdd6b01e892f40a2511ae Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 5 Feb 2020 04:51:16 -0700
Subject: [PATCH 011/101] Update twohanded.dm
---
code/game/objects/items/twohanded.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 364a114751..3a731415c8 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1028,7 +1028,7 @@
force = 10
damtype = BRUTE
w_class = WEIGHT_CLASS_HUGE
- slot_flags = ITEM_SLOT_BACK
+ slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
sharpness = FALSE
force_unwielded = 5
force_wielded = 10
From 643eeb94749d368c11b96ae14db1da24889dc324 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 5 Feb 2020 05:05:11 -0700
Subject: [PATCH 012/101] Update twohanded.dm
---
code/game/objects/items/twohanded.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 3a731415c8..056abf0172 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1046,7 +1046,7 @@
var/lethal_stam_cost = 4
var/stun_cost = 333 //10000/333*25 = 750. stunbatons are at time of writing 10000/1000*49 = 490.
var/stun_status_effect = STATUS_EFFECT_ELECTROSTAFF //a small slowdown effect
- var/stun_stamdmg = 25
+ var/stun_stamdmg = 40
var/stun_status_duration = 25
var/stun_stam_cost = 3.5
From de5186026d676ef8f2823df96798d6ecdddfbe7e Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 6 Feb 2020 01:10:47 -0700
Subject: [PATCH 013/101] Update twohanded.dm
---
code/game/objects/items/twohanded.dm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 056abf0172..bce9e47554 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1034,7 +1034,7 @@
force_wielded = 10
throwforce = 15 //if you are a madman and finish someone off with this, power to you.
throw_speed = 1
- block_chance = 50
+ block_chance = 30
materials = list(MAT_METAL = 4000, MAT_SILVER = 2000)
attack_verb = list("struck", "beaten", "thwacked", "pulped")
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors. (to curb stun-kill rampaging without it being on)
@@ -1066,6 +1066,8 @@
. = R.get_cell()
/obj/item/twohanded/electrostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if(!on)
+ return FALSE
if((attack_type == PROJECTILE_ATTACK) && !can_block_projectiles)
return FALSE
return ..()
From c00f797a4a0411ea31e7e14c4a621ad57e697fe7 Mon Sep 17 00:00:00 2001
From: Hatterhat
Date: Sun, 16 Feb 2020 01:26:33 -0600
Subject: [PATCH 014/101] extendies
---
.../configuration/entries/general.dm | 10 +++++++
code/controllers/subsystem/autotransfer.dm | 17 ++++++++++++
code/controllers/subsystem/ticker.dm | 2 +-
code/controllers/subsystem/vote.dm | 26 ++++++++++++++++++-
config/config.txt | 6 +++++
5 files changed, 59 insertions(+), 2 deletions(-)
create mode 100644 code/controllers/subsystem/autotransfer.dm
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index cb8c0fe966..b5e7137374 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -82,6 +82,16 @@
config_entry_value = 600
min_val = 0
+/datum/config_entry/number/vote_autotransfer_initial //length of time before the first autotransfer vote is called (deciseconds, default 2 hours)
+ config_entry_value = 72000
+ integer = FALSE
+ min_val = 0
+
+/datum/config_entry/number/vote_autotransfer_interval //length of time to wait before subsequent autotransfer votes (deciseconds, default 30 minutes)
+ config_entry_value = 18000
+ integer = FALSE
+ min_val = 0
+
/datum/config_entry/flag/default_no_vote // vote does not default to nochange/norestart
/datum/config_entry/flag/no_dead_vote // dead people can't vote
diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm
new file mode 100644
index 0000000000..05ef3127c1
--- /dev/null
+++ b/code/controllers/subsystem/autotransfer.dm
@@ -0,0 +1,17 @@
+SUBSYSTEM_DEF(autotransfer)
+ name = "Autotransfer Vote"
+ flags = SS_KEEP_TIMING | SS_BACKGROUND
+ wait = 1 MINUTES
+
+ var/starttime
+ var/targettime
+
+/datum/controller/subsystem/autotransfer/Initialize(timeofday)
+ starttime = world.time
+ targettime = starttime + CONFIG_GET(number/vote_autotransfer_initial)
+ return ..()
+
+/datum/controller/subsystem/autotransfer/fire()
+ if (world.time > targettime)
+ SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user
+ targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index fe994facdc..3857fb0af5 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -213,7 +213,7 @@ SUBSYSTEM_DEF(ticker)
check_queue()
check_maprotate()
scripture_states = scripture_unlock_alert(scripture_states)
- SSshuttle.autoEnd()
+ //SSshuttle.autoEnd()
if(!roundend_check_paused && mode.check_finished(force_ending) || force_ending)
current_state = GAME_STATE_FINISHED
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 9924ed7917..10d1cbb3d0 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -89,6 +89,20 @@ SUBSYSTEM_DEF(vote)
choices[GLOB.master_mode] += non_voters.len
if(choices[GLOB.master_mode] >= greatest_votes)
greatest_votes = choices[GLOB.master_mode]
+ else if(mode == "transfer") // austation begin -- Crew autotransfer vote
+ var/factor = 1
+ switch(world.time / (1 MINUTES ))
+ if(0 to 60)
+ factor = 0.5
+ if(61 to 120)
+ factor = 0.8
+ if(121 to 240)
+ factor = 1
+ if(241 to 300)
+ factor = 1.2
+ else
+ factor = 1.4
+ choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end
//get all options with that many votes and return them in a list
. = list()
if(greatest_votes)
@@ -365,6 +379,13 @@ SUBSYSTEM_DEF(vote)
log_admin("The map has been voted for and will change to: [VM.map_name]")
if(SSmapping.changemap(config.maplist[.]))
to_chat(world, "The map vote has chosen [VM.map_name] for next round!")
+ if("transfer") // austation begin -- Crew autotransfer vote
+ if(. == "Initiate Crew Transfer")
+ //TODO find a cleaner way to do this
+ SSshuttle.requestEvac(null,"Crew transfer requested.")
+ var/obj/machinery/computer/communications/C = locate() in GLOB.machines
+ if(C)
+ C.post_status("shuttle") // austation end
if(restart)
var/active_admins = 0
for(var/client/C in GLOB.admins)
@@ -444,6 +465,7 @@ SUBSYSTEM_DEF(vote)
to_chat(usr, "A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!")
return 0
+ SEND_SOUND(world, sound('sound/misc/notice2.ogg'))
reset()
obfuscated = hideresults //CIT CHANGE - adds obfuscated votes
switch(vote_type)
@@ -465,6 +487,8 @@ SUBSYSTEM_DEF(vote)
if(targetmap.max_round_search_span && count_occurences_of_value(lastmaps, M, targetmap.max_round_search_span) >= targetmap.max_rounds_played)
continue
choices |= M
+ if("transfer") // austation begin -- Crew autotranfer vote
+ choices.Add("Initiate Crew Transfer","Continue Playing") // austation end
if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
choices.Add("secret", "extended")
if("mode tiers")
@@ -496,7 +520,7 @@ SUBSYSTEM_DEF(vote)
else
return 0
mode = vote_type
- initiator = initiator_key
+ initiator = initiator_key ? initiator_key : "the Server" // austation -- Crew autotransfer vote
started_time = world.time
var/text = "[capitalize(mode)] vote started by [initiator]."
if(mode == "custom")
diff --git a/config/config.txt b/config/config.txt
index 0ab0cc911e..cc9ede5ef2 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -184,6 +184,12 @@ VOTE_DELAY 6000
## time period (deciseconds) which voting session will last (default 1 minute)
VOTE_PERIOD 600
+## autovote initial delay (deciseconds) before first automatic transfer vote call (default 120 minutes)
+VOTE_AUTOTRANSFER_INITIAL 72000
+
+##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 30 minutes)
+VOTE_AUTOTRANSFER_INTERVAL 18000
+
## prevents dead players from voting or starting votes
# NO_DEAD_VOTE
From 35a070fc5736f4d8aee2770869093a87cb26cb30 Mon Sep 17 00:00:00 2001
From: Hatterhat
Date: Sun, 16 Feb 2020 01:29:06 -0600
Subject: [PATCH 015/101] oh shit oh jesus is this working
---
tgstation.dme | 1 +
1 file changed, 1 insertion(+)
diff --git a/tgstation.dme b/tgstation.dme
index 28f469ac25..3591fa59b5 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -242,6 +242,7 @@
#include "code\controllers\subsystem\assets.dm"
#include "code\controllers\subsystem\atoms.dm"
#include "code\controllers\subsystem\augury.dm"
+#include "code\controllers\subsystem\autotransfer.dm"
#include "code\controllers\subsystem\blackbox.dm"
#include "code\controllers\subsystem\chat.dm"
#include "code\controllers\subsystem\communications.dm"
From f05a88d36f661bc93cd3e2b0539211e19ad73cd6 Mon Sep 17 00:00:00 2001
From: Hatterhat
Date: Sun, 16 Feb 2020 02:24:41 -0600
Subject: [PATCH 016/101] it compiles now ghom
---
code/controllers/subsystem/vote.dm | 38 +++++++++++++++---------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 10d1cbb3d0..9ddd8d9123 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -90,19 +90,19 @@ SUBSYSTEM_DEF(vote)
if(choices[GLOB.master_mode] >= greatest_votes)
greatest_votes = choices[GLOB.master_mode]
else if(mode == "transfer") // austation begin -- Crew autotransfer vote
- var/factor = 1
- switch(world.time / (1 MINUTES ))
- if(0 to 60)
- factor = 0.5
- if(61 to 120)
- factor = 0.8
- if(121 to 240)
- factor = 1
- if(241 to 300)
- factor = 1.2
- else
- factor = 1.4
- choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end
+ var/factor = 1
+ switch(world.time / (1 MINUTES))
+ if(0 to 60)
+ factor = 0.5
+ if(61 to 120)
+ factor = 0.8
+ if(121 to 240)
+ factor = 1
+ if(241 to 300)
+ factor = 1.2
+ else
+ factor = 1.4
+ choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end
//get all options with that many votes and return them in a list
. = list()
if(greatest_votes)
@@ -380,12 +380,12 @@ SUBSYSTEM_DEF(vote)
if(SSmapping.changemap(config.maplist[.]))
to_chat(world, "The map vote has chosen [VM.map_name] for next round!")
if("transfer") // austation begin -- Crew autotransfer vote
- if(. == "Initiate Crew Transfer")
- //TODO find a cleaner way to do this
- SSshuttle.requestEvac(null,"Crew transfer requested.")
- var/obj/machinery/computer/communications/C = locate() in GLOB.machines
- if(C)
- C.post_status("shuttle") // austation end
+ if(. == "Initiate Crew Transfer")
+ //TODO find a cleaner way to do this
+ SSshuttle.requestEvac(null,"Crew transfer requested.")
+ var/obj/machinery/computer/communications/C = locate() in GLOB.machines
+ if(C)
+ C.post_status("shuttle") // austation end
if(restart)
var/active_admins = 0
for(var/client/C in GLOB.admins)
From c97111bedaabdd8feddccc0985d0155c4a607ead Mon Sep 17 00:00:00 2001
From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
Date: Mon, 17 Feb 2020 05:32:03 -0500
Subject: [PATCH 017/101] Reorganise Food + Balance Tweaks
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
---
code/__DEFINES/construction.dm | 4 +-
code/datums/components/crafting/craft.dm | 2 +
.../food_and_drinks/food/customizables.dm | 2 +-
.../food_and_drinks/food/snacks_egg.dm | 2 -
.../food_and_drinks/food/snacks_other.dm | 46 +++
.../food_and_drinks/food/snacks_salad.dm | 2 +-
.../food_and_drinks/food/snacks_soup.dm | 2 +-
.../recipes/tablecraft/recipes_bread.dm | 130 ++++--
.../recipes/tablecraft/recipes_burger.dm | 390 +++++++++---------
.../recipes/tablecraft/recipes_cake.dm | 234 +++++------
.../recipes/tablecraft/recipes_frozen.dm | 2 +-
.../recipes/tablecraft/recipes_meat.dm | 134 +++---
.../recipes/tablecraft/recipes_mexican.dm | 111 +++++
.../recipes/tablecraft/recipes_misc.dm | 261 ++----------
.../recipes/tablecraft/recipes_pastry.dm | 283 ++++++-------
.../recipes/tablecraft/recipes_pie.dm | 220 +++++-----
.../recipes/tablecraft/recipes_pizza.dm | 114 ++---
.../recipes/tablecraft/recipes_salad.dm | 80 ++--
.../recipes/tablecraft/recipes_sandwich.dm | 3 +-
.../recipes/tablecraft/recipes_soup.dm | 243 ++++++-----
.../recipes/tablecraft/recipes_spaghetti.dm | 20 +-
.../recipes/tablecraft/recipes_sushi.dm | 70 +++-
.../recipes/tablecraft/recipies_sweets.dm | 117 ++++++
code/modules/holiday/easter.dm | 98 +----
tgstation.dme | 2 +
25 files changed, 1303 insertions(+), 1269 deletions(-)
create mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
create mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm
diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
index c93f1b2435..c4d87de495 100644
--- a/code/__DEFINES/construction.dm
+++ b/code/__DEFINES/construction.dm
@@ -92,8 +92,10 @@
#define CAT_BREAD "Breads"
#define CAT_BURGER "Burgers"
#define CAT_CAKE "Cakes"
+#define CAT_FISH "Eastern"
#define CAT_EGG "Egg-Based Food"
#define CAT_MEAT "Meats"
+#define CAT_MEXICAN "Mexican"
#define CAT_MISCFOOD "Misc. Food"
#define CAT_PASTRY "Pastries"
#define CAT_PIE "Pies"
@@ -102,7 +104,7 @@
#define CAT_SANDWICH "Sandwiches"
#define CAT_SOUP "Soups"
#define CAT_SPAGHETTI "Spaghettis"
-#define CAT_FISH "Fish"
+#define CAT_SWEETS "Sweets"
#define CAT_ICE "Frozen"
#define RCD_FLOORWALL 1
diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm
index b5c7f34c27..674746479d 100644
--- a/code/datums/components/crafting/craft.dm
+++ b/code/datums/components/crafting/craft.dm
@@ -31,6 +31,7 @@
CAT_FISH,
CAT_ICE,
CAT_MEAT,
+ CAT_MEXICAN,
CAT_MISCFOOD,
CAT_PASTRY,
CAT_PIE,
@@ -39,6 +40,7 @@
CAT_SANDWICH,
CAT_SOUP,
CAT_SPAGHETTI,
+ CAT_SWEETS,
),
CAT_DRINK = CAT_NONE,
CAT_CLOTHING = CAT_NONE,
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 016e37a5c4..7cc1152962 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -294,7 +294,7 @@
icon_state = "bowl"
reagent_flags = OPENCONTAINER
materials = list(MAT_GLASS = 500)
- w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params)
if(istype(I, /obj/item/reagent_containers/food/snacks))
diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm
index c65e42c0e4..b2a474adac 100644
--- a/code/modules/food_and_drinks/food/snacks_egg.dm
+++ b/code/modules/food_and_drinks/food/snacks_egg.dm
@@ -124,7 +124,6 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 1
- w_class = WEIGHT_CLASS_NORMAL
tastes = list("egg" = 1, "cheese" = 1)
foodtype = MEAT | BREAKFAST
@@ -152,7 +151,6 @@
icon_state = "benedict"
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
trash = /obj/item/trash/plate
- w_class = WEIGHT_CLASS_NORMAL
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
foodtype = MEAT | BREAKFAST
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index a7090a5274..1fff57395b 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -674,3 +674,49 @@
if (7000 to INFINITY)
burn()
..()
+
+//Easter Stuff
+
+/obj/item/reagent_containers/food/snacks/chocolatebunny
+ name = "chocolate bunny"
+ desc = "Contains less than 10% real rabbit!"
+ icon_state = "chocolatebunny"
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+ list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
+ filling_color = "#A0522D"
+
+/obj/item/reagent_containers/food/snacks/store/cake/brioche
+ name = "brioche cake"
+ desc = "A ring of sweet, glazed buns."
+ icon_state = "briochecake"
+ slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
+ slices_num = 6
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
+
+/obj/item/reagent_containers/food/snacks/cakeslice/brioche
+ name = "brioche cake slice"
+ desc = "Delicious sweet-bread. Who needs anything else?"
+ icon_state = "briochecake_slice"
+ filling_color = "#FFD700"
+
+/obj/item/reagent_containers/food/snacks/scotchegg
+ name = "scotch egg"
+ desc = "A boiled egg wrapped in a delicious, seasoned meatball."
+ icon_state = "scotchegg"
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+ bitesize = 3
+ filling_color = "#FFFFF0"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 6)
+
+/obj/item/reagent_containers/food/snacks/soup/mammi
+ name = "Mammi"
+ desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
+ icon_state = "mammi"
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
+ list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
+
+/obj/item/reagent_containers/food/snacks/hotcrossbun
+ bitesize = 2
+ name = "hot-cross bun"
+ desc = "The Cross represents the Assistants that died for your sins."
+ icon_state = "hotcrossbun"
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm
index e272733235..aa4cf44f4e 100644
--- a/code/modules/food_and_drinks/food/snacks_salad.dm
+++ b/code/modules/food_and_drinks/food/snacks_salad.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/food/soupsalad.dmi'
trash = /obj/item/reagent_containers/glass/bowl
bitesize = 3
- w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_SMALL
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("leaves" = 1)
foodtype = VEGETABLES
diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm
index a0e1ebcb39..796cff9b65 100644
--- a/code/modules/food_and_drinks/food/snacks_soup.dm
+++ b/code/modules/food_and_drinks/food/snacks_soup.dm
@@ -1,5 +1,5 @@
/obj/item/reagent_containers/food/snacks/soup
- w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/food/soupsalad.dmi'
trash = /obj/item/reagent_containers/glass/bowl
bitesize = 5
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
index e572cc76ff..c3890b28eb 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
@@ -3,36 +3,6 @@
////////////////////////////////////////////////BREAD////////////////////////////////////////////////
-/datum/crafting_recipe/food/meatbread
- name = "Meat bread"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 3
- )
- result = /obj/item/reagent_containers/food/snacks/store/bread/meat
- subcategory = CAT_BREAD
-
-/datum/crafting_recipe/food/xenomeatbread
- name = "Xenomeat bread"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 3
- )
- result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat
- subcategory = CAT_BREAD
-
-/datum/crafting_recipe/food/spidermeatbread
- name = "Spidermeat bread"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 3
- )
- result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat
- subcategory = CAT_BREAD
-
/datum/crafting_recipe/food/banananutbread
name = "Banana nut bread"
reqs = list(
@@ -44,16 +14,6 @@
result = /obj/item/reagent_containers/food/snacks/store/bread/banana
subcategory = CAT_BREAD
-/datum/crafting_recipe/food/tofubread
- name = "Tofu bread"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 3
- )
- result = /obj/item/reagent_containers/food/snacks/store/bread/tofu
- subcategory = CAT_BREAD
-
/datum/crafting_recipe/food/creamcheesebread
name = "Cream cheese bread"
reqs = list(
@@ -64,6 +24,16 @@
result = /obj/item/reagent_containers/food/snacks/store/bread/creamcheese
subcategory = CAT_BREAD
+/datum/crafting_recipe/food/meatbread
+ name = "Meat bread"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 3
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/bread/meat
+ subcategory = CAT_BREAD
+
/datum/crafting_recipe/food/mimanabread
name = "Mimana bread"
reqs = list(
@@ -75,6 +45,38 @@
result = /obj/item/reagent_containers/food/snacks/store/bread/mimana
subcategory = CAT_BREAD
+/datum/crafting_recipe/food/spidermeatbread
+ name = "Spidermeat bread"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 3
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat
+ subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/tofubread
+ name = "Tofu bread"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/reagent_containers/food/snacks/tofu = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 3
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/bread/tofu
+ subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/xenomeatbread
+ name = "Xenomeat bread"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 3
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat
+ subcategory = CAT_BREAD
+
+////////////////////////////////////////////////TOAST////////////////////////////////////////////////
+
/datum/crafting_recipe/food/butteredtoast
name = "Buttered Toast"
reqs = list(
@@ -84,6 +86,45 @@
result = /obj/item/reagent_containers/food/snacks/butteredtoast
subcategory = CAT_BREAD
+/datum/crafting_recipe/food/slimetoast
+ name = "Slime toast"
+ reqs = list(
+ /datum/reagent/toxin/slimejelly = 5,
+ /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
+ subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/jelliedtoast
+ name = "Jellied toast"
+ reqs = list(
+ /datum/reagent/consumable/cherryjelly = 5,
+ /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
+ subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/peanutbuttertoast
+ name = "Peanut butter toast"
+ reqs = list(
+ /datum/reagent/consumable/peanut_butter = 5,
+ /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast
+ subcategory = CAT_BREAD
+
+////////////////////////////////////////////////MISC////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/baguette
+ name = "Baguette"
+ time = 40
+ reqs = list(/datum/reagent/consumable/sodiumchloride = 1,
+ /datum/reagent/consumable/blackpepper = 1,
+ /obj/item/reagent_containers/food/snacks/pastrybase = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/baguette
+ subcategory = CAT_BREAD
+
/datum/crafting_recipe/food/butterbiscuit
name = "Butter Biscuit"
reqs = list(
@@ -100,4 +141,13 @@
/obj/item/reagent_containers/food/snacks/butter = 3,
)
result = /obj/item/reagent_containers/food/snacks/butterdog
+ subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/twobread
+ name = "Two bread"
+ reqs = list(
+ /datum/reagent/consumable/ethanol/wine = 5,
+ /obj/item/reagent_containers/food/snacks/breadslice/plain = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/twobread
subcategory = CAT_BREAD
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
index ffa8709245..0fae6542e9 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
@@ -1,41 +1,9 @@
// see code/module/crafting/table.dm
-////////////////////////////////////////////////BURGERS////////////////////////////////////////////////
+////////////////////////////////////////////////STANDARD BURGS////////////////////////////////////////////////
-/datum/crafting_recipe/food/humanburger
- name = "Human burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/bun = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1
- )
- parts = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/human
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/burger
- name = "Burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
-
- result = /obj/item/reagent_containers/food/snacks/burger/plain
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/corgiburger
- name = "Corgi burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
-
- result = /obj/item/reagent_containers/food/snacks/burger/corgi
- subcategory = CAT_BURGER
-
/datum/crafting_recipe/food/appendixburger
name = "Appendix burger"
reqs = list(
@@ -54,15 +22,87 @@
result = /obj/item/reagent_containers/food/snacks/burger/brain
subcategory = CAT_BURGER
-/datum/crafting_recipe/food/xenoburger
- name = "Xeno burger"
+/datum/crafting_recipe/food/burger
+ name = "Burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1,
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+
+ result = /obj/item/reagent_containers/food/snacks/burger/plain
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/baconburger
+ name = "Bacon Burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/bacon = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+
+ result = /obj/item/reagent_containers/food/snacks/burger/baconburger
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/bigbiteburger
+ name = "Big bite burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 2,
/obj/item/reagent_containers/food/snacks/bun = 1
)
- result = /obj/item/reagent_containers/food/snacks/burger/xeno
+ result = /obj/item/reagent_containers/food/snacks/burger/bigbite
subcategory = CAT_BURGER
+/datum/crafting_recipe/food/superbiteburger
+ name = "Super bite burger"
+ reqs = list(
+ /datum/reagent/consumable/sodiumchloride = 5,
+ /datum/reagent/consumable/blackpepper = 5,
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 5,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 4,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 3,
+ /obj/item/reagent_containers/food/snacks/boiledegg = 1,
+ /obj/item/reagent_containers/food/snacks/meat/bacon = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/superbite
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/cheeseburger
+ name = "Cheese Burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/cheese
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/corgiburger
+ name = "Corgi burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+
+ result = /obj/item/reagent_containers/food/snacks/burger/corgi
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/humanburger
+ name = "Human burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1
+ )
+ parts = list(
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/human
+ subcategory = CAT_BURGER
+
+///////////////EXOTIC//////////////////
+
/datum/crafting_recipe/food/bearger
name = "Bearger"
reqs = list(
@@ -72,6 +112,16 @@
result = /obj/item/reagent_containers/food/snacks/burger/bearger
subcategory = CAT_BURGER
+/datum/crafting_recipe/food/chickenburger
+ name = "Chicken Sandwich"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/steak/chicken = 1,
+ /datum/reagent/consumable/mayonnaise = 5,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/chicken
+ subcategory = CAT_BURGER
+
/datum/crafting_recipe/food/fishburger
name = "Fish burger"
reqs = list(
@@ -82,6 +132,54 @@
result = /obj/item/reagent_containers/food/snacks/burger/fish
subcategory = CAT_BURGER
+/datum/crafting_recipe/food/fivealarmburger
+ name = "Five alarm burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2,
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/fivealarm
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/slimeburger
+ name = "Jelly burger"
+ reqs = list(
+ /datum/reagent/toxin/slimejelly = 5,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/jellyburger
+ name = "Jelly burger"
+ reqs = list(
+ /datum/reagent/consumable/cherryjelly = 5,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/ribburger
+ name = "McRib"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs
+ /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome.
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/rib
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/mcguffin
+ name = "McGuffin"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/friedegg = 1,
+ /obj/item/reagent_containers/food/snacks/meat/bacon = 2,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/mcguffin
+ subcategory = CAT_BURGER
+
/datum/crafting_recipe/food/tofuburger
name = "Tofu burger"
reqs = list(
@@ -91,16 +189,45 @@
result = /obj/item/reagent_containers/food/snacks/burger/tofu
subcategory = CAT_BURGER
-/datum/crafting_recipe/food/ghostburger
- name = "Ghost burger"
+/datum/crafting_recipe/food/baseballburger
+ name = "Home run baseball burger"
reqs = list(
- /obj/item/ectoplasm = 1,
- /datum/reagent/consumable/sodiumchloride = 2,
+ /obj/item/melee/baseball_bat = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/baseball
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/ratburger
+ name = "Rat burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/deadmouse = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/rat
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/soylentburger
+ name = "Soylent Burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/soylentgreen = 1, //two full meats worth.
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 2,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/soylent
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/xenoburger
+ name = "Xeno burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1,
/obj/item/reagent_containers/food/snacks/bun = 1
)
- result = /obj/item/reagent_containers/food/snacks/burger/ghost
+ result = /obj/item/reagent_containers/food/snacks/burger/xeno
subcategory = CAT_BURGER
+////////////MYSTICAL////////////////
+
/datum/crafting_recipe/food/clownburger
name = "Clown burger"
reqs = list(
@@ -119,6 +246,35 @@
result = /obj/item/reagent_containers/food/snacks/burger/mime
subcategory = CAT_BURGER
+/datum/crafting_recipe/food/ghostburger
+ name = "Ghost burger"
+ reqs = list(
+ /obj/item/ectoplasm = 1,
+ /datum/reagent/consumable/sodiumchloride = 2,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/ghost
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/spellburger
+ name = "Spell burger"
+ reqs = list(
+ /obj/item/clothing/head/wizard/fake = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/spell
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/spellburger2
+ name = "Spell burger"
+ reqs = list(
+ /obj/item/clothing/head/wizard = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/spell
+ subcategory = CAT_BURGER
+
+////////////COLORED BURGERS//////////////
+
/datum/crafting_recipe/food/redburger
name = "Red burger"
reqs = list(
@@ -197,154 +353,4 @@
/obj/item/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/reagent_containers/food/snacks/burger/white
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/spellburger
- name = "Spell burger"
- reqs = list(
- /obj/item/clothing/head/wizard/fake = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/burger/spell
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/spellburger2
- name = "Spell burger"
- reqs = list(
- /obj/item/clothing/head/wizard = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/spell
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/bigbiteburger
- name = "Big bite burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 2,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/bigbite
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/superbiteburger
- name = "Super bite burger"
- reqs = list(
- /datum/reagent/consumable/sodiumchloride = 5,
- /datum/reagent/consumable/blackpepper = 5,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 5,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 4,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 3,
- /obj/item/reagent_containers/food/snacks/boiledegg = 1,
- /obj/item/reagent_containers/food/snacks/meat/bacon = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
-
- )
- result = /obj/item/reagent_containers/food/snacks/burger/superbite
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/slimeburger
- name = "Jelly burger"
- reqs = list(
- /datum/reagent/toxin/slimejelly = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/jellyburger
- name = "Jelly burger"
- reqs = list(
- /datum/reagent/consumable/cherryjelly = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/fivealarmburger
- name = "Five alarm burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/fivealarm
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/ratburger
- name = "Rat burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/deadmouse = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/rat
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/baseballburger
- name = "Home run baseball burger"
- reqs = list(
- /obj/item/melee/baseball_bat = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/baseball
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/baconburger
- name = "Bacon Burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/bacon = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
-
- result = /obj/item/reagent_containers/food/snacks/burger/baconburger
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/cheeseburger
- name = "Cheese Burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/cheese
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/soylentburger
- name = "Soylent Burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/soylentgreen = 1, //two full meats worth.
- /obj/item/reagent_containers/food/snacks/cheesewedge = 2,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/soylent
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/ribburger
- name = "McRib"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs
- /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome.
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/rib
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/mcguffin
- name = "McGuffin"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/friedegg = 1,
- /obj/item/reagent_containers/food/snacks/meat/bacon = 2,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/mcguffin
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/chickenburger
- name = "Chicken Sandwich"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/chicken = 1,
- /datum/reagent/consumable/mayonnaise = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/chicken
subcategory = CAT_BURGER
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
index f168896164..492d5c2db3 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
@@ -1,7 +1,84 @@
// see code/module/crafting/table.dm
-////////////////////////////////////////////////CAKE////////////////////////////////////////////////
+////////////////////////////////////////////////FRUIT CAKE////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/applecake
+ name = "Apple cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/apple = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/apple
+ subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/bscccake
+ name = "Blackberry and strawberry chocolate cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 2,
+ /obj/item/reagent_containers/food/snacks/grown/berries = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/bscc
+ subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/bscvcake
+ name = "Blackberry and strawberry vanilla cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/berries = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc
+ subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/lemoncake
+ name = "Lemon cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/lemon
+ subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/limecake
+ name = "Lime cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/lime
+ subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/orangecake
+ name = "Orange cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/orange
+ subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/peachcake
+ name = "Peach cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/peach = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake
+ subcategory = CAT_CAKE
+
+///////////////////////////////////FANCY////////////////////////////////////////////
+
+/datum/crafting_recipe/food/birthdaycake
+ name = "Birthday cake"
+ reqs = list(
+ /datum/reagent/consumable/sugar = 5,
+ /datum/reagent/consumable/caramel =2,
+ /obj/item/candle = 1,
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/birthday
+ subcategory = CAT_CAKE
/datum/crafting_recipe/food/carrotcake
name = "Carrot cake"
@@ -21,42 +98,6 @@
result = /obj/item/reagent_containers/food/snacks/store/cake/cheese
subcategory = CAT_CAKE
-/datum/crafting_recipe/food/applecake
- name = "Apple cake"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/apple = 2
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/apple
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/orangecake
- name = "Orange cake"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/orange
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/limecake
- name = "Lime cake"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/lime
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/lemoncake
- name = "Lemon cake"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/lemon
- subcategory = CAT_CAKE
-
/datum/crafting_recipe/food/chocolatecake
name = "Chocolate cake"
reqs = list(
@@ -66,35 +107,6 @@
result = /obj/item/reagent_containers/food/snacks/store/cake/chocolate
subcategory = CAT_CAKE
-/datum/crafting_recipe/food/birthdaycake
- name = "Birthday cake"
- reqs = list(
- /datum/reagent/consumable/sugar = 5,
- /datum/reagent/consumable/caramel =2,
- /obj/item/candle = 1,
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/birthday
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/braincake
- name = "Brain cake"
- reqs = list(
- /obj/item/organ/brain = 1,
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/brain
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/slimecake
- name = "Slime cake"
- reqs = list(
- /obj/item/slime_extract = 1,
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake
- subcategory = CAT_CAKE
-
/datum/crafting_recipe/food/pumpkinspicecake
name = "Pumpkin spice cake"
reqs = list(
@@ -104,6 +116,26 @@
result = /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice
subcategory = CAT_CAKE
+/datum/crafting_recipe/food/poundcake
+ name = "Pound cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 4
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake
+ subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/vanillacake
+ name = "Vanilla cake"
+ always_availible = FALSE
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake
+ subcategory = CAT_CAKE
+
+/////////////SPECIAL////////////
+
/datum/crafting_recipe/food/holycake
name = "Angel food cake"
reqs = list(
@@ -113,12 +145,24 @@
result = /obj/item/reagent_containers/food/snacks/store/cake/holy_cake
subcategory = CAT_CAKE
-/datum/crafting_recipe/food/poundcake
- name = "Pound cake"
+/datum/crafting_recipe/food/braincake
+ name = "Brain cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 4
+ /obj/item/organ/brain = 1,
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake
+ result = /obj/item/reagent_containers/food/snacks/store/cake/brain
+ subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/clowncake
+ name = "Clown cake"
+ always_availible = FALSE
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/reagent_containers/food/snacks/sundae = 2,
+ /obj/item/reagent_containers/food/snacks/grown/banana = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake
subcategory = CAT_CAKE
/datum/crafting_recipe/food/hardwarecake
@@ -131,53 +175,13 @@
result = /obj/item/reagent_containers/food/snacks/store/cake/hardware_cake
subcategory = CAT_CAKE
-/datum/crafting_recipe/food/bscccake
- name = "blackberry and strawberry chocolate cake"
+/datum/crafting_recipe/food/slimecake
+ name = "Slime cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/chocolatebar = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries = 5
+ /obj/item/slime_extract = 1,
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/bscc
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/bscvcake
- name = "blackberry and strawberry vanilla cake"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/berries = 5
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/clowncake
- name = "clown cake"
- always_availible = FALSE
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/sundae = 2,
- /obj/item/reagent_containers/food/snacks/grown/banana = 5
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/vanillacake
- name = "vanilla cake"
- always_availible = FALSE
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/peachcake
- name = "Peach cake"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/peach = 5
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake
+ result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake
subcategory = CAT_CAKE
/datum/crafting_recipe/food/trumpetcake
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index e204b0c72c..1b1801d982 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -14,7 +14,7 @@
subcategory = CAT_ICE
/datum/crafting_recipe/food/spacefreezy
- name ="Space freezy"
+ name ="Space Freezy"
reqs = list(
/datum/reagent/consumable/bluecherryjelly = 5,
/datum/reagent/consumable/spacemountainwind = 15,
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index d8145410cd..03020b8ba9 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -36,6 +36,18 @@
result = /obj/item/reagent_containers/food/snacks/kebab/tail
subcategory = CAT_MEAT
+/datum/crafting_recipe/food/fiestaskewer
+ name = "Fiesta Skewer"
+ reqs = list(
+ /obj/item/stack/rods = 1,
+ /obj/item/reagent_containers/food/snacks/grown/chili = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+ /obj/item/reagent_containers/food/snacks/grown/corn = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/kebab/fiesta
+ subcategory = CAT_MEAT
+
// see code/module/crafting/table.dm
////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
@@ -50,8 +62,69 @@
result = /obj/item/reagent_containers/food/snacks/spidereggsham
subcategory = CAT_MEAT
+//////////////////////////////////////////////FISH///////////////////////////////////////////
+
+/datum/crafting_recipe/food/fishfingers
+ name = "Fish fingers"
+ reqs = list(
+ /datum/reagent/consumable/flour = 5,
+ /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/fishfingers
+ subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/cubancarp
+ name = "Cuban carp"
+ reqs = list(
+ /datum/reagent/consumable/flour = 5,
+ /obj/item/reagent_containers/food/snacks/grown/chili = 1,
+ /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/cubancarp
+ subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/fishandchips
+ name = "Fish and chips"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/fries = 1,
+ /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/fishandchips
+ subcategory = CAT_MEAT
+
////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
+/datum/crafting_recipe/food/ribs
+ name = "BBQ Ribs"
+ reqs = list(
+ /datum/reagent/consumable/bbqsauce = 5,
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 2,
+ /obj/item/stack/rods = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/bbqribs
+ subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/nugget
+ name = "Chicken nugget"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/nugget
+ subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/corndog
+ name = "Corndog meal"
+ reqs = list(
+ /obj/item/stack/rods = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1,
+ /datum/reagent/consumable/mustard = 5,
+ /datum/reagent/consumable/ketchup = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/corndog
+ subcategory = CAT_MEAT
+
/datum/crafting_recipe/food/cornedbeef
name = "Corned beef"
reqs = list(
@@ -72,16 +145,6 @@
result = /obj/item/reagent_containers/food/snacks/bearsteak
subcategory = CAT_MEAT
-/datum/crafting_recipe/food/enchiladas
- name = "Enchiladas"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
- /obj/item/reagent_containers/food/snacks/grown/chili = 2,
- /obj/item/reagent_containers/food/snacks/tortilla = 2
- )
- result = /obj/item/reagent_containers/food/snacks/enchiladas
- subcategory = CAT_MEAT
-
/datum/crafting_recipe/food/stewedsoymeat
name = "Stewed soymeat"
reqs = list(
@@ -101,23 +164,6 @@
result = /obj/item/reagent_containers/food/snacks/sausage
subcategory = CAT_MEAT
-/datum/crafting_recipe/food/nugget
- name = "Chicken nugget"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1
- )
- result = /obj/item/reagent_containers/food/snacks/nugget
- subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/rawkhinkali
- name = "Raw Khinkali"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/doughslice = 1,
- /obj/item/reagent_containers/food/snacks/faggot = 1
- )
- result = /obj/item/reagent_containers/food/snacks/rawkhinkali
- subcategory = CAT_MEAT
-
/datum/crafting_recipe/food/pigblanket
name = "Pig in a Blanket"
reqs = list(
@@ -128,18 +174,6 @@
result = /obj/item/reagent_containers/food/snacks/pigblanket
subcategory = CAT_MEAT
-/datum/crafting_recipe/food/corndog
- name = "Corndog meal"
- reqs = list(
- /obj/item/stack/rods = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1,
- /datum/reagent/consumable/mustard = 5,
- /datum/reagent/consumable/ketchup = 5
- )
- result = /obj/item/reagent_containers/food/snacks/corndog
- subcategory = CAT_MEAT
-
/datum/crafting_recipe/food/ratkebab
name = "Rat Kebab"
reqs = list(
@@ -166,25 +200,3 @@
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepork
subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/fiestaskewer
- name = "Fiesta Skewer"
- reqs = list(
- /obj/item/stack/rods = 1,
- /obj/item/reagent_containers/food/snacks/grown/chili = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
- /obj/item/reagent_containers/food/snacks/grown/corn = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/kebab/fiesta
- subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/ribs
- name = "BBQ Ribs"
- reqs = list(
- /datum/reagent/consumable/bbqsauce = 5,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 2,
- /obj/item/stack/rods = 2
- )
- result = /obj/item/reagent_containers/food/snacks/bbqribs
- subcategory = CAT_MEAT
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
new file mode 100644
index 0000000000..e155a1bd23
--- /dev/null
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
@@ -0,0 +1,111 @@
+// see code/module/crafting/table.dm
+
+////////////////////////////////////////////////"MEXICAN"////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/burrito
+ name ="Burrito"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/reagent_containers/food/snacks/grown/soybeans = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/burrito
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/cheesyburrito
+ name ="Cheesy burrito"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 2,
+ /obj/item/reagent_containers/food/snacks/grown/soybeans = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/cheesyburrito
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/enchiladas
+ name = "Enchiladas"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/reagent_containers/food/snacks/grown/chili = 2,
+ /obj/item/reagent_containers/food/snacks/tortilla = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/enchiladas
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/carneburrito
+ name ="Carne de asada burrito"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/reagent_containers/food/snacks/grown/soybeans = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/carneburrito
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/fuegoburrito
+ name ="Fuego plasma burrito"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2,
+ /obj/item/reagent_containers/food/snacks/grown/soybeans = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/fuegoburrito
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/taco
+ name ="Classic Taco"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/taco
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/tacoplain
+ name ="Plain Taco"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/taco/plain
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/nachos
+ name ="Nachos"
+ reqs = list(
+ /datum/reagent/consumable/sodiumchloride = 1,
+ /obj/item/reagent_containers/food/snacks/tortilla = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/nachos
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/cheesynachos
+ name ="Cheesy nachos"
+ reqs = list(
+ /datum/reagent/consumable/sodiumchloride = 1,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/tortilla = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/cheesynachos
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/cubannachos
+ name ="Cuban nachos"
+ reqs = list(
+ /datum/reagent/consumable/ketchup = 5,
+ /obj/item/reagent_containers/food/snacks/grown/chili = 2,
+ /obj/item/reagent_containers/food/snacks/tortilla = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/cubannachos
+ subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/wrap
+ name = "Wrap"
+ reqs = list(/datum/reagent/consumable/soysauce = 10,
+ /obj/item/reagent_containers/food/snacks/friedegg = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/eggwrap
+ subcategory = CAT_MEXICAN
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 9cf5ea31a0..b2d79e10f9 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -3,60 +3,32 @@
// MISC
-/datum/crafting_recipe/food/candiedapple
- name = "Candied apple"
- reqs = list(/datum/reagent/water = 5,
- /datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/food/snacks/grown/apple = 1
- )
- result = /obj/item/reagent_containers/food/snacks/candiedapple
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/spiderlollipop
- name = "Spider Lollipop"
- reqs = list(/obj/item/stack/rods = 1,
- /datum/reagent/consumable/sugar = 5,
- /datum/reagent/water = 5,
- /obj/item/reagent_containers/food/snacks/spiderling = 1
- )
- result = /obj/item/reagent_containers/food/snacks/spiderlollipop
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/chococoin
- name = "Choco coin"
- reqs = list(
- /obj/item/coin = 1,
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/chococoin
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/fudgedice
- name = "Fudge dice"
- reqs = list(
- /obj/item/dice = 1,
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/fudgedice
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/chocoorange
- name = "Choco orange"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/chocoorange
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/loadedbakedpotato
- name = "Loaded baked potato"
+/datum/crafting_recipe/food/beans
+ name = "Beans"
time = 40
- reqs = list(
- /obj/item/reagent_containers/food/snacks/grown/potato = 1,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1
+ reqs = list(/datum/reagent/consumable/ketchup = 5,
+ /obj/item/reagent_containers/food/snacks/grown/soybeans = 2
)
- result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
+ result = /obj/item/reagent_containers/food/snacks/beans
+ subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/branrequests
+ name = "Bran Requests Cereal"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/grown/wheat = 1,
+ /obj/item/reagent_containers/food/snacks/no_raisin = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/branrequests
+ subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/oatmeal
+ name = "Oatmeal"
+ reqs = list(
+ /datum/reagent/consumable/milk = 10,
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/grown/oat = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/salad/oatmeal
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/cheesyfries
@@ -68,24 +40,6 @@
result = /obj/item/reagent_containers/food/snacks/cheesyfries
subcategory = CAT_MISCFOOD
-/datum/crafting_recipe/food/wrap
- name = "Wrap"
- reqs = list(/datum/reagent/consumable/soysauce = 10,
- /obj/item/reagent_containers/food/snacks/friedegg = 1,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/eggwrap
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/beans
- name = "Beans"
- time = 40
- reqs = list(/datum/reagent/consumable/ketchup = 5,
- /obj/item/reagent_containers/food/snacks/grown/soybeans = 2
- )
- result = /obj/item/reagent_containers/food/snacks/beans
- subcategory = CAT_MISCFOOD
-
/datum/crafting_recipe/food/eggplantparm
name ="Eggplant parmigiana"
reqs = list(
@@ -95,91 +49,14 @@
result = /obj/item/reagent_containers/food/snacks/eggplantparm
subcategory = CAT_MISCFOOD
-/datum/crafting_recipe/food/baguette
- name = "Baguette"
+/datum/crafting_recipe/food/loadedbakedpotato
+ name = "Loaded baked potato"
time = 40
- reqs = list(/datum/reagent/consumable/sodiumchloride = 1,
- /datum/reagent/consumable/blackpepper = 1,
- /obj/item/reagent_containers/food/snacks/pastrybase = 2
- )
- result = /obj/item/reagent_containers/food/snacks/baguette
- subcategory = CAT_MISCFOOD
-
-////////////////////////////////////////////////TOAST////////////////////////////////////////////////
-
-/datum/crafting_recipe/food/slimetoast
- name = "Slime toast"
reqs = list(
- /datum/reagent/toxin/slimejelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+ /obj/item/reagent_containers/food/snacks/grown/potato = 1,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1
)
- result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/jelliedtoast
- name = "Jellied toast"
- reqs = list(
- /datum/reagent/consumable/cherryjelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/peanutbuttertoast
- name = "Peanut butter toast"
- reqs = list(
- /datum/reagent/consumable/peanut_butter = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/twobread
- name = "Two bread"
- reqs = list(
- /datum/reagent/consumable/ethanol/wine = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 2
- )
- result = /obj/item/reagent_containers/food/snacks/twobread
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/burrito
- name ="Burrito"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/tortilla = 1,
- /obj/item/reagent_containers/food/snacks/grown/soybeans = 2
- )
- result = /obj/item/reagent_containers/food/snacks/burrito
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/cheesyburrito
- name ="Cheesy burrito"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/tortilla = 1,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 2,
- /obj/item/reagent_containers/food/snacks/grown/soybeans = 1
- )
- result = /obj/item/reagent_containers/food/snacks/cheesyburrito
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/carneburrito
- name ="Carne de asada burrito"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/tortilla = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
- /obj/item/reagent_containers/food/snacks/grown/soybeans = 1
- )
- result = /obj/item/reagent_containers/food/snacks/carneburrito
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/fuegoburrito
- name ="Fuego plasma burrito"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/tortilla = 1,
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2,
- /obj/item/reagent_containers/food/snacks/grown/soybeans = 1
- )
- result = /obj/item/reagent_containers/food/snacks/fuegoburrito
+ result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/melonfruitbowl
@@ -195,35 +72,6 @@
result = /obj/item/reagent_containers/food/snacks/melonfruitbowl
subcategory = CAT_MISCFOOD
-/datum/crafting_recipe/food/nachos
- name ="Nachos"
- reqs = list(
- /datum/reagent/consumable/sodiumchloride = 1,
- /obj/item/reagent_containers/food/snacks/tortilla = 1
- )
- result = /obj/item/reagent_containers/food/snacks/nachos
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/cheesynachos
- name ="Cheesy nachos"
- reqs = list(
- /datum/reagent/consumable/sodiumchloride = 1,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/tortilla = 1
- )
- result = /obj/item/reagent_containers/food/snacks/cheesynachos
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/cubannachos
- name ="Cuban nachos"
- reqs = list(
- /datum/reagent/consumable/ketchup = 5,
- /obj/item/reagent_containers/food/snacks/grown/chili = 2,
- /obj/item/reagent_containers/food/snacks/tortilla = 1
- )
- result = /obj/item/reagent_containers/food/snacks/cubannachos
- subcategory = CAT_MISCFOOD
-
/datum/crafting_recipe/food/melonkeg
name ="Melon keg"
reqs = list(
@@ -235,16 +83,6 @@
result = /obj/item/reagent_containers/food/snacks/melonkeg
subcategory = CAT_MISCFOOD
-/datum/crafting_recipe/food/honeybar
- name = "Honey nut bar"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/grown/oat = 1,
- /datum/reagent/consumable/honey = 5
- )
- result = /obj/item/reagent_containers/food/snacks/honeybar
- subcategory = CAT_MISCFOOD
-
-
/datum/crafting_recipe/food/stuffedlegion
name = "Stuffed legion"
time = 40
@@ -257,7 +95,6 @@
result = /obj/item/reagent_containers/food/snacks/stuffedlegion
subcategory = CAT_MISCFOOD
-
/datum/crafting_recipe/lizardwine //not a subtype of /datum/crafting_recipe/food due to a bug where the resulting bottle would contain 100u of lizardwine and 100u of ethanol.
name = "Lizard wine"
time = 40
@@ -269,7 +106,6 @@
category = CAT_FOOD
subcategory = CAT_MISCFOOD
-
/datum/crafting_recipe/food/powercrepe
name = "Powercrepe"
time = 40
@@ -283,36 +119,6 @@
result = /obj/item/reagent_containers/food/snacks/powercrepe
subcategory = CAT_MISCFOOD
-/datum/crafting_recipe/food/taco
- name ="Classic Taco"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/tortilla = 1,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/taco
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/tacoplain
- name ="Plain Taco"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/tortilla = 1,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/taco/plain
- subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/branrequests
- name = "Bran Requests Cereal"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/grown/wheat = 1,
- /obj/item/reagent_containers/food/snacks/no_raisin = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/branrequests
- subcategory = CAT_MISCFOOD
-
/datum/crafting_recipe/food/ricepudding
name = "Rice pudding"
reqs = list(
@@ -332,12 +138,3 @@
)
result = /obj/item/reagent_containers/food/snacks/riceball
subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/chocolatestrawberry
- name = "Chocolate Strawberry"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
- /obj/item/reagent_containers/food/snacks/grown/strawberry = 1
- )
- result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry
- subcategory = CAT_MISCFOOD
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index 62b8509eb1..b19a2a8a67 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -123,23 +123,6 @@ datum/crafting_recipe/food/donut/meat
////////////////////////////////////////////////////JELLY DONUTS///////////////////////////////////////////////////////
-/datum/crafting_recipe/food/donut/jelly/berry
- name = "Berry Jelly Donut"
- reqs = list(
- /datum/reagent/consumable/berryjuice = 3,
- /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry
-
-/datum/crafting_recipe/food/donut/jelly/trumpet
- name = "Spaceman's Jelly Donut"
- reqs = list(
- /datum/reagent/medicine/polypyr = 3,
- /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
- )
-
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet
-
/datum/crafting_recipe/food/donut/jelly/apple
name = "Apple Jelly Donut"
reqs = list(
@@ -148,21 +131,13 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/apple
-/datum/crafting_recipe/food/donut/jelly/caramel
- name = "Caramel Jelly Donut"
+/datum/crafting_recipe/food/donut/jelly/berry
+ name = "Berry Jelly Donut"
reqs = list(
- /datum/reagent/consumable/caramel = 3,
+ /datum/reagent/consumable/berryjuice = 3,
/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel
-
-/datum/crafting_recipe/food/donut/jelly/choco
- name = "Chocolate Jelly Donut"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco
+ result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry
/datum/crafting_recipe/food/donut/jelly/blumpkin
name = "Blumpkin Jelly Donut"
@@ -180,6 +155,22 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo
+/datum/crafting_recipe/food/donut/jelly/caramel
+ name = "Caramel Jelly Donut"
+ reqs = list(
+ /datum/reagent/consumable/caramel = 3,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel
+
+/datum/crafting_recipe/food/donut/jelly/choco
+ name = "Chocolate Jelly Donut"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco
+
/datum/crafting_recipe/food/donut/jelly/matcha
name = "Matcha Jelly Donut"
reqs = list(
@@ -188,8 +179,24 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/matcha
+/datum/crafting_recipe/food/donut/jelly/trumpet
+ name = "Spaceman's Jelly Donut"
+ reqs = list(
+ /datum/reagent/medicine/polypyr = 3,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet
+
////////////////////////////////////////////////////SLIME DONUTS///////////////////////////////////////////////////////
+/datum/crafting_recipe/food/donut/slimejelly/apple
+ name = "Apple Slime Donut"
+ reqs = list(
+ /datum/reagent/consumable/applejuice = 3,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple
+
/datum/crafting_recipe/food/donut/slimejelly/berry
name = "Berry Slime Donut"
reqs = list(
@@ -198,22 +205,21 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry
-/datum/crafting_recipe/food/donut/slimejelly/trumpet
- name = "Spaceman's Slime Donut"
+/datum/crafting_recipe/food/donut/slimejelly/blumpkin
+ name = "Blumpkin Slime Donut"
reqs = list(
- /datum/reagent/medicine/polypyr = 3,
+ /datum/reagent/consumable/blumpkinjuice = 3,
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
)
+ result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet
-
-/datum/crafting_recipe/food/donut/slimejelly/apple
- name = "Apple Slime Donut"
+/datum/crafting_recipe/food/donut/slimejelly/bungo
+ name = "Bungo Slime Donut"
reqs = list(
- /datum/reagent/consumable/applejuice = 3,
+ /datum/reagent/consumable/bungojuice = 3,
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple
+ result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo
/datum/crafting_recipe/food/donut/slimejelly/caramel
name = "Caramel Slime Donut"
@@ -231,21 +237,14 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco
-/datum/crafting_recipe/food/donut/slimejelly/blumpkin
- name = "Blumpkin Slime Donut"
+/datum/crafting_recipe/food/donut/slimejelly/trumpet
+ name = "Spaceman's Slime Donut"
reqs = list(
- /datum/reagent/consumable/blumpkinjuice = 3,
+ /datum/reagent/medicine/polypyr = 3,
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin
-/datum/crafting_recipe/food/donut/slimejelly/bungo
- name = "Bungo Slime Donut"
- reqs = list(
- /datum/reagent/consumable/bungojuice = 3,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo
+ result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet
/datum/crafting_recipe/food/donut/slimejelly/matcha
name = "Matcha Slime Donut"
@@ -388,123 +387,8 @@ datum/crafting_recipe/food/donut/meat
result = /obj/item/reagent_containers/food/snacks/muffin/poppy
subcategory = CAT_PASTRY
-/datum/crafting_recipe/food/chawanmushi
- name = "Chawanmushi"
- reqs = list(
- /datum/reagent/water = 5,
- /datum/reagent/consumable/soysauce = 5,
- /obj/item/reagent_containers/food/snacks/boiledegg = 2,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
- )
- result = /obj/item/reagent_containers/food/snacks/chawanmushi
- subcategory = CAT_PASTRY
-
////////////////////////////////////////////OTHER////////////////////////////////////////////
-/datum/crafting_recipe/food/meatbun
- name = "Meat bun"
- reqs = list(
- /datum/reagent/consumable/soysauce = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1,
- /obj/item/reagent_containers/food/snacks/faggot = 1,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 1
- )
- result = /obj/item/reagent_containers/food/snacks/meatbun
- subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/khachapuri
- name = "Khachapuri"
- reqs = list(
- /datum/reagent/consumable/eggyolk = 5,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/khachapuri
- subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/sugarcookie
- time = 15
- name = "Sugar cookie"
- reqs = list(
- /datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/food/snacks/pastrybase = 1
- )
- result = /obj/item/reagent_containers/food/snacks/sugarcookie
- subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/fortunecookie
- time = 15
- name = "Fortune cookie"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pastrybase = 1,
- /obj/item/paper = 1
- )
- parts = list(
- /obj/item/paper = 1
- )
- result = /obj/item/reagent_containers/food/snacks/fortunecookie
- subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/poppypretzel
- time = 15
- name = "Poppy pretzel"
- reqs = list(
- /obj/item/seeds/poppy = 1,
- /obj/item/reagent_containers/food/snacks/pastrybase = 1
- )
- result = /obj/item/reagent_containers/food/snacks/poppypretzel
- subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/plumphelmetbiscuit
- time = 15
- name = "Plumphelmet biscuit"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pastrybase = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
- )
- result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
- subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/cracker
- time = 15
- name = "Cracker"
- reqs = list(
- /datum/reagent/consumable/sodiumchloride = 1,
- /obj/item/reagent_containers/food/snacks/pastrybase = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/cracker
- subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/chococornet
- name = "Choco cornet"
- reqs = list(
- /datum/reagent/consumable/sodiumchloride = 1,
- /obj/item/reagent_containers/food/snacks/pastrybase = 1,
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1
- )
- result = /obj/item/reagent_containers/food/snacks/chococornet
- subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/oatmealcookie
- name = "Oatmeal cookie"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pastrybase = 1,
- /obj/item/reagent_containers/food/snacks/grown/oat = 1
- )
- result = /obj/item/reagent_containers/food/snacks/oatmealcookie
- subcategory = CAT_PASTRY
-
-
-/datum/crafting_recipe/food/raisincookie
- name = "Raisin cookie"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/no_raisin = 1,
- /obj/item/reagent_containers/food/snacks/pastrybase = 1,
- /obj/item/reagent_containers/food/snacks/grown/oat = 1
- )
- result = /obj/item/reagent_containers/food/snacks/raisincookie
- subcategory = CAT_PASTRY
-
/datum/crafting_recipe/food/cherrycupcake
name = "Cherry cupcake"
reqs = list(
@@ -532,6 +416,55 @@ datum/crafting_recipe/food/donut/meat
result = /obj/item/reagent_containers/food/snacks/strawberrycupcake
subcategory = CAT_PASTRY
+/datum/crafting_recipe/food/raisincookie
+ name = "Raisin cookie"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/no_raisin = 1,
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/reagent_containers/food/snacks/grown/oat = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/raisincookie
+ subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/oatmealcookie
+ name = "Oatmeal cookie"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/reagent_containers/food/snacks/grown/oat = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/oatmealcookie
+ subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/sugarcookie
+ time = 15
+ name = "Sugar cookie"
+ reqs = list(
+ /datum/reagent/consumable/sugar = 5,
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/sugarcookie
+ subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/chococornet
+ name = "Choco cornet"
+ reqs = list(
+ /datum/reagent/consumable/sodiumchloride = 1,
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/chococornet
+ subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/cracker
+ time = 15
+ name = "Cracker"
+ reqs = list(
+ /datum/reagent/consumable/sodiumchloride = 1,
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/cracker
+ subcategory = CAT_PASTRY
+
/datum/crafting_recipe/food/honeybun
name = "Honey bun"
reqs = list(
@@ -539,4 +472,24 @@ datum/crafting_recipe/food/donut/meat
/datum/reagent/consumable/honey = 5
)
result = /obj/item/reagent_containers/food/snacks/honeybun
- subcategory = CAT_PASTRY
\ No newline at end of file
+ subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/poppypretzel
+ time = 15
+ name = "Poppy pretzel"
+ reqs = list(
+ /obj/item/seeds/poppy = 1,
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/poppypretzel
+ subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/plumphelmetbiscuit
+ time = 15
+ name = "Plumphelmet biscuit"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
+ subcategory = CAT_PASTRY
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
index b5bed4d5fc..eabad73138 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
@@ -1,7 +1,16 @@
// see code/module/crafting/table.dm
-////////////////////////////////////////////////PIES////////////////////////////////////////////////
+//////////////////////////////////FRUITS/////////////////////////////////////////
+
+/datum/crafting_recipe/food/applepie
+ name = "Apple pie"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/apple = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pie/applepie
+ subcategory = CAT_PIE
/datum/crafting_recipe/food/bananacreampie
name = "Banana cream pie"
@@ -13,33 +22,13 @@
result = /obj/item/reagent_containers/food/snacks/pie/cream
subcategory = CAT_PIE
-/datum/crafting_recipe/food/meatpie
- name = "Meat pie"
- reqs = list(
- /datum/reagent/consumable/blackpepper = 1,
- /datum/reagent/consumable/sodiumchloride = 1,
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pie/meatpie
- subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/tofupie
- name = "Tofu pie"
+/datum/crafting_recipe/food/berryclafoutis
+ name = "Berry clafoutis"
reqs = list(
/obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 1
+ /obj/item/reagent_containers/food/snacks/grown/berries = 1
)
- result = /obj/item/reagent_containers/food/snacks/pie/tofupie
- subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/xenopie
- name = "Xeno pie"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie
+ result = /obj/item/reagent_containers/food/snacks/pie/berryclafoutis
subcategory = CAT_PIE
/datum/crafting_recipe/food/cherrypie
@@ -51,13 +40,53 @@
result = /obj/item/reagent_containers/food/snacks/pie/cherrypie
subcategory = CAT_PIE
-/datum/crafting_recipe/food/berryclafoutis
- name = "Berry clafoutis"
+/datum/crafting_recipe/food/frostypie
+ name = "Frosty pie"
reqs = list(
/obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/berries = 1
+ /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
)
- result = /obj/item/reagent_containers/food/snacks/pie/berryclafoutis
+ result = /obj/item/reagent_containers/food/snacks/pie/frostypie
+ subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/grapetart
+ name = "Grape tart"
+ reqs = list(
+ /datum/reagent/consumable/milk = 5,
+ /datum/reagent/consumable/sugar = 5,
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/grapes = 3
+ )
+ result = /obj/item/reagent_containers/food/snacks/pie/grapetart
+ subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/peachpie
+ name = "Peach Pie"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/peach = 3
+ )
+ result = /obj/item/reagent_containers/food/snacks/pie/peachpie
+ subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/strawberrypie
+ name = "Strawberry pie"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/strawberry = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie
+ subcategory = CAT_PIE
+
+//////////OTHER PIES/////////
+
+/datum/crafting_recipe/food/amanitapie
+ name = "Amanita pie"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pie/amanita_pie
subcategory = CAT_PIE
/datum/crafting_recipe/food/bearypie
@@ -70,64 +99,14 @@
result = /obj/item/reagent_containers/food/snacks/pie/bearypie
subcategory = CAT_PIE
-/datum/crafting_recipe/food/amanitapie
- name = "Amanita pie"
+/datum/crafting_recipe/food/baklava
+ name = "Baklava pie"
reqs = list(
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1
+ /obj/item/reagent_containers/food/snacks/butter = 1,
+ /obj/item/reagent_containers/food/snacks/tortilla = 4, //Layers
+ /obj/item/seeds/wheat/oat = 3
)
- result = /obj/item/reagent_containers/food/snacks/pie/amanita_pie
- subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/plumppie
- name = "Plump pie"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pie/plump_pie
- subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/applepie
- name = "Apple pie"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/apple = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pie/applepie
- subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/pumpkinpie
- name = "Pumpkin pie"
- reqs = list(
- /datum/reagent/consumable/milk = 5,
- /datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/pumpkin = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pie/pumpkinpie
- subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/goldenappletart
- name = "Golden apple tart"
- reqs = list(
- /datum/reagent/consumable/milk = 5,
- /datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/apple/gold = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pie/appletart
- subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/grapetart
- name = "Grape tart"
- reqs = list(
- /datum/reagent/consumable/milk = 5,
- /datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/grapes = 3
- )
- result = /obj/item/reagent_containers/food/snacks/pie/grapetart
+ result = /obj/item/reagent_containers/food/snacks/pie/baklava
subcategory = CAT_PIE
/datum/crafting_recipe/food/blumpkinpie
@@ -151,32 +130,66 @@
result = /obj/item/reagent_containers/food/snacks/pie/dulcedebatata
subcategory = CAT_PIE
-/datum/crafting_recipe/food/frostypie
- name = "Frosty pie"
+/datum/crafting_recipe/food/meatpie
+ name = "Meat pie"
reqs = list(
+ /datum/reagent/consumable/blackpepper = 1,
+ /datum/reagent/consumable/sodiumchloride = 1,
/obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1
)
- result = /obj/item/reagent_containers/food/snacks/pie/frostypie
+ result = /obj/item/reagent_containers/food/snacks/pie/meatpie
subcategory = CAT_PIE
-/datum/crafting_recipe/food/strawberrypie
- name = "Strawberry pie"
+/datum/crafting_recipe/food/plumppie
+ name = "Plump pie"
reqs = list(
/obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/strawberry = 1
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
)
- result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie
+ result = /obj/item/reagent_containers/food/snacks/pie/plump_pie
subcategory = CAT_PIE
-/datum/crafting_recipe/food/baklava
- name = "Baklava pie"
+/datum/crafting_recipe/food/pumpkinpie
+ name = "Pumpkin pie"
reqs = list(
- /obj/item/reagent_containers/food/snacks/butter = 1,
- /obj/item/reagent_containers/food/snacks/tortilla = 4, //Layers
- /obj/item/seeds/wheat/oat = 3
+ /datum/reagent/consumable/milk = 5,
+ /datum/reagent/consumable/sugar = 5,
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/pumpkin = 1
)
- result = /obj/item/reagent_containers/food/snacks/pie/baklava
+ result = /obj/item/reagent_containers/food/snacks/pie/pumpkinpie
+ subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/tofupie
+ name = "Tofu pie"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/tofu = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pie/tofupie
+ subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/xenopie
+ name = "Xeno pie"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie
+ subcategory = CAT_PIE
+
+//////////////TARTS//////////////
+
+/datum/crafting_recipe/food/goldenappletart
+ name = "Golden apple tart"
+ reqs = list(
+ /datum/reagent/consumable/milk = 5,
+ /datum/reagent/consumable/sugar = 5,
+ /obj/item/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/reagent_containers/food/snacks/grown/apple/gold = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pie/appletart
subcategory = CAT_PIE
/datum/crafting_recipe/food/mimetart
@@ -215,12 +228,3 @@
)
result = /obj/item/reagent_containers/food/snacks/pie/cocolavatart
subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/peachpie
- name = "Peach Pie"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/peach = 3
- )
- result = /obj/item/reagent_containers/food/snacks/pie/peachpie
- subcategory = CAT_PIE
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
index 64447dd180..21112a4a4f 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
@@ -3,6 +3,40 @@
////////////////////////////////////////////////PIZZA!!!////////////////////////////////////////////////
+/datum/crafting_recipe/food/dankpizza
+ name = "Dank pizza"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pizzabread = 1,
+ /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pizza/dank
+ subcategory = CAT_PIZZA
+
+/datum/crafting_recipe/food/donkpocketpizza
+ name = "Donkpocket pizza"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pizzabread = 1,
+ /obj/item/reagent_containers/food/snacks/donkpocket/warm = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pizza/donkpocket
+ subcategory = CAT_PIZZA
+
+/datum/crafting_recipe/food/pineapplepizza
+ name = "Hawaiian pizza"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pizzabread = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/reagent_containers/food/snacks/pineappleslice = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pizza/pineapple
+ subcategory = CAT_PIZZA
+
/datum/crafting_recipe/food/margheritapizza
name = "Margherita pizza"
reqs = list(
@@ -24,18 +58,6 @@
result = /obj/item/reagent_containers/food/snacks/pizza/meat
subcategory = CAT_PIZZA
-/datum/crafting_recipe/food/arnold
- name = "Arnold pizza"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 3,
- /obj/item/ammo_casing/c9mm = 8,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pizza/arnold
- subcategory = CAT_PIZZA
-
/datum/crafting_recipe/food/mushroompizza
name = "Mushroom pizza"
reqs = list(
@@ -45,6 +67,17 @@
result = /obj/item/reagent_containers/food/snacks/pizza/mushroom
subcategory = CAT_PIZZA
+/datum/crafting_recipe/food/sassysagepizza
+ name = "Sassysage pizza"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pizzabread = 1,
+ /obj/item/reagent_containers/food/snacks/faggot = 3,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pizza/sassysage
+ subcategory = CAT_PIZZA
+
/datum/crafting_recipe/food/vegetablepizza
name = "Vegetable pizza"
reqs = list(
@@ -57,50 +90,7 @@
result = /obj/item/reagent_containers/food/snacks/pizza/vegetable
subcategory = CAT_PIZZA
-/datum/crafting_recipe/food/donkpocketpizza
- name = "Donkpocket pizza"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/donkpocket/warm = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pizza/donkpocket
- subcategory = CAT_PIZZA
-
-/datum/crafting_recipe/food/dankpizza
- name = "Dank pizza"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pizza/dank
- subcategory = CAT_PIZZA
-
-/datum/crafting_recipe/food/sassysagepizza
- name = "Sassysage pizza"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/faggot = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pizza/sassysage
- subcategory = CAT_PIZZA
-
-/datum/crafting_recipe/food/pineapplepizza
- name = "Hawaiian pizza"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
- /obj/item/reagent_containers/food/snacks/pineappleslice = 3,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pizza/pineapple
- subcategory = CAT_PIZZA
+//////Special Pizzas/////
/datum/crafting_recipe/food/pineapplepizza/anomaly
name = "Anomaly Hawaiian pizza"
@@ -120,3 +110,15 @@
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
result = /obj/item/pizzabox/infinite
subcategory = CAT_PIZZA
+
+/datum/crafting_recipe/food/arnold
+ name = "Arnold pizza"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/pizzabread = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 3,
+ /obj/item/ammo_casing/c9mm = 8,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/pizza/arnold
+ subcategory = CAT_PIZZA
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
index 39eeb7d936..0a44c4590e 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
@@ -3,16 +3,6 @@
////////////////////////////////////////////////SALADS////////////////////////////////////////////////
-/datum/crafting_recipe/food/herbsalad
- name = "Herb salad"
- reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
- /obj/item/reagent_containers/food/snacks/grown/apple = 1
- )
- result = /obj/item/reagent_containers/food/snacks/salad/herbsalad
- subcategory = CAT_SALAD
-
/datum/crafting_recipe/food/aesirsalad
name = "Aesir salad"
reqs = list(
@@ -23,38 +13,16 @@
result = /obj/item/reagent_containers/food/snacks/salad/aesirsalad
subcategory = CAT_SALAD
-/datum/crafting_recipe/food/validsalad
- name = "Valid salad"
+/datum/crafting_recipe/food/citrusdelight
+ name = "Citrus delight"
reqs = list(
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
- /obj/item/reagent_containers/food/snacks/grown/potato = 1,
- /obj/item/reagent_containers/food/snacks/faggot = 1
- )
- result = /obj/item/reagent_containers/food/snacks/salad/validsalad
- subcategory = CAT_SALAD
+ /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1
-/datum/crafting_recipe/food/monkeysdelight
- name = "Monkeys delight"
- reqs = list(
- /datum/reagent/consumable/flour = 5,
- /datum/reagent/consumable/sodiumchloride = 1,
- /datum/reagent/consumable/blackpepper = 1,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/monkeycube = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1
)
- result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight
- subcategory = CAT_SALAD
-
-/datum/crafting_recipe/food/oatmeal
- name = "Oatmeal"
- reqs = list(
- /datum/reagent/consumable/milk = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/oat = 1
- )
- result = /obj/item/reagent_containers/food/snacks/salad/oatmeal
+ result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight
subcategory = CAT_SALAD
/datum/crafting_recipe/food/fruitsalad
@@ -70,6 +38,16 @@
result = /obj/item/reagent_containers/food/snacks/salad/fruit
subcategory = CAT_SALAD
+/datum/crafting_recipe/food/herbsalad
+ name = "Herb salad"
+ reqs = list(
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
+ /obj/item/reagent_containers/food/snacks/grown/apple = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/salad/herbsalad
+ subcategory = CAT_SALAD
+
/datum/crafting_recipe/food/junglesalad
name = "Jungle salad"
reqs = list(
@@ -83,14 +61,26 @@
result = /obj/item/reagent_containers/food/snacks/salad/jungle
subcategory = CAT_SALAD
-/datum/crafting_recipe/food/citrusdelight
- name = "Citrus delight"
+/datum/crafting_recipe/food/monkeysdelight
+ name = "Monkeys delight"
+ reqs = list(
+ /datum/reagent/consumable/flour = 5,
+ /datum/reagent/consumable/sodiumchloride = 1,
+ /datum/reagent/consumable/blackpepper = 1,
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/monkeycube = 1,
+ /obj/item/reagent_containers/food/snacks/grown/banana = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight
+ subcategory = CAT_SALAD
+
+/datum/crafting_recipe/food/validsalad
+ name = "Valid salad"
reqs = list(
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1
-
+ /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
+ /obj/item/reagent_containers/food/snacks/grown/potato = 1,
+ /obj/item/reagent_containers/food/snacks/faggot = 1
)
- result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight
+ result = /obj/item/reagent_containers/food/snacks/salad/validsalad
subcategory = CAT_SALAD
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
index 127b2cc238..d2ea1da50a 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -84,7 +84,6 @@
result = /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
subcategory = CAT_SANDWICH
-
/datum/crafting_recipe/food/notasandwich
name = "Not a sandwich"
reqs = list(
@@ -113,4 +112,4 @@
/obj/item/reagent_containers/food/snacks/sausage = 1
)
result = /obj/item/reagent_containers/food/snacks/hotdog
- subcategory = CAT_SANDWICH
+ subcategory = CAT_SANDWICH //I don't agree with this.
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
index 76a5a64096..0c966faf33 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -3,71 +3,46 @@
////////////////////////////////////////////////SOUP////////////////////////////////////////////////
-/datum/crafting_recipe/food/meatballsoup
- name = "Meatball soup"
+/datum/crafting_recipe/food/amanitajelly
+ name = "Amanita jelly"
+ reqs = list(
+ /datum/reagent/consumable/ethanol/vodka = 5,
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly
+ subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/beetsoup
+ name = "Beet soup"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/faggot = 1,
- /obj/item/reagent_containers/food/snacks/grown/carrot = 1,
- /obj/item/reagent_containers/food/snacks/grown/potato = 1
+ /obj/item/reagent_containers/food/snacks/grown/whitebeet = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
)
- result = /obj/item/reagent_containers/food/snacks/soup/meatball
+ result = /obj/item/reagent_containers/food/snacks/soup/beet
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/vegetablesoup
- name = "Vegetable soup"
+/datum/crafting_recipe/food/bloodsoup
+ name = "Blood soup"
+ reqs = list(
+ /datum/reagent/blood = 10,
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/blood
+ subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/clownstears
+ name = "Clowns tears"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/carrot = 1,
- /obj/item/reagent_containers/food/snacks/grown/corn = 1,
- /obj/item/reagent_containers/food/snacks/grown/eggplant = 1,
- /obj/item/reagent_containers/food/snacks/grown/potato = 1
+ /obj/item/reagent_containers/food/snacks/grown/banana = 1,
+ /obj/item/stack/ore/bananium = 1
)
- result = /obj/item/reagent_containers/food/snacks/soup/vegetable
- subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/nettlesoup
- name = "Nettle soup"
- reqs = list(
- /datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/nettle = 1,
- /obj/item/reagent_containers/food/snacks/grown/potato = 1,
- /obj/item/reagent_containers/food/snacks/boiledegg = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/nettle
- subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/wingfangchu
- name = "Wingfangchu"
- reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
- /datum/reagent/consumable/soysauce = 5,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2
- )
- result = /obj/item/reagent_containers/food/snacks/soup/wingfangchu
- subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/wishsoup
- name = "Wish soup"
- reqs = list(
- /datum/reagent/water = 20,
- /obj/item/reagent_containers/glass/bowl = 1
- )
- result= /obj/item/reagent_containers/food/snacks/soup/wish
- subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/hotchili
- name = "Hot chili"
- reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
- /obj/item/reagent_containers/food/snacks/grown/chili = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/hotchili
+ result = /obj/item/reagent_containers/food/snacks/soup/clownstears
subcategory = CAT_SOUP
/datum/crafting_recipe/food/coldchili
@@ -81,16 +56,6 @@
result = /obj/item/reagent_containers/food/snacks/soup/coldchili
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/tomatosoup
- name = "Tomato soup"
- reqs = list(
- /datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 2
- )
- result = /obj/item/reagent_containers/food/snacks/soup/tomato
- subcategory = CAT_SOUP
-
/datum/crafting_recipe/food/eyeballsoup
name = "Eyeball soup"
reqs = list(
@@ -102,6 +67,28 @@
result = /obj/item/reagent_containers/food/snacks/soup/tomato/eyeball
subcategory = CAT_SOUP
+/datum/crafting_recipe/food/hotchili
+ name = "Hot chili"
+ reqs = list(
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/reagent_containers/food/snacks/grown/chili = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/hotchili
+ subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/meatballsoup
+ name = "Meatball soup"
+ reqs = list(
+ /datum/reagent/water = 10,
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/faggot = 1,
+ /obj/item/reagent_containers/food/snacks/grown/carrot = 1,
+ /obj/item/reagent_containers/food/snacks/grown/potato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/meatball
+ subcategory = CAT_SOUP
/datum/crafting_recipe/food/milosoup
name = "Milo soup"
@@ -114,35 +101,15 @@
result = /obj/item/reagent_containers/food/snacks/soup/milo
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/bloodsoup
- name = "Blood soup"
+/datum/crafting_recipe/food/mushroomsoup
+ name = "Mushroom soup"
reqs = list(
- /datum/reagent/blood = 10,
+ /datum/reagent/consumable/milk = 5,
+ /datum/reagent/water = 5,
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
)
- result = /obj/item/reagent_containers/food/snacks/soup/blood
- subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/slimesoup
- name = "Slime soup"
- reqs = list(
- /datum/reagent/water = 10,
- /datum/reagent/toxin/slimejelly = 5,
- /obj/item/reagent_containers/glass/bowl = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/slime
- subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/clownstears
- name = "Clowns tears"
- reqs = list(
- /datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
- /obj/item/stack/ore/bananium = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/clownstears
+ result = /obj/item/reagent_containers/food/snacks/soup/mushroom
subcategory = CAT_SOUP
/datum/crafting_recipe/food/mysterysoup
@@ -158,26 +125,37 @@
result = /obj/item/reagent_containers/food/snacks/soup/mystery
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/mushroomsoup
- name = "Mushroom soup"
- reqs = list(
- /datum/reagent/consumable/milk = 5,
- /datum/reagent/water = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/mushroom
- subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/beetsoup
- name = "Beet soup"
+/datum/crafting_recipe/food/nettlesoup
+ name = "Nettle soup"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/whitebeet = 1,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+ /obj/item/reagent_containers/food/snacks/grown/nettle = 1,
+ /obj/item/reagent_containers/food/snacks/grown/potato = 1,
+ /obj/item/reagent_containers/food/snacks/boiledegg = 1
)
- result = /obj/item/reagent_containers/food/snacks/soup/beet
+ result = /obj/item/reagent_containers/food/snacks/soup/nettle
+ subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/redbeetsoup
+ name = "Red beet soup"
+ reqs = list(
+ /datum/reagent/water = 10,
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/beet/red
+ subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/slimesoup
+ name = "Slime soup"
+ reqs = list(
+ /datum/reagent/water = 10,
+ /datum/reagent/toxin/slimejelly = 5,
+ /obj/item/reagent_containers/glass/bowl = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/slime
subcategory = CAT_SOUP
/datum/crafting_recipe/food/stew
@@ -205,16 +183,6 @@
result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/amanitajelly
- name = "Amanita jelly"
- reqs = list(
- /datum/reagent/consumable/ethanol/vodka = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3
- )
- result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly
- subcategory = CAT_SOUP
-
/datum/crafting_recipe/food/sweetpotatosoup
name = "Sweet potato soup"
reqs = list(
@@ -226,13 +194,44 @@
result = /obj/item/reagent_containers/food/snacks/soup/sweetpotato
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/redbeetsoup
- name = "Red beet soup"
+/datum/crafting_recipe/food/tomatosoup
+ name = "Tomato soup"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 1
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 2
)
- result = /obj/item/reagent_containers/food/snacks/soup/beet/red
+ result = /obj/item/reagent_containers/food/snacks/soup/tomato
subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/vegetablesoup
+ name = "Vegetable soup"
+ reqs = list(
+ /datum/reagent/water = 10,
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/food/snacks/grown/carrot = 1,
+ /obj/item/reagent_containers/food/snacks/grown/corn = 1,
+ /obj/item/reagent_containers/food/snacks/grown/eggplant = 1,
+ /obj/item/reagent_containers/food/snacks/grown/potato = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/vegetable
+ subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/wingfangchu
+ name = "Wingfangchu"
+ reqs = list(
+ /obj/item/reagent_containers/glass/bowl = 1,
+ /datum/reagent/consumable/soysauce = 5,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/wingfangchu
+ subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/wishsoup
+ name = "Wish soup"
+ reqs = list(
+ /datum/reagent/water = 20,
+ /obj/item/reagent_containers/glass/bowl = 1
+ )
+ result= /obj/item/reagent_containers/food/snacks/soup/wish
+ subcategory = CAT_SOUP
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
index 355402111c..12020a6241 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
@@ -3,15 +3,6 @@
////////////////////////////////////////////////SPAGHETTI////////////////////////////////////////////////
-/datum/crafting_recipe/food/tomatopasta
- name = "Tomato pasta"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledspaghetti = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 2
- )
- result = /obj/item/reagent_containers/food/snacks/pastatomato
- subcategory = CAT_SPAGHETTI
-
/datum/crafting_recipe/food/copypasta
name = "Copypasta"
reqs = list(
@@ -38,6 +29,17 @@
result = /obj/item/reagent_containers/food/snacks/spesslaw
subcategory = CAT_SPAGHETTI
+/datum/crafting_recipe/food/tomatopasta
+ name = "Tomato pasta"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledspaghetti = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/pastatomato
+ subcategory = CAT_SPAGHETTI
+
+////////////NOODLES///////////
+
/datum/crafting_recipe/food/beefnoodle
name = "Beef noodle"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm
index 9dbf1d684b..5a95ba9907 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm
@@ -1,4 +1,5 @@
-//////////////////////////Sushi Components///////////////////////
+/////////////Recategorizing this as -Eastern- foods///////////////
+///////////////////////Sushi Components///////////////////////////
/datum/crafting_recipe/food/sushi_rice
name = "Sushi Rice"
@@ -93,33 +94,58 @@
result = /obj/item/reagent_containers/food/snacks/sushie_pro
subcategory = CAT_FISH
-///////////////Gaijin junk/////////////////////////////////////
+//////////////////Not-Fish//////////////////////
-/datum/crafting_recipe/food/fishfingers
- name = "Fish fingers"
+/datum/crafting_recipe/food/chawanmushi
+ name = "Chawanmushi"
reqs = list(
- /datum/reagent/consumable/flour = 5,
+ /datum/reagent/water = 5,
+ /datum/reagent/consumable/soysauce = 5,
+ /obj/item/reagent_containers/food/snacks/boiledegg = 2,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/chawanmushi
+ subcategory = CAT_FISH
+
+/datum/crafting_recipe/food/khachapuri
+ name = "Khachapuri"
+ reqs = list(
+ /datum/reagent/consumable/eggyolk = 5,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/khachapuri
+ subcategory = CAT_FISH
+
+/datum/crafting_recipe/food/rawkhinkali
+ name = "Raw Khinkali"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/doughslice = 1,
+ /obj/item/reagent_containers/food/snacks/faggot = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/rawkhinkali
+ subcategory = CAT_FISH
+
+/datum/crafting_recipe/food/meatbun
+ name = "Meat bun"
+ reqs = list(
+ /datum/reagent/consumable/soysauce = 5,
/obj/item/reagent_containers/food/snacks/bun = 1,
- /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ /obj/item/reagent_containers/food/snacks/faggot = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
- result = /obj/item/reagent_containers/food/snacks/fishfingers
+ result = /obj/item/reagent_containers/food/snacks/meatbun
subcategory = CAT_FISH
-/datum/crafting_recipe/food/cubancarp
- name = "Cuban carp"
+/datum/crafting_recipe/food/fortunecookie
+ time = 15
+ name = "Fortune cookie"
reqs = list(
- /datum/reagent/consumable/flour = 5,
- /obj/item/reagent_containers/food/snacks/grown/chili = 1,
- /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/paper = 1
)
- result = /obj/item/reagent_containers/food/snacks/cubancarp
+ parts = list(
+ /obj/item/paper = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/fortunecookie
subcategory = CAT_FISH
-
-/datum/crafting_recipe/food/fishandchips
- name = "Fish and chips"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/fries = 1,
- /obj/item/reagent_containers/food/snacks/carpmeat = 1
- )
- result = /obj/item/reagent_containers/food/snacks/fishandchips
- subcategory = CAT_FISH
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm
new file mode 100644
index 0000000000..a06bfb880b
--- /dev/null
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm
@@ -0,0 +1,117 @@
+// see code/module/crafting/table.dm
+
+// SWEETS
+
+/datum/crafting_recipe/food/candiedapple
+ name = "Candied apple"
+ reqs = list(/datum/reagent/water = 5,
+ /datum/reagent/consumable/sugar = 5,
+ /obj/item/reagent_containers/food/snacks/grown/apple = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/candiedapple
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/chococoin
+ name = "Choco coin"
+ reqs = list(
+ /obj/item/coin = 1,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/chococoin
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/chocoorange
+ name = "Choco orange"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/chocoorange
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/chocolatestrawberry
+ name = "Chocolate Strawberry"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+ /obj/item/reagent_containers/food/snacks/grown/strawberry = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/fudgedice
+ name = "Fudge dice"
+ reqs = list(
+ /obj/item/dice = 1,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/fudgedice
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/honeybar
+ name = "Honey nut bar"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/grown/oat = 1,
+ /datum/reagent/consumable/honey = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/honeybar
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/spiderlollipop
+ name = "Spider Lollipop"
+ reqs = list(/obj/item/stack/rods = 1,
+ /datum/reagent/consumable/sugar = 5,
+ /datum/reagent/water = 5,
+ /obj/item/reagent_containers/food/snacks/spiderling = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/spiderlollipop
+ subcategory = CAT_SWEETS
+
+//Easter Stuff
+
+/datum/crafting_recipe/food/chocolatebunny
+ name = "Chocolate bunny"
+ reqs = list(
+ /datum/reagent/consumable/sugar = 2,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/chocolatebunny
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/hotcrossbun
+ name = "Hot-Cross Bun"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /datum/reagent/consumable/sugar = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/hotcrossbun
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/briochecake
+ name = "Brioche cake"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /datum/reagent/consumable/sugar = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/store/cake/brioche
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/scotchegg
+ name = "Scotch egg"
+ reqs = list(
+ /datum/reagent/consumable/sodiumchloride = 1,
+ /datum/reagent/consumable/blackpepper = 1,
+ /obj/item/reagent_containers/food/snacks/boiledegg = 1,
+ /obj/item/reagent_containers/food/snacks/faggot = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/scotchegg
+ subcategory = CAT_SWEETS
+
+/datum/crafting_recipe/food/mammi
+ name = "Mammi"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+ /datum/reagent/consumable/milk = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/soup/mammi
+ subcategory = CAT_SWEETS
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index 1898fe4b01..5f2d92fc93 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -140,96 +140,8 @@
containsPrize = FALSE
qdel(src)
-//Easter Recipes + food
-/obj/item/reagent_containers/food/snacks/hotcrossbun
- bitesize = 2
- name = "hot-cross bun"
- desc = "The Cross represents the Assistants that died for your sins."
- icon_state = "hotcrossbun"
-
-/datum/crafting_recipe/food/hotcrossbun
- name = "Hot-Cross Bun"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
- /datum/reagent/consumable/sugar = 1
- )
- result = /obj/item/reagent_containers/food/snacks/hotcrossbun
- category = CAT_MISCFOOD
-
-
-/obj/item/reagent_containers/food/snacks/store/cake/brioche
- name = "brioche cake"
- desc = "A ring of sweet, glazed buns."
- icon_state = "briochecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
- slices_num = 6
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
-
-/obj/item/reagent_containers/food/snacks/cakeslice/brioche
- name = "brioche cake slice"
- desc = "Delicious sweet-bread. Who needs anything else?"
- icon_state = "briochecake_slice"
- filling_color = "#FFD700"
-
-/datum/crafting_recipe/food/briochecake
- name = "Brioche cake"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /datum/reagent/consumable/sugar = 2
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/brioche
- category = CAT_MISCFOOD
-
-/obj/item/reagent_containers/food/snacks/scotchegg
- name = "scotch egg"
- desc = "A boiled egg wrapped in a delicious, seasoned meatball."
- icon_state = "scotchegg"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
- bitesize = 3
- filling_color = "#FFFFF0"
- list_reagents = list(/datum/reagent/consumable/nutriment = 6)
-
-/datum/crafting_recipe/food/scotchegg
- name = "Scotch egg"
- reqs = list(
- /datum/reagent/consumable/sodiumchloride = 1,
- /datum/reagent/consumable/blackpepper = 1,
- /obj/item/reagent_containers/food/snacks/boiledegg = 1,
- /obj/item/reagent_containers/food/snacks/faggot = 1
- )
- result = /obj/item/reagent_containers/food/snacks/scotchegg
- category = CAT_MISCFOOD
-
-/obj/item/reagent_containers/food/snacks/soup/mammi
- name = "Mammi"
- desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
- icon_state = "mammi"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
- list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
-
-/datum/crafting_recipe/food/mammi
- name = "Mammi"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
- /datum/reagent/consumable/milk = 5
- )
- result = /obj/item/reagent_containers/food/snacks/soup/mammi
- category = CAT_MISCFOOD
-
-/obj/item/reagent_containers/food/snacks/chocolatebunny
- name = "chocolate bunny"
- desc = "Contains less than 10% real rabbit!"
- icon_state = "chocolatebunny"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
- filling_color = "#A0522D"
-
-/datum/crafting_recipe/food/chocolatebunny
- name = "Chocolate bunny"
- reqs = list(
- /datum/reagent/consumable/sugar = 2,
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1
- )
- result = /obj/item/reagent_containers/food/snacks/chocolatebunny
- category = CAT_MISCFOOD
+/*
+Easter Recipes + Food moved to appropriate files.
+\code\modules\food_and_drinks\
+\code\modules\food_and_drinks\recipes\
+*/
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index 28f469ac25..de3bd872f3 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1837,6 +1837,7 @@
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm"
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm"
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm"
+#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm"
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_misc.dm"
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm"
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pie.dm"
@@ -1846,6 +1847,7 @@
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm"
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm"
#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sushi.dm"
+#include "code\modules\food_and_drinks\recipes\tablecraft\recipies_sweets.dm"
#include "code\modules\games\cas.dm"
#include "code\modules\goonchat\browserOutput.dm"
#include "code\modules\holiday\easter.dm"
From dc6d1fb359244394672faba9e0dcdd58678ce2a4 Mon Sep 17 00:00:00 2001
From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
Date: Mon, 17 Feb 2020 05:56:02 -0500
Subject: [PATCH 018/101] Sorted Frozen Foods
---
.../recipes/tablecraft/recipes_frozen.dm | 288 +++++++++---------
1 file changed, 145 insertions(+), 143 deletions(-)
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index 1b1801d982..6d443c99f0 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -3,6 +3,64 @@
//Misc. Frozen.//
/////////////////
+/datum/crafting_recipe/food/banana_split
+ name = "Banana Split"
+ always_availible = FALSE
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/icecream = 3,
+ /obj/item/reagent_containers/food/snacks/grown/banana = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cherries = 1,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/banana_split
+ subcategory = CAT_ICE
+
+ /datum/crafting_recipe/food/bluecharrie_float
+ name = "Blue Cherry Shake"
+ always_availible = FALSE
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/icecream = 1,
+ /obj/item/reagent_containers/food/snacks/grown/bluecherries = 3,
+ /obj/item/reagent_containers/food/drinks/drinkingglass = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/bluecharrie_float
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/charrie_float
+ name = "Cherry Shake"
+ always_availible = FALSE
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/icecream = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cherries = 3,
+ /obj/item/reagent_containers/food/drinks/drinkingglass = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/charrie_float
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/root_float
+ name = "Cola Float"
+ always_availible = FALSE
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/icecream = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cherries = 1,
+ /datum/reagent/consumable/space_cola = 10,
+ /obj/item/reagent_containers/food/drinks/drinkingglass = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/cola_float
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/honkdae
+ name ="Honkdae"
+ reqs = list(
+ /datum/reagent/consumable/cream = 5,
+ /obj/item/clothing/mask/gas/clown_hat = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cherries = 1,
+ /obj/item/reagent_containers/food/snacks/grown/banana = 2,
+ /obj/item/reagent_containers/food/snacks/icecream = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/honkdae
+ subcategory = CAT_ICE
+
/datum/crafting_recipe/food/icecreamsandwich
name = "Icecream sandwich"
reqs = list(
@@ -34,105 +92,8 @@
result = /obj/item/reagent_containers/food/snacks/sundae
subcategory = CAT_ICE
-/datum/crafting_recipe/food/honkdae
- name ="Honkdae"
- reqs = list(
- /datum/reagent/consumable/cream = 5,
- /obj/item/clothing/mask/gas/clown_hat = 1,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 2,
- /obj/item/reagent_containers/food/snacks/icecream = 1
- )
- result = /obj/item/reagent_containers/food/snacks/honkdae
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/banana_split
- name = "Banana Split"
- always_availible = FALSE
- reqs = list(
- /obj/item/reagent_containers/food/snacks/icecream = 3,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 1,
- /obj/item/reagent_containers/food/snacks/chocolatebar = 1
- )
- result = /obj/item/reagent_containers/food/snacks/banana_split
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/root_float
- name = "Cola Float"
- always_availible = FALSE
- reqs = list(
- /obj/item/reagent_containers/food/snacks/icecream = 1,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 1,
- /datum/reagent/consumable/space_cola = 10,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 1
- )
- result = /obj/item/reagent_containers/food/snacks/cola_float
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/charrie_float
- name = "Cherry Shake"
- always_availible = FALSE
- reqs = list(
- /obj/item/reagent_containers/food/snacks/icecream = 1,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 3,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 1
- )
- result = /obj/item/reagent_containers/food/snacks/charrie_float
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/bluecharrie_float
- name = "Blue Cherry Shake"
- always_availible = FALSE
- reqs = list(
- /obj/item/reagent_containers/food/snacks/icecream = 1,
- /obj/item/reagent_containers/food/snacks/grown/bluecherries = 3,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 1
- )
- result = /obj/item/reagent_containers/food/snacks/bluecharrie_float
- subcategory = CAT_ICE
-
//////////////////////////SNOW CONES///////////////////////
-/datum/crafting_recipe/food/flavorless_sc
- name = "Flavorless snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/pineapple_sc
- name = "Pineapple snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /obj/item/reagent_containers/food/snacks/pineappleslice = 2
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/lime_sc
- name = "Lime snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/limejuice = 5
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/lime
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/lemon_sc
- name = "Lemon snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/lemonjuice = 5
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/lemon
- subcategory = CAT_ICE
-
/datum/crafting_recipe/food/apple_sc
name = "Apple snowcone"
reqs = list(
@@ -143,24 +104,14 @@
result = /obj/item/reagent_containers/food/snacks/snowcones/apple
subcategory = CAT_ICE
-/datum/crafting_recipe/food/grape_sc
- name = "Grape snowcone"
+/datum/crafting_recipe/food/berry_sc
+ name = "Berry snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/grapejuice = 5
+ /datum/reagent/consumable/berryjuice = 5
)
- result = /obj/item/reagent_containers/food/snacks/snowcones/grape
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/orange_sc
- name = "Orange snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/orangejuice = 5
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/orange
+ result = /obj/item/reagent_containers/food/snacks/snowcones/berry
subcategory = CAT_ICE
/datum/crafting_recipe/food/blue_sc
@@ -183,14 +134,13 @@
result = /obj/item/reagent_containers/food/snacks/snowcones/red
subcategory = CAT_ICE
-/datum/crafting_recipe/food/berry_sc
- name = "Berry snowcone"
+/datum/crafting_recipe/food/flavorless_sc
+ name = "Flavorless snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/berryjuice = 5
+ /datum/reagent/consumable/ice = 15
)
- result = /obj/item/reagent_containers/food/snacks/snowcones/berry
+ result = /obj/item/reagent_containers/food/snacks/snowcones
subcategory = CAT_ICE
/datum/crafting_recipe/food/fruitsalad_sc
@@ -206,24 +156,84 @@
result = /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad
subcategory = CAT_ICE
-/datum/crafting_recipe/food/mime_sc
- name = "Mime snowcone"
+/datum/crafting_recipe/food/grape_sc
+ name = "Grape snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/nothing = 5
+ /datum/reagent/consumable/grapejuice = 5
)
- result = /obj/item/reagent_containers/food/snacks/snowcones/mime
+ result = /obj/item/reagent_containers/food/snacks/snowcones/grape
subcategory = CAT_ICE
-/datum/crafting_recipe/food/clown_sc
- name = "Clown snowcone"
+/datum/crafting_recipe/food/honey_sc
+ name = "Honey snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/laughter = 5
+ /datum/reagent/consumable/honey = 5
)
- result = /obj/item/reagent_containers/food/snacks/snowcones/clown
+ result = /obj/item/reagent_containers/food/snacks/snowcones/honey
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/lemon_sc
+ name = "Lemon snowcone"
+ reqs = list(
+ /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /datum/reagent/consumable/ice = 15,
+ /datum/reagent/consumable/lemonjuice = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/snowcones/lemon
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/lime_sc
+ name = "Lime snowcone"
+ reqs = list(
+ /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /datum/reagent/consumable/ice = 15,
+ /datum/reagent/consumable/limejuice = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/snowcones/lime
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/orange_sc
+ name = "Orange snowcone"
+ reqs = list(
+ /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /datum/reagent/consumable/ice = 15,
+ /datum/reagent/consumable/orangejuice = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/snowcones/orange
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/pineapple_sc
+ name = "Pineapple snowcone"
+ reqs = list(
+ /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /datum/reagent/consumable/ice = 15,
+ /obj/item/reagent_containers/food/snacks/pineappleslice = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/pwrgame_sc
+ name = "Pwrgame snowcone"
+ reqs = list(
+ /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /datum/reagent/consumable/ice = 15,
+ /datum/reagent/consumable/pwr_game = 15
+ )
+ result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame
+ subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/rainbow_sc
+ name = "Rainbow snowcone"
+ reqs = list(
+ /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /datum/reagent/consumable/ice = 15,
+ /datum/reagent/colorful_reagent = 1 //Harder to make
+ )
+ result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow
subcategory = CAT_ICE
/datum/crafting_recipe/food/soda_sc
@@ -246,32 +256,24 @@
result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind
subcategory = CAT_ICE
-/datum/crafting_recipe/food/pwrgame_sc
- name = "Pwrgame snowcone"
+/////I don't like seperating the clown and mime.///
+
+/datum/crafting_recipe/food/mime_sc
+ name = "Mime snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/pwr_game = 15
+ /datum/reagent/consumable/nothing = 5
)
- result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame
+ result = /obj/item/reagent_containers/food/snacks/snowcones/mime
subcategory = CAT_ICE
-/datum/crafting_recipe/food/honey_sc
- name = "Honey snowcone"
+/datum/crafting_recipe/food/clown_sc
+ name = "Clown snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/honey = 5
+ /datum/reagent/consumable/laughter = 5
)
- result = /obj/item/reagent_containers/food/snacks/snowcones/honey
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/rainbow_sc
- name = "Rainbow snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/colorful_reagent = 1 //Harder to make
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow
- subcategory = CAT_ICE
+ result = /obj/item/reagent_containers/food/snacks/snowcones/clown
+ subcategory = CAT_ICE
\ No newline at end of file
From 79705d17162b4dbc7969b5725427be61b854a461 Mon Sep 17 00:00:00 2001
From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
Date: Mon, 17 Feb 2020 08:24:21 -0500
Subject: [PATCH 019/101] Moving Burgers Around
---
.../recipes/tablecraft/recipes_burger.dm | 95 +++++++++----------
1 file changed, 47 insertions(+), 48 deletions(-)
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
index 0fae6542e9..cf96c01e7b 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
@@ -3,25 +3,6 @@
////////////////////////////////////////////////STANDARD BURGS////////////////////////////////////////////////
-
-/datum/crafting_recipe/food/appendixburger
- name = "Appendix burger"
- reqs = list(
- /obj/item/organ/appendix = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/appendix
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/brainburger
- name = "Brain burger"
- reqs = list(
- /obj/item/organ/brain = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/brain
- subcategory = CAT_BURGER
-
/datum/crafting_recipe/food/burger
name = "Burger"
reqs = list(
@@ -101,8 +82,55 @@
result = /obj/item/reagent_containers/food/snacks/burger/human
subcategory = CAT_BURGER
+/datum/crafting_recipe/food/ribburger
+ name = "McRib"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs
+ /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome.
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/rib
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/mcguffin
+ name = "McGuffin"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/friedegg = 1,
+ /obj/item/reagent_containers/food/snacks/meat/bacon = 2,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/mcguffin
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/tofuburger
+ name = "Tofu burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/tofu = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/tofu
+ subcategory = CAT_BURGER
+
///////////////EXOTIC//////////////////
+/datum/crafting_recipe/food/appendixburger
+ name = "Appendix burger"
+ reqs = list(
+ /obj/item/organ/appendix = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/appendix
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/brainburger
+ name = "Brain burger"
+ reqs = list(
+ /obj/item/organ/brain = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/brain
+ subcategory = CAT_BURGER
+
/datum/crafting_recipe/food/bearger
name = "Bearger"
reqs = list(
@@ -160,35 +188,6 @@
result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
subcategory = CAT_BURGER
-/datum/crafting_recipe/food/ribburger
- name = "McRib"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs
- /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome.
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/rib
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/mcguffin
- name = "McGuffin"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/friedegg = 1,
- /obj/item/reagent_containers/food/snacks/meat/bacon = 2,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/mcguffin
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/tofuburger
- name = "Tofu burger"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/tofu = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/tofu
- subcategory = CAT_BURGER
-
/datum/crafting_recipe/food/baseballburger
name = "Home run baseball burger"
reqs = list(
From 6e32a466afcbf22591a5d6b393cd23c037973d48 Mon Sep 17 00:00:00 2001
From: raspyosu
Date: Mon, 17 Feb 2020 17:24:09 -0500
Subject: [PATCH 020/101] tweak mesmerize
range increased
added a "windup"
hardstun length increased to counteract windup
windup allows target to attempt to avoid via breaking line of sight at the time the windup completes
initial stun reduced to major slowdown, user also recieves slowdown to prevent sprint memes from just letting them follow around a corner if there is one
---
code/datums/status_effects/debuffs.dm | 4 +-
.../bloodsucker/powers/bs_mesmerize.dm | 54 ++++++++++---------
2 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index c694f27d64..999fd33a00 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -101,14 +101,16 @@
/datum/status_effect/no_combat_mode/mesmerize/on_creation(mob/living/new_owner, set_duration)
. = ..()
ADD_TRAIT(owner, TRAIT_MUTE, "mesmerize")
+ owner.add_movespeed_modifier("[STATUS_EFFECT_MESMERIZE]_[id]", TRUE, priority = 64, override = TRUE, multiplicative_slowdown = 5, blacklisted_movetypes = FALSE? NONE : CRAWLING)
/datum/status_effect/no_combat_mode/mesmerize/on_remove()
. = ..()
REMOVE_TRAIT(owner, TRAIT_MUTE, "mesmerize")
+ owner.remove_movespeed_modifier("[STATUS_EFFECT_MESMERIZE]_[id]")
/obj/screen/alert/status_effect/mesmerized
name = "Mesmerized"
- desc = "You cant tear your sight from who is in front of you...Their gaze is simply too enthralling.."
+ desc = "You cant tear your sight from who is in front of you... their gaze is simply too enthralling.."
icon = 'icons/mob/actions/bloodsucker.dmi'
icon_state = "power_mez"
diff --git a/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm b/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
index dc9d1d46a0..2ee8c3e33f 100644
--- a/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
+++ b/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
@@ -11,8 +11,8 @@
button_icon_state = "power_mez"
bloodcost = 30
cooldown = 300
- target_range = 1
- power_activates_immediately = FALSE
+ target_range = 3
+ power_activates_immediately = TRUE
message_Trigger = "Whom will you subvert to your will?"
must_be_capacitated = TRUE
bloodsucker_can_buy = TRUE
@@ -41,6 +41,7 @@
if (A == owner)
return FALSE
var/mob/living/carbon/target = A // We already know it's carbon due to CheckValidTarget()
+
// Bloodsucker
if (target.mind && target.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
if (display_error)
@@ -62,7 +63,7 @@
to_chat(owner, "Your victim's eyes are glazed over. They cannot perceive you.")
return FALSE
// Check: Target See Me? (behind wall)
- if (!(owner in view(target_range, get_turf(target))))
+ if (!(target in view(target_range, get_turf(owner))))
// Sub-Check: GET CLOSER
//if (!(owner in range(target_range, get_turf(target)))
// if (display_error)
@@ -70,6 +71,10 @@
if (display_error)
to_chat(owner, "You're too far outside your victim's view.")
return FALSE
+
+ if (target.has_status_effect(STATUS_EFFECT_MESMERIZE)) // ?
+ return TRUE
+
// Check: Facing target?
if (!is_A_facing_B(owner,target)) // in unsorted.dm
if (display_error)
@@ -83,28 +88,29 @@
return TRUE
/datum/action/bloodsucker/targeted/mesmerize/FireTargetedPower(atom/A)
- // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done.
- var/mob/living/carbon/target = A
- var/mob/living/user = owner
+ // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done.
+ var/mob/living/carbon/target = A
+ var/mob/living/user = owner
- if(istype(target))
- target.Stun(40) //Utterly useless without this, its okay since there are so many checks to go through
- target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 45) //So you cant rotate with combat mode, plus fancy status alert
-
- if(do_mob(user, target, 40, 0, TRUE, extra_checks = CALLBACK(src, .proc/ContinueActive, user, target)))
- PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!
- var/power_time = 90 + level_current * 12
- target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time + 80)
- to_chat(user, "[target] is fixed in place by your hypnotic gaze.")
- target.Stun(power_time)
- target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move // target.changeNext_move(power_time) // check click.dm
- target.notransform = TRUE // <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
- spawn(power_time)
- if(istype(target))
- target.notransform = FALSE
- // They Woke Up! (Notice if within view)
- if(istype(user) && target.stat == CONSCIOUS && (target in view(10, get_turf(user))) )
- to_chat(user, "[target] has snapped out of their trance.")
+ if(istype(target))
+ PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!
+ var/power_time = 138 + level_current * 12
+ target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 50)
+ user.apply_status_effect(STATUS_EFFECT_MESMERIZE, 50)
+ if(do_mob(user, target, 50, TRUE, TRUE))
+ if (CheckCanTarget(target)) // target just has to be out of view when it is fully charged in order to avoid
+ target.face_atom(user)
+ target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time) // pretty much purely cosmetic
+ target.Stun(power_time)
+ to_chat(user, "[target] is fixed in place by your hypnotic gaze.")
+ target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move // target.changeNext_move(power_time) // check click.dm
+ target.notransform = TRUE // <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
+ spawn(power_time)
+ if(istype(target))
+ target.notransform = FALSE
+ // They Woke Up! (Notice if within view)
+ if(istype(user) && target.stat == CONSCIOUS && (target in view(10, get_turf(user))) )
+ to_chat(user, "[target] has snapped out of their trance.")
/datum/action/bloodsucker/targeted/mesmerize/ContinueActive(mob/living/user, mob/living/target)
From 0fa679771bdd129ba089bd8d44f59b2afed33879 Mon Sep 17 00:00:00 2001
From: raspyosu
Date: Mon, 17 Feb 2020 17:46:47 -0500
Subject: [PATCH 021/101] fix indentation
muh spaces
---
.../bloodsucker/powers/bs_mesmerize.dm | 44 +++++++++----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm b/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
index 2ee8c3e33f..0e1a9d44b0 100644
--- a/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
+++ b/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
@@ -88,29 +88,29 @@
return TRUE
/datum/action/bloodsucker/targeted/mesmerize/FireTargetedPower(atom/A)
- // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done.
- var/mob/living/carbon/target = A
- var/mob/living/user = owner
+ // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done.
+ var/mob/living/carbon/target = A
+ var/mob/living/user = owner
- if(istype(target))
- PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!
- var/power_time = 138 + level_current * 12
- target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 50)
- user.apply_status_effect(STATUS_EFFECT_MESMERIZE, 50)
- if(do_mob(user, target, 50, TRUE, TRUE))
- if (CheckCanTarget(target)) // target just has to be out of view when it is fully charged in order to avoid
- target.face_atom(user)
- target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time) // pretty much purely cosmetic
- target.Stun(power_time)
- to_chat(user, "[target] is fixed in place by your hypnotic gaze.")
- target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move // target.changeNext_move(power_time) // check click.dm
- target.notransform = TRUE // <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
- spawn(power_time)
- if(istype(target))
- target.notransform = FALSE
- // They Woke Up! (Notice if within view)
- if(istype(user) && target.stat == CONSCIOUS && (target in view(10, get_turf(user))) )
- to_chat(user, "[target] has snapped out of their trance.")
+ if(istype(target))
+ PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!
+ var/power_time = 138 + level_current * 12
+ target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 50)
+ user.apply_status_effect(STATUS_EFFECT_MESMERIZE, 50)
+ if(do_mob(user, target, 50, TRUE, TRUE))
+ if (CheckCanTarget(target)) // target just has to be out of view when it is fully charged in order to avoid
+ target.face_atom(user)
+ target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time) // pretty much purely cosmetic
+ target.Stun(power_time)
+ to_chat(user, "[target] is fixed in place by your hypnotic gaze.")
+ target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move // target.changeNext_move(power_time) // check click.dm
+ target.notransform = TRUE // <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
+ spawn(power_time)
+ if(istype(target))
+ target.notransform = FALSE
+ // They Woke Up! (Notice if within view)
+ if(istype(user) && target.stat == CONSCIOUS && (target in view(10, get_turf(user))) )
+ to_chat(user, "[target] has snapped out of their trance.")
/datum/action/bloodsucker/targeted/mesmerize/ContinueActive(mob/living/user, mob/living/target)
From 8666a36b1e04c7e3b6642ed6416aa987d03e68e7 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 18 Feb 2020 02:24:31 -0700
Subject: [PATCH 022/101] fixes most things
---
code/game/objects/items/twohanded.dm | 3 ---
.../structures/crates_lockers/closets/secure/security.dm | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index bce9e47554..bcf74d2164 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1025,11 +1025,8 @@
righthand_file = 'icons/mob/inhands/weapons/estaff_righthand.dmi'
name = "riot suppression electrostaff"
desc = "A large quarterstaff, with massive silver electrodes mounted at the end."
- force = 10
- damtype = BRUTE
w_class = WEIGHT_CLASS_HUGE
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
- sharpness = FALSE
force_unwielded = 5
force_wielded = 10
throwforce = 15 //if you are a madman and finish someone off with this, power to you.
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 7a087f8583..bec1c893ae 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -267,7 +267,7 @@
new /obj/item/clothing/suit/armor/bulletproof(src)
/obj/structure/closet/secure_closet/lethalshots
- name = "shotgun lethal rounds"
+ name = "lethal ammunition and riot staves"
req_access = list(ACCESS_ARMORY)
icon_state = "tac"
/obj/structure/closet/secure_closet/lethalshots/PopulateContents()
From 43db50616167e7a2c682d2136f46241d3b644b42 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 18 Feb 2020 02:26:05 -0700
Subject: [PATCH 023/101] stopa ccidently recycling this
---
code/game/objects/items/twohanded.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index bcf74d2164..2529ebd9ce 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1032,7 +1032,6 @@
throwforce = 15 //if you are a madman and finish someone off with this, power to you.
throw_speed = 1
block_chance = 30
- materials = list(MAT_METAL = 4000, MAT_SILVER = 2000)
attack_verb = list("struck", "beaten", "thwacked", "pulped")
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors. (to curb stun-kill rampaging without it being on)
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
From 49cef552a0bb192c154537bdbf15860212f9d65a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 18 Feb 2020 02:27:38 -0700
Subject: [PATCH 024/101] cleaner
---
code/game/objects/items/twohanded.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 2529ebd9ce..5a0dbf7981 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1031,7 +1031,9 @@
force_wielded = 10
throwforce = 15 //if you are a madman and finish someone off with this, power to you.
throw_speed = 1
+ item_flags = NO_MAT_REDEMPTION | SLOWS_WHILE_IN_HAND
block_chance = 30
+ materials = list(MAT_METAL = 4000, MAT_SILVER = 2000)
attack_verb = list("struck", "beaten", "thwacked", "pulped")
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors. (to curb stun-kill rampaging without it being on)
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
From 9803a0835c4ff028f5ac3e4f99bb2502ee20fb38 Mon Sep 17 00:00:00 2001
From: raspyosu
Date: Tue, 18 Feb 2020 19:04:20 -0500
Subject: [PATCH 025/101] lunge tweaks
added short (20 frames at 30fps) windup w/ telegraphing via audio only played to target
range increased to 4
added flavor text
---
.../bloodsucker/powers/bs_lunge.dm | 40 +++++++++---------
sound/bloodsucker/lunge_warn.ogg | Bin 0 -> 73076 bytes
2 files changed, 21 insertions(+), 19 deletions(-)
create mode 100644 sound/bloodsucker/lunge_warn.ogg
diff --git a/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm b/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm
index 48e12332a2..0f2aba49b6 100644
--- a/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm
+++ b/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm
@@ -7,9 +7,9 @@
button_icon_state = "power_lunge"
bloodcost = 10
cooldown = 120
- target_range = 3
+ target_range = 4
power_activates_immediately = TRUE
- message_Trigger = ""//"Whom will you subvert to your will?"
+ message_Trigger = "Whom will you ensnare within your grasp?"
must_be_capacitated = TRUE
bloodsucker_can_buy = TRUE
@@ -59,24 +59,26 @@
// CAUSES: Target has their back to me, I'm invisible, or I'm in a Closet
// Step One: Heatseek toward Target's Turf
- walk_towards(owner, T, 0.1, 10) // NOTE: this runs in the background! to cancel it, you need to use walk(owner.current,0), or give them a new path.
addtimer(CALLBACK(owner, .proc/_walk, 0), 2 SECONDS)
- if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && owner.resting)
- var/send_dir = get_dir(owner, T)
- new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE)
- owner.spin(10)
- // Step Two: Check if I'm at/adjectent to Target's CURRENT turf (not original...that was just a destination)
- sleep(1)
- if(target.Adjacent(owner))
- // LEVEL 2: If behind target, mute or unconscious!
- if(do_knockdown) // && level_current >= 1)
- target.Knockdown(15 + 10 * level_current,1)
- target.adjustStaminaLoss(40 + 10 * level_current)
- // Cancel Walk (we were close enough to contact them)
- walk(owner, 0)
- target.Stun(10,1) //Without this the victim can just walk away
- target.grabbedby(owner) // Taken from mutations.dm under changelings
- target.grippedby(owner, instant = TRUE) //instant aggro grab
+ target.playsound_local(get_turf(owner), 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // target-only telegraphing
+ if(do_mob(owner, owner, 7, TRUE, TRUE))
+ walk_towards(owner, T, 0.1, 10) // NOTE: this runs in the background! to cancel it, you need to use walk(owner.current,0), or give them a new path.
+ if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && owner.resting)
+ var/send_dir = get_dir(owner, T)
+ new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE)
+ owner.spin(10)
+ // Step Two: Check if I'm at/adjectent to Target's CURRENT turf (not original...that was just a destination)
+ sleep(1.5)
+ if(target.Adjacent(owner))
+ // LEVEL 2: If behind target, mute or unconscious!
+ if(do_knockdown) // && level_current >= 1)
+ target.Knockdown(15 + 10 * level_current,1)
+ target.adjustStaminaLoss(40 + 10 * level_current)
+ // Cancel Walk (we were close enough to contact them)
+ walk(owner, 0)
+ target.Stun(10,1) //Without this the victim can just walk away
+ target.grabbedby(owner) // Taken from mutations.dm under changelings
+ target.grippedby(owner, instant = TRUE) //instant aggro grab
/datum/action/bloodsucker/targeted/lunge/DeactivatePower(mob/living/user = owner, mob/living/target)
..() // activate = FALSE
diff --git a/sound/bloodsucker/lunge_warn.ogg b/sound/bloodsucker/lunge_warn.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..0feec43228b178402fcb1e199434253316485369
GIT binary patch
literal 73076
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