mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 20:47:10 +01:00
[PORT] Add mantis blades (new traitor item) (#27594)
* add mantis blades * fix nuclear only * fix .dme edit * fix linter * new attack chain * maybe fix linter * add NT mantis blade to syndicate 6 * newline * add list * fix nested types * ability to pry open doors with two blades * Update code/game/machinery/doors/airlock.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * requested changes * remove transform * replace sleep with addtimer * Update code/datums/uplink_items/uplink_general.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/datums/uplink_items/uplink_general.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/uplink_kits.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/research/designs/weapon_designs.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/research/designs/weapon_designs.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * add safetys and some cleanup * return parry sound * snake case and replace CALLBACK with VARSET_CALLBACK * move attacking logic and update item and uplink description * cleanup * first attempt * fix conditional statement * update paradise.dme * edit whitespace * signal interceptors * improve some logic * oops * use COMSIG_INTERACTING * return one whitespace * subtype for mantis blades * replace .GetComponent() with signal * fix typo * better naming * attempt_cancel_message and some logic * split logic --------- Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
This commit is contained in:
co-authored by
Burzah
PopeDaveThe3th
parent
6f77bf1f8a
commit
dac57002ff
@@ -111,6 +111,7 @@
|
||||
RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, PROC_REF(on_sharpen))
|
||||
RegisterSignal(parent, COMSIG_CARBON_UPDATE_HANDCUFFED, PROC_REF(on_handcuff_user))
|
||||
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
|
||||
RegisterSignal(parent, COMSIG_TWOHANDED_WIELDED_TRY_WIELD_INTERACT, PROC_REF(check_unwielded))
|
||||
|
||||
// Remove all siginals registered to the parent item
|
||||
/datum/component/two_handed/UnregisterFromParent()
|
||||
@@ -307,6 +308,15 @@
|
||||
// Clear any old refrence to an item that should be gone now
|
||||
offhand_item = null
|
||||
|
||||
/**
|
||||
* Check if item is unwielded
|
||||
*
|
||||
* returns TRUE if unwielded
|
||||
*/
|
||||
/datum/component/two_handed/proc/check_unwielded()
|
||||
SIGNAL_HANDLER // COMSIG_TWOHANDED_WIELDED_TRY_WIELD_INTERACT
|
||||
return wielded ? FALSE : TRUE;
|
||||
|
||||
/**
|
||||
* on_attack triggers on attack with the parent item
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user