Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560

code/game/objects/effects/contraband.dm

@@ -57,6 +57,7 @@
 	var/poster_item_name = "hypothetical poster"
 	var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here."
 	var/poster_item_icon_state = "rolled_poster"
+	var/poster_item_type = /obj/item/poster
 
 /obj/structure/sign/poster/Initialize()
 	. = ..()
@@ -114,7 +115,7 @@
 /obj/structure/sign/poster/proc/roll_and_drop(loc)
 	pixel_x = 0
 	pixel_y = 0
-	var/obj/item/poster/P = new(loc, src)
+	var/obj/item/poster/P = new poster_item_type(loc, src)
 	forceMove(P)
 	return P
 

code/game/objects/effects/spawners/structure.dm

@@ -163,6 +163,10 @@ again.
 	icon_state = "plastitaniumwindow_spawner"
 	spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitanium)
 
+//plastitanium pirate window
+
+/obj/effect/spawner/structure/window/plastitanium/pirate
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitanium/pirate)
 
 //ice window
 

code/game/objects/effects/wanted_poster.dm

@@ -8,6 +8,7 @@
 
 /obj/structure/sign/poster/wanted
 	var/wanted_name
+	poster_item_type = /obj/item/poster/wanted
 
 /obj/structure/sign/poster/wanted/Initialize(mapload, icon/person_icon, person_name, description)
 	. = ..()