cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up every clothing item to use defined pocket lists #35 (#17235)

Browse Source 
* cleaned up every clothing item to use defined pocket lists

* oop, changeling armor weird

* invalid prybar

* allow any emergency tank, for non-oxy breathers

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
Cameron Lennox
2025-03-12 16:32:55 -04:00
committed by GitHub
parent ba029d73ad
commit b36e238cd1
49 changed files with 337 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+8 -36
View File
@@ -219,7 +219,7 @@
item_state = "russofurcoat"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY)
flags_inv = HIDETIE|HIDEHOLSTER
//For general use
@@ -235,18 +235,7 @@
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS
allowed = list(
/obj/item/tank/emergency/oxygen,
/obj/item/flashlight,
/obj/item/gun/energy,
/obj/item/gun/projectile,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
// /obj/item/storage/fancy/shotgun_ammo,
/obj/item/melee/baton,
/obj/item/handcuffs,
// /obj/item/detective_scanner,
/obj/item/taperecorder)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_DETECTIVE)
armor = list(melee = 50, bullet = 15, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
var/unbuttoned = 0
@@ -305,18 +294,7 @@
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS
allowed = list(
/obj/item/tank/emergency/oxygen,
/obj/item/flashlight,
/obj/item/gun/energy,
/obj/item/gun/projectile,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
// /obj/item/storage/fancy/shotgun_ammo,
/obj/item/melee/baton,
/obj/item/handcuffs,
// /obj/item/detective_scanner,
/obj/item/taperecorder)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_DETECTIVE)
armor = list(melee = 50, bullet = 15, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
//Variants
@@ -569,7 +547,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/flashlight,/obj/item/tank)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
@@ -860,7 +838,7 @@
armor = list(melee = 50, bullet = 40, laser = 45, energy = 25, bomb = 50, bio = 100, rad = 50) //These values were taken from the combat rigs and adjusted to be weaker than said rigs.
slowdown = 0
allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_SECURITY, POCKET_SUIT_REGULATORS)
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "joansuit"
@@ -983,7 +961,7 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "octavgentlecoat_mob"
blood_overlay_type = "coat"
allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/taperecorder,/obj/item/uv_light)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_DETECTIVE)
//bwoincognito:Octavious Ward
/obj/item/clothing/under/det/fluff/octavious
@@ -1261,14 +1239,8 @@ Departamental Swimsuits, for general use
icon_state = "trek_ds9_coat"
body_parts_covered = CHEST|ARMS
permeability_coefficient = 0.50
allowed = list(
/obj/item/flashlight, /obj/item/analyzer,
/obj/item/radio, /obj/item/tank/emergency/oxygen,
/obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,
/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_MEDICAL)
armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 20, rad = 25)
/obj/item/clothing/suit/storage/trek/ds9/admiral // Only for adminuz
code/modules/vore/fluffstuff/custom_items_vr.dm
+1 -6
View File
@@ -1205,12 +1205,7 @@
glove_type = null
boot_type = null
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage,
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_STORAGE)
/obj/item/rig/nikki/attackby(obj/item/W, mob/living/user)
//This thing accepts ONLY mounted sizeguns. That's IT. Nothing else!