cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-21 19:16:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1767 from VOREStation/HoS-Nerf

Browse Source 
HoS gear nerf
This commit is contained in:
Spades
2017-06-20 01:24:31 -04:00
committed by GitHub
parent d853fa409b fb1dd6dc6d
commit ee7c895d07
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -2
View File
@@ -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)
code/modules/clothing/suits/armor_vr.dm
+2 -2
View File
@@ -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"
maps/tether/tether-03-station.dmm
+1 -1
View File
@@ -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.<br>-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)