Merge pull request #9629 from GinjaNinja32/spawn

Spawn fixes
This commit is contained in:
PsiOmegaDelta
2015-06-02 08:05:54 +02:00
5 changed files with 30 additions and 11 deletions

View File

@@ -30,19 +30,23 @@
if(!is_open_container())
user << "The cap is sealed."
/obj/item/weapon/reagent_containers/chem_disp_cartridge/verb/setLabel(L as text)
/obj/item/weapon/reagent_containers/chem_disp_cartridge/verb/verb_set_label(L as text)
set name = "Set Cartridge Label"
set category = "Object"
set src in view(usr, 1)
setLabel(L, usr)
/obj/item/weapon/reagent_containers/chem_disp_cartridge/proc/setLabel(L, mob/user = null)
if(L)
if(usr)
usr << "<span class='notice'>You set the label on \the [src] to '[L]'.</span>"
if(user)
user << "<span class='notice'>You set the label on \the [src] to '[L]'.</span>"
label = L
name = "[initial(name)] - '[L]'"
else
if(usr)
usr << "<span class='notice'>You clear the label on \the [src].</span>"
if(user)
user << "<span class='notice'>You clear the label on \the [src].</span>"
label = ""
name = initial(name)
@@ -87,4 +91,4 @@
user << "<span class='notice'>You transfer [trans] units of the solution to \the [target].</span>"
else
return ..()
return ..()

View File

@@ -0,0 +1,13 @@
/client/proc/spawn_chemdisp_cartridge(size in list("small", "medium", "large"), reagent in chemical_reagents_list)
set name = "Spawn Chemical Dispenser Cartridge"
set category = "Admin"
var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C
switch(size)
if("small") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge/small(usr.loc)
if("medium") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge/medium(usr.loc)
if("large") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge(usr.loc)
C.reagents.add_reagent(reagent, C.volume)
var/datum/reagent/R = chemical_reagents_list[reagent]
C.setLabel(R.name)
log_admin("[key_name(usr)] spawned a [size] reagent container containing [reagent] at ([usr.x],[usr.y],[usr.z])")