From 647ed920eb0d32a78b69352ca235e32092de8ff4 Mon Sep 17 00:00:00 2001 From: CaelAislinn Date: Tue, 7 Feb 2012 03:53:01 +1000 Subject: [PATCH 1/3] removed redundant proc, updated old blood in multiz Signed-off-by: CaelAislinn --- code/WorkInProgress/Cael_Aislinn/MultiZ.dm | 33 ++++++++++++++++++++-- code/defines/procs/gamehelpers.dm | 9 ------ code/game/mecha/mecha.dm | 2 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/MultiZ.dm b/code/WorkInProgress/Cael_Aislinn/MultiZ.dm index 6efc163619..b2faa09285 100644 --- a/code/WorkInProgress/Cael_Aislinn/MultiZ.dm +++ b/code/WorkInProgress/Cael_Aislinn/MultiZ.dm @@ -174,9 +174,36 @@ H.apply_damage(0.5*damage, BRUTE, "l_arm") H.apply_damage(0.5*damage, BRUTE, "r_arm") - //var/obj/effect/decal/cleanable/blood/B = new(src.loc) - //B.blood_DNA = H.dna.unique_enzymes - //B.blood_type = H.b_type +/* +/obj/effect/decal/cleanable/blood + name = "Blood" + desc = "It's red and disgusting." + density = 0 + anchored = 1 + layer = 2 + icon = 'blood.dmi' + icon_state = "floor1" + random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7") + var/list/viruses = list() + blood_DNA = list() + var/datum/disease2/disease/virus2 = null + var/OriginalMob = null + + Del() + for(var/datum/disease/D in viruses) + D.cure(0) + ..() +*/ + + var/obj/effect/decal/cleanable/blood/B = new(src.loc) + var/list/blood_DNA_temp[1] + blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type) + B.blood_DNA = blood_DNA_temp + B.virus2 = H.virus2 + for(var/datum/disease/D in H.viruses) + var/datum/disease/newDisease = new D.type + B.viruses += newDisease + newDisease.holder = B H:weakened = max(H:weakened,2) H:updatehealth() diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm index 9658feb8b1..081416a10f 100644 --- a/code/defines/procs/gamehelpers.dm +++ b/code/defines/procs/gamehelpers.dm @@ -291,12 +291,3 @@ proc/check_can_reach(atom/user, atom/target) del(D) // ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE ------- return ok - -//cael - not sure if there's an equivalent proc, but if there is i couldn't find it -//searches to see if M contains O somewhere -proc/is_carrying(var/M as mob, var/O as obj) - while(!istype(O,/area)) - if(O:loc == M) - return 1 - O = O:loc - return 0 \ No newline at end of file diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index e577f86280..bd0643e680 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -118,7 +118,7 @@ return var/obj/mecha/Mech = M.loc spawn() //this helps prevent clickspam fest. - if (Mech && !(is_carrying(M,object)) ) //cael - make sure you cant drill shit in your invent + if (Mech && !(object in M.get_contents()) ) //cael - make sure you cant drill shit in your invent Mech.click_action(object,M) else return ..() From 9ca058fd1b8cec3bf6a707432824d42151e93804 Mon Sep 17 00:00:00 2001 From: CaelAislinn Date: Tue, 7 Feb 2012 06:59:35 +1000 Subject: [PATCH 2/3] added a couple of missing networks to department camera monitors Signed-off-by: CaelAislinn --- code/game/machinery/computer/camera_monitor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/camera_monitor.dm b/code/game/machinery/computer/camera_monitor.dm index 287548eac9..e800f33272 100644 --- a/code/game/machinery/computer/camera_monitor.dm +++ b/code/game/machinery/computer/camera_monitor.dm @@ -6,9 +6,9 @@ else switch(department) if("Security") - networks = list("Arrivals","SS13","Engineering","Research","Medbay","Tcomsat","Mess Hall","Security","Atmospherics","Cargo") + networks = list("Arrivals","SS13","Engineering","Research","Medbay","Tcomsat","Mess Hall","Security","Atmospherics","Cargo","Command","Solars") if("Engineering") - networks = list("Engineering","Tcomsat","Singularity","Atmospherics") + networks = list("Engineering","Tcomsat","Singularity","Atmospherics","Solars") if("Research") networks = list("Research","Bomb Testing") if("Medbay") From 06fad9846930732d6a8c8289a0662c083d501eb7 Mon Sep 17 00:00:00 2001 From: CaelAislinn Date: Tue, 7 Feb 2012 08:05:47 +1000 Subject: [PATCH 3/3] fixed mech charge port bug, fixed (?) autolathe bug, miscellaneous map fixes Signed-off-by: CaelAislinn --- code/game/machinery/autolathe.dm | 77 +++++++++++++++++--------------- code/game/mecha/mech_bay.dm | 2 +- maps/tgstation.2.0.8.dmm | 4 +- 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 705dbef3f2..7c42b3e24f 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -185,45 +185,48 @@ usr << "\red The autolathe is busy. Please wait for completion of previous operation." if (!busy) if(href_list["make"]) - makeNew: - var/turf/T = src.loc - var/obj/template = locate(href_list["make"]) - var/multiplier = text2num(href_list["multiplier"]) - if (!multiplier) multiplier = 1 - var/power = max(2000, (template.m_amt+template.g_amt)*multiplier/5) - if(src.m_amount >= template.m_amt*multiplier && src.g_amount >= template.g_amt*multiplier) - busy = 1 - use_power(power) - icon_state = "autolathe" - flick("autolathe_n",src) - spawn(16) + while(outputAmount > 0) + var/turf/T = src.loc + var/obj/template = locate(href_list["make"]) + var/multiplier = text2num(href_list["multiplier"]) + if (!multiplier) multiplier = 1 + var/power = max(2000, (template.m_amt+template.g_amt)*multiplier/5) + if( (src.m_amount >= template.m_amt*multiplier) && (src.g_amount >= template.g_amt*multiplier) ) use_power(power) + icon_state = "autolathe" + flick("autolathe_n",src) spawn(16) - use_power(power) - spawn(16) - src.m_amount -= template.m_amt*multiplier - src.g_amount -= template.g_amt*multiplier - if(src.m_amount < 0) - src.m_amount = 0 - if(src.g_amount < 0) - src.g_amount = 0 - var/obj/new_item = new template.type(src) - for(var/obj/item/weapon/storage/container in src.contents) - container.attackby(new_item) - if(new_item.loc == container) - break - if (multiplier>1) - var/obj/item/stack/S = new_item - S.amount = multiplier - if(new_item in src) - new_item.loc = T - src.updateUsrDialog() - outputAmount -= 1 - if(outputAmount > 0) - goto makeNew - busy = 0 - else - outputAmount = 1 + if(!busy) + busy = 1 + use_power(power) + flick("autolathe_n",src) + spawn(16) + use_power(power) + flick("autolathe_n",src) + spawn(16) + flick("autolathe_n",src) + src.m_amount -= template.m_amt*multiplier + src.g_amount -= template.g_amt*multiplier + if(src.m_amount < 0) + src.m_amount = 0 + if(src.g_amount < 0) + src.g_amount = 0 + var/obj/new_item = new template.type(src) + for(var/obj/item/weapon/storage/container in src.contents) + container.attackby(new_item) + if(new_item.loc == container) + break + if (multiplier>1) + var/obj/item/stack/S = new_item + S.amount = multiplier + if(new_item in src) + new_item.loc = T + src.updateUsrDialog() + outputAmount -= 1 + busy = 0 + else + outputAmount = 1 + break if(href_list["act"]) var/temp_wire = href_list["wire"] if(href_list["act"] == "pulse") diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index c9a4f391f3..3d5df7a2a9 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -31,7 +31,7 @@ proc/init_devices() recharge_console = locate() in range(1,src) - recharge_port = locate(/obj/machinery/mech_bay_recharge_port, get_step(src, dir)) //gets the recharge poyrt from the facing dir + recharge_port = locate(/obj/machinery/mech_bay_recharge_port, get_step(src, dir)) //gets the recharge port from the facing dir if(recharge_console) recharge_console.recharge_floor = src if(recharge_port) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index ba484a825e..0a149f7434 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -4059,7 +4059,7 @@ "bAc" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bAd" = (/obj/machinery/power/apc{dir = 4; name = "Surgery APC"; pixel_x = 25},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/obj/item/weapon/crowbar,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bAe" = (/turf/simulated/wall/r_wall,/area/medical/surgery) -"bAf" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/power/apc{dir = 1; name = "RD's Office APC"; pixel_x = -25; pixel_y = 0},/obj/structure/cable{d2 = 2; icon_state = "0-4"; pixel_y = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) +"bAf" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/power/apc{dir = 8; name = "RD's Office APC"; pixel_x = -25; pixel_y = 0},/obj/structure/cable{d2 = 2; icon_state = "0-4"; pixel_y = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "bAg" = (/obj/structure/stool/chair{dir = 1},/obj/structure/cable{d2 = 2; icon_state = "4-8"; pixel_y = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "bAh" = (/obj/structure/cable{d2 = 2; icon_state = "4-8"; pixel_y = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "bAi" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/keycard_auth{pixel_x = -25; pixel_y = 32},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) @@ -4638,7 +4638,7 @@ "bLj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/assembly/chargebay) "bLk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor,/area/assembly/chargebay) "bLl" = (/obj/machinery/mech_bay_recharge_port,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/assembly/chargebay) -"bLm" = (/turf/simulated/floor/mech_bay_recharge_floor,/area/assembly/chargebay) +"bLm" = (/turf/simulated/floor/mech_bay_recharge_floor{dir = 8},/area/assembly/chargebay) "bLn" = (/obj/machinery/computer/mech_bay_power_console,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/grid,/area/assembly/chargebay) "bLo" = (/obj/machinery/door/poddoor{id = "Skynet_launch"; name = "Recharge Bay"; req_access_txt = "22"},/turf/simulated/floor,/area/assembly/chargebay) "bLp" = (/turf/simulated/floor{dir = 4; icon_state = "loadingarea"; tag = "loading"},/area/hallway/primary/aft)