mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-14 08:35:39 +01:00
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:
@@ -157,7 +157,7 @@ Pipelines + Other Objects -> Pipe network
|
||||
return TRUE
|
||||
|
||||
// Deconstruct into a pipe item.
|
||||
/obj/machinery/atmospherics/proc/deconstruct()
|
||||
/obj/machinery/atmospherics/atom_deconstruct()
|
||||
if(QDELETED(src))
|
||||
return
|
||||
if(construction_type)
|
||||
@@ -258,7 +258,7 @@ Pipelines + Other Objects -> Pipe network
|
||||
var/datum/gas_mixture/int_air = return_air()
|
||||
var/datum/gas_mixture/env_air = our_turf.return_air()
|
||||
var/internal_pressure = int_air.return_pressure()-env_air.return_pressure()
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
// Release pressure
|
||||
playsound(our_turf, 'sound/effects/bang.ogg', 70, 0, 0)
|
||||
playsound(our_turf, 'sound/effects/clang2.ogg', 70, 0, 0)
|
||||
|
||||
@@ -292,7 +292,7 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
#undef REGULATE_NONE
|
||||
#undef REGULATE_INPUT
|
||||
|
||||
@@ -253,7 +253,7 @@ Thus, the two variables affect pump operation are set in New():
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/binary/pump/click_alt(mob/user)
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
|
||||
@@ -292,7 +292,7 @@ Thus, the two variables affect pump operation are set in New():
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/binary/volume_pump/proc/multitool_act(var/obj/item/W as obj, var/mob/user as mob)
|
||||
if(!overclocked)
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
span_infoplain(span_bold("\The [user]") + "unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/omni/attack_hand(user as mob)
|
||||
if(..())
|
||||
|
||||
@@ -165,4 +165,4 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
// Housekeeping and pipe network stuff below
|
||||
/obj/machinery/atmospherics/trinary/get_neighbor_nodes_for_init()
|
||||
|
||||
@@ -340,7 +340,7 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/tvalve/mirrored
|
||||
icon_state = "map_tvalvem0"
|
||||
|
||||
@@ -88,4 +88,4 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
@@ -198,7 +198,7 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/unary/outlet_injector/click_ctrl(mob/user)
|
||||
if (volume_rate == ATMOS_DEFAULT_VOLUME_PUMP + 500 || use_power == USE_POWER_OFF)
|
||||
|
||||
@@ -442,7 +442,7 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_pump/proc/multitool_act(obj/item/W, mob/user)
|
||||
var/list/options = list(
|
||||
|
||||
@@ -315,7 +315,7 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -304,7 +304,7 @@
|
||||
span_infoplain(span_bold("\The [user]") + " unfastens \the [src]."), \
|
||||
span_notice("You have unfastened \the [src]."), \
|
||||
"You hear a ratchet.")
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/valve/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
span_hear("You hear a ratchet."))
|
||||
if(unsafe_wrenching)
|
||||
unsafe_pressure_release(user, internal_pressure)
|
||||
deconstruct()
|
||||
atom_deconstruct()
|
||||
|
||||
/obj/machinery/atmospherics/pipe/proc/change_color(var/new_color)
|
||||
//only pass valid pipe colors please ~otherwise your pipe will turn invisible
|
||||
|
||||
Reference in New Issue
Block a user