mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-22 04:24:20 +01:00
Adds CI for missing icon_states (#27063)
* Adds CI for missing icon_states * yeah * more fixes * more fixes * seems good * moar * fix * yea * hrtyhrt * yeah * WOE
This commit is contained in:
Contrabang
@@ -264,7 +264,7 @@
|
||||
density = FALSE
|
||||
layer = TURF_LAYER
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
icon_state = "gibbl5"
|
||||
icon_state = "mgibbl5"
|
||||
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
|
||||
no_clear = TRUE
|
||||
mergeable_decal = FALSE
|
||||
|
||||
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
|
||||
//BLOODY FOOTPRINTS
|
||||
/obj/effect/decal/cleanable/blood/footprints
|
||||
icon = 'icons/effects/fluidtracks.dmi'
|
||||
icon_state = "nothingwhatsoever"
|
||||
icon_state = null
|
||||
desc = "You REALLY shouldn't follow these.."
|
||||
gender = PLURAL
|
||||
random_icon_states = null
|
||||
|
||||
@@ -2,10 +2,6 @@
|
||||
name = "sandy floor"
|
||||
icon_state = "sandyfloor"
|
||||
|
||||
/obj/effect/turf_decal/weather/snow
|
||||
name = "snowy floor"
|
||||
icon_state = "snowyfloor"
|
||||
|
||||
/obj/effect/turf_decal/weather/snow/corner
|
||||
name = "snow corner piece"
|
||||
icon = 'icons/turf/snow.dmi'
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
max_integrity = 80
|
||||
|
||||
/obj/effect/forcefield/mime/advanced
|
||||
icon_state = "empty"
|
||||
icon_state = null
|
||||
name = "invisible blockade"
|
||||
desc = "You might be here a while."
|
||||
lifetime = 60 SECONDS
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
opacity = FALSE
|
||||
density = FALSE
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "glowshroom" //replaced in New
|
||||
icon_state = "glowshroomf"
|
||||
base_icon_state = "glowshroom" //replaced in New
|
||||
layer = ABOVE_NORMAL_TURF_LAYER
|
||||
max_integrity = 30
|
||||
var/floor = 0
|
||||
@@ -20,13 +21,15 @@
|
||||
/obj/structure/glowshroom/glowcap
|
||||
name = "glowcap"
|
||||
desc = "Mycena Ruthenia, a species of mushroom that, while it does glow in the dark, is not actually bioluminescent."
|
||||
icon_state = "glowcap"
|
||||
icon_state = "glowcapf"
|
||||
base_icon_state = "glowcap"
|
||||
myseed = /obj/item/seeds/glowshroom/glowcap
|
||||
|
||||
/obj/structure/glowshroom/shadowshroom
|
||||
name = "shadowshroom"
|
||||
desc = "Mycena Umbra, a species of mushroom that emits shadow instead of light."
|
||||
icon_state = "shadowshroom"
|
||||
icon_state = "shadowshroomf"
|
||||
base_icon_state = "shadowshroom"
|
||||
myseed = /obj/item/seeds/glowshroom/shadowshroom
|
||||
|
||||
/obj/structure/glowshroom/shadowshroom/extinguish_light(force = FALSE)
|
||||
@@ -54,7 +57,6 @@
|
||||
var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow)
|
||||
set_light(G.glow_range(myseed), G.glow_power(myseed), G.glow_color)
|
||||
setDir(CalcDir())
|
||||
var/base_icon_state = initial(icon_state)
|
||||
if(!floor)
|
||||
switch(dir) //offset to make it be on the wall rather than on the floor
|
||||
if(NORTH)
|
||||
|
||||
@@ -13,8 +13,6 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(/obj/effect/meteor/medium = 3, /obj/
|
||||
|
||||
GLOBAL_LIST_INIT(meteors_gore, list(/obj/effect/meteor/meaty = 5, /obj/effect/meteor/meaty/xeno = 1)) //for meaty ore event
|
||||
|
||||
GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
|
||||
|
||||
|
||||
///////////////////////////////
|
||||
//Meteor spawning global procs
|
||||
@@ -334,30 +332,6 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
|
||||
if(!isspaceturf(T))
|
||||
new /obj/effect/decal/cleanable/blood/xeno(T)
|
||||
|
||||
//Meteor Ops
|
||||
/obj/effect/meteor/goreops
|
||||
name = "MeteorOps"
|
||||
icon = 'icons/mob/animal.dmi'
|
||||
icon_state = "syndicaterangedpsace"
|
||||
hits = 10
|
||||
hitpwr = EXPLODE_DEVASTATE
|
||||
meteorsound = 'sound/effects/blobattack.ogg'
|
||||
meteordrop = list(/obj/item/food/meat)
|
||||
var/meteorgibs = /obj/effect/gibspawner/generic
|
||||
|
||||
/obj/effect/meteor/goreops/make_debris()
|
||||
..()
|
||||
new meteorgibs(get_turf(src))
|
||||
|
||||
|
||||
/obj/effect/meteor/goreops/ram_turf(turf/T)
|
||||
if(!isspaceturf(T))
|
||||
new /obj/effect/decal/cleanable/blood(T)
|
||||
|
||||
/obj/effect/meteor/goreops/Bump(atom/A)
|
||||
A.ex_act(hitpwr)
|
||||
get_hit()
|
||||
|
||||
//////////////////////////
|
||||
//Spookoween meteors
|
||||
/////////////////////////
|
||||
|
||||
@@ -45,11 +45,6 @@
|
||||
var/damage = 0.0
|
||||
var/range = 10.0
|
||||
|
||||
/obj/effect/begin
|
||||
name = "begin"
|
||||
icon = 'icons/obj/stationobjs.dmi'
|
||||
icon_state = "begin"
|
||||
|
||||
/obj/effect/projection
|
||||
name = "Projection"
|
||||
desc = "This looks like a projection of something."
|
||||
@@ -99,7 +94,7 @@
|
||||
//Makes a tile fully lit no matter what
|
||||
/obj/effect/fullbright
|
||||
icon = 'icons/effects/alphacolors.dmi'
|
||||
icon_state = "white"
|
||||
icon_state = null // null iconstate is white by default
|
||||
plane = LIGHTING_PLANE
|
||||
layer = LIGHTING_LAYER
|
||||
blend_mode = BLEND_ADD
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
/obj/effect/snow
|
||||
desc = "Perfect for making snow angels, or throwing at other people!"
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "snow"
|
||||
icon_state = "snow1"
|
||||
layer = ABOVE_ICYOVERLAY_LAYER
|
||||
|
||||
/obj/effect/snow/New()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
//temporary visual effects(/obj/effect/temp_visual) used by cult stuff
|
||||
/obj/effect/temp_visual/cult
|
||||
icon = 'icons/effects/cult_effects.dmi'
|
||||
icon_state = null
|
||||
randomdir = FALSE
|
||||
duration = 10
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/obj/effect/temp_visual/dir_setting/bloodsplatter
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
icon_state = null
|
||||
duration = 5
|
||||
randomdir = FALSE
|
||||
layer = MOB_LAYER - 0.1
|
||||
@@ -304,7 +305,7 @@
|
||||
duration = 5
|
||||
|
||||
/obj/effect/temp_visual/dir_setting/firing_effect
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon = 'icons/effects/projectile.dmi'
|
||||
icon_state = "firing_effect"
|
||||
duration = 2
|
||||
|
||||
@@ -326,10 +327,6 @@
|
||||
icon_state = "firing_effect_energy"
|
||||
duration = 3
|
||||
|
||||
/obj/effect/temp_visual/dir_setting/firing_effect/magic
|
||||
icon_state = "shieldsparkles"
|
||||
duration = 3
|
||||
|
||||
/obj/effect/temp_visual/impact_effect
|
||||
icon_state = "impact_bullet"
|
||||
duration = 5
|
||||
@@ -525,7 +522,7 @@
|
||||
name = "\improper Bluespace energy wave"
|
||||
desc = "A massive, rippling wave of bluepace energy, all rapidly exhausting itself the moment it leaves the concentrated beam of light."
|
||||
icon = 'icons/effects/beam_splash.dmi'
|
||||
icon_state = "beam_splash_l"
|
||||
icon_state = "beam_splash_w"
|
||||
layer = ABOVE_ALL_MOB_LAYER
|
||||
pixel_y = -16
|
||||
duration = 50
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/obj/effect/projectile
|
||||
name = "pew"
|
||||
icon = 'icons/obj/projectiles.dmi'
|
||||
icon_state = "nothing"
|
||||
icon_state = null
|
||||
layer = HITSCAN_LAYER
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
appearance_flags = LONG_GLIDE
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
name = "robot parts"
|
||||
icon = 'icons/obj/robot_parts.dmi'
|
||||
item_state = "buildpipe"
|
||||
icon_state = "blank"
|
||||
flags = CONDUCT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
var/list/part = null
|
||||
|
||||
@@ -96,8 +96,6 @@ GLOBAL_LIST_INIT(rod_recipes, list (
|
||||
name = "heat resistant rod"
|
||||
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"
|
||||
icon_state = "rods"
|
||||
item_state = "rods"
|
||||
color = "#5286b9ff"
|
||||
flags = CONDUCT
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
@@ -494,18 +494,6 @@
|
||||
item_state = "egg3" // It's the green egg in items_left/righthand
|
||||
item_color = "green"
|
||||
|
||||
|
||||
//This should really be somewhere else but I don't know where. w/e
|
||||
|
||||
/obj/item/inflatable_duck
|
||||
name = "inflatable duck"
|
||||
desc = "No bother to sink or swim when you can just float!"
|
||||
icon_state = "inflatable"
|
||||
item_state = "inflatable"
|
||||
icon = 'icons/obj/clothing/belts.dmi'
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
|
||||
|
||||
/*
|
||||
* Fake meteor
|
||||
*/
|
||||
|
||||
@@ -143,6 +143,7 @@
|
||||
projectile_type = /obj/item/projectile/energy/chrono_beam
|
||||
muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy
|
||||
muzzle_flash_color = null
|
||||
icon = 'icons/obj/projectiles.dmi'
|
||||
icon_state = "chronobolt"
|
||||
e_cost = 0
|
||||
|
||||
|
||||
@@ -285,8 +285,8 @@
|
||||
name = "defibrillator paddles"
|
||||
desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks."
|
||||
icon = 'icons/obj/defib.dmi'
|
||||
icon_state = "defibpaddles"
|
||||
item_state = "defibpaddles"
|
||||
icon_state = "defibpaddles0"
|
||||
item_state = "defibpaddles0"
|
||||
force = 0
|
||||
throwforce = 6
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
|
||||
@@ -91,15 +91,3 @@
|
||||
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
icon_prefix = "plasma"
|
||||
welded_type = /obj/item/stack/sheet/plasmaglass
|
||||
|
||||
/obj/item/shard/scrap
|
||||
name = "sharpened scrap"
|
||||
desc = "Some discarded scrap metal. It has sharp, jagged edges."
|
||||
icon_state = "scrap"
|
||||
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT)
|
||||
welded_type = /obj/item/stack/sheet/metal
|
||||
force = 9
|
||||
throwforce = 15 //owie
|
||||
|
||||
/obj/item/shard/scrap/set_initial_icon_state()
|
||||
return
|
||||
|
||||
@@ -73,15 +73,3 @@
|
||||
..()
|
||||
item_state = "horsebroom[HAS_TRAIT(src, TRAIT_WIELDED) ? 1 : 0]"
|
||||
|
||||
/obj/item/staff/stick
|
||||
name = "stick"
|
||||
desc = "A great tool to drag someone else's drinks across the bar."
|
||||
icon_state = "stick"
|
||||
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
|
||||
item_state = "stick"
|
||||
force = 3.0
|
||||
throwforce = 5.0
|
||||
throw_speed = 1
|
||||
throw_range = 5
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
|
||||
@@ -569,6 +569,7 @@
|
||||
name = "trainer's belt"
|
||||
desc = "For the mining master, holds your lazarus capsules."
|
||||
icon_state = "lazarusbelt_0"
|
||||
base_icon_state = "lazarusbelt"
|
||||
item_state = "lazbelt"
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_TINY
|
||||
@@ -582,7 +583,7 @@
|
||||
update_icon()
|
||||
|
||||
/obj/item/storage/belt/lazarus/update_icon_state()
|
||||
icon_state = "lazarusbelt_[length(contents)]"
|
||||
icon_state = "[base_icon_state]_[length(contents)]"
|
||||
|
||||
/obj/item/storage/belt/lazarus/attackby(obj/item/I, mob/user)
|
||||
var/amount = length(contents)
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
desc = "A wall mounted storage locker."
|
||||
name = "wall locker"
|
||||
icon = 'icons/obj/walllocker.dmi'
|
||||
icon_state = "wall-locker"
|
||||
icon_state = null
|
||||
door_anim_time = 0
|
||||
enable_door_overlay = FALSE
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
icon_closed = "wall-locker"
|
||||
icon_opened = "wall-lockeropen"
|
||||
icon_closed = null
|
||||
icon_opened = null
|
||||
|
||||
/obj/structure/closet/walllocker/close()
|
||||
. = ..()
|
||||
|
||||
@@ -73,6 +73,7 @@
|
||||
/obj/structure/fluff/divine
|
||||
name = "Miracle"
|
||||
icon = 'icons/obj/hand_of_god_structures.dmi'
|
||||
icon_state = null
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
|
||||
|
||||
@@ -30,29 +30,6 @@
|
||||
else
|
||||
. += "<span class='notice'>The anchoring screws are <i>unscrewed</i>. The rods look like they could be <b>cut</b> through.</span>"
|
||||
|
||||
/obj/structure/grille/fence
|
||||
var/width = 3
|
||||
|
||||
/obj/structure/grille/fence/Initialize(mapload)
|
||||
. = ..()
|
||||
if(width > 1)
|
||||
if(dir in list(EAST, WEST))
|
||||
bound_width = width * world.icon_size
|
||||
bound_height = world.icon_size
|
||||
else
|
||||
bound_width = world.icon_size
|
||||
bound_height = width * world.icon_size
|
||||
|
||||
/obj/structure/grille/fence/east_west
|
||||
//width=80
|
||||
//height=42
|
||||
icon='icons/fence-ew.dmi'
|
||||
|
||||
/obj/structure/grille/fence/north_south
|
||||
//width=80
|
||||
//height=42
|
||||
icon='icons/fence-ns.dmi'
|
||||
|
||||
/obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
|
||||
. = ..()
|
||||
update_icon(UPDATE_ICON_STATE)
|
||||
|
||||
@@ -54,14 +54,6 @@
|
||||
if(current_size >= STAGE_FOUR)
|
||||
deconstruct()
|
||||
|
||||
/obj/structure/lattice/clockwork
|
||||
name = "cog lattice"
|
||||
desc = "A lightweight support lattice. These hold the Justicar's station together."
|
||||
icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
|
||||
|
||||
/obj/structure/lattice/clockwork/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
/obj/structure/lattice/catwalk
|
||||
name = "catwalk"
|
||||
desc = "A catwalk for easier EVA maneuvering and cable placement."
|
||||
@@ -104,14 +96,3 @@
|
||||
/obj/structure/lattice/lava/deconstruction_hints(mob/user)
|
||||
to_chat(user, "<span class='notice'>The supporting rods look like they could be <b>cut</b>.</span>, but the <i>heat treatment will shatter off</i>.")
|
||||
|
||||
/obj/structure/lattice/catwalk/clockwork
|
||||
name = "clockwork catwalk"
|
||||
icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
|
||||
smoothing_flags = SMOOTH_CORNERS
|
||||
smoothing_groups = null
|
||||
|
||||
/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!mapload)
|
||||
new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
|
||||
new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
|
||||
|
||||
@@ -131,12 +131,3 @@
|
||||
if(last_ghost_alert + ghost_alert_delay < world.time)
|
||||
notify_ghosts("[src] active in [get_area(src)].", 'sound/effects/ghost2.ogg', title = alert_title, source = attack_atom, action = (attack_atom == src ? NOTIFY_JUMP : NOTIFY_ATTACK))
|
||||
last_ghost_alert = world.time
|
||||
|
||||
/obj/structure/boulder
|
||||
name = "boulder"
|
||||
desc = "A large rock."
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
icon_state = "boulder1"
|
||||
density = TRUE
|
||||
opacity = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/obj/structure/spawner
|
||||
name = "monster nest"
|
||||
icon = 'icons/mob/animal.dmi'
|
||||
icon_state = "hole"
|
||||
icon_state = null
|
||||
max_integrity = 100
|
||||
|
||||
move_resist = MOVE_FORCE_EXTREMELY_STRONG
|
||||
@@ -44,18 +44,6 @@
|
||||
spawn_text = "climbs out of"
|
||||
faction = list("skeleton")
|
||||
|
||||
/obj/structure/spawner/clown
|
||||
name = "Laughing Larry"
|
||||
desc = "A laughing, jovial figure. Something seems stuck in his throat."
|
||||
icon_state = "clownbeacon"
|
||||
icon = 'icons/obj/device.dmi'
|
||||
max_integrity = 200
|
||||
max_mobs = 15
|
||||
spawn_time = 150
|
||||
mob_types = list(/mob/living/simple_animal/hostile/retaliate/clown)
|
||||
spawn_text = "climbs out of"
|
||||
faction = list("clown")
|
||||
|
||||
/obj/structure/spawner/mining
|
||||
name = "monster den"
|
||||
desc = "A hole dug into the ground, harboring all kinds of monsters found within most caves or mining asteroids."
|
||||
|
||||
@@ -342,14 +342,6 @@
|
||||
desc = "A sign labelling a restroom."
|
||||
icon_state = "restroom"
|
||||
|
||||
/obj/structure/sign/medbay
|
||||
name = "\improper MEDBAY"
|
||||
desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here."
|
||||
icon_state = "bluecross"
|
||||
|
||||
/obj/structure/sign/medbay/alt
|
||||
icon_state = "bluecross2"
|
||||
|
||||
/obj/structure/sign/directions
|
||||
name = "direction sign"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user