From 28c9f10310b004af9769c2870a6d1febadbfdf28 Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Fri, 16 Mar 2012 05:08:24 +0000 Subject: [PATCH] Fixed HoS locker vanishing when emagged Commented out bloody footprints until someone can figure out a sane way to prevent there being hundreds if not thousands of decals a round. Reverted Doohl's riot armour/ablative armour changes (the code for reflection is just commented out, neat stuff) Fixed the typo on the CE's request console git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3304 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/closets/secure/security.dm | 2 +- code/modules/detectivework/detective_work.dm | 3 ++- code/modules/mob/living/carbon/human/human_defense.dm | 8 ++++---- maps/tgstation.2.0.8.dmm | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 41f3e1f0dd5..c5bfc1f0ab9 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -57,7 +57,7 @@ icon_locked = "hossecure1" icon_opened = "hossecureopen" icon_broken = "hossecurebroken" - icon_off = "hossecurecoff" + icon_off = "hossecureoff" New() ..() diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index b93feee1a00..a5222c2bb70 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -710,7 +710,7 @@ obj/item/clothing/gloves/var obj/effect/decal/cleanable/var track_amt = 3 mob/blood_owner - +/* turf/Exited(mob/living/carbon/human/M) if(istype(M,/mob/living) && !istype(M,/mob/living/carbon/metroid)) var/dofoot = 1 @@ -835,6 +835,7 @@ proc/get_tracks(mob/M) . = "small alien feet" else . = "an unknown creature" +*/ proc/blood_incompatible(donor,receiver) var diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 6d525c7e519..2852f239138 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -10,7 +10,7 @@ emp_act /mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone) - if(wear_suit && istype(wear_suit, /obj/item/clothing/suit/armor/laserproof)) +/* if(wear_suit && istype(wear_suit, /obj/item/clothing/suit/armor/laserproof)) if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) var/reflectchance = 80 - round(P.damage/3) if(!(def_zone in list("chest", "groin"))) @@ -33,7 +33,7 @@ emp_act P.xo = new_x - curloc.x return -1 // complete projectile permutation - +*/ if(check_shields(P.damage, "the [P.name]")) P.on_hit(src, 2) return 2 @@ -74,12 +74,12 @@ emp_act /mob/living/carbon/human/proc/check_shields(var/damage = 0, var/attack_text = "the attack") if(l_hand && istype(l_hand, /obj/item/weapon))//Current base is the prob(50-d/3) var/obj/item/weapon/I = l_hand - if(I.IsShield() && (prob(70 - round(damage / 3)))) + if(I.IsShield() && (prob(50 - round(damage / 3)))) visible_message("\red [src] blocks [attack_text] with the [l_hand.name]!") return 1 if(r_hand && istype(r_hand, /obj/item/weapon)) var/obj/item/weapon/I = r_hand - if(I.IsShield() && (prob(70 - round(damage / 3)))) + if(I.IsShield() && (prob(50 - round(damage / 3)))) visible_message("\red [src] blocks [attack_text] with the [r_hand.name]!") return 1 if(wear_suit && istype(wear_suit, /obj/item/)) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 0b7ca1436b3..d8dc73c96f8 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -5367,7 +5367,7 @@ "bZk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engine/engineering) "bZl" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/engine/engineering) "bZm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/engine/chiefs_office) -"bZn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/machinery/requests_console{announcementConsole = 1; department = "Chief engiener's office"; departmentType = 3; name = "Bridge RC"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor,/area/engine/chiefs_office) +"bZn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Engineer's office"; departmentType = 3; name = "Bridge RC"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor,/area/engine/chiefs_office) "bZo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/engine/chiefs_office) "bZp" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/reinforced,/obj/item/weapon/lighter/zippo,/turf/simulated/floor,/area/engine/chiefs_office) "bZq" = (/obj/machinery/camera{c_tag = "Engineering CE's Office"; dir = 1; pixel_x = 23},/obj/structure/table/reinforced,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/item/weapon/clipboard,/obj/item/clothing/glasses/meson,/obj/item/weapon/reagent_containers/pill/kelotane{pixel_x = -3; pixel_y = -12},/obj/item/weapon/folder/yellow,/obj/item/weapon/stamp/ce,/turf/simulated/floor,/area/engine/chiefs_office) @@ -6189,7 +6189,7 @@ "cpa" = (/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "NTrasen"; name = "Outer Airlock"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom) "cpb" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/specops/centcom) "cpc" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/control) -"cpd" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'icons/obj/assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) +"cpd" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) "cpe" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion (EAST)"; icon_state = "propulsion"; dir = 4},/turf/space,/area/shuttle/specops/centcom) "cpf" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/shuttle/engine/heater{tag = "icon-heater (WEST)"; icon_state = "heater"; dir = 8},/turf/unsimulated/floor,/area/shuttle/specops/centcom) "cpg" = (/obj/effect/landmark{name = "Commando-Bomb"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom)