cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23407 from DrSnips/detective-boxes

Browse Source 
Detective gear.
This commit is contained in:
Kurfursten
2019-07-08 12:53:00 -05:00
committed by GitHub
parent 500958bfa8 f2c16cbc5f
commit a16b391a04
9 changed files with 81 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/objects/items/weapons/cosmetics.dm
View File

@@ -463,8 +463,11 @@
if (41 to 50)
to_chat(H, "<span class='notice'>You don't see anything.</span>")
return
handle_hair(H)
//handle normal hair
/obj/item/weapon/pocket_mirror/proc/handle_hair(mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/list/species_hair = valid_sprite_accessories(hair_styles_list, null, (H.species.name || null))
//gender intentionally left null so speshul snowflakes can cross-hairdress
if (species_hair.len)
@@ -494,6 +497,20 @@
if (prob(25))
shatter()
/obj/item/weapon/pocket_mirror/comb
name = "hair comb"
desc = "Despite the name honey is not included nor recommended for use with this."
icon_state = "comb"
/obj/item/weapon/pocket_mirror/comb/shatter()
return
/obj/item/weapon/pocket_mirror/comb/attack(mob/M, mob/user)
if(M == user)
handle_hair(user)
else
..()
/obj/item/weapon/nanitecontacts
name = "nanite contacts"
desc = "Deploys nanobots to your eyes to change their color."

48
code/game/objects/items/weapons/storage/belt.dm
View File

@@ -204,14 +204,10 @@
"/obj/item/clothing/glasses",
"/obj/item/ammo_casing/shotgun",
"/obj/item/ammo_storage",
"/obj/item/weapon/reagent_containers/food/snacks/donut/normal",
"/obj/item/weapon/reagent_containers/food/snacks/donut/jelly",
"/obj/item/weapon/reagent_containers/food/snacks/donut",
"/obj/item/weapon/storage/fancy/cigarettes",
"/obj/item/weapon/melee/baton",
"/obj/item/weapon/gun/energy/taser",
"/obj/item/weapon/lighter/zippo",
"/obj/item/weapon/lighter",
"/obj/item/weapon/cigpacket",
"/obj/item/clothing/glasses/hud/security",
"/obj/item/device/flashlight",
"/obj/item/device/pda",
"/obj/item/device/radio/headset",
@@ -223,12 +219,50 @@
"/obj/item/weapon/gun/projectile/sec",
"/obj/item/weapon/legcuffs/bolas",
"/obj/item/device/hailer",
"obj/item/weapon/melee/telebaton",
"/obj/item/weapon/melee/telebaton",
"/obj/item/device/gps/secure",
"/obj/item/clothing/accessory/holobadge",
"/obj/item/weapon/autocuffer",
"/obj/item/weapon/depocket_wand",
)
/obj/item/weapon/storage/belt/detective
name = "hard-worn belt"
desc = "There's a lot you can tell about a man from his clothes - sometimes it's all he can afford, or maybe he chooses to wear something as a message... this belt, then, is a statement. Classy, but not too drab. Fashionable, but still useful. People look at this belt and think, 'My god. That belt is frighteningly well placed. The shades of beige that seem to flood over themselves, splayed across every notch... I fear many things, but I fear most the man who possesses such an incredible belt.'"
max_combined_w_class = 200 //Some of their stuff is pretty large and they have a lot of crap so lets just be safe.
can_only_hold = list(
"/obj/item/clothing/glasses",
"/obj/item/ammo_storage",
"/obj/item/weapon/reagent_containers/food/snacks/donut",
"/obj/item/weapon/storage/fancy/cigarettes",
"/obj/item/weapon/lighter",
"/obj/item/weapon/cigpacket",
"/obj/item/device/flashlight",
"/obj/item/device/pda",
"/obj/item/device/radio/headset",
"/obj/item/weapon/handcuffs",
"/obj/item/device/flash",
"/obj/item/taperoll/police",
"/obj/item/taperoll/syndie/police",
"/obj/item/device/hailer",
"/obj/item/device/gps/secure",
"/obj/item/clothing/accessory/holobadge",
"/obj/item/weapon/reagent_containers/spray",
"/obj/item/weapon/storage/evidencebag",
"/obj/item/device/detective_scanner",
"/obj/item/binoculars",
"/obj/item/weapon/storage/box/surveillance",
"/obj/item/device/handtv",
"/obj/item/device/camera_film",
"/obj/item/weapon/photo",
"/obj/item/weapon/storage/photo_album",
"/obj/item/device/camera",
"/obj/item/weapon/folder",
"/obj/item/weapon/f_card",
"/obj/item/device/vampirehead",
"/obj/item/weapon/switchtool/switchblade",
)
/obj/item/weapon/storage/belt/security/batmanbelt
name = "batbelt"
desc = "For all your crime-fighting bat needs."

4
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -544,6 +544,8 @@
var/glasses = pick(/obj/item/clothing/glasses/sunglasses/sechud/prescription, /obj/item/clothing/glasses/sunglasses/sechud)
new glasses(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/weapon/storage/belt/detective(src)
new /obj/item/weapon/switchtool/switchblade(src)
new /obj/item/device/gps/secure(src)
new /obj/item/ammo_storage/box/c38(src)
new /obj/item/ammo_storage/box/c38(src)
@@ -553,6 +555,8 @@
new /obj/item/binoculars(src)
new /obj/item/weapon/storage/box/surveillance(src)
new /obj/item/device/handtv(src)
new /obj/item/weapon/reagent_containers/spray/luminol(src)
new /obj/item/taperoll/police(src)
/obj/item/weapon/storage/box/mousetraps
name = "box of Pest-B-Gon Mousetraps"

7
code/game/objects/items/weapons/switchtool.dm
View File

@@ -260,6 +260,13 @@
lighter.lit = 1
..()
/obj/item/weapon/switchtool/switchblade
name = "switchblade"
icon_state = "switchblade"
desc = "Half switch. Half blade. Half comb."
stored_modules = list("/obj/item/weapon/kitchen/utensil/knife:knife" = null,
"/obj/item/weapon/pocket_mirror/comb:comb" = null)
#define BT 1
#define ENGI 2
#define CB 4

2
code/game/objects/storage/gimmick_bundles.dm
View File

@@ -11,4 +11,4 @@
..()
new /obj/item/weapon/card/id/nt_disguise(src)
new /obj/item/clothing/mask/gas/voice/detective(src)
new /obj/item/weapon/pocket_mirror(src)
new /obj/item/weapon/pocket_mirror/comb(src)

2
code/modules/detectivework/detective_scanner.dm
View File

@@ -7,7 +7,7 @@
icon_state = "forensic1"
var/amount = 20.0
var/list/stored = list()
w_class = W_CLASS_MEDIUM
w_class = W_CLASS_SMALL
item_state = "electronic"
flags = FPRINT
siemens_coefficient = 1

11
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -116,7 +116,6 @@
name = "space cleaner"
desc = "BLAM!-brand non-foaming space cleaner!"
/obj/item/weapon/reagent_containers/spray/cleaner/New()
..()
reagents.add_reagent(CLEANER, 250)
@@ -131,11 +130,19 @@
volume = 40
amount_per_transfer_from_this = 10
/obj/item/weapon/reagent_containers/spray/pepper/New()
..()
reagents.add_reagent(CONDENSEDCAPSAICIN, 40)
// Luminol
/obj/item/weapon/reagent_containers/spray/luminol
name = "spray bottle (luminol)"
desc = "A spray bottle with an unscrewable top. A label on the side reads 'Contains: Luminol'."
/obj/item/weapon/reagent_containers/spray/luminol/New()
..()
reagents.add_reagent(LUMINOL, 250)
// Plant-B-Gone
/obj/item/weapon/reagent_containers/spray/plantbgone // -- Skie
name = "Plant-B-Gone"