cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

massive burndown (#29894)

Browse Source
This commit is contained in:
Contrabang
2025-07-27 20:52:39 +00:00
committed by GitHub
parent a596fba80d
commit 1504ed98be
1043 changed files with 0 additions and 3598 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/chameleon.dm
-15
View File
@@ -237,7 +237,6 @@
item_state = "bl_suit"
item_color = "black"
desc = "It's a plain jumpsuit. It has a small dial on the wrist."
sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle??
random_sensor = FALSE
resistance_flags = NONE
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -330,7 +329,6 @@
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
icon_state = "meson"
item_state = "meson"
resistance_flags = NONE
prescription_upgradable = TRUE
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -367,12 +365,10 @@
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
flash_protect = FLASH_PROTECTION_SENSITIVE
prescription_upgradable = TRUE
/obj/item/clothing/glasses/chameleon/night
origin_tech = "magnets=3;syndicate=1"
see_in_dark = 8
prescription_upgradable = TRUE
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
/obj/item/clothing/glasses/hud/security/chameleon
@@ -462,7 +458,6 @@
icon_override = 'icons/mob/clothing/head/softcap.dmi'
icon_state = "greysoft"
item_color = "grey"
dyeable = FALSE
resistance_flags = NONE
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -505,7 +500,6 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
@@ -540,8 +534,6 @@
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/mask/chameleon/voice_change
name = "gas mask"
desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow."
icon_state = "swat"
item_state = "swat"
@@ -585,10 +577,6 @@
chameleon_action.emp_randomise()
/obj/item/clothing/shoes/chameleon/noslip
name = "black shoes"
icon_state = "black"
item_color = "black"
desc = "A pair of black shoes."
no_slip = TRUE
/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize(mapload)
@@ -596,7 +584,6 @@
chameleon_action.emp_randomise(INFINITY)
/obj/item/storage/backpack/chameleon
name = "backpack"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/back.dmi'
@@ -649,7 +636,6 @@
chameleon_action.emp_randomise(INFINITY)
/obj/item/radio/headset/chameleon
name = "radio headset"
var/datum/action/item_action/chameleon_change/chameleon_action
/obj/item/radio/headset/chameleon/Initialize(mapload)
@@ -717,7 +703,6 @@
/obj/item/clothing/neck/chameleon
name = "black tie"
desc = "A neosilk clip-on tie."
icon = 'icons/obj/clothing/neck.dmi'
icon_state = "blacktie"
resistance_flags = NONE
code/modules/clothing/clothing.dm
-11
View File
@@ -1,6 +1,5 @@
/obj/item/clothing
name = "clothing"
max_integrity = 200
integrity_failure = 80
resistance_flags = FLAMMABLE
/// Only these species can wear this kit.
@@ -176,7 +175,6 @@
w_class = WEIGHT_CLASS_HUGE
icon = 'icons/mob/screen_gen.dmi'
icon_state = "block"
slot_flags = ITEM_SLOT_BOTH_EARS
/obj/item/clothing/ears/offear/New(obj/O)
. = ..()
@@ -192,7 +190,6 @@
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
w_class = WEIGHT_CLASS_SMALL
flags_cover = GLASSESCOVERSEYES
slot_flags = ITEM_SLOT_EYES
materials = list(MAT_GLASS = 250)
@@ -245,7 +242,6 @@
name = "gloves"
///Carn: for grammarically correct text-parsing
gender = PLURAL
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/clothing/gloves.dmi'
siemens_coefficient = 0.50
body_parts_covered = HANDS
@@ -541,9 +537,7 @@
icon = 'icons/obj/clothing/masks.dmi'
body_parts_covered = HEAD
slot_flags = ITEM_SLOT_MASK
strip_delay = 4 SECONDS
put_on_delay = 4 SECONDS
dyeable = FALSE
var/adjusted_flags = null
@@ -627,7 +621,6 @@
dyeing_key = DYE_REGISTRY_SHOES
permeability_coefficient = 0.50
slowdown = SHOES_SLOWDOWN
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/shoes.dmi',
@@ -755,7 +748,6 @@
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
slot_flags = ITEM_SLOT_OUTER_SUIT
dyeable = FALSE
var/fire_resist = T0C + 100
var/blood_overlay_type = "suit"
@@ -959,16 +951,13 @@
name = "space helmet"
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
w_class = WEIGHT_CLASS_NORMAL
flags = BLOCKHAIR | STOPSPRESSUREDMAGE | THICKMATERIAL
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
item_state = "s_helmet"
permeability_coefficient = 0.01
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 50, FIRE = 200, ACID = 115)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
flash_protect = FLASH_PROTECTION_WELDER
strip_delay = 50
code/modules/clothing/glasses/glasses.dm
-6
View File
@@ -180,7 +180,6 @@
name = "night vision science goggles"
desc = "Now you can science in darkness."
icon_state = "nvpurple"
item_state = "glasses"
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these
@@ -292,7 +291,6 @@
)
/obj/item/clothing/glasses/regular/hipster
name = "prescription glasses"
desc = "Made by Uncool. Co."
icon_state = "hipster_glasses"
item_state = "hipster_glasses"
@@ -361,9 +359,6 @@
desc = "Cheap, plastic sunglasses. They don't even have UV protection."
icon_state = "sun"
item_state = "sunglasses"
see_in_dark = 0
flash_protect = FLASH_PROTECTION_NONE
tint = FLASH_PROTECTION_NONE
prescription_upgradable = TRUE
sprite_sheets = list(
@@ -471,7 +466,6 @@
desc = "Welding goggles made from more expensive materials, strangely smells like potatoes."
icon_state = "rwelding-g"
item_state = "rwelding-g"
flash_protect = FLASH_PROTECTION_WELDER
tint = FLASH_PROTECTION_NONE
/obj/item/clothing/glasses/sunglasses/blindfold
code/modules/clothing/glasses/hudglasses.dm
-3
View File
@@ -41,7 +41,6 @@
name = "health scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
icon_state = "healthhud"
origin_tech = "magnets=3;biotech=2"
hud_types = DATA_HUD_MEDICAL_ADVANCED
sprite_sheets = list(
@@ -140,7 +139,6 @@
see_in_dark = 1
flash_protect = FLASH_PROTECTION_FLASH
tint = FLASH_PROTECTION_FLASH
prescription_upgradable = TRUE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
@@ -195,7 +193,6 @@
see_in_dark = 1 // None of these three can be converted to booleans. Do not try it.
flash_protect = FLASH_PROTECTION_FLASH
tint = FLASH_PROTECTION_FLASH
prescription_upgradable = TRUE
sprite_sheets = list(
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
code/modules/clothing/gloves/colored_gloves.dm
-2
View File
@@ -10,7 +10,6 @@
permeability_coefficient = 0.05
item_color = "yellow"
resistance_flags = NONE
dyeable = TRUE
/obj/item/clothing/gloves/color/yellow/fake
siemens_coefficient = 1
@@ -214,4 +213,3 @@
icon_state = "furglovesico"
item_state = "furgloves"
transfer_prints = TRUE
dyeable = FALSE
code/modules/clothing/head/beanie.dm
-8
View File
@@ -17,42 +17,34 @@
/obj/item/clothing/head/beanie/black
name = "black beanie"
icon_state = "beanie"
color = "#4A4A4B" //Grey but it looks black
/obj/item/clothing/head/beanie/red
name = "red beanie"
icon_state = "beanie"
color = "#D91414" //Red
/obj/item/clothing/head/beanie/green
name = "green beanie"
icon_state = "beanie"
color = "#5C9E54" //Green
/obj/item/clothing/head/beanie/darkblue
name = "dark blue beanie"
icon_state = "beanie"
color = "#1E85BC" //Blue
/obj/item/clothing/head/beanie/purple
name = "purple beanie"
icon_state = "beanie"
color = "#9557C5" //purple
/obj/item/clothing/head/beanie/yellow
name = "yellow beanie"
icon_state = "beanie"
color = "#E0C14F" //Yellow
/obj/item/clothing/head/beanie/orange
name = "orange beanie"
icon_state = "beanie"
color = "#C67A4B" //orange
/obj/item/clothing/head/beanie/cyan
name = "cyan beanie"
icon_state = "beanie"
color = "#54A3CE" //Cyan (Or close to it)
//Striped Beanies have unique sprites
code/modules/clothing/head/helmet.dm
-35
View File
@@ -14,7 +14,6 @@
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/helmet
dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
"Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
@@ -69,7 +68,6 @@
/obj/item/clothing/head/helmet/material
name = "material visor helmet"
desc = "A helmet with a built-in material scanning visor."
icon_state = "helmetmaterials"
vision_flags = SEE_OBJS
/obj/item/clothing/head/helmet/night
@@ -135,10 +133,7 @@
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, RAD = 10, FIRE = 50, ACID = 50)
flags = BLOCKHAIR
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
strip_delay = 80
dog_fashion = null
@@ -157,9 +152,7 @@
item_state = "thunderdome"
armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = 450, ACID = 450)
flags_2 = RAD_PROTECT_CONTENTS_2
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
strip_delay = 80
dog_fashion = null
@@ -212,7 +205,6 @@
item_state = "redtaghelm"
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 0, ACID = 50)
// Offer about the same protection as a hardhat.
flags_inv = HIDEEARS|HIDEEYES
dog_fashion = null
/obj/item/clothing/head/helmet/bluetaghelm
@@ -223,7 +215,6 @@
item_state = "bluetaghelm"
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 0, ACID = 50)
// Offer about the same protection as a hardhat.
flags_inv = HIDEEARS|HIDEEYES
dog_fashion = null
/obj/item/clothing/head/blob
@@ -261,7 +252,6 @@
name = "skull helmet"
desc = "An intimidating tribal helmet, it looks sick as hell."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
armor = list(MELEE = 25, BULLET = 15, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
icon_state = "skull"
item_state = "skull"
@@ -275,9 +265,7 @@
desc = "A helmet made from durathread and leather."
icon_state = "durathread"
item_state = "durathread"
resistance_flags = FLAMMABLE
armor = list(MELEE = 10, BULLET = 5, LASER = 20, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 35, ACID = 50)
strip_delay = 60
/obj/item/clothing/head/helmet/street_judge
name = "judge's helmet"
@@ -354,10 +342,7 @@
)
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
@@ -368,8 +353,6 @@
/obj/item/clothing/head/helmet/federation/marine/export
name = "\improper Federation marine combat helmet (E)"
desc = "An export-grade combat helmet commonly given or sold to allies of the Trans-Solar Federation. The OCULUS system has been removed, and its protection is generally inferior to its in-service counterpart."
icon_state = "fedhelmet_marine"
item_state = "fedhelmet_marine"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
@@ -380,17 +363,10 @@
"Unathi" = 'icons/mob/clothing/species/unathi/head.dmi'
)
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
see_in_dark = 0
lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
flash_protect = FLASH_PROTECTION_NONE
armor = list(MELEE = 30, BULLET = 35, LASER = 35, ENERGY = 30, BOMB = 50, RAD = 0, FIRE = 100, ACID = 50)
strip_delay = 130
/obj/item/clothing/head/helmet/federation/marine/officer
name = "\improper Federation marine officer's combat helmet"
@@ -406,16 +382,5 @@
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/head.dmi'
)
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
see_in_dark = 8
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
flash_protect = FLASH_PROTECTION_WELDER
armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 100, RAD = 25, FIRE = INFINITY, ACID = 100)
strip_delay = 130
code/modules/clothing/head/job_hats.dm
-2
View File
@@ -206,9 +206,7 @@
dog_fashion = /datum/dog_fashion/head/surgery
/obj/item/clothing/head/surgery/blue
name = "blue surgical cap"
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue."
icon_state = "surgcap_blue"
dog_fashion = /datum/dog_fashion/head/surgery
/obj/item/clothing/head/surgery/green
code/modules/clothing/head/misc_hats.dm
-5
View File
@@ -450,9 +450,7 @@
item_state = "cone"
force = 1.0
throwforce = 3.0
throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("warned", "cautioned", "smashed")
resistance_flags = NONE
dog_fashion = /datum/dog_fashion/head/cone
@@ -521,11 +519,8 @@
)
/obj/item/clothing/head/papersack/smiley
name = "paper sack hat"
desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all."
icon_state = "papersack_smile"
flags = BLOCKHAIR
flags_inv = HIDEFACE|HIDEEARS
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
code/modules/clothing/head/misc_special.dm
-1
View File
@@ -169,7 +169,6 @@
icon_state = "hardhat0_reindeer"
item_state = "hardhat0_reindeer"
item_color = "reindeer"
flags_inv = 0
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
brightness_on = 1 //luminosity when on
dog_fashion = /datum/dog_fashion/head/reindeer
code/modules/clothing/head/soft_caps.dm
-11
View File
@@ -40,28 +40,24 @@
desc = "It's a baseball hat in a tasteless red colour."
icon_state = "redsoft"
item_color = "red"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/blue
name = "blue cap"
desc = "It's a baseball hat in a tasteless blue colour."
icon_state = "bluesoft"
item_color = "blue"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/green
name = "green cap"
desc = "It's a baseball hat in a tasteless green colour."
icon_state = "greensoft"
item_color = "green"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/yellow
name = "yellow cap"
desc = "It's a baseball hat in a tasteless yellow colour."
icon_state = "yellowsoft"
item_color = "yellow"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/orange
name = "orange cap"
@@ -74,28 +70,24 @@
desc = "It's a baseball hat in a tasteless white colour."
icon_state = "whitesoft"
item_color = "white"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/purple
name = "purple cap"
desc = "It's a baseball hat in a tasteless purple colour."
icon_state = "purplesoft"
item_color = "purple"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/black
name = "black cap"
desc = "It's a baseball hat in a tasteless black colour."
icon_state = "blacksoft"
item_color = "black"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/rainbow
name = "rainbow cap"
desc = "It's a baseball hat in a bright rainbow of colors."
icon_state = "rainbowsoft"
item_color = "rainbow"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/cargo
name = "cargo cap"
@@ -130,14 +122,12 @@
desc = "It's a grey baseball hat with a purple custodial shield."
icon_state = "janitorgreysoft"
item_color = "janitorgrey"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/janitorpurple
name = "purple janitor's cap"
desc = "It's a purple baseball hat with a mint service shield."
icon_state = "janitorpurplesoft"
item_color = "janitorpurple"
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/paramedic
name = "\improper EMT cap"
@@ -153,7 +143,6 @@
item_color = "sec"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/sec/corp
name = "corporate security cap"
code/modules/clothing/masks/boxing.dm
-2
View File
@@ -5,7 +5,6 @@
item_state = "balaclava"
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = WEIGHT_CLASS_SMALL
can_toggle = TRUE
actions_types = list(/datum/action/item_action/adjust)
adjusted_flags = ITEM_SLOT_HEAD
@@ -29,7 +28,6 @@
item_state = "luchag"
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = WEIGHT_CLASS_SMALL
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
code/modules/clothing/masks/breath.dm
-1
View File
@@ -6,7 +6,6 @@
flags = AIRTIGHT
flags_cover = MASKCOVERSMOUTH
can_toggle = TRUE
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
actions_types = list(/datum/action/item_action/adjust)
code/modules/clothing/masks/misc_masks.dm
-9
View File
@@ -4,7 +4,6 @@
icon_state = "muzzle"
item_state = "muzzle"
flags_cover = MASKCOVERSMOUTH
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
put_on_delay = 2 SECONDS
/// How long you need to gnaw to get rid of the gag, 0 to make it impossible to remove
@@ -91,10 +90,8 @@
desc = "A muzzle designed to prevent biting."
icon_state = "muzzle_secure"
item_state = "muzzle_secure"
resist_time = 0 SECONDS
mute = MUZZLE_MUTE_NONE
security_lock = TRUE
locked = FALSE
materials = list(MAT_METAL=500, MAT_GLASS=50)
sprite_sheets = list(
@@ -235,7 +232,6 @@
item_state = "pig"
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/horsehead
@@ -245,7 +241,6 @@
item_state = "horsehead"
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = WEIGHT_CLASS_SMALL
var/voicechange = FALSE
var/temporaryname = " the Horse"
var/originalname = ""
@@ -343,7 +338,6 @@
icon_state = "fawkes"
item_state = "fawkes"
flags_inv = HIDEFACE
w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/gas/clown_hat/pennywise
name = "\improper Pennywise mask"
@@ -351,7 +345,6 @@
icon_state = "pennywise_mask"
item_state = "pennywise_mask"
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
// Bandanas
/obj/item/clothing/mask/bandana
@@ -360,7 +353,6 @@
flags_inv = HIDEFACE
flags_cover = MASKCOVERSMOUTH
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_MASK
adjusted_flags = ITEM_SLOT_HEAD
icon_state = "bandbotany"
dyeable = TRUE
@@ -483,7 +475,6 @@
/obj/item/clothing/mask/bandana/botany
name = "botany bandana"
desc = "It's a green bandana with some fine nanotech lining."
icon_state = "bandbotany"
/obj/item/clothing/mask/bandana/skull
name = "skull bandana"
code/modules/clothing/neck/cloaks.dm
-1
View File
@@ -4,7 +4,6 @@
name = "grey cloak"
desc = "It's a cloak that can be worn around your neck in a pretty dull color."
icon_state = "cloak"
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = UPPER_TORSO | ARMS
/obj/item/clothing/neck/cloak/head_of_security
code/modules/clothing/neck/neck.dm
-1
View File
@@ -1,7 +1,6 @@
/obj/item/clothing/neck/tie
name = "tie"
desc = "A neosilk clip-on tie."
w_class = WEIGHT_CLASS_SMALL
var/under_suit = FALSE
/obj/item/clothing/neck/tie/blue
code/modules/clothing/neck/necklace.dm
-2
View File
@@ -1,10 +1,8 @@
/obj/item/clothing/neck/necklace
name = "necklace"
desc = "A simple necklace."
icon_state = "necklace"
item_state = "necklace"
item_color = "necklace"
w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/neck/necklace/long
name = "large necklace"
code/modules/clothing/neck/scarfs.dm
-1
View File
@@ -1,7 +1,6 @@
/obj/item/clothing/neck/scarf
name = "scarf"
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
w_class = WEIGHT_CLASS_SMALL
dog_fashion = /datum/dog_fashion/head
/obj/item/clothing/neck/scarf/red
code/modules/clothing/shoes/colour.dm
-1
View File
@@ -8,7 +8,6 @@
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
heat_protection = FEET
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
dyeable = TRUE
/obj/item/clothing/shoes/black/greytide
flags = NODROP
code/modules/clothing/shoes/magboots.dm
-1
View File
@@ -8,7 +8,6 @@
strip_delay = 7 SECONDS
put_on_delay = 7 SECONDS
resistance_flags = FIRE_PROOF
no_slip = FALSE
var/magboot_state = "magboots"
var/magpulse = FALSE
var/slowdown_active = 2
code/modules/clothing/shoes/misc_shoes.dm
-11
View File
@@ -2,7 +2,6 @@
name = "mime shoes"
icon_state = "mime"
item_color = "mime"
dyeable = TRUE
/// basic syndicate combat boots for nuke ops and mob corpses
/obj/item/clothing/shoes/combat
@@ -40,13 +39,11 @@
desc = "A pair of magic, black shoes."
icon_state = "black"
resistance_flags = FIRE_PROOF | ACID_PROOF
dyeable = FALSE
/obj/item/clothing/shoes/sandal/magic
name = "magical sandals"
desc = "A pair of sandals imbued with magic."
resistance_flags = FIRE_PROOF | ACID_PROOF
dyeable = FALSE
/obj/item/clothing/shoes/galoshes
name = "galoshes"
@@ -93,7 +90,6 @@
// "Dyeable" in this case is a bit of an understatement, washing these
// with a crayon will give them the appearance and name of normal
// shoes, but the functionality of clown shoes.
dyeable = TRUE
var/enabled_waddle = TRUE
@@ -208,12 +204,10 @@
can_cut_open = 0
icon_state = "jacksandal"
item_color = "jacksandal"
dyeable = FALSE
/obj/item/clothing/shoes/jackboots/noisy
name = "heavy jackboots"
desc = "Outdated heavier versions of the standard Nanotrasen-issue Security combat boots. Pick up that can."
dyeable = FALSE
/obj/item/clothing/shoes/jackboots/noisy/Initialize(mapload)
. = ..()
@@ -236,7 +230,6 @@
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
knife_slot = TRUE
dyeable = FALSE
/obj/item/clothing/shoes/workboots/smithing
name = "smithing boots"
@@ -247,7 +240,6 @@
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
dyeable = FALSE
/obj/item/clothing/shoes/winterboots
name = "winter boots"
@@ -448,8 +440,6 @@
desc = "A roll of treated canvas used for wrapping claws or paws."
icon_state = "clothwrap"
item_state = "clothwrap"
force = 0
w_class = WEIGHT_CLASS_SMALL
dyeable = FALSE
/obj/item/clothing/shoes/bhop
@@ -461,7 +451,6 @@
resistance_flags = FIRE_PROOF
actions_types = list(/datum/action/item_action/bhop)
permeability_coefficient = 0.05
can_cut_open = FALSE
knife_slot = TRUE
dyeable = FALSE
code/modules/clothing/spacesuits/alien_suits.dm
-5
View File
@@ -79,9 +79,6 @@
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs, /obj/item/tank/internals)
armor = list(MELEE = 35, BULLET = 35, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
dyeable = FALSE
icon = 'icons/obj/clothing/species/vox/suits.dmi'
icon_state = null
species_restricted = list("Vox")
@@ -195,8 +192,6 @@
desc = "These bizarre gauntlets seem to be fitted for... bird claws?"
icon_state = "gloves-vox"
item_state = "gloves-vox"
siemens_coefficient = 0
permeability_coefficient = 0.05
item_color = "gloves-vox"
icon = 'icons/obj/clothing/species/vox/gloves.dmi'
species_restricted = list("Vox")
code/modules/clothing/spacesuits/chronosuit.dm
-4
View File
@@ -26,7 +26,6 @@
actions_types = list(/datum/action/item_action/toggle)
armor = list(MELEE = 75, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 30, RAD = 90, FIRE = INFINITY, ACID = INFINITY)
resistance_flags = FIRE_PROOF | ACID_PROOF
dyeable = FALSE
var/obj/item/clothing/head/helmet/space/chronos/helmet = null
var/obj/effect/chronos_cam/camera = null
@@ -181,10 +180,7 @@
/obj/effect/chronos_cam
name = "chronosuit view"
density = FALSE
anchored = TRUE
invisibility = 101
opacity = FALSE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/mob/holder = null
code/modules/clothing/spacesuits/ert_hardsuits.dm
-9
View File
@@ -78,15 +78,10 @@
/obj/item/clothing/head/helmet/space/hardsuit/ert/commander
name = "emergency response team commander helmet"
desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has blue Command stripes."
icon_state = "hardsuit0-ert_commander"
item_state = "helm-command"
item_color = "ert_commander"
/obj/item/clothing/suit/space/hardsuit/ert/commander
name = "emergency response team commander suit"
desc = "A powered combat hardsuit produced by Citadel Armories. Decently armored, environmentally sealed, and fire-resistant. This one is covered in blue Command livery."
icon_state = "ert_commander"
item_state = "suit-command"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/commander
//Security
@@ -141,7 +136,6 @@
armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = INFINITY, FIRE = 200, ACID = 200)
flags_2 = RAD_PROTECT_CONTENTS_2
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma
slowdown = 0
//Medical
/obj/item/clothing/head/helmet/space/hardsuit/ert/medical
@@ -181,7 +175,6 @@
icon_state = "hardsuit0-ert_paranormal"
item_color = "ert_paranormal"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
@@ -196,7 +189,6 @@
icon_state = "hardsuit-paranormal"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
resistance_flags = FIRE_PROOF
sprite_sheets = list(
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
@@ -227,7 +219,6 @@
icon_state = "ert_solgov_marine"
item_state = "ert_solgov_marine"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
slowdown = 0
armor = list(MELEE = 25, BULLET = 75, LASER = 10, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command
code/modules/clothing/spacesuits/hardsuit.dm
-4
View File
@@ -1,7 +1,6 @@
//Baseline hardsuits
/obj/item/clothing/head/helmet/space/hardsuit
name = "hardsuit helmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
icon_state = null
item_state = "eng_helm"
max_integrity = 300
@@ -145,7 +144,6 @@
allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
siemens_coefficient = 0
actions_types = list(/datum/action/item_action/toggle_helmet)
dyeable = FALSE
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
sprite_sheets = list(
@@ -354,7 +352,6 @@
icon_state = "hardsuit0-syndielite"
item_color = "syndielite"
armor = list(MELEE = 75, BULLET = 75, LASER = 50, ENERGY = 15, BOMB = 60, RAD = 115, FIRE = INFINITY, ACID = INFINITY)
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -365,7 +362,6 @@
item_color = "syndielite"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
armor = list(MELEE = 75, BULLET = 75, LASER = 50, ENERGY = 15, BOMB = 60, RAD = 115, FIRE = INFINITY, ACID = INFINITY)
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
code/modules/clothing/spacesuits/misc_spacesuits.dm
-7
View File
@@ -5,7 +5,6 @@
item_state = "capspacehelmet"
desc = "A special helmet designed for only the most fashionable of military figureheads."
flags_inv = HIDEFACE
permeability_coefficient = 0.01
armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 15, BOMB = 50, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
sprite_sheets = list(
@@ -27,7 +26,6 @@
desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!"
icon_state = "caparmor"
item_state = "capspacesuit"
w_class = WEIGHT_CLASS_BULKY
allowed = list(/obj/item/tank/internals, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/restraints/handcuffs)
armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 15, BOMB = 50, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
@@ -64,7 +62,6 @@
flags_2 = RAD_PROTECT_CONTENTS_2
strip_delay = 130
dog_fashion = /datum/dog_fashion/back/deathsquad
dyeable = FALSE
/obj/item/clothing/suit/space/deathsquad/Initialize(mapload)
. = ..()
@@ -99,8 +96,6 @@
flags_inv = 0
slowdown = 0
armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_2 = RAD_PROTECT_CONTENTS_2
w_class = WEIGHT_CLASS_NORMAL
/obj/item/clothing/suit/space/deathsquad/officer/solgov
@@ -210,7 +205,6 @@
/obj/item/clothing/suit/space/eva
name = "EVA suit"
icon_state = "spacenew"
item_state = "s_suit"
desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies."
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 50, ACID = 95)
@@ -230,7 +224,6 @@
/obj/item/clothing/head/helmet/space/eva
name = "EVA helmet"
icon_state = "spacenew"
item_state = "s_helmet"
desc = "A lightweight space helmet with the basic ability to protect the wearer from the vacuum of space during emergencies."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 50, ACID = 95)
code/modules/clothing/spacesuits/plasmamen.dm
-5
View File
@@ -6,7 +6,6 @@
item_state = "plasmaman-helm"
base_icon_state = "plasmaman-helm"
strip_delay = 80
flash_protect = FLASH_PROTECTION_WELDER
tint = FLASH_PROTECTION_WELDER
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = 150)
resistance_flags = FIRE_PROOF
@@ -21,8 +20,6 @@
dyeing_key = DYE_REGISTRY_PLASMAMEN_HELMET
actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen/plasmaman)
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
visor_flags_inv = HIDEEYES|HIDEFACE
icon = 'icons/obj/clothing/species/plasmaman/hats.dmi'
species_restricted = list("Plasmaman")
@@ -106,7 +103,6 @@
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 150)
/obj/item/clothing/head/helmet/space/plasmaman/security/hos
name = "security plasma envirosuit helmet"
desc = "A plasmaman containment helmet designed for the head of security."
icon_state = "hos_envirohelm"
item_state = "hos_envirohelm"
@@ -281,7 +277,6 @@
icon_state = "wizard_envirohelm"
item_state = "wizard_envirohelm"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, RAD = 10, FIRE = INFINITY, ACID = INFINITY)
resistance_flags = FIRE_PROOF | ACID_PROOF
magical = TRUE
code/modules/clothing/spacesuits/syndi.dm
-13
View File
@@ -109,7 +109,6 @@
//Black-green syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/green
name = "black space helmet"
icon_state = "syndicate-helm-black-green"
item_state = "syndicate-helm-black-green"
@@ -121,7 +120,6 @@
//Black-blue syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/blue
name = "black space helmet"
icon_state = "syndicate-helm-black-blue"
item_state = "syndicate-helm-black-blue"
@@ -133,31 +131,24 @@
//Black medical syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/med
name = "black space helmet"
icon_state = "syndicate-helm-black-med"
item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/med
name = "green space suit"
icon_state = "syndicate-black-med"
item_state = "syndicate-black"
//Black-orange syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/orange
name = "black space helmet"
icon_state = "syndicate-helm-black-orange"
item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/orange
name = "black and orange space suit"
icon_state = "syndicate-black-orange"
item_state = "syndicate-black"
//Black-red syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/red
name = "black space helmet"
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
@@ -185,14 +176,11 @@
//Black with yellow/red engineering syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/engie
name = "black space helmet"
icon_state = "syndicate-helm-black-engie"
item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/engie
name = "black engineering space suit"
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"
/obj/item/clothing/head/helmet/space/syndicate/contractor
name = "contractor helmet"
@@ -204,7 +192,6 @@
/obj/item/clothing/suit/space/syndicate/contractor
name = "contractor space suit"
desc = "A specialised black and gold space suit that's easier to move around in than its standard Syndicate counterpart. It is made of an exotic military-grade fabric for added protection, and can be ultra-compressed into even the tightest of spaces."
slowdown = 1
w_class = WEIGHT_CLASS_SMALL
icon_state = "syndicate-contractor"
item_state = "syndicate-contractor"
code/modules/clothing/suits/armor_suits.dm
-20
View File
@@ -39,7 +39,6 @@
desc = "A soft armor vest suitable for stopping minor impacts."
icon_state = "armor-combat"
item_state = "bulletproof"
blood_overlay_type = "armor"
/obj/item/clothing/suit/armor/vest/security
name = "security armor"
@@ -48,8 +47,6 @@
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
icon_state = "armor"
item_state = "armor"
var/obj/item/clothing/accessory/holobadge/attached_badge
/obj/item/clothing/suit/armor/vest/security/attackby__legacy__attackchain(obj/item/I, mob/user, params)
@@ -114,7 +111,6 @@
name = "press vest"
desc = "A sturdy vest that should keep you protected from the dangers of the station."
icon_state = "press_vest"
item_state = "armor"
/obj/item/clothing/suit/armor/secjacket
name = "security jacket"
@@ -192,7 +188,6 @@
name = "warden's armored jacket"
desc = "A comfortable armored jacket fitted with Level II plate inserts for moderate protection. This one has silver livery on the shoulders to denote rank."
icon_state = "warden_jacket"
item_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|HANDS
heat_protection = UPPER_TORSO|LOWER_TORSO|HANDS
@@ -215,8 +210,6 @@
name = "captain's carapace"
desc = "A fancy blue & gold dragonscale armor vest fitted with Level III and IV armor panelling. Offers excellent protection against melee attacks, kinetic impacts, and laser discharges. "
icon_state = "captain_carapace"
item_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
armor = list(MELEE = 50, BULLET = 35, LASER = 50, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 450)
dog_fashion = null
resistance_flags = FIRE_PROOF
@@ -282,7 +275,6 @@
name = "security riot suit"
desc = "A full-body suit of riot gear that provides excellent protection against blunt force trauma, fire, and corrosive substances, but little protection otherwise. This suit is covered in red Security stripes."
icon_state = "riot-sec"
item_state = "swat_suit"
/obj/item/clothing/suit/armor/riot/knight
name = "plate armour"
@@ -318,7 +310,6 @@
desc = "A comfortable and low-profile vest made of durathread, reinforced with panels of tanned leather. Offers decent protection against laser discharges, but won't be stopping a bullet any time soon."
icon_state = "durathread"
item_state = "durathread"
strip_delay = 60
max_integrity = 200
resistance_flags = FLAMMABLE
armor = list(MELEE = 10, BULLET = 5, LASER = 20, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 35, ACID = 50)
@@ -345,8 +336,6 @@
name = "security bulletproof armor"
desc = "A full-body suit of armor fitted with Level IV ballistic inserts and panelling. Will stop most low-caliber kinetic rounds and resist the concussive force of explosions somewhat, but it does little against melee and energy attacks. This suit is covered in red Security stripes."
icon_state = "bulletproof-sec"
item_state = "armor"
blood_overlay_type = "armor"
/obj/item/clothing/suit/armor/swat
name = "SWAT armor"
@@ -393,8 +382,6 @@
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
icon_state = "detective-armor"
item_state = "armor"
blood_overlay_type = "armor"
allowed = list(/obj/item/tank/internals/emergency_oxygen,/obj/item/reagent_containers/spray/pepper,/obj/item/flashlight,/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/lighter,/obj/item/detective_scanner,/obj/item/taperecorder)
resistance_flags = FLAMMABLE
dog_fashion = null
@@ -770,15 +757,12 @@
w_class = WEIGHT_CLASS_BULKY
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
/obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
/obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
flags = THICKMATERIAL | STOPSPRESSUREDMAGE
slowdown = 0
strip_delay = 12 SECONDS
/obj/item/clothing/suit/armor/federation/marine/officer
@@ -796,8 +780,6 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
)
icon_state = "fedarmor_marine"
item_state = "fedarmor_marine"
armor = list(MELEE = 30, BULLET = 35, LASER = 35, ENERGY = 30, BOMB = 50, RAD = 0, FIRE = 100, ACID = 50)
@@ -806,7 +788,6 @@
name = "emergency response team armor"
desc = "A mid-quality protective vest produced by Citadel Armories. Additional polymer paneling over the chest and shoulders offers moderately improved energy protection compared to standard kevlar vests."
icon_state = "ertarmor_cmd"
item_state = "armor"
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 0, FIRE = 50, ACID = 50)
//Commander
@@ -903,7 +884,6 @@
armor = list(MELEE = 25, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 75, ACID = 75)
flags = BLOCKHAIR
flags_cover = HEADCOVERSEYES
body_parts_covered = HEAD
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
code/modules/clothing/suits/hood.dm
-1
View File
@@ -102,7 +102,6 @@
name = "screened niqab"
desc = "A niqab with an eye mesh for additional concealment. The wearer can see you, but you can't see them."
icon_state = "abaya_hood"
body_parts_covered = HEAD
cold_protection = HEAD
flags = BLOCKHAIR
flags_inv = HIDEEARS | HIDEMASK | HIDEFACE | HIDEEYES
code/modules/clothing/suits/job_suits.dm
-2
View File
@@ -136,7 +136,6 @@
/obj/item/clothing/suit/storage/det_suit/forensics
name = "jacket"
desc = "A forensics technician jacket."
item_state = "det_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -372,7 +371,6 @@
icon_state = "trainercoat"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
ignore_suitadjust = TRUE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
code/modules/clothing/suits/misc_suits.dm
-16
View File
@@ -291,7 +291,6 @@
name = "carp hood"
desc = "A hood attached to a carp costume."
icon_state = "carp_casual"
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
flags = BLOCKHAIR
@@ -349,7 +348,6 @@
name = "salmon hood"
desc = "A hood attached to a salmon suit."
icon_state = "salmon"
body_parts_covered = HEAD
flags = BLOCKHAIR
flags_inv = HIDEEARS
@@ -369,7 +367,6 @@
name = "bee hood"
desc = "A hood attached to a bee costume."
icon_state = "bee"
body_parts_covered = HEAD
flags = THICKMATERIAL|BLOCKHAIR
flags_inv = HIDEEARS
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi')
@@ -414,7 +411,6 @@
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."
icon_state = "winterhood"
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags = BLOCKHAIR
@@ -701,7 +697,6 @@
name = "black hood"
desc = "A hood attached to a hoodie."
icon_state = "blackhood"
body_parts_covered = HEAD
cold_protection = HEAD
flags = BLOCKHAIR
flags_inv = HIDEEARS
@@ -725,7 +720,6 @@
name = "Martian Institute of Technology hoodie"
desc = "A hoodie proudly worn by students and graduates alike, has the letters 'MIT' on the back."
icon_state = "mit_hoodie"
hoodtype = /obj/item/clothing/head/hooded/hood
/obj/item/clothing/suit/hooded/hoodie/cut
name = "Canaan University of Technology hoodie"
@@ -749,7 +743,6 @@
name = "Tharsis Polytech hoodie"
desc = "A dark hoodie with the Tharsis Polytech logo on the back."
icon_state = "tp_hoodie"
hoodtype = /obj/item/clothing/head/hooded/hood
/obj/item/clothing/suit/straight_jacket
name = "straight jacket"
@@ -915,7 +908,6 @@
icon_state = "secgreatcoat"
item_state = "secgreatcoat"
w_class = WEIGHT_CLASS_NORMAL
ignore_suitadjust = TRUE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -1005,10 +997,8 @@
desc = "A vintage classic, loved by rockers, rebels, and punks alike."
icon_state = "motojacket_open"
item_state = "motojacket_open"
ignore_suitadjust = FALSE
suit_adjusted = TRUE
actions_types = list(/datum/action/item_action/zipper)
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -1034,13 +1024,8 @@
icon_state = "bomber"
item_state = "bomber"
icon_override = 'icons/mob/clothing/suits/coat.dmi'
ignore_suitadjust = FALSE
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
actions_types = list(/datum/action/item_action/zipper)
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suits/coat.dmi',
@@ -1382,7 +1367,6 @@
desc = "The hands float by themselves, so it's extra spooky."
icon_state = "ghost_sheet"
item_state = "ghost_sheet"
throwforce = 0
throw_speed = 1
throw_range = 2
w_class = WEIGHT_CLASS_TINY
code/modules/clothing/suits/utility.dm
-1
View File
@@ -98,7 +98,6 @@
strip_delay = 70
put_on_delay = 70
resistance_flags = NONE
dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
code/modules/clothing/suits/wiz_robe.dm
-19
View File
@@ -44,7 +44,6 @@
)
/obj/item/clothing/head/wizard/fake
name = "wizard hat"
desc = "It has WIZZARD written across it in sequins. Comes with a cool beard."
icon_state = "wizard-fake"
gas_transfer_coefficient = 1
@@ -52,7 +51,6 @@
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
magical = FALSE
resistance_flags = FLAMMABLE
dog_fashion = /datum/dog_fashion/head/blue_wizard
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
@@ -151,10 +149,8 @@
item_state = "psyamp"
/obj/item/clothing/suit/wizrobe/fake
name = "wizard robe"
desc = "A rather dull, blue robe meant to mimick real wizard robes."
icon_state = "wizard-fake"
item_state = "wizrobe"
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
@@ -162,9 +158,6 @@
magical = FALSE
/obj/item/clothing/head/wizard/marisa/fake
name = "witch hat"
desc = "Strange-looking hat-wear, makes you want to cast fireballs."
icon_state = "marisa"
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
@@ -172,10 +165,6 @@
magical = FALSE
/obj/item/clothing/suit/wizrobe/marisa/fake
name = "witch robe"
desc = "Magic is all about the spell power, ZE!"
icon_state = "marisa"
item_state = "marisarobe"
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
@@ -189,8 +178,6 @@
desc = "Not all wizards are afraid of getting up close and personal."
icon_state = "hardsuit-wiz"
item_state = "wiz_hardsuit"
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
slowdown = 0
@@ -213,8 +200,6 @@
/obj/item/clothing/suit/space/hardsuit/wizard/arch
desc = "For the arch wizard in need of additional protection."
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard/arch
/obj/item/clothing/suit/space/hardsuit/wizard/arch/setup_shielding()
@@ -226,8 +211,6 @@
icon_state = "hardsuit0-wiz"
item_state = "wiz_helm"
item_color = "wiz"
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
actions_types = list() //No inbuilt light
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -238,5 +221,3 @@
/obj/item/clothing/head/helmet/space/hardsuit/wizard/arch
desc = "A truly protective helmet."
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
code/modules/clothing/under/accessories/accessory.dm
-1
View File
@@ -6,7 +6,6 @@
item_state = ""
item_color = ""
slot_flags = ITEM_SLOT_ACCESSORY
w_class = WEIGHT_CLASS_SMALL
var/slot = ACCESSORY_SLOT_DECOR
/// the suit the accessory may be attached to
var/obj/item/clothing/under/has_suit = null
code/modules/clothing/under/accessories/holster.dm
-5
View File
@@ -110,14 +110,9 @@
unholster(user)
/obj/item/clothing/accessory/holster/armpit
name = "shoulder holster"
desc = "A worn-out handgun holster. Perfect for concealed carry"
icon_state = "holster"
item_color = "holster"
holster_allow = list(/obj/item/gun/projectile, /obj/item/gun/energy/detective)
/obj/item/clothing/accessory/holster/waist
name = "shoulder holster"
desc = "A handgun holster. Made of expensive leather."
icon_state = "holster"
item_color = "holster_low"
code/modules/clothing/under/accessories/storage_accessories.dm
-2
View File
@@ -76,8 +76,6 @@
/obj/item/clothing/accessory/storage/webbing
name = "webbing"
desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden."
icon_state = "webbing"
item_color = "webbing"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
code/modules/clothing/under/centcom.dm
-2
View File
@@ -24,7 +24,6 @@
icon_state = "deathsquad"
item_state = "deathsquad"
item_color = "deathsquad"
sensor_mode = SENSOR_OFF // You think the Deathsquad wants to be seen?
random_sensor = FALSE
/obj/item/clothing/under/rank/centcom/ert/chaplain
@@ -108,6 +107,5 @@
name = "\improper Nanotrasen diplomatic uniform"
desc = "A very gaudy and official looking uniform of the Nanotrasen Diplomatic Corps."
icon_state = "presidente"
item_state = "g_suit"
item_color = "presidente"
displays_id = FALSE
code/modules/clothing/under/color.dm
-5
View File
@@ -93,7 +93,6 @@
name = "ancient jumpsuit"
desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."
icon_state = "ancient"
item_state = "gy_suit"
item_color = "ancient"
/obj/item/clothing/under/color/orange
@@ -111,7 +110,6 @@
item_color = "orangeskirt"
/obj/item/clothing/under/color/orange/prison
name = "orange jumpsuit"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisoner"
item_state = "prisoner"
@@ -120,7 +118,6 @@
sensor_mode = SENSOR_COORDS
/obj/item/clothing/under/color/jumpskirt/orange/prison
name = "orange jumpskirt"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisonerjumpskirt"
item_state = "prisoner"
@@ -322,12 +319,10 @@
name = "red team jersey"
desc = "The jersey of the Nanotrasen Phi-ghters!"
icon_state = "redjersey"
item_state = "r_suit"
item_color = "redjersey"
/obj/item/clothing/under/color/blue/jersey
name = "blue team jersey"
desc = "The jersey of the Nanotrasen Pi-rates!"
icon_state = "bluejersey"
item_state = "b_suit"
item_color = "bluejersey"
code/modules/clothing/under/jobs/civilian.dm
-2
View File
@@ -94,7 +94,6 @@
/obj/item/clothing/under/rank/civilian/clown/skirt
name = "clown skirt"
desc = "<i>'HONK!'</i>"
icon_state = "clown_skirt"
item_state = "clown_skirt"
item_color = "clown_skirt"
@@ -118,7 +117,6 @@
/obj/item/clothing/under/rank/civilian/mime/skirt
name = "mime's skirt"
desc = "It's not very colourful."
icon_state = "mime_skirt"
item_state = "mime_skirt"
item_color = "mime_skirt"
code/modules/clothing/under/jobs/engineering_jumpsuits.dm
-1
View File
@@ -36,7 +36,6 @@
resistance_flags = NONE
/obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist
name = "atmospheric technician's jumpsuit"
desc = "A light jumpsuit useful for squeezing through narrow vents."
resistance_flags = FIRE_PROOF
code/modules/clothing/under/jobs/medical_jumpsuits.dm
-1
View File
@@ -138,7 +138,6 @@
/obj/item/clothing/under/rank/medical/paramedic/skirt
name = "paramedic's jumpskirt"
desc = "It's made of a special fiber that provides minor protection against biohazards and radiation. It has a cross on the back denoting that the wearer is trained medical personnel."
icon_state = "paramedic_skirt"
item_state = "paramedic_skirt"
item_color = "paramedic_skirt"
code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm
-1
View File
@@ -21,7 +21,6 @@
item_color = "atmos_envirosuit"
/obj/item/clothing/under/plasmaman/atmospherics/contortionist
name = "atmospherics plasma envirosuit"
desc = "An airtight suit designed to be used by plasmemen for squeezing through narrow vents."
resistance_flags = FIRE_PROOF
code/modules/clothing/under/jobs/security_jumpsuits.dm
-6
View File
@@ -21,7 +21,6 @@
name = "warden's jumpskirt"
desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders."
icon_state = "warden_skirt"
item_state = "r_suit"
item_color = "warden_skirt"
/obj/item/clothing/under/rank/security/warden/skirt/corporate
@@ -44,7 +43,6 @@
name = "security officer's jumpskirt"
desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
icon_state = "security_skirt"
item_state = "r_suit"
item_color = "security_skirt"
/obj/item/clothing/under/rank/security/officer/skirt/corporate
@@ -78,7 +76,6 @@
name = "security officer's uniform"
desc = "It's made of a slightly sturdier material, to allow for robust protection."
icon_state = "redshirt" //pants, actually
item_state = "r_suit"
item_color = "redshirt"
/obj/item/clothing/under/rank/security/officer/corporate
@@ -137,7 +134,6 @@
name = "head of security's jumpskirt"
desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
icon_state = "hos_skirt"
item_state = "r_suit"
item_color = "hos_skirt"
dyeable = TRUE
dyeing_key = DYE_REGISTRY_JUMPSKIRT
@@ -163,13 +159,11 @@
name = "warden's suit"
desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders."
icon_state = "warden_formal"
item_state = "gy_suit"
item_color = "warden_formal"
/obj/item/clothing/under/rank/security/formal/head_of_security
name = "head of security's suit"
desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security."
icon_state = "hos_formal"
item_state = "gy_suit"
item_color = "hos_formal"
code/modules/clothing/under/misc_jumpsuits.dm
-1
View File
@@ -1,7 +1,6 @@
/obj/item/clothing/under/misc
desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
dyeable = TRUE
icon = 'icons/obj/clothing/under/misc.dmi'
sprite_sheets = list(
"Human" = 'icons/mob/clothing/under/misc.dmi',
code/modules/clothing/under/pants.dm
-2
View File
@@ -106,9 +106,7 @@
/obj/item/clothing/under/pants/shorts
name = "athletic shorts"
desc = "95% Polyester, 5% Spandex!"
gender = PLURAL
body_parts_covered = LOWER_TORSO
displays_id = FALSE
/obj/item/clothing/under/pants/shorts/red
icon_state = "redshorts"
code/modules/clothing/under/syndicate_jumpsuits.dm
-3
View File
@@ -33,7 +33,6 @@
name = "tacticool turtleneck"
desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
icon_state = "tactifool"
item_state = "bl_suit"
item_color = "tactifool"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 35)
@@ -41,11 +40,9 @@
name = "tactical suit"
desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp."
icon_state = "tactical_suit"
item_state = "bl_suit"
item_color = "tactical_suit"
/obj/item/clothing/under/syndicate/silicon_cham
name = "tactical turtleneck"
desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants. <b>This one has extra cybernetic modifications.</b>"
blockTracking = TRUE