mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Proper fix to prevent RPD from making a thing while storing it.
This commit is contained in:
@@ -706,7 +706,7 @@ var/global/list/floorbot_targets=list()
|
||||
|
||||
/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob)
|
||||
if(!istype(T, /obj/item/stack/tile/plasteel))
|
||||
..()
|
||||
. = ..()
|
||||
return
|
||||
if(src.contents.len >= 1)
|
||||
to_chat(user, "<span class='notice'>They wont fit in as there is already stuff inside.</span>")
|
||||
|
||||
@@ -554,7 +554,7 @@
|
||||
/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob)
|
||||
|
||||
if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
|
||||
..()
|
||||
. = ..()
|
||||
return
|
||||
|
||||
//Making a medibot!
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
playsound(get_turf(src), "rustle", 50, 1, -5)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/*
|
||||
* Backpack Types
|
||||
@@ -62,7 +62,7 @@
|
||||
user.throw_at(get_turf(src), 10, 5)
|
||||
del(src)
|
||||
return
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user as mob)
|
||||
if (prob(src.reliability)) return 1 //No failure
|
||||
|
||||
@@ -157,7 +157,7 @@
|
||||
|
||||
/obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
playsound(get_turf(src), "rustle", 50, 1, -5)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/storage/bible/pickup(mob/living/user as mob)
|
||||
if(user.mind && user.mind.assigned_role == "Chaplain") //We are the Chaplain, yes we are
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
O.show_message(text("<span class='notice'>The locker has been broken by [] with an electromagnetic card!</span>", user), 1, text("You hear a faint electrical spark."), 2)
|
||||
|
||||
if(!locked)
|
||||
..()
|
||||
. = ..()
|
||||
else
|
||||
to_chat(user, "<span class='warning'>Its locked!</span>")
|
||||
return
|
||||
@@ -183,7 +183,7 @@
|
||||
tracked_access = "The tracker reads: 'Last unlocked by [ID.registered_name].'"
|
||||
return
|
||||
else
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/storage/lockbox/coinbox
|
||||
name = "coinbox"
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
return
|
||||
|
||||
// -> storage/attackby() what with handle insertion, etc
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
|
||||
/obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location)
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
item_state = "pneumatic-tank"
|
||||
user.update_icons()
|
||||
else
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/storage/pneumatic/examine(mob/user)
|
||||
..()
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
to_chat(user, "<span class='notice'>You fill up \the [src] with \the [G]'s contents.</span>")
|
||||
return 1
|
||||
else
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
//Redirect the attack only if it's a machine, otherwise don't bother
|
||||
/obj/item/weapon/storage/component_exchanger/preattack(var/atom/A, var/mob/user, proximity_flag)
|
||||
|
||||
Reference in New Issue
Block a user