cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #632 from Mark9013100/12/20/2015secpistol

Browse Source 
Replaces the standard .45 pistol with the Detective's.
This commit is contained in:
Neerti
2015-12-20 16:02:42 -05:00
parent 9618a95ead a4b891f5ef
commit df2f02c5af
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile/pistol.dm
+7 -6
View File
@@ -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 << "<span class='notice'>You don't feel cool enough to name this gun, chump.</span>"
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
code/modules/random_map/drop/drop_types.dm
+2 -2
View File
@@ -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,