From a4b891f5ef8af2e25cb0f2202b677cfa19255a63 Mon Sep 17 00:00:00 2001 From: Mark9013100 Date: Sun, 20 Dec 2015 15:36:26 -0500 Subject: [PATCH] Replaces the standard .45 pistol with the Detective's. --- code/datums/supplypacks.dm | 4 ++-- code/game/antagonist/outsider/raider.dm | 3 +-- code/modules/projectiles/guns/projectile/pistol.dm | 13 +++++++------ code/modules/random_map/drop/drop_types.dm | 4 ++-- maps/polaris-1.dmm | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index b8158bc0ff..7c84124b65 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -715,8 +715,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/weapon/gun/energy/gun, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/gun/energy/taser, - /obj/item/weapon/gun/projectile/sec, - /obj/item/weapon/gun/projectile/sec, + /obj/item/weapon/gun/projectile/colt/detective, + /obj/item/weapon/gun/projectile/colt/detective, /obj/item/weapon/storage/box/flashbangs, /obj/item/weapon/storage/box/flashbangs) cost = 40 diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index 8ab342bbf2..8da368f848 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -86,8 +86,7 @@ var/datum/antagonist/raider/raiders /obj/item/weapon/gun/projectile/shotgun/doublebarrel, /obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet, /obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn, - /obj/item/weapon/gun/projectile/colt, - /obj/item/weapon/gun/projectile/sec, + /obj/item/weapon/gun/projectile/colt/detective, /obj/item/weapon/gun/projectile/pistol, /obj/item/weapon/gun/projectile/revolver, /obj/item/weapon/gun/projectile/pirate diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index dcd5b450e4..4763b83bb6 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -28,11 +28,12 @@ /obj/item/weapon/gun/projectile/colt/detective/verb/rename_gun() set name = "Name Gun" set category = "Object" - set desc = "Rename your gun. If you're the detective." + set desc = "Rename your gun. If you're Security." var/mob/M = usr if(!M.mind) return 0 - if(!M.mind.assigned_role == "Detective") + var/job = M.mind.assigned_role + if(job != "Detective" && job != "Security Officer" && job != "Warden" && job != "Head of Security") M << "You don't feel cool enough to name this gun, chump." return 0 @@ -44,9 +45,9 @@ return 1 /obj/item/weapon/gun/projectile/colt/detective/verb/reskin_gun() - set name = "Reskin gun" + set name = "Resprite gun" set category = "Object" - set desc = "Click to reskin your gun." + set desc = "Click to choose a sprite for your gun." var/mob/M = usr var/list/options = list() @@ -57,11 +58,11 @@ options["H&K VP"] = "VP78" options["P08 Luger"] = "p08" options["P08 Luger, Brown"] = "p08b" - var/choice = input(M,"What do you want to skin the gun to?","Reskin Gun") in options + var/choice = input(M,"What do you want the gun's sprite to be?","Resprite Gun") in options if(src && choice && !M.stat && in_range(M,src)) icon_state = options[choice] unique_reskin = options[choice] - M << "Your gun is now skinned as [choice]. Say hello to your new friend." + M << "Your gun is now sprited as [choice]. Say hello to your new friend." return 1 /obj/item/weapon/gun/projectile/sec diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm index df35b7e22d..4787a53bf4 100644 --- a/code/modules/random_map/drop/drop_types.dm +++ b/code/modules/random_map/drop/drop_types.dm @@ -45,7 +45,7 @@ var/global/list/datum/supply_drop_loot/supply_drop /datum/supply_drop_loot/ballistics/New() ..() contents = list( - /obj/item/weapon/gun/projectile/sec, + /obj/item/weapon/gun/projectile/colt/detective, /obj/item/weapon/gun/projectile/shotgun/doublebarrel, /obj/item/weapon/gun/projectile/shotgun/pump/combat, /obj/item/weapon/gun/projectile/automatic/wt550, @@ -57,7 +57,7 @@ var/global/list/datum/supply_drop_loot/supply_drop /datum/supply_drop_loot/ballistics/New() ..() contents = list( - /obj/item/weapon/gun/projectile/sec, + /obj/item/weapon/gun/projectile/colt/detective, /obj/item/weapon/gun/projectile/shotgun/doublebarrel, /obj/item/weapon/gun/projectile/shotgun/pump/combat, /obj/item/weapon/gun/projectile/automatic/wt550, diff --git a/maps/polaris-1.dmm b/maps/polaris-1.dmm index a536b3e97e..6fe1e7f92d 100644 --- a/maps/polaris-1.dmm +++ b/maps/polaris-1.dmm @@ -1591,7 +1591,7 @@ "aEE" = (/obj/machinery/door/airlock/security{name = "Equipment Storage"; req_access = list(2)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "aEF" = (/turf/simulated/wall,/area/security/security_equiptment_storage) "aEG" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/machinery/door/window/brigdoor/northleft{name = "Weapons locker"; req_access = list(3)},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) -"aEH" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/random/handgun,/obj/random/handgun,/obj/random/handgun,/obj/random/handgun,/obj/machinery/door/window/brigdoor/northleft{name = "Weapons locker"; req_access = list(2)},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) +"aEH" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/machinery/door/window/brigdoor/northleft{name = "Weapons locker"; req_access = list(2)},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/gun/projectile/colt/detective,/obj/item/weapon/gun/projectile/colt/detective,/obj/item/weapon/gun/projectile/colt/detective,/obj/item/weapon/gun/projectile/colt/detective,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "aEI" = (/obj/machinery/disposal,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden) "aEJ" = (/obj/structure/closet/secure_closet/warden,/obj/item/device/megaphone,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden) "aEK" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/security_space_law{pixel_x = -3; pixel_y = 5},/obj/item/weapon/stamp/denied{pixel_x = 5},/obj/item/weapon/stamp,/turf/simulated/floor/tiled/dark,/area/security/warden)