From df7d0eb05fcb3304780588cad9ce85c676dda153 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 19 Jun 2017 22:29:24 -0400 Subject: [PATCH 1/2] .dm file changes first --- .../structures/crates_lockers/closets/secure/security.dm | 4 ++-- code/modules/clothing/suits/armor_vr.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index fdfa3c482a..8a9875506e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -142,10 +142,10 @@ new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/device/flash(src) new /obj/item/weapon/melee/baton/loaded(src) - new /obj/item/weapon/gun/projectile/lamia(src) + /*new /obj/item/weapon/gun/projectile/lamia(src) new /obj/item/ammo_magazine/m44/rubber(src) new /obj/item/ammo_magazine/m44(src) - new /obj/item/ammo_magazine/m44(src) + new /obj/item/ammo_magazine/m44(src)*/ // NO YOU DO NOT GET A .44 MAGNUM! -Ace new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/cell/device/weapon(src) new /obj/item/weapon/melee/telebaton(src) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 509b58e546..9d44f78a49 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -35,10 +35,10 @@ /obj/item/clothing/suit/storage/vest/hoscoat - armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/suit/storage/vest/hos - armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/suit/storage/vest/hoscoat/jensen name = "armored trenchcoat" From fb1dd6dc6ddb45411261af9d56cfd33317476a0c Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 19 Jun 2017 22:57:36 -0400 Subject: [PATCH 2/2] Map tweak to add a note for HoS --- maps/tether/tether-03-station.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tether/tether-03-station.dmm b/maps/tether/tether-03-station.dmm index 6c42f9bd66..8cecfed6a5 100644 --- a/maps/tether/tether-03-station.dmm +++ b/maps/tether/tether-03-station.dmm @@ -3839,7 +3839,7 @@ "bvQ" = (/obj/structure/table/woodentable,/obj/machinery/photocopier/faxmachine{department = "Head of Security"},/obj/machinery/light{dir = 8},/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "bvR" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{dir = 2; pixel_x = 10; pixel_y = 12},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) "bvS" = (/obj/structure/table/woodentable,/obj/item/weapon/stamp/hos,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) -"bvT" = (/obj/structure/table/woodentable,/obj/machinery/computer/skills{pixel_y = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) +"bvT" = (/obj/structure/table/woodentable,/obj/machinery/computer/skills{pixel_y = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/weapon/paper{desc = ""; info = "The Chief of Security at CentCom is debating a new policy. It's not official yet, and probably won't be since it's hard to enforce, but I suggest following it anyway. That policy is, if a security officer claims they need more than two extra magazines (or batteries) to go on normal patrols, fire them. If they cannot subdue a single suspect using all that ammo, they are not competent as Security.
-Jeremiah Acacius"; name = "note to the Head of Security"},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) "bvU" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloorblack{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "bvV" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/structure/closet{name = "Evidence Closet"},/turf/simulated/floor/tiled/white,/area/security/forensics) "bvW" = (/turf/simulated/floor/tiled/white,/area/security/forensics)