Gulag-fluff (#659)

* Gulag-fluff

* Fixed typos

code/game/objects/effects/decals/contraband.dm

@@ -8,6 +8,7 @@
 #define POSTERLEGIT 0
 #define POSTERCONTRABAND 1
 #define POSTERREV 2
+#define POSTERSOV 3
 
 var/global/list/revposters = list(
 list(name = "- Kill Police", desc = " Poster with a bloody secyrity helmet on it."),
@@ -97,6 +98,10 @@ list(name = "- The Owl", desc = " The Owl would do his best to protect the stati
 list(name = "- No ERP", desc = " This poster reminds the crew that Eroticism, Rape and Pornography are banned on Nanotrasen stations."),
 list(name = "- Carbon Dioxide", desc = " This informational poster teaches the viewer what carbon dioxide is.") )
 
+var/global/list/sovposters = list(
+
+list(name = "- Lenin", desc = "A poster glorifying tovarisch Lenin."),
+list(name = "-Stalin", desc = "A poster glorifying tovarisch Stalin.") )
 
 /obj/item/weapon/contraband
 	name = "contraband item"
@@ -134,6 +139,12 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v
 	desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface."
 	official = POSTERLEGIT
 
+/obj/item/weapon/poster/soviet
+	name = "soviet posters"
+	desc = "For the motherland!"
+	icon_state = "rolled_poster"
+	official = POSTERSOV
+
 /obj/item/weapon/poster/atom_init(mapload, given_serial = 0)
 	if(!given_serial)
 		generate_first_time()
@@ -157,6 +168,11 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v
 	resulting_poster = new /obj/structure/sign/poster/contraband/rev(0, serial_number, official)
 	name += " - No. [serial_number]"
 
+/obj/item/weapon/poster/soviet/generate_first_time()
+	serial_number = rand(1, sovposters.len)
+	resulting_poster = new /obj/structure/sign/poster/contraband/sov(0, serial_number, official)
+	name += " - No. [serial_number]"
+
 //############################## THE ACTUAL DECALS ###########################
 
 /obj/structure/sign/poster
@@ -195,6 +211,18 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v
 	name += revposters[serial_number][POSTERNAME]
 	desc += revposters[serial_number][POSTERDESC]
 
+/obj/structure/sign/poster/contraband/sov
+	name = "poster"
+	desc = "A large suspicious piece of space-resistant printed paper. "
+	icon = 'icons/obj/contraband.dmi'
+	official = POSTERSOV
+
+/obj/structure/sign/poster/contraband/sov/pick_state(poster_number)
+	serial_number = poster_number ? poster_number : rand(1, sovposters.len)
+	icon_state = "poster[serial_number]_sov"
+	name += revposters[serial_number][POSTERNAME]
+	desc += revposters[serial_number][POSTERDESC]
+
 /obj/structure/sign/poster/atom_init(mapload, poster_number, rolled_official)
 	official = rolled_official ? rolled_official : 0
 
@@ -258,6 +286,11 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v
 			P.resulting_poster = src
 			P.forceMove(newloc)
 			forceMove(P)
+		if(POSTERSOV)
+			var/obj/item/weapon/poster/contraband/rev/P = new(src, serial_number)
+			P.resulting_poster = src
+			P.forceMove(newloc)
+			forceMove(P)
 
 //separated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby()
 /turf/simulated/wall/proc/place_poster(obj/item/weapon/poster/P, mob/user)

code/game/objects/items/devices/flashlight.dm

@@ -127,6 +127,9 @@
 	g_amt = 0
 	on = 1
 
+/obj/item/device/flashlight/lamp/svetilnik
+	icon_state = "svetilnik"
+	item_state = "svetilnik"
 
 // green-shaded desk lamp
 /obj/item/device/flashlight/lamp/green

code/game/objects/structures/gulag.dm

@@ -0,0 +1,28 @@
+/obj/structure/fuzebox
+	name = "fuzebox"
+	desc = "High voltage!"
+	icon = 'icons/obj/structures/gulag.dmi'
+	icon_state = "fuzebox"
+	anchored = TRUE
+
+/obj/structure/poweroutlet
+	name = "poweroutlet"
+	desc = "Don't stick your fingers inside."
+	icon = 'icons/obj/structures/gulag.dmi'
+	icon_state = "poweroutlet"
+	anchored = TRUE
+
+/obj/structure/poweroutlet/double
+	icon_state = "poweroutlet_double"
+
+/obj/structure/pipe
+	name = "pipe"
+	desc = "Just an ordinary pipe."
+	icon = 'icons/obj/structures/gulag.dmi'
+	icon_state = "pipe"
+	anchored = TRUE
+
+
+/obj/structure/pipe/ripped
+	desc = "Just an ordinary broken pipe."
+	icon_state = "piperipped"

code/game/objects/structures/signs/_signs.dm

@@ -153,3 +153,13 @@
 	name = "\improper Mr. Deempisi portrait"
 	desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"
 	icon_state = "monkey_painting"
+
+/obj/structure/sign/ussrflag
+	name = "\improper ussr flag"
+	desc = "Gosudarstvenny flag Soyuza Sovetskikh Sotsialisticheskikh Respublik."
+	icon_state = "ussrflag"
+
+/obj/structure/sign/mineswarning
+	name = "\improper mines warning"
+	desc = "You don't want to go here..."
+	icon_state = "mineswarning"

taucetistation.dme

@@ -813,6 +813,7 @@
 #include "code\game\objects\structures\flora.dm"
 #include "code\game\objects\structures\girders.dm"
 #include "code\game\objects\structures\grille.dm"
+#include "code\game\objects\structures\gulag.dm"
 #include "code\game\objects\structures\headpole.dm"
 #include "code\game\objects\structures\inflatable.dm"
 #include "code\game\objects\structures\janicart.dm"