Skip to content

Commit

Permalink
ITS TIME
Browse files Browse the repository at this point in the history
  • Loading branch information
Salted-Zen committed Oct 27, 2023
1 parent 10c2c2c commit fbb3d5c
Show file tree
Hide file tree
Showing 5 changed files with 353 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,30 @@
item_path = /obj/item/gun/energy/recharge/kinetic_accelerator
cost_per_order = 750

/datum/orderable_item/accelerator/gun/repeater //monke edit
item_path = /obj/item/gun/energy/recharge/kinetic_accelerator/repeater
cost_per_order = 1250

/datum/orderable_item/accelerator/gun/shotgun //monke edit
item_path = /obj/item/gun/energy/recharge/kinetic_accelerator/shotgun
cost_per_order = 1250

/datum/orderable_item/accelerator/gun/pounder //monke edit
item_path = /obj/item/gun/energy/recharge/kinetic_accelerator/pounder
cost_per_order = 1250

/datum/orderable_item/accelerator/gun/glock //monke edit
item_path = /obj/item/gun/energy/recharge/kinetic_accelerator/glock
cost_per_order = 1250

/datum/orderable_item/accelerator/gun/railgun //monke edit
item_path = /obj/item/gun/energy/recharge/kinetic_accelerator/railgun
cost_per_order = 1250

/datum/orderable_item/accelerator/gun/hook //monke edit
item_path = /obj/item/gun/energy/recharge/kinetic_accelerator/hook
cost_per_order = 1250

/datum/orderable_item/accelerator/range
item_path = /obj/item/borg/upgrade/modkit/range
cost_per_order = 1000
Expand Down
5 changes: 3 additions & 2 deletions code/modules/projectiles/guns/energy/kinetic_accelerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
var/max_mod_capacity = 100
var/list/modkits = list()
gun_flags = NOT_A_REAL_GUN
var/disablemodification = FALSE //monkeedit - stops removal and addition of mods

/obj/item/gun/energy/recharge/kinetic_accelerator/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -53,7 +54,7 @@

/obj/item/gun/energy/recharge/kinetic_accelerator/crowbar_act(mob/living/user, obj/item/I)
. = TRUE
if(modkits.len)
if(modkits.len && !disablemodification) //monkeedit
to_chat(user, span_notice("You pry all the modifications out."))
I.play_tool_sound(src, 100)
for(var/a in modkits)
Expand Down Expand Up @@ -109,7 +110,7 @@
return ..()

/obj/item/gun/energy/recharge/kinetic_accelerator/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/borg/upgrade/modkit))
if(istype(I, /obj/item/borg/upgrade/modkit) && !disablemodification) //monkeedit
var/obj/item/borg/upgrade/modkit/MK = I
MK.install(src, user)
else
Expand Down
3 changes: 2 additions & 1 deletion code/modules/projectiles/guns/energy/recharge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
var/recharge_timerid
/// Do we recharge slower with more of our type?
var/unique_frequency = FALSE
var/override_dualweild = FALSE //monkeedit

/obj/item/gun/energy/recharge/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -61,7 +62,7 @@
if(!set_recharge_time)
set_recharge_time = recharge_time
var/carried = 0
if(!unique_frequency)
if(!unique_frequency && !override_dualweild) //Monke edit
for(var/obj/item/gun/energy/recharge/recharging_gun in loc.get_all_contents())
if(recharging_gun.type != type || recharging_gun.unique_frequency)
continue
Expand Down
30 changes: 16 additions & 14 deletions code/modules/projectiles/guns/special/meat_hook.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
hitsound = 'sound/effects/splat.ogg'
var/chain
var/knockdown_time = (0.5 SECONDS)
var/disablepull = FALSE //monke edit

/obj/projectile/hook/fire(setAngle)
if(firer)
Expand All @@ -52,20 +53,21 @@

/obj/projectile/hook/on_hit(atom/target)
. = ..()
if(ismovable(target))
var/atom/movable/A = target
if(A.anchored)
return
A.visible_message(span_danger("[A] is snagged by [firer]'s hook!"))
//Should really be a movement loop, but I don't want to support moving 5 tiles a tick
//It just looks bad
new /datum/forced_movement(A, get_turf(firer), 5, TRUE)
if (isliving(target))
var/mob/living/fresh_meat = target
fresh_meat.Knockdown(knockdown_time)
return
//TODO: keep the chain beamed to A
//TODO: needs a callback to delete the chain
if(!disablepull) //monke edit
if(ismovable(target))
var/atom/movable/A = target
if(A.anchored)
return
A.visible_message(span_danger("[A] is snagged by [firer]'s hook!"))
//Should really be a movement loop, but I don't want to support moving 5 tiles a tick
//It just looks bad
new /datum/forced_movement(A, get_turf(firer), 5, TRUE)
if (isliving(target))
var/mob/living/fresh_meat = target
fresh_meat.Knockdown(knockdown_time)
return
//TODO: keep the chain beamed to A
//TODO: needs a callback to delete the chain

/obj/projectile/hook/Destroy()
qdel(chain)
Expand Down
Loading

0 comments on commit fbb3d5c

Please sign in to comment.