Removes All Weapons

This commit is contained in:
Fox McCloud
2018-04-15 16:25:56 -04:00
parent 8b576c4d42
commit 5c4aa9b3fd
1100 changed files with 17642 additions and 17666 deletions
+11 -11
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/reagent_containers
/obj/item/reagent_containers
name = "Container"
desc = "..."
icon = 'icons/obj/chemical.dmi'
@@ -11,7 +11,7 @@
var/spawned_disease = null
var/disease_amount = 20
/obj/item/weapon/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this
/obj/item/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this
set name = "Set transfer amount"
set category = "Object"
set src in range(0)
@@ -25,10 +25,10 @@
if(N)
amount_per_transfer_from_this = N
/obj/item/weapon/reagent_containers/New()
/obj/item/reagent_containers/New()
..()
if(!possible_transfer_amounts)
verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT
verbs -= /obj/item/reagent_containers/verb/set_APTFT
create_reagents(volume)
if(spawned_disease)
var/datum/disease/F = new spawned_disease(0)
@@ -37,31 +37,31 @@
if(list_reagents)
reagents.add_reagent_list(list_reagents)
/obj/item/weapon/reagent_containers/ex_act()
/obj/item/reagent_containers/ex_act()
if(reagents)
for(var/datum/reagent/R in reagents.reagent_list)
R.on_ex_act()
..()
/obj/item/weapon/reagent_containers/fire_act()
/obj/item/reagent_containers/fire_act()
reagents.chem_temp += 30
reagents.handle_reactions()
..()
/obj/item/weapon/reagent_containers/attack_self(mob/user)
/obj/item/reagent_containers/attack_self(mob/user)
return
// this prevented pills, food, and other things from being picked up by bags.
// possibly intentional, but removing it allows us to not duplicate functionality.
// -Sayu (storage conslidation)
/*
/obj/item/weapon/reagent_containers/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/item/reagent_containers/attackby(obj/item/I as obj, mob/user as mob, params)
return
*/
/obj/item/weapon/reagent_containers/afterattack(obj/target, mob/user , flag)
/obj/item/reagent_containers/afterattack(obj/target, mob/user , flag)
return
/obj/item/weapon/reagent_containers/proc/reagentlist(obj/item/weapon/reagent_containers/snack) //Attack logs for regents in pills
/obj/item/reagent_containers/proc/reagentlist(obj/item/reagent_containers/snack) //Attack logs for regents in pills
var/data
if(snack && snack.reagents && snack.reagents.reagent_list && snack.reagents.reagent_list.len) //find a reagent list if there is and check if it has entries
for(var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind
@@ -69,7 +69,7 @@
return data
else return "No reagents"
/obj/item/weapon/reagent_containers/wash(mob/user, atom/source)
/obj/item/reagent_containers/wash(mob/user, atom/source)
if(is_open_container())
if(reagents.total_volume >= volume)
to_chat(user, "<span class='warning'>[src] is full.</span>")