Gripper attackby fixes (#13571)

This cannot go wrong, can it?
This commit is contained in:
mikomyazaki
2022-04-20 22:15:15 +02:00
committed by GitHub
parent d8497aa4cb
commit e59589ec8a
184 changed files with 975 additions and 894 deletions
@@ -77,18 +77,18 @@
if(istype(W, /obj/item/ammo_casing))
if(W.type != ammo_type)
to_chat(user, SPAN_WARNING("\The [W] has a different type of ammunition!"))
return
return TRUE
if(length(ammo) >= max_ammo)
to_chat(user, SPAN_WARNING("\The [src] is already fully stacked."))
return
return TRUE
var/obj/item/ammo_casing/B = W
if(!B.BB)
to_chat(user, SPAN_WARNING("\The [B] is spent!"))
return
return TRUE
to_chat(user, SPAN_NOTICE("You add \the [W] to \the [src]."))
add_ammo(W)
return
..()
return TRUE
return ..()
/obj/item/ammo_pile/attack_hand(mob/user)
if(user.get_inactive_hand() == src)
@@ -174,4 +174,4 @@
ammo_type = /obj/item/ammo_casing/shotgun
/obj/item/ammo_pile/fourty_five
ammo_type = /obj/item/ammo_casing/c45
ammo_type = /obj/item/ammo_casing/c45
+11 -11
View File
@@ -873,32 +873,32 @@
if(bayonet)
to_chat(user, SPAN_DANGER("There is a bayonet attached to \the [src] already."))
return
return TRUE
user.drop_from_inventory(I,src)
bayonet = I
to_chat(user, SPAN_NOTICE("You attach \the [I] to the front of \the [src]."))
update_icon()
return
return TRUE
if(istype(pin) && pin.attackby(I, user)) //Allows users to use their ID on a gun with a wireless-control firing pin to register their identity.
return
return TRUE
if(istype(I, /obj/item/ammo_display))
if(!can_ammo_display)
to_chat(user, SPAN_WARNING("\The [I] cannot attach to \the [src]."))
return
return TRUE
if(ammo_display)
to_chat(user, SPAN_WARNING("\The [src] already has a holographic ammo display."))
return
return TRUE
if(displays_maptext)
to_chat(user, SPAN_WARNING("\The [src] is already displaying its ammo count."))
return
return TRUE
user.drop_from_inventory(I, src)
ammo_display = I
displays_maptext = TRUE
to_chat(user, SPAN_NOTICE("You attach \the [I] to \the [src]."))
return
return TRUE
if(I.iscrowbar() && bayonet)
to_chat(user, SPAN_NOTICE("You detach \the [bayonet] from \the [src]."))
@@ -906,7 +906,7 @@
user.put_in_hands(bayonet)
bayonet = null
update_icon()
return
return TRUE
if(I.iswrench() && ammo_display)
to_chat(user, SPAN_NOTICE("You wrench the ammo display loose from \the [src]."))
@@ -915,7 +915,7 @@
ammo_display = null
displays_maptext = FALSE
maptext = ""
return
return TRUE
if(pin && I.isscrewdriver())
visible_message(SPAN_WARNING("\The [user] begins to try and pry out \the [src]'s firing pin!"))
@@ -932,12 +932,12 @@
"You hear a metallic crack.")
qdel(pin)
pin = null
return
return TRUE
if(is_sharp(I))
user.visible_message("<b>[user]</b> carves a notched mark into \the [src].", SPAN_NOTICE("You carve a notched mark into \the [src]."))
markings++
return
return TRUE
return ..()
+2 -2
View File
@@ -213,7 +213,7 @@
update_icon()
/obj/item/gun/projectile/attackby(obj/item/A, mob/user)
..()
. = ..()
load_ammo(A, user)
/obj/item/gun/projectile/toggle_firing_mode(mob/user)
@@ -295,4 +295,4 @@
. += P.get_print_info()
else
. += "No magazine inserted.<br>"
. += ..(FALSE)
. += ..(FALSE)