Merge github.com:Baystation12/Baystation12

Conflicts:
	html/changelog.html

code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm

@@ -29,25 +29,7 @@
 
 	handle_regular_hud_updates()
 
-		if (src.stat == 2 || src.mutations & XRAY)
-			src.sight |= SEE_TURFS
-			src.sight |= SEE_MOBS
-			src.sight |= SEE_OBJS
-			src.see_in_dark = 8
-			src.see_invisible = 2
-		else if (src.stat != 2)
-			src.sight |= SEE_MOBS
-			src.sight |= SEE_TURFS
-			src.sight &= ~SEE_OBJS
-			src.see_in_dark = 5
-			src.see_invisible = 2
-
-		if (src.sleep)
-			src.sleep.icon_state = text("sleep[]", src.sleeping > 0 ? 1 : 0)
-			src.sleep.overlays = null
-			if(src.sleeping_willingly)
-				src.sleep.overlays += icon(src.sleep.icon, "sleep_willing")
-		if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
+		..() //-Yvarov
 
 		if (src.healths)
 			if (src.stat != 2)
@@ -86,7 +68,7 @@
 
 		if(src.sleeping)
 			Paralyse(3)
-			if (prob(10) && health) spawn(0) emote("snore")
+			//if (prob(10) && health) spawn(0) emote("snore") Invalid Emote
 			if(!src.sleeping_willingly)
 				src.sleeping--
 

code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm

@@ -29,25 +29,7 @@
 
 	handle_regular_hud_updates()
 
-		if (src.stat == 2 || src.mutations & XRAY)
-			src.sight |= SEE_TURFS
-			src.sight |= SEE_MOBS
-			src.sight |= SEE_OBJS
-			src.see_in_dark = 8
-			src.see_invisible = 2
-		else if (src.stat != 2)
-			src.sight |= SEE_MOBS
-			src.sight &= SEE_TURFS
-			src.sight &= ~SEE_OBJS
-			src.see_in_dark = 7
-			src.see_invisible = 3
-
-		if (src.sleep)
-			src.sleep.icon_state = text("sleep[]", src.sleeping > 0 ? 1 : 0)
-			src.sleep.overlays = null
-			if(src.sleeping_willingly)
-				src.sleep.overlays += icon(src.sleep.icon, "sleep_willing")
-		if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
+		..() //-Yvarov
 
 		if (src.healths)
 			if (src.stat != 2)
@@ -87,7 +69,7 @@
 
 		if(src.sleeping)
 			Paralyse(3)
-			if (prob(10) && health) spawn(0) emote("snore")
+			//if (prob(10) && health) spawn(0) emote("snore") Invalid Emote
 			if(!src.sleeping_willingly)
 				src.sleeping--
 

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -404,7 +404,7 @@
 
 			if(src.sleeping)
 				Paralyse(3)
-				if (prob(10) && health) spawn(0) emote("snore")
+				//if (prob(10) && health) emote("snore") //Invalid emote for aliens, but it might be worth making sleep noticeable somehow -Yvarov
 				if(!src.sleeping_willingly)
 					src.sleeping--
 

code/modules/mob/living/carbon/alien/humanoid/queen.dm

@@ -32,25 +32,7 @@
 
 	handle_regular_hud_updates()
 
-		if (src.stat == 2 || src.mutations & XRAY)
-			src.sight |= SEE_TURFS
-			src.sight |= SEE_MOBS
-			src.sight |= SEE_OBJS
-			src.see_in_dark = 8
-			src.see_invisible = 2
-		else if (src.stat != 2)
-			src.sight |= SEE_MOBS
-			src.sight |= SEE_TURFS
-			src.sight &= ~SEE_OBJS
-			src.see_in_dark = 8
-			src.see_invisible = 2
-
-		if (src.sleep)
-			src.sleep.icon_state = text("sleep[]", src.sleeping > 0 ? 1 : 0)
-			src.sleep.overlays = null
-			if(src.sleeping_willingly)
-				src.sleep.overlays += icon(src.sleep.icon, "sleep_willing")
-		if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
+		..() //-Yvarov
 
 		if (src.healths)
 			if (src.stat != 2)
@@ -88,7 +70,7 @@
 
 		if(src.sleeping)
 			Paralyse(3)
-			if (prob(10) && health) spawn(0) emote("snore")
+			//if (prob(10) && health) spawn(0) emote("snore") Invalid Emote
 			if(!src.sleeping_willingly)
 				src.sleeping--
 

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -327,7 +327,7 @@
 
 			if(sleeping)
 				Paralyse(3)
-				if (prob(10) && health) spawn(0) emote("snore")
+				//if (prob(10) && health) spawn(0) emote("snore") Invalid Emote
 				if(!src.sleeping_willingly)
 					src.sleeping--
 

code/modules/mob/living/carbon/human/examine.dm

@@ -116,7 +116,10 @@
 
 	//handcuffed?
 	if (src.handcuffed)
-		msg += "[t_He] [t_is] \icon[src.handcuffed] handcuffed!\n"
+		if(istype(src.handcuffed, /obj/item/weapon/handcuffs/cable))
+			msg += "<span class='warning'>[t_He] [t_is] \icon[src.handcuffed] restrained with cable!</span>\n"
+		else
+			msg += "<span class='warning'>[t_He] [t_is] \icon[src.handcuffed] handcuffed!</span>\n"
 
 	//belt
 	if (src.belt)

code/modules/mob/living/carbon/human/hud.dm

@@ -206,14 +206,6 @@
 	using.layer = 19
 	src.other += using
 
-	using = new src.h_type( src )
-	using.name = "hat storage"
-	using.icon = ui_style
-	using.icon_state = "hair"
-	using.screen_loc = ui_hstore1
-	using.layer = 19
-	src.other += using
-
 	using = new src.h_type( src )
 	using.name = "resist"
 	using.icon = ui_style

code/modules/mob/living/carbon/human/human.dm

@@ -39,7 +39,6 @@
 	var/obj/item/weapon/r_store = null
 	var/obj/item/weapon/l_store = null
 	var/obj/item/weapon/s_store = null
-	var/obj/item/weapon/h_store = null
 
 	var/icon/stand_icon = null
 	var/icon/lying_icon = null
@@ -481,15 +480,6 @@
 		glasses = null
 	else if (W == head)
 		var/obj/item/prev_head = W
-		W = h_store
-		if (W)
-			u_equip(W)
-			if (client)
-				client.screen -= W
-			if (W)
-				W.loc = loc
-				W.dropped(src)
-				W.layer = initial(W.layer)
 		head = null
 		if(prev_head && (prev_head.flags & BLOCKHAIR))
 			// rebuild face
@@ -524,8 +514,6 @@
 		l_store = null
 	else if (W == s_store)
 		s_store = null
-	else if (W == h_store)
-		h_store = null
 	else if (W == back)
 		back = null
 	else if (W == handcuffed)
@@ -756,22 +744,6 @@
 				u_equip(W)
 				s_store = W
 
-		if("hat storage")
-			if (h_store)
-				if (emptyHand)
-					h_store.DblClick()
-				return
-			var/confirm
-			if (head)
-				if (istype(W, /obj/item/weapon/pen))
-					confirm = 1
-				if (istype(head) && is_type_in_list(W, head.allowed)) // NOTE: head is /obj/item/clothing/head/ and parer hat is not /obj/item/clothing/ and does not have "allowed" --rastaf0
-					confirm = 1
-			if (!confirm) return
-			else
-				u_equip(W)
-				h_store = W
-
 	update_clothing()
 
 	return
@@ -1087,9 +1059,6 @@
 			overlays += image("icon" = 'belt_mirror.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
 		s_store.screen_loc = ui_sstore1
 
-	if (h_store)
-		h_store.screen_loc = ui_hstore1
-
 	if(client) hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
 											   //to hide / show them.
 	if (client)
@@ -1210,10 +1179,11 @@
 
 	if (handcuffed)
 		pulling = null
+		var/h1 = handcuffed.icon_state
 		if (!lying)
-			overlays += image("icon" = 'mob.dmi', "icon_state" = "handcuff1", "layer" = MOB_LAYER)
+			overlays += image("icon" = 'mob.dmi', "icon_state" = "[h1]1", "layer" = MOB_LAYER)
 		else
-			overlays += image("icon" = 'mob.dmi', "icon_state" = "handcuff2", "layer" = MOB_LAYER)
+			overlays += image("icon" = 'mob.dmi', "icon_state" = "[h1]2", "layer" = MOB_LAYER)
 
 	if (client)
 		client.screen -= contents
@@ -1620,6 +1590,8 @@
 			if("dnainjector")
 				message = text("\red <B>[] is trying to inject [] with the []!</B>", source, target, item)
 			if("mask")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their mask removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) mask</font>")
 				if(istype(target.wear_mask, /obj/item/clothing)&&!target.wear_mask:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.wear_mask, target)
 				else
@@ -1627,60 +1599,84 @@
 /*			if("headset")
 				message = text("\red <B>[] is trying to take off \a [] from []'s face!</B>", source, target.w_radio, target) */
 			if("l_hand")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their left hand item removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) left hand item</font>")
 				message = text("\red <B>[] is trying to take off \a [] from []'s left hand!</B>", source, target.l_hand, target)
 			if("r_hand")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their right hand item removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) right hand item</font>")
 				message = text("\red <B>[] is trying to take off \a [] from []'s right hand!</B>", source, target.r_hand, target)
 			if("gloves")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their gloves removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) gloves</font>")
 				if(istype(target.gloves, /obj/item/clothing)&&!target.gloves:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.gloves, target)
 				else
 					message = text("\red <B>[] is trying to take off the [] from []'s hands!</B>", source, target.gloves, target)
 			if("eyes")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their eyewear removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) eyewear</font>")
 				if(istype(target.glasses, /obj/item/clothing)&&!target.glasses:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.glasses, target)
 				else
 					message = text("\red <B>[] is trying to take off the [] from []'s eyes!</B>", source, target.glasses, target)
 			if("l_ear")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their left ear item removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) left ear item</font>")
 				if(istype(target.l_ear, /obj/item/clothing)&&!target.l_ear:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.l_ear, target)
 				else
 					message = text("\red <B>[] is trying to take off the [] from []'s left ear!</B>", source, target.l_ear, target)
 			if("r_ear")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their right ear item removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) right ear item</font>")
 				if(istype(target.r_ear, /obj/item/clothing)&&!target.r_ear:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.r_ear, target)
 				else
 					message = text("\red <B>[] is trying to take off the [] from []'s right ear!</B>", source, target.r_ear, target)
 			if("head")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their hat removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) hat</font>")
 				if(istype(target.head, /obj/item/clothing)&&!target.head:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.head, target)
 				else
 					message = text("\red <B>[] is trying to take off the [] from []'s head!</B>", source, target.head, target)
 			if("shoes")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their shoes removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) shoes</font>")
 				if(istype(target.shoes, /obj/item/clothing)&&!target.shoes:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.shoes, target)
 				else
 					message = text("\red <B>[] is trying to take off the [] from []'s feet!</B>", source, target.shoes, target)
 			if("belt")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their belt item removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) belt item</font>")
 				message = text("\red <B>[] is trying to take off the [] from []'s belt!</B>", source, target.belt, target)
 			if("suit")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their suit removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) suit</font>")
 				if(istype(target.wear_suit, /obj/item/clothing)&&!target.wear_suit:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.wear_suit, target)
 				else
 					message = text("\red <B>[] is trying to take off \a [] from []'s body!</B>", source, target.wear_suit, target)
 			if("back")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their back item removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) back item</font>")
 				message = text("\red <B>[] is trying to take off \a [] from []'s back!</B>", source, target.back, target)
 			if("handcuff")
 				message = text("\red <B>[] is trying to unhandcuff []!</B>", source, target)
 			if("uniform")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their uniform removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) uniform</font>")
 				if(istype(target.w_uniform, /obj/item/clothing)&&!target.w_uniform:canremove)
 					message = text("\red <B>[] fails to take off \a [] from []'s body!</B>", source, target.w_uniform, target)
 				else
 					message = text("\red <B>[] is trying to take off \a [] from []'s body!</B>", source, target.w_uniform, target)
 			if("s_store")
 				message = text("\red <B>[] is trying to take off \a [] from []'s suit!</B>", source, target.s_store, target)
-			if("h_store")
-				message = text("\red <B>[] is trying to empty []'s hat!</B>", source, target)
 			if("pockets")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their pockets emptied by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to empty [target.name]'s ([target.ckey]) pockets</font>")
 				for(var/obj/item/weapon/mousetrap/MT in  list(target.l_store, target.r_store))
 					if(MT.armed)
 						for(var/mob/O in viewers(target, null))
@@ -1701,10 +1697,14 @@
 					//SN src = null
 					del(src)
 					return
-				message = text("\red <B>[] is trying perform CPR on []!</B>", source, target)
+				message = text("\red <B>[] is trying to perform CPR on []!</B>", source, target)
 			if("id")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their ID removed by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) ID</font>")
 				message = text("\red <B>[] is trying to take off [] from []'s uniform!</B>", source, target.wear_id, target)
 			if("internal")
+				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their internals toggled by [source.name] ([source.ckey])</font>")
+				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to toggle [target.name]'s ([target.ckey]) internals</font>")
 				if (target.internal)
 					message = text("\red <B>[] is trying to remove []'s internals</B>", source, target)
 				else
@@ -2127,17 +2127,6 @@ It can still be worn/put on as normal.
 					item.layer = 20
 					target.back = item
 					item.loc = target
-		if("h_store")
-			if (target.h_store)
-				var/obj/item/W = target.h_store
-				target.u_equip(W)
-				if (target.client)
-					target.client.screen -= W
-				if (W)
-					W.loc = target.loc
-					W.dropped(target)
-					W.layer = initial(W.layer)
-				W.add_fingerprint(source)
 		if("handcuff")
 			if (target.handcuffed)
 				var/obj/item/W = target.handcuffed
@@ -2288,7 +2277,6 @@ It can still be worn/put on as normal.
 	<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
 	<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
 	<BR><A href='?src=\ref[src];item=pockets'>Empty Pockets</A>
-	<BR><A href='?src=\ref[src];item=h_store'>Empty Hat</A>
 	<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
 	<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
 	<BR>"}

code/modules/mob/living/carbon/human/life.dm

@@ -980,10 +980,16 @@
 					if (stunned > 0)
 						AdjustStunned(-1)
 						stat = 0
+
 					if (weakened > 0)
 						AdjustWeakened(-1)
 						lying = 1
 						stat = 0
+
+					if(resting)
+						lying = 1
+						stat = 0
+
 					if (paralysis > 0)
 						handle_dreams()
 						AdjustParalysis(-1)
@@ -1003,10 +1009,6 @@
 						if(!sleeping_willingly)
 							sleeping--
 
-					if(resting)
-						lying = 1
-						stat = 0
-
 					var/h = hand
 					hand = 0
 					drop_item()

code/modules/mob/living/living.dm

@@ -3,10 +3,10 @@
 	..()
 
 	// While I'm doing a terriblly lazy way of initalizing things, why don't I make it so people's preferences tag along with them.  This could be useful in fixing the fucking cloned-as-unknown thing, making me not have to dynamically load them during tensioner, and of course, storing metadata.
-
-	if(!src.storedpreferences)
-		src.storedpreferences = new
-		storedpreferences.savefile_load(src, 0)
+//Whoever wrote this should go suck a choad.  This was causing runtimes, asshat.  IN ADDITION, YOU PUT IT IN THE LIFE PROC YOU ASSHAT
+//	if(!src.storedpreferences)
+//		src.storedpreferences = new
+//		storedpreferences.savefile_load(src, 0)
 
 
 
@@ -281,8 +281,8 @@
 		density = 1
 	else
 		density = !lying
-
-
+//Bullshit ERP horseshit causing runtimes.  Eat a dick.
+/*
 /mob/living/proc/Examine_OOC()
 	set name = "Examine Meta-Info (OOC)"
 	set category = "OOC"
@@ -300,7 +300,7 @@
 	else
 		usr << "OOC Metadata is not supported by this server!"
 
-	return
+	return*/
 
 /mob/living/attack_animal(mob/M)
 	attack_paw(M)	// treat it like a normal non-human attack

code/modules/mob/living/silicon/ai/ai.dm

@@ -47,15 +47,16 @@
 
 	verbs += /mob/living/silicon/ai/proc/show_laws_verb
 
-	if (istype(loc, /turf))
+	if (istype(loc, /turf)) //If you add a verb here, make sure to add it to transform_procs.dm too.
 		verbs += /mob/living/silicon/ai/proc/ai_call_shuttle
+		verbs += /mob/living/silicon/ai/proc/show_laws_verb
 		verbs += /mob/living/silicon/ai/proc/ai_camera_track
+		verbs += /mob/living/silicon/ai/proc/ai_alerts
 		verbs += /mob/living/silicon/ai/proc/ai_camera_list
-		//Added ai_network_change by Mord_Sith
 		verbs += /mob/living/silicon/ai/proc/ai_network_change
 		verbs += /mob/living/silicon/ai/proc/ai_statuschange
-		//Hologram verb./N
 		verbs += /mob/living/silicon/ai/proc/ai_hologram_change
+		verbs += /mob/living/silicon/ai/proc/ai_roster
 
 	if(!safety)//Only used by AIize() to successfully spawn an AI.
 		if (!B)//If there is no player/brain inside.
@@ -440,6 +441,7 @@
 
 	if(client.eye == eyeobj)
 		eyeobj.loc = C.loc
+		cameranet.visibility(eyeobj)
 	else
 		machine = src
 		src:current = C
@@ -577,7 +579,9 @@
 		if(C.network == newnet)
 			cameralist.Add(C)
 
-	switchCamera( pick(cameralist) )
+	if(length(cameralist))
+		switchCamera( pick(cameralist) )
+
 	src << "\blue Jumped to [newnet] camera network."
 //End of code by Mord_Sith
 //cael - with the multiple onstation networks all linked together, changing networks is legacy functionality

code/modules/mob/mob.dm

@@ -415,7 +415,7 @@
 	if ((stat != 2 || !( ticker )))
 		usr << "\blue <B>You must be dead to use this!</B>"
 		return
-	if (ticker.mode.name == ("meteor" || "epidemic"))
+	if (ticker.mode.name == "meteor" || ticker.mode.name == "epidemic")
 		usr << "\blue Respawn is disabled."
 		return
 	else

code/modules/mob/mob_defines.dm

@@ -286,13 +286,9 @@ the mob is also allowed to move without any sort of restriction. For instance, i
 	var/digitalcamo = 0 // Can they be tracked by the AI?
 
 	var/list/organs = list(  )	//List of organs.
-	var/list/organs2 = list()
+//	var/list/organs2 = list()
 //Singularity wants you!
 	var/grav_delay = 0
 	var/being_strangled = 0
 
-	var/datum/preferences/storedpreferences = null
-
-//	var/geaslist = list()
-
 

code/modules/mob/new_player/preferences.dm

@@ -99,7 +99,7 @@ datum/preferences
 		b_eyes = 0
 
 		//UI style
-		UI = UI_OLD
+		UI = UI_NEW
 
 		//Mob preview
 		icon/preview_icon = null

code/modules/mob/new_player/sprite_accessories.dm

@@ -173,7 +173,7 @@
 
 	hogan
 		name = "Hulk Hogan Mustache"
-		icon_state = "facial_chaplin"
+		icon_state = "facial_hogan" //-Neek
 
 	vandyke
 		name = "Van Dyke Mustache"

code/modules/mob/screen.dm

@@ -439,7 +439,8 @@
 			usr.pulling = null
 		if("sleep")
 			if(usr.sleeping && usr.sleeping_willingly)
-				return
+				usr.sleeping = 0
+				usr.sleeping_willingly = 0
 			else if(!usr.sleeping)
 				usr.sleeping = 20 //Short nap
 				usr.sleeping_willingly = 1
@@ -492,22 +493,25 @@
 				usr.next_move = world.time + 100
 				usr.last_special = world.time + 100
 				if(isalienadult(usr) || usr.mutations & HULK)//Don't want to do a lot of logic gating here.
-					usr << "\green You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)"
+					usr << "\green You attempt to break \the [usr:handcuffed]. (This will take around 5 seconds and you need to stand still)"
 					for(var/mob/O in viewers(usr))
-						O.show_message(text("\red <B>[] is trying to break the handcuffs!</B>", usr), 1)
+						O.show_message(text("\red <B>[] is trying to break \the [usr:handcuffed]!</B>", usr), 1)
 					spawn(0)
 						if(do_after(usr, 50))
 							if(!usr:handcuffed || usr:buckled)
 								return
 							for(var/mob/O in viewers(usr))
-								O.show_message(text("\red <B>[] manages to break the handcuffs!</B>", usr), 1)
-							usr << "\green You successfully break your handcuffs."
+								O.show_message(text("\red <B>[] manages to break \the [usr:handcuffed]!</B>", usr), 1)
+							usr << "\green You successfully break \the [usr:handcuffed]."
 							del(usr:handcuffed)
 							usr:handcuffed = null
 				else
-					usr << "\red You attempt to remove your handcuffs. (This will take around [displaytime] minutes and you need to stand still)"
+					if(istype(usr:handcuffed, /obj/item/weapon/handcuffs/cable))
+						breakouttime = 300
+						displaytime = 0.5
+					usr << "\red You attempt to remove \the [usr:handcuffed]. (This will take around [displaytime] minutes and you need to stand still)"
 					for(var/mob/O in viewers(usr))
-						O.show_message(text("\red <B>[] attempts to remove the handcuffs!</B>", usr), 1)
+						O.show_message(text("\red <B>[] attempts to remove \the [usr:handcuffed]!</B>", usr), 1)
 					spawn(0)
 						var/increment = 150
 						for(var/i = 0, i < breakouttime, i += increment)
@@ -526,11 +530,11 @@
 											"This is exhausting!")									// - SkyMarshal
 								for(var/mob/O in viewers(usr))
 									if(prob(50)) //Reduces spam slightly
-										O.show_message(text("\red [] continues to struggle in their cuffs!", usr), 1)
+										O.show_message(text("\red [] continues to struggle in \the [usr:handcuffed]!", usr), 1)
 						if(!usr:handcuffed) return
 						for(var/mob/O in viewers(usr))
-							O.show_message(text("\red <B>[] manages to remove the handcuffs!</B>", usr), 1)
-						usr << "\blue You successfully remove your handcuffs."
+							O.show_message(text("\red <B>[] manages to remove \the [usr:handcuffed]!</B>", usr), 1)
+						usr << "\blue You successfully remove \the [usr:handcuffed]."
 						usr:handcuffed:loc = usr:loc
 						usr:handcuffed = null
 						usr.update_clothing()

code/modules/mob/simple_animal/corgi.dm

@@ -171,7 +171,8 @@
 						/obj/item/clothing/head/helmet/hardhat/white,
 						/obj/item/weapon/bedsheet,
 						/obj/item/clothing/head/helmet/space/santahat,
-						/obj/item/clothing/head/collectable/paper
+						/obj/item/clothing/head/collectable/paper,
+						/obj/item/clothing/head/cargosoft
 					)
 
 					if( ! ( item_to_add.type in allowed_types ) )
@@ -183,7 +184,7 @@
 					src.inventory_head = item_to_add
 					update_clothing()
 
-					//Various hats and items (worn on his head) change Ian's behaviour. His attributesare reset when a HAT is removed.
+					//Various hats and items (worn on his head) change Ian's behaviour. His attributes are reset when a HAT is removed.
 
 
 					switch(inventory_head && inventory_head.type)
@@ -240,6 +241,10 @@
 							emote_hear = list("barks christmas songs", "yaps")
 							desc = "He has a very shiny nose."
 							src.sd_SetLuminosity(6)
+						if(/obj/item/clothing/head/cargosoft)
+							name = "Corgi Tech [real_name]"
+							speak = list("Needs a stamp!", "Request DENIED!", "Fill these out in triplicate!")
+							desc = "The reason your yellow gloves have chew-marks."
 
 			if("back")
 				if(inventory_back)

code/modules/mob/transform_procs.dm

@@ -398,13 +398,15 @@
 		O << "4.) Your laws are not in preference, laws do not take preference over one another unless specifically stated in the law."
 		O << "<br>We want everyone to have a good time, so we, the admins, will try to correct you if you stray from these rules.  Just try to keep it sensible."
 
-
+//If you add a verb here, make sure to add it to silicon\ai\ai.dm too.
 	O.verbs += /mob/living/silicon/ai/proc/ai_call_shuttle
 	O.verbs += /mob/living/silicon/ai/proc/show_laws_verb
 	O.verbs += /mob/living/silicon/ai/proc/ai_camera_track
 	O.verbs += /mob/living/silicon/ai/proc/ai_alerts
 	O.verbs += /mob/living/silicon/ai/proc/ai_camera_list
+	O.verbs += /mob/living/silicon/ai/proc/ai_network_change
 	O.verbs += /mob/living/silicon/ai/proc/ai_statuschange
+	O.verbs += /mob/living/silicon/ai/proc/ai_hologram_change
 	O.verbs += /mob/living/silicon/ai/proc/ai_roster
 
 //	O.verbs += /mob/living/silicon/ai/proc/ai_cancel_call