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

hyperstation/code/game/objects/railings.dm

@@ -7,13 +7,16 @@
 	icon = 'hyperstation/icons/obj/railings.dmi'
 	var/icon_modifier = "grey_"
 	icon_state = "grey_railing0"
-	
+
 	density = FALSE
 	layer = 4
 	anchored = TRUE
 	flags_1 = ON_BORDER_1
 	max_integrity = 250
 	var/heat_resistance = 800
+	var/health = 70
+	var/maxhealth = 70
+
 
 	resistance_flags = ACID_PROOF
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
@@ -119,3 +122,40 @@
 						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)
+
+/obj/structure/railing/examine(mob/user)
+	. = ..()
+	if(health < maxhealth)
+		switch(health / maxhealth)
+			if(0.0 to 0.5)
+				. += "<span class='warning'>It looks severely damaged!</span>"
+			if(0.25 to 0.5)
+				. += "<span class='warning'>It looks damaged!</span>"
+			if(0.5 to 1.0)
+				. += "<span class='notice'>It has a few scrapes and dents.</span>"
+
+/obj/structure/railing/take_damage(amount)
+	health -= amount
+	if(health <= 0)
+		visible_message("<span class='warning'>\The [src] breaks down!</span>")
+		playsound(src, 'sound/effects/grillehit.ogg', 50, 1)
+		new /obj/item/stack/rods(get_turf(src))
+		qdel(src)
+
+/obj/structure/railing/MouseDrop_T(mob/living/M, mob/living/user)
+	if(!istype(user))
+		return
+	if(!isliving(user))
+		return
+
+	usr.visible_message("<span class='warning'>[user] starts climbing onto \the [src]!</span>")
+
+	if(!do_after(user, 20))
+		return
+
+	if(get_turf(user) == get_turf(src))
+		usr.forceMove(get_step(src, src.dir))
+	else
+		usr.forceMove(get_turf(src))
+
+	usr.visible_message("<span class='warning'>[user] climbed over \the [src]!</span>")

hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm

@@ -1,5 +1,3 @@
-//Archie was here
-
 /obj/item/clothing/glasses/polychromic
 	name = "polychromic glasses template"
 	desc = "You shouldn't be seeing this. Report it if you do."

hyperstation/code/modules/mob/living/status_indicators.dm

@@ -0,0 +1,51 @@
+//Ported from virgo, with some touch ups to make it work with our code.
+
+/mob/living
+	var/list/status_indicators = null // Will become a list as needed.
+
+/mob/living/proc/add_status_indicator(mutable_appearance/thing)
+	if(get_status_indicator(thing))
+		return
+
+	if(!istype(thing, /mutable_appearance))
+		thing = mutable_appearance('hyperstation/icons/mob/status_indicators.dmi', icon_state = thing)
+
+	LAZYADD(status_indicators, thing)
+	handle_status_indicators()
+
+/mob/living/proc/remove_status_indicator(mutable_appearance/thing)
+	thing = get_status_indicator(thing)
+
+	cut_overlay(thing)
+	LAZYREMOVE(status_indicators, thing)
+	handle_status_indicators()
+
+/mob/living/proc/get_status_indicator(mutable_appearance/thing)
+	if(!istype(thing, /mutable_appearance))
+		for(var/mutable_appearance/I in status_indicators)
+			if(I.icon_state == thing)
+				return I
+	return LAZYACCESS(status_indicators, LAZYFIND(status_indicators, thing))
+
+/mob/living/proc/handle_status_indicators()
+	// First, get rid of all the overlays.
+	for(var/thing in status_indicators)
+		cut_overlay(thing)
+
+	if(!LAZYLEN(status_indicators))
+		return
+
+	if(stat == DEAD)
+		return
+
+	// Now the indicator row can actually be built.
+	for(var/thing in status_indicators)
+		var/mutable_appearance/I = thing
+
+		I.appearance_flags = PIXEL_SCALE|KEEP_APART
+		I.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+		I.plane = HUD_PLANE
+		I.layer = ABOVE_FLY_LAYER
+		I.pixel_y = 18
+		I.pixel_x = 18
+		add_overlay(I)

hyperstation/code/obj/fleshlight.dm

@@ -1,6 +1,7 @@
 //Hyperstation 13 fleshlight
 //Humbley request this doesnt get ported to other code bases, we strive to make things unique on our server and we dont have alot of coders
 //but if you absolutely must. please give us some credit~ <3
+//made by quotefox
 
 /obj/item/fleshlight
 	name = "fleshlight"
@@ -170,7 +171,7 @@
 
 		if (C.getArousalLoss() >= 100 && ishuman(C) && C.has_dna())
 			var/mob/living/carbon/human/O = C
-			O.mob_climax_partner(P, M, FALSE, FALSE, FALSE, TRUE) //climax with their partner remotely!
+			O.mob_climax_partner(P, M, FALSE, TRUE, FALSE, TRUE) //climax with their partner remotely, and impreg because people keep asking!
 		return
 	..()