Merge branch 'master' into upstream-merge-29741

code/game/objects/structures/ai_core.dm

@@ -45,14 +45,13 @@
 		switch(state)
 			if(EMPTY_CORE)
 				if(istype(P, /obj/item/circuitboard/aicore))
-					if(!user.drop_item())
+					if(!user.transferItemToLoc(P, src))
 						return
 					playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
 					to_chat(user, "<span class='notice'>You place the circuit board inside the frame.</span>")
 					update_icon()
 					state = CIRCUIT_CORE
 					circuit = P
-					P.forceMove(src)
 					return
 			if(CIRCUIT_CORE)
 				if(istype(P, /obj/item/screwdriver))
@@ -143,10 +142,9 @@
 						to_chat(user, "<span class='warning'>This [M.name] is mindless!</span>")
 						return
 
-					if(!user.drop_item())
+					if(!user.transferItemToLoc(M,src))
 						return
 
-					M.forceMove(src)
 					brain = M
 					to_chat(user, "<span class='notice'>You add [M.name] to the frame.</span>")
 					update_icon()
@@ -176,7 +174,14 @@
 						SSticker.mode.remove_antag_for_borging(brain.brainmob.mind)
 						if(!istype(brain.laws, /datum/ai_laws/ratvar))
 							remove_servant_of_ratvar(brain.brainmob, TRUE)
-						var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(loc, laws, brain.brainmob)
+
+						var/mob/living/silicon/ai/A = null
+
+						if (brain.overrides_aicore_laws)
+							A = new /mob/living/silicon/ai(loc, brain.laws, brain.brainmob)
+						else
+							A = new /mob/living/silicon/ai(loc, laws, brain.brainmob)
+
 						if(brain.force_replace_ai_name)
 							A.fully_replace_character_name(A.name, brain.replacement_ai_name())
 						SSblackbox.inc("cyborg_ais_created",1)

code/game/objects/structures/crates_lockers/closets.dm

@@ -15,7 +15,7 @@
 	max_integrity = 200
 	integrity_failure = 50
 	armor = list(melee = 20, bullet = 10, laser = 10, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 60)
-	var/breakout_time = 2
+	var/breakout_time = 1200
 	var/message_cooldown
 	var/can_weld_shut = TRUE
 	var/horizontal = FALSE
@@ -366,9 +366,9 @@
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	user.visible_message("<span class='warning'>[src] begins to shake violently!</span>", \
-		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)</span>", \
+		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear banging from [src].</span>")
-	if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src || opened || (!locked && !welded) )
 			return
 		//we check after a while whether there is a point of resisting anymore and whether the user is capable of resisting

code/game/objects/structures/crates_lockers/crates/critter.dm

@@ -1,38 +1,38 @@
-/obj/structure/closet/crate/critter
-	name = "critter crate"
-	desc = "A crate designed for safe transport of animals. It has an oxygen tank for safe transport in space."
-	icon_state = "crittercrate"
-	horizontal = FALSE
-	allow_objects = FALSE
-	breakout_time = 1
-	material_drop = /obj/item/stack/sheet/mineral/wood
-	material_drop_amount = 4
-	delivery_icon = "deliverybox"
-	var/obj/item/tank/internals/emergency_oxygen/tank
-
-/obj/structure/closet/crate/critter/New()
-	..()
-	tank = new
-
-/obj/structure/closet/crate/critter/Destroy()
-	var/turf/T = get_turf(src)
-	if(tank)
-		tank.forceMove(T)
-		tank = null
-
-	return ..()
-
-/obj/structure/closet/crate/critter/update_icon()
-	cut_overlays()
-	if(opened)
-		add_overlay("crittercrate_door_open")
-	else
-		add_overlay("crittercrate_door")
-		if(manifest)
-			add_overlay("manifest")
-
-/obj/structure/closet/crate/critter/return_air()
-	if(tank)
-		return tank.air_contents
-	else
-		return loc.return_air()
+/obj/structure/closet/crate/critter
+	name = "critter crate"
+	desc = "A crate designed for safe transport of animals. It has an oxygen tank for safe transport in space."
+	icon_state = "crittercrate"
+	horizontal = FALSE
+	allow_objects = FALSE
+	breakout_time = 600
+	material_drop = /obj/item/stack/sheet/mineral/wood
+	material_drop_amount = 4
+	delivery_icon = "deliverybox"
+	var/obj/item/tank/internals/emergency_oxygen/tank
+
+/obj/structure/closet/crate/critter/New()
+	..()
+	tank = new
+
+/obj/structure/closet/crate/critter/Destroy()
+	var/turf/T = get_turf(src)
+	if(tank)
+		tank.forceMove(T)
+		tank = null
+
+	return ..()
+
+/obj/structure/closet/crate/critter/update_icon()
+	cut_overlays()
+	if(opened)
+		add_overlay("crittercrate_door_open")
+	else
+		add_overlay("crittercrate_door")
+		if(manifest)
+			add_overlay("manifest")
+
+/obj/structure/closet/crate/critter/return_air()
+	if(tank)
+		return tank.air_contents
+	else
+		return loc.return_air()

code/game/objects/structures/dresser.dm

@@ -13,6 +13,8 @@
 		if(do_after(user, 20, target = src))
 			to_chat(user, "<span class='notice'>You successfully [anchored ? "unwrench" : "wrench"] [src].</span>")
 			anchored = !anchored
+	else
+		return ..()
 
 /obj/structure/dresser/deconstruct(disassembled = TRUE)
 	new /obj/item/stack/sheet/mineral/wood (get_turf(src), 10)

code/game/objects/structures/extinguisher.dm

@@ -10,6 +10,10 @@
 	var/obj/item/extinguisher/stored_extinguisher
 	var/opened = 0
 
+/obj/structure/extinguisher_cabinet/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to [opened ? "close":"open"] it.</span>")
+
 /obj/structure/extinguisher_cabinet/New(loc, ndir, building)
 	..()
 	if(building)

code/game/objects/structures/morgue.dm

@@ -24,7 +24,7 @@
 	var/locked = FALSE
 	var/opendir = SOUTH
 	var/message_cooldown
-	var/breakout_time = 1
+	var/breakout_time = 600
 
 /obj/structure/bodycontainer/Destroy()
 	open()
@@ -97,9 +97,9 @@
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	user.visible_message(null, \
-		"<span class='notice'>You lean on the back of [src] and start pushing the tray open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)</span>", \
+		"<span class='notice'>You lean on the back of [src] and start pushing the tray open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a metallic creaking from [src].</span>")
-	if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src )
 			return
 		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \

code/game/objects/structures/reflector.dm

@@ -13,6 +13,10 @@
 	var/buildstacktype = /obj/item/stack/sheet/metal
 	var/buildstackamount = 0
 
+/obj/structure/reflector/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to adjust its direction.</span>")
+
 /obj/structure/reflector/bullet_act(obj/item/projectile/P)
 	var/turf/reflector_turf = get_turf(src)
 	var/turf/reflect_turf