mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
Leland KembleandGitHub
06608081d2
## About The Pull Request 50 files, plus additonal file that was necessary because I slightly refactored windoor construction. This ended up like three and a half times larger than most of the other ones, I really wasn't meaning for that to happen. Maybe its because I more vigorously enforced the empty line after every return thing. The only way to find out is to read 1700 lines of changes, and I don't feel like doing that again. I pinky promise it all works, and I've tested every item changed individually. Changes beyond conversion: You can't welder down reinforced falsewalls anymore, pretty sure it was an oversight because they're supposed to be taken down by wirecutters You can right click to close gun lockers with an empty hand, because otherwise you can't close the lockers at all if there's a gun in them Meatspikes no longer runtime on construction due to the old trick of balloon alert + qdel Windoor assembly no longer SUCKS DICK!!, it's no longer storing essentially a boolean in an undocumented number in a string, it no longer requires a VERB to flip its direction. on a related note, the creator of the windoor assembly construction steps has been sent to live on a farm far out in the country Also, a quick note about how these prs are gonna fuck everything up until they're all together. There's a lot more places where `attackby()` is directly called than I would have assumed, and given as those are being changed to call `item_interaction()` potentially(usually) in a different pr than the pr in which that atom's `attackby()` is actually converted, that function's not going to work at all until both are merged. The good news is that almost every instance this is happening, it's pure convenience, where the user would have access to both items anyway and could just manually call the attack chain by clicking them together. Instances where this is not the case are being skipped over until they can be packaged together to avoid the issue, but I'm not bothering to do this on ones where the desync won't make an interaction actually unusable, because that would require me to turn a 1700 line pr into a 3500 line pr and I really was aiming for like 500 ## Why It's Good For The Game Ignore the paragraph about how I expect this to create a hostage situation where the only fix to the bugs I make is to merge my other prs, and instead think about how cool swing combat would be and how much you want it ## Changelog 🆑 fix: you now can only use a wirecutter to take down a reinforced falsewall fix: meatspikes no longer runtime on construction fix: you no longer have to use a verb that you can't use to flip windoor assemblies qol: you can right click a gun locker to close it code: 50 files have been moved from attackby() to item_interaction() /🆑
167 lines
6.0 KiB
Plaintext
167 lines
6.0 KiB
Plaintext
///how much projectile damage is lost when using a bad fuel
|
|
#define BAD_FUEL_DAMAGE_TAX 20
|
|
///extra chance it explodes upon firing
|
|
#define BAD_FUEL_EXPLODE_PROBABILTY 10
|
|
|
|
/obj/structure/cannon
|
|
name = "cannon"
|
|
desc = "Holemaker Deluxe: A sporty model with a good stop power. Any cannon enthusiast should be expected to start here."
|
|
density = TRUE
|
|
anchored = TRUE
|
|
icon = 'icons/obj/weapons/cannons.dmi'
|
|
icon_state = "falconet_patina"
|
|
max_integrity = 300
|
|
///whether the cannon can be unwrenched from the ground.
|
|
var/anchorable_cannon = TRUE
|
|
var/obj/item/stack/cannonball/loaded_cannonball = null
|
|
var/charge_ignited = FALSE
|
|
var/fire_delay = 1.5 SECONDS
|
|
var/charge_size = 15
|
|
var/fire_sound = 'sound/items/weapons/gun/general/cannon.ogg'
|
|
|
|
/obj/structure/cannon/Initialize(mapload)
|
|
. = ..()
|
|
create_reagents(charge_size)
|
|
AddElement(/datum/element/simple_rotation)
|
|
|
|
/obj/structure/cannon/examine(mob/user)
|
|
. = ..()
|
|
. += span_notice("[src] accepts gunpowder or welding fuel.")
|
|
. += span_warning("Using welding fuel will weaken the force of the projectile fired.")
|
|
|
|
/obj/structure/cannon/proc/fire()
|
|
for(var/mob/shaken_mob in urange(10, src))
|
|
if(shaken_mob.stat == CONSCIOUS)
|
|
shake_camera(shaken_mob, 3, 1)
|
|
|
|
playsound(src, fire_sound, 50, TRUE)
|
|
flick(icon_state+"_fire", src)
|
|
if(loaded_cannonball)
|
|
var/obj/projectile/fired_projectile = new loaded_cannonball.projectile_type(get_turf(src))
|
|
if(reagents.has_reagent(/datum/reagent/fuel, charge_size))
|
|
fired_projectile.damage = max(2, fired_projectile.damage - BAD_FUEL_DAMAGE_TAX)
|
|
QDEL_NULL(loaded_cannonball)
|
|
fired_projectile.firer = src
|
|
fired_projectile.fired_from = src
|
|
fired_projectile.fire(dir2angle(dir))
|
|
reagents.remove_all()
|
|
charge_ignited = FALSE
|
|
|
|
/obj/structure/cannon/wrench_act(mob/living/user, obj/item/tool)
|
|
. = ..()
|
|
if(!anchorable_cannon)
|
|
return FALSE
|
|
default_unfasten_wrench(user, tool)
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
/obj/structure/cannon/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
|
|
if(charge_ignited)
|
|
balloon_alert(user, "it's gonna fire!")
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
if(istype(tool, /obj/item/stack/cannonball))
|
|
if(loaded_cannonball)
|
|
balloon_alert(user, "already loaded!")
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
var/obj/item/stack/cannonball/cannoneers_balls = tool
|
|
loaded_cannonball = new cannoneers_balls.type(src, 1)
|
|
loaded_cannonball.copy_evidences(cannoneers_balls)
|
|
balloon_alert(user, "loaded a [cannoneers_balls.singular_name]")
|
|
cannoneers_balls.use(1, transfer = TRUE)
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
var/ignition_message = tool.ignition_effect(src, user)
|
|
|
|
if(ignition_message)
|
|
if(!reagents.has_reagent(/datum/reagent/gunpowder,charge_size) && !reagents.has_reagent(/datum/reagent/fuel,charge_size))
|
|
balloon_alert(user, "needs [reagents.maximum_volume]u of charge!")
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
visible_message(ignition_message)
|
|
user.log_message("fired a cannon", LOG_ATTACK)
|
|
log_game("[key_name(user)] fired a cannon in [AREACOORD(src)]")
|
|
addtimer(CALLBACK(src, PROC_REF(fire)), fire_delay)
|
|
charge_ignited = TRUE
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
if(is_reagent_container(tool))
|
|
var/obj/item/reagent_containers/powder_keg = tool
|
|
if(!powder_keg.is_open_container())
|
|
return NONE // reagent containers transfer elsewhere in the chain, be free
|
|
|
|
if(istype(powder_keg, /obj/item/rag))
|
|
return NONE
|
|
|
|
if(!powder_keg.reagents.total_volume)
|
|
balloon_alert(user, "[powder_keg] is empty!")
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
if(reagents.total_volume == reagents.maximum_volume)
|
|
balloon_alert(user, "[src] is full!")
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
var/has_enough_gunpowder = powder_keg.reagents.has_reagent(/datum/reagent/gunpowder, charge_size)
|
|
var/has_enough_alt_fuel = powder_keg.reagents.has_reagent(/datum/reagent/fuel, charge_size)
|
|
if(!has_enough_gunpowder && !has_enough_alt_fuel)
|
|
balloon_alert(user, "[powder_keg] needs 15u of charge to load!")
|
|
to_chat(user, span_warning("[powder_keg] doesn't have at least 15u of gunpowder to fill [src]!"))
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
if(has_enough_gunpowder)
|
|
powder_keg.reagents.trans_to(src, charge_size, target_id = /datum/reagent/gunpowder)
|
|
balloon_alert(user, "[src] loaded with gunpowder")
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
//if(has_enough_alt_fuel) but we already know it does if we're here
|
|
powder_keg.reagents.trans_to(src, charge_size, target_id = /datum/reagent/fuel)
|
|
balloon_alert(user, "[src] loaded with welding fuel")
|
|
return ITEM_INTERACT_SUCCESS
|
|
return NONE
|
|
|
|
/obj/structure/cannon/trash
|
|
name = "trash cannon"
|
|
desc = "Okay, sure, you could call it a toolbox welded to an opened oxygen tank cabled to a skateboard, but it's a TRASH CANNON to us."
|
|
icon_state = "garbagegun"
|
|
anchored = FALSE
|
|
anchorable_cannon = FALSE
|
|
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 11.65, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
|
|
var/fires_before_deconstruction = 5
|
|
|
|
/obj/structure/cannon/trash/fire()
|
|
var/explode_chance = 10
|
|
var/used_alt_fuel = reagents.has_reagent(/datum/reagent/fuel, charge_size)
|
|
if(used_alt_fuel)
|
|
explode_chance += BAD_FUEL_EXPLODE_PROBABILTY
|
|
. = ..()
|
|
fires_before_deconstruction--
|
|
if(used_alt_fuel)
|
|
fires_before_deconstruction--
|
|
if(prob(explode_chance))
|
|
visible_message(span_userdanger("[src] explodes!"))
|
|
explosion(src, heavy_impact_range = 1, light_impact_range = 5, flame_range = 5)
|
|
return
|
|
if(fires_before_deconstruction <= 0)
|
|
visible_message(span_warning("[src] falls apart from operation!"))
|
|
qdel(src)
|
|
|
|
/obj/structure/cannon/trash/Destroy()
|
|
new /obj/item/stack/sheet/iron/five(src.loc)
|
|
new /obj/item/stack/rods(src.loc)
|
|
. = ..()
|
|
|
|
///A cannon found from the fishing mystery box.
|
|
/obj/structure/cannon/mystery_box
|
|
icon_state = "mystery_box_cannon" //east facing sprite for the presented item, it'll be changed back to normal on init
|
|
dir = EAST
|
|
anchored = FALSE
|
|
|
|
/obj/structure/cannon/mystery_box/Initialize(mapload)
|
|
. = ..()
|
|
icon_state = "falconet_patina"
|
|
reagents.add_reagent(/datum/reagent/gunpowder, charge_size)
|
|
loaded_cannonball = new(src)
|
|
|
|
#undef BAD_FUEL_DAMAGE_TAX
|
|
#undef BAD_FUEL_EXPLODE_PROBABILTY
|