Merge branch 'master' into janitorCartFix

Conflicts:
	code/game/objects/items/weapons/storage/storage.dm

code/modules/admin/admin.dm

@@ -537,6 +537,25 @@ var/global/floorIsLava = 0
 		log_admin("Announce: [key_name(usr)] : [message]")
 	feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/datum/admins/proc/set_admin_notice()
+	set category = "Special Verbs"
+	set name = "Set Admin Notice"
+	set desc ="Set an announcement that appears to everyone who joins the server. Only lasts this round"
+	if(!check_rights(0))	return
+
+	admin_notice = input(src,"Set a public notice for this round. Everyone who joins the server will see it.\n(Leaving it blank will delete the current notice):","Set Notice",admin_notice) as null|message
+	switch(admin_notice)
+		if(null)
+			return
+		if("")
+			message_admins("[key_name(usr)] removed the admin notice.")
+			log_admin("[key_name(usr)] removed the admin notice:\n[admin_notice]")
+			return
+	message_admins("[key_name(usr)] set the admin notice.")
+	log_admin("[key_name(usr)] set the admin notice:\n[admin_notice]")
+	world << "\blue <b>Admin Notice:</b>\n \t [admin_notice]"
+	feedback_add_details("admin_verb","SAN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /datum/admins/proc/toggleooc()
 	set category = "Server"
 	set desc="Toggle dis bitch"

code/modules/admin/admin_verbs.dm

@@ -27,6 +27,7 @@ var/list/admin_verbs_admin = list(
 	/datum/admins/proc/toggleenter,		/*toggles whether people can join the current game*/
 	/datum/admins/proc/toggleguests,	/*toggles whether guests can join the current game*/
 	/datum/admins/proc/announce,		/*priority announce something to all clients.*/
+	/datum/admins/proc/set_admin_notice,/*announcement all clients see when joining the server.*/
 	/client/proc/admin_ghost,			/*allows us to ghost/reenter body at will*/
 	/client/proc/toggle_view_range,		/*changes how far we can see*/
 	/datum/admins/proc/view_txt_log,	/*shows the server log (diary) for today*/
@@ -138,6 +139,7 @@ var/list/admin_verbs_hideable = list(
 	/datum/admins/proc/toggleenter,
 	/datum/admins/proc/toggleguests,
 	/datum/admins/proc/announce,
+	/datum/admins/proc/set_admin_notice,
 	/client/proc/admin_ghost,
 	/client/proc/toggle_view_range,
 	/datum/admins/proc/view_txt_log,

code/modules/admin/topic.dm

@@ -1339,11 +1339,11 @@
 			usr << "The person you are trying to contact is not wearing a headset"
 			return
 
-		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcomm", "")
+		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcom", "")
 		if(!input)	return
 
 		src.owner << "You sent [input] to [H] via a secure channel."
-		log_admin("[src.owner] replied to [key_name(H)]'s Centcomm message with the message [input].")
+		log_admin("[src.owner] replied to [key_name(H)]'s Centcom message with the message [input].")
 		message_admins("[src.owner] replied to [key_name(H)]'s Centcom message with: \"[input]\"")
 		H << "You hear something crackle in your ears for a moment before a voice speaks.  \"Please stand by for a message from Central Command.  Message as follows. [input].  Message ends.\""
 
@@ -1851,7 +1851,7 @@
 					if(W.z == 1 && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
 						W.req_access = list()
 				message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
-				command_alert("Centcomm airlock control override activated. Please take this time to get acquainted with your coworkers.")
+				command_alert("Centcom airlock control override activated. Please take this time to get acquainted with your coworkers.")
 				world << sound('sound/AI/commandreport.ogg')
 			if("dorf")
 				feedback_inc("admin_secrets_fun_used",1)

code/modules/admin/verbs/pray.dm

@@ -29,7 +29,7 @@
 
 /proc/Centcomm_announce(var/text , var/mob/Sender)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
-	msg = "\blue <b><font color=orange>CENTCOMM:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
+	msg = "\blue <b><font color=orange>CENTCOM:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 	admins << msg
 
 /proc/Syndicate_announce(var/text , var/mob/Sender)

code/modules/awaymissions/loot.dm

@@ -8,7 +8,7 @@
 /obj/effect/spawner/lootdrop/initialize()
 	if(loot && loot.len)
 		for(var/i = lootcount, i > 0, i--)
-			if(!loot.len) return
+			if(!loot.len) break
 			var/lootspawn = pick(loot)
 			if(!lootdoubles)
 				loot.Remove(lootspawn)

code/modules/client/preferences_toggles.dm

@@ -129,7 +129,10 @@
 	prefs.save_preferences()
 	src << "Others can[(prefs.toggles & MEMBER_PUBLIC) ? "" : "not"] see whether you are a byond member."
 
-var/list/ghost_forms = list("ghost","ghostking","ghostian2")
+var/list/ghost_forms = list("ghost","ghostking","ghostian2","ghost_red","ghost_black", \
+							"ghost_blue","ghost_yellow","ghost_green","ghost_pink", \
+							"ghost_cyan","ghost_dblue","ghost_dred","ghost_dgreen", \
+							"ghost_dcyan","ghost_grey","ghost_dyellow","ghost_dpink")
 /client/verb/pick_form()
 	set name = "Choose Ghost Form"
 	set category = "Preferences"

code/modules/clothing/clothing.dm

@@ -91,7 +91,7 @@ BLIND     // can't see anything
 	icon = 'icons/obj/clothing/suits.dmi'
 	name = "suit"
 	var/fire_resist = T0C+100
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	slot_flags = SLOT_OCLOTHING
@@ -123,7 +123,7 @@ BLIND     // can't see anything
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
+	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 3

code/modules/clothing/gloves/miscellaneous.dm

@@ -42,8 +42,12 @@
 		item_color = "medical"		//Exists for washing machines. Is not different from latex gloves in any way.
 
 /obj/item/clothing/gloves/botanic_leather
-	desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
+	desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin.  They're also quite warm."
 	name = "botanist's leather gloves"
 	icon_state = "leather"
 	item_state = "ggloves"
 	permeability_coefficient = 0.9
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -17,16 +17,9 @@
 	w_class = 4
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
-	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	slowdown = 1.5
 	armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
-	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
-	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 
 
 //Deathsquad suit
@@ -74,7 +67,7 @@
 	icon_state = "santa"
 	item_state = "santa"
 	slowdown = 0
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE
+	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
 	allowed = list(/obj/item) //for stuffing exta special presents
 
 

code/modules/clothing/suits/armor.dm

@@ -16,7 +16,7 @@
 	icon_state = "armor"
 	item_state = "armor"
 	blood_overlay_type = "armor"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/hos
@@ -130,7 +130,7 @@
 	item_state = "reactiveoff"
 	blood_overlay_type = "armor"
 	slowdown = 1
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/reactive/IsShield()
@@ -162,7 +162,7 @@
 
 
 /obj/item/clothing/suit/armor/centcom
-	name = "\improper Centcomm armor"
+	name = "\improper Centcom armor"
 	desc = "A suit that protects against some damage."
 	icon_state = "centcom"
 	item_state = "centcom"

code/modules/clothing/suits/bio.dm

@@ -4,7 +4,7 @@
 	icon_state = "bio"
 	desc = "A hood that protects the head and face from biological comtaminants."
 	permeability_coefficient = 0.01
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR|THICKMATERIAL
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 
@@ -16,7 +16,7 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = FPRINT | TABLEPASS
+	flags = FPRINT | TABLEPASS | THICKMATERIAL
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	slowdown = 1.0
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)

code/modules/clothing/suits/miscellaneous.dm

@@ -86,7 +86,7 @@
 	desc = "This robe commands authority."
 	icon_state = "judge"
 	item_state = "judge"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	allowed = list(/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/spacecash)
 	flags_inv = HIDEJUMPSUIT

code/modules/clothing/suits/utility.dm

@@ -21,7 +21,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher)
 	slowdown = 1.0
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE
+	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
 	cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
@@ -47,7 +47,7 @@
 	name = "bomb hood"
 	desc = "Use in case of bomb."
 	icon_state = "bombsuit"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR|THICKMATERIAL
 	armor = list(melee = 40, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	cold_protection = HEAD
@@ -64,7 +64,7 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = FPRINT | TABLEPASS
+	flags = FPRINT | TABLEPASS | THICKMATERIAL
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	slowdown = 2
 	armor = list(melee = 40, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0)
@@ -93,7 +93,7 @@
 	name = "radiation hood"
 	icon_state = "rad"
 	desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR|THICKMATERIAL
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
 
 
@@ -105,6 +105,7 @@
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
+	flags = FPRINT | TABLEPASS | THICKMATERIAL
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 1.5

code/modules/clothing/under/color.dm

@@ -3,7 +3,7 @@
 	icon_state = "black"
 	item_state = "bl_suit"
 	item_color = "black"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/color/blackf
 	name = "feminine black jumpsuit"
@@ -18,21 +18,21 @@
 	icon_state = "blue"
 	item_state = "b_suit"
 	item_color = "blue"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/color/green
 	name = "green jumpsuit"
 	icon_state = "green"
 	item_state = "g_suit"
 	item_color = "green"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
 	icon_state = "grey"
 	item_state = "gy_suit"
 	item_color = "grey"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
@@ -42,116 +42,116 @@
 	item_color = "orange"
 	has_sensor = 2
 	sensor_mode = 3
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/color/pink
 	name = "pink jumpsuit"
 	icon_state = "pink"
 	item_state = "p_suit"
 	item_color = "pink"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/color/red
 	name = "red jumpsuit"
 	icon_state = "red"
 	item_state = "r_suit"
 	item_color = "red"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
 	icon_state = "white"
 	item_state = "w_suit"
 	item_color = "white"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
 	icon_state = "yellow"
 	item_state = "y_suit"
 	item_color = "yellow"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/psyche
-	name = "psychedelic"
+	name = "psychedelic jumpsuit"
 	desc = "Groovy!"
 	icon_state = "psyche"
 	item_color = "psyche"
 
 /obj/item/clothing/under/lightblue
-	name = "lightblue"
+	name = "lightblue jumpsuit"
 	desc = "lightblue"
 	icon_state = "lightblue"
 	item_color = "lightblue"
 
 /obj/item/clothing/under/aqua
-	name = "aqua"
+	name = "aqua jumpsuit"
 	desc = "aqua"
 	icon_state = "aqua"
 	item_color = "aqua"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/purple
-	name = "purple"
+	name = "purple jumpsuit"
 	desc = "purple"
 	icon_state = "purple"
 	item_state = "p_suit"
 	item_color = "purple"
 
 /obj/item/clothing/under/lightpurple
-	name = "lightpurple"
+	name = "lightpurple jumpsuit"
 	desc = "lightpurple"
 	icon_state = "lightpurple"
 	item_color = "lightpurple"
 
 /obj/item/clothing/under/lightgreen
-	name = "lightgreen"
+	name = "lightgreen jumpsuit"
 	desc = "lightgreen"
 	icon_state = "lightgreen"
 	item_color = "lightgreen"
 
 /obj/item/clothing/under/lightblue
-	name = "lightblue"
+	name = "lightblue jumpsuit"
 	desc = "lightblue"
 	icon_state = "lightblue"
 	item_color = "lightblue"
 
 /obj/item/clothing/under/lightbrown
-	name = "lightbrown"
+	name = "lightbrown jumpsuit"
 	desc = "lightbrown"
 	icon_state = "lightbrown"
 	item_color = "lightbrown"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/brown
-	name = "brown"
+	name = "brown jumpsuit"
 	desc = "brown"
 	icon_state = "brown"
 	item_color = "brown"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/yellowgreen
-	name = "yellowgreen"
+	name = "yellowgreen jumpsuit"
 	desc = "yellowgreen"
 	icon_state = "yellowgreen"
 	item_color = "yellowgreen"
 
 /obj/item/clothing/under/darkblue
-	name = "darkblue"
+	name = "darkblue jumpsuit"
 	desc = "darkblue"
 	icon_state = "darkblue"
 	item_color = "darkblue"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/lightred
-	name = "lightred"
+	name = "lightred jumpsuit"
 	desc = "lightred"
 	icon_state = "lightred"
 	item_color = "lightred"
 
 /obj/item/clothing/under/darkred
-	name = "darkred"
+	name = "darkred jumpsuit"
 	desc = "darkred"
 	icon_state = "darkred"
 	item_color = "darkred"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

code/modules/clothing/under/jobs/civilian.dm

@@ -6,7 +6,7 @@
 	icon_state = "ba_suit"
 	item_state = "ba_suit"
 	item_color = "ba_suit"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
@@ -15,7 +15,7 @@
 	icon_state = "captain"
 	item_state = "caparmor"
 	item_color = "captain"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/rank/cargo
@@ -32,7 +32,7 @@
 	icon_state = "cargotech"
 	item_state = "lb_suit"
 	item_color = "cargo"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/rank/chaplain
@@ -41,7 +41,7 @@
 	icon_state = "chaplain"
 	item_state = "bl_suit"
 	item_color = "chapblack"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/rank/chef
@@ -49,7 +49,7 @@
 	name = "chef's uniform"
 	icon_state = "chef"
 	item_color = "chef"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/rank/clown
@@ -58,7 +58,7 @@
 	icon_state = "clown"
 	item_state = "clown"
 	item_color = "clown"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	fitted = 0
 
 
@@ -68,7 +68,7 @@
 	icon_state = "hop"
 	item_state = "b_suit"
 	item_color = "hop"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/rank/hydroponics
@@ -78,7 +78,7 @@
 	item_state = "g_suit"
 	item_color = "hydroponics"
 	permeability_coefficient = 0.50
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/rank/janitor
@@ -87,7 +87,7 @@
 	icon_state = "janitor"
 	item_color = "janitor"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/lawyer
@@ -148,7 +148,7 @@
 	icon_state = "mime"
 	item_state = "mime"
 	item_color = "mime"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/miner
 	desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."

code/modules/clothing/under/jobs/engineering.dm

@@ -6,7 +6,7 @@
 	item_state = "g_suit"
 	item_color = "chief"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/atmospheric_technician
 	desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -14,7 +14,7 @@
 	icon_state = "atmos"
 	item_state = "atmos_suit"
 	item_color = "atmos"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/engineer
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
@@ -23,7 +23,7 @@
 	item_state = "engi_suit"
 	item_color = "engine"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/roboticist
 	desc = "It's a slimming black with reinforced seams; great for industrial work."

code/modules/clothing/under/jobs/medsci.dm

@@ -8,7 +8,7 @@
 	item_state = "g_suit"
 	item_color = "director"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/scientist
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
@@ -18,7 +18,7 @@
 	item_color = "toxinswhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 
 /obj/item/clothing/under/rank/chemist
@@ -50,7 +50,7 @@
 	item_color = "geneticswhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/virologist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -78,7 +78,7 @@
 	item_color = "medical"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/medical/blue
 	name = "medical scrubs"

code/modules/clothing/under/jobs/security.dm

@@ -16,7 +16,7 @@
 	item_state = "r_suit"
 	item_color = "warden"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/security
 	name = "security officer's jumpsuit"
@@ -25,7 +25,7 @@
 	item_state = "r_suit"
 	item_color = "secred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /*
  * Detective
@@ -37,7 +37,7 @@
 	item_state = "det"
 	item_color = "detective"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /*
  * Head of Security
@@ -49,7 +49,7 @@
 	item_state = "r_suit"
 	item_color = "hosred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /*
  * Jensen cosplay gear

code/modules/clothing/under/miscellaneous.dm

@@ -24,7 +24,7 @@
 	name = "amish suit"
 	icon_state = "sl_suit"
 	item_color = "sl_suit"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/roman
 	name = "roman armor"
@@ -40,7 +40,7 @@
 	icon_state = "waiter"
 	item_state = "waiter"
 	item_color = "waiter"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/mailman
 	name = "mailman's jumpsuit"
@@ -115,7 +115,7 @@
 	desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
 	icon_state = "owl"
 	item_color = "owl"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	fitted = 0
 
 /obj/item/clothing/under/johnny

code/modules/events/event_manager.dm

@@ -231,6 +231,7 @@ var/datum/controller/event/events
 			switch(DD)
 				if(10)							holiday = "Human-Rights Day"
 				if(14)							holiday = "Monkey Day"
+				if(21)							holiday = "Mayan Doomsday Anniversary"
 				if(22)							holiday = "Orgasming Day"		//lol. These all actually exist
 				if(24)							holiday = "Xmas"
 				if(25)							holiday = "Xmas"

code/modules/events/holiday/friday13th.dm

@@ -0,0 +1,18 @@
+// Basically, cut the event frequency in half to simulate unluckiness.
+
+/datum/round_event_control/fridaythethirteen
+	name = "Friday the 13th"
+	holidayID = "Friday the 13th"
+	typepath = /datum/round_event/fridaythethirteen
+	weight = -1
+	max_occurrences = 1
+	earliest_start = 0
+
+/datum/round_event/fridaythethirteen/start()
+	//Very unlucky, cut the frequency of events in half.
+	events.frequency_lower /= 2
+	events.frequency_upper /= 2
+
+/datum/round_event/fridaythethirteen/announce()
+	for(var/mob/living/L in player_list)
+		L << "<span class='warning'>You are feeling unlucky today.</span>"

code/modules/events/holiday/xmas.dm

@@ -31,6 +31,8 @@
 				new /obj/item/weapon/a_gift(T)
 	for(var/mob/living/simple_animal/corgi/Ian/Ian in mob_list)
 		Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
+	for(var/obj/machinery/computer/security/telescreen/entertainment/Monitor in machines)
+		Monitor.icon_state = "entertainment_xmas"
 
 /datum/round_event/presents/announce()
 	command_alert("Ho Ho Ho, Merry Xmas!", "Unknown Transmission")
@@ -43,9 +45,6 @@
 	desc = "Directions for use: Requires two people, one to pull each end."
 	var/cracked = 0
 
-/obj/item/weapon/toy/xmas_cracker/New()
-	..()
-
 /obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user)
 	if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
 		target.visible_message("<span class='notice'>[user] and [target] pop \an [src]! *pop*</span>", "<span class='notice'>You pull \an [src] with [target]! *pop*</span>", "<span class='notice'>You hear a *pop*.</span>")

code/modules/events/ninja.dm

@@ -2544,7 +2544,7 @@ ________________________________________________________________________________
 					U.client.images += image(tempHud,target,"hudninja")
 				else//If we don't know what role they have but they have one.
 					U.client.images += image(tempHud,target,"hudunknown1")
-		else//If the silicon mob has no law datum, no inherent laws, or a law zero, add them to the hud.
+		else if(issilicon(target))//If the silicon mob has no law datum, no inherent laws, or a law zero, add them to the hud.
 			var/mob/living/silicon/silicon_target = target
 			if(!silicon_target.laws||(silicon_target.laws&&(silicon_target.laws.zeroth||!silicon_target.laws.inherent.len)))
 				if(isrobot(silicon_target))//Different icons for robutts and AI.

code/modules/events/shuttle_loan.dm

@@ -23,18 +23,18 @@
 	supply_shuttle.shuttle_loan = src
 	switch(dispatch_type)
 		if(HIJACK_SYNDIE)
-			command_alert("The syndicate are trying to infiltrate your station. If you let them hijack your shuttle, you'll save us a headache.","CentComm Counter Intelligence")
+			command_alert("The syndicate are trying to infiltrate your station. If you let them hijack your shuttle, you'll save us a headache.","Centcom Counter Intelligence")
 		if(RUSKY_PARTY)
-			command_alert("A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","CentComm Russian Outreach Program")
+			command_alert("A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","Centcom Russian Outreach Program")
 		if(SPIDER_GIFT)
-			command_alert("The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","CentComm Diplomatic Corps")
+			command_alert("The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","Centcom Diplomatic Corps")
 		if(DEPARTMENT_RESUPPLY)
-			command_alert("Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","CentComm Supply Department")
+			command_alert("Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","Centcom Supply Department")
 			thanks_msg = "The shuttle will be returned in 5 minutes."
 			bonus_points = 0
 
 /datum/round_event/shuttle_loan/proc/loan_shuttle()
-	command_alert(thanks_msg, "Cargo shuttle commandeered by CentComm.")
+	command_alert(thanks_msg, "Cargo shuttle commandeered by Centcom.")
 
 	dispatched = 1
 	supply_shuttle.points += bonus_points
@@ -172,7 +172,7 @@
 				while(crate_types.len > 0)
 					var/datum/supply_order/O = new /datum/supply_order()
 					O.ordernum = supply_shuttle.ordernum
-					O.orderedby = "CentComm"
+					O.orderedby = "Centcom"
 					supply_shuttle.shoppinglist += O
 
 					var/spawn_type = crate_types[crate_types.len]

code/modules/events/spacevine.dm

@@ -103,9 +103,9 @@
 						"<span class='warning'>You hear shredding and ripping.</span>")
 			unbuckle()
 		else
-			var/text = pick("rips","tears","pulls")
+			var/text = pick("rip","tear","pull")
 			user.visible_message(\
-				"<span class='notice'>[user.name] [text] at the vines.</span>",\
+				"<span class='notice'>[user.name] [text]s at the vines.</span>",\
 				"<span class='notice'>You [text] at the vines.</span>",\
 				"<span class='warning'>You hear shredding and ripping.</span>")
 	return

code/modules/hydroponics/grown.dm

@@ -716,7 +716,13 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user as mob)
 	user << "<span class='notice'>You prepare the astroturf.</span>"
-	new/obj/item/stack/tile/grass(user.loc)
+	var/location = get_turf(user)
+	var/grassAmt = 1 // The grass we're holding
+	for(var/obj/item/weapon/reagent_containers/food/snacks/grown/grass/grassToConvert in location) // The grass on the floor
+		grassAmt += 1
+		del(grassToConvert)
+	var/obj/item/stack/tile/newAstroturf = new /obj/item/stack/tile/grass(location)
+	newAstroturf.amount = grassAmt
 	del(src)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod
@@ -971,3 +977,21 @@
 			reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
 			reagents.add_reagent("singulo", 1+round((potency / 5), 1))
 			bitesize = 1+round(reagents.total_volume / 2, 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit
+	seed = "/obj/item/seeds/gatfruit"
+	name = "gatfruit"
+	desc = "It smells like burning."
+	icon_state = "gatfruit"
+	potency = 60
+	origin_tech = "combat=3"
+	trash = /obj/item/weapon/gun/projectile/revolver
+	New()
+		..()
+		spawn(5)	//So potency can be set in the proc that creates these crops
+			reagents.add_reagent("sulfur", 1+round((potency / 10), 1))
+			reagents.add_reagent("carbon", 1+round((potency / 10), 1))
+			reagents.add_reagent("nitrogen", 1+round((potency / 15), 1))
+			reagents.add_reagent("potassium", 1+round((potency / 20), 1))
+			bitesize = 1+round(reagents.total_volume / 2, 1)
+

code/modules/hydroponics/hydroitemcode.dm

@@ -70,10 +70,7 @@
 	if(!..()) return
 	if(istype(M, /mob/living))
 		M << "\red You are stunned by the powerful acid of the Deathnettle!"
-		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Had the [src.name] used on them by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] on [M.name] ([M.ckey])</font>")
-
-		log_attack("<font color='red'> [user.name] ([user.ckey]) used the [src.name] on [M.name] ([M.ckey])</font>")
+		add_logs(user, M, "attacked", object="[src.name]")
 
 		playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
 

code/modules/hydroponics/hydroponics.dm

@@ -20,6 +20,7 @@
 	var/planted = 0			//Is it occupied?
 	var/harvest = 0			//Ready to harvest?
 	var/obj/item/seeds/myseed = null	//The currently planted seed
+	var/unwrenchable = 1
 
 /obj/machinery/hydroponics/bullet_act(var/obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables.
 	if(!planted)
@@ -58,6 +59,18 @@ obj/machinery/hydroponics/process()
 			if(nutrilevel <= 0 && myseed.plant_type != 1)
 				adjustHealth(-rand(1,3))
 
+//Photosynthesis/////////////////////////////////////////////////////////
+			// Lack of light hurts non-mushrooms
+			if(isturf(loc))
+				var/turf/currentTurf = loc
+				var/lightAmt = currentTurf.lighting_lumcount
+				if(myseed.plant_type == 2) // Mushroom
+					if(lightAmt < 2)
+						adjustHealth(-1)
+				else // Non-mushroom
+					if(lightAmt < 4)
+						adjustHealth(-2)
+
 //Water//////////////////////////////////////////////////////////////////
 			// Drink random amount of water
 			adjustWater(-rand(1,6))
@@ -349,7 +362,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			if(istype(reagent_source, /obj/item/weapon/reagent_containers/glass/))
 				playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
 
-		// There needs to be a good amount of mutagen to actually work
+		// Requires 5 mutagen to possibly change species.
 		if(S.has_reagent("mutagen", 5))
 			switch(rand(100))
 				if(91  to 100)	plantdies()
@@ -360,6 +373,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 				if(11	to 20)  mutateweed()
 				if(1   to 10)  mutatepest()
 				else 			user << "Nothing happens..."
+		// 2 or 1 units is enough to change the yield and other stats.
+		else if(S.has_reagent("mutagen", 2))
+			hardmutate()
+		else if(S.has_reagent("mutagen", 1))
+			mutate()
 
 		// Antitoxin binds shit pretty well. So the tox goes significantly down
 		if(S.has_reagent("anti_toxin", 1))
@@ -462,10 +480,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			adjustNutri(round(S.get_reagent_amount("nutriment")*1))
 
 		// Poor man's mutagen.
-		if(S.has_reagent("radium", 1))
-			adjustHealth(-round(S.get_reagent_amount("radium")*1.5))
-			adjustToxic(round(S.get_reagent_amount("radium")*2))
-		if(S.has_reagent("radium", 10))
+		if(S.has_reagent("radium", 10) || S.has_reagent("uranium", 10))
 			switch(rand(100))
 				if(91  to 100)	plantdies()
 				if(81  to 90)  mutatespecie()
@@ -475,6 +490,19 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 				if(11	to 20)  mutateweed()
 				if(1   to 10)  mutatepest()
 				else 			user << "Nothing happens..."
+		// Can change the yield and other stats, but requires more than mutagen
+		else if(S.has_reagent("radium", 5) || S.has_reagent("uranium", 5))
+			hardmutate()
+		else if(S.has_reagent("radium", 2) || S.has_reagent("uranium", 2))
+			mutate()
+
+		// After handling the mutating, we now handle the damage from adding crude radioactives...
+		if(S.has_reagent("uranium", 1))
+			adjustHealth(-round(S.get_reagent_amount("uranium")*1))
+			adjustToxic(round(S.get_reagent_amount("uranium")*2))
+		if(S.has_reagent("radium", 1))
+			adjustHealth(-round(S.get_reagent_amount("radium")*1))
+			adjustToxic(round(S.get_reagent_amount("radium")*3)) // Radium is harsher (OOC: also easier to produce)
 
 		// The best stuff there is. For testing/debugging.
 		if(S.has_reagent("adminordrazine", 1))
@@ -575,7 +603,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 		playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
 		del(O)
 		update_icon()
-	else if(istype(O, /obj/item/weapon/wrench))
+	else if(istype(O, /obj/item/weapon/wrench) && unwrenchable)
 		if(!anchored && !isinspace())
 			playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 			anchored = 1
@@ -811,10 +839,12 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 /obj/machinery/hydroponics/proc/update_tray(mob/user = usr)
 	harvest = 0
 	lastproduce = age
-	if((yieldmod * myseed.yield) <= 0)
+	if(istype(myseed,/obj/item/seeds/replicapod/))
+		user << "You harvest from the [myseed.plantname]."
+	else if((yieldmod * myseed.yield) <= 0)
 		user << "\red You fail to harvest anything useful."
 	else
-		user << "You harvest from the [myseed.plantname]."
+		user << "You harvest [yieldmod * myseed.yield] items from the [myseed.plantname]."
 	if(myseed.oneharvest)
 		del(myseed)
 		planted = 0
@@ -892,6 +922,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	icon_state = "soil"
 	density = 0
 	use_power = 0
+	unwrenchable = 0
 
 	update_icon() // Same as normal but with the overlays removed - Cheridan.
 		overlays.Cut()

code/modules/hydroponics/seeds.dm

@@ -1050,3 +1050,19 @@
 	potency = 20
 	plant_type = 0
 	growthstages = 6
+
+/obj/item/seeds/gatfruit
+	name = "pack of gatfruit seeds"
+	desc = "These seeds grow into .357 revolvers."
+	icon_state = "seed-gatfruit"
+	species = "gatfruit"
+	plantname = "gatfruit"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit
+	lifespan = 20
+	endurance = 20
+	maturation = 40
+	production = 10
+	yield = 2
+	potency = 60
+	plant_type = 0
+	growthstages = 2

code/modules/library/lib_items.dm

@@ -60,7 +60,7 @@
 				state = 0
 
 		if(2)
-			if(istype(I, /obj/item/weapon/book))
+			if(istype(I, /obj/item/weapon/book) || istype(I, /obj/item/weapon/spellbook))
 				user.drop_item()
 				I.loc = src
 				update_icon()

code/modules/mining/mine_turfs.dm

@@ -415,7 +415,7 @@
 
 	if(istype(W,/obj/item/weapon/storage/bag/ore))
 		var/obj/item/weapon/storage/bag/ore/S = W
-		if(S.collection_mode)
+		if(S.collection_mode == 1)
 			for(var/obj/item/weapon/ore/O in src.contents)
 				O.attackby(W,user)
 				return

code/modules/mining/ores_coins.dm

@@ -22,10 +22,12 @@
 
 	attack_self(mob/living/user as mob) //It's magic I ain't gonna explain how instant conversion with no tool works. -- Urist
 		var/location = get_turf(user)
-		for(var/obj/item/weapon/ore/glass/sandToConvert in location)
-			new /obj/item/stack/sheet/mineral/sandstone(location)
+		var/sandAmt = 1 // The sand we're holding
+		for(var/obj/item/weapon/ore/glass/sandToConvert in location) // The sand on the floor
+			sandAmt += 1
 			del(sandToConvert)
-		new /obj/item/stack/sheet/mineral/sandstone(location)
+		var/obj/item/stack/sheet/mineral/newSandstone = new /obj/item/stack/sheet/mineral/sandstone(location)
+		newSandstone.amount = sandAmt
 		del(src)
 
 /obj/item/weapon/ore/plasma

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

@@ -257,7 +257,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 
 			LAssailant = M

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

@@ -143,8 +143,7 @@
 			O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		adjustBruteLoss(damage)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		add_logs(M, src, "attacked", admin=0)
 		updatehealth()
 
 
@@ -228,7 +227,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 
 			LAssailant = M

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -11,10 +11,9 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 	var/stage = 0
 
 /obj/item/alien_embryo/New()
-	if(affected_mob.getlimb(/obj/item/organ/limb/robot/chest)) //If our Victim is augmented in the chest, No Babby - RR
-		return
 	if(istype(loc, /mob/living))
 		affected_mob = loc
+		affected_mob.status_flags |= XENO_HOST
 		processing_objects.Add(src)
 		spawn(0)
 			AddInfectionImages(affected_mob)

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -161,14 +161,15 @@ var/const/MAX_ACTIVE_TIME = 400
 
 	if(!sterile)
 		//target.contract_disease(new /datum/disease/alien_embryo(0)) //so infection chance is same as virus infection chance
-		new /obj/item/alien_embryo(target)
-		target.status_flags |= XENO_HOST
-
 		target.visible_message("\red \b [src] falls limp after violating [target]'s face!")
 
 		Die()
 		icon_state = "[initial(icon_state)]_impregnated"
 
+		if(!target.getlimb(/obj/item/organ/limb/robot/chest) && !(target.status_flags & XENO_HOST))
+			new /obj/item/alien_embryo(target)
+
+
 		if(iscorgi(target))
 			var/mob/living/simple_animal/corgi/C = target
 			src.loc = get_turf(C)

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

@@ -365,8 +365,7 @@
 				var/start_T_descriptor = "<font color='#6b5d00'>tile at [start_T.x], [start_T.y], [start_T.z] in area [get_area(start_T)]</font>"
 				var/end_T_descriptor = "<font color='#6b4400'>tile at [end_T.x], [end_T.y], [end_T.z] in area [get_area(end_T)]</font>"
 
-				M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]</font>")
-				usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]</font>")
+				add_logs(usr, M, "thrown", admin=0, addition="from [start_T_descriptor] with the target [end_T_descriptor]")
 
 	if(!item) return //Grab processing has a chance of returning null
 

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

@@ -237,8 +237,7 @@
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		add_logs(M, src, "attacked", admin=0)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
 		var/obj/item/organ/limb/affecting = get_organ(ran_zone(dam_zone))
@@ -465,3 +464,20 @@
 		xylophone = 1
 		spawn(1200)
 			xylophone = 0
+
+/mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone)
+	. = 1 // Default to returning true.
+	if(user && !target_zone)
+		target_zone = user.zone_sel.selecting
+	// If targeting the head, see if the head item is thin enough.
+	// If targeting anything else, see if the wear suit is thin enough.
+	switch(target_zone)
+		if("head")
+			if(head && head.flags & THICKMATERIAL)
+				. = 0
+		else
+			if(wear_suit && wear_suit.flags & THICKMATERIAL)
+				. = 0
+	if(!. && error_msg && user)
+		// Might need re-wording.
+		user << "<span class='alert'>There is no exposed flesh or thin material [target_zone == "head" ? "on their head" : "on their body"].</span>"

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

@@ -15,7 +15,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 			LAssailant = M
 

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

@@ -3,6 +3,7 @@
 		return
 
 	if((M != src) && check_shields(0, M.name))
+		add_logs(M, src, "attempted to touch")
 		visible_message("<span class='warning'>[M] attempted to touch [src]!</span>")
 		return 0
 
@@ -10,6 +11,8 @@
 		if("help")
 			if(health >= 0)
 				help_shake_act(M)
+				if(src != M)
+					add_logs(M, src, "shaked")
 				return 1
 
 			//CPR
@@ -21,6 +24,7 @@
 				return 0
 
 			if(cpr_time < world.time + 30)
+				add_logs(src, M, "CPRed")
 				visible_message("<span class='notice'>[M] is trying to perform CPR on [src]!</span>")
 				if(!do_mob(M, src))
 					return 0
@@ -35,6 +39,9 @@
 		if("grab")
 			if(M == src || anchored)
 				return 0
+
+			add_logs(M, src, "grabbed", addition="passively")
+
 			if(w_uniform)
 				w_uniform.add_fingerprint(M)
 
@@ -44,7 +51,6 @@
 			if(!G)	//the grab will delete itself in New if affecting is anchored
 				return
 			M.put_in_active_hand(G)
-			grabbed_by += G
 			G.synch()
 			LAssailant = M
 
@@ -53,10 +59,7 @@
 			return 1
 
 		if("harm")
-			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Punched [src.name] ([src.ckey])</font>")
-			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been punched by [M.name] ([M.ckey])</font>")
-
-			log_attack("<font color='red'>[M.name] ([M.ckey]) punched [src.name] ([src.ckey])</font>")
+			add_logs(M, src, "punched")
 
 			var/attack_verb = "punch"
 			if(lying)
@@ -105,9 +108,7 @@
 				forcesay(hit_appends)
 
 		if("disarm")
-			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Disarmed [src.name] ([src.ckey])</font>")
-			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been disarmed by [M.name] ([M.ckey])</font>")
-			log_attack("<font color='red'>[M.name] ([M.ckey]) disarmed [src.name] ([src.ckey])</font>")
+			add_logs(M, src, "disarmed")
 
 			if(w_uniform)
 				w_uniform.add_fingerprint(M)

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

@@ -60,7 +60,7 @@ emp_act
 			return -1 // complete projectile permutation
 
 	if(check_shields(P.damage, "the [P.name]"))
-		P.on_hit(src, 2)
+		P.on_hit(src, 2, def_zone)
 		return 2
 	return (..(P , def_zone))
 

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

@@ -5,6 +5,7 @@
 	if(ishuman(src))
 		var/mob/living/carbon/human/H = src
 		var/obj/item/I = H.get_active_hand()
+		var/obj/item/weapon/storage/S = H.get_inactive_hand()
 		if(!I)
 			H << "<span class='notice'>You are not holding anything to equip.</span>"
 			return
@@ -13,8 +14,20 @@
 				update_inv_l_hand(0)
 			else
 				update_inv_r_hand(0)
+		else if(s_active && s_active.can_be_inserted(I,1))	//if storage active insert there
+			s_active.handle_item_insertion(I)
+		else if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1))	//see if we have box in other hand
+			S.handle_item_insertion(I)
 		else
-			H << "\red You are unable to equip that."
+			S = H.get_item_by_slot(slot_belt)
+			if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1))		//else we put in belt
+				S.handle_item_insertion(I)
+			else 
+				S = H.get_item_by_slot(slot_back)	//else we put in backpack
+				if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1))		
+					S.handle_item_insertion(I)
+				else
+					H << "\red You are unable to equip that."
 
 
 /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/I, list/slots, del_on_fail = 1)

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

@@ -318,8 +318,7 @@
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		add_logs(M, src, "attacked", admin=0)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		adjustBruteLoss(damage)
 		updatehealth()
@@ -438,7 +437,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 
 			LAssailant = M
@@ -529,7 +527,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 
 			LAssailant = M
@@ -845,7 +842,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	body_parts_covered = FULL_BODY
 	slowdown = 1.0
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE | ABSTRACT
+	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ABSTRACT
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS | HEAD
 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
 	cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS | HEAD

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

@@ -67,7 +67,7 @@
 		G.process()
 
 	if(!client && stat == CONSCIOUS)
-		if(prob(33) && canmove && isturf(loc))
+		if(prob(33) && canmove && isturf(loc) && !pulledby && !grabbed_by.len)
 			step(src, pick(cardinal))
 		if(prob(1))
 			emote(pick("scratch","jump","roll","tail"))

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

@@ -151,7 +151,6 @@
 
 				M.put_in_active_hand(G)
 
-				grabbed_by += G
 				G.synch()
 
 				LAssailant = M
@@ -220,7 +219,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 
 			LAssailant = M
@@ -254,8 +252,7 @@
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		add_logs(M, src, "attacked", admin=0)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		adjustBruteLoss(damage)
 		updatehealth()

code/modules/mob/living/living.dm

@@ -211,6 +211,9 @@
 		O.emp_act(severity)
 	..()
 
+/mob/living/proc/can_inject()
+	return 1
+
 /mob/living/proc/get_organ_target()
 	var/mob/shooter = src
 	var/t = shooter:zone_sel.selecting

code/modules/mob/living/living_defense.dm

@@ -50,7 +50,7 @@
 		return 2
 	if(!P.nodamage)
 		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone)
-	P.on_hit(src, absorb)
+	P.on_hit(src, absorb, def_zone)
 	return absorb
 
 /mob/living/hitby(atom/movable/AM)//Standardization and logging -Sieve
@@ -71,9 +71,7 @@
 		var/client/assailant = directory[ckey(O.fingerprintslast)]
 		if(assailant && assailant.mob && istype(assailant.mob,/mob))
 			var/mob/M = assailant.mob
-			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with [O], last touched by [M.name] ([assailant.ckey])</font>")
-			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [src.name] ([src.ckey]) with [O]</font>")
-			log_attack("<font color='red'>[src.name] ([src.ckey]) was hit by [O], last touched by [M.name] ([assailant.ckey])</font>")
+			add_logs(M, src, "hit", object="[O]")
 
 //Mobs on Fire
 /mob/living/proc/IgniteMob()

code/modules/mob/living/say.dm

@@ -298,7 +298,7 @@ var/list/department_radio_keys = list(
 			var/mob/living/simple_animal/parrot/P = A
 			if(P.speech_buffer.len >= 10)
 				P.speech_buffer.Remove(pick(P.speech_buffer))
-			P.speech_buffer.Add(message)
+			P.speech_buffer.Add(html_decode(message))
 
 		if(istype(A, /obj/)) //radio in pocket could work, radio in backpack wouldn't --rastaf0
 			var/obj/O = A

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

@@ -438,8 +438,7 @@ var/list/ai_list = list()
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		add_logs(M, src, "attacked", admin=0)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		adjustBruteLoss(damage)
 		updatehealth()

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

@@ -107,7 +107,7 @@ var/const/VOX_DELAY = 600
 
 	announcing_vox = world.time + VOX_DELAY
 
-	log_game("[key_name_admin(src)] made a vocal announcement with the following message: [message].")
+	log_game("[key_name(src)] made a vocal announcement with the following message: [message].")
 
 	for(var/word in words)
 		play_vox_word(word, src.z, null)
@@ -144,4 +144,4 @@ var/const/VOX_DELAY = 600
 		return 1
 	return 0
 
-#endif
+#endif

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

@@ -104,7 +104,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
 "cargo" = 'sound/vox_fem/cargo.ogg',
 "ceiling" = 'sound/vox_fem/ceiling.ogg',
 "celsius" = 'sound/vox_fem/celsius.ogg',
-"centcomm" = 'sound/vox_fem/centcomm.ogg',
+"centcom" = 'sound/vox_fem/centcom.ogg',
 "center" = 'sound/vox_fem/center.ogg',
 "centi" = 'sound/vox_fem/centi.ogg',
 "central" = 'sound/vox_fem/central.ogg',

code/modules/mob/living/silicon/pai/software.dm

@@ -486,11 +486,11 @@
 		var/mob/living/M = card.loc
 		if(!istype(M, /mob/living))
 			while (!istype(M, /mob/living))
-				M = M.loc
 				if(istype(M, /turf))
 					src.temp = "Error: No biological host found. <br>"
 					src.subscreen = 0
 					return dat
+				M = M.loc
 		dat += {"Bioscan Results for [M]: <br>"
 		Overall Status: [M.stat > 1 ? "dead" : "[M.health]% healthy"] <br>
 		Scan Breakdown: <br>

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

@@ -603,7 +603,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 			for(var/mob/O in viewers(src, null))
@@ -719,8 +718,7 @@
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		add_logs(M, src, "attacked", admin=0)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		adjustBruteLoss(damage)
 		updatehealth()

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

@@ -109,6 +109,11 @@
 /mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0)
 	return
 
+/mob/living/silicon/can_inject(var/mob/user, var/error_msg)
+	if(error_msg)
+		user << "<span class='alert'>Their outer shell is too tough.</span>"
+	return 0
+
 /mob/living/silicon/IsAdvancedToolUser()
 	return 1
 

code/modules/mob/living/simple_animal/constructs.dm

@@ -99,8 +99,7 @@
 				playsound(loc, M.attack_sound, 50, 1, 1)
 			for(var/mob/O in viewers(src, null))
 				O.show_message("<span class='attack'>\The <EM>[M]</EM> [M.attacktext] \the <EM>[src]</EM>!</span>", 1)
-			M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+			add_logs(M, src, "attacked", admin=0)
 			var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 			adjustBruteLoss(damage)
 

code/modules/mob/living/simple_animal/hostile/tree.dm

@@ -54,4 +54,18 @@
 	..()
 	visible_message("\red <b>[src]</b> is hacked into pieces!")
 	new /obj/item/stack/sheet/wood(loc)
+	del(src)
+
+/mob/living/simple_animal/hostile/tree/festivus
+	name = "festivus pole"
+	desc = "serenity now... SERENITY NOW!"
+	icon_state = "festivus_pole"
+	icon_living = "festivus_pole"
+	icon_dead = "festivus_pole"
+	icon_gib = "festivus_pole"
+
+/mob/living/simple_animal/hostile/tree/festivus/Die()
+	..()
+	visible_message("\red <b>[src]</b> is hacked into pieces!")
+	new /obj/item/stack/rods(loc)
 	del(src)

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -246,8 +246,7 @@
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red <B>\The [M]</B> [M.attacktext] [src]!", 1)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		add_logs(M, src, "attacked", admin=0)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		adjustBruteLoss(damage)
 
@@ -278,7 +277,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 
 			LAssailant = M
@@ -314,7 +312,6 @@
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 			LAssailant = M
 

code/modules/mob/mob.dm

@@ -528,6 +528,7 @@ var/list/slot_equipment_priority = list( \
 	if ( !AM || !usr || src==AM || !isturf(src.loc) )	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
 		return
 	if (!( AM.anchored ))
+		AM.add_fingerprint(src)
 
 		// If we're pulling something then drop what we're currently pulling and pull this instead.
 		if(pulling)

code/modules/mob/mob_grab.dm

@@ -32,6 +32,14 @@
 	hud.name = "reinforce grab"
 	hud.master = src
 
+	affecting.grabbed_by += src
+
+
+/obj/item/weapon/grab/Del()
+	if(affecting)
+		affecting.grabbed_by -= src
+	del(hud)
+	..()
 
 //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
 /obj/item/weapon/grab/proc/throw()
@@ -134,9 +142,7 @@
 			icon_state = "grabbed+1"
 			if(!affecting.buckled)
 				affecting.loc = assailant.loc
-			affecting.attack_log += "\[[time_stamp()]\] <font color='orange'>Has had their neck grabbed by [assailant.name] ([assailant.ckey])</font>"
-			assailant.attack_log += "\[[time_stamp()]\] <font color='red'>Grabbed the neck of [affecting.name] ([affecting.ckey])</font>"
-			log_attack("<font color='red'>[assailant.name] ([assailant.ckey]) grabbed the neck of [affecting.name] ([affecting.ckey])</font>")
+			add_logs(assailant, affecting, "neck-grabbed")
 			hud.icon_state = "disarm/kill"
 			hud.name = "disarm/kill"
 		else
@@ -155,9 +161,7 @@
 						return
 					state = GRAB_KILL
 					assailant.visible_message("<span class='danger'>[assailant] has tightened \his grip on [affecting]'s neck!</span>")
-					affecting.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been strangled (kill intent) by [assailant.name] ([assailant.ckey])</font>"
-					assailant.attack_log += "\[[time_stamp()]\] <font color='red'>Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>"
-					log_attack("<font color='red'>[assailant.name] ([assailant.ckey]) Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>")
+					add_logs(assailant, affecting, "strangled")
 
 					assailant.next_move = world.time + 10
 					affecting.losebreath += 1
@@ -206,6 +210,5 @@
 /obj/item/weapon/grab/dropped()
 	del(src)
 
-/obj/item/weapon/grab/Del()
-	del(hud)
-	..()
+#undef UPGRADE_COOLDOWN
+#undef UPGRADE_KILL_TIMER

code/modules/mob/mob_helpers.dm

@@ -264,9 +264,9 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 
 
 /proc/shake_camera(mob/M, duration, strength=1)
-	if(!M || !M.client || M.shakecamera)
-		return
-	spawn(1)
+	spawn(0)
+		if(!M || !M.client || M.shakecamera)
+			return
 		var/oldeye=M.client.eye
 		var/x
 		M.shakecamera = 1

code/modules/mob/new_player/login.dm

@@ -3,6 +3,9 @@
 	if(join_motd)
 		src << "<div class=\"motd\">[join_motd]</div>"
 
+	if(admin_notice)
+		src << "\blue <b>Admin Notice:</b>\n \t [admin_notice]"
+
 	if(!mind)
 		mind = new /datum/mind(key)
 		mind.active = 1

code/modules/paperwork/pen.dm

@@ -42,40 +42,16 @@
 	colour = "white"
 
 
-/obj/item/weapon/pen/attack(mob/M, mob/user)
-	if(!ismob(M))
+/obj/item/weapon/pen/attack(mob/living/M, mob/user)
+	if(!istype(M))
 		return
 
-	user << "<span class='warning'>You stab [M] with the pen.</span>"
-	M << "\red You feel a tiny prick!"
-
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [name]  by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to stab [M.name] ([M.ckey])</font>")
-	log_attack("<font color='red'>[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey])</font>")
-
-
-/*
- * Sleepy Pens
- */
-/obj/item/weapon/pen/sleepypen
-	desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
-	origin_tech = "materials=2;syndicate=5"
-
-
-/obj/item/weapon/pen/sleepypen/New()
-	create_reagents(30)
-	reagents.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin	//30 Chloral seems to be fatal, reducing it to 22.
-	..()
-
-
-/obj/item/weapon/pen/sleepypen/attack(mob/M, mob/user)
-	if(!istype(M))	return
-
-	..()
-	if(reagents.total_volume)
-		if(M.reagents)
-			reagents.trans_to(M, 30) //used to be 150
+	if(M.can_inject(user, 1))
+		user << "<span class='warning'>You stab [M] with the pen.</span>"
+		M << "\red You feel a tiny prick!"
+		. = 1
 
+	add_logs(user, M, "stabbed", object="[name]")
 
 /*
  * Parapens
@@ -84,13 +60,13 @@
 	origin_tech = "materials=2;syndicate=5"
 
 
-/obj/item/weapon/pen/paralysis/attack(mob/M, mob/user)
+/obj/item/weapon/pen/paralysis/attack(mob/living/M, mob/user)
 	if(!istype(M))	return
 
-	..()
-	if(reagents.total_volume)
-		if(M.reagents)
-			reagents.trans_to(M, 50)
+	if(..())
+		if(reagents.total_volume)
+			if(M.reagents)
+				reagents.trans_to(M, 50)
 
 
 /obj/item/weapon/pen/paralysis/New()

code/modules/paperwork/photocopier.dm

@@ -24,7 +24,7 @@
 	var/maxcopies = 10	//how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
 	var/greytoggle = "Greyscale"
 	var/mob/living/ass = null
-
+	var/busy = 0
 
 /obj/machinery/photocopier/attack_ai(mob/user)
 	return attack_hand(user)
@@ -63,7 +63,7 @@
 	if(href_list["copy"])
 		if(copy)
 			for(var/i = 0, i < copies, i++)
-				if(toner > 0)
+				if(toner > 0 && !busy && copy)
 					var/obj/item/weapon/paper/c = new /obj/item/weapon/paper (loc)
 					if(toner > 10)	//lots of toner, make it dark
 						c.info = "<font color = #101010>"
@@ -78,13 +78,15 @@
 					c.fields = copy.fields
 					c.updateinfolinks()
 					toner--
+					busy = 1
 					sleep(15)
+					busy = 0
 				else
 					break
 			updateUsrDialog()
 		else if(photocopy)
 			for(var/i = 0, i < copies, i++)
-				if(toner >= 5)  //Was set to = 0, but if there was say 3 toner left and this ran, you would get -2 which would be weird for ink
+				if(toner >= 5 && !busy && photocopy)  //Was set to = 0, but if there was say 3 toner left and this ran, you would get -2 which would be weird for ink
 					var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (loc)
 					var/icon/I = icon(photocopy.icon, photocopy.icon_state)
 					var/icon/img = icon(photocopy.img)
@@ -109,8 +111,9 @@
 					p.pixel_x = rand(-10, 10)
 					p.pixel_y = rand(-10, 10)
 					p.blueprints = photocopy.blueprints //a copy of a picture is still good enough for the syndicate
-
+					busy = 1
 					sleep(15)
+					busy = 0
 				else
 					break
 		else if(ass) //ASS COPY. By Miauw
@@ -118,7 +121,7 @@
 				var/icon/temp_img
 				if(ishuman(ass) && (ass.get_item_by_slot(slot_w_uniform) || ass.get_item_by_slot(slot_wear_suit)))
 					usr << "<span class='notice'>You feel kind of silly copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on.</span>"
-				else if(toner >= 5 && check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on.
+				else if(toner >= 5 && !busy && check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on.
 					if(isalien(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.
 						temp_img = icon("icons/ass/assalien.png")
 					else if(ishuman(ass)) //Suit checks are in check_ass
@@ -141,7 +144,9 @@
 					ic.Blend(small_img,ICON_OVERLAY, 10, 13)
 					p.icon = ic
 					toner -= 5
+					busy = 1
 					sleep(15)
+					busy = 0
 				else
 					break
 		updateUsrDialog()
@@ -176,7 +181,7 @@
 			updateUsrDialog()
 	else if(href_list["aipic"])
 		if(!istype(usr,/mob/living/silicon/ai)) return
-		if(toner >= 5)
+		if(toner >= 5 && !busy)
 			var/list/nametemp = list()
 			var/find
 			var/datum/picture/selection
@@ -201,7 +206,9 @@
 			p.pixel_x = rand(-10, 10)
 			p.pixel_y = rand(-10, 10)
 			toner -= 5	 //AI prints color pictures only, thus they can do it more efficiently
+			busy = 1
 			sleep(15)
+			busy = 0
 		updateUsrDialog()
 	else if(href_list["colortoggle"])
 		if(greytoggle == "Greyscale")

code/modules/power/cable.dm

@@ -302,8 +302,8 @@
 	if(src.amount < used)
 		return 0
 	else if (src.amount == used)
-		//handle mob icon update
-		if(ismob(loc))
+		.=1 //Because del(src) stops the proc, set the default return value to 1
+		if(ismob(loc)) //handle mob icon update
 			var/mob/M = loc
 			M.u_equip(src)
 		del(src)

code/modules/power/port_gen.dm

@@ -53,7 +53,6 @@ display round(lastgen) and plasmatank amount
 
 	var/active = 0
 	var/power_gen = 5000
-	var/open = 0
 	var/recent_fault = 0
 	var/power_output = 1
 
@@ -115,8 +114,8 @@ display round(lastgen) and plasmatank amount
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
-	component_parts += new /obj/item/weapon/cable_coil(src)
-	component_parts += new /obj/item/weapon/cable_coil(src)
+	component_parts += new /obj/item/weapon/cable_coil(src, 1)
+	component_parts += new /obj/item/weapon/cable_coil(src, 1)
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
 	component_parts += new board_path(src)
 	var/obj/sheet = new sheet_path(null)
@@ -231,21 +230,14 @@ display round(lastgen) and plasmatank amount
 			playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 
 		else if(istype(O, /obj/item/weapon/screwdriver))
-			open = !open
+			panel_open = !panel_open
 			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-			if(open)
+			if(panel_open)
 				user << "\blue You open the access panel."
 			else
 				user << "\blue You close the access panel."
-		else if(istype(O, /obj/item/weapon/crowbar) && !open)
-			var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc)
-			for(var/obj/item/I in component_parts)
-				if(I.reliability < 100)
-					I.crit_fail = 1
-				I.loc = src.loc
-			new_frame.state = 2
-			new_frame.icon_state = "box_1"
-			del(src)
+		else if(istype(O, /obj/item/weapon/crowbar) && panel_open)
+			default_deconstruction_crowbar()
 
 /obj/machinery/power/port_gen/pacman/attack_hand(mob/user as mob)
 	..()

code/modules/power/turbine.dm

@@ -1,3 +1,27 @@
+// TURBINE v2 AKA rev4407 Engine reborn!
+
+// How to use it? - Mappers
+//
+// This is a very good power generating mechanism. All you need is a blast furnace with soaring flames and output.
+// Not everything is included yet so the turbine can run out of fuel quiet quickly. The best thing about the turbine is that even
+// though something is on fire that passes through it, it won't be on fire as it passes out of it. So the exhaust fumes can still
+// containt unreacted fuel - plasma and oxygen that needs to be filtered out and re-routed back. This of course requires smart piping
+// For a computer to work with the turbine the compressor requires a comp_id matching with the turbine computer's id. This will be
+// subjected to a change in the near future mind you. Right now this method of generating power is a good backup but don't expect it
+// become a main power source unless some work is done. Have fun. At 50k RPM it generates 60k power. So more than one turbine is needed!
+//
+// - Numbers
+//
+// Example setup	 S - sparker
+//					 B - Blast doors into space for venting
+// *BBB****BBB*		 C - Compressor
+// S    CT    *		 T - Turbine
+// * ^ *  * V *		 D - Doors with firedoor
+// **|***D**|**      ^ - Fuel feed (Not vent, but a gas outlet)
+//   |      |        V - Suction vent (Like the ones in atmos
+//
+
+
 /obj/machinery/compressor
 	name = "compressor"
 	desc = "The compressor stage of a gas turbine generator."
@@ -14,6 +38,7 @@
 	var/capacity = 1e6
 	var/comp_id = 0
 
+
 /obj/machinery/power/turbine
 	name = "gas turbine generator"
 	desc = "A gas turbine used for backup power generation."
@@ -21,28 +46,29 @@
 	icon_state = "turbine"
 	anchored = 1
 	density = 1
+	var/opened = 0
 	var/obj/machinery/compressor/compressor
 	directwired = 1
 	var/turf/simulated/outturf
 	var/lastgen
 
 /obj/machinery/computer/turbine_computer
-	name = "Gas Turbine Control Console"
+	name = "gas turbine control computer"
 	desc = "A computer to remotely control a gas turbine"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "airtunnel0e"
 	anchored = 1
 	density = 1
 	var/obj/machinery/compressor/compressor
-	var/list/obj/machinery/door/poddoor/doors
 	var/id = 0
-	var/door_status = 0
 
 // the inlet stage of the gas turbine electricity generator
 
 /obj/machinery/compressor/New()
 	..()
 
+// The inlet of the compressor is the direction it faces
+
 	gas_contained = new
 	inturf = get_step(src, dir)
 
@@ -55,6 +81,16 @@
 #define COMPFRICTION 5e5
 #define COMPSTARTERLOAD 2800
 
+
+// Crucial to make things work!!!!
+// OLD FIX - explanation given down below.
+// /obj/machinery/power/compressor/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+// 		return !density
+
+
+/obj/machinery/power/compressor/CanAtmosPass(var/turf/T)
+	return !density
+
 /obj/machinery/compressor/process()
 	if(!starter)
 		return
@@ -66,11 +102,16 @@
 		return
 	rpm = 0.9* rpm + 0.1 * rpmtarget
 	var/datum/gas_mixture/environment = inturf.return_air()
+
+	// It's a simplified version taking only 1/10 of the moles from the turf nearby. It should be later changed into a better version
+
 	var/transfer_moles = environment.total_moles()/10
 	//var/transfer_moles = rpm/10000*capacity
 	var/datum/gas_mixture/removed = inturf.remove_air(transfer_moles)
 	gas_contained.merge(removed)
 
+// RPM function to include compression friction - be advised that too low/high of a compfriction value can make things screwy
+
 	rpm = max(0, rpm - (rpm*rpm)/COMPFRICTION)
 
 
@@ -94,35 +135,64 @@
 		overlays += image('icons/obj/pipes.dmi', "comp-o1", FLY_LAYER)
 	 //TODO: DEFERRED
 
+// These are crucial to working of a turbine - the stats modify the power output. TurbGenQ modifies how much raw energy can you get from
+// rpms, TurbGenG modifies the shape of the curve - the lower the value the less straight the curve is.
+
+#define TURBPRES 9000000
+#define TURBGENQ 100000
+#define TURBGENG 0.5
+
 /obj/machinery/power/turbine/New()
 	..()
 
+// The outlet is pointed at the direction of the turbine component
+
 	outturf = get_step(src, dir)
 
 	spawn(5)
 
+// compressor is found in the opposite direction
+
 		compressor = locate() in get_step(src, get_dir(outturf, src))
 		if(!compressor)
 			stat |= BROKEN
 
 
-#define TURBPRES 9000000
-#define TURBGENQ 20000
-#define TURBGENG 0.8
+// THIS MAKES IT WORK!!!!!
+
+// OLD FIX . Dunno how other engines handle this but this is how it should work: Turbine and compressor should be
+// treated as walls to avoid conductivity and gas spread. This was the problem of the original turbine which was just
+// a machinery - it didn't block the gas passage.
+// /obj/machinery/power/turbine/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+//		return !density
+
+/obj/machinery/power/turbine/CanAtmosPass(var/turf/T)
+	return !density
+
+
 
 /obj/machinery/power/turbine/process()
-	if(!compressor.starter)
-		return
-	overlays.Cut()
+
 	if(stat & BROKEN)
 		return
 	if(!compressor)
 		stat |= BROKEN
 		return
+	if(!compressor.starter)
+		return
+	overlays.Cut()
+
+	// This is the power generation function. If anything is needed it's good to plot it in EXCEL before modifying
+	// the TURBGENQ and TURBGENG values
+
 	lastgen = ((compressor.rpm / TURBGENQ)**TURBGENG) *TURBGENQ
 
 	add_avail(lastgen)
+
+	// Weird function but it works. Should be something else...
+
 	var/newrpm = ((compressor.gas_contained.temperature) * compressor.gas_contained.total_moles())/4
+
 	newrpm = max(0, newrpm)
 
 	if(!compressor.starter || newrpm > 1000)
@@ -133,41 +203,29 @@
 		var/datum/gas_mixture/removed = compressor.gas_contained.remove(oamount)
 		outturf.assume_air(removed)
 
+// If it works, put an overlay that it works!
+
 	if(lastgen > 100)
 		overlays += image('icons/obj/pipes.dmi', "turb-o", FLY_LAYER)
 
-
-	for(var/mob/M in viewers(1, src))
-		if ((M.client && M.machine == src))
-			src.interact(M)
-	AutoUpdateAI(src)
-
-
-/obj/machinery/power/turbine/attack_ai(mob/user)
-
-	if(stat & (BROKEN|NOPOWER))
-		return
-
-	interact(user)
+	updateDialog()
 
 /obj/machinery/power/turbine/attack_hand(mob/user)
 
-	add_fingerprint(user)
-
-	if(stat & (BROKEN|NOPOWER))
+	if(..())
 		return
 
 	interact(user)
 
-/obj/machinery/power/turbine/proc/interact(mob/user)
+
+
+/obj/machinery/power/turbine/interact(mob/user)
 
 	if ( (get_dist(src, user) > 1 ) || (stat & (NOPOWER|BROKEN)) && (!istype(user, /mob/living/silicon/ai)) )
-		user.machine = null
+		user.unset_machine(src)
 		user << browse(null, "window=turbine")
 		return
 
-	user.machine = src
-
 	var/t = "<TT><B>Gas Turbine Generator</B><HR><PRE>"
 
 	t += "Generated power : [round(lastgen)] W<BR><BR>"
@@ -179,8 +237,9 @@
 	t += "</PRE><HR><A href='?src=\ref[src];close=1'>Close</A>"
 
 	t += "</TT>"
-	user << browse(t, "window=turbine")
-	onclose(user, "turbine")
+	var/datum/browser/popup = new(user, "turbine", name)
+	popup.set_content(t)
+	popup.open()
 
 	return
 
@@ -190,22 +249,24 @@
 
 	if( href_list["close"] )
 		usr << browse(null, "window=turbine")
-		usr.machine = null
+		usr.unset_machine(src)
 		return
 
 	else if( href_list["str"] )
-		compressor.starter = !compressor.starter
+		if(compressor)
+			compressor.starter = !compressor.starter
+
+	updateDialog()
+
 
-	spawn(0)
-		for(var/mob/M in viewers(1, src))
-			if ((M.client && M.machine == src))
-				src.interact(M)
 
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+// COMPUTER NEEDS A SERIOUS REWRITE.
+
 
 
 /obj/machinery/computer/turbine_computer/New()
@@ -214,97 +275,49 @@
 		for(var/obj/machinery/compressor/C in world)
 			if(id == C.comp_id)
 				compressor = C
-		doors = new /list()
-		for(var/obj/machinery/door/poddoor/P in world)
-			if(P.id == id)
-				doors += P
-
-/obj/machinery/computer/turbine_computer/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				M.id = src.id
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				M.id = src.id
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		src.attack_hand(user)
-	return
 
 /obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob)
-	user.machine = src
+	if(..())
+		return
+
+	interact(user)
+
+/obj/machinery/computer/turbine_computer/interact(mob/user)
+
 	var/dat
-	if(src.compressor)
+	if(compressor)
 		dat += {"<BR><B>Gas turbine remote control system</B><HR>
 		\nTurbine status: [ src.compressor.starter ? "<A href='?src=\ref[src];str=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=\ref[src];str=1'>On</A>"]
 		\n<BR>
 		\nTurbine speed: [src.compressor.rpm]rpm<BR>
 		\nPower currently being generated: [src.compressor.turbine.lastgen]W<BR>
 		\nInternal gas temperature: [src.compressor.gas_contained.temperature]K<BR>
-		\nVent doors: [ src.door_status ? "<A href='?src=\ref[src];doors=1'>Closed</A> <B>Open</B>" : "<B>Closed</B> <A href='?src=\ref[src];doors=1'>Open</A>"]
-		\n</PRE><HR><A href='?src=\ref[src];view=1'>View</A>
 		\n</PRE><HR><A href='?src=\ref[src];close=1'>Close</A>
 		\n<BR>
 		\n"}
 	else
 		dat += "\red<B>No compatible attached compressor found."
 
-	user << browse(dat, "window=computer;size=400x500")
-	onclose(user, "computer")
+	var/datum/browser/popup = new(user, "turbinecomputer", name)
+	popup.set_content(dat)
+	popup.open()
 	return
 
-
-
 /obj/machinery/computer/turbine_computer/Topic(href, href_list)
 	if(..())
 		return
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
-		usr.machine = src
 
-		if( href_list["view"] )
-			usr.client.eye = src.compressor
-		else if( href_list["str"] )
-			src.compressor.starter = !src.compressor.starter
-		else if (href_list["doors"])
-			for(var/obj/machinery/door/poddoor/D in src.doors)
-				if (door_status == 0)
-					spawn( 0 )
-						D.open()
-						door_status = 1
-				else
-					spawn( 0 )
-						D.close()
-						door_status = 0
-		else if( href_list["close"] )
-			usr << browse(null, "window=computer")
-			usr.machine = null
-			return
+	else if( href_list["str"] )
+		if(compressor)
+			compressor.starter = !compressor.starter
+	else if( href_list["close"] )
+		usr << browse(null, "window=turbinecomputer")
+		usr.unset_machine(src)
+		return
 
-		src.add_fingerprint(usr)
 	src.updateUsrDialog()
 	return
 
 /obj/machinery/computer/turbine_computer/process()
 	src.updateDialog()
-	return
+	return

code/modules/projectiles/ammunition/bullets.dm

@@ -99,6 +99,7 @@
 /obj/item/ammo_casing/shotgun/dart/New()
 	..()
 	flags |= NOREACT
+	flags |= OPENCONTAINER
 	create_reagents(30)
 
 /obj/item/ammo_casing/shotgun/dart/attackby()

code/modules/projectiles/guns/energy/special.dm

@@ -26,55 +26,6 @@
 	charge_cost = 100
 	projectile_type = "/obj/item/projectile/energy/declone"
 
-obj/item/weapon/gun/energy/staff
-	name = "staff of change"
-	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "staffofchange"
-	item_state = "staffofchange"
-	fire_sound = 'sound/weapons/emitter.ogg'
-	flags =  FPRINT | TABLEPASS | CONDUCT
-	slot_flags = SLOT_BACK
-	w_class = 5
-	charge_cost = 200
-	projectile_type = "/obj/item/projectile/change"
-	origin_tech = null
-	clumsy_check = 0
-	var/charge_tick = 0
-
-
-	New()
-		..()
-		processing_objects.Add(src)
-
-
-	Del()
-		processing_objects.Remove(src)
-		..()
-
-
-	process()
-		charge_tick++
-		if(charge_tick < 4) return 0
-		charge_tick = 0
-		if(!power_supply) return 0
-		power_supply.give(200)
-		return 1
-
-	update_icon()
-		return
-
-	shoot_with_empty_chamber(mob/living/user as mob|obj)
-		user << "<span class='warning'>The [name] whizzles quietly.<span>"
-		return
-
-/obj/item/weapon/gun/energy/staff/animate
-	name = "staff of animation"
-	desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."
-	projectile_type = "/obj/item/projectile/animate"
-	icon_state = "staffofanimation"
-	item_state = "staffofanimation"
-
 /obj/item/weapon/gun/energy/floragun
 	name = "floral somatoray"
 	desc = "A tool that discharges controlled radiation which induces mutation in plant cells."

code/modules/projectiles/guns/magic.dm

@@ -0,0 +1,53 @@
+/obj/item/weapon/gun/magic
+	name = "staff of nothing"
+	desc = "This staff is boring to watch because even though it came first you've seen everything it can do in other staves for years."
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "staffofnothing"
+	item_state = "staff"
+	fire_sound = 'sound/weapons/emitter.ogg'
+	flags =  FPRINT | TABLEPASS | CONDUCT
+	w_class = 5
+	var/projectile_type = "/obj/item/projectile/magic"
+	var/max_charges = 6
+	var/charges = 0
+	var/recharge_rate = 4
+	var/charge_tick = 0
+	var/can_charge = 1
+	origin_tech = null
+	clumsy_check = 0
+
+/obj/item/weapon/gun/magic/process_chambered()
+		if(in_chamber)	return 1
+		if(!charges)	return 0
+		if(!projectile_type)	return 0
+		in_chamber = new projectile_type(src)
+		return 1
+
+/obj/item/weapon/gun/magic/afterattack(atom/target as mob, mob/living/user as mob, flag)
+	..()
+	if(charges && !in_chamber && !flag)	charges--
+
+/obj/item/weapon/gun/magic/New()
+	..()
+	charges = max_charges
+	if(can_charge)	processing_objects.Add(src)
+
+
+/obj/item/weapon/gun/magic/Del()
+	if(can_charge)	processing_objects.Remove(src)
+	..()
+
+
+/obj/item/weapon/gun/magic/process()
+	charge_tick++
+	if(charge_tick < recharge_rate || charges >= max_charges) return 0
+	charge_tick = 0
+	charges++
+	return 1
+
+/obj/item/weapon/gun/magic/update_icon()
+	return
+
+/obj/item/weapon/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj)
+	user << "<span class='warning'>The [name] whizzles quietly.<span>"
+	return

code/modules/projectiles/guns/magic/staff.dm

@@ -0,0 +1,23 @@
+obj/item/weapon/gun/magic/staff/
+	slot_flags = SLOT_BACK
+
+obj/item/weapon/gun/magic/staff/change
+	name = "staff of change"
+	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
+	projectile_type = "/obj/item/projectile/magic/change"
+	icon_state = "staffofchange"
+	item_state = "staffofchange"
+
+obj/item/weapon/gun/magic/staff/animate
+	name = "staff of animation"
+	desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."
+	projectile_type = "/obj/item/projectile/magic/animate"
+	icon_state = "staffofanimation"
+	item_state = "staffofanimation"
+
+obj/item/weapon/gun/magic/staff/healing
+	name = "staff of healing"
+	desc = "An artefact that spits bolts of restoring magic which can remove ailments of all kinds and even raise the dead."
+	projectile_type = "/obj/item/projectile/magic/resurrection"
+	icon_state = "staffofhealing"
+	item_state = "staffofhealing"

code/modules/projectiles/guns/magic/wand.dm

@@ -0,0 +1,119 @@
+/obj/item/weapon/gun/magic/wand/
+	name = "wand of nothing"
+	desc = "It's not just a stick, it's a MAGIC stick!"
+	projectile_type = "/obj/item/projectile/magic"
+	icon_state = "wand6"
+	item_state = "wand"
+	w_class = 2
+	can_charge = 0
+	max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
+	var/variable_charges = 1
+
+/obj/item/weapon/gun/magic/wand/New()
+	if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges
+		if(prob(33))
+			max_charges = Ceiling(max_charges / 3)
+		else
+			max_charges = Ceiling(max_charges / 2)
+	..()
+
+/obj/item/weapon/gun/magic/wand/examine()
+	..()
+	usr << "Has [charges] charge\s remaining."
+	return
+
+/obj/item/weapon/gun/magic/wand/attack(atom/target as mob, mob/living/user as mob)
+	if(target == user)
+		return
+	..()
+
+/obj/item/weapon/gun/magic/wand/afterattack(atom/target as mob, mob/living/user as mob)
+	if(target == user)
+		if(charges)
+			zap_self(user)
+		else
+			user << "<span class='warning'>The [name] whizzles quietly.<span>"
+	else
+		..()
+
+/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user as mob)
+	user.visible_message("<span class='notice'>[user] zaps \himself with [src]!</span>")
+	playsound(user, fire_sound, 50, 1)
+	user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> zapped \himself with a <b>[src]</b>"
+
+/obj/item/weapon/gun/magic/wand/death
+	name = "wand of death"
+	desc = "This deadly wand overwhelms the victim's body with pure energy, slaying them without fail."
+	projectile_type = "/obj/item/projectile/magic/death"
+	icon_state = "wand4"
+	max_charges = 3 //3, 2, 2, 1
+
+/obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user as mob)
+	var/message ="<span class='warning'>You irradiate yourself with pure energy! "
+	message += pick("Do not pass go. Do not collect 200 zorkmids.</span>","You feel more confident in your spell casting skills.</span>","You Die...</span>","Do you want your possessions identified?</span>")
+	user << message
+	user.adjustOxyLoss(500)
+	charges--
+	..()
+
+/obj/item/weapon/gun/magic/wand/resurrection
+	name = "wand of resurrection"
+	desc = "This wand uses healing magics to heal and revive. They are rarely utilized within the Wizard Federation for some reason."
+	projectile_type = "/obj/item/projectile/magic/resurrection"
+	icon_state = "wand1"
+	max_charges = 3 //3, 2, 2, 1
+
+/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user as mob)
+	user.revive()
+	user << "<span class='notice'>You feel great!</span>"
+	charges--
+	..()
+
+/obj/item/weapon/gun/magic/wand/polymorph
+	name = "wand of polymorph"
+	desc = "This wand is attuned to chaos and will radically alter the victim's form."
+	projectile_type = "/obj/item/projectile/magic/change"
+	icon_state = "wand5"
+	max_charges = 10 //10, 5, 5, 4
+
+/obj/item/weapon/gun/magic/wand/polymorph/zap_self(mob/living/user as mob)
+	..() //because the user mob ceases to exists by the time wabbajack fully resolves
+	wabbajack(user)
+	charges--
+
+/obj/item/weapon/gun/magic/wand/teleport
+	name = "wand of teleportation"
+	desc = "This wand will wrench targets through space and time to move them somewhere else."
+	projectile_type = "/obj/item/projectile/magic/teleport"
+	icon_state = "wand3"
+	max_charges = 10 //10, 5, 5, 4
+
+/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user as mob)
+	do_teleport(user, user, 10)
+	var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+	smoke.set_up(10, 0, user.loc)
+	smoke.start()
+	charges--
+	..()
+
+/obj/item/weapon/gun/magic/wand/door
+	name = "wand of door creation"
+	desc = "This particular wand can create doors in any wall for the unscrupulous wizard who shuns teleportation magics."
+	projectile_type = "/obj/item/projectile/magic/door"
+	icon_state = "wand0"
+	max_charges = 20 //20, 10, 10, 7
+
+/obj/item/weapon/gun/magic/wand/door/zap_self()
+	return
+
+/obj/item/weapon/gun/magic/wand/fireball
+	name = "wand of fireball"
+	desc = "This wand shoots scorching balls of fire that explode into destructive flames."
+	projectile_type = "/obj/item/projectile/magic/fireball"
+	icon_state = "wand2"
+	max_charges = 8 //8, 4, 4, 3
+
+/obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user as mob)
+	explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
+	charges--
+	..()

code/modules/projectiles/guns/projectile.dm

@@ -11,7 +11,6 @@
 	var/obj/item/ammo_box/magazine/magazine
 	var/obj/item/ammo_casing/chambered = null // The round (not bullet) that is in the chamber.
 
-
 /obj/item/weapon/gun/projectile/New()
 	..()
 	magazine = new mag_type(src)
@@ -19,17 +18,22 @@
 	update_icon()
 	return
 
-/obj/item/weapon/gun/projectile/process_chambered()
+/obj/item/weapon/gun/projectile/process_chambered(var/eject_casing = 1, var/empty_chamber = 1)
 //	if(in_chamber)
 //		return 1
-
 	var/obj/item/ammo_casing/AC = chambered //Find chambered round
 	if(isnull(AC) || !istype(AC))
 		return 0
-	AC.loc = get_turf(src) //Eject casing onto ground.
-	chambered = null
+	if(eject_casing)
+		AC.loc = get_turf(src) //Eject casing onto ground.
+	if(empty_chamber)
+		chambered = null
 	chamber_round()
 	if(AC.BB)
+		if(AC.reagents && AC.BB.reagents)
+			var/datum/reagents/casting_reagents = AC.reagents
+			casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts/bullets
+			casting_reagents.delete()
 		in_chamber = AC.BB //Load projectile into chamber.
 		AC.BB.loc = src //Set projectile loc to gun.
 		AC.BB = null

code/modules/projectiles/guns/projectile/revolver.dm

@@ -13,18 +13,7 @@
 	return
 
 /obj/item/weapon/gun/projectile/revolver/process_chambered()
-	var/obj/item/ammo_casing/AC = chambered //Find chambered round
-	if(isnull(AC) || !istype(AC))
-		return 0
-	chambered = null
-	chamber_round()
-	if(AC.BB)
-		in_chamber = AC.BB //Load projectile into chamber.
-		AC.BB.loc = src //Set projectile loc to gun.
-		AC.BB = null
-		AC.update_icon()
-		return 1
-	return 0
+	return ..(0, 1)
 
 /obj/item/weapon/gun/projectile/revolver/attackby(var/obj/item/A as obj, mob/user as mob)
 	var/num_loaded = 0

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -35,21 +35,10 @@
 		update_icon()
 
 /obj/item/weapon/gun/projectile/shotgun/process_chambered()
-	var/obj/item/ammo_casing/AC = chambered //Find chambered round
-	if(isnull(AC) || !istype(AC))
-		return 0
-	if(AC.BB)
-		if(AC.reagents && AC.BB.reagents)
-			var/datum/reagents/casting_reagents = AC.reagents
-			casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts
-			casting_reagents.delete()
-		in_chamber = AC.BB //Load projectile into chamber.
-		AC.BB.loc = src //Set projectile loc to gun.
-		AC.BB = null
-		AC.update_icon()
-		return 1
-	return 0
+	return ..(0, 0)
 
+/obj/item/weapon/gun/projectile/shotgun/chamber_round()
+	return
 
 /obj/item/weapon/gun/projectile/shotgun/attack_self(mob/living/user)
 	if(recentpump)	return

code/modules/projectiles/projectile.dm

@@ -55,7 +55,7 @@
 		// Garbage collect the projectiles
 		loc = null
 
-	proc/on_hit(var/atom/target, var/blocked = 0)
+	proc/on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
 		if(blocked >= 2)		return 0//Full block
 		if(!isliving(target))	return 0
 		if(isanimal(target))	return 0
@@ -78,6 +78,12 @@
 				loc = A.loc
 				return 0// nope.avi
 
+			var/reagent_note
+			if(reagents && reagents.reagent_list)
+				reagent_note = " REAGENTS:"
+				for(var/datum/reagent/R in reagents.reagent_list)
+					reagent_note += R.id + " ("
+					reagent_note += num2text(R.volume) + ") "
 			var/distance = get_dist(get_turf(A), starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
 			def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
 			if(silenced)
@@ -85,14 +91,8 @@
 			else
 				M.visible_message("<span class='danger'>[M] is hit by [src] in the [parse_zone(def_zone)]!", \
 									"<span class='userdanger'>[M] is hit by [src] in the [parse_zone(def_zone)]!")	//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+			add_logs(firer, M, "shot", object="[src]", addition=reagent_note)
 
-			if(istype(firer, /mob))
-				M.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				firer.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				log_attack("<font color='red'>[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]</font>")
-			else
-				M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a [src]</font>")
 
 		spawn(0)
 			if(A)

code/modules/projectiles/projectile/bullets.dm

@@ -18,6 +18,7 @@
 	stun = 5
 	weaken = 5
 
+
 /obj/item/projectile/bullet/midbullet2
 	damage = 25
 
@@ -26,7 +27,6 @@
 	damage = 30
 
 
-
 /obj/item/projectile/bullet/suffocationbullet//How does this even work?
 	name = "co bullet"
 	damage = 20
@@ -51,10 +51,22 @@
 	weaken = 10
 	stutter = 10
 
+
 /obj/item/projectile/bullet/a762
 	damage = 25
 
 
+/obj/item/projectile/bullet/incendiary
+	name = "incendiary bullet"
+	damage = 20
+
+/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
+	if(istype(target, /mob/living/carbon))
+		var/mob/living/carbon/M = target
+		M.adjust_fire_stacks(1)
+		M.IgniteMob()
+
+
 /obj/item/projectile/bullet/dart
 	name = "dart"
 	icon_state = "cbbolt"
@@ -65,13 +77,14 @@
 		flags |= NOREACT
 		create_reagents(50)
 
-	on_hit(var/atom/target, var/blocked = 0)
+	on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
 		if(istype(target, /mob/living/carbon))
 			var/mob/living/carbon/M = target
-			reagents.trans_to(M, reagents.total_volume)
-		else
-			flags &= ~NOREACT
-			reagents.handle_reactions()
+			if(M.can_inject(target_zone = hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
+				reagents.trans_to(M, reagents.total_volume)
+				return 1
+		flags &= ~NOREACT
+		reagents.handle_reactions()
 		return 1
 
 /obj/item/projectile/bullet/dart/metalfoam

code/modules/projectiles/projectile/magic.dm

@@ -0,0 +1,223 @@
+/obj/item/projectile/magic
+	name = "bolt of nothing"
+	icon_state = "energy"
+	damage = 0
+	damage_type = OXY
+	nodamage = 1
+	flag = "magic"
+
+/obj/item/projectile/magic/death
+	name = "bolt of death"
+	icon_state = "pulse1_bl"
+	damage = 9001
+	damage_type = OXY
+	nodamage = 0
+	flag = "magic"
+
+/obj/item/projectile/magic/fireball
+	name = "bolt of fireball"
+	icon_state = "fireball"
+	damage = 25 //The spell fireball additionally does 20 burn, so the wand fireball is marginally less painful
+	damage_type = BRUTE
+	nodamage = 0
+	flag = "magic"
+
+/obj/item/projectile/magic/fireball/on_hit(var/target)
+	var/turf/T = get_turf(target)
+	explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
+
+/obj/item/projectile/magic/resurrection
+	name = "bolt of resurrection"
+	icon_state = "ion"
+	damage = 0
+	damage_type = OXY
+	nodamage = 1
+	flag = "magic"
+
+/obj/item/projectile/magic/resurrection/on_hit(var/mob/living/carbon/target)
+
+	if(istype(target,/mob))
+		var/old_stat = target.stat
+		target.revive()
+		target.suiciding = 0
+		if(!target.ckey)
+			for(var/mob/dead/observer/ghost in player_list)
+				if(target.real_name == ghost.real_name)
+					ghost.reenter_corpse()
+					break
+		if(old_stat != DEAD)
+			target << "<span class='notice'>You feel great!</span>"
+		else
+			target << "<span class='notice'>You rise with a start, you're alive!!!</span>"
+
+/obj/item/projectile/magic/teleport
+	name = "bolt of teleportation"
+	icon_state = "bluespace"
+	damage = 0
+	damage_type = OXY
+	nodamage = 1
+	flag = "magic"
+	var/inner_tele_radius = 0
+	var/outer_tele_radius = 6
+
+/obj/item/projectile/magic/teleport/on_hit(var/mob/target)
+	var/teleammount = 0
+	var/teleloc = target
+	if(!isturf(target))
+		teleloc = target.loc
+	for(var/atom/movable/stuff in teleloc)
+		if(!stuff.anchored && stuff.loc)
+			teleammount++
+			do_teleport(stuff, stuff, 10)
+			var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+			smoke.set_up(max(round(10 - teleammount),1), 0, stuff.loc) //Smoke drops off if a lot of stuff is moved for the sake of sanity
+			smoke.start()
+
+/obj/item/projectile/magic/door
+	name = "bolt of door creation"
+	icon_state = "energy"
+	damage = 0
+	damage_type = OXY
+	nodamage = 1
+	flag = "magic"
+
+/obj/item/projectile/magic/door/on_hit(var/atom/target)
+	var/atom/T = target.loc
+	if(isturf(target))
+		if(target.density)
+			new /obj/structure/mineral_door/wood(target)
+			target:ChangeTurf(/turf/simulated/floor/plating)
+	else if (isturf(T))
+		if(T.density)
+			new /obj/structure/mineral_door/wood(T)
+			T:ChangeTurf(/turf/simulated/floor/plating)
+
+/obj/item/projectile/magic/change
+	name = "bolt of change"
+	icon_state = "ice_1"
+	damage = 0
+	damage_type = BURN
+	nodamage = 1
+	flag = "magic"
+
+/obj/item/projectile/magic/change/on_hit(var/atom/change)
+	wabbajack(change)
+
+proc/wabbajack(mob/living/M)
+	if(istype(M))
+		if(istype(M, /mob/living) && M.stat != DEAD)
+			if(M.monkeyizing)	return
+			M.monkeyizing = 1
+			M.canmove = 0
+			M.icon = null
+			M.overlays.Cut()
+			M.invisibility = 101
+
+			if(istype(M, /mob/living/silicon/robot))
+				var/mob/living/silicon/robot/Robot = M
+				if(Robot.mmi)	del(Robot.mmi)
+			else
+				for(var/obj/item/W in M)
+					if(istype(W, /obj/item/weapon/implant))	//TODO: Carn. give implants a dropped() or something
+						del(W)
+						continue
+					W.layer = initial(W.layer)
+					W.loc = M.loc
+					W.dropped(M)
+
+			var/mob/living/new_mob
+
+			var/randomize = pick("monkey","robot","slime","xeno","human","animal")
+			switch(randomize)
+				if("monkey")
+					new_mob = new /mob/living/carbon/monkey(M.loc)
+					new_mob.universal_speak = 1
+				if("robot")
+					new_mob = new /mob/living/silicon/robot(M.loc)
+					new_mob.gender = M.gender
+					new_mob.invisibility = 0
+					new_mob.job = "Cyborg"
+					var/mob/living/silicon/robot/Robot = new_mob
+					Robot.mmi = new /obj/item/device/mmi(new_mob)
+					Robot.mmi.transfer_identity(M)	//Does not transfer key/client.
+				if("slime")
+					if(prob(50))		new_mob = new /mob/living/carbon/slime/adult(M.loc)
+					else				new_mob = new /mob/living/carbon/slime(M.loc)
+					new_mob.universal_speak = 1
+				if("xeno")
+					if(prob(50))
+						new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
+					else
+						new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
+					new_mob.universal_speak = 1
+
+					/*var/alien_caste = pick("Hunter","Sentinel","Drone","Larva")
+					switch(alien_caste)
+						if("Hunter")	new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
+						if("Sentinel")	new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
+						if("Drone")		new_mob = new /mob/living/carbon/alien/humanoid/drone(M.loc)
+						else			new_mob = new /mob/living/carbon/alien/larva(M.loc)
+					new_mob.universal_speak = 1*/
+				if("animal")
+					var/animal = pick("parrot","corgi","crab","pug","cat","carp","bear","mushroom","tomato","mouse","chicken","cow","lizard","chick")
+					switch(animal)
+						if("parrot")	new_mob = new /mob/living/simple_animal/parrot(M.loc)
+						if("corgi")		new_mob = new /mob/living/simple_animal/corgi(M.loc)
+						if("crab")		new_mob = new /mob/living/simple_animal/crab(M.loc)
+						if("pug")		new_mob = new /mob/living/simple_animal/pug(M.loc)
+						if("cat")		new_mob = new /mob/living/simple_animal/cat(M.loc)
+						if("carp")		new_mob = new /mob/living/simple_animal/hostile/carp(M.loc)
+						if("bear")		new_mob = new /mob/living/simple_animal/hostile/bear(M.loc)
+						if("mushroom")	new_mob = new /mob/living/simple_animal/mushroom(M.loc)
+						if("tomato")	new_mob = new /mob/living/simple_animal/tomato(M.loc)
+						if("mouse")		new_mob = new /mob/living/simple_animal/mouse(M.loc)
+						if("chicken")	new_mob = new /mob/living/simple_animal/chicken(M.loc)
+						if("cow")		new_mob = new /mob/living/simple_animal/cow(M.loc)
+						if("lizard")	new_mob = new /mob/living/simple_animal/lizard(M.loc)
+						else			new_mob = new /mob/living/simple_animal/chick(M.loc)
+						new_mob.universal_speak = 1
+				if("human")
+					new_mob = new /mob/living/carbon/human(M.loc)
+
+					var/datum/preferences/A = new()	//Randomize appearance for the human
+					A.copy_to(new_mob)
+
+					var/mob/living/carbon/human/H = new_mob
+					ready_dna(H)
+					if(H.dna)
+						H.dna.mutantrace = pick("lizard","golem","slime","plant","fly","shadow","adamantine","skeleton",8;"")
+						H.update_body()
+				else
+					return
+
+			for (var/obj/effect/proc_holder/spell/S in M.spell_list)
+				new_mob.spell_list += new S.type
+
+			new_mob.a_intent = "harm"
+			if(M.mind)
+				M.mind.transfer_to(new_mob)
+			else
+				new_mob.key = M.key
+
+			new_mob << "<B>Your form morphs into that of a [randomize].</B>"
+
+			del(M)
+			return new_mob
+
+/obj/item/projectile/magic/animate
+	name = "bolt of animation"
+	icon_state = "red_1"
+	damage = 0
+	damage_type = BURN
+	nodamage = 1
+	flag = "magic"
+
+/obj/item/projectile/magic/animate/Bump(var/atom/change)
+	. = ..()
+	if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
+		var/obj/O = change
+		new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
+	else if(istype(change, /mob/living/simple_animal/hostile/mimic/copy))
+		// Change our allegiance!
+		var/mob/living/simple_animal/hostile/mimic/copy/C = change
+		C.ChangeOwner(firer)

code/modules/reagents/Chemistry-Holder.dm

@@ -271,9 +271,9 @@ datum
 									feedback_add_details("chemical_reaction","[C.result]|[C.result_amount*multiplier]")
 									multiplier = max(multiplier, 1) //this shouldnt happen ...
 									add_reagent(C.result, C.result_amount*multiplier)
-								
+
 								var/list/seen = viewers(4, get_turf(my_atom))
-								
+
 								if(!istype(my_atom, /mob)) // No bubbling mobs
 									for(var/mob/M in seen)
 										M << "\blue \icon[my_atom] The solution begins to bubble."
@@ -284,7 +284,7 @@ datum
 									if(ME2.Uses <= 0) // give the notification that the slime core is dead
 										for(var/mob/M in seen)
 											M << "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction."
-											ME2.name = "used slime extract"
+											ME2.name = "\improper used slime extract"
 											ME2.desc = "This extract has been used up."
 
 								playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 80, 1)

code/modules/reagents/Chemistry-Machinery.dm

@@ -16,7 +16,7 @@
 	var/beaker = null
 	var/recharged = 0
 	var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine",
-	"sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron",
+	"sodium","aluminium","silicon","phosphorus","sulfur","chlorine","potassium","iron",
 	"copper","mercury","radium","water","ethanol","sugar","sacid")
 
 /obj/machinery/chem_dispenser/proc/recharge()
@@ -113,7 +113,7 @@
 	var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, ui_key)
 	if (!ui)
 		// the ui does not exist, so we'll create a new one
-		ui = new(user, src, ui_key, "chem_dispenser.tmpl", "Chem Dispenser 5000", 370, 585)
+		ui = new(user, src, ui_key, "chem_dispenser.tmpl", "Chem Dispenser 5000", 370, 590)
 		// When the UI is first opened this is the data it will use
 		ui.set_initial_data(data)
 		ui.open()
@@ -519,7 +519,8 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
 		if(!src.wait)
 			var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
 			if(B)
-
+				B.pixel_x = rand(-3, 3)
+				B.pixel_y = rand(-3, 3)
 				var/path = GetResistancesByIndex(text2num(href_list["create_vaccine"]))
 				var/vaccine_type = path
 				var/vaccine_name = "Unknown"
@@ -548,6 +549,8 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
 		if(!wait)
 			var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
 			B.icon_state = "bottle3"
+			B.pixel_x = rand(-3, 3)
+			B.pixel_y = rand(-3, 3)
 			var/type = GetVirusTypeByIndex(text2num(href_list["create_virus_culture"]))//the path is received as string - converting
 			var/datum/disease/D = null
 			if(!ispath(type))
@@ -567,7 +570,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
 			B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."
 			B.reagents.add_reagent("blood",20,data)
 			src.updateUsrDialog()
-			replicator_cooldown(1000)
+			replicator_cooldown(50)
 		else
 			src.temp_html = "The replicator is not ready yet."
 		src.updateUsrDialog()

code/modules/reagents/Chemistry-Reagents.dm

@@ -695,9 +695,9 @@ datum
 					if(!istype(T, /turf/space))
 						new /obj/effect/decal/cleanable/greenglow(T)
 
-		aluminum
-			name = "Aluminum"
-			id = "aluminum"
+		aluminium
+			name = "Aluminium"
+			id = "aluminium"
 			description = "A silvery white and ductile member of the boron group of chemical elements."
 			reagent_state = SOLID
 			color = "#A8A8A8" // rgb: 168, 168, 168

code/modules/reagents/Chemistry-Recipes.dm

@@ -53,7 +53,7 @@ datum
 			name = "Silicate"
 			id = "silicate"
 			result = "silicate"
-			required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
+			required_reagents = list("aluminium" = 1, "silicon" = 1, "oxygen" = 1)
 			result_amount = 3
 */
 		stoxin
@@ -102,7 +102,7 @@ datum
 			name = "Thermite"
 			id = "thermite"
 			result = "thermite"
-			required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1)
+			required_reagents = list("aluminium" = 1, "iron" = 1, "oxygen" = 1)
 			result_amount = 3
 
 		lexorin
@@ -316,7 +316,7 @@ datum
 			name = "Flash powder"
 			id = "flash_powder"
 			result = null
-			required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 )
+			required_reagents = list("aluminium" = 1, "potassium" = 1, "sulfur" = 1 )
 			result_amount = null
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/location = get_turf(holder.my_atom)
@@ -345,7 +345,7 @@ datum
 			name = "Napalm"
 			id = "napalm"
 			result = null
-			required_reagents = list("aluminum" = 1, "plasma" = 1, "sacid" = 1 )
+			required_reagents = list("aluminium" = 1, "plasma" = 1, "sacid" = 1 )
 			result_amount = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/turf/simulated/T = get_turf(holder.my_atom)
@@ -468,7 +468,7 @@ datum
 			id = "mixvirus"
 			result = "blood"
 			required_reagents = list("virusfood" = 5)
-			required_catalysts = list("blood")
+			required_catalysts = list("blood" = 5)
 			var/level_min = 0
 			var/level_max = 2
 
@@ -501,7 +501,8 @@ datum
 
 				name = "Devolve Virus"
 				id = "remvirus"
-				required_reagents = list("synaptizine" = 5)
+				required_reagents = list("synaptizine" = 1)
+				required_catalysts = list("blood" = 1)
 
 				on_reaction(var/datum/reagents/holder, var/created_volume)
 
@@ -558,7 +559,7 @@ datum
 			name = "Metal Foam"
 			id = "metalfoam"
 			result = null
-			required_reagents = list("aluminum" = 3, "foaming_agent" = 1, "pacid" = 1)
+			required_reagents = list("aluminium" = 3, "foaming_agent" = 1, "pacid" = 1)
 			result_amount = 5
 
 			on_reaction(var/datum/reagents/holder, var/created_volume)

code/modules/reagents/grenade_launcher.dm

@@ -57,9 +57,9 @@
 			F.loc = user.loc
 			F.throw_at(target, 30, 2)
 			message_admins("[key_name_admin(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
-			log_game("[key_name_admin(user)] used a grenade ([src.name]).")
+			log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
 			F.active = 1
 			F.icon_state = initial(icon_state) + "_active"
 			playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
 			spawn(15)
-				F.prime()
+				F.prime()

code/modules/reagents/reagent_containers/borghydro.dm

@@ -83,17 +83,16 @@ Borg Hypospray
 				R.cell.use(charge_cost) 					//Take power from borg...
 				RG.add_reagent(reagent_ids[mode], 5)		//And fill hypo with reagent.
 
-/obj/item/weapon/reagent_containers/borghypo/attack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/reagent_containers/borghypo/attack(mob/living/M as mob, mob/user as mob)
 	var/datum/reagents/R = reagent_list[mode]
 	if(!R.total_volume)
 		user << "<span class='notice'>The injector is empty.</span>"
 		return
-	if (!( istype(M, /mob) ))
+	if (!( istype(M) ))
 		return
-	if (R.total_volume)
-		user << "<span class='notice'>You inject [M] with the injector.</span>"
+	if (R.total_volume && M.can_inject(user, 1))
 		M << "<span class='warning'>You feel a tiny prick!</span>"
-
+		user << "<span class='notice'>You inject [M] with the injector.</span>"
 		R.reaction(M, INGEST)
 		if(M.reagents)
 			var/trans = R.trans_to(M, amount_per_transfer_from_this)

code/modules/reagents/reagent_containers/dropper.dm

@@ -63,9 +63,7 @@
 					for(var/datum/reagent/A in src.reagents.reagent_list)
 						R += A.id + " ("
 						R += num2text(A.volume) + "),"
-				user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> squirted <b>[M]/[M.ckey]</b> with ([R])"
-				M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> squirted <b>[M]/[M.ckey]</b> with ([R])"
-				log_attack("\[[time_stamp()]\] <b>[user]/[user.ckey]</b> squirted <b>[M]/[M.ckey]</b> with ([R])")
+				add_logs(user, M, "squirted", object="[R]")
 
 			trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
 			user << "<span class='notice'>You transfer [trans] unit\s of the solution.</span>"

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -42,12 +42,7 @@
 			if(!do_mob(user, M)) return
 			for(var/mob/O in viewers(world.view, user))
 				O.show_message("\red [user] feeds [M] [src].", 1)
-
-			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
-
-
-			log_attack("<font color='red'>[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
+			add_logs(user, M, "fed", object="[reagentlist(src)]")
 
 			if(reagents.total_volume)
 				reagents.reaction(M, INGEST)

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -42,13 +42,7 @@
 			if(!do_mob(user, M)) return
 			for(var/mob/O in viewers(world.view, user))
 				O.show_message("\red [user] feeds [M] [src].", 1)
-
-			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
-
-			log_attack("<font color='red'>[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
-
-
+			add_logs(user, M, "fed", object="[reagentlist(src)]")
 			if(reagents.total_volume)
 				reagents.reaction(M, INGEST)
 				spawn(5)
@@ -327,7 +321,7 @@
 	icon_state = "lemon-lime"
 	New()
 		..()
-		name = "Lemon-Lime"
+		name = "Lemon-Lime"
 		reagents.add_reagent("lemon_lime", 30)
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
@@ -381,4 +375,4 @@
 		..()
 		reagents.add_reagent("dr_gibb", 30)
 		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -97,9 +97,7 @@
 			else O.show_message(text("\red <B>[target] has attacked himself with a bottle of [src.name]!</B>"), 1)
 
 	//Attack logs
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has attacked [target.name] ([target.ckey]) with a bottle!</font>")
-	target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been smashed with a bottle by [user.name] ([user.ckey])</font>")
-	log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [target.name] with a bottle. ([target.ckey])</font>")
+	add_logs(user, target, "attacked", object="bottle")
 
 	//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
 	if(src.reagents)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -71,12 +71,7 @@
 					return 0
 
 				if(!do_mob(user, M)) return
-
-				M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
-				user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
-
-				log_attack("<font color='red'>[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
-
+				add_logs(user, M, "fed", object="[reagentlist(src)]")
 				M.visible_message("<span class='danger'>[user] forces [M] to eat [src].</span>", \
 									"<span class='userdanger'>[user] feeds [M] to eat [src].</span>")
 
@@ -996,7 +991,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
 	name = "space twinkie"
 	icon_state = "space_twinkie"
-	desc = "Guaranteed to survive longer then you will."
+	desc = "Guaranteed to survive longer than you will."
 	New()
 		..()
 		reagents.add_reagent("sugar", 4)
@@ -2427,4 +2422,4 @@
 		..()
 		reagents.add_reagent("nutriment", 2)
 		reagents.add_reagent("sugar", 5)
-		bitesize = 2
+		bitesize = 2

code/modules/reagents/reagent_containers/glass.dm

@@ -55,9 +55,7 @@
 				for(var/datum/reagent/A in reagents.reagent_list)
 					R += A.id + " ("
 					R += num2text(A.volume) + "),"
-			user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> splashed <b>[M]/[M.ckey]</b> with ([R])"
-			M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> splashed <b>[M]/[M.ckey]</b> with ([R])"
-			log_attack("\[[time_stamp()]\] <b>[user]/[user.ckey]</b> splashed <b>[M]/[M.ckey]</b> with ([R])")
+			add_logs(user, M, "splashed", object="[R]")
 			reagents.reaction(target, TOUCH)
 			spawn(5) reagents.clear_reagents()
 			return

code/modules/reagents/reagent_containers/hypospray.dm

@@ -9,6 +9,7 @@
 	possible_transfer_amounts = null
 	flags = FPRINT | TABLEPASS | OPENCONTAINER
 	slot_flags = SLOT_BELT
+	var/ignore_flags = 0
 
 /obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user)
 	return attack_hand(user)
@@ -19,15 +20,16 @@
 	reagents.add_reagent("doctorsdelight", 30)
 
 
-/obj/item/weapon/reagent_containers/hypospray/attack(mob/M, mob/user)
+/obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user)
 	if(!reagents.total_volume)
 		user << "<span class='notice'>[src] is empty.</span>"
 		return
-	if(!ismob(M))
+	if(!istype(M))
 		return
-	if(reagents.total_volume)
-		user << "<span class='notice'>You inject [M] with [src].</span>"
+
+	if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) // Ignore flag should be checked first or there will be an error message.
 		M << "<span class='warning'>You feel a tiny prick!</span>"
+		user << "<span class='notice'>You inject [M] with [src].</span>"
 
 		reagents.reaction(M, INGEST)
 		if(M.reagents)
@@ -40,10 +42,7 @@
 
 			var/contained = english_list(injected)
 
-			log_attack("<font color='red'>[user.name] ([user.ckey]) injected [M.name] ([M.ckey]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)])</font>")
-			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected ([contained]) with [src.name] by [user.name] ([user.ckey])</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to inject [M.name] ([M.ckey]) with [contained]</font>")
-
+			add_logs(user, M, "injected", object="[src.name]", addition="([contained])")
 
 /obj/item/weapon/reagent_containers/hypospray/combat
 	name = "combat stimulant injector"
@@ -51,6 +50,7 @@
 	amount_per_transfer_from_this = 10
 	icon_state = "combat_hypo"
 	volume = 60
+	ignore_flags = 1 // So they can heal their comrades.
 
 /obj/item/weapon/reagent_containers/hypospray/combat/New()
 	..()

code/modules/reagents/reagent_containers/pill.dm

@@ -41,12 +41,7 @@
 			M.visible_message("<span class='danger'>[user] forces [M] to swallow [src].</span>", \
 								"<span class='userdanger'>[user] forces [M] to swallow [src].</span>")
 
-
-			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [src.name] to [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
-
-
-			log_attack("<font color='red'>[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
+			add_logs(user, M, "fed", object="[reagentlist(src)]")
 
 			if(reagents.total_volume)
 				reagents.reaction(M, INGEST)

code/modules/reagents/reagent_containers/syringes.dm

@@ -44,6 +44,11 @@
 		if(!proximity) return
 		if(!target.reagents) return
 
+		if(isliving(target))
+			var/mob/living/M = target
+			if(!M.can_inject(user, 1))
+				return
+
 		switch(mode)
 			if(SYRINGE_DRAW)
 
@@ -122,7 +127,7 @@
 				if(istype(target, /obj/item/weapon/implantcase/chem))
 					return
 
-				if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/ammo_casing/shotgun/dart) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes))
+				if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes))
 					user << "<span class='notice'>You cannot directly fill [target].</span>"
 					return
 				if(target.reagents.total_volume >= target.reagents.maximum_volume)
@@ -141,10 +146,7 @@
 						rinject += R.name
 					var/contained = english_list(rinject)
 					var/mob/M = target
-					log_attack("<font color='red'>[user.name] ([user.ckey]) injected [M.name] ([M.ckey]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)])</font>")
-					M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected ([contained]) with [src.name] by [user.name] ([user.ckey])</font>")
-					user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to inject [M.name] ([M.ckey]) with [contained]</font>")
-
+					add_logs(user, M, "injected", object="[src.name]", addition="which had [contained]")
 					reagents.reaction(target, INGEST)
 				if(ismob(target) && target == user)
 					//Attack log entries are produced here due to failure to produce elsewhere. Remove them here if you have doubles from normal syringes.

code/modules/reagents/syringe_gun.dm

@@ -1,120 +1,67 @@
-
-
-
 /obj/item/weapon/gun/syringe
 	name = "syringe gun"
-	desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance."
-	icon = 'icons/obj/gun.dmi'
+	desc = "A spring loaded rifle designed to fit syringes, used to incapacitate unruly patients from a distance."
 	icon_state = "syringegun"
 	item_state = "syringegun"
-	w_class = 3.0
+	w_class = 3
 	throw_speed = 2
 	throw_range = 10
-	force = 4.0
-	var/list/syringes = new/list()
-	var/max_syringes = 1
+	force = 4
 	m_amt = 2000
+	clumsy_check = 0
+	fire_sound = 'sound/items/syringeproj.ogg'
+	var/list/syringes = list()
+	var/max_syringes = 1
 
-	examine()
-		set src in view()
-		..()
-		if(!(usr in view(2)) && usr != loc)
-			return
-		usr << "[syringes.len] / [max_syringes] syringes."
+/obj/item/weapon/gun/syringe/process_chambered()
+	if(!syringes.len) return 0
+	
+	var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
+	
+	if(!S) return 0
+	
+	in_chamber = new /obj/item/projectile/bullet/dart/syringe(src)
+	S.reagents.trans_to(in_chamber, S.reagents.total_volume)
+	in_chamber.name = S.name
+	syringes.Remove(S)
+	
+	del(S)
+	return 1
 
+/obj/item/weapon/gun/syringe/examine()
+	..()
+	usr << "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining."
+	return
 
-	attackby(obj/item/I, mob/user)
-		if(istype(I, /obj/item/weapon/reagent_containers/syringe))
-			if(syringes.len < max_syringes)
-				user.drop_item()
-				I.loc = src
-				syringes += I
-				user << "<span class='notice'>You put [I] in [src].</span>"
-				user << "<span class='notice'>[syringes.len] / [max_syringes] syringes.</span>"
-			else
-				usr << "<span class='notice'>[src] cannot hold more syringes.</span>"
+/obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob)
+	if(!syringes.len)
+		user << "<span class='notice'>[src] is empty.</span>"
+		return 0
+	
+	var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len]
+	
+	if(!S) return 0
+	S.loc = user.loc
+	
+	syringes.Remove(S)
+	user << "<span class = 'notice'>You unload [S] from \the [src]!</span>"
+	
+	return 1
 
-
-	afterattack(obj/target, mob/user , flag)
-		if(!isturf(target.loc) || target == user) return
-
-		if(syringes.len)
-			spawn(0) fire_syringe(target,user)
+/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, var/show_msg = 1)
+	if(istype(A, /obj/item/weapon/reagent_containers/syringe))
+		if(syringes.len < max_syringes)
+			user.drop_item()
+			user << "<span class='notice'>You load [A] into \the [src]!</span>"
+			syringes.Add(A)
+			A.loc = src
+			return 1
 		else
-			usr << "<span class='notice'>[src] is empty.</span>"
-
-
-	proc/fire_syringe(atom/target, mob/user)
-		if(locate (/obj/structure/table, src.loc))
-			return
-		else
-			var/turf/trg = get_turf(target)
-			var/obj/effect/syringe_gun_dummy/D = new /obj/effect/syringe_gun_dummy(get_turf(src))
-			var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
-			if(!S || !S.reagents)	//ho boy! wot runtimes!	//haha i love finding my old comments
-				return
-			S.reagents.trans_to(D, S.reagents.total_volume)
-			syringes -= S
-			del(S)
-			D.icon_state = "syringeproj"
-			D.name = "syringe"
-			playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
-
-			for(var/i=0, i<6, i++)
-				if(!D) break
-				if(D.loc == trg) break
-				step_towards(D,trg)
-
-				if(D)
-					for(var/mob/living/carbon/M in D.loc)
-						if(!istype(M,/mob/living/carbon)) continue
-						if(M == user) continue
-						//Syringe gun attack logging by Yvarov
-						var/R
-						if(D.reagents)
-							for(var/datum/reagent/A in D.reagents.reagent_list)
-								R += A.id + " ("
-								R += num2text(A.volume) + "),"
-						if(ismob(M))
-							M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])"
-							user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])"
-							log_attack("<font color='red'>[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R])</font>")
-						else
-							M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])"
-							log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a <b>syringegun</b> ([R])</font>")
-						if(D.reagents)
-							D.reagents.trans_to(M, 15)
-						M.visible_message("<span class='danger'>[M] is hit by the syringe!</span>", \
-											"<span class='userdanger'>[M] is hit by the syringe!</span>")
-
-						del(D)
-						break
-				if(D)
-					for(var/atom/A in D.loc)
-						if(A == user) continue
-						if(A.density) del(D)
-
-				sleep(1)
-
-			if(D)
-				spawn(10)
-					del(D)
-
+			usr << "<span class='notice'>[src] cannot hold more syringes.</span>"
+	return 0
 
 /obj/item/weapon/gun/syringe/rapidsyringe
 	name = "rapid syringe gun"
-	desc = "A modification of the syringe gun design, using a rotating cylinder to store up to four syringes."
+	desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
 	icon_state = "rapidsyringegun"
-	max_syringes = 4
-
-
-/obj/effect/syringe_gun_dummy
-	name = ""
-	desc = ""
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "null"
-	anchored = 1
-	density = 0
-
-	New()
-		create_reagents(15)
+	max_syringes = 6

code/modules/recycling/disposal.dm

@@ -1154,6 +1154,10 @@
 	if(istype(I, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/W = I
 
+		if(linked)
+			user << "You need to deconstruct disposal machinery above this pipe."
+			return
+
 		if(W.remove_fuel(0,user))
 			playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
 			// check if anything changed over 2 seconds
@@ -1168,6 +1172,7 @@
 				user << "You must stay still while welding the pipe."
 		else
 			user << "You need more welding fuel to cut the pipe."
+
 			return
 
 	// would transfer to next pipe segment, but we are in a trunk

code/modules/recycling/sortingmachinery.dm

@@ -117,7 +117,6 @@
 
 		user.attack_log += text("\[[time_stamp()]\] <font color='blue'>Has used [name] on \ref[target]</font>")
 
-
 		if(istype(target, /obj/item) && !(istype(target, /obj/item/weapon/storage) && !istype(target,/obj/item/weapon/storage/box)))
 			var/obj/item/O = target
 			if(amount > 1)

code/modules/research/circuitprinter.dm

@@ -52,19 +52,12 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 		if (shocked)
 			shock(user,50)
 		if (istype(O, /obj/item/weapon/screwdriver))
-			if (!opened)
-				opened = 1
-				if(linked_console)
-					linked_console.linked_imprinter = null
-					linked_console = null
-				icon_state = "circuit_imprinter_t"
-				user << "You open the maintenance hatch of [src]."
-			else
-				opened = 0
-				icon_state = "circuit_imprinter"
-				user << "You close the maintenance hatch of [src]."
+			if(linked_console)
+				linked_console.linked_imprinter = null
+				linked_console = null
+			default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter")
 			return
-		if (opened)
+		if (panel_open)
 			if(istype(O, /obj/item/weapon/crowbar))
 				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
 				var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)

code/modules/research/designs.dm

@@ -250,14 +250,23 @@ datum/design/clonescanner
 	materials = list("$glass" = 2000, "sacid" = 20)
 	build_path = "/obj/item/weapon/circuitboard/clonescanner"
 
-datum/design/arcademachine
-	name = "Circuit Design (Arcade Machine)"
+datum/design/arcadebattle
+	name = "Circuit Design (Battle Arcade Machine)"
 	desc = "Allows for the construction of circuit boards used to build a new arcade machine."
 	id = "arcademachine"
 	req_tech = list("programming" = 1)
 	build_type = IMPRINTER
 	materials = list("$glass" = 2000, "sacid" = 20)
-	build_path = "/obj/item/weapon/circuitboard/arcade"
+	build_path = "/obj/item/weapon/circuitboard/arcade/battle"
+
+datum/design/orion_trail
+	name = "Circuit Design (Orion Trail Arcade Machine)"
+	desc = "Allows for the construction of circuit boards used to build a new Orion Trail machine."
+	id = "arcademachine"
+	req_tech = list("programming" = 2)
+	build_type = IMPRINTER
+	materials = list("$glass" = 2000, "sacid" = 20)
+	build_path = "/obj/item/weapon/circuitboard/arcade/orion_trail"
 
 datum/design/powermonitor
 	name = "Circuit Design (Power Monitor)"

code/modules/research/destructive_analyzer.dm

@@ -44,27 +44,14 @@ Note: Must be placed within 3 tiles of the R&D Console
 	if (shocked)
 		shock(user,50)
 	if (istype(O, /obj/item/weapon/screwdriver))
-		if (!opened)
-			opened = 1
-			if(linked_console)
-				linked_console.linked_destroy = null
-				linked_console = null
-			icon_state = "d_analyzer_t"
-			user << "You open the maintenance hatch of [src]."
-		else
-			opened = 0
-			icon_state = "d_analyzer"
-			user << "You close the maintenance hatch of [src]."
+		if(linked_console)
+			linked_console.linked_destroy = null
+			linked_console = null
+		default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer")
 		return
-	if (opened)
+	if (panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
-			playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
-			var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
-			M.state = 2
-			M.icon_state = "box_1"
-			for(var/obj/I in component_parts)
-				I.loc = src.loc
-			del(src)
+			default_deconstruction_crowbar()
 			return 1
 		else
 			user << "\red You can't load the [src.name] while it's opened."

code/modules/research/protolathe.dm

@@ -57,30 +57,13 @@ Note: Must be placed west/left of and R&D console to function.
 	if (O.is_open_container())
 		return 1
 	if (istype(O, /obj/item/weapon/screwdriver))
-		if (!opened)
-			opened = 1
-			if(linked_console)
-				linked_console.linked_lathe = null
-				linked_console = null
-			icon_state = "protolathe_t"
-			user << "You open the maintenance hatch of [src]."
-		else
-			opened = 0
-			icon_state = "protolathe"
-			user << "You close the maintenance hatch of [src]."
+		if(linked_console)
+			linked_console.linked_lathe = null
+			linked_console = null
+		default_deconstruction_screwdriver(user, "protolathe_t", "protolathe")
 		return
-	if (opened)
+	if (panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
-			playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
-			var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
-			M.state = 2
-			M.icon_state = "box_1"
-			for(var/obj/I in component_parts)
-				if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
-					reagents.trans_to(I, reagents.total_volume)
-				if(I.reliability != 100 && crit_fail)
-					I.crit_fail = 1
-				I.loc = src.loc
 			if(m_amount >= 3750)
 				var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal(src.loc)
 				G.amount = round(m_amount / G.perunit)
@@ -108,7 +91,7 @@ Note: Must be placed west/left of and R&D console to function.
 			if(adamantine_amount >= 2000)
 				var/obj/item/stack/sheet/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine(src.loc)
 				G.amount = round(adamantine_amount / G.perunit)
-			del(src)
+			default_deconstruction_crowbar()
 			return 1
 		else
 			user << "\red You can't load the [src.name] while it's opened."

code/modules/research/rdconsole.dm

@@ -99,7 +99,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 /obj/machinery/computer/rdconsole/proc/SyncRDevices() //Makes sure it is properly sync'ed up with the devices attached to it (if any).
 	for(var/obj/machinery/r_n_d/D in oview(3,src))
-		if(D.linked_console != null || D.disabled || D.opened)
+		if(D.linked_console != null || D.disabled || D.panel_open)
 			continue
 		if(istype(D, /obj/machinery/r_n_d/destructive_analyzer))
 			if(linked_destroy == null)