Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nau food fix and additions, Rogue's Fixing and Balance, #93

Merged
merged 1 commit into from
Dec 4, 2024
Merged

Nau food fix and additions, Rogue's Fixing and Balance, #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,8 @@
H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/tracking, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/tracking, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/tracking, 5, TRUE)
pants = /obj/item/clothing/under/roguetown/trou/leather
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
gloves = /obj/item/clothing/gloves/roguetown/fingerless
Expand Down Expand Up @@ -138,7 +137,6 @@
H.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/tracking, 2, TRUE)
shoes = /obj/item/clothing/shoes/roguetown/shortboots
Expand All @@ -153,7 +151,7 @@
backl = /obj/item/storage/backpack/rogue/satchel
beltl = /obj/item/rogueweapon/sword/rapier
beltr = /obj/item/rogueweapon/shield/buckler
backpack_contents = list(/obj/item/rogueweapon/huntingknife/idagger/steel/parrying)
backpack_contents = list(/obj/item/rogueweapon/huntingknife/idagger/steel/parrying, /obj/item/lockpickring/mundane)
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_DECEIVING_MEEKNESS, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NUTCRACKER, TRAIT_GENERIC) //extra damage to groin, dirty tricks.
Expand All @@ -169,7 +167,7 @@
/datum/outfit/job/roguetown/adventurer/rogue/proc/tricksterarch(mob/living/carbon/human/H)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE)
Expand All @@ -181,6 +179,8 @@
H.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE)
shoes = /obj/item/clothing/shoes/roguetown/boots
pants = /obj/item/clothing/under/roguetown/trou/leather
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
gloves = /obj/item/clothing/gloves/roguetown/leather
Expand All @@ -192,7 +192,7 @@
backl = /obj/item/storage/backpack/rogue/satchel
beltr = /obj/item/rogueweapon/huntingknife/idagger/steel
beltl = /obj/item/rogueweapon/huntingknife/idagger/steel
backpack_contents = list(/obj/item/lockpick)
backpack_contents = list(/obj/item/lockpickring/mundane)
ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
H.change_stat("strength", -2)
H.change_stat("perception", 2)
Expand Down
8 changes: 7 additions & 1 deletion modular/Neu_Food/code/NeuFood.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,17 @@
/* .................. Food platter ................... */
/obj/item/cooking/platter/attackby(obj/item/I, mob/user, params)
var/found_table = locate(/obj/structure/table) in (loc)
if(findtext("[I.type]", "/plated")) //All plated food items have /plated at end of path
to_chat(user, span_warning("[I] in your hand appears to already be plated."))
return
if(istype(I, /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked))
if(isturf(loc)&& (found_table))
playsound(get_turf(user), 'sound/foley/dropsound/food_drop.ogg', 40, TRUE, -1)
if(do_after(user,2 SECONDS, target = src))
new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/plated(loc)
if(istype(I, /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced))
new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced/plated(loc)
else
new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/plated(loc)
qdel(I)
qdel(src)
else
Expand Down
21 changes: 20 additions & 1 deletion modular/Neu_Food/code/cooked/NeuFood_meals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@
/* ................. Plated fryfish ................... */
/obj/item/reagent_containers/food/snacks/rogue/fryfish/carp/plated
desc = "Abyssor's bounty, make sure to eat the eyes!"
icon = 'modular/Neu_Food/icons/food.dmi'
icon_state = "carpcooked_plated"
item_state = "plate_food"
lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi'
Expand All @@ -271,6 +272,7 @@

/obj/item/reagent_containers/food/snacks/rogue/fryfish/clownfish/plated
desc = "Abyssor's bounty, make sure to eat the eyes!"
icon = 'modular/Neu_Food/icons/food.dmi'
icon_state = "clownfishcooked_plated"
item_state = "plate_food"
lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi'
Expand All @@ -283,6 +285,7 @@

/obj/item/reagent_containers/food/snacks/rogue/fryfish/angler/plated
desc = "Abyssor's bounty, make sure to eat the eyes!"
icon = 'modular/Neu_Food/icons/food.dmi'
icon_state = "anglercooked_plated"
item_state = "plate_food"
lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi'
Expand All @@ -295,6 +298,7 @@

/obj/item/reagent_containers/food/snacks/rogue/fryfish/eel/plated
desc = "Abyssor's bounty, make sure to eat the eyes!"
icon = 'modular/Neu_Food/icons/food.dmi'
icon_state = "eelcooked_plated"
item_state = "plate_food"
lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi'
Expand Down Expand Up @@ -342,7 +346,10 @@
return FALSE

mill.reagents.remove_reagent(/datum/reagent/consumable/blackpepper, 1)
new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced(loc)
if(istype(src, /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/plated))
new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced/plated(loc)
else
new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced(loc)
qdel(src)
else
mill.icon_state = "peppermill"
Expand All @@ -367,6 +374,18 @@
trash = /obj/item/cooking/platter
rotprocess = SHELFLIFE_LONG

/obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced/plated
icon_state = "roastchicken_plated"
item_state = "plate_food"
lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi'
righthand_file = 'modular/Neu_Food/icons/food_righthand.dmi'
color = "#ffc0c0"
experimental_inhand = FALSE
w_class = WEIGHT_CLASS_BULKY
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2)
trash = /obj/item/cooking/platter
rotprocess = SHELFLIFE_LONG


/* ................. Cooked rat ................... */
/obj/item/reagent_containers/food/snacks/rogue/friedrat/plated
Expand Down
2 changes: 1 addition & 1 deletion modular/Neu_Food/code/raw/NeuFood_dough.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@
rotprocess = SHELFLIFE_LONG

/obj/item/reagent_containers/food/snacks/rogue/ccakeslice/plated
icon_state = "cheesecakeslice_plated"
icon_state = "cheesecake_slice_plated"
rotprocess = SHELFLIFE_EXTREME
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
trash = /obj/item/cooking/platter
Expand Down
11 changes: 11 additions & 0 deletions modular/Neu_Food/code/raw/NeuFood_veggies.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,14 @@
fried_type = /obj/item/reagent_containers/food/snacks/rogue/preserved/potato_fried
cooked_type = /obj/item/reagent_containers/food/snacks/rogue/preserved/potato_fried

/obj/item/reagent_containers/food/snacks/grown/apple
slice_path = /obj/item/reagent_containers/food/snacks/rogue/fruit/apple_sliced
slices_num = 3
chopping_sound = TRUE

/obj/item/reagent_containers/food/snacks/rogue/fruit/apple_sliced
name = "apple slice"
icon_state = "apple_sliced"
desc = "A neatly sliced bit of apple. Nicer to eat. Refined, even."
tastes = list("airy apple" = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
Binary file modified modular/Neu_Food/icons/food.dmi
View file
Open in desktop
Binary file not shown.