cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added the Combat Bakery Kit (#21901)

Browse Source 
* QUASO

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* blame lewc for giving me spaces

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/components/boomerang.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/granters/_granters.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* purge that

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2023-09-13 21:32:30 +01:00
committed by GitHub
co-authored by Luc Burzah Henri215
parent 0e371e1b93
commit d42d2f647d
14 changed files with 289 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/crafting/recipes.dm
+11
View File
@@ -67,6 +67,17 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/throwing_croissant
name = "Throwing croissant"
reqs = list(
/obj/item/reagent_containers/food/snacks/croissant = 1,
/obj/item/stack/rods = 1
)
result = list(/obj/item/reagent_containers/food/snacks/croissant)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
always_availible = FALSE
/datum/crafting_recipe/advancedegun
name = "Advanced Energy Gun"
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
code/modules/food_and_drinks/food/foods/baked_goods.dm
+10
View File
@@ -551,5 +551,15 @@
list_reagents = list("nutriment" = 4, "sugar" = 2)
tastes = list("croissant" = 1)
/obj/item/reagent_containers/food/snacks/croissant/throwing
throwforce = 20
throw_range = 9 //now with extra throwing action
tastes = list("croissant" = 2, "butter" = 1, "metal" = 1)
list_reagents = list("nutriment" = 4, "sugar" = 2, "iron" = 1)
/obj/item/reagent_containers/food/snacks/croissant/throwing/Initialize(mapload)
. = ..()
AddComponent(/datum/component/boomerang, throw_range, TRUE)
#undef DONUT_NORMAL
#undef DONUT_FROSTED
code/modules/food_and_drinks/food/foods/bread.dm
+8
View File
@@ -170,6 +170,14 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bread" = 2)
/obj/item/reagent_containers/food/snacks/baguette/combat
sharp = TRUE
force = 20
/obj/item/reagent_containers/food/snacks/baguette/combat/Initialize(mapload)
. = ..()
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = ALL_ATTACK_TYPES)
/obj/item/reagent_containers/food/snacks/twobread
name = "two bread"
desc = "It is very bitter and winy."