Merge upstream

code/game/objects/structures/barsigns.dm

@@ -299,6 +299,11 @@
 	icon = "thenet"
 	desc = "You just seem to get caught up in it for hours."
 
+/datum/barsign/maidcafe
+	name = "Maid Cafe"
+	icon = "maidcafe"
+	desc = "Welcome back, master!"
+
 
 /datum/barsign/hiddensigns
 	hidden = 1

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

@@ -131,6 +131,8 @@
 	max_integrity = 70
 	horizontal = TRUE
 	delivery_icon = "deliverycrate"
+	material_drop = /obj/item/stack/sheet/mineral/wood
+	material_drop_amount = 5
 
 /obj/structure/closet/wardrobe/red
 	name = "security wardrobe"

code/game/objects/structures/displaycase.dm

@@ -207,7 +207,7 @@
 		playsound(src.loc, I.usesound, 50, 1)
 		if(do_after(user, 30*I.toolspeed, target = src))
 			playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
-			new /obj/item/stack/sheet/mineral/wood(get_turf(src))
+			new /obj/item/stack/sheet/mineral/wood(get_turf(src), 5)
 			qdel(src)
 
 	else if(istype(I, /obj/item/weapon/electronics/airlock))

code/game/objects/structures/flora.dm

@@ -339,7 +339,7 @@
 /obj/structure/flora/rock/jungle
 	icon_state = "pile of rocks"
 	desc = "A pile of rocks."
-	icon_state = "rocks"
+	icon_state = "rock"
 	icon = 'icons/obj/flora/jungleflora.dmi'
 	density = FALSE
 
@@ -380,6 +380,6 @@
 	pixel_x = -16
 	pixel_y = -16
 
-/obj/structure/flora/rock/jungle/Initialize()
+/obj/structure/flora/rock/pile/largejungle/Initialize()
 	..()
 	icon_state = "[initial(icon_state)][rand(1,3)]"

code/game/objects/structures/ghost_role_spawners.dm

@@ -109,7 +109,7 @@
 /obj/effect/mob_spawn/human/golem/New(loc, datum/species/golem/species = null, has_owner = FALSE, mob/creator = null)
 	..()
 	if(species)
-		name += " ([initial(species.id)])"
+		name += " ([initial(species.prefix)])"
 		mob_species = species
 	var/area/A = get_area(src)
 	if(A)
@@ -120,26 +120,7 @@
 		owner = creator
 
 /obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn)
-	var/golem_surname = pick(golem_names)
-	// 3% chance that our golem has a human surname, because
-	// cultural contamination
-	if(prob(3))
-		golem_surname = pick(last_names)
-
 	var/datum/species/golem/X = mob_species
-	var/golem_forename = initial(X.id)
-
-	// The id of golem species is either their material "diamond","gold",
-	// or just "golem" for the plain ones. So we're using it for naming.
-
-	if(golem_forename == "golem")
-		golem_forename = "iron"
-
-	new_spawn.real_name = "[capitalize(golem_forename)] [golem_surname]"
-	// This means golems have names like Iron Forge, or Diamond Quarry
-	// also a tiny chance of being called "Plasma Meme"
-	// which is clearly a feature
-
 	to_chat(new_spawn, "[initial(X.info_text)]")
 	if(!owner)
 		to_chat(new_spawn, "Build golem shells in the autolathe, and feed refined mineral sheets to the shells to bring them to life! You are generally a peaceful group unless provoked.")
@@ -151,6 +132,7 @@
 	if(ishuman(new_spawn))
 		var/mob/living/carbon/human/H = new_spawn
 		H.set_cloned_appearance()
+		H.real_name = H.dna.species.random_name()
 
 /obj/effect/mob_spawn/human/golem/adamantine
 	name = "dust-caked golem shell"

code/game/objects/structures/lattice.dm

@@ -42,7 +42,7 @@
 
 /obj/structure/lattice/deconstruct(disassembled = TRUE)
 	if(!(flags & NODECONSTRUCT))
-		new /obj/item/stack/rods(get_turf(src), amount=number_of_rods)
+		new /obj/item/stack/rods(get_turf(src), number_of_rods)
 	qdel(src)
 
 /obj/structure/lattice/singularity_pull(S, current_size)

code/game/objects/structures/safe.dm

@@ -147,6 +147,7 @@ FLOOR SAFES
 		if(open)
 			if(P && in_range(src, user))
 				user.put_in_hands(P)
+				space -= P.w_class
 				updateUsrDialog()