Merge branch 'master' into dev

Conflicts:
	code/modules/mob/say.dm

README.md

@@ -58,6 +58,12 @@ When you have done this, you'll need to recompile the code, but then it should w
 
 ---
 
+### Configuration
+
+For a basic setup, simply copy every file from config/example to config.
+
+---
+
 ### SQL Setup
 
 The SQL backend for the library and stats tracking requires a MySQL server.  Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql.  More detailed setup instructions arecoming soon, for now ask in our IRC channel.

code/game/machinery/computer/HolodeckControl.dm

@@ -231,8 +231,10 @@
 	emergencyShutdown()
 	..()
 
-
 /obj/machinery/computer/HolodeckControl/process()
+	for(var/item in holographic_items) // do this first, to make sure people don't take items out when power is down.
+		if(!(get_turf(item) in linkedholodeck))
+			derez(item, 0)
 
 	if(!..())
 		return
@@ -256,13 +258,6 @@
 				T.ex_act(3)
 				T.hotspot_expose(1000,500,1)
 
-
-		for(var/item in holographic_items)
-			if(!(get_turf(item) in linkedholodeck))
-				derez(item, 0)
-
-
-
 /obj/machinery/computer/HolodeckControl/proc/derez(var/obj/obj , var/silent = 1)
 	holographic_items.Remove(obj)
 

code/modules/mob/say.dm

@@ -82,8 +82,12 @@
 			return 1
 		else
 			return 0
-	//Sharing a type implies understanding.
-	else if (istype(other, src.type) || istype(src.type, other))
+
+	else if(other.universal_speak || src.universal_speak)
+		return 1
+	else if(isAI(src) && ispAI(other))
+		return 1
+	else if (istype(other, src.type) || istype(src, other.type))
 		return 1
 	return 0
 

code/modules/organs/organ_external.dm

@@ -467,25 +467,29 @@
 					organ= new /obj/item/weapon/organ/l_arm(owner.loc, owner)
 			if(LEG_RIGHT)
 				if(status & ORGAN_ROBOT)
-					organ = new /obj/item/robot_parts/l_leg(owner.loc)
+					organ = new /obj/item/robot_parts/r_leg(owner.loc)
 				else
 					organ= new /obj/item/weapon/organ/r_leg(owner.loc, owner)
 			if(LEG_LEFT)
 				if(status & ORGAN_ROBOT)
-					organ = new /obj/item/robot_parts/r_leg(owner.loc)
+					organ = new /obj/item/robot_parts/l_leg(owner.loc)
 				else
 					organ= new /obj/item/weapon/organ/l_leg(owner.loc, owner)
 			if(HAND_RIGHT)
-				organ= new /obj/item/weapon/organ/r_hand(owner.loc, owner)
+				if(!(status & ORGAN_ROBOT))
+					organ= new /obj/item/weapon/organ/r_hand(owner.loc, owner)
 				owner.u_equip(owner.gloves)
 			if(HAND_LEFT)
-				organ= new /obj/item/weapon/organ/l_hand(owner.loc, owner)
+				if(!(status & ORGAN_ROBOT))
+					organ= new /obj/item/weapon/organ/l_hand(owner.loc, owner)
 				owner.u_equip(owner.gloves)
 			if(FOOT_RIGHT)
-				organ= new /obj/item/weapon/organ/r_foot/(owner.loc, owner)
+				if(!(status & ORGAN_ROBOT))
+					organ= new /obj/item/weapon/organ/r_foot/(owner.loc, owner)
 				owner.u_equip(owner.shoes)
 			if(FOOT_LEFT)
-				organ = new /obj/item/weapon/organ/l_foot(owner.loc, owner)
+				if(!(status & ORGAN_ROBOT))
+					organ = new /obj/item/weapon/organ/l_foot(owner.loc, owner)
 				owner.u_equip(owner.shoes)
 		if(organ)
 			destspawn = 1

config/README feedback.txt

@@ -1,30 +0,0 @@
-Create a databse at the same location where the server MySQL databse is. (as defined in config/dbconfig.txt under ADDRESS and PORT) It can be a separate database or the same one, as you wish. Create the following table in it: (name needs to remain as 'erro_feedback')
- 
-
-CREATE TABLE IF NOT EXISTS `erro_feedback` (
-
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-
-  `time` datetime NOT NULL,
-
-  `round_id` int(8) NOT NULL,
-
-  `var_name` varchar(32) NOT NULL,
-
-  `var_value` int(16) DEFAULT NULL,
-
-  `details` text,
-
-  PRIMARY KEY (`id`)
-
-);
-
- 
-
-Open the file config/dbconfig.txt and edit the following lines:
-
-FEEDBACK_DATABASE test
-
-FEEDBACK_LOGIN mylogin
-
-FEEDBACK_PASSWORD mypassword

config/custom_sprites.txt

@@ -1,5 +0,0 @@
-rowtree-Lucy
-sydrec-SINA
-ravensdale-Blunt
-ravensdale-Skuld
-serithi-REMNANT

config/example/custom_items.txt

@@ -0,0 +1 @@
+ckey: name: /path/to/obj

config/example/custom_sprites.txt

@@ -0,0 +1 @@
+ckey-state

config/motd help.txt

@@ -1 +0,0 @@
-Most valid html will work in motd.txt (excluding imgs)

maps/tgstation2.dmm

@@ -1554,7 +1554,7 @@
 "aDT" = (/obj/structure/table,/obj/item/weapon/paper/pamphlet,/turf/simulated/floor,/area/gateway)
 "aDU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/gateway)
 "aDV" = (/obj/structure/table,/obj/item/device/radio/off{pixel_y = 6},/obj/item/device/radio/off{pixel_x = 6; pixel_y = 4},/obj/item/device/radio/off{pixel_x = -6; pixel_y = 4},/obj/item/device/radio/off,/turf/simulated/floor,/area/gateway)
-"aDW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table,/obj/machinery/recharger{pixel_y = 29},/obj/structure/sign/biohazard{pixel_x = 32},/turf/simulated/floor,/area/gateway)
+"aDW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table,/obj/machinery/recharger{pixel_y = 0},/obj/structure/sign/biohazard{pixel_x = 32},/turf/simulated/floor,/area/gateway)
 "aDX" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/fpmaint)
 "aDY" = (/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva)
 "aDZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva)