Flammable Items, Abstractness, and hypnosis (#19267)

* Laser Eyes

* Update dna.dm

* Mecha

* Update positive_genes.dm

* These

* These 2

* yeh

* Rest of these

* Update turf.dm

* Update food.dm

* Some moar

* mooove

* Update vorestation.dme

* Update burning.dm

* firesuit

* flags

* HYPNOCOLOR

* xd

* no filter

* dc

* Update ore_bag.dm

* Update misc.dm

* Update misc.dm
This commit is contained in:
Cameron Lennox
2026-04-13 00:30:02 -04:00
committed by GitHub
parent ee2fd148ae
commit d8c1932cb9
145 changed files with 791 additions and 203 deletions
+1
View File
@@ -3,6 +3,7 @@
siemens_coefficient = 0.9
drop_sound = 'sound/items/drop/clothing.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
resistance_flags = FLAMMABLE
var/list/species_restricted = null //Only these species can wear this kit.
var/list/accessories
+2
View File
@@ -3,6 +3,7 @@
name = DEVELOPER_WARNING_NAME
desc = "An earring of some kind."
icon = 'icons/inventory/ears/item.dmi'
resistance_flags = FIRE_PROOF
/obj/item/clothing/ears/earring/stud
name = "pearl stud earrings"
@@ -17,6 +18,7 @@
/obj/item/clothing/ears/earring/stud/wood
name = "wood stud earrings"
color = "#824b28"
resistance_flags = FLAMMABLE
/obj/item/clothing/ears/earring/stud/iron
name = "iron stud earrings"
+2
View File
@@ -9,6 +9,7 @@
item_state_slots = list(slot_r_hand_str = "earmuffs", slot_l_hand_str = "earmuffs")
slot_flags = SLOT_EARS | SLOT_TWOEARS
ear_protection = 2
resistance_flags = FIRE_PROOF
/obj/item/clothing/ears/earmuffs/headphones
name = "headphones"
@@ -48,6 +49,7 @@
w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
species_restricted = list(SPECIES_SKRELL)
resistance_flags = FIRE_PROOF
/obj/item/clothing/ears/skrell/chain
name = "Gold headtail chains"
+1
View File
@@ -29,6 +29,7 @@ BLIND // can't see anything
var/list/away_planes //Holder for disabled planes
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
resistance_flags = FIRE_PROOF
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
@@ -7,6 +7,7 @@
w_class = ITEMSIZE_NORMAL
drop_sound = 'sound/items/drop/metalshield.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
resistance_flags = FIRE_PROOF
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
if(..()) //This will only run if no other problems occured when equiping.
+1
View File
@@ -31,6 +31,7 @@
permeability_coefficient = 0.05
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
resistance_flags = FIRE_PROOF
/obj/item/clothing/gloves/orange
name = "orange gloves"
@@ -12,6 +12,7 @@
glove_level = 3
overgloves = 1
punch_force = 5
resistance_flags = FIRE_PROOF
/obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user, slot, disable_warning = FALSE)
var/mob/living/carbon/human/H = user
@@ -20,6 +20,7 @@
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
resistance_flags = FIRE_PROOF
/obj/item/clothing/gloves/swat
desc = "These tactical gloves are somewhat fire and impact-resistant."
@@ -30,6 +31,7 @@
permeability_coefficient = 0.05
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
resistance_flags = FIRE_PROOF
/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves
desc = "These tactical gloves are somewhat fire and impact resistant."
@@ -40,6 +42,7 @@
permeability_coefficient = 0.05
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
resistance_flags = FIRE_PROOF
/obj/item/clothing/gloves/sterile
name = "sterile gloves"
@@ -112,6 +115,7 @@
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
resistance_flags = FIRE_PROOF
/obj/item/clothing/gloves/ranger
var/glovecolor = "white"
@@ -69,6 +69,7 @@
desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!"
icon_state = "welding"
body_parts_covered = HEAD|FACE|EYES
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/collectable/slime
name = "collectable slime hat"
+1
View File
@@ -24,6 +24,7 @@
ear_protection = 1
drop_sound = 'sound/items/drop/helm.ogg'
pickup_sound = 'sound/items/pickup/helm.ogg'
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/hardhat/orange
icon_state = "hardhat0_orange"
+1
View File
@@ -14,6 +14,7 @@
ear_protection = 1
drop_sound = 'sound/items/drop/helm.ogg'
pickup_sound = 'sound/items/pickup/helm.ogg'
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/helmet/solgov
name = "\improper Solar Confederate Government helmet"
@@ -32,6 +32,7 @@
drop_sound = 'sound/items/drop/helm.ogg'
pickup_sound = 'sound/items/pickup/helm.ogg'
special_handling = TRUE
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/welding/attack_self(mob/user)
. = ..(user)
@@ -20,6 +20,7 @@
var/list/images
var/list/raw_images
var/last_status
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/pilot/Initialize(mapload)
. = ..()
@@ -10,6 +10,7 @@
w_class = ITEMSIZE_NORMAL
actions_types = list(/datum/action/item_action/toggle_visor)
special_handling = TRUE
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/pilot_vr/attack_self(mob/user)
. = ..(user)
+1
View File
@@ -13,6 +13,7 @@
pickup_sound = 'sound/items/pickup/component.ogg'
drop_sound = 'sound/items/drop/component.ogg'
special_handling = TRUE
resistance_flags = FIRE_PROOF
/obj/item/clothing/mask/breath/proc/adjust_mask(mob/user)
+1
View File
@@ -14,6 +14,7 @@
var/list/filtered_gases = list(GAS_PHORON, GAS_N2O)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 75, rad = 0)
pickup_sound = 'sound/items/pickup/rubber.ogg'
resistance_flags = FIRE_PROOF
/obj/item/clothing/mask/gas/filter_air(datum/gas_mixture/air)
var/datum/gas_mixture/gas_filtered = new
+1
View File
@@ -11,6 +11,7 @@
icon_state = "monitor"
var/monitor_state_index = "blank"
resistance_flags = FIRE_PROOF
/obj/item/clothing/mask/monitor/set_dir()
@@ -11,6 +11,7 @@
var/lstat
var/visor_state = "Neutral" //Separating this from lstat so that it could potentially be used for an override system or something
var/mob/living/carbon/maskmaster
resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE | BOMB_PROOF |FREEZE_PROOF
/obj/item/clothing/mask/synthfacemask/equipped()
..()
+1
View File
@@ -132,6 +132,7 @@
max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
snow_speed = -1
step_volume_mod = 0.8
resistance_flags = FIRE_PROOF
/obj/item/clothing/shoes/boots/winter/security
name = "security winter boots"
@@ -9,6 +9,7 @@
can_hold_knife = TRUE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
resistance_flags = FIRE_PROOF
/obj/item/clothing/shoes/leg_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
if(..()) //This will only run if no other problems occured when equiping.
+1
View File
@@ -23,6 +23,7 @@
step_volume_mod = 1.3
drop_sound = 'sound/items/drop/metalboots.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
resistance_flags = FIRE_PROOF
/obj/item/clothing/shoes/magboots/proc/set_slowdown()
slowdown = shoes? max(SHOES_SLOWDOWN, shoes.slowdown): SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster.
@@ -11,6 +11,7 @@
step_volume_mod = 0.5
drop_sound = 'sound/items/drop/rubber.ogg'
pickup_sound = 'sound/items/pickup/rubber.ogg'
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/shoes/mime
name = "mime shoes"
@@ -28,6 +29,7 @@
species_restricted = null
drop_sound = 'sound/items/drop/rubber.ogg'
pickup_sound = 'sound/items/pickup/rubber.ogg'
resistance_flags = ACID_PROOF
/obj/item/clothing/shoes/dress
name = "dress shoes"
@@ -17,6 +17,7 @@
var/recharging_rate = 60 //default 6 seconds between each dash
var/recharging_time = 0 //time until next dash
// var/jumping = FALSE //are we mid-jump? We have no throw_at callback, so we have to check user.throwing.
resistance_flags = FIRE_PROOF
/obj/item/clothing/shoes/bhop/ui_action_click(mob/unused_user, actiontype)
var/mob/living/user = loc
@@ -18,6 +18,7 @@
var/brute_damage = 0 // Specifically brute damage.
var/burn_damage = 0 // Specifically burn damage.
var/base_name // Used to keep the original name safe while we apply modifiers.
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/suit/space/Initialize(mapload)
. = ..()
@@ -104,6 +104,7 @@
var/protean = 0
var/obj/item/storage/backpack/rig_storage
permeability_coefficient = 0 //Protect the squishies, after all this shit should be waterproof.
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/rig/Initialize(mapload)
. = ..()
@@ -26,6 +26,7 @@
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN, SPECIES_SHADEKIN)
max_pressure_protection = null
min_pressure_protection = null
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/gloves/gauntlets/rig
name = "gauntlets"
@@ -33,10 +34,12 @@
flags = PHORONGUARD
item_flags = THICKMATERIAL
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN, SPECIES_SHADEKIN)
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/shoes/magboots/rig
name = "boots"
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN, SPECIES_SHADEKIN)
icon_base = null
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/suit/space/rig
name = "chestpiece"
@@ -72,6 +75,7 @@
var/obj/item/material/knife/tacknife
max_pressure_protection = null
min_pressure_protection = null
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/suit/space/rig/attack_hand(var/mob/living/M)
if(tacknife)
@@ -126,15 +130,19 @@
name = DEVELOPER_WARNING_NAME // "mask"
body_parts_covered = HEAD|FACE|EYES
flags = THICKMATERIAL|AIRTIGHT
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/suit/lightrig
name = DEVELOPER_WARNING_NAME // "suit"
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY)
flags_inv = HIDEJUMPSUIT
flags = THICKMATERIAL
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/shoes/lightrig
name = DEVELOPER_WARNING_NAME // "boots"
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/gloves/gauntlets/lightrig
flags = THICKMATERIAL
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -23,6 +23,7 @@
preserve_item = 1
flash_protection = FLASH_PROTECTION_MAJOR
valid_accessory_slots = null
resistance_flags = FIRE_PROOF | ACID_PROOF
var/obj/machinery/camera/camera
var/list/camera_networks
@@ -90,6 +91,7 @@
preserve_item = 1
valid_accessory_slots = (ACCESSORY_SLOT_OVER | ACCESSORY_SLOT_ARMBAND | ACCESSORY_SLOT_DECOR)
var/list/supporting_limbs //If not-null, automatically splints breaks. Checked when removing the suit.
resistance_flags = FIRE_PROOF | ACID_PROOF
//VOREStation edit start - use the specially refitted sprites by KBraid. Done this way to avoid breaking subtypes.
/obj/item/clothing/suit/space/Initialize(mapload)
@@ -8,3 +8,4 @@
body_parts_covered = CHEST|ARMS|LEGS
species_restricted = list(SPECIES_VOX)
siemens_coefficient = 1 //Its literally metal
resistance_flags = FIRE_PROOF
+1
View File
@@ -9,6 +9,7 @@
heat_protection = CHEST
max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.6
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
if(..()) //This will only run if no other problems occured when equiping.
+2
View File
@@ -13,6 +13,7 @@
siemens_coefficient = 0.9
flags = PHORONGUARD
item_flags = THICKMATERIAL | ALLOW_SURVIVALFOOD
resistance_flags = UNACIDABLE
/obj/item/clothing/suit/bio_suit
name = "bio suit"
@@ -29,6 +30,7 @@
siemens_coefficient = 0.9
flags = PHORONGUARD
item_flags = THICKMATERIAL
resistance_flags = UNACIDABLE
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general
+1
View File
@@ -21,6 +21,7 @@
armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 2
actions_types = list(/datum/action/item_action/toggle_knight_headgear)
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/storage/hooded/knight/galahad
name = "crusader's armor"
@@ -3,6 +3,7 @@
desc = "An experimental suit of armor, awaiting installation of an anomaly core."
icon_state = "reactiveoff"
w_class = ITEMSIZE_COST_LARGE
resistance_flags = FIRE_PROOF | UNACIDABLE
/obj/item/clothing/suit/armor/reactive_armor_shell/attackby(obj/item/I, mob/user)
. = ..()
+3
View File
@@ -27,6 +27,7 @@
cold_protection = CHEST|LEGS|FEET|ARMS|HANDS
min_pressure_protection = 0.2 * ONE_ATMOSPHERE
max_pressure_protection = 20 * ONE_ATMOSPHERE
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/fire/firefighter
name = "firesuit"
@@ -51,6 +52,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
siemens_coefficient = 0
resistance_flags = BOMB_PROOF
/obj/item/clothing/suit/bomb_suit
name = "bomb suit"
@@ -66,6 +68,7 @@
cold_protection = CHEST|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0
resistance_flags = BOMB_PROOF
/obj/item/clothing/head/bomb_hood/security
icon_state = "bombsuitsec"