Merge branch 'master' into upstream-merge-34773

code/game/objects/effects/decals/misc.dm

@@ -8,7 +8,7 @@
 /obj/effect/temp_visual/point/Initialize(mapload, set_invis = 0)
 	. = ..()
 	var/atom/old_loc = loc
-	forceMove(get_turf(src))
+	loc = get_turf(src) // We don't want to actualy trigger anything when it moves
 	pixel_x = old_loc.pixel_x
 	pixel_y = old_loc.pixel_y
 	invisibility = set_invis

code/game/objects/effects/landmarks.dm

@@ -4,6 +4,18 @@
 	icon_state = "x2"
 	anchored = TRUE
 	invisibility = INVISIBILITY_ABSTRACT
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+/obj/effect/landmark/singularity_act()
+	return
+
+// Please stop bombing the Observer-Start landmark.
+/obj/effect/landmark/ex_act()
+	return
+
+/obj/effect/landmark/singularity_pull()
+	return
+
 
 /obj/effect/landmark/New()
 	..()

code/game/objects/items/pet_carrier.dm

@@ -124,17 +124,17 @@
 		to_chat(loc, "<span class='warning'>You see [user] reach through the bars and fumble for the lock switch!</span>")
 		if(!do_after(user, rand(300, 400), target = user) || open || !locked || !user in occupants)
 			return
-		loc.visible_message("<span class='warning'>[user] flips the lock switch on [src] by reaching through!</span>", ignored_mob = user)
+		loc.visible_message("<span class='warning'>[user] flips the lock switch on [src] by reaching through!</span>", null, null, null, user)
 		to_chat(user, "<span class='boldannounce'>Bingo! The lock pops open!</span>")
 		locked = FALSE
 		playsound(src, 'sound/machines/boltsup.ogg', 30, TRUE)
 		update_icon()
 	else
-		loc.visible_message("<span class='warning'>[src] starts rattling as something pushes against the door!</span>", ignored_mob = user)
+		loc.visible_message("<span class='warning'>[src] starts rattling as something pushes against the door!</span>", null, null, null, user)
 		to_chat(user, "<span class='notice'>You start pushing out of [src]... (This will take about 20 seconds.)</span>")
 		if(!do_after(user, 200, target = user) || open || !locked || !user in occupants)
 			return
-		loc.visible_message("<span class='warning'>[user] shoves out of	[src]!</span>", ignored_mob = user)
+		loc.visible_message("<span class='warning'>[user] shoves out of	[src]!</span>", null, null, null, user)
 		to_chat(user, "<span class='notice'>You shove open [src]'s door against the lock's resistance and fall out!</span>")
 		locked = FALSE
 		open = TRUE
@@ -162,7 +162,7 @@
 		to_chat(user, "<span class='warning'>[src] is already carrying too much!</span>")
 		return
 	user.visible_message("<span class='notice'>[user] starts loading [target] into [src].</span>", \
-	"<span class='notice'>You start loading [target] into [src]...</span>", ignored_mob = target)
+	"<span class='notice'>You start loading [target] into [src]...</span>", null, null, target)
 	to_chat(target, "<span class='userdanger'>[user] starts loading you into their [name]!</span>")
 	if(!do_mob(user, target, 30))
 		return
@@ -172,7 +172,7 @@
 		to_chat(user, "<span class='warning'>[src] is already carrying too much!</span>")
 		return
 	user.visible_message("<span class='notice'>[user] loads [target] into [src]!</span>", \
-	"<span class='notice'>You load [target] into [src].</span>", ignored_mob = target)
+	"<span class='notice'>You load [target] into [src].</span>", null, null, target)
 	to_chat(target, "<span class='userdanger'>[user] loads you into their [name]!</span>")
 	add_occupant(target)
 

code/game/objects/structures/beds_chairs/alien_nest.dm

@@ -11,6 +11,7 @@
 	canSmoothWith = null
 	buildstacktype = null
 	flags_1 = NODECONSTRUCT_1
+	bolts = FALSE
 	var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/alien.dmi', "nestoverlay", LYING_MOB_LAYER)
 
 /obj/structure/bed/nest/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user)
@@ -88,4 +89,4 @@
 	if(user.a_intent != INTENT_HARM)
 		return attack_hand(user)
 	else
-		return ..()
+		return ..()

code/game/objects/structures/beds_chairs/bed.dm

@@ -13,17 +13,19 @@
 	icon_state = "bed"
 	icon = 'icons/obj/objects.dmi'
 	anchored = TRUE
-	can_buckle = 1
-	buckle_lying = 1
+	can_buckle = TRUE
+	buckle_lying = TRUE
 	resistance_flags = FLAMMABLE
 	max_integrity = 100
 	integrity_failure = 30
 	var/buildstacktype = /obj/item/stack/sheet/metal
 	var/buildstackamount = 2
+	var/bolts = TRUE
 
 /obj/structure/bed/examine(mob/user)
 	..()
-	to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
+	if(bolts)
+		to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
 
 /obj/structure/bed/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))