mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 23:23:28 +01:00
massive burndown (#29894)
This commit is contained in:
@@ -3,8 +3,6 @@
|
||||
name = "acid"
|
||||
desc = "Burbling corrosive stuff."
|
||||
icon_state = "acid"
|
||||
density = FALSE
|
||||
opacity = FALSE
|
||||
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
|
||||
layer = ABOVE_NORMAL_TURF_LAYER
|
||||
var/turf/target
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
name = "anomaly"
|
||||
desc = "A mysterious anomaly, seen commonly only in the region of space that the station orbits..."
|
||||
icon_state = "bhole3"
|
||||
density = FALSE
|
||||
light_range = 3
|
||||
var/movechance = ANOMALY_MOVECHANCE
|
||||
var/obj/item/assembly/signaler/anomaly/aSignal = /obj/item/assembly/signaler/anomaly
|
||||
@@ -102,9 +101,7 @@
|
||||
/obj/effect/anomaly/grav
|
||||
name = "gravitational anomaly"
|
||||
icon_state = "shield2"
|
||||
density = FALSE
|
||||
appearance_flags = PIXEL_SCALE|LONG_GLIDE
|
||||
layer = OBJ_LAYER // Mobs will appear above this
|
||||
var/boing = FALSE
|
||||
var/knockdown = FALSE
|
||||
aSignal = /obj/item/assembly/signaler/anomaly/grav
|
||||
@@ -474,7 +471,6 @@
|
||||
|
||||
/obj/effect/anomaly/bhole
|
||||
name = "vortex anomaly"
|
||||
icon_state = "bhole3"
|
||||
desc = "That's a nice station you have there. It'd be a shame if something happened to it."
|
||||
aSignal = /obj/item/assembly/signaler/anomaly/vortex
|
||||
/// The timer that will give us an extra proccall of ripping the floors up
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
/obj/effect/decal/cleanable/blood/xeno
|
||||
name = "xeno blood"
|
||||
desc = "It's green and acidic. It looks like... <i>blood?</i>"
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
basecolor = COLOR_BLOOD_XENO
|
||||
bloodiness = BLOOD_AMOUNT_PER_DECAL
|
||||
blood_state = BLOOD_STATE_XENO
|
||||
|
||||
/obj/effect/decal/cleanable/blood/xeno/splatter
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/effect/decal/cleanable/liquid_fuel
|
||||
//Liquid fuel is used for things that used to rely on volatile fuels or plasma being contained to a couple tiles.
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "fuel"
|
||||
layer = ABOVE_NORMAL_TURF_LAYER
|
||||
var/amount = 1 //Basically moles.
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
desc = "It's thick and gooey. Perhaps it's the chef's cooking?"
|
||||
var/drydesc = "It's dry and crusty. Someone is not doing their job."
|
||||
gender = PLURAL
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
icon_state = "mfloor1"
|
||||
@@ -23,7 +22,6 @@
|
||||
var/off_floor = FALSE
|
||||
var/image/weightless_image
|
||||
var/weightless_icon = 'icons/effects/blood_weightless.dmi'
|
||||
inertia_move_delay = 5 // so they dont collide with who emitted them
|
||||
|
||||
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
|
||||
if(C == src)
|
||||
@@ -207,7 +205,6 @@
|
||||
/obj/effect/decal/cleanable/blood/drip
|
||||
name = "drips of blood"
|
||||
desc = "A drop of blood in an ocean of mess."
|
||||
gender = PLURAL
|
||||
icon = 'icons/effects/drip.dmi'
|
||||
icon_state = "1"
|
||||
random_icon_states = list("1", "2", "3", "4", "5")
|
||||
@@ -221,11 +218,9 @@
|
||||
/// not a child of blood on purpose
|
||||
/obj/effect/decal/cleanable/trail_holder
|
||||
name = "blood"
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "nothing"
|
||||
desc = "Your instincts say you shouldn't be following these."
|
||||
gender = PLURAL
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
random_icon_states = null
|
||||
blood_DNA = list()
|
||||
@@ -258,10 +253,6 @@
|
||||
/obj/effect/decal/cleanable/blood/gibs
|
||||
name = "gibs"
|
||||
desc = "They look bloody and gruesome."
|
||||
gender = PLURAL
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
icon_state = "mgibbl5"
|
||||
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
|
||||
no_clear = TRUE
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
name = "clutter"
|
||||
desc = "Someone should clean that up."
|
||||
gender = PLURAL
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/obj/objects.dmi'
|
||||
icon_state = "shards"
|
||||
@@ -43,12 +42,10 @@
|
||||
name = "dirt"
|
||||
desc = "Someone should clean that up."
|
||||
gender = PLURAL
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/effects/dirt.dmi'
|
||||
icon_state = "dirt"
|
||||
base_icon_state = "dirt"
|
||||
smoothing_flags = NONE
|
||||
smoothing_groups = list(SMOOTH_GROUP_CLEANABLE_DIRT)
|
||||
canSmoothWith = list(SMOOTH_GROUP_CLEANABLE_DIRT, SMOOTH_GROUP_WALLS)
|
||||
mouse_opacity = FALSE
|
||||
@@ -75,9 +72,7 @@
|
||||
name = "flour"
|
||||
desc = "It's still good. Four second rule!"
|
||||
gender = PLURAL
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "flour"
|
||||
|
||||
/obj/effect/decal/cleanable/flour/nanofrost
|
||||
@@ -98,10 +93,8 @@
|
||||
name = "glowing goo"
|
||||
desc = "Jeez. I hope that's not for lunch."
|
||||
gender = PLURAL
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
light_range = 1
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "greenglow"
|
||||
|
||||
/obj/effect/decal/cleanable/greenglow/Initialize(mapload)
|
||||
@@ -114,21 +107,14 @@
|
||||
/obj/effect/decal/cleanable/cobweb
|
||||
name = "cobweb"
|
||||
desc = "Somebody should remove that."
|
||||
density = FALSE
|
||||
layer = OBJ_LAYER
|
||||
plane = GAME_PLANE
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "cobweb1"
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
/obj/effect/decal/cleanable/molten_object
|
||||
name = "gooey grey mass"
|
||||
desc = "It looks like a melted... something."
|
||||
density = FALSE
|
||||
layer = OBJ_LAYER
|
||||
plane = GAME_PLANE
|
||||
gender = NEUTER
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "molten"
|
||||
mergeable_decal = FALSE
|
||||
|
||||
@@ -139,19 +125,14 @@
|
||||
/obj/effect/decal/cleanable/cobweb2
|
||||
name = "cobweb"
|
||||
desc = "Somebody should remove that."
|
||||
density = FALSE
|
||||
layer = OBJ_LAYER
|
||||
plane = GAME_PLANE
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "cobweb2"
|
||||
|
||||
/obj/effect/decal/cleanable/vomit
|
||||
name = "vomit"
|
||||
desc = "Gosh, how unpleasant."
|
||||
gender = PLURAL
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
plane = FLOOR_PLANE
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
icon_state = "vomit_1"
|
||||
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
|
||||
@@ -247,23 +228,19 @@
|
||||
/obj/effect/decal/cleanable/tomato_smudge
|
||||
name = "tomato smudge"
|
||||
desc = "It's red."
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/effects/tomatodecal.dmi'
|
||||
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
|
||||
|
||||
/obj/effect/decal/cleanable/plant_smudge
|
||||
name = "plant smudge"
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
gender = NEUTER
|
||||
icon = 'icons/effects/tomatodecal.dmi'
|
||||
random_icon_states = list("smashed_plant")
|
||||
|
||||
/obj/effect/decal/cleanable/egg_smudge
|
||||
name = "smashed egg"
|
||||
desc = "Seems like this one won't hatch."
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/effects/tomatodecal.dmi'
|
||||
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
|
||||
@@ -272,7 +249,6 @@
|
||||
/obj/effect/decal/cleanable/pie_smudge
|
||||
name = "smashed pie"
|
||||
desc = "It's pie cream from a cream pie."
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/effects/tomatodecal.dmi'
|
||||
random_icon_states = list("smashed_pie")
|
||||
@@ -280,10 +256,8 @@
|
||||
/obj/effect/decal/cleanable/fungus
|
||||
name = "space fungus"
|
||||
desc = "A fungal growth. Looks pretty nasty."
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
plane = GAME_PLANE
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "flour"
|
||||
color = "#D5820B"
|
||||
scoop_reagents = list("fungus" = 10)
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
icon_state = "gib1"
|
||||
basecolor = "#030303"
|
||||
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
|
||||
bloodiness = BLOOD_AMOUNT_PER_DECAL
|
||||
mergeable_decal = FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in()
|
||||
return FALSE
|
||||
|
||||
@@ -13,7 +13,6 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
|
||||
desc = "Whoops..."
|
||||
drydesc = "Whoops..."
|
||||
icon_state = "wheels1"
|
||||
gender = PLURAL
|
||||
random_icon_states = null
|
||||
amount = 0
|
||||
gravity_check = ALWAYS_IN_GRAVITY
|
||||
@@ -30,13 +29,10 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
|
||||
icon = 'icons/effects/fluidtracks.dmi'
|
||||
icon_state = null
|
||||
desc = "You REALLY shouldn't follow these.."
|
||||
gender = PLURAL
|
||||
random_icon_states = null
|
||||
basecolor = "#A10808"
|
||||
var/entered_dirs = 0
|
||||
var/exited_dirs = 0
|
||||
var/base_alpha = BLOODY_FOOTPRINT_BASE_ALPHA
|
||||
blood_state = BLOOD_STATE_HUMAN //the icon state to load images from
|
||||
gravity_check = ALWAYS_IN_GRAVITY
|
||||
|
||||
/obj/effect/decal/cleanable/blood/footprints/Initialize(mapload)
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
///when another of the same type is made on the same tile will they merge --- YES=TRUE; NO=FLASE
|
||||
var/mergeable_decal = TRUE
|
||||
///prevents Ambient Occlusion effects around it ; Set to GAME_PLANE in Initialize() if on a wall
|
||||
plane = FLOOR_PLANE
|
||||
///for blood n vomit in zero G --- IN GRAVITY=TRUE; NO GRAVITY=FALSE
|
||||
var/gravity_check = TRUE
|
||||
hud_possible = list(JANI_HUD)
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
name = "rolled-up poster"
|
||||
desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities."
|
||||
icon = 'icons/obj/contraband.dmi'
|
||||
force = 0
|
||||
resistance_flags = FLAMMABLE
|
||||
var/poster_type
|
||||
var/obj/structure/sign/poster/poster_structure
|
||||
@@ -53,7 +52,6 @@
|
||||
name = "poster"
|
||||
desc = "A large piece of space-resistant printed paper."
|
||||
icon = 'icons/obj/contraband.dmi'
|
||||
anchored = TRUE
|
||||
var/original_name
|
||||
var/random_basetype
|
||||
var/ruined = FALSE
|
||||
@@ -207,7 +205,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/random, 32, 32)
|
||||
/obj/structure/sign/poster/contraband
|
||||
poster_item_name = "contraband poster"
|
||||
poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities."
|
||||
poster_item_icon_state = "rolled_poster"
|
||||
|
||||
/obj/structure/sign/poster/contraband/random
|
||||
name = "random contraband poster"
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
// Used for spray that you spray at walls, tables, hydrovats etc
|
||||
/obj/effect/decal/spraystill
|
||||
density = FALSE
|
||||
layer = 50
|
||||
plane = HUD_PLANE
|
||||
|
||||
@@ -27,7 +26,6 @@
|
||||
|
||||
/obj/effect/decal/snow
|
||||
name = "snow"
|
||||
density = FALSE
|
||||
layer = TURF_DECAL_LAYER
|
||||
icon = 'icons/turf/snow.dmi'
|
||||
icon_state = "snow"
|
||||
@@ -46,14 +44,12 @@
|
||||
|
||||
/obj/effect/decal/leaves
|
||||
name = "fall leaves"
|
||||
density = FALSE
|
||||
layer = HIGH_TURF_LAYER
|
||||
icon = 'icons/obj/flora/plants.dmi'
|
||||
icon_state = "fallleaves"
|
||||
|
||||
/obj/effect/decal/straw
|
||||
name = "scattered straw"
|
||||
density = FALSE
|
||||
layer = HIGH_TURF_LAYER
|
||||
icon = 'icons/obj/flora/plants.dmi'
|
||||
icon_state = "strawscattered"
|
||||
|
||||
@@ -9,5 +9,4 @@
|
||||
|
||||
/obj/effect/turf_decal/weather/snow/corner
|
||||
name = "snow corner piece"
|
||||
icon = 'icons/turf/snow.dmi'
|
||||
icon_state = "snow_corner"
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
/obj/effect/particle_effect/chem_smoke
|
||||
icon = 'icons/goonstation/effects/64x64.dmi'
|
||||
icon_state = "smoke"
|
||||
density = FALSE
|
||||
opacity = FALSE
|
||||
layer = ABOVE_MOB_LAYER
|
||||
animate_movement = NO_STEPS
|
||||
var/matrix/first = matrix()
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
/obj/effect/particle_effect/foam
|
||||
name = "foam"
|
||||
icon_state = "foam"
|
||||
opacity = FALSE
|
||||
density = FALSE
|
||||
gender = PLURAL
|
||||
layer = OBJ_LAYER + 0.9
|
||||
animate_movement = NO_STEPS
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
anchored = FALSE
|
||||
plane = SMOKE_PLANE
|
||||
layer = FLY_LAYER
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
var/steps = 0
|
||||
var/lifetime = 10 SECONDS_TO_LIFE_CYCLES
|
||||
var/direction
|
||||
@@ -144,7 +143,6 @@
|
||||
|
||||
/obj/effect/particle_effect/smoke/steam
|
||||
color = COLOR_OFF_WHITE
|
||||
lifetime = 10 SECONDS_TO_LIFE_CYCLES
|
||||
causes_coughing = TRUE
|
||||
|
||||
/obj/effect/particle_effect/smoke/steam/smoke_mob(mob/living/carbon/breather)
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
/obj/effect/particle_effect/steam
|
||||
name = "steam"
|
||||
icon_state = "extinguish"
|
||||
density = FALSE
|
||||
|
||||
/obj/effect/particle_effect/steam/New()
|
||||
..()
|
||||
|
||||
@@ -56,7 +56,6 @@
|
||||
name = "Abstract object"
|
||||
invisibility = INVISIBILITY_ABSTRACT
|
||||
layer = TURF_LAYER
|
||||
density = FALSE
|
||||
icon = null
|
||||
icon_state = null
|
||||
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 100, RAD = 100, FIRE = 100, ACID = 100)
|
||||
@@ -158,7 +157,6 @@
|
||||
|
||||
/// These effects can be added to anything to hold particles, which is useful because Byond only allows a single particle per atom
|
||||
/obj/effect/abstract/particle_holder
|
||||
anchored = TRUE
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
layer = ABOVE_ALL_MOB_LAYER
|
||||
vis_flags = VIS_INHERIT_PLANE
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
/obj/effect/forcefield
|
||||
desc = "A space wizard's magic wall."
|
||||
name = "FORCEWALL"
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "m_shield"
|
||||
opacity = FALSE
|
||||
density = TRUE
|
||||
var/lifetime = 30 SECONDS
|
||||
|
||||
@@ -58,7 +56,6 @@
|
||||
return !blocks_atmos
|
||||
|
||||
/obj/structure/forcefield/mime
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "5"
|
||||
name = "invisible wall"
|
||||
alpha = 1
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
name = "glowshroom"
|
||||
desc = "Mycena Bregprox, a species of mushroom that glows in the dark."
|
||||
anchored = TRUE
|
||||
opacity = FALSE
|
||||
density = FALSE
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "glowshroomf"
|
||||
base_icon_state = "glowshroom" //replaced in New
|
||||
|
||||
@@ -42,11 +42,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
|
||||
|
||||
/obj/effect/landmark/spawner/tradergearminor
|
||||
name = "traderstart_specificgear_minor"
|
||||
icon_state = "questionmark"
|
||||
|
||||
/obj/effect/landmark/spawner/tradergearmajor
|
||||
name = "traderstart_specificgear_major"
|
||||
icon_state = "questionmark"
|
||||
|
||||
/obj/effect/landmark/spawner/ert
|
||||
name = "Response Team"
|
||||
@@ -280,7 +278,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
|
||||
|
||||
/obj/effect/landmark/start/assistant
|
||||
name = "Assistant"
|
||||
icon_state = "Assistant"
|
||||
|
||||
/obj/effect/landmark/start/atmospheric
|
||||
name = "Life Support Specialist"
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
/obj/effect/mine
|
||||
name = "dummy mine"
|
||||
desc = "I better stay away from that thing."
|
||||
density = FALSE
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "uglyminearmed"
|
||||
var/triggered = FALSE
|
||||
@@ -113,7 +112,6 @@
|
||||
desc = "pick me up."
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "electricity2"
|
||||
density = FALSE
|
||||
var/duration = 0
|
||||
|
||||
/obj/effect/mine/pickup/New()
|
||||
|
||||
@@ -134,10 +134,8 @@
|
||||
render_target = "*snap[id]"
|
||||
|
||||
/obj/effect/frosty_breath
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
layer = ABOVE_MOB_LAYER
|
||||
anchored = TRUE
|
||||
|
||||
/obj/effect/frosty_breath/Initialize(mapload, mob/living/carbon/C)
|
||||
. = ..()
|
||||
|
||||
@@ -39,12 +39,10 @@
|
||||
|
||||
/obj/effect/overlay/sparkles
|
||||
name = "sparkles"
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "shieldsparkles"
|
||||
|
||||
/obj/effect/overlay/adminoverlay
|
||||
name = "adminoverlay"
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "admin"
|
||||
layer = 4.1
|
||||
|
||||
@@ -63,7 +61,6 @@
|
||||
|
||||
/// Door overlay for animating closets
|
||||
/obj/effect/overlay/closet_door
|
||||
anchored = TRUE
|
||||
plane = FLOAT_PLANE
|
||||
layer = FLOAT_LAYER
|
||||
vis_flags = VIS_INHERIT_ID
|
||||
@@ -71,7 +68,6 @@
|
||||
|
||||
/obj/effect/overlay/vis
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
anchored = TRUE
|
||||
vis_flags = VIS_INHERIT_DIR
|
||||
///When detected to be unused it gets set to world.time, after a while it gets removed
|
||||
var/unused = 0
|
||||
|
||||
@@ -208,8 +208,6 @@
|
||||
name = "advanced portal"
|
||||
desc = "A portal capable of bypassing bluespace interference."
|
||||
icon_state = "portal1"
|
||||
failchance = 0
|
||||
precision = 0
|
||||
ignore_tele_proof_area_setting = TRUE
|
||||
|
||||
#undef EFFECT_COOLDOWN
|
||||
|
||||
@@ -64,7 +64,6 @@
|
||||
|
||||
/obj/effect/snow
|
||||
desc = "Perfect for making snow angels, or throwing at other people!"
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "snow1"
|
||||
plane = FLOOR_PLANE
|
||||
layer = ABOVE_ICYOVERLAY_LAYER
|
||||
|
||||
@@ -278,7 +278,6 @@ This spawner places pipe leading up to the interior door, you will need to finis
|
||||
name = "square airlock spawner (interior east, exterior south)"
|
||||
icon_state = "2x2_E_to_S"
|
||||
interior_direction = EAST
|
||||
exterior_direction = SOUTH
|
||||
|
||||
/obj/effect/spawner/airlock/long/square/wide
|
||||
name = "rectangular airlock spawner (interior north, exterior south)"
|
||||
@@ -303,8 +302,6 @@ This spawner places pipe leading up to the interior door, you will need to finis
|
||||
/obj/effect/spawner/airlock/long/square/three
|
||||
name = "3 by 3 square airlock spawner (interior north, exterior south)"
|
||||
icon_state = "3x3_N_to_S"
|
||||
interior_direction = NORTH
|
||||
exterior_direction = SOUTH
|
||||
tiles_in_x_direction = 3
|
||||
tiles_in_y_direction = 3
|
||||
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
btype = 1
|
||||
|
||||
/obj/effect/spawner/newbomb/radio
|
||||
btype = 0
|
||||
|
||||
|
||||
/obj/effect/spawner/newbomb/New()
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
/// Spawners for the Syndicate depot ruin.
|
||||
/obj/effect/spawner/random/syndicate
|
||||
name = "Syndicate Area Spawner"
|
||||
icon = 'icons/effects/random_spawners.dmi'
|
||||
|
||||
// Turrets
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/effect/spawner/random/bluespace_tap
|
||||
name = "bluespace harvester reward spawner"
|
||||
spawn_loot_count = 1
|
||||
|
||||
// Common clothing pool
|
||||
/obj/effect/spawner/random/bluespace_tap/clothes_common
|
||||
@@ -209,7 +208,6 @@
|
||||
// Common food pool
|
||||
/obj/effect/spawner/random/bluespace_tap/food_common
|
||||
name = "common fancy food"
|
||||
spawn_loot_count = 1
|
||||
loot = list(
|
||||
/obj/item/food/wingfangchu,
|
||||
/obj/item/food/hotdog,
|
||||
@@ -245,7 +243,6 @@
|
||||
// Uncommon food pool
|
||||
/obj/effect/spawner/random/bluespace_tap/food_uncommon
|
||||
name = "uncommon fancy food"
|
||||
spawn_loot_count = 1
|
||||
loot = list(
|
||||
/obj/item/food/sliceable/cheesecake,
|
||||
/obj/item/food/sliceable/bananacake,
|
||||
@@ -278,7 +275,6 @@
|
||||
// Rare food pool
|
||||
/obj/effect/spawner/random/bluespace_tap/food_rare
|
||||
name = "rare fancy food"
|
||||
spawn_loot_count = 1
|
||||
loot = list(
|
||||
/obj/item/food/monkeysdelight,
|
||||
/obj/item/food/dionaroast,
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
spawn_loot_chance = 16
|
||||
|
||||
/obj/effect/spawner/random/cobweb
|
||||
icon = 'icons/effects/random_spawners.dmi'
|
||||
|
||||
/obj/effect/spawner/random/cobweb/left
|
||||
name = "cobweb left 100% chance"
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
/obj/effect/spawner/random/loot
|
||||
name = "random loot spawner"
|
||||
icon_state = "loot"
|
||||
|
||||
/obj/effect/spawner/random/loot/contraband_posters
|
||||
name = "5x contraband posters spawner"
|
||||
spawn_loot_count = 5
|
||||
spawn_loot_double = TRUE
|
||||
loot = list(/obj/item/poster/random_contraband)
|
||||
|
||||
/obj/effect/spawner/random/loot/cryo_beakers
|
||||
name = "3x cryo beaker spawner"
|
||||
spawn_loot_count = 3
|
||||
spawn_loot_double = TRUE
|
||||
loot = list(/obj/item/reagent_containers/glass/beaker/bluespace)
|
||||
|
||||
/obj/effect/spawner/random/loot/good_times
|
||||
@@ -51,7 +48,6 @@
|
||||
|
||||
/obj/effect/spawner/random/loot/coins
|
||||
name = "coins spawner"
|
||||
spawn_loot_double = TRUE
|
||||
loot = list(
|
||||
/obj/item/coin/silver = 3,
|
||||
/obj/item/coin/iron = 3,
|
||||
|
||||
@@ -196,7 +196,6 @@
|
||||
|
||||
/obj/effect/spawner/random/fancy_table
|
||||
name = "fancy table spawner"
|
||||
icon = 'icons/effects/random_spawners.dmi'
|
||||
icon_state = "fancy_table"
|
||||
loot_type_path = /obj/structure/table/wood/fancy
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/effect/spawner/random/plushies
|
||||
name = "plushie spawner"
|
||||
icon = 'icons/effects/random_spawners.dmi'
|
||||
icon_state = "plushie"
|
||||
loot = list(
|
||||
list(
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/datum/spawn_pool/whiteship_mobs
|
||||
available_points = 0
|
||||
|
||||
/obj/effect/spawner/random/pool/whiteship_mob
|
||||
icon_state = "giftbox"
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
|
||||
/obj/effect/spawner/random/pool/spaceloot/syndicate/common
|
||||
name = "syndicate depot loot, common"
|
||||
icon_state = "loot"
|
||||
point_value = 10
|
||||
loot = list(
|
||||
// Loot schema: costumes, toys, useless gimmick items
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
/obj/effect/spawner/random
|
||||
icon = 'icons/effects/random_spawners.dmi'
|
||||
icon_state = "loot"
|
||||
layer = OBJ_LAYER
|
||||
/// Stops persistent lootdrop spawns from being shoved into lockers
|
||||
anchored = TRUE
|
||||
/// A list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
|
||||
var/list/loot
|
||||
/// The subtypes AND type to combine with the loot list
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/effect/spawner/random/tech_storage
|
||||
name = "generic circuit board spawner"
|
||||
icon = 'icons/effects/random_spawners.dmi'
|
||||
icon_state = "circuit_board"
|
||||
spawn_loot_split = TRUE
|
||||
spawn_loot_split_pixel_offsets = 3
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/effect/spawner/random/traders
|
||||
name = "trader item spawner"
|
||||
icon_state = "loot"
|
||||
spawn_loot_count = 6
|
||||
|
||||
/obj/effect/spawner/random/traders/civilian
|
||||
|
||||
@@ -306,7 +306,6 @@
|
||||
|
||||
/obj/effect/spawner/random/traders/merchantguild_major
|
||||
name = "12. merchant guild large gear"
|
||||
spawn_loot_count = 6 //Low-risk items, flavorful knick knacks - higher stock
|
||||
loot = list(
|
||||
/obj/item/clothing/suit/pimpcoat = 5,
|
||||
/obj/item/dualsaber/toy = 5,
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/effect/spawner/random/barrier
|
||||
name = "random barrier spawner"
|
||||
icon = 'icons/effects/random_spawners.dmi'
|
||||
icon_state = "barrier"
|
||||
loot = list(
|
||||
/obj/effect/spawner/window/reinforced,
|
||||
@@ -13,8 +12,6 @@
|
||||
|
||||
/obj/effect/spawner/random/barrier/temporary
|
||||
name = "random temporary barrier spawner"
|
||||
icon = 'icons/effects/random_spawners.dmi'
|
||||
icon_state = "barrier"
|
||||
loot = list(
|
||||
/obj/structure/barricade/wooden,
|
||||
/obj/structure/grille,
|
||||
@@ -34,7 +31,6 @@
|
||||
|
||||
/obj/effect/spawner/random/barrier/obstruction
|
||||
name = "obstruction"
|
||||
icon_state = "barrier"
|
||||
loot = list(
|
||||
/obj/machinery/door/airlock/welded,
|
||||
/obj/structure/barricade/wooden,
|
||||
|
||||
@@ -114,13 +114,10 @@
|
||||
name = "pod window spawner"
|
||||
icon_state = "podwindow_spawner"
|
||||
window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod
|
||||
useGrille = TRUE
|
||||
|
||||
/obj/effect/spawner/window/shuttle/survival_pod/tinted
|
||||
name = "tinted pod window spawner"
|
||||
icon_state = "podwindow_spawner"
|
||||
window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod/tinted
|
||||
useGrille = TRUE
|
||||
|
||||
/obj/effect/spawner/window/plastitanium
|
||||
name = "plastitanium window spawner"
|
||||
@@ -132,4 +129,3 @@
|
||||
name = "leaded plastitanium window spawner"
|
||||
icon_state = "leaded_plastitaniumwindow_spawner"
|
||||
window_to_spawn_full = /obj/structure/window/full/plastitanium/rad_protect
|
||||
useGrille = TRUE
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "stickyweb1"
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
max_integrity = 15
|
||||
cares_about_temperature = TRUE
|
||||
var/mob/living/carbon/human/master_commander = null
|
||||
@@ -33,7 +32,6 @@
|
||||
take_damage(5, BURN, 0, 0)
|
||||
|
||||
/obj/structure/spider/stickyweb
|
||||
icon_state = "stickyweb1"
|
||||
|
||||
/obj/structure/spider/stickyweb/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -229,7 +227,6 @@
|
||||
/obj/effect/decal/cleanable/spiderling_remains
|
||||
name = "spiderling remains"
|
||||
desc = "Green squishy mess."
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "greenshatter"
|
||||
|
||||
/obj/structure/spider/cocoon
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
icon = 'icons/effects/cult_effects.dmi'
|
||||
icon_state = null
|
||||
randomdir = FALSE
|
||||
duration = 10
|
||||
|
||||
/obj/effect/temp_visual/cult/sparks
|
||||
randomdir = TRUE
|
||||
@@ -12,7 +11,6 @@
|
||||
|
||||
/obj/effect/temp_visual/cult/sparks/hierophant
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
randomdir = TRUE
|
||||
duration = 12
|
||||
name = "purple sparks"
|
||||
icon_state = "hierophant_blast"
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
icon_state = null
|
||||
duration = 5
|
||||
randomdir = FALSE
|
||||
layer = MOB_LAYER - 0.1
|
||||
color = "#C80000"
|
||||
var/splatter_type = "splatter"
|
||||
@@ -50,8 +49,6 @@
|
||||
/obj/effect/temp_visual/dir_setting/speedbike_trail
|
||||
name = "speedbike trails"
|
||||
icon_state = "ion_fade"
|
||||
duration = 10
|
||||
randomdir = FALSE
|
||||
layer = MOB_LAYER - 0.2
|
||||
|
||||
/obj/effect/temp_visual/dir_setting/ninja
|
||||
@@ -169,7 +166,6 @@
|
||||
icon_state = "3"
|
||||
light_range = LIGHT_RANGE_FIRE
|
||||
light_color = LIGHT_COLOR_FIRE
|
||||
duration = 10
|
||||
layer = MASSIVE_OBJ_LAYER
|
||||
alpha = 250
|
||||
blend_mode = BLEND_ADD
|
||||
@@ -229,7 +225,6 @@
|
||||
name = "kinetic explosion"
|
||||
icon = 'icons/obj/projectiles.dmi'
|
||||
icon_state = "kinetic_blast"
|
||||
layer = ABOVE_MOB_LAYER
|
||||
duration = 4
|
||||
|
||||
/obj/effect/temp_visual/pka_explosion
|
||||
@@ -274,7 +269,6 @@
|
||||
name = "bleed"
|
||||
icon = 'icons/effects/bleed.dmi'
|
||||
icon_state = "bleed0"
|
||||
duration = 10
|
||||
var/shrink = TRUE
|
||||
|
||||
/obj/effect/temp_visual/bleed/Initialize(mapload, atom/size_calc_target)
|
||||
@@ -525,9 +519,7 @@
|
||||
|
||||
/obj/effect/temp_visual/electrocution
|
||||
name = "electrocution"
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "electrocution"
|
||||
duration = 1 SECONDS
|
||||
|
||||
/obj/effect/temp_visual/electrocution/Initialize(mapload, set_duration)
|
||||
duration = set_duration
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
icon_state = "impact_laser"
|
||||
|
||||
/obj/effect/projectile/impact/laser/blue
|
||||
name = "laser impact"
|
||||
icon_state = "impact_blue"
|
||||
|
||||
/obj/effect/projectile/impact/disabler
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/item/areaeditor
|
||||
name = "area modification item"
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "blueprints"
|
||||
attack_verb = list("attacked", "bapped", "hit")
|
||||
/// Extra text added to the description.
|
||||
@@ -73,11 +72,8 @@
|
||||
/obj/item/areaeditor/blueprints
|
||||
name = "station blueprints"
|
||||
desc = "Blueprints of the station. There is a \"<b>CONFIDENTIAL</b>\" stamp and several coffee stains on it."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "blueprints"
|
||||
fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-security storage."
|
||||
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
var/list/showing = list()
|
||||
var/client/viewing
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
name = "Chess Piece"
|
||||
desc = "A generic chess piece used in a game of chess."
|
||||
icon = 'icons/obj/chess.dmi'
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
//Black chess pieces.
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
new /obj/item/reagent_containers/pill/zoom(src)
|
||||
|
||||
/obj/item/reagent_containers/pill/random_drugs
|
||||
name = "pill"
|
||||
desc = "A cocktail of illicit designer drugs, who knows what might be in here."
|
||||
|
||||
/obj/item/reagent_containers/pill/random_drugs/Initialize(mapload)
|
||||
|
||||
@@ -175,7 +175,6 @@
|
||||
|
||||
/obj/item/door_remote/civillian
|
||||
name = "civilian door remote"
|
||||
icon_state = "gangtool-white"
|
||||
region_access = list(REGION_GENERAL)
|
||||
additional_access = list(ACCESS_HOP)
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS
|
||||
attack_verb = list("attacked", "coloured")
|
||||
toolspeed = 1
|
||||
var/colour = COLOR_RED
|
||||
var/drawtype = "rune"
|
||||
var/list/graffiti = list("body","amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","up","down","left","right","heart","borgsrogue","voxpox","shitcurity","catbeast","hieroglyphs1","hieroglyphs2","hieroglyphs3","security","syndicate1","syndicate2","nanotrasen","lie","valid","arrowleft","arrowright","arrowup","arrowdown","chicken","hailcrab","brokenheart","peace","scribble","scribble2","scribble3","skrek","squish","tunnelsnake","yip","youaredead")
|
||||
@@ -173,9 +172,6 @@
|
||||
|
||||
/obj/item/toy/crayon/red
|
||||
name = "red crayon"
|
||||
icon_state = "crayonred"
|
||||
colour = COLOR_RED
|
||||
dye_color = DYE_RED
|
||||
|
||||
/obj/item/toy/crayon/orange
|
||||
name = "orange crayon"
|
||||
|
||||
@@ -218,7 +218,6 @@
|
||||
icon = 'icons/obj/decorations.dmi'
|
||||
icon_state = ""
|
||||
density = TRUE
|
||||
anchored = FALSE
|
||||
max_integrity = 100
|
||||
|
||||
/obj/structure/decorative_structures/wrench_act(mob/user, obj/item/I)
|
||||
|
||||
@@ -114,7 +114,6 @@
|
||||
|
||||
/obj/item/paper/camera_bug
|
||||
name = "\improper Camera Bug Guide"
|
||||
icon_state = "paper"
|
||||
info = {"<b>Instructions on your new invasive camera utility</b><br>
|
||||
<br>
|
||||
This camera bug can access all default cameras on the station, along with the hidden cameras provided in this kit.<br>
|
||||
|
||||
@@ -96,8 +96,6 @@
|
||||
name = ""
|
||||
desc = ""
|
||||
resistance_flags = INDESTRUCTIBLE | FREEZE_PROOF
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
var/can_move = TRUE
|
||||
var/obj/item/chameleon/master = null
|
||||
|
||||
|
||||
@@ -5,10 +5,8 @@
|
||||
icon_state = "flash"
|
||||
item_state = "flashtool" //looks exactly like a flash (and nothing like a flashbang)
|
||||
belt_icon = "flash"
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
flags = CONDUCT
|
||||
materials = list(MAT_METAL = 300, MAT_GLASS = 300)
|
||||
origin_tech = "magnets=2;combat=1"
|
||||
|
||||
@@ -93,7 +93,6 @@
|
||||
item_state = ""
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS
|
||||
flags = CONDUCT
|
||||
brightness_on = 2
|
||||
var/colour = "blue" // Ink color
|
||||
|
||||
@@ -111,7 +110,6 @@
|
||||
desc = "A miniature lamp, that might be used by small robots."
|
||||
icon_state = "penlight"
|
||||
item_state = ""
|
||||
flags = CONDUCT
|
||||
brightness_on = 2
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
|
||||
@@ -123,7 +121,6 @@
|
||||
item_state = "lamp"
|
||||
brightness_on = 5
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
flags = CONDUCT
|
||||
materials = list()
|
||||
on = TRUE
|
||||
light_color = "#fff4bb"
|
||||
@@ -326,8 +323,6 @@
|
||||
brightness_on = 7
|
||||
icon_state = "torch"
|
||||
item_state = "torch"
|
||||
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
|
||||
light_color = LIGHT_COLOR_ORANGE
|
||||
on_damage = 10
|
||||
|
||||
@@ -335,7 +330,6 @@
|
||||
gender = PLURAL
|
||||
name = "glowing slime extract"
|
||||
desc = "A glowing ball of what appears to be amber."
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "slime-on"
|
||||
item_state = "slime"
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
@@ -412,7 +406,6 @@
|
||||
icon_state = null
|
||||
light_color = null
|
||||
brightness_on = 0
|
||||
light_range = 0
|
||||
light_power = 10
|
||||
alpha = 0
|
||||
layer = 0
|
||||
@@ -425,6 +418,5 @@
|
||||
name = "eyelight"
|
||||
desc = "This shouldn't exist outside of someone's head, how are you seeing this?"
|
||||
light_range = 15
|
||||
light_power = 1
|
||||
flags = CONDUCT | DROPDEL
|
||||
actions_types = list()
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
name = "handheld defibrillator"
|
||||
desc = "Used to restart stopped hearts."
|
||||
icon = 'icons/obj/medical.dmi'
|
||||
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
|
||||
icon_state = "defib-on"
|
||||
item_state = "defib"
|
||||
belt_icon = "defib"
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
origin_tech = "bluespace=1"
|
||||
flags = CONDUCT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
throw_speed = 2
|
||||
throw_range = 9
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
|
||||
@@ -66,7 +65,6 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/beacon/syndicate/bundle
|
||||
name = "suspicious beacon"
|
||||
desc = "A label on it reads: <i>Activate to select a bundle</i>."
|
||||
var/list/static/bundles = list(
|
||||
"Spy" = /obj/item/storage/box/syndie_kit/bundle/spy,
|
||||
@@ -113,7 +111,6 @@
|
||||
user.put_in_hands(bundle)
|
||||
|
||||
/obj/item/beacon/syndicate/power_sink
|
||||
name = "suspicious beacon"
|
||||
desc = "A label on it reads: <i>Warning: Activating this device will send a power sink to your location</i>."
|
||||
|
||||
/obj/item/beacon/syndicate/power_sink/attack_self__legacy__attackchain(mob/user)
|
||||
@@ -125,7 +122,6 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/beacon/syndicate/bomb
|
||||
name = "suspicious beacon"
|
||||
desc = "A label on it reads: <i>Warning: Activating this device will send a high-ordinance explosive to your location</i>."
|
||||
origin_tech = "bluespace=5;syndicate=5"
|
||||
var/bomb = /obj/machinery/syndicatebomb
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
|
||||
/obj/item/encryptionkey/soviet
|
||||
name = "soviet encryption key"
|
||||
icon_state = "cypherkey"
|
||||
channels = list("Special Ops" = 1)
|
||||
origin_tech = "syndicate=4"
|
||||
|
||||
|
||||
@@ -106,7 +106,6 @@
|
||||
name = "syndicate headset"
|
||||
desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs."
|
||||
flags = EARBANGPROTECT
|
||||
origin_tech = "syndicate=3"
|
||||
icon_state = "syndie_headset"
|
||||
item_state = "syndie_headset"
|
||||
|
||||
@@ -147,7 +146,6 @@
|
||||
name = "security radio headset"
|
||||
desc = "This is used by your elite security force."
|
||||
icon_state = "sec_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_sec
|
||||
|
||||
/obj/item/radio/headset/headset_sec/alt
|
||||
@@ -175,56 +173,48 @@
|
||||
name = "engineering radio headset"
|
||||
desc = "When the engineers wish to chat like girls."
|
||||
icon_state = "eng_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_eng
|
||||
|
||||
/obj/item/radio/headset/headset_rob
|
||||
name = "robotics radio headset"
|
||||
desc = "Made specifically for the roboticists who cannot decide between departments."
|
||||
icon_state = "rob_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_rob
|
||||
|
||||
/obj/item/radio/headset/headset_med
|
||||
name = "medical radio headset"
|
||||
desc = "A headset for the trained staff of the medbay."
|
||||
icon_state = "med_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_med
|
||||
|
||||
/obj/item/radio/headset/headset_med/para
|
||||
name = "paramedic radio headset"
|
||||
desc = "A headset for the trusty paramedic, Nanotrasen search and rescue."
|
||||
icon_state = "para_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_med/para
|
||||
|
||||
/obj/item/radio/headset/headset_sci
|
||||
name = "science radio headset"
|
||||
desc = "A sciency headset. Like usual."
|
||||
icon_state = "sci_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_sci
|
||||
|
||||
/obj/item/radio/headset/headset_medsci
|
||||
name = "medical research radio headset"
|
||||
desc = "A headset that is a result of the mating between medical and science."
|
||||
icon_state = "medsci_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_medsci
|
||||
|
||||
/obj/item/radio/headset/headset_com
|
||||
name = "command radio headset"
|
||||
desc = "A headset with a commanding channel."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_com
|
||||
|
||||
/obj/item/radio/headset/heads/captain
|
||||
name = "captain's headset"
|
||||
desc = "The headset of the boss."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/captain
|
||||
|
||||
/obj/item/radio/headset/heads/captain/alt
|
||||
@@ -238,14 +228,12 @@
|
||||
name = "research director's headset"
|
||||
desc = "Headset of the researching God."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/rd
|
||||
|
||||
/obj/item/radio/headset/heads/hos
|
||||
name = "head of security's headset"
|
||||
desc = "The headset of the man who protects your worthless lives."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/hos
|
||||
|
||||
/obj/item/radio/headset/heads/hos/alt
|
||||
@@ -259,35 +247,30 @@
|
||||
name = "chief engineer's headset"
|
||||
desc = "The headset of the guy who is in charge of morons."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/ce
|
||||
|
||||
/obj/item/radio/headset/heads/cmo
|
||||
name = "chief medical officer's headset"
|
||||
desc = "The headset of the highly trained medical chief."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/cmo
|
||||
|
||||
/obj/item/radio/headset/heads/hop
|
||||
name = "head of personnel's headset"
|
||||
desc = "The headset of the guy who will one day be captain."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/hop
|
||||
|
||||
/obj/item/radio/headset/heads/qm
|
||||
name = "quartermaster's headset"
|
||||
desc = "Smelling of tobacco and gunpowder, this headset has likely seen many backroom deals."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/qm
|
||||
|
||||
/obj/item/radio/headset/headset_cargo
|
||||
name = "supply radio headset"
|
||||
desc = "A headset used by the cargo department."
|
||||
icon_state = "cargo_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_cargo
|
||||
|
||||
/obj/item/radio/headset/headset_cargo/mining
|
||||
@@ -304,28 +287,24 @@
|
||||
name = "service radio headset"
|
||||
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
|
||||
icon_state = "srv_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_service
|
||||
|
||||
/obj/item/radio/headset/heads/ntrep
|
||||
name = "nanotrasen representative's headset"
|
||||
desc = "The headset of the Nanotrasen Representative."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/ntrep
|
||||
|
||||
/obj/item/radio/headset/headset_nct
|
||||
name = "\improper Nanotrasen career trainer radio headset"
|
||||
desc = "This is used by your well-taught corporate training team."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/headset_nct
|
||||
|
||||
/obj/item/radio/headset/heads/magistrate
|
||||
name = "magistrate's headset"
|
||||
desc = "The headset of the Magistrate."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/magistrate
|
||||
|
||||
/obj/item/radio/headset/heads/magistrate/alt
|
||||
@@ -339,7 +318,6 @@
|
||||
name = "blueshield's headset"
|
||||
desc = "The headset of the Blueshield."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/blueshield
|
||||
|
||||
/obj/item/radio/headset/heads/blueshield/alt
|
||||
@@ -353,7 +331,6 @@
|
||||
name = "emergency response team headset"
|
||||
desc = "The headset of the boss's boss."
|
||||
icon_state = "com_headset"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/ert
|
||||
freqlock = TRUE
|
||||
|
||||
@@ -398,7 +375,6 @@
|
||||
desc = "Integrated AI radio transceiver."
|
||||
icon = 'icons/obj/robot_component.dmi'
|
||||
icon_state = "radio"
|
||||
item_state = "headset"
|
||||
ks2type = /obj/item/encryptionkey/heads/ai_integrated
|
||||
var/myAi = null // Atlantis: Reference back to the AI which has this radio.
|
||||
var/disabledAi = FALSE // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
anchored = TRUE
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
canhear_range = 2
|
||||
flags = CONDUCT
|
||||
blocks_emissive = FALSE
|
||||
var/circuitry_installed = 1
|
||||
var/buildstage = 0
|
||||
@@ -16,7 +15,6 @@
|
||||
/obj/item/radio/intercom/custom
|
||||
name = "station intercom (Custom)"
|
||||
custom_name = TRUE
|
||||
broadcasting = FALSE
|
||||
listening = FALSE
|
||||
|
||||
/obj/item/radio/intercom/interrogation
|
||||
@@ -42,8 +40,6 @@
|
||||
/obj/item/radio/intercom/department
|
||||
canhear_range = 5
|
||||
custom_name = TRUE
|
||||
broadcasting = FALSE
|
||||
listening = TRUE
|
||||
|
||||
/obj/item/radio/intercom/department/medbay
|
||||
name = "station intercom (Medbay)"
|
||||
@@ -284,7 +280,6 @@
|
||||
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'
|
||||
|
||||
/obj/item/radio/intercom/locked
|
||||
|
||||
@@ -65,7 +65,6 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems)
|
||||
|
||||
flags = CONDUCT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
throw_speed = 2
|
||||
throw_range = 9
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
|
||||
@@ -631,7 +630,6 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems)
|
||||
icon = 'icons/obj/robot_component.dmi' // Cyborgs radio icons should look like the component.
|
||||
icon_state = "radio"
|
||||
has_loudspeaker = TRUE
|
||||
loudspeaker = FALSE
|
||||
canhear_range = 0
|
||||
dog_fashion = null
|
||||
freqlock = TRUE // don't let cyborgs change the default channel of their internal radio away from common
|
||||
@@ -765,13 +763,10 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems)
|
||||
|
||||
/obj/item/radio/off
|
||||
listening = FALSE
|
||||
dog_fashion = /datum/dog_fashion/back
|
||||
|
||||
/obj/item/radio/phone
|
||||
broadcasting = FALSE
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "red_phone"
|
||||
listening = TRUE
|
||||
name = "phone"
|
||||
dog_fashion = null
|
||||
|
||||
|
||||
@@ -145,7 +145,6 @@ SLIME SCANNER
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
materials = list(MAT_METAL=200)
|
||||
origin_tech = "magnets=1;biotech=1"
|
||||
/// Can be SIMPLE_HEALTH_SCAN (damage is only shown as a single % value), or DETAILED_HEALTH_SCAN (shows the % value and also damage for every specific limb).
|
||||
@@ -597,7 +596,6 @@ SLIME SCANNER
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
flags = CONDUCT
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
materials = list(MAT_METAL = 210, MAT_GLASS = 140)
|
||||
origin_tech = "magnets=1;engineering=1"
|
||||
var/cooldown = FALSE
|
||||
@@ -925,7 +923,6 @@ SLIME SCANNER
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
flags = CONDUCT
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
materials = list(MAT_METAL=30, MAT_GLASS=20)
|
||||
|
||||
/obj/item/slime_scanner/attack__legacy__attackchain(mob/living/M, mob/living/user)
|
||||
@@ -1002,7 +999,6 @@ SLIME SCANNER
|
||||
desc = "Scan an entire body to prepare for field surgery. Consumes power for each scan."
|
||||
|
||||
/obj/item/bodyanalyzer/borg/syndicate
|
||||
scan_time = 5 SECONDS
|
||||
scan_cd = 20 SECONDS
|
||||
|
||||
/obj/item/bodyanalyzer/New()
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
|
||||
force = 2
|
||||
throwforce = 0
|
||||
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
|
||||
/// If its currently recording
|
||||
@@ -273,7 +272,6 @@
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
materials = list(MAT_METAL = 40, MAT_GLASS = 10)
|
||||
force = 1
|
||||
throwforce = 0
|
||||
drop_sound = 'sound/items/handling/tape_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/tape_pickup.ogg'
|
||||
var/max_capacity = 600
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
/obj/item/thermal_drill
|
||||
name = "thermal safe drill"
|
||||
desc = "A tungsten carbide thermal drill with magnetic clamps for the purpose of drilling hardened objects. Guaranteed 100% jam proof."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "hardened_drill"
|
||||
w_class = WEIGHT_CLASS_GIGANTIC
|
||||
force = 15.0
|
||||
|
||||
@@ -242,7 +242,6 @@
|
||||
|
||||
/obj/item/paper/teleporter
|
||||
name = "Teleporter Guide"
|
||||
icon_state = "paper"
|
||||
info = {"<b>Instructions on your new prototype syndicate teleporter</b><br>
|
||||
<br>
|
||||
This teleporter will teleport the user 4-8 meters in the direction they are facing. Unlike the cult veil shifter, you can not drag people with you.<br>
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "docs_generic"
|
||||
item_state = "paper"
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
throw_range = 1
|
||||
throw_speed = 1
|
||||
@@ -28,7 +27,6 @@
|
||||
|
||||
/obj/item/documents/syndicate/red
|
||||
name = "'Red' secret documents"
|
||||
desc = "Documents printed on special copy-protected paper. They detail sensitive Syndicate operational intelligence."
|
||||
icon_state = "docs_red"
|
||||
|
||||
/obj/item/documents/syndicate/red/examine(mob/user)
|
||||
@@ -37,7 +35,6 @@
|
||||
|
||||
/obj/item/documents/syndicate/blue
|
||||
name = "'Blue' secret documents"
|
||||
desc = "Documents printed on special copy-protected paper. They detail sensitive Syndicate operational intelligence."
|
||||
icon_state = "docs_blue"
|
||||
|
||||
/obj/item/documents/syndicate/blue/examine(mob/user)
|
||||
@@ -46,7 +43,6 @@
|
||||
|
||||
/obj/item/documents/syndicate/yellow
|
||||
name = "'Yellow' secret documents"
|
||||
desc = "Documents printed on special copy-protected paper. They detail sensitive Syndicate operational intelligence."
|
||||
icon_state = "docs_yellow"
|
||||
resistance_flags = NONE
|
||||
|
||||
@@ -81,7 +77,6 @@
|
||||
name = "\improper D.V.O.R.A.K Blackbox Disk"
|
||||
desc = "This disk contains a full record of all information that passed through D.V.O.R.A.K's systems during its uptime, not to mention what may have gone wrong. NT might be interested in this."
|
||||
icon = 'icons/obj/module.dmi'
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
item_state = "card-id"
|
||||
icon_state = "holodisk"
|
||||
drop_sound = 'sound/items/handling/disk_drop.ogg'
|
||||
|
||||
@@ -51,7 +51,6 @@
|
||||
/obj/item/flag/nt
|
||||
name = "\improper Nanotrasen flag"
|
||||
desc = "A flag proudly boasting the logo of NT."
|
||||
icon_state = "ntflag"
|
||||
|
||||
/obj/item/flag/clown
|
||||
name = "\improper Clown Unity flag"
|
||||
@@ -171,7 +170,6 @@
|
||||
/obj/item/flag/command
|
||||
name = "\improper Command flag"
|
||||
desc = "The flag of the independent, sovereign nation of Command. Apparently the budget was all spent on this flag, rather than a creative name."
|
||||
icon_state = "ntflag"
|
||||
|
||||
//Antags
|
||||
|
||||
@@ -210,7 +208,6 @@
|
||||
/obj/item/flag/chameleon
|
||||
name = "chameleon flag"
|
||||
desc = "A poor recreation of the official NT flag. It seems to shimmer a little."
|
||||
icon_state = "ntflag"
|
||||
origin_tech = "syndicate=1;magnets=4"
|
||||
var/updated_icon_state = null
|
||||
var/used = FALSE
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
clothes_req = FALSE
|
||||
overlay = null
|
||||
action_icon_state = "cheese_wedge"
|
||||
action_background_icon_state = "bg_spell"
|
||||
summon_type = list(/obj/item/food/sliced/cheesewedge)
|
||||
summon_amt = 9
|
||||
aoe_range = 1
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
desc = "This is how real men fight."
|
||||
icon_state = "latexballon"
|
||||
item_state = "nothing"
|
||||
force = 0
|
||||
throwforce = 0
|
||||
flags = DROPDEL | ABSTRACT
|
||||
attack_verb = list("slapped")
|
||||
hitsound = 'sound/weapons/slap.ogg'
|
||||
|
||||
@@ -3,11 +3,8 @@
|
||||
desc = "You wanted a fiery fist o' pain, but all you got was this dumb balloon."
|
||||
icon_state = "latexballon"
|
||||
item_state = "lgloves"
|
||||
force = 0
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
throw_speed = 1
|
||||
throw_range = 7
|
||||
cares_about_temperature = TRUE
|
||||
var/state
|
||||
var/datum/gas_mixture/air_contents = null
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
icon_state = "apc_frame"
|
||||
|
||||
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
|
||||
metal_sheets_refunded = 2
|
||||
|
||||
/obj/item/mounted/frame/apc_frame/try_build(turf/on_wall, mob/user)
|
||||
if(!..())
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
icon_state = "extinguisher_frame"
|
||||
|
||||
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
|
||||
metal_sheets_refunded = 2
|
||||
|
||||
/obj/item/mounted/frame/extinguisher/do_build(turf/on_wall, mob/user)
|
||||
new /obj/structure/extinguisher_cabinet/empty(get_turf(src), get_dir(user, on_wall))
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
icon_state = "firealarm_frame"
|
||||
|
||||
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
|
||||
metal_sheets_refunded = 2
|
||||
|
||||
/obj/item/mounted/frame/firealarm/do_build(turf/on_wall, mob/user)
|
||||
new /obj/machinery/firealarm(get_turf(src), get_dir(user, on_wall), 1)
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
name = "mountable frame"
|
||||
desc = "Place it on a wall."
|
||||
origin_tech = "materials=1;engineering=1"
|
||||
toolspeed = 1
|
||||
usesound = 'sound/items/deconstruct.ogg'
|
||||
|
||||
///amount of metal sheets returned upon the frame being wrenched
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
icon_state = "intercom-frame"
|
||||
|
||||
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
|
||||
metal_sheets_refunded = 2
|
||||
|
||||
/obj/item/mounted/frame/intercom/do_build(turf/on_wall, mob/user)
|
||||
new /obj/item/radio/intercom(get_turf(src), get_dir(user, on_wall), 0)
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
icon_state = "tube-construct-item"
|
||||
|
||||
mount_requirements = MOUNTED_FRAME_SIMFLOOR
|
||||
metal_sheets_refunded = 2
|
||||
///specifies which type of light fixture this frame will build
|
||||
var/fixture_type = "tube"
|
||||
|
||||
@@ -44,7 +43,6 @@
|
||||
/obj/item/mounted/frame/light_fixture/small
|
||||
name = "small light fixture frame"
|
||||
desc = "Used for building small lights."
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "bulb-construct-item"
|
||||
fixture_type = "bulb"
|
||||
metal_sheets_refunded = 1
|
||||
@@ -52,7 +50,6 @@
|
||||
/obj/item/mounted/frame/light_fixture/floor
|
||||
name = "floor light fixture frame"
|
||||
desc = "Used for building floor lights."
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "floor-construct-item"
|
||||
fixture_type = "floor"
|
||||
metal_sheets_refunded = 3
|
||||
@@ -70,19 +67,15 @@
|
||||
/obj/item/mounted/frame/light_fixture/clockwork/small
|
||||
name = "brass small light fixture frame"
|
||||
desc = "Used for building small brass lights."
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "clockwork_bulb-construct-item"
|
||||
fixture_type = "clockwork_bulb"
|
||||
metal_sheets_refunded = 0
|
||||
brass_sheets_refunded = 1
|
||||
|
||||
/obj/item/mounted/frame/light_fixture/clockwork/floor
|
||||
name = "brass floor light fixture frame"
|
||||
desc = "Used for building brass floor lights."
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "clockwork_floor-construct-item"
|
||||
fixture_type = "clockwork_floor"
|
||||
metal_sheets_refunded = 0
|
||||
brass_sheets_refunded = 3
|
||||
buildon_types = list(/turf/simulated/floor)
|
||||
allow_floor_mounting = TRUE
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
|
||||
/obj/item/reagent_containers/drinks/bottle/random_drink
|
||||
name = "unlabelled drink"
|
||||
icon = 'icons/obj/drinks.dmi'
|
||||
|
||||
/obj/item/reagent_containers/drinks/bottle/random_drink/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
/obj/item/inflatable/cyborg
|
||||
name = "inflatable wall"
|
||||
desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
|
||||
var/power_use = 400
|
||||
var/structure_type = /obj/structure/inflatable
|
||||
/// How long it takes to inflate
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
var/list/part = null
|
||||
var/sabotaged = FALSE //Emagging limbs can have repercussions when installed as prosthetics.
|
||||
var/model_info = "Unbranded"
|
||||
dir = SOUTH
|
||||
|
||||
/obj/item/robot_parts/New(newloc, model)
|
||||
..(newloc)
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
hitsound = 'sound/items/handling/salvagepickup.ogg'
|
||||
pickup_sound = 'sound/items/handling/salvagepickup.ogg'
|
||||
drop_sound = 'sound/items/handling/salvagedrop.ogg'
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
/obj/item/salvage/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
desc = "A shooting target."
|
||||
icon = 'icons/obj/objects.dmi'
|
||||
icon_state = "target_h"
|
||||
density = FALSE
|
||||
var/hp = 1800
|
||||
|
||||
/obj/item/target/Destroy()
|
||||
|
||||
@@ -4,11 +4,6 @@
|
||||
desc = "An inflatable ball of fun, enjoyed on many beaches."
|
||||
icon_state = "ball"
|
||||
item_state = "beachball"
|
||||
density = FALSE
|
||||
anchored = FALSE
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
force = 0
|
||||
throwforce = 0
|
||||
throw_speed = 1
|
||||
throw_range = 20
|
||||
flags = CONDUCT
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
max_amount = 6
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 40
|
||||
parent_stack = TRUE
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
origin_tech = "materials=2;engineering=3"
|
||||
amount = 6
|
||||
max_amount = 6
|
||||
toolspeed = 1
|
||||
merge_type = /obj/item/stack/nanopaste
|
||||
|
||||
/obj/item/stack/nanopaste/attack__legacy__attackchain(mob/living/M as mob, mob/user as mob)
|
||||
|
||||
@@ -27,16 +27,12 @@ GLOBAL_LIST_INIT(rod_recipes, list (
|
||||
icon_state = "rods-5"
|
||||
item_state = "rods"
|
||||
flags = CONDUCT
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
force = 9.0
|
||||
throwforce = 10.0
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
materials = list(MAT_METAL=1000)
|
||||
max_amount = 50
|
||||
attack_verb = list("hit", "bludgeoned", "whacked")
|
||||
hitsound = 'sound/weapons/grenadelaunch.ogg'
|
||||
toolspeed = 1
|
||||
usesound = 'sound/items/deconstruct.ogg'
|
||||
merge_type = /obj/item/stack/rods
|
||||
|
||||
@@ -97,10 +93,7 @@ GLOBAL_LIST_INIT(rod_recipes, list (
|
||||
desc = "Treated, specialized iron rods. When exposed to the vacuum of space their coating breaks off, but they can hold up against the extreme heat of molten liquids."
|
||||
singular_name = "heat resistant rod"
|
||||
color = "#5286b9ff"
|
||||
flags = CONDUCT
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
materials = list(MAT_METAL = 1000, MAT_TITANIUM = 1000, MAT_PLASMA = 1000)
|
||||
max_amount = 50
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
merge_type = /obj/item/stack/rods/lava
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ GLOBAL_LIST_INIT(glass_recipes, list (
|
||||
materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 100)
|
||||
resistance_flags = ACID_PROOF
|
||||
origin_tech = "materials=1"
|
||||
created_window = /obj/structure/window/basic
|
||||
full_window = /obj/structure/window/full/basic
|
||||
merge_type = /obj/item/stack/sheet/glass
|
||||
|
||||
@@ -68,7 +68,6 @@ GLOBAL_LIST_INIT(lizard_recipes, list(
|
||||
icon = 'icons/obj/stacks/organic.dmi'
|
||||
icon_state = "sheet-hide"
|
||||
origin_tech = "materials=2"
|
||||
max_amount = 50
|
||||
|
||||
/obj/item/stack/sheet/animalhide/xeno
|
||||
name = "alien hide"
|
||||
@@ -180,12 +179,10 @@ GLOBAL_LIST_INIT(sinew_recipes, list (
|
||||
/obj/item/stack/sheet/animalhide/goliath_hide
|
||||
name = "goliath hide plates"
|
||||
desc = "Pieces of a goliath's rocky hide, these might be able to make your miner equipment such as suits, plasmaman helmets, borgs and Ripley class exosuits a bit more durable to attack from the local fauna."
|
||||
icon = 'icons/obj/stacks/organic.dmi'
|
||||
icon_state = "goliath_hide"
|
||||
item_state = "goliath_hide"
|
||||
singular_name = "hide plate"
|
||||
flags = NOBLUDGEON
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
layer = MOB_LAYER
|
||||
dynamic_icon_state = TRUE
|
||||
var/static/list/goliath_platable_armor_typecache = typecacheof(list(
|
||||
@@ -244,7 +241,6 @@ GLOBAL_LIST_INIT(sinew_recipes, list (
|
||||
item_state = "armor_plate"
|
||||
singular_name = "armor plate"
|
||||
flags = NOBLUDGEON
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
layer = MOB_LAYER
|
||||
|
||||
/obj/item/stack/sheet/animalhide/armor_plate/afterattack__legacy__attackchain(atom/target, mob/user, proximity_flag)
|
||||
@@ -271,12 +267,10 @@ GLOBAL_LIST_INIT(sinew_recipes, list (
|
||||
/obj/item/stack/sheet/animalhide/ashdrake
|
||||
name = "ash drake hide"
|
||||
desc = "The strong, scaled hide of an ash drake. Can be attached to the mech itself, greatly enhancing its protective characteristics. Unfortunately, only working class exosuits have notches for such armor."
|
||||
icon = 'icons/obj/stacks/organic.dmi'
|
||||
icon_state = "dragon_hide"
|
||||
item_state = "dragon_hide"
|
||||
singular_name = "drake plate"
|
||||
flags = NOBLUDGEON
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
layer = MOB_LAYER
|
||||
dynamic_icon_state = TRUE
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
desc = "A glass tile, which is wired, somehow."
|
||||
icon = 'icons/obj/tiles.dmi'
|
||||
icon_state = "glass_wire"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
force = 3.0
|
||||
throwforce = 5.0
|
||||
throw_speed = 5
|
||||
|
||||
@@ -144,8 +144,6 @@ GLOBAL_LIST_INIT(snow_recipes, list(
|
||||
))
|
||||
|
||||
/obj/item/stack/sheet/mineral
|
||||
force = 5
|
||||
throwforce = 5
|
||||
throw_speed = 3
|
||||
|
||||
/obj/item/stack/sheet/mineral/Initialize(mapload, new_amount, merge)
|
||||
@@ -163,7 +161,6 @@ GLOBAL_LIST_INIT(snow_recipes, list(
|
||||
icon_state = "sheet-sandstone"
|
||||
item_state = "sheet-sandstone"
|
||||
throw_range = 5
|
||||
origin_tech = "materials=1"
|
||||
sheettype = "sandstone"
|
||||
materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
|
||||
@@ -506,11 +503,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
|
||||
icon_state = "sheet-titanium"
|
||||
item_state = "sheet-titanium"
|
||||
singular_name = "titanium sheet"
|
||||
force = 5
|
||||
throwforce = 5
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
throw_speed = 1
|
||||
throw_range = 3
|
||||
sheettype = "titanium"
|
||||
merge_type = /obj/item/stack/sheet/mineral/titanium
|
||||
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT)
|
||||
@@ -548,11 +541,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list(
|
||||
icon_state = "sheet-plastitanium"
|
||||
item_state = "sheet-plastitanium"
|
||||
singular_name = "plastitanium sheet"
|
||||
force = 5
|
||||
throwforce = 5
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
throw_speed = 1
|
||||
throw_range = 3
|
||||
sheettype = "plastitanium"
|
||||
merge_type = /obj/item/stack/sheet/mineral/plastitanium
|
||||
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
|
||||
@@ -588,9 +577,6 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list(
|
||||
item_state = "sheet-abductor"
|
||||
dynamic_icon_state = FALSE
|
||||
singular_name = "alien alloy sheet"
|
||||
force = 5
|
||||
throwforce = 5
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
throw_speed = 1
|
||||
origin_tech = "materials=6;abductor=1"
|
||||
sheettype = "abductor"
|
||||
|
||||
@@ -139,7 +139,6 @@ GLOBAL_LIST_INIT(metal_recipes, list(
|
||||
throwforce = 10.0
|
||||
flags = CONDUCT
|
||||
resistance_flags = FIRE_PROOF
|
||||
origin_tech = "materials=1"
|
||||
merge_type = /obj/item/stack/sheet/metal
|
||||
point_value = 2
|
||||
table_type = /obj/structure/table
|
||||
@@ -464,7 +463,6 @@ GLOBAL_LIST_INIT(durathread_recipes, list (
|
||||
name = "raw durathread bundle"
|
||||
desc = "A bundle of raw durathread ready to be spun on the loom."
|
||||
singular_name = "raw durathread ball"
|
||||
icon_state = "sheet-durathreadraw"
|
||||
icon = 'icons/obj/stacks/organic.dmi'
|
||||
merge_type = /obj/item/stack/sheet/cotton/durathread
|
||||
pull_effort = 70
|
||||
@@ -523,7 +521,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list (
|
||||
icon = 'icons/obj/stacks/miscellaneous.dmi'
|
||||
icon_state = "sheet-card"
|
||||
item_state = "sheet-card"
|
||||
origin_tech = "materials=1"
|
||||
resistance_flags = FLAMMABLE
|
||||
merge_type = /obj/item/stack/sheet/cardboard
|
||||
|
||||
@@ -545,7 +542,6 @@ GLOBAL_LIST_INIT(soil_recipes, list (
|
||||
icon = 'icons/obj/stacks/organic.dmi'
|
||||
icon_state = "sheet-soil"
|
||||
item_state = "sheet-soil"
|
||||
origin_tech = "materials=1"
|
||||
resistance_flags = FIRE_PROOF
|
||||
merge_type = /obj/item/stack/sheet/soil
|
||||
|
||||
@@ -690,10 +686,6 @@ GLOBAL_LIST_INIT(brass_recipes, list (
|
||||
singular_name = "bone"
|
||||
desc = "Someone's been drinking their milk."
|
||||
force = 7
|
||||
throwforce = 5
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
throw_speed = 1
|
||||
throw_range = 3
|
||||
origin_tech = "materials=2;biotech=2"
|
||||
|
||||
//////////////////////////////
|
||||
|
||||
@@ -3,10 +3,8 @@
|
||||
icon = 'icons/obj/stacks/minerals.dmi'
|
||||
lefthand_file = 'icons/mob/inhands/sheet_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/sheet_righthand.dmi'
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
force = 5
|
||||
throwforce = 5
|
||||
max_amount = 50
|
||||
throw_speed = 1
|
||||
throw_range = 3
|
||||
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
|
||||
@@ -17,7 +15,6 @@
|
||||
var/created_window = null //apparently glass sheets don't share a base type for glass specifically, so each had to define these vars individually
|
||||
var/full_window = null //moving the var declaration to here so this can be checked cleaner until someone is willing to make them share a base type properly
|
||||
usesound = 'sound/items/deconstruct.ogg'
|
||||
toolspeed = 1
|
||||
var/wall_allowed = TRUE //determines if sheet can be used in wall construction or not.
|
||||
dynamic_icon_state = TRUE
|
||||
|
||||
|
||||
@@ -5,14 +5,12 @@
|
||||
icon = 'icons/obj/tiles.dmi'
|
||||
icon_state = "tile"
|
||||
item_state = "tile"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
force = 1
|
||||
throwforce = 1
|
||||
throw_speed = 5
|
||||
throw_range = 20
|
||||
max_amount = 60
|
||||
flags = CONDUCT
|
||||
origin_tech = "materials=1"
|
||||
var/turf_type = null
|
||||
var/mineralType = null
|
||||
scatter_distance = 3
|
||||
@@ -229,13 +227,11 @@
|
||||
gender = PLURAL
|
||||
singular_name = "floor tile"
|
||||
desc = "Those could work as a pretty decent throwing weapon."
|
||||
icon_state = "tile"
|
||||
force = 6
|
||||
materials = list(MAT_METAL=500)
|
||||
throwforce = 10
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
flags = CONDUCT
|
||||
turf_type = /turf/simulated/floor/plasteel
|
||||
mineralType = "metal"
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
|
||||
@@ -297,7 +293,6 @@
|
||||
singular_name = "light pod floor tile"
|
||||
desc = "A lightly colored grooved floor tile."
|
||||
icon_state = "tile_podlight"
|
||||
turf_type = /turf/simulated/floor/pod
|
||||
|
||||
/obj/item/stack/tile/pod/dark
|
||||
name = "dark pod floor tile"
|
||||
@@ -340,7 +335,6 @@
|
||||
throwforce = 10
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
flags = CONDUCT
|
||||
turf_type = /turf/simulated/floor/catwalk
|
||||
mineralType = "metal"
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
|
||||
|
||||
@@ -10,13 +10,11 @@
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
force = 5
|
||||
throwforce = 7
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
materials = list(MAT_METAL = 300)
|
||||
drop_sound = 'sound/items/handling/crowbar_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/crowbar_pickup.ogg'
|
||||
origin_tech = "engineering=1;combat=1"
|
||||
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
|
||||
toolspeed = 1
|
||||
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
|
||||
tool_behaviour = TOOL_CROWBAR
|
||||
@@ -117,7 +115,6 @@
|
||||
/obj/item/crowbar/power
|
||||
name = "jaws of life"
|
||||
desc = "A compact and powerful industrial tool with a modular head. This one has a set of prying jaws attached, which are strong enough to pry open powered airlocks."
|
||||
flags = CONDUCT
|
||||
icon_state = "jaws_pry"
|
||||
item_state = "jawsoflife"
|
||||
belt_icon = "jaws"
|
||||
@@ -126,7 +123,6 @@
|
||||
usesound = 'sound/items/jaws_pry.ogg'
|
||||
force = 15
|
||||
toolspeed = 0.25
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
var/airlock_open_time = 100 // Time required to open powered airlocks
|
||||
|
||||
/obj/item/crowbar/power/Initialize(mapload)
|
||||
|
||||
@@ -10,11 +10,9 @@
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
force = 10
|
||||
throwforce = 7
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
materials = list(MAT_METAL = 300)
|
||||
origin_tech = "engineering=1;combat=1"
|
||||
attack_verb = list("attacked", "hammered", "smashed", "bludgeoned", "whacked")
|
||||
toolspeed = 1
|
||||
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
|
||||
tool_behaviour = TOOL_HAMMER
|
||||
|
||||
@@ -13,16 +13,11 @@
|
||||
icon_state = "multitool"
|
||||
belt_icon = "multitool"
|
||||
flags = CONDUCT
|
||||
force = 0
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
throwforce = 0
|
||||
throw_range = 7
|
||||
throw_speed = 3
|
||||
drop_sound = 'sound/items/handling/multitool_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/multitool_pickup.ogg'
|
||||
materials = list(MAT_METAL = 300, MAT_GLASS = 140)
|
||||
origin_tech = "magnets=1;engineering=2"
|
||||
toolspeed = 1
|
||||
tool_behaviour = TOOL_MULTITOOL
|
||||
hitsound = 'sound/weapons/tap.ogg'
|
||||
new_attack_chain = TRUE
|
||||
@@ -170,7 +165,6 @@
|
||||
return OBLITERATION
|
||||
|
||||
/obj/item/multitool/cyborg
|
||||
name = "multitool"
|
||||
desc = "An integrated multitool used for electrical maintenance, typically found in construction and engineering robots."
|
||||
toolspeed = 0.5
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
attack_verb = list("stabbed")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
usesound = 'sound/items/screwdriver.ogg'
|
||||
toolspeed = 1
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
|
||||
drop_sound = 'sound/items/handling/screwdriver_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/screwdriver_pickup.ogg'
|
||||
@@ -33,7 +32,6 @@
|
||||
RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
|
||||
|
||||
/obj/item/screwdriver/nuke
|
||||
name = "screwdriver"
|
||||
desc = "A specialized screwdriver with an ultra-thin flathead tip, meant for accessing very specific machinery."
|
||||
icon_state = "screwdriver_nuke"
|
||||
belt_icon = "screwdriver_nuke"
|
||||
|
||||
@@ -14,13 +14,11 @@
|
||||
throw_speed = 3
|
||||
throw_range = 5
|
||||
hitsound = "swing_hit"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 30)
|
||||
resistance_flags = FIRE_PROOF
|
||||
materials = list(MAT_METAL = 400, MAT_GLASS = 100)
|
||||
origin_tech = "engineering=1;plasmatech=1"
|
||||
tool_behaviour = TOOL_WELDER
|
||||
toolspeed = 1
|
||||
tool_enabled = FALSE
|
||||
usesound = 'sound/items/welder.ogg'
|
||||
drop_sound = 'sound/items/handling/weldingtool_drop.ogg'
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
force = 6
|
||||
throwforce = 5
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
materials = list(MAT_METAL = 370)
|
||||
origin_tech = "materials=1;engineering=1"
|
||||
@@ -19,7 +18,6 @@
|
||||
drop_sound = 'sound/items/handling/wirecutter_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/wirecutter_pickup.ogg'
|
||||
sharp = TRUE
|
||||
toolspeed = 1
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
|
||||
tool_behaviour = TOOL_WIRECUTTER
|
||||
var/random_color = TRUE
|
||||
@@ -107,7 +105,6 @@
|
||||
resistance_flags = FIRE_PROOF | ACID_PROOF
|
||||
|
||||
/obj/item/wirecutters/cyborg
|
||||
name = "wirecutters"
|
||||
desc = "A pair of integrated wirecutters used by construction and engineering robots."
|
||||
toolspeed = 0.5
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
pickup_sound = 'sound/items/handling/wrench_pickup.ogg'
|
||||
origin_tech = "materials=1;engineering=1"
|
||||
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
|
||||
toolspeed = 1
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
|
||||
tool_behaviour = TOOL_WRENCH
|
||||
|
||||
|
||||
@@ -20,10 +20,8 @@
|
||||
|
||||
|
||||
/obj/item/toy
|
||||
throwforce = 0
|
||||
throw_speed = 4
|
||||
throw_range = 20
|
||||
force = 0
|
||||
new_attack_chain = TRUE
|
||||
|
||||
|
||||
@@ -111,10 +109,6 @@
|
||||
/obj/item/toy/syndicateballoon
|
||||
name = "syndicate balloon"
|
||||
desc = "There is a tag on the back that reads \"FUK NT!11!\"."
|
||||
throwforce = 0
|
||||
throw_speed = 4
|
||||
throw_range = 20
|
||||
force = 0
|
||||
icon_state = "syndballoon"
|
||||
item_state = "syndballoon"
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
@@ -304,7 +298,6 @@
|
||||
force = 0
|
||||
throwforce = 0
|
||||
throw_speed = 3
|
||||
throw_range = 5
|
||||
origin_tech = null
|
||||
attack_verb = list("attacked", "struck", "hit")
|
||||
brightness_on = 0
|
||||
@@ -334,7 +327,6 @@
|
||||
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too.
|
||||
force = 5
|
||||
throwforce = 5
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
attack_verb = list("attacked", "slashed", "stabbed", "sliced")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
|
||||
@@ -358,7 +350,6 @@
|
||||
throwforce = 5.0
|
||||
throw_speed = 10
|
||||
throw_range = 30
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
|
||||
|
||||
/obj/item/toy/snappop/virus/throw_impact(atom/hit_atom)
|
||||
@@ -477,7 +468,6 @@
|
||||
cooldown = world.time
|
||||
|
||||
/obj/item/toy/therapy/red
|
||||
item_state = "egg4" // It's the red egg in items_left/righthand
|
||||
item_color = "red"
|
||||
|
||||
/obj/item/toy/therapy/purple
|
||||
@@ -493,7 +483,6 @@
|
||||
item_color = "yellow"
|
||||
|
||||
/obj/item/toy/therapy/orange
|
||||
item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless
|
||||
item_color = "orange"
|
||||
|
||||
/obj/item/toy/therapy/green
|
||||
@@ -1541,9 +1530,7 @@
|
||||
flags = CONDUCT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
materials = list(MAT_METAL=2000)
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
throwforce = 5
|
||||
throw_speed = 4
|
||||
throw_range = 5
|
||||
force = 5
|
||||
origin_tech = "combat=1"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user