Merge remote-tracking branch 'upstream/master' into lootdrop

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -209,6 +209,14 @@ var/global/list/image/splatter_cache=list()
                                 break
 
 
+/obj/effect/decal/cleanable/blood/old/New()
+	..()
+	dry()
+
+/obj/effect/decal/cleanable/blood/gibs/old/New()
+	..()
+	dry()
+
 /obj/effect/decal/cleanable/mucus
 	name = "mucus"
 	desc = "Disgusting mucus."

code/game/objects/items.dm

@@ -295,7 +295,45 @@
 /obj/item/proc/mob_can_equip(M as mob, slot, disable_warning = 0)
 	if(!slot) return 0
 	if(!M) return 0
+	if(issmall(M))
+		//START MONKEY
+		var/mob/living/carbon/human/H = M
 
+		switch(slot)
+			if(slot_l_hand)
+				if(H.l_hand)
+					return 0
+				return 1
+			if(slot_r_hand)
+				if(H.r_hand)
+					return 0
+				return 1
+			if(slot_wear_mask)
+				if(H.wear_mask)
+					return 0
+				if( !(slot_flags & SLOT_MASK) )
+					return 0
+				return 1
+			if(slot_back)
+				if(H.back)
+					return 0
+				if( !(slot_flags & SLOT_BACK) )
+					return 0
+				return 1
+			if(slot_handcuffed)
+				if(H.handcuffed)
+					return 0
+				if(!istype(src, /obj/item/weapon/restraints/handcuffs))
+					return 0
+				return 1
+			if(slot_in_backpack)
+				if (H.back && istype(H.back, /obj/item/weapon/storage/backpack))
+					var/obj/item/weapon/storage/backpack/B = H.back
+					if(B.contents.len < B.storage_slots && w_class <= B.max_w_class)
+						return 1
+				return 0
+		return 0 //Unsupported slot
+		//END MONKEY
 	if(ishuman(M))
 		//START HUMAN
 		var/mob/living/carbon/human/H = M

code/game/objects/items/toys.dm

@@ -1259,6 +1259,28 @@ obj/item/toy/cards/deck/syndicate/black
 		user << "<span class='alert'>Nothing happens.</span>"
 
 
+/*
+ * AI core prizes
+ */
+/obj/item/toy/AI
+	name = "toy AI"
+	desc = "A little toy model AI core with real law announcing action!"
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "AI"
+	w_class = 2.0
+	var/cooldown = 0
+
+/obj/item/toy/AI/attack_self(mob/user)
+	if(!cooldown) //for the sanity of everyone
+		var/message = generate_ion_law()
+		user << "<span class='notice'>You press the button on [src].</span>"
+		playsound(user, 'sound/machines/click.ogg', 20, 1)
+		src.loc.visible_message("<span class='danger'>\icon[src] [message]</span>")
+		cooldown = 1
+		spawn(30) cooldown = 0
+		return
+	..()
+
 /obj/item/toy/owl
 	name = "owl action figure"
 	desc = "An action figure modeled after 'The Owl', defender of justice."

code/game/objects/items/weapons/AI_modules.dm

@@ -103,12 +103,12 @@ AI MODULES
 
 /obj/item/weapon/aiModule/zeroth
 	var/removeownlaw = 0
-		
+
 /obj/item/weapon/aiModule/zeroth/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	if(target.laws.zeroth)
 		if(removeownlaw && (laws[1] == target.laws.zeroth))
 			target.clear_zeroth_law()
-			return 2		
+			return 2
 		else
 			target << "[sender.real_name] attempted to modify your zeroth law."
 			target << "It would be in your best interest to play along with [sender.real_name] that:"
@@ -178,7 +178,7 @@ AI MODULES
 	if(..() == 1)
 		return "[targetName], but the AI's existing zeroth law cannot be overriden."
 	if(..() == 2)
-		return "The AI's zeroth law has been overridden."		
+		return "The AI's zeroth law has been overridden."
 	return targetName
 
 
@@ -273,7 +273,7 @@ AI MODULES
 
 /obj/item/weapon/aiModule/reset/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
-	target.clear_inherent_laws()	
+	target.clear_inherent_laws()
 
 /******************* Full Core Boards *******************/
 
@@ -445,7 +445,7 @@ AI MODULES
 	target.add_ion_law(laws[1])
 	return laws[1]
 
-/*
+
 /******************* Ion Module *******************/
 
 /obj/item/weapon/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw
@@ -466,6 +466,4 @@ AI MODULES
 	laws[1] = generate_ion_law()
 	user << "<span class='notice'>You press the button on [src].</span>"
 	playsound(user, 'sound/machines/click.ogg', 20, 1)
-	src.loc.visible_message("<span class='warning'>\icon[src] [laws[1]]</span>")
-
-*/
+	src.loc.visible_message("<span class='warning'>\icon[src] [laws[1]]</span>")

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -68,6 +68,7 @@
 				new /obj/item/weapon/aiModule/syndicate(src)
 				new /obj/item/weapon/card/emag(src)
 				new /obj/item/device/encryptionkey/binary(src)
+				new /obj/item/weapon/aiModule/toyAI(src)
 				return
 
 			if("lordsingulo")

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

@@ -99,6 +99,8 @@
 	icon_closed = "blue"
 
 /obj/structure/closet/lawcloset/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/lawyer/female(src)
 	new /obj/item/clothing/under/lawyer/black(src)
 	new /obj/item/clothing/under/lawyer/red(src)

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

@@ -5,6 +5,8 @@
 	icon_closed = "blue"
 
 /obj/structure/closet/wardrobe/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/blue(src)
 	new /obj/item/clothing/under/color/blue(src)
 	new /obj/item/clothing/under/color/blue(src)
@@ -23,6 +25,8 @@
 	icon_closed = "red"
 
 /obj/structure/closet/wardrobe/red/New()
+	..()
+	sleep(2)
 	new /obj/item/weapon/storage/backpack/duffel/security(src)
 	new /obj/item/weapon/storage/backpack/duffel/security(src)
 	new /obj/item/clothing/mask/bandana/red(src)
@@ -55,6 +59,8 @@
 	icon_closed = "red"
 
 /obj/structure/closet/redcorp/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/security/corp(src)
 	new /obj/item/clothing/under/rank/security/corp(src)
 	new /obj/item/clothing/under/rank/security/corp(src)
@@ -68,6 +74,8 @@
 	icon_closed = "pink"
 
 /obj/structure/closet/wardrobe/pink/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/pink(src)
 	new /obj/item/clothing/under/color/pink(src)
 	new /obj/item/clothing/under/color/pink(src)
@@ -82,6 +90,8 @@
 	icon_closed = "black"
 
 /obj/structure/closet/wardrobe/black/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/black(src)
 	new /obj/item/clothing/under/color/black(src)
 	new /obj/item/clothing/under/color/black(src)
@@ -106,6 +116,8 @@
 	icon_closed = "black"
 
 /obj/structure/closet/wardrobe/chaplain_black/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/chaplain(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/suit/nun(src)
@@ -131,6 +143,8 @@
 	icon_closed = "green"
 
 /obj/structure/closet/wardrobe/green/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/green(src)
 	new /obj/item/clothing/under/color/green(src)
 	new /obj/item/clothing/under/color/green(src)
@@ -145,6 +159,8 @@
 	icon_closed = "green"
 
 /obj/structure/closet/wardrobe/xenos/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/suit/unathi/mantle(src)
 	new /obj/item/clothing/suit/unathi/robe(src)
 	new /obj/item/clothing/shoes/sandal(src)
@@ -160,6 +176,8 @@
 	icon_closed = "orange"
 
 /obj/structure/closet/wardrobe/orange/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/orange/prison(src)
 	new /obj/item/clothing/under/color/orange/prison(src)
 	new /obj/item/clothing/under/color/orange/prison(src)
@@ -175,6 +193,8 @@
 	icon_closed = "wardrobe-y"
 
 /obj/structure/closet/wardrobe/yellow/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/yellow(src)
 	new /obj/item/clothing/under/color/yellow(src)
 	new /obj/item/clothing/under/color/yellow(src)
@@ -190,6 +210,8 @@
 	icon_closed = "yellow"
 
 /obj/structure/closet/wardrobe/atmospherics_yellow/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
@@ -212,6 +234,8 @@
 	icon_closed = "yellow"
 
 /obj/structure/closet/wardrobe/engineering_yellow/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/engineer(src)
 	new /obj/item/clothing/under/rank/engineer(src)
 	new /obj/item/clothing/under/rank/engineer(src)
@@ -233,6 +257,8 @@
 	icon_closed = "white"
 
 /obj/structure/closet/wardrobe/white/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/white(src)
 	new /obj/item/clothing/under/color/white(src)
 	new /obj/item/clothing/under/color/white(src)
@@ -245,6 +271,8 @@
 	name = "medical doctor's wardrobe"
 
 /obj/structure/closet/wardrobe/white/medical/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/nursesuit (src)
 	new /obj/item/clothing/head/nursehat (src)
 	new /obj/item/clothing/under/rank/nurse(src)
@@ -269,6 +297,8 @@
 	icon_closed = "white"
 
 /obj/structure/closet/wardrobe/pjs/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/pj/red(src)
 	new /obj/item/clothing/under/pj/red(src)
 	new /obj/item/clothing/under/pj/blue(src)
@@ -286,6 +316,8 @@
 	icon_closed = "white"
 
 /obj/structure/closet/wardrobe/toxins_white/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)
@@ -307,6 +339,8 @@
 	icon_closed = "black"
 
 /obj/structure/closet/wardrobe/robotics_black/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
@@ -326,6 +360,8 @@
 	icon_closed = "white"
 
 /obj/structure/closet/wardrobe/chemistry_white/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/chemist(src)
 	new /obj/item/clothing/under/rank/chemist(src)
 	new /obj/item/clothing/shoes/white(src)
@@ -341,6 +377,8 @@
 	icon_closed = "white"
 
 /obj/structure/closet/wardrobe/genetics_white/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/geneticist(src)
 	new /obj/item/clothing/under/rank/geneticist(src)
 	new /obj/item/clothing/shoes/white(src)
@@ -356,6 +394,8 @@
 	icon_closed = "white"
 
 /obj/structure/closet/wardrobe/virology_white/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/virologist(src)
 	new /obj/item/clothing/under/rank/virologist(src)
 	new /obj/item/clothing/shoes/white(src)
@@ -373,6 +413,8 @@
 	icon_closed = "white"
 
 /obj/structure/closet/wardrobe/medic_white/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/under/rank/medical/blue(src)
@@ -393,6 +435,8 @@
 	icon_closed = "grey"
 
 /obj/structure/closet/wardrobe/grey/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/grey(src)
 	new /obj/item/clothing/under/color/grey(src)
 	new /obj/item/clothing/under/color/grey(src)
@@ -417,6 +461,8 @@
 	icon_closed = "mixed"
 
 /obj/structure/closet/wardrobe/mixed/New()
+	..()
+	sleep(2)
 	new /obj/item/clothing/under/color/blue(src)
 	new /obj/item/clothing/under/color/yellow(src)
 	new /obj/item/clothing/under/color/green(src)

code/game/objects/structures/window.dm

@@ -105,6 +105,8 @@ var/global/wcColored
 /obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return 1
+	if(dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
+		return 0	//full tile window, you can't move into it!
 	if(get_dir(loc, target) == dir)
 		return !density
 	else