TGS Test Merge (#248)

code/__DEFINES/__game.dm

@@ -382,6 +382,7 @@ block( \
 #define WALL_DEVWALL "devwall"
 #define WALL_DEVWALL_R "devwall_r"
 #define WALL_HUNTERSHIP "metal"//DMI specific name
+#define WALL_DINER "diner"
 
 //Defines for dropship weapon gimbals
 #define GIMBAL_LEFT -1

code/game/area/admin_level.dm

@@ -134,6 +134,10 @@
 	soundscape_playlist = SCAPE_PL_ELEVATOR_MUSIC
 	icon_state = "yellow"
 
+/area/adminlevel/ert_station/pizza
+	name = "Pizza Galaxy"
+	icon_state = "red"
+
 //Simulation area
 /area/adminlevel/simulation
 	name = "Simulated Reality"

code/game/machinery/doors/multi_tile.dm

@@ -639,3 +639,8 @@
 	opacity = FALSE
 	glass = TRUE
 
+/obj/structure/machinery/door/airlock/multi_tile/diner
+	name = "\improper Diner Airlock"
+	icon = 'icons/obj/structures/doors/2x1diner_door.dmi'
+	opacity = FALSE
+	glass = TRUE

code/game/objects/items/props/souto_land.dm

@@ -26,4 +26,12 @@
 	icon_state = "post"
 	layer = ABOVE_MOB_LAYER
 
+// Diner
+
+/obj/structure/prop/souto_land/streamer/blue
+	name = "blue streamers"
+	icon_state = "streamers_blue"
+
+/obj/structure/prop/souto_land/pole/blue
+	icon_state = "post_blue"
 

code/game/objects/structures/barricade/handrail.dm

@@ -198,3 +198,42 @@
 
 /obj/structure/barricade/handrail/sandstone/b
 	icon_state = "hr_sandstone_b"
+
+// Diner
+
+/obj/structure/barricade/handrail/pizza
+	name = "\improper diner half-wall"
+	can_be_reinforced = FALSE
+	projectile_coverage = PROJECTILE_COVERAGE_LOW
+
+/obj/structure/barricade/handrail/pizza/outer_wall
+	icon_state = "diner_wall_o"
+
+/obj/structure/barricade/handrail/pizza/inner_wall_long
+	icon_state = "diner_wall_i_long"
+	projectile_coverage = PROJECTILE_COVERAGE_NONE
+
+/obj/structure/barricade/handrail/pizza/inner_wall_short
+	icon_state = "diner_wall_i_short"
+	projectile_coverage = PROJECTILE_COVERAGE_NONE
+
+/obj/structure/barricade/handrail/pizza/inner_corners
+	icon_state = "diner_wall_i_corners"
+	layer = 2.99
+
+/obj/structure/barricade/handrail/pizza/outer_corners
+	icon_state = "diner_wall_o_corners"
+
+/obj/structure/barricade/handrail/pizza/entrance
+	icon_state = "diner_wall_entrance"
+	projectile_coverage = PROJECTILE_COVERAGE_NONE
+	density = FALSE
+
+/obj/structure/barricade/handrail/pizza/t_junction
+	icon_state = "diner_wall_t"
+	layer = 2.99
+
+/obj/structure/barricade/handrail/pizza/endcap
+	icon_state = "diner_wall_cap"
+	layer = 2.99
+	density = FALSE

code/game/objects/structures/stool_bed_chair_nest/sofa.dm

@@ -64,3 +64,15 @@
 /obj/structure/bed/sofa/vert/white/top //top
 	name = "Couch edge"
 	icon_state = "bench_vet3"
+
+// Diner
+
+/obj/structure/bed/sofa/diner_e_w
+	name = "Diner Couch"
+	icon = 'icons/obj/structures/props/diner_e_w.dmi'
+	icon_state = "east_west"
+
+/obj/structure/bed/sofa/diner_n_s
+	name = "Diner Couch"
+	icon = 'icons/obj/structures/props/diner_n_s.dmi'
+	icon_state = "north_south"

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -6,7 +6,11 @@
 	can_buckle = FALSE
 	foldabletype = /obj/item/stool
 
-
+/obj/structure/bed/stool/diner
+	icon_state = "stool_diner"
+	anchored = TRUE
+	can_buckle = FALSE
+	foldabletype = /obj/item/stool/diner
 
 /obj/item/stool
 	name = "stool"
@@ -27,4 +31,8 @@
 	..()
 	deploy_stool(user)
 
+/obj/item/stool/diner
+	name = "diner stool"
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "stool_diner"
 

code/game/objects/structures/tables_racks.dm

@@ -622,6 +622,22 @@
 	icon_state = "clothtable"
 	table_prefix = "cloth"
 
+//Diner
+
+/obj/structure/surface/table/reinforced/diner_white
+	name = "white diner table"
+	desc = "A smooth white table, bolted to the floor. The industry standard for a diner."
+	icon_state = "wdinertable"
+	table_prefix = "wdiner"
+
+/obj/structure/surface/table/reinforced/diner_red
+	name = "red diner table"
+	desc = "A smooth white table, bolted to the floor. The industry standard for a diner."
+	icon_state = "rdinertable"
+	table_prefix = "rdiner"
+
+// TOC tables
+
 /obj/structure/surface/table/reinforced/toc
 	name = "operations table"
 	desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs."

code/game/objects/structures/window.dm

@@ -992,3 +992,25 @@
 	icon_state = "paddedsec_rwindow0"
 	basestate = "paddedsec_rwindow"
 	window_frame = /obj/structure/window_frame/corsat/security
+
+//Diner windows
+
+/obj/structure/window/framed/diner
+	name = "hull window"
+	desc = "A glass window with a special rod matrix inside a wall frame. This one was made out of exotic materials to prevent hull breaches. No way to get through here."
+	icon = 'icons/turf/walls/diner_windows.dmi'
+	icon_state = "diner_window0"
+	basestate = "diner_window"
+	health = 40
+	window_frame = /obj/structure/window_frame/diner
+
+/obj/structure/window/framed/diner/hull
+	name = "window"
+	desc = "A glass window with a special rod matrix inside a wall frame. This one was made out of exotic materials to prevent hull breaches. No way to get through here."
+	icon_state = "diner_window0"
+	basestate = "diner_window"
+	not_damageable = TRUE
+	not_deconstructable = TRUE
+	unslashable = TRUE
+	unacidable = TRUE
+	health = 1000000 //Failsafe, shouldn't matter

code/game/objects/structures/window_frame.dm

@@ -300,3 +300,10 @@
 
 /obj/structure/window_frame/corsat/security
 	window_type = /obj/structure/window/framed/corsat/security
+
+// Diner frames
+/obj/structure/window_frame/diner
+	icon = 'icons/turf/walls/diner_windows.dmi'
+	icon_state = "diner_window0_frame"
+	basestate = "diner_window"
+	window_type = /obj/structure/window/framed/diner

code/game/turfs/diner.dm

@@ -0,0 +1,14 @@
+/turf/open/floor/diner
+	icon = 'icons/turf/floors/diner_floors.dmi'
+
+/turf/open/floor/diner/red_yellow
+	icon_state = "yellow_red"
+
+/turf/open/floor/diner/white_black
+	icon_state = "white_black"
+
+/turf/open/floor/diner/white_red
+	icon_state = "white_red"
+
+/turf/open/floor/diner/white_blue
+	icon_state = "white_blue"

code/game/turfs/walls/wall_types.dm

@@ -695,6 +695,22 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	icon_state = "shiva_fab_red"
 	walltype = WALL_SHIVA_FAB_RED
 
+// Diner walls
+
+/turf/closed/wall/diner
+	name = "reinforced hull"
+	desc = "A reinforced metal wall used to separate rooms and make up the station."
+	damage_cap = HEALTH_WALL_REINFORCED
+	icon = 'icons/turf/walls/diner_walls.dmi'
+	icon_state = "diner"
+	walltype = WALL_DINER
+
+/turf/closed/wall/diner/hull
+	name = "heavy reinforced hull"
+	desc = "A highly reinforced metal wall used to separate rooms and make up the station."
+	hull = TRUE
+	icon_state = "diner_h"
+
 
 //Xenomorph's Resin Walls
 

colonialmarines.dme

@@ -1343,6 +1343,7 @@
 #include "code\game\turfs\auto_turf.dm"
 #include "code\game\turfs\baseturf_skipover.dm"
 #include "code\game\turfs\closed.dm"
+#include "code\game\turfs\diner.dm"
 #include "code\game\turfs\floor.dm"
 #include "code\game\turfs\floor_types.dm"
 #include "code\game\turfs\kutjevo.dm"