mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 09:05:11 +01:00
Ghom
0b0c5ea91e
## About The Pull Request Extends the part of the crafting unit test that ensures consistency between the total mats of the components of a recipe (or rather, the result of said recipe) and a generic instance of the same type as its result, previously only implemented on food recipes. ## Why It's Good For The Game This ensures a degree of consistency with the material composition of various objects in the game. I couldn't do it in the original PR as that one was too big already and it took months to get it merged, and have the relative bugs fixed. Currently a WIP as I slowly deal with the unit test reports. ## Changelog 🆑 refactor: Follow-up to the crafting/material refactor from months ago. All objects crafted with stacks now inherit their mat composition (not necessarily the effects and color) by default, while previously only a few things like chair, sinks and toilets did. Report any object looking or behaving weirdly as a result. fix: The material composition of ammo boxes is no longer a 1/10 of what it's supposed to be. It was a shitty hack to make it harder to recycle empty ammo boxes. Instead, they lose materials as they're emptied now. /🆑
84 lines
2.6 KiB
Plaintext
84 lines
2.6 KiB
Plaintext
|
|
//Boat
|
|
|
|
/obj/vehicle/ridden/lavaboat
|
|
name = "lava boat"
|
|
desc = "A boat used for traversing lava."
|
|
icon = 'icons/obj/mining_zones/dragonboat.dmi'
|
|
icon_state = "goliath_boat"
|
|
icon_preview = 'icons/obj/fluff/previews.dmi'
|
|
icon_state_preview = "boat"
|
|
resistance_flags = LAVA_PROOF | FIRE_PROOF
|
|
can_buckle = TRUE
|
|
key_type = /obj/item/oar
|
|
|
|
/obj/vehicle/ridden/lavaboat/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/lavaboat)
|
|
|
|
/obj/item/oar
|
|
name = "oar"
|
|
desc = "Not to be confused with the kind Research hassles you for."
|
|
icon = 'icons/mob/rideables/vehicles.dmi'
|
|
icon_state = "oar"
|
|
inhand_icon_state = "oar"
|
|
icon_angle = 45
|
|
lefthand_file = 'icons/mob/inhands/items/lavaland_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/items/lavaland_righthand.dmi'
|
|
force = 12
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
resistance_flags = LAVA_PROOF | FIRE_PROOF
|
|
custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 2)
|
|
|
|
/datum/crafting_recipe/oar
|
|
name = "Goliath Bone Oar"
|
|
result = /obj/item/oar
|
|
reqs = list(/obj/item/stack/sheet/bone = 2)
|
|
time = 1.5 SECONDS
|
|
category = CAT_TOOLS
|
|
|
|
/datum/crafting_recipe/boat
|
|
name = "Goliath Hide Boat"
|
|
result = /obj/vehicle/ridden/lavaboat
|
|
reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3)
|
|
time = 5 SECONDS
|
|
category = CAT_TOOLS
|
|
|
|
/obj/vehicle/ridden/lavaboat/plasma
|
|
name = "plasma boat"
|
|
desc = "A boat used for traversing the streams of plasma without turning into an icecube."
|
|
icon = 'icons/obj/mining_zones/dragonboat.dmi'
|
|
icon_state = "goliath_boat"
|
|
resistance_flags = FREEZE_PROOF
|
|
can_buckle = TRUE
|
|
|
|
/datum/crafting_recipe/boat/plasma
|
|
name = "Polar Bear Hide Boat"
|
|
result = /obj/vehicle/ridden/lavaboat/plasma
|
|
reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 3)
|
|
|
|
//Dragon Boat
|
|
|
|
|
|
/obj/item/ship_in_a_bottle
|
|
name = "ship in a bottle"
|
|
desc = "A tiny ship inside a bottle."
|
|
icon = 'icons/obj/mining_zones/artefacts.dmi'
|
|
icon_state = "ship_bottle"
|
|
|
|
/obj/item/ship_in_a_bottle/attack_self(mob/user)
|
|
to_chat(user, span_notice("You're not sure how they get the ships in these things, but you're pretty sure you know how to get it out."))
|
|
playsound(user.loc, 'sound/effects/glass/glassbr1.ogg', 100, TRUE)
|
|
new /obj/vehicle/ridden/lavaboat/dragon(get_turf(src))
|
|
qdel(src)
|
|
|
|
/obj/vehicle/ridden/lavaboat/dragon
|
|
name = "mysterious boat"
|
|
desc = "This boat moves where you will it, without the need for an oar."
|
|
icon_state = "dragon_boat"
|
|
resistance_flags = LAVA_PROOF | FIRE_PROOF | FREEZE_PROOF
|
|
|
|
/obj/vehicle/ridden/lavaboat/dragon/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/lavaboat/dragonboat)
|