Merge branch 'incremental_tg' r5600 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.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/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.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/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

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

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

@@ -160,6 +160,38 @@
 		return
 
 
+/obj/structure/closet/secure_closet/security/cargo
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/cargo(src)
+		new /obj/item/device/encryptionkey/headset_cargo(src)
+		return
+
+/obj/structure/closet/secure_closet/security/engine
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/engine(src)
+		new /obj/item/device/encryptionkey/headset_eng(src)
+		return
+
+/obj/structure/closet/secure_closet/security/science
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/science(src)
+		new /obj/item/device/encryptionkey/headset_sci(src)
+		return
+
+/obj/structure/closet/secure_closet/security/med
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/medgreen(src)
+		new /obj/item/device/encryptionkey/headset_med(src)
+		return
+
 
 /obj/structure/closet/secure_closet/detective
 	name = "Detective's Cabinet"
@@ -205,7 +237,7 @@
 
 /obj/structure/closet/secure_closet/injection
 	name = "Lethal Injections"
-	req_access = list(access_hos)
+	req_access = list(access_captain)
 
 
 	New()

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

@@ -32,5 +32,33 @@
 /obj/structure/largecrate/lisa/attackby(obj/item/weapon/W as obj, mob/user as mob)	//ugly but oh well
 	if(istype(W, /obj/item/weapon/crowbar))
 		new /mob/living/simple_animal/corgi/Lisa(loc)
+	..()
 
-	..()
+/obj/structure/largecrate/cow
+	name = "cow crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/cow/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/cow(loc)
+	..()
+
+/obj/structure/largecrate/goat
+	name = "goat crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/goat/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/hostile/retaliate/goat(loc)
+	..()
+
+/obj/structure/largecrate/chick
+	name = "chicken crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/chick/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		var/num = rand(4, 6)
+		for(var/i = 0, i < num, i++)
+			new /mob/living/simple_animal/chick(loc)
+	..()

code/game/objects/structures/grille.dm

@@ -38,7 +38,7 @@
 
 	if(shock(user, 70))
 		return
-	if((HULK in user.mutations) || (SUPRSTR in user.augmentations))
+	if(HULK in user.mutations)
 		health -= 5
 	else
 		health -= 3

code/game/objects/structures/mop_bucket.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mopbucket"
 	density = 1
-	pressure_resistance = ONE_ATMOSPHERE
+	pressure_resistance = 5
 	flags = FPRINT | TABLEPASS | OPENCONTAINER
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 

code/game/objects/structures/signs.dm

@@ -92,6 +92,11 @@
 	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
 	icon_state = "redcross"
 
+/obj/structure/sign/greencross
+	name = "medbay"
+	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
+	icon_state = "greencross"
+
 /obj/structure/sign/goldenplaque
 	name = "The Most Robust Men Award for Robustness"
 	desc = "To be Robust is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, saving friend from foe, are truly Robust. Stay Robust my friends."

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

@@ -67,6 +67,10 @@
 	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.lying || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
 		return
 
+	if (istype(M, /mob/living/carbon/slime))
+		user << "The [M] is too squishy to buckle in."
+		return
+
 	unbuckle()
 
 	if (M == usr)
@@ -147,4 +151,4 @@
 		new/obj/item/roller(get_turf(src))
 		spawn(0)
 			del(src)
-		return
+		return

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

@@ -52,14 +52,19 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if(!usr || !isturf(usr.loc))
-		return
-	if(usr.stat || usr.restrained())
+	if(config.ghost_interaction)
+		src.dir = turn(src.dir, 90)
+		handle_rotation()
 		return
+	else
+		if(!usr || !isturf(usr.loc))
+			return
+		if(usr.stat || usr.restrained())
+			return
 
-	src.dir = turn(src.dir, 90)
-	handle_rotation()
-	return
+		src.dir = turn(src.dir, 90)
+		handle_rotation()
+		return
 
 /obj/structure/stool/bed/chair/MouseDrop_T(mob/M as mob, mob/user as mob)
 	if(!istype(M)) return

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

@@ -5,7 +5,7 @@
 	icon_state = "stool"
 	anchored = 1.0
 	flags = FPRINT
-	pressure_resistance = 3*ONE_ATMOSPHERE
+	pressure_resistance = 15
 
 /obj/structure/stool/ex_act(severity)
 	switch(severity)

code/game/objects/structures/tables_racks.dm

@@ -282,7 +282,7 @@
 
 
 /obj/structure/table/attack_hand(mob/user)
-	if(HULK in user.mutations || SUPRSTR in user.augmentations)
+	if(HULK in user.mutations)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		if(istype(src, /obj/structure/table/reinforced))
@@ -562,7 +562,7 @@
 
 
 /obj/structure/table/attack_hand(mob/user)
-	if(HULK in user.mutations || SUPRSTR in user.augmentations)
+	if(HULK in user.mutations)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		new /obj/item/weapon/rack_parts(loc)

code/game/objects/structures/window.dm

@@ -98,7 +98,7 @@
 
 
 /obj/structure/window/attack_hand(mob/user as mob)
-	if((HULK in user.mutations) || (SUPRSTR in user.augmentations))
+	if(HULK in user.mutations)
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
 		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
 		new /obj/item/weapon/shard(loc)