Merge pull request #3785 from comma/dev

Some fixes

baystation12.int

@@ -1,5 +1,6 @@
 // BEGIN_INTERNALS
 /*
+MAP_ICON_TYPE: 0
 AUTO_FILE_DIR: OFF
 */
 // END_INTERNALS

code/_onclick/item_attack.dm

@@ -26,7 +26,9 @@
 	if (!istype(M)) // not sure if this is the right thing...
 		return
 	var/messagesource = M
-
+	if (can_operate(M))        //Checks if mob is lying down on table for surgery
+		if (do_surgery(M,user,src))
+			return
 	if (istype(M,/mob/living/carbon/brain))
 		messagesource = M:container
 	if (hitsound)

code/game/objects/structures/flora.dm

@@ -12,8 +12,8 @@
 	icon_state = "pine_1"
 
 /obj/structure/flora/tree/pine/New()
-	..()
 	icon_state = "pine_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/tree/pine/xmas
 	name = "xmas tree"
@@ -29,8 +29,8 @@
 	icon_state = "tree_1"
 
 /obj/structure/flora/tree/dead/New()
-	..()
 	icon_state = "tree_[rand(1, 6)]"
+	..()
 
 
 //grass
@@ -43,23 +43,23 @@
 	icon_state = "snowgrass1bb"
 
 /obj/structure/flora/grass/brown/New()
-	..()
 	icon_state = "snowgrass[rand(1, 3)]bb"
+	..()
 
 
 /obj/structure/flora/grass/green
 	icon_state = "snowgrass1gb"
 
 /obj/structure/flora/grass/green/New()
-	..()
 	icon_state = "snowgrass[rand(1, 3)]gb"
+	..()
 
 /obj/structure/flora/grass/both
 	icon_state = "snowgrassall1"
 
 /obj/structure/flora/grass/both/New()
-	..()
 	icon_state = "snowgrassall[rand(1, 3)]"
+	..()
 
 
 //bushes
@@ -70,8 +70,13 @@
 	anchored = 1
 
 /obj/structure/flora/bush/New()
-	..()
 	icon_state = "snowbush[rand(1, 6)]"
+	..()
+
+/obj/structure/flora/pottedplant
+	name = "potted plant"
+	icon = 'icons/obj/plants.dmi'
+	icon_state = "plant-26"
 
 //newbushes
 
@@ -82,110 +87,110 @@
 	anchored = 1
 
 /obj/structure/flora/ausbushes/New()
-	..()
 	icon_state = "firstbush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/reedbush
 	icon_state = "reedbush_1"
 
 /obj/structure/flora/ausbushes/reedbush/New()
-	..()
 	icon_state = "reedbush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/leafybush
 	icon_state = "leafybush_1"
 
 /obj/structure/flora/ausbushes/leafybush/New()
-	..()
 	icon_state = "leafybush_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/palebush
 	icon_state = "palebush_1"
 
 /obj/structure/flora/ausbushes/palebush/New()
-	..()
 	icon_state = "palebush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/stalkybush
 	icon_state = "stalkybush_1"
 
 /obj/structure/flora/ausbushes/stalkybush/New()
-	..()
 	icon_state = "stalkybush_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/grassybush
 	icon_state = "grassybush_1"
 
 /obj/structure/flora/ausbushes/grassybush/New()
-	..()
 	icon_state = "grassybush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/fernybush
 	icon_state = "fernybush_1"
 
 /obj/structure/flora/ausbushes/fernybush/New()
-	..()
 	icon_state = "fernybush_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/sunnybush
 	icon_state = "sunnybush_1"
 
 /obj/structure/flora/ausbushes/sunnybush/New()
-	..()
 	icon_state = "sunnybush_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/genericbush
 	icon_state = "genericbush_1"
 
 /obj/structure/flora/ausbushes/genericbush/New()
-	..()
 	icon_state = "genericbush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/pointybush
 	icon_state = "pointybush_1"
 
 /obj/structure/flora/ausbushes/pointybush/New()
-	..()
 	icon_state = "pointybush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/lavendergrass
 	icon_state = "lavendergrass_1"
 
 /obj/structure/flora/ausbushes/lavendergrass/New()
-	..()
 	icon_state = "lavendergrass_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/ywflowers
 	icon_state = "ywflowers_1"
 
 /obj/structure/flora/ausbushes/ywflowers/New()
-	..()
 	icon_state = "ywflowers_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/brflowers
 	icon_state = "brflowers_1"
 
 /obj/structure/flora/ausbushes/brflowers/New()
-	..()
 	icon_state = "brflowers_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/ppflowers
 	icon_state = "ppflowers_1"
 
 /obj/structure/flora/ausbushes/ppflowers/New()
-	..()
 	icon_state = "ppflowers_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/sparsegrass
 	icon_state = "sparsegrass_1"
 
 /obj/structure/flora/ausbushes/sparsegrass/New()
-	..()
 	icon_state = "sparsegrass_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/fullgrass
 	icon_state = "fullgrass_1"
 
 /obj/structure/flora/ausbushes/fullgrass/New()
-	..()
 	icon_state = "fullgrass_[rand(1, 3)]"
+	..()

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

@@ -13,11 +13,10 @@
 	icon_state = "bed"
 	var/mob/living/buckled_mob
 
-/obj/structure/stool/psychbed
+/obj/structure/stool/bed/psych
 	name = "psych bed"
 	desc = "For prime comfort during psychiatric evaluations."
 	icon_state = "psychbed"
-	var/mob/living/buckled_mob
 
 /obj/structure/stool/bed/alien
 	name = "resting contraption"

code/game/objects/structures/tables_racks.dm

@@ -348,6 +348,7 @@
 
 
 /obj/structure/table/attackby(obj/item/W as obj, mob/user as mob)
+	if (!W) return
 	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
 		var/obj/item/weapon/grab/G = W
 		if (istype(G.affecting, /mob/living))

code/game/structure/flora.dm

@@ -1,196 +0,0 @@
-//trees
-/obj/structure/flora/tree
-	name = "tree"
-	anchored = 1
-	density = 1
-	pixel_x = -16
-	layer = 9
-
-/obj/structure/flora/tree/pine
-	name = "pine tree"
-	icon = 'icons/obj/flora/pinetrees.dmi'
-	icon_state = "pine_1"
-
-/obj/structure/flora/tree/pine/New()
-	icon_state = "pine_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/tree/pine/xmas
-	name = "xmas tree"
-	icon = 'icons/obj/flora/pinetrees.dmi'
-	icon_state = "pine_c"
-
-/obj/structure/flora/tree/pine/xmas/New()
-	..()
-	icon_state = "pine_c"
-
-/obj/structure/flora/tree/dead
-	icon = 'icons/obj/flora/deadtrees.dmi'
-	icon_state = "tree_1"
-
-/obj/structure/flora/tree/dead/New()
-	icon_state = "tree_[rand(1, 6)]"
-	..()
-
-
-//grass
-/obj/structure/flora/grass
-	name = "grass"
-	icon = 'icons/obj/flora/snowflora.dmi'
-	anchored = 1
-
-/obj/structure/flora/grass/brown
-	icon_state = "snowgrass1bb"
-
-/obj/structure/flora/grass/brown/New()
-	icon_state = "snowgrass[rand(1, 3)]bb"
-	..()
-
-
-/obj/structure/flora/grass/green
-	icon_state = "snowgrass1gb"
-
-/obj/structure/flora/grass/green/New()
-	icon_state = "snowgrass[rand(1, 3)]gb"
-	..()
-
-/obj/structure/flora/grass/both
-	icon_state = "snowgrassall1"
-
-/obj/structure/flora/grass/both/New()
-	icon_state = "snowgrassall[rand(1, 3)]"
-	..()
-
-
-//bushes
-/obj/structure/flora/bush
-	name = "bush"
-	icon = 'icons/obj/flora/snowflora.dmi'
-	icon_state = "snowbush1"
-	anchored = 1
-
-/obj/structure/flora/bush/New()
-	icon_state = "snowbush[rand(1, 6)]"
-	..()
-
-/obj/structure/flora/pottedplant
-	name = "potted plant"
-	icon = 'icons/obj/plants.dmi'
-	icon_state = "plant-26"
-
-//newbushes
-
-/obj/structure/flora/ausbushes
-	name = "bush"
-	icon = 'icons/obj/flora/ausflora.dmi'
-	icon_state = "firstbush_1"
-	anchored = 1
-
-/obj/structure/flora/ausbushes/New()
-	icon_state = "firstbush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/reedbush
-	icon_state = "reedbush_1"
-
-/obj/structure/flora/ausbushes/reedbush/New()
-	icon_state = "reedbush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/leafybush
-	icon_state = "leafybush_1"
-
-/obj/structure/flora/ausbushes/leafybush/New()
-	icon_state = "leafybush_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/palebush
-	icon_state = "palebush_1"
-
-/obj/structure/flora/ausbushes/palebush/New()
-	icon_state = "palebush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/stalkybush
-	icon_state = "stalkybush_1"
-
-/obj/structure/flora/ausbushes/stalkybush/New()
-	icon_state = "stalkybush_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/grassybush
-	icon_state = "grassybush_1"
-
-/obj/structure/flora/ausbushes/grassybush/New()
-	icon_state = "grassybush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/fernybush
-	icon_state = "fernybush_1"
-
-/obj/structure/flora/ausbushes/fernybush/New()
-	icon_state = "fernybush_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/sunnybush
-	icon_state = "sunnybush_1"
-
-/obj/structure/flora/ausbushes/sunnybush/New()
-	icon_state = "sunnybush_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/genericbush
-	icon_state = "genericbush_1"
-
-/obj/structure/flora/ausbushes/genericbush/New()
-	icon_state = "genericbush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/pointybush
-	icon_state = "pointybush_1"
-
-/obj/structure/flora/ausbushes/pointybush/New()
-	icon_state = "pointybush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/lavendergrass
-	icon_state = "lavendergrass_1"
-
-/obj/structure/flora/ausbushes/lavendergrass/New()
-	icon_state = "lavendergrass_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/ywflowers
-	icon_state = "ywflowers_1"
-
-/obj/structure/flora/ausbushes/ywflowers/New()
-	icon_state = "ywflowers_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/brflowers
-	icon_state = "brflowers_1"
-
-/obj/structure/flora/ausbushes/brflowers/New()
-	icon_state = "brflowers_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/ppflowers
-	icon_state = "ppflowers_1"
-
-/obj/structure/flora/ausbushes/ppflowers/New()
-	icon_state = "ppflowers_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/sparsegrass
-	icon_state = "sparsegrass_1"
-
-/obj/structure/flora/ausbushes/sparsegrass/New()
-	icon_state = "sparsegrass_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/fullgrass
-	icon_state = "fullgrass_1"
-
-/obj/structure/flora/ausbushes/fullgrass/New()
-	icon_state = "fullgrass_[rand(1, 3)]"
-	..()

maps/tgstation2.dmm

@@ -3874,7 +3874,7 @@
 "bwz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bwA" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/manifold{pipe_color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bwB" = (/obj/machinery/vending/wallmed1{pixel_y = 28},/turf/simulated/floor{icon_state = "bcarpet02"},/area/medical/medbay{name = "Psychiatric Office"})
-"bwC" = (/obj/structure/noticeboard{pixel_y = 28},/obj/structure/stool/psychbed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor{icon_state = "bcarpet02"},/area/medical/medbay{name = "Psychiatric Office"})
+"bwC" = (/obj/structure/noticeboard{pixel_y = 28},/obj/structure/stool/bed/psych,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor{icon_state = "bcarpet02"},/area/medical/medbay{name = "Psychiatric Office"})
 "bwD" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Medical_Psychiatry"; name = "Privacy Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/medbay{name = "Psychiatric Office"})
 "bwE" = (/obj/machinery/alarm{pixel_y = 24},/obj/structure/stool/bed/chair/comfy/brown,/turf/simulated/floor{icon_state = "bcarpet01"},/area/medical/medbay{name = "Psychiatric Office"})
 "bwF" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)