cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3446 from Heroman3003/fuzzy-legcuffs

Browse Source 
Added fuzzy legcuffs
This commit is contained in:
Aronai Sieyes
2018-04-12 18:42:54 -04:00
committed by GitHub
parent 791b5a4155 dd2a46281e
commit 83c27b175f
6 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/supplypacks/recreation_vr.dm
View File

@@ -18,7 +18,7 @@
/obj/item/stack/cable_coil/random,
/obj/item/clothing/accessory/collar/shock,
/obj/item/clothing/suit/straight_jacket,
/obj/item/weapon/handcuffs/legcuffs,
/obj/item/weapon/handcuffs/legcuffs/fuzzy,
/obj/item/weapon/melee/fluff/holochain/mass,
/obj/item/weapon/material/twohanded/fluff/riding_crop,
/obj/item/clothing/under/fluff/latexmaid

5
code/game/objects/items/weapons/handcuffs_vr.dm Normal file
View File

@@ -0,0 +1,5 @@
/obj/item/weapon/handcuffs/legcuffs/fuzzy
name = "fuzzy legcuffs"
desc = "Use this to keep... 'prisoners' in line."
icon = 'icons/obj/items_vr.dmi'
icon_state = "fuzzylegcuff"

2
code/game/objects/random/random.dm
View File

@@ -274,7 +274,7 @@
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
prob(1);/obj/item/weapon/beartrap,
prob(1);/obj/item/weapon/handcuffs/fuzzy,
prob(1);/obj/item/weapon/handcuffs/legcuffs,
prob(1);/obj/item/weapon/handcuffs/legcuffs/fuzzy,
prob(2);/obj/item/weapon/reagent_containers/syringe/drugs,
prob(1);/obj/item/weapon/reagent_containers/syringe/steroid,
prob(4);/obj/item/device/radio_jammer,

BIN
icons/obj/items_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

2
maps/tether/tether-02-surface2.dmm
View File

@@ -373,7 +373,7 @@
/obj/structure/closet/wardrobe/pjs,
/obj/item/weapon/handcuffs/fuzzy,
/obj/item/weapon/handcuffs/fuzzy,
/obj/item/weapon/handcuffs/legcuffs,
/obj/item/weapon/handcuffs/legcuffs/fuzzy,
/obj/item/weapon/handcuffs/fuzzy,
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/gloves/combat{

1
vorestation.dme
View File

@@ -1016,6 +1016,7 @@
#include "code\game\objects\items\weapons\flamethrower.dm"
#include "code\game\objects\items\weapons\gift_wrappaper.dm"
#include "code\game\objects\items\weapons\handcuffs.dm"
#include "code\game\objects\items\weapons\handcuffs_vr.dm"
#include "code\game\objects\items\weapons\improvised_components.dm"
#include "code\game\objects\items\weapons\manuals.dm"
#include "code\game\objects\items\weapons\manuals_vr.dm"