Introduce the Distillery, a few recipes, and new chemicals. Introduce chemical patches, which apply on-touch chemicals, and can be dissolved a la pills.

This commit is contained in:
Mechoid
2019-08-07 20:49:24 -07:00
parent b242773440
commit c462448da8
20 changed files with 791 additions and 6 deletions

View File

@@ -44,7 +44,8 @@
/obj/machinery/smartfridge/,
/obj/machinery/biogenerator,
/obj/structure/frame,
/obj/machinery/radiocarbon_spectrometer
/obj/machinery/radiocarbon_spectrometer,
/obj/machinery/portable_atmospherics/powered/reagent_distillery
)
/obj/item/weapon/reagent_containers/glass/Initialize()

View File

@@ -0,0 +1,82 @@
/*
* Patches. A subtype of pills, in order to inherit the possible future produceability within chem-masters, and dissolving.
*/
/obj/item/weapon/reagent_containers/pill/patch
name = "patch"
desc = "A patch."
icon = 'icons/obj/chemical.dmi'
icon_state = null
item_state = "pill"
base_state = "patch"
possible_transfer_amounts = null
w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
volume = 60
var/pierce_material = FALSE // If true, the patch can be used through thick material.
/obj/item/weapon/reagent_containers/pill/patch/attack(mob/M as mob, mob/user as mob)
var/mob/living/L = user
if(M == L)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/affecting = H.get_organ(check_zone(L.zone_sel.selecting))
if(!affecting)
to_chat(user, "<span class='warning'>The limb is missing!</span>")
return
if(affecting.status >= ORGAN_ROBOT)
to_chat(user, "<span class='notice'>\The [src] won't work on a robotic limb!</span>")
return
if(!H.can_inject(user, FALSE, L.zone_sel.selecting, pierce_material))
to_chat(user, "<span class='notice'>\The [src] can't be applied through such a thick material!</span>")
return
to_chat(H, "<span class='notice'>\The [src] is placed on your [affecting].</span>")
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_TOUCH)
qdel(src)
return 1
else if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/affecting = H.get_organ(check_zone(L.zone_sel.selecting))
if(!affecting)
to_chat(user, "<span class='warning'>The limb is missing!</span>")
return
if(affecting.status >= ORGAN_ROBOT)
to_chat(user, "<span class='notice'>\The [src] won't work on a robotic limb!</span>")
return
if(!H.can_inject(user, FALSE, L.zone_sel.selecting, pierce_material))
to_chat(user, "<span class='notice'>\The [src] can't be applied through such a thick material!</span>")
return
user.visible_message("<span class='warning'>[user] attempts to place \the [src] onto [H]`s [affecting].</span>")
user.setClickCooldown(user.get_attack_speed(src))
if(!do_mob(user, M))
return
user.drop_from_inventory(src) //icon update
user.visible_message("<span class='warning'>[user] applies \the [src] to [H].</span>")
var/contained = reagentlist()
add_attack_logs(user,M,"Applied a patch containing [contained]")
to_chat(H, "<span class='notice'>\The [src] is placed on your [affecting].</span>")
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_TOUCH)
qdel(src)
return 1
return 0

View File

@@ -7,6 +7,9 @@
icon = 'icons/obj/chemical.dmi'
icon_state = null
item_state = "pill"
var/base_state = "pill"
possible_transfer_amounts = null
w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
@@ -15,7 +18,7 @@
/obj/item/weapon/reagent_containers/pill/Initialize()
. = ..()
if(!icon_state)
icon_state = "pill[rand(1, 4)]" //preset pills only use colour changing or unique icons
icon_state = "[base_state][rand(1, 4)]" //preset pills only use colour changing or unique icons
/obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob)
if(M == user)