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
@@ -20,6 +20,7 @@ LINEN BINS
pickup_sound = 'sound/items/pickup/clothing.ogg'
///var used for attack_self chain
var/special_handling = FALSE
resistance_flags = FLAMMABLE
/obj/item/bedsheet/Initialize(mapload)
. = ..()
+5 -3
View File
@@ -12,6 +12,7 @@
var/datum/material/material
var/set_temperature = T0C + 30 //K
var/heating_power = 80000
resistance_flags = FIRE_PROOF
/obj/structure/bonfire/Initialize(mapload, material_name)
. = ..()
@@ -170,7 +171,7 @@
START_PROCESSING(SSobj, src)
visible_message(span_warning("\The [src] starts burning!"))
/obj/structure/bonfire/proc/burn()
/obj/structure/bonfire/proc/burn_bonfire()
var/turf/current_location = get_turf(src)
current_location.hotspot_expose(1000, 500)
for(var/A in current_location)
@@ -225,7 +226,7 @@
extinguish()
return
if(!grill)
burn()
burn_bonfire()
if(burning)
var/W = get_fuel_amount()
@@ -279,6 +280,7 @@
var/next_fuel_consumption = 0
var/set_temperature = T0C + 20 //K
var/heating_power = 40000
resistance_flags = FIRE_PROOF
/obj/structure/fireplace/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/material/wood) || istype(W, /obj/item/stack/material/log) )
@@ -365,7 +367,7 @@
START_PROCESSING(SSobj, src)
visible_message(span_warning("\The [src] starts burning!"))
/obj/structure/fireplace/proc/burn()
/obj/structure/fireplace/proc/burn_bonfire()
var/turf/current_location = get_turf(src)
current_location.hotspot_expose(1000, 500)
for(var/A in current_location)
+2 -2
View File
@@ -80,7 +80,7 @@
if(Adjacent(user))
attack_hand(user)
/obj/structure/catwalk/proc/deconstruct(mob/user)
/obj/structure/catwalk/atom_deconstruct(disassembled = TRUE, mob/user)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
to_chat(user, span_notice("Slicing \the [src] joints ..."))
//Lattice would delete itself, but let's save ourselves a new obj
@@ -97,7 +97,7 @@
if(C.has_tool_quality(TOOL_WELDER))
var/obj/item/weldingtool/WT = C.get_welder()
if(WT.isOn() && WT.remove_fuel(0, user))
deconstruct(user)
atom_deconstruct(TRUE, user)
return
if(C.has_tool_quality(TOOL_CROWBAR) && plated_tile)
hatch_open = !hatch_open
+1 -1
View File
@@ -13,7 +13,7 @@
var/flapping
var/obj_integrity = 100
var/original_int = 100
var/max_integrity = 100
max_integrity = 100
var/stored_examine
var/identifier = "statue"
var/material = "stone"
@@ -261,6 +261,7 @@
applies_material_colour = 1
var/sofa_material = MAT_CARPET
var/corner_piece = FALSE
resistance_flags = FLAMMABLE
/obj/structure/bed/chair/sofa/update_icon()
if(applies_material_colour && sofa_material)