cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports pneumatic cannon to new attack chain (#29287)

Browse Source 
* Ports pneumatic cannon to new attack chain

* adds interact_with_atom too
This commit is contained in:
BiancaWilkson
2025-05-12 23:53:29 -04:00
committed by GitHub
parent b15a1c2ee1
commit 2815be652e
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/pneumaticCannon.dm
+20 -17
View File
@@ -10,6 +10,7 @@
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 60, ACID = 50)
new_attack_chain = TRUE
///The max weight of items that can fit into the cannon
var/max_weight_class = 20
///The weight of items currently in the cannon
@@ -75,32 +76,34 @@
pressure_setting++
to_chat(user, "<span class='notice'>You tweak [src]'s pressure output to [pressure_setting].</span>")
/obj/item/pneumatic_cannon/attackby__legacy__attackchain(obj/item/W, mob/user, params)
..()
if(istype(W, /obj/item/tank/internals) && !tank)
if(istype(W, /obj/item/tank/internals/emergency_oxygen))
to_chat(user, "<span class='warning'>[W] is too small for [src].</span>")
return
add_tank(W, user)
return
if(W.type == type)
/obj/item/pneumatic_cannon/item_interaction(mob/living/user, obj/item/used, list/modifiers)
if(istype(used, /obj/item/tank/internals) && !tank)
if(istype(used, /obj/item/tank/internals/emergency_oxygen))
to_chat(user, "<span class='warning'>[used] is too small for [src].</span>")
return ITEM_INTERACT_COMPLETE
add_tank(used, user)
return ITEM_INTERACT_COMPLETE
if(used.type == type)
to_chat(user, "<span class='warning'>You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption.</span>")
return
load_item(W, user)
return ITEM_INTERACT_COMPLETE
load_item(used, user)
return ..()
/obj/item/pneumatic_cannon/screwdriver_act(mob/living/user, obj/item/I)
remove_tank(user)
return TRUE
/obj/item/pneumatic_cannon/afterattack__legacy__attackchain(atom/target, mob/living/carbon/human/user, flag, params)
if(isstorage(target)) //So you can store it in backpacks
/obj/item/pneumatic_cannon/ranged_interact_with_atom(atom/target, mob/living/user, list/modifiers)
fire(user, target)
return ITEM_INTERACT_COMPLETE
/obj/item/pneumatic_cannon/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(get_turf(user) == get_turf(target))
return ..()
if(istype(target, /obj/structure/rack)) //So you can store it on racks
return ..()
if(!istype(user))
if(user.a_intent != INTENT_HELP) // I know this seems backwards but other guns also have point blank shooting being locked to help intent
return ..()
fire(user, target)
return ITEM_INTERACT_COMPLETE
/obj/item/pneumatic_cannon/proc/fire(mob/living/carbon/human/user, atom/target)
if(!istype(user) && !target)