mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 14:07:51 +01:00
Added the Combat Bakery Kit (#21901)
* QUASO * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * blame lewc for giving me spaces * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/datums/components/boomerang.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/granters/_granters.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * purge that --------- Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
co-authored by
Luc
Burzah
Henri215
Luc
Burzah
Henri215
parent
0e371e1b93
commit
d42d2f647d
@@ -0,0 +1,86 @@
|
||||
///The cooldown period between last_boomerang_throw and it's methods of implementing a rebound proc.
|
||||
#define BOOMERANG_REBOUND_INTERVAL (1 SECONDS)
|
||||
|
||||
/**
|
||||
* If an object is given the boomerang component, it should be thrown back to the thrower after either hitting it's target, or landing on the thrown tile.
|
||||
* Thrown objects should be thrown back to the original thrower with this component, a number of tiles defined by boomerang_throw_range.
|
||||
*/
|
||||
/datum/component/boomerang
|
||||
///How far should the boomerang try to travel to return to the thrower?
|
||||
var/boomerang_throw_range = 3
|
||||
///If this boomerang is thrown, does it re-enable the throwers throw mode?
|
||||
var/thrower_easy_catch_enabled = FALSE
|
||||
///This cooldown prevents our 2 throwing signals from firing too often based on how we implement those signals within thrown impacts.
|
||||
var/last_boomerang_throw = 0
|
||||
|
||||
/datum/component/boomerang/Initialize(boomerang_throw_range, thrower_easy_catch_enabled)
|
||||
. = ..()
|
||||
if(!isitem(parent)) //Only items support being thrown around like a boomerang, feel free to make this apply to humans later on.
|
||||
return COMPONENT_INCOMPATIBLE
|
||||
|
||||
//Assignments
|
||||
src.boomerang_throw_range = boomerang_throw_range
|
||||
src.thrower_easy_catch_enabled = thrower_easy_catch_enabled
|
||||
|
||||
/datum/component/boomerang/RegisterWithParent()
|
||||
RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(prepare_throw)) //Collect data on current thrower and the throwing datum
|
||||
RegisterSignal(parent, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(return_missed_throw))
|
||||
RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(return_hit_throw))
|
||||
|
||||
/datum/component/boomerang/UnregisterFromParent()
|
||||
UnregisterSignal(parent, list(COMSIG_MOVABLE_POST_THROW, COMSIG_MOVABLE_THROW_LANDED, COMSIG_MOVABLE_IMPACT))
|
||||
|
||||
/**
|
||||
* Proc'd before the first thrown is performed in order to gather information regarding each throw as well as handle throw_mode as necessary.
|
||||
* * source: Datum src from original signal call.
|
||||
* * thrown_thing: The thrownthing datum from the parent object's latest throw. Updates thrown_boomerang.
|
||||
* * spin: Carry over from POST_THROW, the speed of rotation on the boomerang when thrown.
|
||||
*/
|
||||
/datum/component/boomerang/proc/prepare_throw(datum/source, datum/thrownthing/thrown_thing, spin)
|
||||
SIGNAL_HANDLER
|
||||
if(thrower_easy_catch_enabled && iscarbon(thrown_thing?.thrower))
|
||||
var/mob/living/carbon/C = thrown_thing.thrower
|
||||
C.throw_mode_on()
|
||||
|
||||
/**
|
||||
* Proc that triggers when the thrown boomerang hits an object.
|
||||
* * source: Datum src from original signal call.
|
||||
* * hit_atom: The atom that has been hit by the boomerang component.
|
||||
* * init_throwing_datum: The thrownthing datum that originally impacted the object, that we use to build the new throwing datum for the rebound.
|
||||
*/
|
||||
/datum/component/boomerang/proc/return_hit_throw(datum/source, atom/hit_atom, datum/thrownthing/init_throwing_datum)
|
||||
SIGNAL_HANDLER
|
||||
if(world.time <= last_boomerang_throw)
|
||||
return
|
||||
var/obj/item/true_parent = parent
|
||||
aerodynamic_swing(init_throwing_datum, true_parent)
|
||||
|
||||
/**
|
||||
* Proc that triggers when the thrown boomerang does not hit a target.
|
||||
* * source: Datum src from original signal call.
|
||||
* * throwing_datum: The thrownthing datum that originally impacted the object, that we use to build the new throwing datum for the rebound.
|
||||
*/
|
||||
/datum/component/boomerang/proc/return_missed_throw(datum/source, datum/thrownthing/throwing_datum)
|
||||
SIGNAL_HANDLER
|
||||
if(world.time <= last_boomerang_throw)
|
||||
return
|
||||
var/obj/item/true_parent = parent
|
||||
aerodynamic_swing(throwing_datum, true_parent)
|
||||
|
||||
/**
|
||||
* Proc that triggers when the thrown boomerang has been fully thrown, rethrowing the boomerang back to the thrower, and producing visible feedback.
|
||||
* * throwing_datum: The thrownthing datum that originally impacted the object, that we use to build the new throwing datum for the rebound.
|
||||
* * hit_atom: The atom that has been hit by the boomerang'd object.
|
||||
*/
|
||||
/datum/component/boomerang/proc/aerodynamic_swing(datum/thrownthing/throwing_datum, obj/item/true_parent)
|
||||
var/mob/thrown_by = locateUID(true_parent.thrownby)
|
||||
if(istype(thrown_by))
|
||||
var/dir = get_dir(true_parent, thrown_by)
|
||||
var/turf/T = get_ranged_target_turf(thrown_by, dir, 2)
|
||||
addtimer(CALLBACK(true_parent, TYPE_PROC_REF(/atom/movable, throw_at), T, boomerang_throw_range, throwing_datum.speed, null, TRUE), 1)
|
||||
last_boomerang_throw = world.time + BOOMERANG_REBOUND_INTERVAL
|
||||
true_parent.visible_message("<span class='danger'>[true_parent] is flying back at [throwing_datum.thrower]!</span>", \
|
||||
"<span class='danger'>You see [true_parent] fly back at you!</span>", \
|
||||
"<span class='hear'>You hear an aerodynamic woosh!</span>")
|
||||
|
||||
#undef BOOMERANG_REBOUND_INTERVAL
|
||||
@@ -47,6 +47,16 @@
|
||||
to_chat(L, "<span class='caution'>Glowing red letters appear on the front cover...</span>")
|
||||
to_chat(L, "<span class='warning'>[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]</span>")
|
||||
burnt_out = TRUE
|
||||
else if(istype(item, /obj/item/book/granter))
|
||||
var/obj/item/book/granter/I = item
|
||||
if(prob(80))
|
||||
L.visible_message("<span class='warning'>[I] catches fire!</span>")
|
||||
qdel(I)
|
||||
else
|
||||
I.uses += 1
|
||||
charged_item = I
|
||||
break
|
||||
|
||||
else if(istype(item, /obj/item/gun/magic))
|
||||
var/obj/item/gun/magic/I = item
|
||||
if(prob(80) && !I.can_charge)
|
||||
|
||||
@@ -67,6 +67,15 @@
|
||||
cost = 50
|
||||
job = list("Mime")
|
||||
|
||||
/datum/uplink_item/jobspecific/combat_baking
|
||||
name = "Combat Bakery Kit"
|
||||
desc = "A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword, \
|
||||
a pair of throwing croissants, and the recipe to make more on demand. Once the job is done, eat the evidence."
|
||||
reference = "CBK"
|
||||
item = /obj/item/storage/box/syndie_kit/combat_baking
|
||||
cost = 25 //A chef can get a knife that sharp easily, though it won't block. While you can get endless boomerang, they are less deadly than a stech, and slower / more predictable.
|
||||
job = list("Mime", "Chef")
|
||||
|
||||
/datum/uplink_item/jobspecific/pressure_mod
|
||||
name = "Kinetic Accelerator Pressure Mod"
|
||||
desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. Occupies 35% mod capacity."
|
||||
|
||||
Reference in New Issue
Block a user