Merge branch 'master' of https://github.com/butmun/Interpost-Hague

SS13-Source-Archive · Oct 13, 2020 · 2d67651 · 2d67651
2 parents d56fd43 + 902783c
commit 2d67651
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 4 deletions.
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -2,7 +2,6 @@
 	name = "chair"
 	desc = "You sit in this, either by will or force."
 	icon_state = "chair_preview"
-	color = "#666666"
 	base_icon = "chair"
 	buckle_dir = 0
 	buckle_lying = 0 //force people to sit up in chairs when buckled

diff --git a/code/modules/religion/religion.dm b/code/modules/religion/religion.dm
@@ -195,7 +195,7 @@ proc/generate_random_prayer()//This generates a new one.
 			if(do_after(src, timer))
 				var/T =  get_turf(src)
 				playsound(get_turf(src), praise_sound,30,0)
-				to_chat(src, "A [user_religion.holy_item] apears at your feet")
+				to_chat(src, "<span class='danger'>A [user_religion.holy_item] appears at your feet!</span>")
 				var/holy_item_type = GLOB.all_religions[religion].holy_item.type
 				var/new_holy_item = new holy_item_type(T)
 				religion_token = new_holy_item

diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
diff --git a/maps/frontier/frontier-2.dmm b/maps/frontier/frontier-2.dmm
@@ -606,8 +606,8 @@
 "lH" = (/obj/effect/floor_decal/newcorner/white/corner{icon_state = "white-corner"; dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/primary/fore)
 "lI" = (/obj/effect/floor_decal/newcorner/red{tag = "icon-red (WEST)"; icon_state = "red"; dir = 8},/turf/simulated/floor/tiled,/area/security/main)
 "lJ" = (/obj/effect/floor_decal/newcorner/white/quarter{tag = "icon-white-quarter (NORTH)"; icon_state = "white-quarter"; dir = 1},/obj/structure/table/standard,/obj/random/smokes,/turf/simulated/floor/tiled,/area/hallway/primary/fore)
-"lK" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/spline/plain{dir = 8},/turf/simulated/floor/wood,/area/hallway/primary/fore)
-"lL" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/hallway/primary/fore)
+"lK" = (/obj/effect/floor_decal/spline/plain{dir = 8},/obj/structure/table/glass,/turf/simulated/floor/wood,/area/hallway/primary/fore)
+"lL" = (/obj/structure/table/glass,/turf/simulated/floor/wood,/area/hallway/primary/fore)
 "lM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/security_port)
 "lN" = (/obj/structure/bed/chair/office/dark{tag = "icon-officechair_dark_preview (NORTH)"; icon_state = "officechair_dark_preview"; dir = 1},/turf/simulated/floor/tiled,/area/security/main)
 "lO" = (/obj/machinery/light{dir = 4},/obj/effect/floor_decal/newcorner/red{icon_state = "red"; dir = 4},/turf/simulated/floor/tiled,/area/security/main)