cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 07:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unapologetic Security Nerfs (#6679)

Browse Source
This commit is contained in:
OneOneThreeEight
2019-10-07 17:34:04 -04:00
committed by Werner
parent f5343171c6
commit 4bd2ce6ba0
35 changed files with 168 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/clothing/gloves/arm_guard.dm
View File

@@ -6,7 +6,7 @@
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
punch_force = 3
w_class = 3
siemens_coefficient = 0.5
siemens_coefficient = 0.35
drop_sound = 'sound/items/drop/metalshield.ogg'
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot)
@@ -33,4 +33,4 @@
/obj/item/clothing/gloves/arm_guard/riot
name = "riot arm guards"
desc = "These arm guards will protect your hands and arms from close combat weapons."
armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)

11
code/modules/clothing/head/helmet.dm
View File

@@ -77,6 +77,7 @@
icon_state = "riot"
body_parts_covered = HEAD|FACE|EYES //face shield
armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.35
flags_inv = HIDEEARS
action_button_name = "Toggle Visor"
@@ -106,12 +107,14 @@
desc = "A helmet with reinforced plating to protect against ballistic projectiles."
icon_state = "helmet_bulletproof"
armor = list(melee = 25, bullet = 80, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.35
/obj/item/clothing/head/helmet/merc
name = "combat helmet"
desc = "A tan helmet made from advanced ceramic."
icon_state = "helmet_tac"
armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
siemens_coefficient = 0.35
/obj/item/clothing/head/helmet/swat
name = "\improper SWAT helmet"
@@ -122,6 +125,7 @@
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.1
/obj/item/clothing/head/helmet/swat/peacekeeper
name = "\improper ERT civil protection helmet"
@@ -173,6 +177,7 @@
"Unathi" = 'icons/mob/species/unathi/helmet.dmi'
)
armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
siemens_coefficient = 0.35
/obj/item/clothing/head/helmet/augment
@@ -184,6 +189,7 @@
body_parts_covered = HEAD|EYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.1
/obj/item/clothing/head/helmet/iachelmet
name = "IAC helmet"
@@ -201,6 +207,7 @@
contained_sprite = 1
species_restricted = list("Unathi")
armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
siemens_coefficient = 0.35
/obj/item/clothing/head/helmet/tank
name = "padded cap"
@@ -209,6 +216,7 @@
flags_inv = BLOCKHEADHAIR
color = "#5f5f5f"
armor = list(melee = 25, bullet = 5, laser = 5, energy = 10, bomb = 5, bio = 0, rad = 0)
siemens_coefficient = 0.75
/obj/item/clothing/head/helmet/tank/olive
color = "#727c58"
@@ -226,6 +234,7 @@
slot_r_hand_str = "syndicate-helm-green"
)
armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
siemens_coefficient = 0.35
//Commander
/obj/item/clothing/head/helmet/ert/command
@@ -257,6 +266,7 @@
body_parts_covered = HEAD|FACE|EYES
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
armor = list(melee = 50, bullet = 30, laser = 30, energy = 15, bomb = 40, bio = 0, rad = 0)
siemens_coefficient = 0.35
/obj/item/clothing/head/helmet/tajara
name = "amohdan swordsmen helmet"
@@ -274,3 +284,4 @@
single combat in their quests to become the greatest swordsman. Modern Amohda is a mix between loyalists to the NKA and to the DPRA, with almost universal praise for a return to \
traditional culture, yet often violent disagreement about the course of the island's political future. A sizable third party of monarchists which advocate the reestablishment of the \
Imperial Amohdan dynasty also exists, fragmenting the monarchist factions on the island and further complicating political violence in the area."
siemens_coefficient = 0.35

2
code/modules/clothing/head/jobs.dm
View File

@@ -173,7 +173,7 @@
)
allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/head/det/grey
icon_state = "grey_fedora"

2
code/modules/clothing/head/misc_special.dm
View File

@@ -25,7 +25,7 @@
flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
body_parts_covered = HEAD|FACE|EYES
action_button_name = "Flip Welding Mask"
siemens_coefficient = 0.9
siemens_coefficient = 0.75 // what? it's steel.
w_class = 3
var/base_state
flash_protection = FLASH_PROTECTION_MAJOR

2
code/modules/clothing/masks/boxing.dm
View File

@@ -50,7 +50,7 @@
flags_inv = HIDEFACE|BLOCKHAIR
body_parts_covered = HEAD|FACE
w_class = 2
siemens_coefficient = 3.0
siemens_coefficient = 0.9
/obj/item/clothing/mask/luchador/tecnicos
name = "tecnicos mask"

6
code/modules/clothing/shoes/jobs.dm
View File

@@ -15,7 +15,7 @@
item_state = "jackboots"
force = 3
armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
can_hold_knife = 1
drop_sound = 'sound/items/drop/boots.ogg'
@@ -33,7 +33,7 @@
item_state = "workboots"
force = 3
armor = list(melee = 40, bullet = 0, laser = 0, energy = 15, bomb = 20, bio = 0, rad = 20)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
can_hold_knife = 1
drop_sound = 'sound/items/drop/boots.ogg'
@@ -42,4 +42,4 @@
desc = "A pair of toeless work boots designed for use in industrial settings. Modified for species whose toes have claws."
icon_state = "workbootstoeless"
item_state = "workbootstoeless"
species_restricted = null
species_restricted = null

4
code/modules/clothing/shoes/leg_guard.dm
View File

@@ -5,7 +5,7 @@
body_parts_covered = LEGS|FEET
w_class = 3
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
siemens_coefficient = 0.5
siemens_coefficient = 0.35
force = 3
drop_sound = 'sound/items/drop/boots.ogg'
@@ -33,4 +33,4 @@
/obj/item/clothing/shoes/leg_guard/riot
name = "riot leg guards"
desc = "These will protect your legs and feet from close combat weapons."
armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)

9
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -7,7 +7,7 @@
item_flags = NOSLIP
origin_tech = list(TECH_ILLEGAL = 3)
var/list/clothing_choices = list()
siemens_coefficient = 0.8
siemens_coefficient = 0.75
species_restricted = null
drop_sound = 'sound/items/drop/rubber.ogg'
@@ -35,7 +35,7 @@
force = 5
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
item_flags = NOSLIP
siemens_coefficient = 0.5
siemens_coefficient = 0.35
can_hold_knife = 1
cold_protection = FEET
@@ -87,7 +87,7 @@
item_state = "cult"
force = 5
silent = 1
siemens_coefficient = 0
siemens_coefficient = 0.35 //antags don't get exceptions, it's just heavy armor by magical standards
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
cold_protection = FEET
@@ -186,7 +186,7 @@
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
siemens_coefficient = 0.9
siemens_coefficient = 0.75
can_hold_knife = 1
/obj/item/clothing/shoes/black_boots
@@ -235,3 +235,4 @@
description_fluff = "These traditional Unathi footwear have remained relatively unchanged in principle, with improved materials and construction being the only notable change. This pair is reinforced with leather of the Zazehal, a Moghesian species of eel that can grow up to twenty five feet long. Typically, Zazehal Festivals are thrown every month of the warm season in which Unathi strew freshly killed birds across the shoreline and collect these creatures with baskets. The fungi that grow on their skin is harvested and used as an exotic seasoning, and their skin is used for its' incredibly durable, shark-like leather."
icon_state = "eelcaligae"
armor = list(melee = 40, bullet = 0, laser = 0, energy = 15, bomb = 20, bio = 0, rad = 20)
siemens_coefficient = 0.75

4
code/modules/clothing/spacesuits/alien.dm
View File

@@ -5,7 +5,7 @@
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank)
slowdown = 2
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_restricted = list("Vox", "Vox Armalis")
@@ -16,7 +16,7 @@
/obj/item/clothing/head/helmet/space/vox
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.6
siemens_coefficient = 0.35
item_flags = STOPPRESSUREDAMAGE
flags_inv = null
species_restricted = list("Vox","Vox Armalis")

2
code/modules/clothing/spacesuits/rig/rig.dm
View File

@@ -20,7 +20,7 @@
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.2
siemens_coefficient = 0.35
permeability_coefficient = 0.1
unacidable = 1
slowdown = 1 // All rigs by default should have slowdown.

6
code/modules/clothing/spacesuits/rig/suits/alien.dm
View File

@@ -4,6 +4,7 @@
suit_type = "NT breacher"
icon_state = "breacher_rig_cheap"
armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 70, bio = 100, rad = 50)
siemens_coefficient = 0.1
emp_protection = -20
slowdown = 6
offline_slowdown = 10
@@ -22,6 +23,7 @@
suit_type = "breacher chassis"
icon_state = "breacher_rig"
armor = list(melee = 90, bullet = 90, laser = 90, energy = 90, bomb = 90, bio = 100, rad = 80) //Takes TEN TIMES as much damage to stop someone in a breacher. In exchange, it's slow.
siemens_coefficient = 0.1
vision_restriction = 0
slowdown = 4
vision_restriction = TINT_NONE
@@ -35,6 +37,7 @@
suit_type = "combat exoskeleton"
icon_state = "vaurca_rig"
armor = list(melee = 65, bullet = 65, laser = 100, energy = 100, bomb = 90, bio = 100, rad = 80)
siemens_coefficient = 0.1
vision_restriction = 0
slowdown = 2
offline_slowdown = 3
@@ -73,6 +76,7 @@
suit_type = "tesla suit"
icon_state = "tesla_rig"
armor = list(melee = 70, bullet = 50, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 60)
siemens_coefficient = 0.1
vision_restriction = 0
slowdown = 2
offline_slowdown = 3
@@ -88,4 +92,4 @@
/obj/item/rig_module/tesla_coil,
/obj/item/rig_module/mounted/tesla)
allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_UTILITY
allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_UTILITY

6
code/modules/clothing/spacesuits/rig/suits/combat.dm
View File

@@ -4,6 +4,7 @@
icon_state = "combat_rig"
suit_type = "combat hardsuit"
armor = list(melee = 70, bullet = 55, laser = 45, energy = 15, bomb = 75, bio = 100, rad = 60)
siemens_coefficient = 0.1
offline_slowdown = 3
offline_vision_restriction = TINT_HEAVY
@@ -36,6 +37,7 @@
icon_state = "military_rig"
suit_type = "military hardsuit"
armor = list(melee = 80, bullet = 75, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 30)
siemens_coefficient = 0.1
offline_slowdown = 3
offline_vision_restriction = TINT_HEAVY
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
@@ -71,6 +73,7 @@
icon_state = "legion_rig"
suit_type = "retrofitted military hardsuit"
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 40, bio = 100, rad = 30)
siemens_coefficient = 0.35
slowdown = 2
offline_slowdown = 4
offline_vision_restriction = TINT_HEAVY
@@ -106,6 +109,7 @@
icon_state = "gunslinger"
suit_type = "gunslinger hardsuit"
armor = list(melee = 50, bullet = 60, laser = 40, energy = 30, bomb = 30, bio = 100, rad = 60)
siemens_coefficient = 0.1
offline_slowdown = 2
offline_vision_restriction = TINT_HEAVY
@@ -130,6 +134,7 @@
icon_state = "strikesuit"
suit_type = "strike hardsuit"
armor = list(melee = 80, bullet = 45, laser = 45, energy = 25, bomb = 25, bio = 100, rad = 100)
siemens_coefficient = 0.1
offline_slowdown = 2
offline_vision_restriction = TINT_HEAVY
@@ -154,6 +159,7 @@
icon_state = "elyran_rig"
suit_type = "elyran battlesuit"
armor = list(melee = 60, bullet = 40, laser = 60, energy = 60, bomb = 25, bio = 100, rad = 100)
siemens_coefficient = 0.1
offline_slowdown = 2
offline_vision_restriction = TINT_HEAVY

17
code/modules/clothing/spacesuits/rig/suits/ert.dm
View File

@@ -8,19 +8,15 @@
suit_type = "ERT commander"
icon_state = "ert_commander_rig"
emp_protection = 35
helm_type = /obj/item/clothing/head/helmet/space/rig/ert
req_access = list(access_cent_specops)
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100)
siemens_coefficient = 0.1
allowed = list(
/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rfd/construction, /obj/item/weapon/crowbar, \
/obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/device/multitool, \
/obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \
/obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller)
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/vision/nvg,
@@ -37,11 +33,8 @@
suit_type = "ERT engineer"
icon_state = "ert_engineer_rig"
emp_protection = 30
armor = list(melee = 55, bullet = 45, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100)
glove_type = /obj/item/clothing/gloves/rig/eva
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/vision/meson,
@@ -58,9 +51,7 @@
suit_type = "ERT medic"
icon_state = "ert_medical_rig"
emp_protection = 30
armor = list(melee = 55, bullet = 45, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100)
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/vision/medhud,
@@ -78,9 +69,7 @@
suit_type = "ERT security"
icon_state = "ert_security_rig"
emp_protection = 30
armor = list(melee = 65, bullet = 55, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 80)
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/vision/sechud,
@@ -96,7 +85,6 @@
desc = "A suit worn by the janitoral division of an Emergency Response Team. Has purple highlights. Less armoured than security the variant, but offers full radiation protection."
suit_type = "ERT janitor"
icon_state = "ert_janitor_rig"
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/maneuvering_jets,
@@ -106,7 +94,6 @@
/obj/item/rig_module/actuators
)
armor = list(melee = 55, bullet = 45, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100)
allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL
/obj/item/weapon/rig/ert/assetprotection
@@ -116,9 +103,7 @@
icon_state = "asset_protection_rig"
armor = list(melee = 80, bullet = 75, laser = 60, energy = 40, bomb = 80, bio = 100, rad =100)
slowdown = 0
siemens_coefficient = 0
emp_protection = 50
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/maneuvering_jets,

1
code/modules/clothing/spacesuits/rig/suits/merc.dm
View File

@@ -9,6 +9,7 @@
icon_state = "merc_rig"
suit_type = "crimson hardsuit"
armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
siemens_coefficient = 0.1
offline_slowdown = 3
offline_vision_restriction = TINT_HEAVY
emp_protection = 30

7
code/modules/clothing/spacesuits/rig/suits/station.dm
View File

@@ -25,7 +25,7 @@
desc = "Prepare for paperwork."
icon_state = "internalaffairs_rig"
armor = null
siemens_coefficient = 0.9
siemens_coefficient = 0.9
slowdown = 0
offline_slowdown = 0
offline_vision_restriction = TINT_HEAVY
@@ -63,6 +63,7 @@
desc = "A heavy, powerful rig used by construction crews and mining corporations."
icon_state = "industrial_rig"
armor = list(melee = 60, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50)
siemens_coefficient = 0.35
slowdown = 2
offline_slowdown = 7
offline_vision_restriction = TINT_HEAVY
@@ -171,6 +172,7 @@
desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it."
icon_state = "hazmat_rig"
armor = list(melee = 45, bullet = 5, laser = 40, energy = 65, bomb = 60, bio = 100, rad = 100)
siemens_coefficient = 0.50
offline_vision_restriction = TINT_HEAVY
emp_protection = 40
@@ -199,6 +201,7 @@
desc = "A durable suit designed for medical rescue in high risk areas."
icon_state = "medical_rig"
armor = list(melee = 30, bullet = 15, laser = 20, energy = 60, bomb = 30, bio = 100, rad = 100)
siemens_coefficient = 0.50
slowdown = 0
offline_slowdown = 2
offline_vision_restriction = TINT_HEAVY
@@ -275,4 +278,4 @@
req_access = list()
req_one_access = list()
species_restricted = list("Human")
species_restricted = list("Human")

4
code/modules/clothing/spacesuits/rig/suits/terminator.dm
View File

@@ -4,6 +4,7 @@
icon_state = "terminator_rig"
suit_type = "synthetic exoskeleton"
armor = list(melee = 80, bullet = 75, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 30)
siemens_coefficient = 0.0 // Ok this is the only exception. Got it? Good.
offline_slowdown = 3
offline_vision_restriction = TINT_HEAVY
has_sealed_state = TRUE
@@ -36,9 +37,7 @@
/obj/item/rig_module/mounted/plasmacutter,
/obj/item/rig_module/actuators/combat
)
species_restricted = list("Heavy Machine")
allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA
/obj/item/clothing/head/helmet/space/rig/terminator
@@ -46,7 +45,6 @@
light_overlay = "helmet_light_terminator"
light_color = LIGHT_COLOR_RED
/obj/item/weapon/rig/terminator/equipped
initial_modules = list(
/obj/item/rig_module/maneuvering_jets,

4
code/modules/clothing/spacesuits/spacesuits.dm
View File

@@ -18,7 +18,7 @@
body_parts_covered = HEAD|FACE|EYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.9
siemens_coefficient = 0.5
species_restricted = list("exclude","Diona","Vox","Golem")
flash_protection = FLASH_PROTECTION_MAJOR
allow_hair_covering = FALSE
@@ -77,7 +77,7 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.9
siemens_coefficient = 0.5
species_restricted = list("exclude","Diona","Vox","Golem")
var/list/supporting_limbs //If not-null, automatically splints breaks. Checked when removing the suit.

4
code/modules/clothing/spacesuits/syndi.dm
View File

@@ -5,7 +5,7 @@
item_state = "syndicate"
desc = "A crimson helmet sporting clean lines and durable plating. Engineered to look menacing."
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.3
siemens_coefficient = 0.5
brightness_on = 6
/obj/item/clothing/suit/space/syndicate
@@ -17,7 +17,7 @@
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 1
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.3
siemens_coefficient = 0.5
//Green syndicate space suit

6
code/modules/clothing/spacesuits/void/alien.dm
View File

@@ -4,7 +4,7 @@
armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_restricted = list("Skrell","Human")
siemens_coefficient = 0.4
siemens_coefficient = 0.5
refittable = FALSE
/obj/item/clothing/head/helmet/space/void/skrell/white
@@ -21,7 +21,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_restricted = list("Skrell","Human")
siemens_coefficient = 0.4
siemens_coefficient = 0.5
refittable = FALSE
/obj/item/clothing/suit/space/void/skrell/white
@@ -58,4 +58,4 @@
description_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."

2
code/modules/clothing/spacesuits/void/captain.dm
View File

@@ -9,6 +9,7 @@
)
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50)
siemens_coefficient = 0.35
/obj/item/clothing/suit/space/void/captain
name = "captain voidsuit"
@@ -23,3 +24,4 @@
allowed = list(/obj/item/weapon/tank, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
slowdown = 1.5
armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
siemens_coefficient = 0.35

4
code/modules/clothing/spacesuits/void/merc.dm
View File

@@ -9,7 +9,7 @@
slot_r_hand_str = "syndie_helm"
)
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
camera_networks = list(NETWORK_MERCENARY)
light_overlay = "helmet_light_green" //todo: species-specific light overlays
@@ -29,5 +29,5 @@
w_class = 3
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human", "Skrell", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")

22
code/modules/clothing/spacesuits/void/misc.dm
View File

@@ -4,7 +4,7 @@
icon_state = "sol_helmet"
item_state = "sol_helmet"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
brightness_on = 6
@@ -19,7 +19,7 @@
slowdown = 1
armor = list(melee = 70, bullet = 55, laser = 45, energy = 15, bomb = 40, bio = 100, rad = 60)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
refittable = FALSE
@@ -29,7 +29,7 @@
icon_state = "vulture"
item_state = "vulture"
armor = list(melee = 80, bullet = 70, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 30)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
brightness_on = 6
@@ -43,7 +43,7 @@
slowdown = 3
armor = list(melee = 80, bullet = 70, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 30)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
refittable = FALSE
@@ -54,7 +54,7 @@
icon_state = "eridani_suit"
item_state = "eridani_suit"
armor = list(melee = 50, bullet = 50, laser = 40, energy = 50, bomb = 50, bio = 100, rad = 30)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
w_class = 3
brightness_on = 6
@@ -67,7 +67,7 @@
item_state = "eridani_suit"
armor = list(melee = 50, bullet = 50, laser = 40, energy = 40, bomb = 50, bio = 100, rad = 30)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
refittable = FALSE
@@ -77,7 +77,7 @@
icon_state = "valkyrie"
item_state = "valkyrie"
armor = list(melee = 60, bullet = 30, laser = 50, energy = 40, bomb = 60, bio = 100, rad = 100)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000
brightness_on = 6
@@ -90,7 +90,7 @@
item_state = "valkyrie"
armor = list(melee = 60, bullet = 30, laser = 50, energy = 40, bomb = 60, bio = 100, rad = 100)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
refittable = FALSE
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000
@@ -100,8 +100,8 @@
desc = "A sleek helmet with a bright yellow visor, expertly made in and colored in the iconic branding of Ceres' Lance."
icon_state = "lancer_suit"
item_state = "lancer_suit"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.3
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.35
species_restricted = list("Human")
refittable = FALSE
@@ -114,6 +114,6 @@
w_class = 3
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
species_restricted = list("Human")
refittable = FALSE

4
code/modules/clothing/spacesuits/void/void.dm
View File

@@ -7,7 +7,7 @@
heat_protection = HEAD
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.4
siemens_coefficient = 0.5
//Species-specific stuff.
species_restricted = list("Human", "Bishop Accessory Frame")
@@ -38,7 +38,7 @@
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit)
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.4
siemens_coefficient = 0.5
species_restricted = list("Human", "Skrell", "Bishop Accessory Frame")
sprite_sheets_refit = list(

4
code/modules/clothing/spacesuits/void/wizard.dm
View File

@@ -9,7 +9,7 @@
)
unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles!
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
wizard_garb = 1
species_restricted = list("Human", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
@@ -44,7 +44,7 @@
w_class = 3
unacidable = 1
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.3
siemens_coefficient = 0.35
wizard_garb = 1
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual)
species_restricted = list("Human", "Skrell", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")

17
code/modules/clothing/suits/armor.dm
View File

@@ -119,7 +119,7 @@
item_state = "riot_vest"
slowdown = 1
armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.5
siemens_coefficient = 0.35
pocket_slots = 4
/obj/item/clothing/suit/armor/bulletproof
@@ -129,6 +129,7 @@
item_state = "bulletproof_armor"
blood_overlay_type = "armor"
armor = list(melee = 25, bullet = 80, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.35
pocket_slots = 4
/obj/item/clothing/suit/armor/laserproof
@@ -176,7 +177,7 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.5
siemens_coefficient = 0.35
pocket_slots = 4//fullbody, more slots
/obj/item/clothing/suit/armor/swat/officer
@@ -260,7 +261,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
slowdown = 1
armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 20, bio = 0, rad = 0)
siemens_coefficient = 0.5
siemens_coefficient = 0.35
var/obj/item/clothing/accessory/holster/holster
/obj/item/clothing/suit/armor/tactical/Initialize()
@@ -313,6 +314,7 @@
item_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 20, bio = 0, rad = 0)
siemens_coefficient = 0.35
//Commander
/obj/item/clothing/suit/armor/vest/ert/command
@@ -414,6 +416,7 @@
item_state = "webvest"
armor = list(melee = 50, bullet = 40, laser = 50, energy = 25, bomb = 30, bio = 0, rad = 0)
slowdown = 1
siemens_coefficient = 0.35
/obj/item/clothing/suit/storage/vest/heavy/officer
name = "officer heavy armor vest"
@@ -465,6 +468,7 @@
item_state = "ert_soldier"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 20, bio = 0, rad = 0)
siemens_coefficient = 0.35
slowdown = 0
/obj/item/clothing/suit/storage/vest/heavy/ert/commander
@@ -510,6 +514,7 @@
contained_sprite = TRUE
species_restricted = list("Unathi")
armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
siemens_coefficient = 0.35
/obj/item/clothing/suit/armor/tajara
name = "amohdan swordsmen armor"
@@ -523,6 +528,7 @@
flags_inv = HIDEJUMPSUIT|HIDETAIL
species_restricted = list("Tajara")
armor = list(melee = 60, bullet = 50, laser = 20, energy = 10, bomb = 5, bio = 0, rad = 0)
siemens_coefficient = 0.35
description_fluff = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
single combat in their quests to become the greatest swordsman. Modern Amohda is a mix between loyalists to the NKA and to the DPRA, with almost universal praise for a return to \
traditional culture, yet often violent disagreement about the course of the island's political future. A sizable third party of monarchists which advocate the reestablishment of the \
@@ -538,6 +544,7 @@
item_state = "legion_armor"
body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS
armor = list(melee = 50, bullet = 30, laser = 30, energy = 15, bomb = 40, bio = 0, rad = 0)
siemens_coefficient = 0.35
/obj/item/clothing/suit/armor/vest/idris
name = "Idris Reclamation Unit coat"
@@ -583,7 +590,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 3
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 0
siemens_coefficient = 0.1
pocket_slots = 3
/obj/item/clothing/suit/armor/tdome
@@ -602,4 +609,4 @@
desc = "Pukish armor."
icon_state = "tdgreen"
item_state = "tdgreen"
siemens_coefficient = 1
siemens_coefficient = 1

4
code/modules/clothing/suits/bio.dm
View File

@@ -11,7 +11,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
siemens_coefficient = 0.9
siemens_coefficient = 0.75
/obj/item/clothing/suit/bio_suit
name = "bio suit"
@@ -28,7 +28,7 @@
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
siemens_coefficient = 0.9
siemens_coefficient = 0.75
//Standard biosuit, orange stripe

2
code/modules/clothing/suits/hoodies.dm
View File

@@ -86,6 +86,7 @@
cold_protection = UPPER_TORSO|LOWER_TORSO|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)
siemens_coefficient = 0.75
hooded = 1
hoodtype = /obj/item/clothing/head/winterhood
@@ -96,6 +97,7 @@
icon_state = "generic_hood"
body_parts_covered = HEAD
cold_protection = HEAD
siemens_coefficient = 0.75
flags_inv = HIDEEARS | BLOCKHAIR | HIDEEARS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
canremove = 0

14
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -16,7 +16,7 @@
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO
allowed = list (/obj/item/weapon/gun/energy/lasertag/blue)
siemens_coefficient = 3.0
siemens_coefficient = 1.0
/obj/item/clothing/suit/redtag
name = "red laser tag armour"
@@ -26,7 +26,7 @@
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO
allowed = list (/obj/item/weapon/gun/energy/lasertag/red)
siemens_coefficient = 3.0
siemens_coefficient = 1.0
/*
* Costume
@@ -132,7 +132,7 @@
item_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
flags_inv = HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 2.0
siemens_coefficient = 1.5
/obj/item/clothing/suit/monkeysuit
@@ -142,7 +142,7 @@
item_state = "monkeysuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 2.0
siemens_coefficient = 1.5
/obj/item/clothing/suit/holidaypriest
@@ -199,7 +199,7 @@
item_state = "leathercoat_alt"
body_parts_covered = UPPER_TORSO|ARMS
min_cold_protection_temperature = T0C - 20
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/suit/browncoat
name = "brown leather coat"
@@ -220,7 +220,7 @@
item_state = "xenos_helm"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 2.0
siemens_coefficient = 1.5
/obj/item/clothing/suit/storage/toggle/bomber
name = "bomber jacket"
@@ -232,7 +232,7 @@
body_parts_covered = UPPER_TORSO|ARMS
cold_protection = UPPER_TORSO|ARMS
min_cold_protection_temperature = T0C - 20
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/suit/storage/toggle/leather_jacket
name = "leather jacket"

7
code/modules/clothing/suits/utility.dm
View File

@@ -18,6 +18,7 @@
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
siemens_coefficient = 0.5
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher)
slowdown = 1.0
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
@@ -35,6 +36,7 @@
name = "firesuit"
desc = "A suit that protects against extreme fire and heat."
//icon_state = "thermal"
siemens_coefficient = 0.35
item_state = "ro_suit"
w_class = 4//bulky item
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + 25000
@@ -43,6 +45,7 @@
/obj/item/clothing/suit/fire/atmos
name = "atmospheric technician firesuit"
desc = "A suit that protects against fire and heat, this one is designed for atmospheric technicians."
siemens_coefficient = 0.35
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + 15000
icon_state = "atmos_firesuit"
item_state = "atmos_firesuit"
@@ -57,6 +60,7 @@
w_class = 5//Too large to fit in a backpack
item_flags = STOPPRESSUREDAMAGE|THICKMATERIAL|BLOCK_GAS_SMOKE_EFFECT
armor = list(melee = 30, bullet = 20, laser = 25,energy = 30, bomb = 100, bio = 60, rad = 60)
siemens_coefficient = 0.1
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
body_parts_covered = HEAD|FACE|EYES
siemens_coefficient = 0
@@ -78,6 +82,7 @@
permeability_coefficient = 0.01
slowdown = 8
armor = list(melee = 55, bullet = 55, laser = 55,energy = 60, bomb = 100, bio = 60, rad = 60)
siemens_coefficient = 0.1
item_flags = STOPPRESSUREDAMAGE|THICKMATERIAL
flags_inv = HIDEJUMPSUIT|HIDETAIL
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
@@ -173,6 +178,7 @@
flags_inv = BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
siemens_coefficient = 0.35
/obj/item/clothing/suit/radiation
@@ -187,6 +193,7 @@
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas)
slowdown = 1.5
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
siemens_coefficient = 0.35
flags_inv = HIDEJUMPSUIT|HIDETAIL

9
code/modules/clothing/suits/wiz_robe.dm
View File

@@ -7,7 +7,7 @@
slot_r_hand_str = "wizhat"
)
//Not given any special protective value since the magic robes are full-body protection --NEO
siemens_coefficient = 0.7
siemens_coefficient = 0.75
body_parts_covered = 0
wizard_garb = 1
@@ -15,7 +15,6 @@
name = "red wizard hat"
desc = "Strange-looking, red, hat-wear that most certainly belongs to a real magic user."
icon_state = "redwizard"
siemens_coefficient = 0.7
/obj/item/clothing/head/wizard/fake
name = "wizard hat"
@@ -28,7 +27,6 @@
name = "witch Hat"
desc = "Strange-looking hat-wear, makes you want to cast fireballs."
icon_state = "marisa"
siemens_coefficient = 0.7
/obj/item/clothing/head/wizard/magus
name = "magus Helm"
@@ -39,7 +37,6 @@
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet"
)
siemens_coefficient = 0.7
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/wizard/amp
@@ -70,7 +67,7 @@
armor = list(melee = 30, bullet = 20, laser = 20,energy = 20, bomb = 20, bio = 20, rad = 20)
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual)
flags_inv = HIDEJUMPSUIT
siemens_coefficient = 0.7
siemens_coefficient = 0.75
wizard_garb = 1
/obj/item/clothing/suit/wizrobe/red
@@ -117,7 +114,7 @@
armor = list(melee = 30, bullet = 20, laser = 20,energy = 20, bomb = 20, bio = 20, rad = 20)
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual)
flags_inv = HIDEJUMPSUIT
siemens_coefficient = 0.7
siemens_coefficient = 0.75
wizard_garb = 1
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS

4
code/modules/clothing/under/jobs/engineering.dm
View File

@@ -6,6 +6,7 @@
item_state = "g_suit"
worn_state = "chief"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -13,6 +14,7 @@
icon_state = "atmos"
item_state = "atmos_suit"
worn_state = "atmos"
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/engineer
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
@@ -21,6 +23,7 @@
item_state = "engi_suit"
worn_state = "engine"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/roboticist
desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
@@ -28,3 +31,4 @@
icon_state = "robotics"
item_state = "bl_suit"
worn_state = "robotics"
siemens_coefficient = 0.75

12
code/modules/clothing/under/jobs/security.dm
View File

@@ -15,7 +15,7 @@
icon_state = "officer_standard"
worn_state = "officer_standard"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/security/corp
icon_state = "officer_corporate"
@@ -31,7 +31,7 @@
icon_state = "cadet_standard"
worn_state = "cadet_standard"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/warden
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
@@ -39,7 +39,7 @@
icon_state = "warden_standard"
worn_state = "warden_standard"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/warden/corp
icon_state = "warden_corporate"
@@ -59,7 +59,7 @@
icon_state = "detective_standard"
worn_state = "detective_standard"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/under/det/black
name = "hard-worn suit"
@@ -85,7 +85,7 @@
icon_state = "hos_standard"
worn_state = "hos_standard"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/head_of_security/corp
icon_state = "hos_corporate"
@@ -119,4 +119,4 @@
/obj/item/clothing/under/rank/security/eridani/alt
icon_state = "erisec_alt"
worn_state = "erisec_alt"
worn_state = "erisec_alt"

2
code/modules/clothing/under/syndicate.dm
View File

@@ -6,7 +6,7 @@
worn_state = "syndicate"
has_sensor = 0
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
siemens_coefficient = 0.75
/obj/item/clothing/under/syndicate/combat
name = "combat turtleneck"