mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
massive burndown (#29894)
This commit is contained in:
@@ -11,7 +11,6 @@
|
||||
name = "area power controller"
|
||||
desc = "A control terminal for the area electrical systems."
|
||||
icon_state = "apc0"
|
||||
max_integrity = 200
|
||||
integrity_failure = 50
|
||||
resistance_flags = FIRE_PROOF
|
||||
req_access = list(ACCESS_ENGINE_EQUIP)
|
||||
@@ -1152,4 +1151,3 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, 24, 24)
|
||||
item_state = "electronic"
|
||||
flags = CONDUCT
|
||||
usesound = 'sound/items/deconstruct.ogg'
|
||||
toolspeed = 1
|
||||
|
||||
@@ -31,7 +31,6 @@ By design, d1 is the smallest direction and d2 is the highest
|
||||
|
||||
//The following vars are set here for the benefit of mapping - they are reset when the cable is spawned
|
||||
alpha = 128 //is set to 255 when spawned
|
||||
plane = GAME_PLANE //is set to FLOOR_PLANE when spawned
|
||||
layer = LOW_OBJ_LAYER //isset to WIRE_LAYER when spawned
|
||||
|
||||
/// The direction of endpoint one of this cable
|
||||
|
||||
@@ -18,14 +18,12 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
|
||||
merge_type = /obj/item/stack/cable_coil // This is here to let its children merge between themselves
|
||||
color = COLOR_RED
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
throw_speed = 2
|
||||
throw_range = 5
|
||||
materials = list(MAT_METAL = 15, MAT_GLASS = 10)
|
||||
flags = CONDUCT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
|
||||
usesound = 'sound/items/deconstruct.ogg'
|
||||
toolspeed = 1
|
||||
|
||||
/obj/item/stack/cable_coil/Initialize(mapload, length, paramcolor)
|
||||
. = ..()
|
||||
|
||||
@@ -7,9 +7,7 @@
|
||||
origin_tech = "powerstorage=1"
|
||||
force = 5
|
||||
throwforce = 5
|
||||
throw_speed = 2
|
||||
throw_range = 5
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
/// Battery's current state of charge (kilojoules)
|
||||
var/charge = 0
|
||||
/// Battery's maximum state of charge (kilojoules)
|
||||
@@ -340,7 +338,6 @@
|
||||
charge = 100
|
||||
maxcharge = 300
|
||||
materials = list()
|
||||
rating = 1
|
||||
grown_battery = TRUE //it has the overlays for wires
|
||||
|
||||
/obj/item/stock_parts/cell/high/slime
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
icon = 'icons/obj/singularity.dmi'
|
||||
icon_state = "Contain_F"
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
move_resist = INFINITY
|
||||
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
|
||||
flags_2 = RAD_NO_CONTAMINATE_2
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
density = TRUE
|
||||
req_access = list(ACCESS_ENGINE_EQUIP)
|
||||
|
||||
power_state = NO_POWER_USE
|
||||
idle_power_consumption = 10
|
||||
active_power_consumption = 300
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ GLOBAL_LIST_EMPTY(field_generator_fields)
|
||||
desc = "A large thermal battery that projects a high amount of energy when powered."
|
||||
icon = 'icons/obj/machines/field_generator.dmi'
|
||||
icon_state = "Field_Gen"
|
||||
anchored = FALSE
|
||||
density = TRUE
|
||||
power_state = NO_POWER_USE
|
||||
max_integrity = 500
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
pixel_y = -85
|
||||
current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO
|
||||
dissipate = FALSE
|
||||
move_self = TRUE
|
||||
grav_pull = 5
|
||||
consume_range = 6
|
||||
gender = FEMALE
|
||||
@@ -24,7 +23,6 @@
|
||||
pixel_x = -236
|
||||
pixel_y = -256
|
||||
current_size = 12
|
||||
move_self = TRUE //Do we move on our own?
|
||||
grav_pull = 10
|
||||
consume_range = 12 //How many tiles out do we eat
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
desc = "Small things moving very fast."
|
||||
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
||||
icon_state = "particle"
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
var/movement_range = 11
|
||||
var/energy = 10
|
||||
|
||||
|
||||
@@ -64,7 +64,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
|
||||
desc = "Part of a Particle Accelerator."
|
||||
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
||||
icon_state = null
|
||||
anchored = FALSE
|
||||
density = TRUE
|
||||
max_integrity = 500
|
||||
armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 90, ACID = 80)
|
||||
@@ -222,7 +221,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
|
||||
name = "Particle Accelerator"
|
||||
desc = "Part of a Particle Accelerator."
|
||||
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
||||
anchored = FALSE
|
||||
density = TRUE
|
||||
power_state = NO_POWER_USE
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/structure/particle_accelerator/fuel_chamber
|
||||
name = "EM Acceleration Chamber"
|
||||
desc_holder = "This part is where the Alpha particles are accelerated to <b><i>radical speeds</i></b>."
|
||||
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
||||
icon_state = "fuel_chamber"
|
||||
reference = "fuel_chamber"
|
||||
|
||||
@@ -10,15 +10,9 @@
|
||||
/obj/machinery/particle_accelerator/control_box
|
||||
name = "Particle Accelerator Control Console"
|
||||
desc = "This part controls the density of the particles."
|
||||
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
||||
icon_state = "control_box"
|
||||
reference = "control_box"
|
||||
anchored = FALSE
|
||||
density = TRUE
|
||||
power_state = NO_POWER_USE
|
||||
idle_power_consumption = 500
|
||||
active_power_consumption = 10000
|
||||
construction_state = 0
|
||||
active = FALSE
|
||||
dir = 1
|
||||
var/strength_upper_limit = 2
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
/obj/structure/particle_accelerator/particle_emitter
|
||||
name = "EM Containment Grid"
|
||||
desc_holder = "This part launches the Alpha particles. You might not want to stand near this end."
|
||||
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
||||
icon_state = null
|
||||
var/fire_delay = 50
|
||||
var/last_shot = 0
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/structure/particle_accelerator/power_box
|
||||
name = "Particle Focusing EM Lens"
|
||||
desc_holder = "This part uses electromagnetic waves to focus the Alpha particles."
|
||||
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
||||
icon_state = "power_box"
|
||||
reference = "power_box"
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
desc = "An odd device which produces a Gravitational Singularity when set up."
|
||||
icon = 'icons/obj/singularity.dmi'
|
||||
icon_state = "TheSingGen"
|
||||
anchored = FALSE
|
||||
density = TRUE
|
||||
power_state = NO_POWER_USE
|
||||
resistance_flags = FIRE_PROOF
|
||||
|
||||
@@ -97,7 +97,6 @@
|
||||
icon = 'icons/obj/supermatter.dmi'
|
||||
icon_state = "darkmatter"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
layer = ABOVE_MOB_LAYER + 0.01
|
||||
appearance_flags = PIXEL_SCALE|LONG_GLIDE
|
||||
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 | IMMUNE_TO_SHUTTLECRUSH_2 | NO_MALF_EFFECT_2 | CRITICAL_ATOM_2
|
||||
@@ -1001,8 +1000,6 @@
|
||||
l_color = "#ddd6cf")
|
||||
|
||||
/obj/effect/warp_effect/supermatter
|
||||
plane = GRAVITY_PULSE_PLANE
|
||||
appearance_flags = PIXEL_SCALE|LONG_GLIDE // no tile bound so you can see it around corners and so
|
||||
icon = 'icons/effects/light_352.dmi'
|
||||
icon_state = "light"
|
||||
pixel_x = -176
|
||||
|
||||
@@ -19,13 +19,10 @@
|
||||
pixel_x = -32
|
||||
pixel_y = -32
|
||||
current_size = STAGE_TWO
|
||||
move_self = TRUE
|
||||
grav_pull = 0
|
||||
density = TRUE
|
||||
energy = 0
|
||||
dissipate = FALSE
|
||||
dissipate_delay = 5
|
||||
dissipate_strength = 1
|
||||
warps_projectiles = FALSE
|
||||
var/list/orbiting_balls = list()
|
||||
var/miniball = FALSE
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
name = "energy ball generator"
|
||||
desc = "Makes the wardenclyffe look like a child's plaything when shot with a particle accelerator."
|
||||
icon = 'icons/obj/tesla_engine/tesla_generator.dmi'
|
||||
icon_state = "TheSingGen"
|
||||
creation_type = /obj/singularity/energy_ball
|
||||
|
||||
/obj/machinery/the_singularitygen/tesla/zap_act(power, zap_flags)
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
/obj/machinery/power/port_gen
|
||||
name = "Placeholder Generator" //seriously, don't use this. It can't be anchored without VV magic.
|
||||
desc = "A portable generator for emergency backup power."
|
||||
icon = 'icons/obj/power.dmi'
|
||||
icon_state = "portgen0_0"
|
||||
density = TRUE
|
||||
anchored = FALSE
|
||||
|
||||
@@ -184,7 +184,6 @@
|
||||
icon_state = "sp_base"
|
||||
item_state = "electropack"
|
||||
w_class = WEIGHT_CLASS_BULKY // Pretty big!
|
||||
anchored = FALSE
|
||||
var/tracker = 0
|
||||
var/glass_type = null
|
||||
|
||||
@@ -273,11 +272,9 @@
|
||||
desc = "A controller for solar panel arrays."
|
||||
icon = 'icons/obj/computer.dmi'
|
||||
icon_state = "computer"
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
power_state = IDLE_POWER_USE
|
||||
idle_power_consumption = 250
|
||||
max_integrity = 200
|
||||
integrity_failure = 100
|
||||
var/icon_screen = "solar"
|
||||
var/icon_keyboard = "power_key"
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
icon_state = "teg"
|
||||
anchored = FALSE
|
||||
density = TRUE
|
||||
power_state = NO_POWER_USE
|
||||
|
||||
var/obj/machinery/atmospherics/binary/circulator/cold_circ
|
||||
var/obj/machinery/atmospherics/binary/circulator/hot_circ
|
||||
|
||||
@@ -133,9 +133,7 @@
|
||||
icon_state = "frame"
|
||||
desc = "Monitors treadmill use."
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
maptext_height = 26
|
||||
maptext_width = 32
|
||||
maptext_y = -1
|
||||
|
||||
var/on = FALSE // if we should be metering or not
|
||||
|
||||
@@ -74,7 +74,6 @@
|
||||
desc = "The compressor stage of a gas turbine generator. A data panel for linking with a to a computer can be accessed with a screwdriver."
|
||||
icon = 'icons/obj/pipes.dmi'
|
||||
icon_state = "compressor"
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
resistance_flags = FIRE_PROOF
|
||||
var/obj/machinery/power/turbine/turbine
|
||||
@@ -121,7 +120,6 @@
|
||||
desc = "A gas turbine used for backup power generation."
|
||||
icon = 'icons/obj/pipes.dmi'
|
||||
icon_state = "turbine"
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
resistance_flags = FIRE_PROOF
|
||||
var/opened = FALSE
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
icon_state = "tube-construct-stage1"
|
||||
anchored = TRUE
|
||||
layer = FLY_LAYER
|
||||
max_integrity = 200
|
||||
armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 80, ACID = 50)
|
||||
/// Construction stage
|
||||
var/stage = LIGHT_CONSTRUCT_EMPTY_FRAME
|
||||
@@ -174,8 +173,6 @@
|
||||
name = "small light fixture frame"
|
||||
desc = "A small light fixture under construction."
|
||||
icon_state = "bulb-construct-stage1"
|
||||
anchored = TRUE
|
||||
layer = FLY_LAYER
|
||||
fixture_type = "bulb"
|
||||
sheets_refunded = 1
|
||||
construct_type = /obj/machinery/light/small/built
|
||||
@@ -184,7 +181,6 @@
|
||||
name = "floor light fixture frame"
|
||||
desc = "A floor light fixture under construction."
|
||||
icon_state = "floor-construct-stage1"
|
||||
anchored = TRUE
|
||||
layer = ABOVE_OPEN_TURF_LAYER
|
||||
plane = FLOOR_PLANE
|
||||
fixture_type = "floor"
|
||||
@@ -194,11 +190,7 @@
|
||||
/obj/machinery/light_construct/clockwork/small
|
||||
name = "small brass light fixture frame"
|
||||
desc = "A small brass light fixture under construction."
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "clockwork_bulb-construct-stage1"
|
||||
anchored = TRUE
|
||||
layer = 5
|
||||
stage = 1
|
||||
fixture_type = "clockwork_bulb"
|
||||
sheets_refunded = 1
|
||||
construct_type = /obj/machinery/light/clockwork/small/built
|
||||
@@ -207,7 +199,6 @@
|
||||
name = "brass floor light fixture frame"
|
||||
desc = "A brass floor light fixture under construction."
|
||||
icon_state = "clockwork_floor-construct-stage1"
|
||||
anchored = TRUE
|
||||
layer = ABOVE_OPEN_TURF_LAYER
|
||||
plane = FLOOR_PLANE
|
||||
fixture_type = "clockwork_floor"
|
||||
|
||||
@@ -457,7 +457,6 @@
|
||||
charge = 0.08e6 // Engineering starts with some charge for singulo
|
||||
|
||||
/obj/machinery/power/smes/empty
|
||||
charge = 0
|
||||
|
||||
/obj/machinery/power/smes/magical
|
||||
name = "magical power storage unit"
|
||||
|
||||
Reference in New Issue
Block a user