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

The cannon and blunderbuss now only disallow open containers instead of all reagent_containers. (#10698)

Browse Source
This commit is contained in:
Shadowmech88
2016-06-22 08:13:44 -05:00
committed by ComicIronic
parent 0cde9ec9df
commit a7532303c1
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/guns/projectile/constructable/blunderbuss.dm
View File

@@ -97,7 +97,7 @@
for(var/i=1, i<=prohibited_items.len, i++)
if(istype(W,prohibited_items[i]))
item_prohibited = 1
if(!loaded_item && istype(W,/obj/item) && !istype(W,/obj/item/weapon/reagent_containers) && !item_prohibited)
if(!loaded_item && istype(W,/obj/item) && !W.is_open_container() && !item_prohibited)
if(istype(W, /obj/item/stack))
var/obj/item/stack/S = W
S.use(1)
@@ -113,10 +113,10 @@
else if(!loaded_item && item_prohibited)
to_chat(user, "<span class='warning'>That won't fit into the muzzle!</span>")
return 1
else if(loaded_item && istype(W,/obj/item/weapon/reagent_containers))
else if(loaded_item && W.is_open_container())
to_chat(user, "<span class='warning'>You can't reach the fuel chamber when there's something stuck in the barrel!</span>")
return 1
else if(!loaded_item && istype(W,/obj/item/weapon/reagent_containers))
else if(!loaded_item && W.is_open_container())
transfer_fuel(W, user)
return 1
else if(loaded_item && istype(W,/obj/item))
@@ -128,6 +128,8 @@
/obj/item/weapon/blunderbuss/proc/transfer_fuel(obj/item/weapon/reagent_containers/S, mob/user as mob)
if(!S.is_open_container())
return
if(!istype(S))
return
if(S.is_empty())
to_chat(user, "<span class='warning'>\The [S] is empty.</span>")
return

8
code/modules/projectiles/guns/projectile/constructable/cannon.dm
View File

@@ -91,7 +91,7 @@
for(var/i=1, i<=prohibited_items.len, i++)
if(istype(W,prohibited_items[i]))
item_prohibited = 1
if(!loaded_item && istype(W,/obj/item) && !istype(W,/obj/item/weapon/reagent_containers) && !item_prohibited)
if(!loaded_item && istype(W,/obj/item) && !W.is_open_container() && !item_prohibited)
if(!user.drop_item(W, src))
to_chat(user, "<span class='warning'>You can't let go of \the [W]!</span>")
return 1
@@ -101,10 +101,10 @@
else if(!loaded_item && item_prohibited)
to_chat(user, "<span class='warning'>That won't fit into the barrel!</span>")
return 1
else if(loaded_item && istype(W,/obj/item/weapon/reagent_containers))
else if(loaded_item && W.is_open_container())
to_chat(user, "<span class='warning'>The fuel needs to be put in before the ammunition!</span>")
return 1
else if(!loaded_item && istype(W,/obj/item/weapon/reagent_containers))
else if(!loaded_item && W.is_open_container())
transfer_fuel(W, user)
return 1
else if(loaded_item && istype(W,/obj/item))
@@ -116,6 +116,8 @@
/obj/structure/bed/chair/vehicle/wheelchair/wheelchair_assembly/cannon/proc/transfer_fuel(obj/item/weapon/reagent_containers/S, mob/user as mob)
if(!S.is_open_container())
return
if(!istype(S))
return
if(S.is_empty())
to_chat(user, "<span class='warning'>\The [S] is empty.</span>")
return