Merge pull request #183 from Mirag1993/Мердж-с-оффами

Fixes invisible radiation medkits (shiptest-ss13#2512)

code/_onclick/hud/parallax.dm

@@ -57,7 +57,7 @@
 			pref = PARALLAX_HIGH
 		switch(C.prefs.parallax)
 			if (PARALLAX_INSANE)
-				C.parallax_throttle = FALSE
+				C.parallax_throttle = PARALLAX_DELAY_DEFAULT
 				C.parallax_layers_max = 5
 				return TRUE
 
@@ -298,13 +298,6 @@
 	speed = 3
 	layer = 3
 
-/atom/movable/screen/parallax_layer/random/space_gas
-	icon_state = "space_gas"
-
-/atom/movable/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
-	. = ..()
-	src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
-
 /atom/movable/screen/parallax_layer/random/asteroids
 	icon_state = "asteroids"
 

code/controllers/subsystem/parallax.dm

@@ -8,14 +8,12 @@ SUBSYSTEM_DEF(parallax)
 	var/planet_x_offset = 128
 	var/planet_y_offset = 128
 	var/random_layer
-	var/random_parallax_color
 
 //These are cached per client so needs to be done asap so people joining at roundstart do not miss these.
 /datum/controller/subsystem/parallax/PreInit()
 	. = ..()
-	if(prob(70))	//70% chance to pick a special extra layer
-		random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids)
-		random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color.
+	if(prob(20))	//20% chance to pick a special extra layer, in this case just asteroids, no space dirt
+		random_layer = /atom/movable/screen/parallax_layer/random/asteroids
 	planet_y_offset = rand(100, 160)
 	planet_x_offset = rand(100, 160)
 

code/game/objects/items/storage/firstaid.dm

@@ -176,14 +176,10 @@
 /obj/item/storage/firstaid/radiation
 	name = "radiation treatment kit"
 	desc = "Used to treat severe radiation poisoning."
-	icon_state = "antitoxin"
-	item_state = "firstaid-toxin"
+	icon_state = "radiation"
+	item_state = "firstaid-ointment" //its yellow
 	damagetype_healed = TOX
 
-/obj/item/storage/firstaid/radiation/Initialize(mapload)
-	. = ..()
-	icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2")
-
 /obj/item/storage/firstaid/radiation/PopulateContents()
 	if(empty)
 		return