mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
hookfix
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
/obj/item/weapon/gun/hookshot
|
/obj/item/weapon/gun/hookshot //-by Deity Link
|
||||||
name = "hookshot"
|
name = "hookshot"
|
||||||
desc = "Used to create tethers! It's a very experimental device, recently developped by Nanotrasen."
|
desc = "Used to create tethers! It's a very experimental device, recently developped by Nanotrasen."
|
||||||
icon = 'icons/obj/gun_experimental.dmi'
|
icon = 'icons/obj/gun_experimental.dmi'
|
||||||
@@ -188,10 +188,15 @@
|
|||||||
if(!isturf(HC.loc) || (loc != firer))
|
if(!isturf(HC.loc) || (loc != firer))
|
||||||
cancel_chain()
|
cancel_chain()
|
||||||
break
|
break
|
||||||
|
var/turf/oldLoc = firer.loc
|
||||||
var/bckp = firer.pass_flags
|
var/bckp = firer.pass_flags
|
||||||
firer.pass_flags = PASSTABLE
|
firer.pass_flags = PASSTABLE
|
||||||
firer.Move(HC.loc,get_dir(firer,HC.loc))
|
firer.Move(HC.loc,get_dir(firer,HC.loc))
|
||||||
firer.pass_flags = bckp
|
firer.pass_flags = bckp
|
||||||
|
if(firer.loc == oldLoc)//we're bumping into something, abort!
|
||||||
|
clockwerk = 0
|
||||||
|
rewind_chain()
|
||||||
|
return
|
||||||
HC.loc = src
|
HC.loc = src
|
||||||
sleep(1)
|
sleep(1)
|
||||||
clockwerk = 0
|
clockwerk = 0
|
||||||
|
|||||||
@@ -15,6 +15,9 @@
|
|||||||
var/max_shells = 200
|
var/max_shells = 200
|
||||||
var/current_shells = 200
|
var/current_shells = 200
|
||||||
|
|
||||||
|
/obj/item/weapon/gun/gatling/isHandgun()
|
||||||
|
return 0
|
||||||
|
|
||||||
/obj/item/weapon/gun/gatling/examine(mob/user)
|
/obj/item/weapon/gun/gatling/examine(mob/user)
|
||||||
..()
|
..()
|
||||||
user << "<span class='info'>Has [current_shells] round\s remaining.</span>"
|
user << "<span class='info'>Has [current_shells] round\s remaining.</span>"
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
load_method = 0
|
load_method = 0
|
||||||
var/backup_view = 7
|
var/backup_view = 7
|
||||||
|
|
||||||
|
/obj/item/weapon/gun/projectile/hecate/isHandgun()
|
||||||
|
return 0
|
||||||
|
|
||||||
/obj/item/weapon/gun/projectile/hecate/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params, struggle = 0)
|
/obj/item/weapon/gun/projectile/hecate/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params, struggle = 0)
|
||||||
if(flag) return //we're placing gun on a table or in backpack
|
if(flag) return //we're placing gun on a table or in backpack
|
||||||
if(harm_labeled >= min_harm_label)
|
if(harm_labeled >= min_harm_label)
|
||||||
|
|||||||
@@ -19,6 +19,9 @@
|
|||||||
|
|
||||||
var/current_shells = 200
|
var/current_shells = 200
|
||||||
|
|
||||||
|
/obj/item/weapon/gun/stickybomb/isHandgun()
|
||||||
|
return 0
|
||||||
|
|
||||||
/obj/item/weapon/gun/stickybomb/New()
|
/obj/item/weapon/gun/stickybomb/New()
|
||||||
..()
|
..()
|
||||||
loaded = list(
|
loaded = list(
|
||||||
|
|||||||
@@ -4,3 +4,4 @@ changes:
|
|||||||
- bugfix: Gravity Wells no longer try to move atoms that are already on top of them.
|
- bugfix: Gravity Wells no longer try to move atoms that are already on top of them.
|
||||||
- bugfix: Gravity Well Gun projectiles aren't affected by singularities or narsie anymore, and thus can reliably keep them stuck in a place for the duration of the Gravity Well (Note that the Gravity Well can only pull singularities to its center once it has reached a certain size, which it takes about 12 seconds to reach).
|
- bugfix: Gravity Well Gun projectiles aren't affected by singularities or narsie anymore, and thus can reliably keep them stuck in a place for the duration of the Gravity Well (Note that the Gravity Well can only pull singularities to its center once it has reached a certain size, which it takes about 12 seconds to reach).
|
||||||
- bugfix: Singularities cannot be eaten by smaller singularities anymore.
|
- bugfix: Singularities cannot be eaten by smaller singularities anymore.
|
||||||
|
- bugfix: Fixed the Hookshot being able to pull you through grilles and closing doors and stuff.
|
||||||
|
|||||||
Reference in New Issue
Block a user