cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper fix to prevent RPD from making a thing while storing it.

Browse Source
This commit is contained in:
D3athrow
2015-12-05 15:38:34 -06:00
parent 0571df3515
commit e7b583ff29
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/bots/floorbot.dm
View File

@@ -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) /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)) if(!istype(T, /obj/item/stack/tile/plasteel))
..() . = ..()
return return
if(src.contents.len >= 1) if(src.contents.len >= 1)
to_chat(user, "<span class='notice'>They wont fit in as there is already stuff inside.</span>") to_chat(user, "<span class='notice'>They wont fit in as there is already stuff inside.</span>")

2
code/game/machinery/bots/medbot.dm
View File

@@ -554,7 +554,7 @@
/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob) /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))) if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
..() . = ..()
return return
//Making a medibot! //Making a medibot!

4
code/game/objects/items/weapons/storage/backpack.dm
View File

@@ -16,7 +16,7 @@
/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
playsound(get_turf(src), "rustle", 50, 1, -5) playsound(get_turf(src), "rustle", 50, 1, -5)
..() . = ..()
/* /*
* Backpack Types * Backpack Types
@@ -62,7 +62,7 @@
user.throw_at(get_turf(src), 10, 5) user.throw_at(get_turf(src), 10, 5)
del(src) del(src)
return return
..() . = ..()
/obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user as mob) /obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user as mob)
if (prob(src.reliability)) return 1 //No failure if (prob(src.reliability)) return 1 //No failure

2
code/game/objects/items/weapons/storage/bible.dm
View File

@@ -157,7 +157,7 @@
/obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob)
playsound(get_turf(src), "rustle", 50, 1, -5) playsound(get_turf(src), "rustle", 50, 1, -5)
..() . = ..()
/obj/item/weapon/storage/bible/pickup(mob/living/user as mob) /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 if(user.mind && user.mind.assigned_role == "Chaplain") //We are the Chaplain, yes we are

4
code/game/objects/items/weapons/storage/lockbox.dm
View File

@@ -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) 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) if(!locked)
..() . = ..()
else else
to_chat(user, "<span class='warning'>Its locked!</span>") to_chat(user, "<span class='warning'>Its locked!</span>")
return return
@@ -183,7 +183,7 @@
tracked_access = "The tracker reads: 'Last unlocked by [ID.registered_name].'" tracked_access = "The tracker reads: 'Last unlocked by [ID.registered_name].'"
return return
else else
..() . = ..()
/obj/item/weapon/storage/lockbox/coinbox /obj/item/weapon/storage/lockbox/coinbox
name = "coinbox" name = "coinbox"

2
code/game/objects/items/weapons/storage/secure.dm
View File

@@ -69,7 +69,7 @@
return return
// -> storage/attackby() what with handle insertion, etc // -> storage/attackby() what with handle insertion, etc
..() . = ..()
/obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location) /obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location)

2
code/modules/projectiles/guns/projectile/pneumatic.dm
View File

@@ -60,7 +60,7 @@
item_state = "pneumatic-tank" item_state = "pneumatic-tank"
user.update_icons() user.update_icons()
else else
..() . = ..()
/obj/item/weapon/storage/pneumatic/examine(mob/user) /obj/item/weapon/storage/pneumatic/examine(mob/user)
..() ..()

2
code/modules/research/mechanic/component_exchanger.dm
View File

@@ -38,7 +38,7 @@
to_chat(user, "<span class='notice'>You fill up \the [src] with \the [G]'s contents.</span>") to_chat(user, "<span class='notice'>You fill up \the [src] with \the [G]'s contents.</span>")
return 1 return 1
else else
..() . = ..()
//Redirect the attack only if it's a machine, otherwise don't bother //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) /obj/item/weapon/storage/component_exchanger/preattack(var/atom/A, var/mob/user, proximity_flag)