mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
massive burndown (#29894)
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
|
||||
//This is the icon for fire on turfs.
|
||||
/obj/effect/hotspot
|
||||
anchored = TRUE
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
icon = 'icons/goonstation/effects/fire.dmi'
|
||||
icon_state = "1"
|
||||
|
||||
@@ -241,7 +241,6 @@
|
||||
return list(milla_atmos_airtight, milla_superconductivity)
|
||||
|
||||
/obj/effect/wind
|
||||
anchored = TRUE
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
icon = 'icons/effects/tile_effects.dmi'
|
||||
icon_state = "wind"
|
||||
|
||||
@@ -1184,7 +1184,6 @@ Just an object used in constructing air alarms
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
|
||||
origin_tech = "engineering=2;programming=1"
|
||||
toolspeed = 1
|
||||
usesound = 'sound/items/deconstruct.ogg'
|
||||
|
||||
#undef AALARM_PRESET_HUMAN
|
||||
|
||||
@@ -11,8 +11,6 @@ Pipelines + Other Objects -> Pipe network
|
||||
/obj/machinery/atmospherics
|
||||
anchored = TRUE
|
||||
resistance_flags = FIRE_PROOF
|
||||
max_integrity = 200
|
||||
plane = GAME_PLANE
|
||||
power_state = NO_POWER_USE
|
||||
power_channel = PW_CHANNEL_ENVIRONMENT
|
||||
on_blueprints = TRUE
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/obj/machinery/atmospherics/binary
|
||||
dir = SOUTH
|
||||
initialize_directions = SOUTH|NORTH
|
||||
power_state = IDLE_POWER_USE
|
||||
|
||||
@@ -15,7 +14,6 @@
|
||||
var/datum/pipeline/parent1
|
||||
var/datum/pipeline/parent2
|
||||
|
||||
new_attack_chain = TRUE
|
||||
|
||||
/obj/machinery/atmospherics/binary/New()
|
||||
..()
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
desc = "A gas circulator pump and heat exchanger. Its input port is on the south side, and its output port is on the north side."
|
||||
icon = 'icons/obj/atmospherics/circulator.dmi'
|
||||
icon_state = "circ8-off"
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
can_unwrench = TRUE
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/obj/machinery/atmospherics/trinary
|
||||
dir = SOUTH
|
||||
initialize_directions = SOUTH|NORTH|WEST
|
||||
power_state = IDLE_POWER_USE
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
|
||||
/obj/machinery/atmospherics/trinary/tvalve/flipped/bypass
|
||||
icon_state = "map_tvalvem1"
|
||||
flipped = TRUE
|
||||
state = TVALVE_STATE_SIDE
|
||||
|
||||
/obj/machinery/atmospherics/trinary/tvalve/update_icon(animation)
|
||||
@@ -122,7 +121,6 @@
|
||||
|
||||
/obj/machinery/atmospherics/trinary/tvalve/digital/flipped/bypass
|
||||
icon_state = "map_tvalvem1"
|
||||
flipped = TRUE
|
||||
state = TVALVE_STATE_SIDE
|
||||
|
||||
/obj/machinery/atmospherics/trinary/tvalve/digital/power_change()
|
||||
|
||||
@@ -8,9 +8,7 @@
|
||||
icon = 'icons/obj/cryogenics.dmi'
|
||||
icon_state = "pod0"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
layer = ABOVE_WINDOW_LAYER
|
||||
plane = GAME_PLANE
|
||||
interact_offline = TRUE
|
||||
max_integrity = 350
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 30, ACID = 30)
|
||||
|
||||
@@ -10,7 +10,6 @@ GLOBAL_LIST_EMPTY(air_injectors)
|
||||
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF //really helpful in building gas chambers for xenomorphs
|
||||
|
||||
can_unwrench = TRUE
|
||||
can_unwrench_while_on = TRUE
|
||||
|
||||
name = "air injector"
|
||||
desc = "Has a valve and pump attached to it."
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
name = "oxygen generator"
|
||||
desc = ""
|
||||
|
||||
dir = SOUTH
|
||||
initialize_directions = SOUTH
|
||||
|
||||
var/oxygen_content = 10
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
|
||||
/obj/machinery/atmospherics/unary/tank/air
|
||||
name = "Pressure Tank (Air)"
|
||||
icon_state = "air_map"
|
||||
|
||||
/obj/machinery/atmospherics/unary/tank/air/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
layer = OBJ_LAYER
|
||||
|
||||
idle_power_consumption = 500
|
||||
active_power_consumption = 0
|
||||
|
||||
var/icon_state_off = "freezer"
|
||||
var/icon_state_on = "freezer_1"
|
||||
@@ -218,11 +217,6 @@
|
||||
investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS)
|
||||
|
||||
/obj/machinery/atmospherics/unary/thermomachine/freezer
|
||||
icon_state = "freezer"
|
||||
icon_state_off = "freezer"
|
||||
icon_state_on = "freezer_1"
|
||||
icon_state_open = "freezer-o"
|
||||
cooling = TRUE
|
||||
|
||||
/obj/machinery/atmospherics/unary/thermomachine/freezer/on
|
||||
on = TRUE
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/obj/machinery/atmospherics/unary
|
||||
dir = SOUTH
|
||||
initialize_directions = SOUTH
|
||||
layer = TURF_LAYER+0.1
|
||||
/// The current air contents of this device
|
||||
|
||||
@@ -7,10 +7,8 @@ GLOBAL_LIST_EMPTY(gas_meters)
|
||||
icon_state = "meterX"
|
||||
layer = GAS_PIPE_VISIBLE_LAYER + GAS_PUMP_OFFSET
|
||||
layer_offset = GAS_PUMP_OFFSET
|
||||
anchored = TRUE
|
||||
max_integrity = 150
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 40, ACID = 0)
|
||||
power_channel = PW_CHANNEL_ENVIRONMENT
|
||||
power_state = IDLE_POWER_USE
|
||||
idle_power_consumption = 2
|
||||
active_power_consumption = 5
|
||||
|
||||
@@ -5,12 +5,10 @@
|
||||
name = "refill station"
|
||||
icon = 'icons/obj/atmos.dmi'
|
||||
icon_state = "filler_oxygen"
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
resistance_flags = NONE
|
||||
idle_power_consumption = 1
|
||||
active_power_consumption = 5
|
||||
power_channel = PW_CHANNEL_ENVIRONMENT
|
||||
/// The desired pressure the refill station should be outputting into a holding tank.
|
||||
target_pressure = MAX_TARGET_PRESSURE
|
||||
can_unwrench_while_on = FALSE
|
||||
|
||||
@@ -3,11 +3,9 @@
|
||||
desc = "An endcap for pipes."
|
||||
icon = 'icons/atmos/pipes.dmi'
|
||||
icon_state = "cap"
|
||||
level = 2
|
||||
|
||||
volume = 35
|
||||
|
||||
dir = SOUTH
|
||||
initialize_directions = SOUTH
|
||||
|
||||
var/obj/machinery/atmospherics/node
|
||||
@@ -80,9 +78,6 @@
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/atmospherics/pipe/cap/visible
|
||||
level = 2
|
||||
icon_state = "cap"
|
||||
plane = GAME_PLANE
|
||||
layer = GAS_PIPE_VISIBLE_LAYER
|
||||
|
||||
/obj/machinery/atmospherics/pipe/cap/visible/scrubbers
|
||||
@@ -107,10 +102,8 @@
|
||||
|
||||
/obj/machinery/atmospherics/pipe/cap/hidden
|
||||
level = 1
|
||||
icon_state = "cap"
|
||||
alpha = 128
|
||||
plane = FLOOR_PLANE
|
||||
layer = GAS_PIPE_HIDDEN_LAYER
|
||||
|
||||
/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers
|
||||
name = "scrubbers pipe endcap"
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
volume = 105
|
||||
|
||||
dir = SOUTH
|
||||
initialize_directions = EAST|NORTH|WEST
|
||||
|
||||
var/obj/machinery/atmospherics/node1
|
||||
@@ -150,7 +149,6 @@
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible
|
||||
icon_state = "map"
|
||||
level = 2
|
||||
plane = GAME_PLANE
|
||||
layer = GAS_PIPE_VISIBLE_LAYER
|
||||
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers
|
||||
@@ -203,10 +201,8 @@
|
||||
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden
|
||||
icon_state = "map"
|
||||
level = 1
|
||||
alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
|
||||
plane = FLOOR_PLANE
|
||||
layer = GAS_PIPE_HIDDEN_LAYER
|
||||
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers
|
||||
name="Scrubbers pipe manifold"
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
volume = 140
|
||||
|
||||
dir = SOUTH
|
||||
initialize_directions = NORTH|SOUTH|EAST|WEST
|
||||
|
||||
var/obj/machinery/atmospherics/node1
|
||||
@@ -160,7 +159,6 @@
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/visible
|
||||
icon_state = "map_4way"
|
||||
level = 2
|
||||
plane = GAME_PLANE
|
||||
layer = GAS_PIPE_VISIBLE_LAYER
|
||||
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers
|
||||
@@ -207,10 +205,8 @@
|
||||
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/hidden
|
||||
icon_state = "map_4way"
|
||||
level = 1
|
||||
alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
|
||||
plane = FLOOR_PLANE
|
||||
layer = GAS_PIPE_HIDDEN_LAYER
|
||||
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers
|
||||
name = "4-way scrubbers pipe manifold"
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
var/datum/pipeline/parent
|
||||
var/volume = 0
|
||||
force = 20
|
||||
power_state = NO_POWER_USE
|
||||
can_unwrench = TRUE
|
||||
damage_deflection = 12
|
||||
can_be_undertile = TRUE
|
||||
@@ -11,7 +10,6 @@
|
||||
//Buckling
|
||||
can_buckle = TRUE
|
||||
buckle_requires_restraints = TRUE
|
||||
buckle_lying = -1
|
||||
|
||||
flags_2 = NO_MALF_EFFECT_2
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
volume = 70
|
||||
|
||||
dir = SOUTH
|
||||
initialize_directions = SOUTH|NORTH
|
||||
|
||||
var/obj/machinery/atmospherics/node1
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
icon_state = "intact"
|
||||
pipe_icon = "hepipe"
|
||||
level = 2
|
||||
plane = GAME_PLANE
|
||||
layer = GAS_PIPE_VISIBLE_LAYER
|
||||
var/initialize_directions_he
|
||||
var/surface = 2
|
||||
@@ -95,9 +94,7 @@
|
||||
/////////////////////////////////
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
|
||||
icon = 'icons/atmos/junction.dmi'
|
||||
icon_state = "intact"
|
||||
pipe_icon = "hejunction"
|
||||
level = 2
|
||||
minimum_temperature_difference = 300
|
||||
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
|
||||
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden
|
||||
icon_state = "intact"
|
||||
level = 1
|
||||
alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
|
||||
// these are inherited, but it's nice to have them explicit here
|
||||
plane = FLOOR_PLANE
|
||||
layer = GAS_PIPE_HIDDEN_LAYER
|
||||
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers
|
||||
name = "Scrubbers pipe"
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
icon_state = "intact"
|
||||
level = 2
|
||||
// these are inherited, but it's nice to have them explicit here
|
||||
plane = GAME_PLANE
|
||||
layer = GAS_PIPE_VISIBLE_LAYER
|
||||
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers
|
||||
|
||||
@@ -58,7 +58,6 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new())
|
||||
density = TRUE
|
||||
flags = CONDUCT
|
||||
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 80, ACID = 50)
|
||||
max_integrity = 250
|
||||
integrity_failure = 100
|
||||
cares_about_temperature = TRUE
|
||||
|
||||
@@ -76,7 +75,6 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new())
|
||||
pressure_resistance = 7 * ONE_ATMOSPHERE
|
||||
var/temperature_resistance = 1000 + T0C
|
||||
volume = 1000
|
||||
power_state = NO_POWER_USE
|
||||
interact_offline = TRUE
|
||||
var/release_log = ""
|
||||
var/current_pressure_appearance
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
name = "atmoalter"
|
||||
anchored = FALSE
|
||||
layer = BELOW_OBJ_LAYER
|
||||
power_state = NO_POWER_USE
|
||||
max_integrity = 250
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 60, ACID = 30)
|
||||
var/datum/gas_mixture/air_contents = new
|
||||
|
||||
Reference in New Issue
Block a user