mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-19 14:51:27 +00:00
db578cdc6f
* I am suffering * Alright this should be all now * Fixes CI * I hate the online merge resolver. * This got lost in the merge master * Updatepaths fixed + new added * Contra review * Fixes desserts * Oops * This should fix it * Maybe? * Attempt 3 * Missed conflict * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Update code/modules/food_and_drinks/food/foods/pizza.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Fixes grinders * Adds comment * Warrior review * Warrior + Sirryan review * Update code/modules/food_and_drinks/food_base.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
225 lines
6.5 KiB
Plaintext
225 lines
6.5 KiB
Plaintext
|
|
//////////////////////////////////////////////
|
|
// Aquarium Supplies //
|
|
//////////////////////////////////////////////
|
|
|
|
/obj/item/egg_scoop
|
|
name = "fish egg scoop"
|
|
desc = "A small scoop to collect fish eggs with."
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "egg_scoop"
|
|
slot_flags = SLOT_FLAG_BELT
|
|
throwforce = 0
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
|
|
/obj/item/fish_net
|
|
name = "fish net"
|
|
desc = "A tiny net to capture fish with. It's a death sentence!"
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "net"
|
|
slot_flags = SLOT_FLAG_BELT
|
|
throwforce = 0
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
|
|
/obj/item/fish_net/suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw
|
|
visible_message("<span class='suicide'>[user] places [src] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.</span>")
|
|
return OXYLOSS
|
|
|
|
/obj/item/fishfood
|
|
name = "fish food can"
|
|
desc = "A small can of Carp's Choice brand fish flakes. The label shows a smiling Space Carp."
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "fish_food"
|
|
throwforce = 1
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
|
|
/obj/item/tank_brush
|
|
name = "aquarium brush"
|
|
desc = "A brush for cleaning the inside of aquariums. Contains a built-in odor neutralizer."
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "brush"
|
|
slot_flags = SLOT_FLAG_BELT
|
|
throwforce = 0
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
attack_verb = list("scrubbed", "brushed", "scraped")
|
|
|
|
/obj/item/tank_brush/suicide_act(mob/user)
|
|
visible_message("<span class='suicide'>[user] is vigorously scrubbing [user.p_themselves()] raw with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
|
|
return BRUTELOSS|FIRELOSS
|
|
|
|
/obj/item/storage/bag/fish
|
|
name = "fish bag"
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "bag"
|
|
storage_slots = 100
|
|
max_combined_w_class = 100
|
|
max_w_class = WEIGHT_CLASS_NORMAL
|
|
w_class = WEIGHT_CLASS_TINY
|
|
can_hold = list(
|
|
/obj/item/fish,
|
|
/obj/item/fish_eggs,
|
|
/obj/item/food/snacks/shrimp,
|
|
)
|
|
resistance_flags = FLAMMABLE
|
|
|
|
//////////////////////////////////////////////
|
|
// Fish Items //
|
|
//////////////////////////////////////////////
|
|
|
|
/obj/item/food/snacks/shrimp
|
|
name = "shrimp"
|
|
desc = "A single raw shrimp."
|
|
icon = 'icons/obj/food/seafood.dmi'
|
|
icon_state = "shrimp_raw"
|
|
filling_color = "#FF1C1C"
|
|
bitesize = 1
|
|
|
|
/obj/item/food/snacks/shrimp/Initialize(mapload)
|
|
. = ..()
|
|
desc = pick("Anyway, like I was sayin', shrimp is the fruit of the sea.", "You can barbecue it, boil it, broil it, bake it, saute it.")
|
|
reagents.add_reagent("protein", 1)
|
|
|
|
/obj/item/food/snacks/feederfish
|
|
name = "feeder fish"
|
|
desc = "A tiny feeder fish. Sure doesn't look very filling..."
|
|
icon = 'icons/obj/food/seafood.dmi'
|
|
icon_state = "feederfish"
|
|
filling_color = "#FF1C1C"
|
|
bitesize = 1
|
|
|
|
/obj/item/food/snacks/feederfish/Initialize(mapload)
|
|
. = ..()
|
|
reagents.add_reagent("protein", 1)
|
|
|
|
/obj/item/fish
|
|
name = "fish"
|
|
desc = "A generic fish"
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "fish"
|
|
throwforce = 1
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
force = 1
|
|
attack_verb = list("slapped", "humiliated", "hit", "rubbed")
|
|
hitsound = 'sound/effects/snap.ogg'
|
|
|
|
/obj/item/fish/glofish
|
|
name = "glofish"
|
|
desc = "A small bio-luminescent fish. Not very bright, but at least it's pretty!"
|
|
icon_state = "glofish"
|
|
|
|
/obj/item/fish/glofish/Initialize(mapload)
|
|
. = ..()
|
|
set_light(2, 1, "#99FF66")
|
|
|
|
/obj/item/fish/electric_eel
|
|
name = "electric eel"
|
|
desc = "An eel capable of producing a mild electric shock. Luckily it's rather weak out of water."
|
|
icon_state = "electric_eel"
|
|
|
|
/obj/item/fish/shark
|
|
name = "shark"
|
|
desc = "Warning: Keep away from tornadoes."
|
|
icon_state = "shark"
|
|
hitsound = 'sound/weapons/bite.ogg'
|
|
force = 3
|
|
|
|
/obj/item/fish/shark/attackby(obj/item/O, mob/user as mob)
|
|
if(istype(O, /obj/item/wirecutters))
|
|
to_chat(user, "You rip out the teeth of \the [src.name]!")
|
|
new /obj/item/fish/toothless_shark(get_turf(src))
|
|
new /obj/item/shard/shark_teeth(get_turf(src))
|
|
qdel(src)
|
|
return
|
|
..()
|
|
|
|
/obj/item/fish/toothless_shark
|
|
name = "toothless shark"
|
|
desc = "Looks like someone ripped it's teeth out!"
|
|
icon_state = "shark"
|
|
hitsound = 'sound/effects/snap.ogg'
|
|
|
|
/obj/item/shard/shark_teeth
|
|
name = "shark teeth"
|
|
desc = "A number of teeth, supposedly from a shark."
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "teeth"
|
|
force = 2.0
|
|
throwforce = 5.0
|
|
materials = list()
|
|
|
|
/obj/item/shard/shark_teeth/set_initial_icon_state()
|
|
icon_state = "teeth"
|
|
pixel_x = rand(-5,5)
|
|
pixel_y = rand(-5,5)
|
|
|
|
/obj/item/fish/catfish
|
|
name = "catfish"
|
|
desc = "Apparently, catfish don't purr like you might have expected them to. Such a confusing name!"
|
|
icon_state = "catfish"
|
|
|
|
/obj/item/fish/catfish/attackby(obj/item/O, mob/user as mob)
|
|
if(is_sharp(O))
|
|
to_chat(user, "You carefully clean and gut \the [src.name].")
|
|
new /obj/item/food/snacks/catfishmeat(get_turf(src))
|
|
new /obj/item/food/snacks/catfishmeat(get_turf(src))
|
|
qdel(src)
|
|
return
|
|
..()
|
|
|
|
/obj/item/fish/goldfish
|
|
name = "goldfish"
|
|
desc = "A goldfish, just like the one you never won at the county fair."
|
|
icon_state = "goldfish"
|
|
|
|
/obj/item/fish/salmon
|
|
name = "salmon"
|
|
desc = "The second-favorite food of Space Bears, right behind crew members."
|
|
icon_state = "salmon"
|
|
|
|
/obj/item/fish/salmon/attackby(obj/item/O, mob/user as mob)
|
|
if(is_sharp(O))
|
|
to_chat(user, "You carefully clean and gut \the [src.name].")
|
|
new /obj/item/food/snacks/salmonmeat(get_turf(src))
|
|
new /obj/item/food/snacks/salmonmeat(get_turf(src))
|
|
qdel(src)
|
|
return
|
|
..()
|
|
|
|
/obj/item/fish/babycarp
|
|
name = "baby space carp"
|
|
desc = "Substantially smaller than the space carp lurking outside the hull, but still unsettling."
|
|
icon_state = "babycarp"
|
|
hitsound = 'sound/weapons/bite.ogg'
|
|
force = 3
|
|
|
|
/obj/item/fish/babycarp/attackby(obj/item/O, mob/user as mob)
|
|
if(is_sharp(O))
|
|
to_chat(user, "You carefully clean and gut \the [src.name].")
|
|
new /obj/item/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
|
|
qdel(src)
|
|
return
|
|
..()
|
|
|
|
|
|
/obj/item/grown/bananapeel/clownfish
|
|
name = "clown fish"
|
|
desc = "Even underwater, you cannot escape HONKing."
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "clownfish"
|
|
throwforce = 1
|
|
force = 1
|
|
attack_verb = list("slapped", "humiliated", "hit", "rubbed")
|
|
|
|
/obj/item/grown/bananapeel/clownfish/choose_icon_state()
|
|
return
|