Gives chemistry breathing room - moves welding tank to a wall-mount version

This commit is contained in:
Crazylemon64
2016-02-05 03:20:57 -08:00
parent f913789bf3
commit eba74c1392
5 changed files with 126 additions and 5 deletions
+8 -1
View File
@@ -92,6 +92,7 @@
icon_state = "weldtank"
amount_per_transfer_from_this = 10
var/obj/item/device/assembly_holder/rig = null
var/accepts_rig = 1
/obj/structure/reagent_dispensers/fueltank/New()
..()
@@ -126,7 +127,7 @@
overlays = new/list()
/obj/structure/reagent_dispensers/fueltank/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W,/obj/item/device/assembly_holder))
if (istype(W,/obj/item/device/assembly_holder) && accepts_rig)
if (rig)
user << "\red There is another device in the way."
return ..()
@@ -254,3 +255,9 @@
/obj/structure/reagent_dispensers/spacecleanertank/New()
..()
reagents.add_reagent("cleaner",5000)
/obj/structure/reagent_dispensers/fueltank/chem
icon_state = "weldingtank_chem"
anchored = 1
density = 0
accepts_rig = 0
+94
View File
@@ -0,0 +1,94 @@
/proc/attempt_initiate_surgery(obj/item/I, mob/living/M, mob/user, var/override )
if(istype(M))
var/mob/living/carbon/human/H
var/obj/item/organ/external/affecting
var/selected_zone = user.zone_sel.selecting
if(istype(M, /mob/living/carbon/human))
H = M
affecting = H.get_organ(check_zone(selected_zone))
if(isslime(M) ||isalien(M) ||can_operate(H)) //if they're prone or a slime
var/datum/surgery/current_surgery
for(var/datum/surgery/S in M.surgeries)
if(S.location == selected_zone)
current_surgery = S
if(!current_surgery)
var/list/all_surgeries = surgeries_list.Copy()
var/list/available_surgeries = list()
for(var/datum/surgery/S in all_surgeries)
if(!S.possible_locs.Find(selected_zone))
continue
if(affecting && S.requires_organic_bodypart && affecting.status == ORGAN_ROBOT)
continue
if(!S.can_start(user, M))
continue
for(var/path in S.allowed_mob)
if(istype(M, path))
available_surgeries[S.name] = S
break
if(override)
if(istype(I,/obj/item/robot_parts))
var/datum/surgery/S = available_surgeries["robotic limb attachment"]
if(S)
var/datum/surgery/procedure = new S.type
if(procedure)
procedure.location = selected_zone
M.surgeries += procedure
procedure.organ_ref = affecting
procedure.next_step(user, M)
else
var/P = input("Begin which procedure?", "Surgery", null, null) as null|anything in available_surgeries
if(P && user && user.Adjacent(M) && (I in user))
var/datum/surgery/S = available_surgeries[P]
var/datum/surgery/procedure = new S.type
if(procedure)
procedure.location = selected_zone
M.surgeries += procedure
procedure.organ_ref = affecting
user.visible_message("[user] prepares to operate on [M]'s [parse_zone(selected_zone)].", \
"<span class='notice'>You prepare to operate on [M]'s [parse_zone(selected_zone)].</span>")
else if(!current_surgery.step_in_progress)
if(current_surgery.status == 1 )
M.surgeries -= current_surgery
user << "You stop the surgery."
qdel(current_surgery)
else if(istype(user.get_inactive_hand(), /obj/item/weapon/cautery) && current_surgery.can_cancel)
M.surgeries -= current_surgery
user.visible_message("[user] mends the incision on [M]'s [parse_zone(selected_zone)] with the [I] .", \
"<span class='notice'>You mend the incision on [M]'s [parse_zone(selected_zone)].</span>")
affecting.open = 0
affecting.germ_level = 0
affecting.status &= ~ORGAN_BLEEDING
qdel(current_surgery)
else if(current_surgery.can_cancel)
user << "<span class='warning'>You need to hold a cautery in inactive hand to stop [M]'s surgery!</span>"
return 1
return 0
proc/get_location_modifier(mob/M)
var/turf/T = get_turf(M)
if(locate(/obj/machinery/optable, T))
return 1
else if(locate(/obj/structure/table, T))
return 0.8
else if(locate(/obj/structure/stool/bed, T))
return 0.7
else
return 0.5
//just until i update maps....
/obj/item/organ/brain/New()
new /obj/item/organ/internal/brain(src.loc)