more map changes

GainStation13/code/clothing/hud.dm

@@ -0,0 +1,14 @@
+
+/obj/item/clothing/glasses/hud/health/gar
+	name = "gar health scanner HUD"
+	desc = "When you're scared, that's all the more reason to move forward!"
+	icon ='GainStation13/icons/obj/clothing/glasses.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/eyes.dmi'
+	icon_state = "garh"
+	item_state = "garh"
+	force = 10
+	throwforce = 10
+	throw_speed = 4
+	attack_verb = list("sliced")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharpness = IS_SHARP

GainStation13/code/clothing/under.dm

@@ -23,13 +23,13 @@
 	item_state = "r_suit"
 
 
-/obj/item/clothing/under/shorts/yellowwshort
+/obj/item/clothing/under/shorts/yellow
 	name = "Yellow workout short"
 	icon_state = "yellowwshort"
 	icon = 'GainStation13/icons/obj/clothing/uniforms.dmi'
 	mob_overlay_icon = 'GainStation13/icons/mob/uniform.dmi'
 
-/obj/item/clothing/under/shorts/pinkwshort
+/obj/item/clothing/under/shorts/pink
 	name = "Pink workout short"
 	icon_state = "pinkwshort"
 	icon = 'GainStation13/icons/obj/clothing/uniforms.dmi'

GainStation13/code/structures/table.dm

@@ -0,0 +1,37 @@
+/obj/structure/table/plaswood
+	name = "plaswood table"
+	desc = "An strong and grey wooden table."
+	icon = 'GainStation13/icons/obj/smooth_structures/plaswoodpoker_table.dmi'
+	icon_state = "plaswood_table"
+	resistance_flags = FLAMMABLE
+	max_integrity = 200
+	integrity_failure = 50
+	armor = list("melee" = 10, "bullet" = 30, "laser" = 30, "energy" = 100, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
+	canSmoothWith = list(/obj/structure/table/plaswood,
+		/obj/structure/table/plaswood/plaswoodpoker)
+
+/obj/structure/table/plaswood/plaswoodpoker
+	name = "gambling table"
+	desc = "A seedy table for seedy dealings in seedy places."
+	icon = 'GainStation13/icons/obj/smooth_structures/plaswoodpoker_table.dmi'
+	icon_state = "plaswoodpoker_table"
+	frame = /obj/structure/table_frame/plaswood
+	buildstack = /obj/item/stack/tile/carpet
+
+/obj/structure/table/gmushroom
+	name = "Mushroom table"
+	desc = "A pinkish table. And is fireproof!"
+	icon = 'GainStation13/icons/obj/smooth_structures/gmushroom_table.dmi'
+	icon_state = "gmushroom_table"
+	resistance_flags = FIRE_PROOF
+	max_integrity = 70
+	canSmoothWith = list(/obj/structure/table/gmushroom,
+		/obj/structure/table/gmushroom/gmushroompoker)
+
+/obj/structure/table/gmushroom/gmushroompoker
+	name = "gambling table"
+	desc = "A seedy table for seedy dealings in seedy places."
+	icon = 'GainStation13/icons/obj/smooth_structures/gmushroompoker_table.dmi'
+	icon_state = "gmushroompoker_table"
+	frame = /obj/structure/table_frame/gmushroom
+	buildstack = /obj/item/stack/tile/carpet