cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 23:54:24 +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/clothing/accessories/clothing.dm
+3 -3
View File
@@ -170,7 +170,7 @@
item_state = "classicponcho"
icon_override = 'icons/inventory/accessory/mob.dmi'
max_heat_protection_temperature = T0C+100
allowed = list(/obj/item/tank/emergency/oxygen)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = CHEST|ARMS|LEGS
@@ -368,7 +368,7 @@
item_state = "vest"
icon_override = 'icons/inventory/accessory/mob.dmi'
item_state_slots = list(slot_r_hand_str = "wcoat", slot_l_hand_str = "wcoat")
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)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = CHEST
@@ -558,7 +558,7 @@
icon_state = "klbr"
icon_override = 'icons/inventory/accessory/mob.dmi'
item_state_slots = list(SLOT_ID_RIGHT_HAND = "armor", SLOT_ID_LEFT_HAND = "armor")
allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight/maglight,/obj/item/clothing/head/helmet)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_EXPLO)
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = UPPER_TORSO|ARMS
siemens_coefficient = 0.9
code/modules/clothing/clothing.dm
+1 -1
View File
@@ -774,7 +774,7 @@
SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi')
max_heat_protection_temperature = T0C+100
allowed = list(/obj/item/tank/emergency/oxygen)
allowed = list(POCKET_EMERGENCY)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)
slot_flags = SLOT_OCLOTHING
heat_protection = ARMS|LEGS|CHEST //At a minimum. Some might be more covering or less covering!
code/modules/clothing/head/jobs.dm
+1 -1
View File
@@ -160,7 +160,7 @@
desc = "A specially designed fedora that is woven with protective fibers. It also makes you look cool."
icon_state = "fedora_brown"
item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
allowed = list(/obj/item/reagent_containers/food/snacks/candy_corn, /obj/item/pen)
allowed = list(POCKET_SLEUTH)
armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
valid_accessory_slots = null
code/modules/clothing/head/misc.dm
+1 -1
View File
@@ -421,7 +421,7 @@
/obj/item/clothing/head/fedora/brown
desc = "A brown fedora. Perfect for detectives or those trying to pilfer artifacts."
icon_state = "fedora_brown"
allowed = list(/obj/item/reagent_containers/food/snacks/candy_corn, /obj/item/pen)
allowed = list(POCKET_SLEUTH)
/obj/item/clothing/head/fedora/white
desc = "A white fedora, really cool hat if you're a mobster. A really lame hat if you're not."
code/modules/clothing/spacesuits/alien.dm
+2 -2
View File
@@ -16,7 +16,7 @@
name = "Skrellian voidsuit"
desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
armor = list(melee = 20, bullet = 20, laser = 20, energy = 50, bomb = 50, bio = 100, rad = 50)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_MINING, /obj/item/t_scanner, /obj/item/rcd)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN)
@@ -32,7 +32,7 @@
w_class = ITEMSIZE_NORMAL
flags = PHORONGUARD
item_flags = THICKMATERIAL
allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank)
allowed = list(POCKET_GENERIC, POCKET_EXPLO, POCKET_ALL_TANKS, /obj/item/melee/energy/sword)
armor = list(melee = 60, bullet = 50, laser = 40,energy = 15, bomb = 30, bio = 100, rad = 50)
siemens_coefficient = 0.2
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
code/modules/clothing/spacesuits/miscellaneous.dm
+2 -2
View File
@@ -18,7 +18,7 @@
permeability_coefficient = 0.02
item_flags = 0
body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS
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)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY)
slowdown = 1.5
armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
@@ -83,7 +83,7 @@
desc = "Yarr."
icon_state = "pirate"
w_class = ITEMSIZE_NORMAL
allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_EXPLO)
slowdown = 0
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.9
code/modules/clothing/spacesuits/rig/rig_pieces.dm
+2 -2
View File
@@ -32,7 +32,7 @@
/obj/item/clothing/suit/space/rig
name = "chestpiece"
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS)
body_parts_covered = CHEST|LEGS|ARMS
heat_protection = CHEST|LEGS|ARMS
cold_protection = CHEST|LEGS|ARMS
@@ -111,7 +111,7 @@
/obj/item/clothing/suit/lightrig
name = DEVELOPER_WARNING_NAME // "suit"
allowed = list(/obj/item/flashlight)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY)
flags_inv = HIDEJUMPSUIT
flags = THICKMATERIAL
code/modules/clothing/spacesuits/rig/suits/alien.dm
+1 -7
View File
@@ -51,13 +51,7 @@
item_flags = THICKMATERIAL
siemens_coefficient = 0.2
offline_slowdown = 2.5
allowed = list(
/obj/item/gun,
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage
)
allowed = list(POCKET_GENERIC, POCKET_EXPLO, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_STORAGE)
air_type = /obj/item/tank/vox
code/modules/clothing/spacesuits/rig/suits/combat.dm
+2 -28
View File
@@ -12,14 +12,7 @@
offline_vision_restriction = 1
helm_type = /obj/item/clothing/head/helmet/space/rig/combat
allowed = list(
/obj/item/gun,
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/melee/baton,
/obj/item/storage
)
allowed = list(POCKET_GENERIC, POCKET_SECURITY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_STORAGE)
/obj/item/rig/combat/equipped
@@ -49,26 +42,7 @@
slowdown = 0.5
offline_slowdown = 1.5
offline_vision_restriction = 1
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/handcuffs,
/obj/item/t_scanner,
/obj/item/rcd,
/obj/item/weldingtool,
/obj/item/tool,
/obj/item/multitool,
/obj/item/radio,
/obj/item/analyzer,
/obj/item/melee/baton,
/obj/item/gun,
/obj/item/storage,
/obj/item/reagent_containers/hypospray,
/obj/item/roller,
/obj/item/suit_cooling_unit
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_ENGINEERING, POCKET_HEAVYTOOLS, POCKET_STORAGE, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS)
chest_type = /obj/item/clothing/suit/space/rig/military
helm_type = /obj/item/clothing/head/helmet/space/rig/military
code/modules/clothing/spacesuits/rig/suits/ert.dm
+1 -19
View File
@@ -14,25 +14,7 @@
siemens_coefficient= 0.5
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/t_scanner,
/obj/item/rcd,
/obj/item/tool/crowbar,
/obj/item/tool/screwdriver,
/obj/item/weldingtool,
/obj/item/tool/wirecutters,
/obj/item/tool/wrench,
/obj/item/multitool,
/obj/item/radio,
/obj/item/analyzer,
/obj/item/storage,
/obj/item/melee/baton,
/obj/item/gun,
/obj/item/reagent_containers/hypospray,
/obj/item/roller
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_ENGINEERING, POCKET_HEAVYTOOLS, POCKET_STORAGE, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS)
initial_modules = list(
/obj/item/rig_module/ai_container,
code/modules/clothing/spacesuits/rig/suits/light.dm
+1 -11
View File
@@ -4,17 +4,7 @@
desc = "A lighter, less armoured rig suit."
icon_state = "ninja_rig"
suit_type = "light suit"
allowed = list(
/obj/item/gun,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/melee/baton,
/obj/item/handcuffs,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/cell,
/obj/item/storage
)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_EXPLO, POCKET_SUIT_REGULATORS, POCKET_STORAGE)
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
emp_protection = 10
slowdown = 0
code/modules/clothing/spacesuits/rig/suits/merc.dm
+1 -12
View File
@@ -14,18 +14,7 @@
siemens_coefficient = 0.3
glove_type = /obj/item/clothing/gloves/gauntlets/rig/eva
helm_type = /obj/item/clothing/head/helmet/space/rig/merc
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/gun,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/melee/baton,
/obj/item/melee/energy/sword,
/obj/item/handcuffs,
/obj/item/storage
)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_EXPLO, POCKET_SUIT_REGULATORS, POCKET_STORAGE)
initial_modules = list(
/obj/item/rig_module/mounted,
code/modules/clothing/spacesuits/rig/suits/pmc.dm
+2 -19
View File
@@ -12,25 +12,8 @@
req_access = list(access_cent_specops)
armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 95)
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/t_scanner,
/obj/item/rcd,
/obj/item/tool/crowbar,
/obj/item/tool/screwdriver,
/obj/item/weldingtool,
/obj/item/tool/wirecutters,
/obj/item/tool/wrench,
/obj/item/multitool,
/obj/item/radio,
/obj/item/analyzer,
/obj/item/melee/baton,
/obj/item/gun,
/obj/item/storage,
/obj/item/reagent_containers/hypospray,
/obj/item/roller
)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_ENGINEERING, POCKET_HEAVYTOOLS, POCKET_SECURITY, POCKET_SUIT_REGULATORS, POCKET_STORAGE)
/obj/item/rig/pmc/commander
name = "PMC-C hardsuit control module"
code/modules/clothing/spacesuits/rig/suits/robotics.dm
+1 -4
View File
@@ -20,10 +20,7 @@
glove_type = null
cell_type = null
allowed = list(
/obj/item/flashlight,
/obj/item/storage/box
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_STORAGE)
req_access = list()
req_one_access = list()
code/modules/clothing/spacesuits/rig/suits/station.dm
+7 -65
View File
@@ -31,12 +31,7 @@
offline_slowdown = 0
offline_vision_restriction = 0
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_ALL_TANKS, /obj/item/storage)
req_access = list()
req_one_access = list()
@@ -78,15 +73,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/industrial
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage,
/obj/item/t_scanner,
/obj/item/pickaxe,
/obj/item/rcd
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING, POCKET_CE, /obj/item/storage)
req_access = list()
req_one_access = list()
@@ -116,14 +103,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/eva
glove_type = /obj/item/clothing/gloves/gauntlets/rig/eva
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage,
/obj/item/t_scanner,
/obj/item/rcd
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_CE, /obj/item/storage)
req_access = list()
req_one_access = list()
@@ -163,14 +143,7 @@
glove_type = /obj/item/clothing/gloves/gauntlets/rig/ce
boot_type = /obj/item/clothing/shoes/magboots/rig/ce //VOREStation Add
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage,
/obj/item/t_scanner,
/obj/item/rcd
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_ENGINEERING, POCKET_CE)
req_access = list()
req_one_access = list()
@@ -206,23 +179,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/hazmat
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/stack/flag,
/obj/item/storage,
/obj/item/pickaxe,
/obj/item/healthanalyzer,
/obj/item/measuring_tape,
/obj/item/ano_scanner,
/obj/item/depth_scanner,
/obj/item/core_sampler,
/obj/item/gps,
/obj/item/beacon_locator,
/obj/item/radio/beacon,
/obj/item/pickaxe/hand
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING, POCKET_XENOARC)
req_access = list()
req_one_access = list()
@@ -252,15 +209,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/medical
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage,
/obj/item/healthanalyzer,
/obj/item/stack/medical,
/obj/item/roller
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MEDICAL, /obj/item/storage, /obj/item/roller)
req_access = list()
req_one_access = list()
@@ -291,14 +240,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/hazard
allowed = list(
/obj/item/gun,
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/melee/baton,
/obj/item/storage
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_EXPLO, /obj/item/storage)
req_access = list()
req_one_access = list()
code/modules/clothing/spacesuits/rig/suits/station_vr.dm
+18 -51
View File
@@ -17,52 +17,43 @@
//Area allowing backpacks to be placed on rigsuits.
/obj/item/rig/vox
allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/backpack, /obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT)
/obj/item/rig/combat
allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT)
/obj/item/rig/ert
allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/tool/crowbar, \
/obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \
/obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_CE, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT)
/obj/item/rig/light/ninja
allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/cell, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY, POCKET_BAYSUIT)
/obj/item/rig/merc
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY, POCKET_BAYSUIT)
/obj/item/rig/ce
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_ENGINEERING, POCKET_CE, POCKET_BAYSUIT)
/obj/item/rig/medical
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/roller,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MEDICAL, POCKET_BAYSUIT, /obj/item/roller, /obj/item/storage/firstaid)
/obj/item/rig/hazmat
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/stack/flag,/obj/item/storage/excavation,/obj/item/pickaxe,/obj/item/healthanalyzer,/obj/item/measuring_tape,/obj/item/ano_scanner,/obj/item/depth_scanner,/obj/item/core_sampler,/obj/item/gps,/obj/item/beacon_locator,/obj/item/radio/beacon,/obj/item/pickaxe/hand,/obj/item/storage/bag/fossils,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_XENOARC, POCKET_BAYSUIT)
/obj/item/rig/hazard
allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, POCKET_BAYSUIT)
/obj/item/rig/industrial
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_BAYSUIT)
/obj/item/rig/military
allowed = list(/obj/item/flashlight, /obj/item/tank,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/handcuffs, \
/obj/item/t_scanner, /obj/item/rcd, /obj/item/weldingtool, /obj/item/tool, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \
/obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller, /obj/item/suit_cooling_unit, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_CE, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT)
/obj/item/rig/pmc
allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/tool/crowbar, \
/obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \
/obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_SECURITY, POCKET_MEDICAL, POCKET_HEAVYTOOLS, POCKET_BAYSUIT, /obj/item/storage/firstaid)
/obj/item/rig/robotics
allowed = list(/obj/item/flashlight, /obj/item/storage/box, /obj/item/storage/belt, /obj/item/defib_kit/compact)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, /obj/item/storage/box, /obj/item/storage/belt, /obj/item/defib_kit/compact)
// 'Technomancer' hardsuit
/obj/item/rig/focalpoint
@@ -84,8 +75,7 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE // so it's like a rig firesuit
armor = list("melee" = 40, "bullet" = 10, "laser" = 30, "energy" = 55, "bomb" = 70, "bio" = 100, "rad" = 100)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/backpack)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, /obj/item/storage/backpack)
chest_type = /obj/item/clothing/suit/space/rig/focalpoint
helm_type = /obj/item/clothing/head/helmet/space/rig/focalpoint
boot_type = /obj/item/clothing/shoes/magboots/rig/ce/focalpoint
@@ -142,10 +132,7 @@
icon_state = "ihs_rig"
suit_type = "\improper Hephaestus hardsuit"
cell_type = /obj/item/cell/super
allowed = list(/obj/item/flashlight, /obj/item/tank,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/handcuffs, \
/obj/item/t_scanner, /obj/item/rcd, /obj/item/weldingtool, /obj/item/tool, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \
/obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller, /obj/item/suit_cooling_unit, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_SECURITY, POCKET_ENGINEERING, POCKET_BAYSUIT, /obj/item/storage/firstaid, /obj/item/roller)
armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 60, "bio" = 100, "rad" = 20)
@@ -209,8 +196,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/zero
boot_type = null
glove_type = null
allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/backpack, /obj/item/bluespaceradio, /obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_BAYSUIT)
slowdown = 0
offline_slowdown = 1
@@ -257,16 +243,7 @@
boot_type = /obj/item/clothing/shoes/magboots/rig/ce/baymed
glove_type = /obj/item/clothing/gloves/gauntlets/rig/baymed
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/healthanalyzer,
/obj/item/stack/medical,
/obj/item/roller,
/obj/item/storage/backpack,
/obj/item/bluespaceradio,
/obj/item/defib_kit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MEDICAL, POCKET_BAYSUIT, /obj/item/roller)
// speedy paper
slowdown = -0.5
@@ -331,17 +308,7 @@
boot_type = /obj/item/clothing/shoes/magboots/rig/ce/bayeng
glove_type = /obj/item/clothing/gloves/gauntlets/rig/bayeng
allowed = list(
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/t_scanner,
/obj/item/pickaxe,
/obj/item/rcd,
/obj/item/storage/backpack,
/obj/item/bluespaceradio,
/obj/item/defib_kit
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING, POCKET_CE, POCKET_BAYSUIT)
slowdown = 0
offline_slowdown = 5 // very bulky
code/modules/clothing/spacesuits/spacesuits.dm
+1 -1
View File
@@ -76,7 +76,7 @@
flags = PHORONGUARD
item_flags = THICKMATERIAL
body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/suit_cooling_unit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS)
slowdown = 1.5
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
code/modules/clothing/spacesuits/syndi.dm
+1 -1
View File
@@ -11,7 +11,7 @@
icon_state = "syndicate"
desc = "A crimson spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
w_class = ITEMSIZE_NORMAL
allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY)
slowdown = 0.5
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.6
code/modules/clothing/spacesuits/void/ert_vr.dm
+1 -1
View File
@@ -15,7 +15,7 @@
min_pressure_protection = 0 * ONE_ATMOSPHERE
max_pressure_protection = 15* ONE_ATMOSPHERE
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+10000
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY)
/obj/item/clothing/suit/space/void/responseteam/command
name = "Mark VII-C Emergency Response Team Commander Suit"
code/modules/clothing/spacesuits/void/event.dm
+9 -131
View File
@@ -18,15 +18,7 @@
icon_state = "rig-vintagecrew"
item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG")
armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50)
allowed = list(/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage/briefcase/inflatable,
/obj/item/gps,
/obj/item/radio/beacon,
/obj/item/pickaxe,
/obj/item/shovel
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_MINING)
//Engineering Crewsuit (ORANGE, RING)
//This is probably the most appealing to get your hands on for basic protection and the specialist stuff
@@ -52,26 +44,7 @@
max_pressure_protection = 15 * ONE_ATMOSPHERE
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+10000
breach_threshold = 14 //These are kinda thicc
allowed = list(/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/t_scanner,
/obj/item/rcd,
/obj/item/rcd_ammo,
/obj/item/storage/toolbox,
/obj/item/storage/briefcase/inflatable,
/obj/item/gps,
/obj/item/radio/beacon,
/obj/item/robotanalyzer,
/obj/item/geiger,
/obj/item/tool,
/obj/item/weldingtool,
/obj/item/cell,
/obj/item/pickaxe,
/obj/item/measuring_tape,
/obj/item/lightreplacer,
/obj/item/shovel
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING, POCKET_CE, POCKET_MINING, POCKET_HEAVYTOOLS)
//Medical Crewsuit (GREEN, CROSS)
//This thing is basically tissuepaper, but it has very solid rad protection for its age
@@ -94,19 +67,7 @@
icon_state = "rig-vintagemedic"
item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG")
armor = list(melee = 30, bullet = 15, laser = 15, energy = 5, bomb = 25, bio = 100, rad = 75)
allowed = list(/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage/firstaid,
/obj/item/healthanalyzer,
/obj/item/robotanalyzer,
/obj/item/mass_spectrometer,
/obj/item/halogen_counter,
/obj/item/stack/medical,
/obj/item/gps,
/obj/item/radio/beacon,
/obj/item/cell
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MEDICAL)
//Marine Crewsuit (BLUE, SHIELD)
//Really solid, balance between Sec and Sec EVA, but it has slightly worse shock protection
@@ -128,22 +89,7 @@
breach_threshold = 14 //These are kinda thicc
resilience = 0.15 //Armored
siemens_coefficient = 0.8
allowed = list(/obj/item/gun,
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/melee,
/obj/item/grenade,
/obj/item/flash,
/obj/item/gps,
/obj/item/radio/beacon,
/obj/item/handcuffs,
/obj/item/hailer,
/obj/item/holowarrant,
/obj/item/megaphone,
/obj/item/ammo_magazine,
/obj/item/cell
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY)
//Officer Crewsuit (GOLD, X)
//The best of the bunch - at the time, this would have been almost cutting edge
@@ -166,22 +112,7 @@
breach_threshold = 16 //Extra Thicc
resilience = 0.1 //Heavily Armored
siemens_coefficient = 0.7
allowed = list(/obj/item/gun,
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/melee,
/obj/item/grenade,
/obj/item/flash,
/obj/item/gps,
/obj/item/radio/beacon,
/obj/item/handcuffs,
/obj/item/hailer,
/obj/item/holowarrant,
/obj/item/megaphone,
/obj/item/ammo_magazine,
/obj/item/cell
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_SECURITY)
//Pilot Crewsuit (ROYAL BLUE, I)
//The lightest weight of the lot, but protection is about the same as the crew variant's. It has an extra helmet variant for those who prefer that design.
@@ -207,13 +138,7 @@
slowdown = 0
armor = list(melee = 25, bullet = 20, laser = 20, energy = 5, bomb = 20, bio = 100, rad = 50)
siemens_coefficient = 0.9
allowed = list(/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage/briefcase/inflatable,
/obj/item/gps,
/obj/item/radio/beacon,
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_MINING)
//Scientist Crewsuit (PURPLE, O)
//Baseline values are slightly worse than the gray crewsuit, but it has significantly better Energy protection and is the only other suit with 100% rad immunity besides the engi suit
@@ -237,28 +162,7 @@
item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG")
armor = list(melee = 25, bullet = 10, laser = 10, energy = 50, bomb = 10, bio = 100, rad = 100)
siemens_coefficient = 0.8
allowed = list(/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage/firstaid,
/obj/item/healthanalyzer,
/obj/item/gps,
/obj/item/radio/beacon,
/obj/item/ano_scanner,
/obj/item/depth_scanner,
/obj/item/xenoarch_multi_tool,
/obj/item/measuring_tape,
/obj/item/reagent_scanner,
/obj/item/robotanalyzer,
/obj/item/analyzer,
/obj/item/cataloguer,
/obj/item/universal_translator,
/obj/item/tool/crowbar,
/obj/item/stack/marker_beacon,
/obj/item/stack/flag,
/obj/item/clipboard,
/obj/item/cell
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_XENOARC, /obj/item/storage/firstaid)
//Miner's Crewsuit (BROWN)
//Basically just the basic suit, but with brown markings. If anyone wants to tweak this, go wild.
@@ -276,15 +180,7 @@
icon_state = "rig-vintageminer"
item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG")
armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50)
allowed = list(/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/storage/briefcase/inflatable,
/obj/item/gps,
/obj/item/radio/beacon,
/obj/item/pickaxe,
/obj/item/shovel
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_MINING)
//Mercenary Crewsuit (RED, CROSS)
//The best of the best, this should be ultra-rare
@@ -306,22 +202,4 @@
breach_threshold = 16 //Extra Thicc
resilience = 0.05 //Military Armor
siemens_coefficient = 0.6
allowed = list(/obj/item/gun,
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/melee,
/obj/item/grenade,
/obj/item/flash,
/obj/item/gps,
/obj/item/radio/beacon,
/obj/item/handcuffs,
/obj/item/hailer,
/obj/item/holowarrant,
/obj/item/megaphone,
/obj/item/ammo_magazine,
/obj/item/spaceflare,
/obj/item/powersink,
/obj/item/radio_jammer,
/obj/item/cell
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_SECURITY)
code/modules/clothing/spacesuits/void/event_vr.dm
+1 -1
View File
@@ -270,7 +270,7 @@
armor = list("melee" = 50, "bullet" = 15, "laser" = 15, "energy" = 25, "bomb" = 45, "bio" = 100, "rad" = 80)
slowdown = 1.5
breach_threshold = 14
allowed = list(/obj/item/tank,/obj/item/suit_cooling_unit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING)
sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB
sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM
code/modules/clothing/spacesuits/void/merc.dm
+2 -2
View File
@@ -16,7 +16,7 @@
item_state_slots = list(slot_r_hand_str = "syndie_voidsuit", slot_l_hand_str = "syndie_voidsuit")
w_class = ITEMSIZE_NORMAL
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_SECURITY)
siemens_coefficient = 0.6
breach_threshold = 16 //Extra Thicc
resilience = 0.05 //Military Armor
@@ -40,7 +40,7 @@
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
min_pressure_protection = 0 * ONE_ATMOSPHERE
max_pressure_protection = 20* ONE_ATMOSPHERE
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe,/obj/item/flamethrower)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_SECURITY, /obj/item/material/twohanded/fireaxe, /obj/item/flamethrower)
siemens_coefficient = 0.7
breach_threshold = 18 //Super Extra Thicc
slowdown = 1
code/modules/clothing/spacesuits/void/station.dm
+8 -10
View File
@@ -17,7 +17,7 @@
icon_state = "rig-engineering"
item_state_slots = list(slot_r_hand_str = "eng_voidsuit", slot_l_hand_str = "eng_voidsuit")
armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 70)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING, POCKET_ENGINEERING, POCKET_CE)
min_pressure_protection = 0 * ONE_ATMOSPHERE
max_pressure_protection = 15 * ONE_ATMOSPHERE
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+5000
@@ -100,7 +100,7 @@
desc = "A hand-me-down salvage voidsuit. It has obviously had a lot of repair work done to its radiation shielding."
icon_state = "rig-engineeringsav"
armor = list(melee = 50, bullet = 15, laser = 25, energy = 15, bomb = 45, bio = 100, rad = 100)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable,/obj/item/t_scanner,/obj/item/rcd)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_ENGINEERING, POCKET_CE)
slowdown = 0.5
//Mining
@@ -118,7 +118,7 @@
desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating."
icon_state = "rig-mining"
item_state_slots = list(slot_r_hand_str = "mining_voidsuit", slot_l_hand_str = "mining_voidsuit")
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/pickaxe)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MINING)
armor = list(melee = 50, bullet = 15, laser = 25, energy = 15, bomb = 55, bio = 100, rad = 50)
breach_threshold = 14 //These are kinda thicc
resilience = 0.15 //Armored
@@ -151,7 +151,7 @@
desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
icon_state = "rig-medical"
item_state_slots = list(slot_r_hand_str = "medical_voidsuit", slot_l_hand_str = "medical_voidsuit")
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_MEDICAL)
armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 80)
//Medical EMT Voidsuit
@@ -245,7 +245,7 @@
icon_state = "rig-sec"
item_state_slots = list(slot_r_hand_str = "sec_voidsuit", slot_l_hand_str = "sec_voidsuit")
armor = list(melee = 50, bullet = 25, laser = 25, energy = 15, bomb = 45, bio = 100, rad = 10)
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_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ALL_TANKS, POCKET_EXPLO)
siemens_coefficient = 0.7
breach_threshold = 14 //These are kinda thicc
resilience = 0.15 //Armored
@@ -344,8 +344,7 @@
icon_state = "void_explorer"
item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black")
armor = list(melee = 50, bullet = 15, laser = 35, energy = 25, bomb = 30, bio = 100, rad = 70)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/stack/flag,/obj/item/healthanalyzer,/obj/item/gps,/obj/item/radio/beacon, \
/obj/item/shovel,/obj/item/ammo_magazine,/obj/item/gun)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_MEDICAL, POCKET_EXPLO)
breach_threshold = 14 //These are kinda thicc
resilience = 0.15 //Armored
@@ -366,8 +365,7 @@
icon_state = "void_exp_medic"
item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black")
armor = list(melee = 50, bullet = 15, laser = 25, energy = 15, bomb = 30, bio = 100, rad = 90)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/stack/flag,/obj/item/healthanalyzer,/obj/item/gps,/obj/item/radio/beacon, \
/obj/item/shovel,/obj/item/ammo_magazine,/obj/item/gun,/obj/item/storage/firstaid,/obj/item/stack/medical)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_MINING, POCKET_MEDICAL, POCKET_EXPLO)
breach_threshold = 14 //These are kinda thicc
resilience = 0.15 //Armored
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+5000
@@ -400,7 +398,7 @@
item_state_slots = list(slot_r_hand_str = "atmos_voidsuit", slot_l_hand_str = "atmos_voidsuit")
name = "pilot voidsuit"
armor = list(melee = 40, bullet = 10, laser = 25, energy = 15, bomb = 25, bio = 100, rad = 60)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, /obj/item/storage/toolbox, /obj/item/storage/briefcase/inflatable)
/obj/item/clothing/head/helmet/space/void/pilot/alt
icon_state = "rig0_pilot2"
code/modules/clothing/spacesuits/void/void.dm
+1 -1
View File
@@ -26,7 +26,7 @@
desc = "A high-tech dark red space suit. Used for AI satellite maintenance."
slowdown = 0.5
armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
min_pressure_protection = 0 * ONE_ATMOSPHERE
max_pressure_protection = 10 * ONE_ATMOSPHERE
code/modules/clothing/spacesuits/void/zaddat.dm
+1 -1
View File
@@ -16,7 +16,7 @@
slowdown = 1
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 70)
siemens_coefficient = 1
allowed = list(/obj/item/flashlight,/obj/item/tank)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS)
icon_state = "zaddat_hegemony"
helmet = new/obj/item/clothing/head/helmet/space/void/zaddat //shrouds come with helmets built-in
var/has_been_customized = FALSE
code/modules/clothing/suits/aliens/teshari.dm
+1 -1
View File
@@ -261,7 +261,7 @@
flags_inv = HIDEHOLSTER|HIDETIE
actions_types = list(/datum/action/item_action/toggle_hood)
hoodtype = /obj/item/clothing/head/tesh_hood
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)
species_restricted = list(SPECIES_TESHARI)
/obj/item/clothing/head/tesh_hood
code/modules/clothing/suits/aliens/vox.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/clothing/suit/armor/vox_scrap
name = "rusted metal armor"
desc = "A hodgepodge of various pieces of metal scrapped together into a rudimentary vox-shaped piece of armor."
allowed = list(/obj/item/gun, /obj/item/tank)
allowed = list(POCKET_EMERGENCY, POCKET_EXPLO, POCKET_ALL_TANKS)
armor = list(melee = 60, bullet = 30, laser = 30,energy = 5, bomb = 40, bio = 0, rad = 0) //Higher melee armor versus lower everything else.
icon_state = "vox-scrap"
icon_state = "vox-scrap"
code/modules/clothing/suits/armor.dm
+5 -5
View File
@@ -1,6 +1,6 @@
/obj/item/clothing/suit/armor
name = DEVELOPER_WARNING_NAME
allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight/maglight,/obj/item/clothing/head/helmet)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY)
body_parts_covered = CHEST
item_flags = THICKMATERIAL
@@ -129,7 +129,7 @@
permeability_coefficient = 0.01
item_flags = THICKMATERIAL
body_parts_covered = CHEST|LEGS|FEET|ARMS
allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/helmet)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY)
slowdown = 1
w_class = ITEMSIZE_HUGE
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 100)
@@ -282,7 +282,7 @@
blood_overlay_type = "armor"
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight/maglight,/obj/item/clothing/head/helmet)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY)
body_parts_covered = CHEST
item_flags = THICKMATERIAL
@@ -412,7 +412,7 @@
icon_state = "pvest"
desc = "A simple kevlar plate carrier. This one has the word 'Press' embroidered on patches on the back and front."
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
allowed = list(/obj/item/flashlight,/obj/item/taperecorder,/obj/item/pen,/obj/item/camera_film,/obj/item/camera,/obj/item/clothing/head/helmet)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_DETECTIVE, /obj/item/camera,/obj/item/clothing/head/helmet)
/obj/item/clothing/suit/storage/vest/heavy
name = "heavy armor vest"
@@ -472,7 +472,7 @@
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
w_class = ITEMSIZE_LARGE//bulky item
body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/helmet)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
code/modules/clothing/suits/armor_vr.dm
+1 -10
View File
@@ -153,16 +153,7 @@
slowdown=0
siemens_coefficient = 0.9
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection.
allowed = list(
/obj/item/flashlight,
/obj/item/gun,
/obj/item/ammo_magazine,
/obj/item/melee,
/obj/item/material/knife,
/obj/item/tank,
/obj/item/radio,
/obj/item/pickaxe
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_EXPLO, POCKET_ALL_TANKS, POCKET_MINING)
/obj/item/clothing/suit/armor/combat/crusader_explo/FM
name = "field medic low tech suit"
code/modules/clothing/suits/bio.dm
+1 -1
View File
@@ -23,7 +23,7 @@
permeability_coefficient = 0.01
body_parts_covered = CHEST|LEGS|ARMS|HANDS|FEET
slowdown = 1.0
allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/pen,/obj/item/flashlight/pen)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
siemens_coefficient = 0.9
code/modules/clothing/suits/hooded.dm
+36 -79
View File
@@ -113,8 +113,7 @@
cold_protection = CHEST|ARMS|LEGS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
hoodtype = /obj/item/clothing/head/hood/winter
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, /obj/item/suit_cooling_unit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS)
/obj/item/clothing/suit/storage/hooded/wintercoat/captain
name = "site manager's winter coat"
@@ -123,10 +122,7 @@
item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain")
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/captain
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, /obj/item/suit_cooling_unit, /obj/item/gun/energy,
/obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,
/obj/item/handcuffs, /obj/item/clothing/head/helmet)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_SECURITY)
/obj/item/clothing/suit/storage/hooded/wintercoat/hop
name = "head of personnel's winter coat"
@@ -134,10 +130,7 @@
icon_state = "coathop"
armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 5, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/hop
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, /obj/item/suit_cooling_unit, /obj/item/gun/energy,
/obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,
/obj/item/handcuffs, /obj/item/clothing/head/helmet)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_SECURITY)
/obj/item/clothing/suit/storage/hooded/wintercoat/security
name = "security winter coat"
@@ -146,10 +139,7 @@
item_state_slots = list(slot_r_hand_str = "coatsecurity", slot_l_hand_str = "coatsecurity")
armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/security
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, /obj/item/suit_cooling_unit, /obj/item/gun/energy,
/obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,
/obj/item/handcuffs, /obj/item/clothing/head/helmet, /obj/item/clothing/mask/gas)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_SECURITY)
/obj/item/clothing/suit/storage/hooded/wintercoat/security/hos
name = "head of security's winter coat"
@@ -157,10 +147,7 @@
icon_state = "coathos"
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/security/hos
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, /obj/item/suit_cooling_unit, /obj/item/gun/energy,
/obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,
/obj/item/handcuffs, /obj/item/clothing/head/helmet, /obj/item/clothing/mask/gas)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_SECURITY)
/obj/item/clothing/suit/storage/hooded/wintercoat/medical
name = "medical winter coat"
@@ -169,11 +156,7 @@
item_state_slots = list(slot_r_hand_str = "coatmedical", slot_l_hand_str = "coatmedical")
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/medical
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, /obj/item/suit_cooling_unit, /obj/item/analyzer, /obj/item/stack/medical,
/obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray,
/obj/item/healthanalyzer, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/clothing/mask/gas)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_MEDICAL)
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt
name = "medical winter coat, alt"
@@ -216,11 +199,7 @@
icon_state = "coatsar"
armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5)
hoodtype = /obj/item/clothing/head/hood/winter/medical/sar //VOREStation edit: sar winter hood
allowed = list (/obj/item/gun, /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, /obj/item/suit_cooling_unit, /obj/item/analyzer, /obj/item/stack/medical,
/obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray,
/obj/item/healthanalyzer, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/clothing/mask/gas)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_MEDICAL)
/obj/item/clothing/suit/storage/hooded/wintercoat/science
name = "science winter coat"
@@ -229,11 +208,7 @@
item_state_slots = list(slot_r_hand_str = "coatscience", slot_l_hand_str = "coatscience")
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/science
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, /obj/item/suit_cooling_unit, /obj/item/analyzer,/obj/item/stack/medical,
/obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray,
/obj/item/healthanalyzer, /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_MEDICAL)
/obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics
name = "robotics winter coat"
@@ -256,10 +231,7 @@
item_state_slots = list(slot_r_hand_str = "coatengineer", slot_l_hand_str = "coatengineer")
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
hoodtype = /obj/item/clothing/head/hood/winter/engineering
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, /obj/item/suit_cooling_unit, /obj/item/analyzer, /obj/item/flashlight,
/obj/item/multitool, /obj/item/pipe_painter, /obj/item/radio, /obj/item/t_scanner, /obj/item/tool/crowbar, /obj/item/tool/screwdriver,
/obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/tank/emergency/oxygen, /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering, /obj/item/clothing/head/hardhat) //please engineers take your hardhat with you I beg of you
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING)
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
name = "atmospherics winter coat"
@@ -282,10 +254,7 @@
icon_state = "coathydro"
item_state_slots = list(slot_r_hand_str = "coathydro", slot_l_hand_str = "coathydro")
hoodtype = /obj/item/clothing/head/hood/winter/hydro
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,
/obj/item/suit_cooling_unit, /obj/item/reagent_containers/spray/plantbgone, /obj/item/analyzer/plant_analyzer, /obj/item/seeds,
/obj/item/reagent_containers/glass/bottle, /obj/item/material/minihoe)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_HYDROPONICS)
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo
name = "cargo winter coat"
@@ -308,9 +277,7 @@
item_state_slots = list(slot_r_hand_str = "coatminer", slot_l_hand_str = "coatminer")
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/cargo/miner
allowed = list(/obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/storage/fancy/cigarettes,
/obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit,
/obj/item/tank, /obj/item/radio, /obj/item/pickaxe, /obj/item/storage/bag/ore, /obj/item/clothing/mask/gas)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_MINING)
/obj/item/clothing/suit/storage/hooded/wintercoat/bar
name = "bartender winter coat"
@@ -381,16 +348,7 @@
hoodtype = /obj/item/clothing/head/hood/explorer
siemens_coefficient = 0.9
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection.
allowed = list(
/obj/item/flashlight,
/obj/item/gun,
/obj/item/ammo_magazine,
/obj/item/melee,
/obj/item/material/knife,
/obj/item/tank,
/obj/item/radio,
/obj/item/pickaxe
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_MINING, POCKET_EXPLO)
/obj/item/clothing/suit/storage/hooded/techpriest
name = "techpriest robes"
@@ -399,39 +357,38 @@
hoodtype = /obj/item/clothing/head/hood/techpriest
/obj/item/clothing/suit/storage/hooded/raincoat
name = "raincoat"
desc = "A thin, opaque coat meant to protect you from all sorts of rain. Preferred by outdoorsmen and janitors alike across the rift. Of course, the only type of fluids you'd like to protect yourself from around this place don't rain down from the sky. Usually. Comes with a hood!"
icon_state = "raincoat"
body_parts_covered = CHEST|ARMS|LEGS
flags_inv = HIDEHOLSTER
hoodtype = /obj/item/clothing/head/hood/raincoat
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, /obj/item/suit_cooling_unit)
name = "raincoat"
desc = "A thin, opaque coat meant to protect you from all sorts of rain. Preferred by outdoorsmen and janitors alike across the rift. Of course, the only type of fluids you'd like to protect yourself from around this place don't rain down from the sky. Usually. Comes with a hood!"
icon_state = "raincoat"
body_parts_covered = CHEST|ARMS|LEGS
flags_inv = HIDEHOLSTER
hoodtype = /obj/item/clothing/head/hood/raincoat
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS)
//hooded cloaks
/obj/item/clothing/suit/storage/hooded/cloak
name = "hooded maroon cloak"
desc = "A simple maroon colored cloak."
icon_state = "maroon_cloak"
body_parts_covered = CHEST|ARMS
hoodtype = /obj/item/clothing/head/hood/cloak
name = "hooded maroon cloak"
desc = "A simple maroon colored cloak."
icon_state = "maroon_cloak"
body_parts_covered = CHEST|ARMS
hoodtype = /obj/item/clothing/head/hood/cloak
/obj/item/clothing/suit/storage/hooded/cloak/winter
name = "hooded winter cloak"
desc = "A simple wool cloak used during winter."
icon_state = "winter_cloak"
hoodtype = /obj/item/clothing/head/hood/cloak/winter
name = "hooded winter cloak"
desc = "A simple wool cloak used during winter."
icon_state = "winter_cloak"
hoodtype = /obj/item/clothing/head/hood/cloak/winter
/obj/item/clothing/suit/storage/hooded/cloak/asymmetric
name = "hooded asymmetric cloak"
desc = "A blue hooded cloak with an asymmetric design."
icon_state = "asymmetric_cloak"
hoodtype = /obj/item/clothing/head/hood/cloak/asymmetric
name = "hooded asymmetric cloak"
desc = "A blue hooded cloak with an asymmetric design."
icon_state = "asymmetric_cloak"
hoodtype = /obj/item/clothing/head/hood/cloak/asymmetric
/obj/item/clothing/suit/storage/hooded/cloak/fancy
name = "hooded fancy cloak"
desc = "A fancy black hooded cloak."
icon_state = "hb_cloak"
hoodtype = /obj/item/clothing/head/hood/cloak/fancy
name = "hooded fancy cloak"
desc = "A fancy black hooded cloak."
icon_state = "hb_cloak"
hoodtype = /obj/item/clothing/head/hood/cloak/fancy
code/modules/clothing/suits/hooded_vr.dm
+1 -2
View File
@@ -119,8 +119,7 @@
cold_protection = CHEST|ARMS|LEGS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
hoodtype = /obj/item/clothing/head/hood/hoodie
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, /obj/item/suit_cooling_unit)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS)
/obj/item/clothing/suit/storage/hooded/hoodie/redtrim
name = "red-trimmed hoodie"
code/modules/clothing/suits/jobs.dm
+4 -11
View File
@@ -127,9 +127,7 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEHOLSTER
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)
armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/det_trench/grey
@@ -144,9 +142,7 @@
desc = "A forensics technician jacket."
body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEHOLSTER
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)
armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/forensics/red
@@ -234,8 +230,7 @@
icon_state = "fr_jacket"
item_state_slots = list(slot_r_hand_str = "fr_jacket", slot_l_hand_str = "fr_jacket")
blood_overlay_type = "armor"
allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe,
/obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency/oxygen)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_MEDICAL)
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/toggle/fr_jacket/ems
@@ -250,9 +245,7 @@
icon_state = "surgical"
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \
/obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency/oxygen,/obj/item/surgical/scalpel,/obj/item/surgical/retractor,/obj/item/surgical/hemostat, \
/obj/item/surgical/cautery,/obj/item/surgical/bonegel,/obj/item/surgical/FixOVein)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_MEDICAL, POCKET_SURGERY)
//Mime
/obj/item/clothing/suit/suspenders
code/modules/clothing/suits/labcoat.dm
+1 -1
View File
@@ -6,7 +6,7 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEHOLSTER
allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/clothing/mask/gas)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_MEDICAL)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
/obj/item/clothing/suit/storage/toggle/labcoat/red
code/modules/clothing/suits/miscellaneous.dm
+17 -17
View File
@@ -153,7 +153,7 @@
desc = "This robe commands authority."
icon_state = "judge"
body_parts_covered = CHEST|LEGS|ARMS
allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/spacecash)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY)
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
/obj/item/clothing/suit/storage/apron/overalls
@@ -167,7 +167,7 @@
icon_state = "syndicate"
desc = "A plastic replica of a mercenary combat space suit, you'll look just like a real bloodthirsty mercenary in this! This is a toy, it is not made for use in space!"
w_class = ITEMSIZE_NORMAL
allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/toy)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
body_parts_covered = CHEST|ARMS|HANDS|LEGS|FEET
@@ -398,7 +398,7 @@
name = "leather coat"
desc = "A long, thick black leather coat."
icon_state = "leathercoat_alt"
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)
item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket")
flags_inv = HIDEHOLSTER
@@ -413,7 +413,7 @@
name = "brown leather coat"
desc = "A long, brown leather coat."
icon_state = "browncoat"
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)
item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket")
flags_inv = HIDEHOLSTER
*/
@@ -421,7 +421,7 @@
name = "black coat"
desc = "A flowing, black coat."
icon_state = "neo_leather" //This didn't have an icon_state anywhere I can find. It used to be 'neocoat'. The closest replacement I could find was neo_leather
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)
item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket")
flags_inv = HIDEHOLSTER
@@ -444,7 +444,7 @@
desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat appears to have its kevlar lining removed."
icon_state = "detective"
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_EXPLO, POCKET_DETECTIVE)
flags_inv = HIDEHOLSTER
/obj/item/clothing/suit/storage/trench/grey
@@ -466,7 +466,7 @@
desc = "A duster is a light, loose-fitting long coat. Dusters are meant to protect your clothing from dust and rain."
icon_state = "duster"
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)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_EXPLO)
flags_inv = HIDEHOLSTER
/obj/item/clothing/suit/storage/toggle/cardigan
@@ -621,7 +621,7 @@
desc = "A thick, well-worn WW2 leather bomber jacket."
icon_state = "bomber"
item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket")
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)
body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEHOLSTER
cold_protection = UPPER_TORSO|ARMS
@@ -648,7 +648,7 @@
name = "leather jacket"
desc = "A black leather coat."
icon_state = "leather_jacket"
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)
body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEHOLSTER
@@ -684,7 +684,7 @@
desc = "A brown leather coat."
icon_state = "brown_jacket"
item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket")
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)
body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEHOLSTER
@@ -712,7 +712,7 @@
desc = "A denim coat."
icon_state = "denim_jacket"
item_state_slots = list(slot_r_hand_str = "denim_jacket", slot_l_hand_str = "denim_jacket")
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)
body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEHOLSTER
@@ -822,7 +822,7 @@
name = "black varsity jacket"
desc = "A favorite of jocks everywhere from Sol to Nyx."
icon_state = "varsity"
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)
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
flags_inv = HIDETIE|HIDEHOLSTER
@@ -850,7 +850,7 @@
name = "runner jacket"
desc = "A yellow sports jacket with white trim and an unfolded collar."
icon_state = "runner"
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)
item_state_slots = list(slot_r_hand_str = "suit_red", slot_l_hand_str = "suit_red")
flags_inv = HIDEHOLSTER
@@ -913,7 +913,7 @@
desc = "A track jacket, for the athletic."
icon_state = "trackjacket"
item_state_slots = list(slot_r_hand_str = "black_labcoat", slot_l_hand_str = "black_labcoat")
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)
/obj/item/clothing/suit/storage/toggle/track/blue
name = "blue track jacket"
@@ -943,7 +943,7 @@
desc = "A comfy, grey flannel shirt. Unleash your inner hipster."
icon_state = "flannel"
item_state_slots = list(slot_r_hand_str = "black_labcoat", slot_l_hand_str = "black_labcoat")
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 = HIDEHOLSTER
var/rolled = 0
var/tucked = 0
@@ -1051,7 +1051,7 @@
cold_protection = CHEST|ARMS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, 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)
/obj/item/clothing/suit/storage/snowsuit/command
name = "command snowsuit"
@@ -1154,7 +1154,7 @@
name = "motorcycle jacket"
desc = "A recreation of one of the famous Sol-based biwheeled driver assemblies. Patches on the back denote an AI-generated 'biker logo'. It looks unintelligible."
icon_state = "motojacket"
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) //same as leather jackets
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY)
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/punkvest
code/modules/clothing/suits/solgov.dm
+4 -4
View File
@@ -16,7 +16,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
flags_inv = HIDEHOLSTER
allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/taperecorder,/obj/item/analyzer,/obj/item/radio,/obj/item/taperoll)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_DETECTIVE, /obj/item/clothing/head/beret)
valid_accessory_slots = (ACCESSORY_SLOT_ARMBAND|ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_RANK|ACCESSORY_SLOT_DEPT)
restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND)
@@ -186,7 +186,7 @@
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/radio,/obj/item/pen)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, /obj/item/clothing/head/beret)
valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK)
restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND)
/* //These two sprites were lost to time. Original PR doesn't appear to have them either.
@@ -270,7 +270,7 @@
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
allowed = list(/obj/item/tank/emergency,/obj/item/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/radio,/obj/item/pen)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, /obj/item/clothing/head/beret)
valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK)
/obj/item/clothing/suit/dress/solgov/fleet/sailor
@@ -371,7 +371,7 @@
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
allowed = list(/obj/item/tank/emergency,/obj/item/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/radio,/obj/item/pen)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, /obj/item/clothing/head/beret)
valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK)
/obj/item/clothing/suit/dress/terran/navy
code/modules/clothing/suits/utility.dm
+3 -3
View File
@@ -18,7 +18,7 @@
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/extinguisher)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, /obj/item/extinguisher)
slowdown = 1.0
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
item_flags = 0
@@ -73,7 +73,7 @@
/obj/item/clothing/suit/bomb_suit/security
icon_state = "bombsuitsec"
allowed = list(/obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs)
allowed = list(POCKET_SECURITY)
body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS
/*
@@ -96,7 +96,7 @@
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = CHEST|LEGS|ARMS|HANDS|FEET
allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, /obj/item/clothing/head/radiation)
slowdown = 1.5
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
flags_inv = HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
code/modules/clothing/suits/utility_vr.dm
+1 -1
View File
@@ -13,7 +13,7 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO
flags_inv = HIDEHOLSTER
allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_MEDICAL)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
/obj/item/clothing/head/radiation
code/modules/clothing/suits/wiz_robe.dm
+1 -1
View File
@@ -65,7 +65,7 @@
gas_transfer_coefficient = 0.01 // IT'S MAGICAL OKAY JEEZ +1 TO NOT DIE
permeability_coefficient = 0.01
armor = list(melee = 30, bullet = 20, laser = 20,energy = 20, bomb = 20, bio = 20, rad = 20)
allowed = list(/obj/item/teleportation_scroll)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_WIZARD)
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
siemens_coefficient = 0.8
wizard_garb = 1
code/modules/mob/holder.dm
+1 -1
View File
@@ -388,7 +388,7 @@ var/list/holder_mob_icon_cache = list()
/obj/item/holder/protoblob
slot_flags = SLOT_HEAD | SLOT_OCLOTHING | SLOT_HOLSTER | SLOT_ICLOTHING | SLOT_ID | SLOT_EARS
w_class = ITEMSIZE_TINY
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_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, /obj/item/storage/backpack)
item_icons = list(
slot_l_hand_str = 'icons/mob/lefthand_holder.dmi',
slot_r_hand_str = 'icons/mob/righthand_holder.dmi',
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm
+1 -8
View File
@@ -226,14 +226,7 @@
desc = "A body-hugging mass of nanomachines."
can_breach = 0
species_restricted = list(SPECIES_PROTEAN, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_XENOMORPH_HYBRID)
allowed = list(
/obj/item/gun,
/obj/item/flashlight,
/obj/item/tank,
/obj/item/suit_cooling_unit,
/obj/item/melee/baton,
/obj/item/storage/backpack,
)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS, POCKET_SUIT_REGULATORS, POCKET_EXPLO, /obj/item/storage/backpack)
sprite_sheets = list(
SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi',
SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
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!
code/modules/xenoarcheaology/tools/equipment.dm
+1 -1
View File
@@ -23,7 +23,7 @@
icon_state = "cespace_suit"
item_state = "cespace_suit"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/pickaxe)
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_MINING)
slowdown = 1
// Pressure protection inherited from space suits