Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/game/objects/items/stacks/medical.dm

@@ -1,5 +1,14 @@
-
-//What is this even used for?
+/obj/item/stack/medical
+	name = "medical pack"
+	singular_name = "medical pack"
+	icon = 'icons/obj/items.dmi'
+	amount = 5
+	max_amount = 5
+	w_class = 1
+	throw_speed = 4
+	throw_range = 20
+	var/heal_brute = 0
+	var/heal_burn = 0
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if (M.stat == 2)
@@ -53,4 +62,63 @@
 		)
 
 	use(1)
+
 	M.updatehealth()
+/obj/item/stack/medical/bruise_pack
+	name = "bruise pack"
+	singular_name = "bruise pack"
+	desc = "A pack designed to treat blunt-force trauma."
+	icon_state = "brutepack"
+	heal_brute = 60
+	origin_tech = "biotech=1"
+
+/obj/item/stack/medical/ointment
+	name = "ointment"
+	desc = "Used to treat those nasty burns."
+	gender = PLURAL
+	singular_name = "ointment"
+	icon_state = "ointment"
+	heal_burn = 40
+	origin_tech = "biotech=1"
+
+/obj/item/stack/medical/bruise_pack/tajaran
+	name = "\improper S'rendarr's Hand leaf"
+	singular_name = "S'rendarr's Hand leaf"
+	desc = "A soft leaf that is rubbed on bruises."
+	icon = 'harvest.dmi'
+	icon_state = "cabbage"
+	heal_brute = 7
+
+/obj/item/stack/medical/ointment/tajaran
+	name = "\improper Messa's Tear leaf"
+	singular_name = "Messa's Tear leaf"
+	desc = "A cold leaf that is rubbed on burns."
+	icon = 'harvest.dmi'
+	icon_state = "ambrosiavulgaris"
+	heal_burn = 7
+
+/obj/item/stack/medical/advanced/bruise_pack
+	name = "advanced trauma kit"
+	singular_name = "advanced trauma kit"
+	desc = "An advanced trauma kit for severe injuries."
+	icon_state = "traumakit"
+	heal_brute = 12
+	origin_tech = "biotech=1"
+
+/obj/item/stack/medical/advanced/ointment
+	name = "advanced burn kit"
+	singular_name = "advanced burn kit"
+	desc = "An advanced treatment kit for severe burns."
+	icon_state = "burnkit"
+	heal_burn = 12
+	origin_tech = "biotech=1"
+
+/obj/item/stack/medical/splint
+	name = "medical splint"
+	singular_name = "medical splint"
+	icon_state = "splint"
+	amount = 5
+	max_amount = 5
+
+/obj/item/stack/medical/splint/single
+	amount = 1

code/game/objects/items/stacks/sheets/glass.dm

@@ -10,7 +10,7 @@
  */
 /obj/item/stack/sheet/glass
 	name = "glass"
-	desc = "HOLY HELL! That is a lot of glass."
+	desc = "HOLY SHEET! That is a lot of glass."
 	singular_name = "glass sheet"
 	icon_state = "sheet-glass"
 	g_amt = 3750

code/game/objects/items/stacks/sheets/leather.dm

@@ -33,6 +33,36 @@
 	icon_state = "sheet-lizard"
 	origin_tech = ""
 
+/obj/item/stack/sheet/animalhide/xeno
+	name = "alien hide"
+	desc = "The skin of a terrible creature."
+	singular_name = "alien hide piece"
+	icon_state = "sheet-xeno"
+	origin_tech = ""
+
+//don't see anywhere else to put these, maybe together they could be used to make the xenos suit?
+/obj/item/stack/sheet/xenochitin
+	name = "alien chitin"
+	desc = "A piece of the hide of a terrible creature."
+	singular_name = "alien hide piece"
+	icon = 'icons/mob/alien.dmi'
+	icon_state = "chitin"
+	origin_tech = ""
+
+/obj/item/xenos_claw
+	name = "alien claw"
+	desc = "The claw of a terrible creature."
+	icon = 'icons/mob/alien.dmi'
+	icon_state = "claw"
+	origin_tech = ""
+
+/obj/item/weed_extract
+	name = "weed extract"
+	desc = "A piece of slimy, purplish weed."
+	icon = 'icons/mob/alien.dmi'
+	icon_state = "weed_extract"
+	origin_tech = ""
+
 /obj/item/stack/sheet/hairlesshide
 	name = "hairless hide"
 	desc = "This hide was stripped of it's hair, but still needs tanning."

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -128,12 +128,13 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
  */
 var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
 	new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \
-	new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/lightbox/tubes), \
-	new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/lightbox/bulbs), \
-	new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/mousetraps), \
+	new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/box/lights/tubes), \
+	new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/box/lights/bulbs), \
+	new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/box/mousetraps), \
 	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
 	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
 	new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
+	new/datum/stack_recipe("folder", /obj/item/weapon/folder), \
 )
 
 /obj/item/stack/sheet/cardboard	//BubbleWrap

code/game/objects/items/stacks/sheets/sheets.dm

@@ -11,12 +11,16 @@
 	var/perunit = 3750
 	var/sheettype = null //this is used for girders in the creation of walls/false walls
 
-/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (istype(W, /obj/item/weapon/sheetsnatcher))
-		var/obj/item/weapon/sheetsnatcher/S = W
+
+// Since the sheetsnatcher was consolidated into weapon/storage/bag we now use
+// item/attackby() properly, making this unnecessary
+
+/*/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/storage/bag/sheetsnatcher))
+		var/obj/item/weapon/storage/bag/sheetsnatcher/S = W
 		if(!S.mode)
 			S.add(src,user)
 		else
 			for (var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z))
 				S.add(stack,user)
-	..()
+	..()*/

code/game/objects/items/stacks/tiles/light.dm

@@ -14,7 +14,7 @@
 	var/on = 1
 	var/state //0 = fine, 1 = flickering, 2 = breaking, 3 = broken
 
-/obj/item/stack/tile/light/New()
+/obj/item/stack/tile/light/New(var/loc, var/amount=null)
 	..()
 	if(prob(5))
 		state = 3 //broken