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

[MIRROR] Shibari! (#11716)

Browse Source 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-21 15:26:11 -07:00
committed by GitHub
parent 2b7d27d6b8
commit ca150fd5a2
14 changed files with 128 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/weapons/gift_wrappaper.dm
View File

@@ -172,7 +172,7 @@
if (!ishuman(target)) return
var/mob/living/carbon/human/H = target
if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket) || H.stat)
if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket) || istype(H.wear_suit, /obj/item/clothing/suit/shibari) || H.stat)
if (src.amount > 2)
var/obj/effect/spresent/present = new /obj/effect/spresent (H.loc)
src.amount -= 2

4
code/game/objects/items/weapons/handcuffs.dm
View File

@@ -125,6 +125,10 @@ var/last_chew = 0
if (H.zone_sel.selecting != O_MOUTH) return
if (H.wear_mask) return
if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket)) return
if (istype(H.wear_suit, /obj/item/clothing/suit/shibari))
var/obj/item/clothing/suit/shibari/s = wear_suit
if(s.rope_mode == "Arms" || s.rope_mode == "Arms and Legs")
return
var/obj/item/organ/external/O = H.organs_by_name[(H.hand ? BP_L_HAND : BP_R_HAND)]
if (!O) return

3
code/game/objects/random/maintenance.dm
View File

@@ -118,7 +118,8 @@ something, make sure it's not in one of the other lists.*/
prob(2);/obj/item/cracker,
prob(5);/obj/random/mega_nukies,
prob(1);/obj/random/potion_ingredient/plus,
prob(2);/obj/random/translator
prob(2);/obj/random/translator,
prob(1);/obj/random/shibari
/* VOREStation Edit End */
)

17
code/game/objects/random/misc_vr.dm
View File

@@ -419,3 +419,20 @@
prob(10);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink,
prob(10);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow
)
/obj/random/shibari
name = "random shibari"
desc = "A random shibari."
icon = 'icons/inventory/suit/item.dmi'
icon_state = "shibari_None"
spawn_nothing_percentage = 0
/obj/random/shibari/item_to_spawn()
return pick(prob(5);/obj/item/clothing/suit/shibari,
prob(5);/obj/item/clothing/suit/shibari/red,
prob(5);/obj/item/clothing/suit/shibari/blue,
prob(5);/obj/item/clothing/suit/shibari/green,
prob(5);/obj/item/clothing/suit/shibari/yellow,
prob(5);/obj/item/clothing/suit/shibari/black,
prob(5);/obj/item/clothing/suit/shibari/pink
)