Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818

[MIRROR] Fix some missing icons
2018-05-15 06:52:32 -05:00
parent a580ea7544 42e3d7ef87
commit f86af0ab41
20 changed files with 21 additions and 25 deletions
@@ -31225,9 +31225,6 @@
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
-"dWc" = (
-/turf/closed/mineral/random/labormineral,
-/area/space)
 "dYC" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 1
@@ -79414,7 +79411,7 @@ bfP
 bjc
 bfP
 bfP
-dWc
+aad
 aaa
 aaa
 aaa
@@ -5,7 +5,7 @@
 	name = "ominous beacon"
 	desc = "This looks suspicious..."
 	icon = 'icons/obj/singularity.dmi'
-	icon_state = "beacon"
+	icon_state = "beacon0"

 	anchored = FALSE
 	density = TRUE
@@ -1,7 +1,7 @@
 /obj/effect/decal/cleanable
 	gender = PLURAL
 	layer = ABOVE_NORMAL_TURF_LAYER
-	var/list/random_icon_states = list()
+	var/list/random_icon_states = null
 	var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA
 	var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
 	var/mergeable_decal = TRUE //when two of these are on a same tile or do we need to merge them into just one?
@@ -27,7 +27,7 @@
 ///////////Mimewalls///////////

 /obj/effect/forcefield/mime
-	icon_state = "empty"
+	icon_state = "nothing"
 	name = "invisible wall"
 	desc = "You have a bad feeling about this."

@@ -275,8 +275,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/items_and_weapons.dmi'
-	icon_state = "defibpaddles"
-	item_state = "defibpaddles"
+	icon_state = "defibpaddles0"
+	item_state = "defibpaddles0"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'

@@ -21,7 +21,7 @@

 // Special AI/pAI PDAs that cannot explode.
 /obj/item/pda/ai
-	icon_state = "NONE"
+	icon = null
 	ttone = "data"
 	fon = FALSE
 	detonatable = FALSE
@@ -840,7 +840,7 @@
 	name = "card"
 	desc = "a card"
 	icon = 'icons/obj/toy.dmi'
-	icon_state = "singlecard_nanotrasen_down"
+	icon_state = "singlecard_down_nanotrasen"
 	w_class = WEIGHT_CLASS_TINY
 	var/cardname = null
 	var/flipped = 0
@@ -53,7 +53,7 @@
 	name = "resin"
 	desc = "Looks like some kind of thick resin."
 	icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
-	icon_state = "resin"
+	icon_state = "smooth"
 	density = TRUE
 	opacity = 1
 	anchored = TRUE
@@ -77,7 +77,7 @@
 	name = "resin wall"
 	desc = "Thick resin solidified into a wall."
 	icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
-	icon_state = "wall0"	//same as resin, but consistency ho!
+	icon_state = "smooth"	//same as resin, but consistency ho!
 	resintype = "wall"
 	canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)

@@ -88,7 +88,7 @@
 	name = "resin membrane"
 	desc = "Resin just thin enough to let light pass through."
 	icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi'
-	icon_state = "membrane0"
+	icon_state = "smooth"
 	opacity = 0
 	max_integrity = 160
 	resintype = "membrane"
@@ -65,6 +65,7 @@
 //------------------------------------FALLING SUPPLY POD-------------------------------------//
 /obj/effect/temp_visual/DPfall
 	icon = 'icons/obj/2x2.dmi'
+	icon_state = "supplypod_falling"
 	pixel_x = -16
 	pixel_y = -5
 	pixel_z = 200
@@ -151,6 +151,7 @@
 	desc = "You get the feeling that you shouldn't be standing here."
 	clockwork_desc = "A sigil that will soon erupt and smite any unenlightened nearby."
 	icon = 'icons/effects/96x96.dmi'
+	icon_state = ""
 	pixel_x = -32
 	pixel_y = -32
 	layer = BELOW_MOB_LAYER
@@ -66,7 +66,7 @@
 	name = "pile of viscera"
 	desc = "A repulsive pile of guts and gore."
 	gender = NEUTER
-	random_icon_states = list("innards")
+	icon_state = "innards"

 /mob/living/simple_animal/slaughter/phasein()
 	. = ..()
@@ -831,7 +831,7 @@
 	set_module = /obj/item/robot_module/janitor

 /mob/living/silicon/robot/modules/syndicate
-	icon_state = "syndie_bloodhound"
+	icon_state = "synd_sec"
 	faction = list(ROLE_SYNDICATE)
 	bubble_icon = "syndibot"
 	req_access = list(ACCESS_SYNDICATE)
@@ -859,7 +859,7 @@
 	return

 /mob/living/silicon/robot/modules/syndicate/medical
-	icon_state = "syndi-medi"
+	icon_state = "synd_medical"
 	playstyle_string = "<span class='big bold'>You are a Syndicate medical cyborg!</span><br>\
 						<b>You are armed with powerful medical tools to aid you in your mission: help the operatives secure the nuclear authentication disk. \
 						Your hypospray will produce Restorative Nanites, a wonder-drug that will heal most types of bodily damages, including clone and brain damage. It also produces morphine for offense. \
@@ -1,7 +1,7 @@
 /obj/item/robot_module
 	name = "Default"
 	icon = 'icons/obj/module.dmi'
-	icon_state = "std_module"
+	icon_state = "std_mod"
 	w_class = WEIGHT_CLASS_GIGANTIC
 	item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -2,7 +2,7 @@
 	name = "\improper honkbot"
 	desc = "A little robot. It looks happy with its bike horn."
 	icon = 'icons/mob/aibots.dmi'
-	icon_state = "honkbot"
+	icon_state = "honkbot1"
 	density = FALSE
 	anchored = FALSE
 	health = 25
@@ -436,7 +436,7 @@

 /obj/item/projectile/beam/beam_rifle
 	name = "particle beam"
-	icon = ""
+	icon = null
 	hitsound = 'sound/effects/explosion3.ogg'
 	damage = 0				//Handled manually.
 	damage_type = BURN
@@ -4,7 +4,7 @@

 /obj/item/projectile/curse_hand
 	name = "curse hand"
-	icon_state = "cursehand"
+	icon_state = "cursehand0"
 	hitsound = 'sound/effects/curse4.ogg'
 	layer = LARGE_MOB_LAYER
 	damage_type = BURN
@@ -19,10 +19,7 @@
 /obj/item/projectile/curse_hand/Initialize(mapload)
 	. = ..()
 	handedness = prob(50)
-	update_icon()
-
-/obj/item/projectile/curse_hand/update_icon()
-	icon_state = "[icon_state][handedness]"
+	icon_state = "cursehand[handedness]"

 /obj/item/projectile/curse_hand/fire(setAngle)
 	if(starting)