Various features/tweaks from ScavStation. #4807
Conversation
MistakeNot4892
added
do not merge
MistakeNot4892
force-pushed
the
scavs
branch
11 times, most recently
from
2a9f004 to
65e7d23
Compare
MistakeNot4892
force-pushed
the
scavs
branch
2 times, most recently
from
8f680dc to
f12f153
Compare
MistakeNot4892
changed the title
MistakeNot4892
removed
the
work in progress
MistakeNot4892
changed the title
MistakeNot4892
added
ready for review
There was a problem hiding this comment.
couple nitpicks. also if you wanna add more drinks maybe take a peek at https://github.com/OpaqueSunset/LighthouseRelay/tree/master/mods/content/extradrinks
|
|
||
| /obj/item/box/animal_cubes/spiders/WillContain() | ||
| return list(/obj/item/food/animal_cube/wrapped/spider = 5) | ||
|
|
||
| /obj/item/box/animal_cubes/carp | ||
| name = "space carp cube box" | ||
| desc = "Drymate brand carp cubes. Allergen information: May contain pike" |
There was a problem hiding this comment.
| desc = "Drymate brand carp cubes. Allergen information: May contain pike" | |
| desc = "Drymate brand carp cubes. Allergen information: May contain pike." |
i also think it'd be funny if it said something like "may contain traces of pike" or whatever. something that really understates it lol. comedy!
| lore_text = "A powder used to flavor food and drinks. Unpleasant to eat a full spoonful of." | ||
| taste_description = "cinnamon" | ||
| color = "#a34b0d" | ||
| value = 0.1 //is this the monetary value? if so, should be increased a bit, cinnamon is pretty expensive |
There was a problem hiding this comment.
yes it is the monetary value
| . = "soy London Fog" | ||
| else | ||
| . = "Baron Grey" | ||
| . = "Earl Grey" |
There was a problem hiding this comment.
wasn't this legally distinct for a reason? doesn't seem to be a trademark so idk
There was a problem hiding this comment.
Not sure either.
| @@ -36,7 +36,7 @@ | |||
| add_to_reagents(/decl/material/solid/organic/meat, 10) | |||
|
|
|||
| /obj/item/food/animal_cube/get_single_monetary_worth() | |||
| . = (spawn_type ? round(atom_info_repository.get_combined_worth_for(spawn_type) * 1.25) : 5) | |||
| . = (spawn_type ? round(atom_info_repository.get_combined_worth_for((islist(spawn_type) ? spawn_type[1] : spawn_type)) * 1.25) : 5) | |||
There was a problem hiding this comment.
uh, what the heck is this for. it looks like they maybe wanted to do a pickweight thing but it always just takes the first item? and it never decrements either so it's not a counter.
There was a problem hiding this comment.
Per Discord, it's taking the first spawn type for things like carp cubes that have multiple possible products.
There was a problem hiding this comment.
i don't see the other ones ever being used though? i only saw [1] and never pickweight
out-of-phaze
added
awaiting author
out-of-phaze
added
ready for review
Dev-suitable tweaks/fixes from downstream. Other items have been split into their own PRs.