Sprites by Wei aka Esselnek, Mapping by Nanu, Reviewed by Spartanbobby

cmss13-devs · Mar 17, 2024 · 6bd992f · 6bd992f
1 parent 9b6f711
commit 6bd992f
Show file tree

Hide file tree

Showing 21 changed files with 991 additions and 1,010 deletions.
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -375,6 +375,7 @@
 #define WALL_DEVWALL_R "devwall_r"
 #define WALL_HUNTERSHIP "metal"//DMI specific name
 #define WALL_AICORE "aiwall"
+#define WALL_DINER "diner"
 
 //Defines for dropship weapon gimbals
 #define GIMBAL_LEFT -1

diff --git a/code/game/objects/items/props/souto_land.dm b/code/game/objects/items/props/souto_land.dm
@@ -26,4 +26,11 @@
 	icon_state = "post"
 	layer = ABOVE_MOB_LAYER
 
+/obj/structure/prop/souto_land/streamer/blue
+	name = "orange streamers"
+	icon = 'icons/obj/structures/props/banners.dmi'
+	icon_state = "bStreamerflags"
 
+/obj/structure/prop/souto_land/pole/blue
+	icon = 'icons/obj/structures/props/banners.dmi'
+	icon_state = "bStreamerpole"
diff --git a/code/game/objects/structures/barricade/handrail.dm b/code/game/objects/structures/barricade/handrail.dm
@@ -199,10 +199,36 @@
 /obj/structure/barricade/handrail/sandstone/b
 	icon_state = "hr_sandstone_b"
 
+// Diner
 /obj/structure/barricade/handrail/pizza
 	name = "\improper diner half-wall"
-	icon_state = "hr_sandstone" //temp, getting sprites soontm
-	color = "#b51c0b"
 	can_be_reinforced = FALSE
 	projectile_coverage = PROJECTILE_COVERAGE_LOW
 	layer = MOB_LAYER + 0.01
+
+/obj/structure/barricade/handrail/pizza/outer_wall
+	icon_state = "diner_wall_o"
+
+/obj/structure/barricade/handrail/pizza/inner_wall
+	icon_state = "diner_wall_i"
+	projectile_coverage = PROJECTILE_COVERAGE_NONE
+
+/obj/structure/barricade/handrail/pizza/inner_corners
+	icon_state = "diner_wall_i_corners"
+	layer = MOB_LAYER + 0.02
+
+/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"
+
+/obj/structure/barricade/handrail/pizza/endcap
+	icon_state = "diner_wall_cap"
+	layer = MOB_LAYER + 0.02
+	density = FALSE
diff --git a/code/game/objects/structures/stool_bed_chair_nest/sofa.dm b/code/game/objects/structures/stool_bed_chair_nest/sofa.dm
@@ -64,3 +64,13 @@
 /obj/structure/bed/sofa/vert/white/top //top
 	name = "Couch edge"
 	icon_state = "bench_vet3"
+
+/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"
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/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"
@@ -17,6 +21,11 @@
 	throwforce = 12
 	w_class = SIZE_HUGE
 
+/obj/item/stool/diner
+	name = "diner stool"
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "stool_diner"
+
 /obj/item/stool/proc/deploy_stool(mob/user)
 	new /obj/structure/bed/stool(get_turf(user))
 	user.temp_drop_inv_item(src)

diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
@@ -628,6 +628,18 @@
 	icon_state = "clothtable"
 	table_prefix = "cloth"
 
+/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"
+
 /*
  * Racks
  */

diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -1015,3 +1015,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
diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm
@@ -310,3 +310,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
diff --git a/code/game/turfs/diner.dm b/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"
diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm
@@ -735,6 +735,19 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	icon_state = "shiva_fab_red"
 	walltype = WALL_SHIVA_FAB_RED
 
+/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
 

diff --git a/colonialmarines.dme b/colonialmarines.dme
@@ -1369,6 +1369,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"

diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
diff --git a/icons/obj/structures/handrail.dmi b/icons/obj/structures/handrail.dmi
diff --git a/icons/obj/structures/props/banners.dmi b/icons/obj/structures/props/banners.dmi
diff --git a/icons/obj/structures/props/diner_e_w.dmi b/icons/obj/structures/props/diner_e_w.dmi
diff --git a/icons/obj/structures/props/diner_n_s.dmi b/icons/obj/structures/props/diner_n_s.dmi
diff --git a/icons/obj/structures/tables.dmi b/icons/obj/structures/tables.dmi
diff --git a/icons/turf/floors/diner_floors.dmi b/icons/turf/floors/diner_floors.dmi
diff --git a/icons/turf/walls/diner_walls.dmi b/icons/turf/walls/diner_walls.dmi
diff --git a/icons/turf/walls/diner_windows.dmi b/icons/turf/walls/diner_windows.dmi