Merge remote-tracking branch 'upstream/master' into fairylights

code/controllers/subsystem/ticker.dm

@@ -677,10 +677,16 @@ SUBSYSTEM_DEF(ticker)
 	update_everything_flag_in_db()
 	if(!round_end_sound)
 		round_end_sound = pick(\
-		'sound/roundend/iwishtherewassomethingmore.ogg',
-		'sound/roundend/likeisaid.ogg',
-		'sound/roundend/whatarottenwaytodie.ogg',
-		'sound/roundend/whatashame.ogg',
+		'hyperstation/sound/roundend/dotheballsgo.ogg',
+		'hyperstation/sound/roundend/filledwith.ogg',
+		'hyperstation/sound/roundend/iknowwhat.ogg',
+		'hyperstation/sound/roundend/lottawords.ogg',
+		'hyperstation/sound/roundend/pissesonme.ogg',
+		'hyperstation/sound/roundend/theballsgothard.ogg',
+		'hyperstation/sound/roundend/iwishtherewassomethingmore.ogg',
+		'hyperstation/sound/roundend/likeisaid.ogg',
+		'hyperstation/sound/roundend/whatarottenwaytodie.ogg',
+		'hyperstation/sound/roundend/whatashame.ogg',
 		'sound/roundend/newroundsexy.ogg',
 		'sound/roundend/apcdestroyed.ogg',
 		'sound/roundend/bangindonk.ogg',

hyperstation/code/game/objects/railings.dm

@@ -160,3 +160,36 @@
 		usr.forceMove(get_turf(src))
 
 	usr.visible_message("<span class='warning'>[user] climbed over \the [src]!</span>")
+
+/obj/structure/railing/handrail
+	name = "handrail"
+	desc = "A waist high handrail, perhaps you could climb over it."
+
+	icon = 'hyperstation/icons/obj/railings.dmi'
+	icon_modifier = "hand_"
+	icon_state = "hand_railing0"
+	max_integrity = 100
+
+/obj/structure/railing/handrail/update_icon(var/UpdateNeighgors = 1)
+	NeighborsCheck(UpdateNeighgors)
+	overlays.Cut()
+	if (!check || !anchored)//|| !anchored
+		icon_state = "[icon_modifier]railing0"
+	else
+		icon_state = "[icon_modifier]railing1"
+		if (check & 32)
+			overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]corneroverlay")
+		if ((check & 16) || !(check & 32) || (check & 64))
+			overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]frontoverlay_l")
+		if (!(check & 2) || (check & 1) || (check & 4))
+			overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]frontoverlay_r")
+			if(check & 4)
+				switch (src.dir)
+					if (NORTH)
+						overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = 32)
+					if (SOUTH)
+						overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = -32)
+					if (EAST)
+						overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = -32)
+					if (WEST)
+						overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = 32)