Merge pull request #11649 from Baystation12/master

Dev-freeze

code/game/machinery/camera/camera.dm

@@ -145,7 +145,6 @@
 				assembly.camera_network = english_list(network, "Exodus", ",", ",")
 				assembly.update_icon()
 				assembly.dir = src.dir
-				assembly = null //so qdel doesn't eat it.
 				if(stat & BROKEN)
 					assembly.state = 2
 					user << "<span class='notice'>You repaired \the [src] frame.</span>"
@@ -153,6 +152,7 @@
 					assembly.state = 1
 					user << "<span class='notice'>You cut \the [src] free from the wall.</span>"
 					new /obj/item/stack/cable_coil(src.loc, length=2)
+				assembly = null //so qdel doesn't eat it.
 			qdel(src)
 
 	// OTHER

code/modules/client/preferences_gear.dm

@@ -18,7 +18,17 @@ var/global/list/gear_datums = list()
 
 	//create a list of gear datums to sort
 	for(var/type in typesof(/datum/gear)-/datum/gear)
-		var/datum/gear/G = new type()
+		var/datum/gear/G = type
+		if(!initial(G.display_name))
+			error("Loadout - Missing display name: [G]")
+			continue
+		if(!initial(G.cost))
+			error("Loadout - Missing cost: [G]")
+			continue
+		if(!initial(G.path))
+			error("Loadout - Missing path definition: [G]")
+			continue
+		G = new G()
 
 		var/category = (G.sort_category in sort_categories)? G.sort_category : "unknown"
 		sort_categories[category][G.display_name] = G
@@ -127,13 +137,13 @@ var/global/list/gear_datums = list()
 	cost = 1
 	slot = slot_head
 
- /datum/gear/grcap
+/datum/gear/grcap
 	display_name = "cap, grey"
 	path = /obj/item/clothing/head/soft/grey
 	cost = 1
 	slot = slot_head
 
- /datum/gear/ocap
+/datum/gear/ocap
 	display_name = "cap, orange"
 	path = /obj/item/clothing/head/soft/orange
 	cost = 1
@@ -205,7 +215,7 @@ var/global/list/gear_datums = list()
 	cost = 1
 	slot = slot_head
 
- /datum/gear/bowler
+/datum/gear/bowler
 	display_name = "hat, bowler"
 	path = /obj/item/clothing/head/bowler
 	cost = 1

code/modules/clothing/spacesuits/rig/modules/ninja.dm

@@ -121,6 +121,11 @@
 
 	if(T.contains_dense_objects())
 		H << "<span class='warning'>You cannot teleport to a location with solid objects.</span>"
+		return 0
+
+	if(T.z != H.z || get_dist(T, get_turf(H)) > world.view)
+		H << "<span class='warning'>You cannot teleport to such a distant object.</span>"
+		return 0
 
 	phase_out(H,get_turf(H))
 	H.forceMove(T)

config/names/ai.txt

@@ -1,147 +1,55 @@
-1-Rover-1
-16-20
-7-Zark-7
-790
-AM
-AMEE
-ASTAR
-Adaptive Manipulator
-Allied Mastercomputer
-Alpha 5
-Alpha 6
-Alpha 7
-AmigoBot
-Android
-Aniel
-Asimov
-Astor
+A-SYNC
+Alpha v0.9
+AI
+Algebra
+A.P.T.
 B-4
 B-9
-B.O.B.
-B166ER
-Bender
-Bishop
-Blitz
-Box
-Brackenridge
-C-3PO
-Cassandra One
-Cell
-Chii
-Chip
-Computer
-Conky 2000
-Cutie
-Data
-Dee Model
-Deep Thought
-Dor-15
-Dorfl
-Dot Matrix
-Duey
-E.D.I.
-ED-209
-E-Man
-Emma-2
-Erasmus
-Ez-27
-FRIEND COMPUTER
-Fagor
-Faith
-Fi
-Frost
-Fum
-Futura
-G2
-George
-Gnut
-Gort
-H.A.R.L.I.E.
-H.E.L.P.eR.
-H.E.R.B.I.E.
-HAL 9000
-Hadaly
-Huey
-Irona
-Jay-Dub
-Jinx
-Johnny 5
-K-9
-KITT
-Klapaucius
-Kryten 2X4B-523P
-L-76
-L-Ron
-LUH 3417
-Louie
-MARK13
-Maria
-Marvin
-Master Control Program
-Max 404
-Maximillian
-Mechagodzilla
-Mechani-Kong
-Metalhead
-Mr. R.I.N.G.
-NCH
-Necron-99
-Norby
-OMM 0910
-Orange v 3.5
+Beta v0.5
+BLUE-PRNT
+Bright
+B.U.F.F.E.R.
+CALC
+Calculus
+Chroot
+Cruiser
+D-LITE
+Digit
+DSTAR
+E.X.E.C.
+F.I.N.D.
+FG-N1
+Force
+GREP
+H.E.A.D.
+Idle
+IN-2
+JLT-0
+Kernel
+LC-8
+LS-AL
+M.A.K.E.
+NAN
+NAND
+Neon
+Neumann
+NOR
+NOT
+OMNI
+OVR-FLW
+PID-0
 PTO
-Project 2501
-R.I.C. 2.0
-R2-D2
-R4-P17
-Revelation
-Ro-Man
-Robbie
-S.A.M.
-S.H.O.C.K.
-S.H.R.O.U.D.
-S.O.P.H.I.E.
-SEN 5241
-SHODAN
-SID 6.7
-Setaur
-Shrike
-Solo
-Speedy
-Super 17
-Surgeon General Kraken
-T-1000
-T-800
-T-850
-THX 1138
-TWA
-Terminus
-Tidy
-Tik-Tok
-Tobor
-Trurl
-ULTRABOT
-Ulysses
-Uniblab
-V.I.N.CENT.
-Voltes V
-W1k1
-Wikipedia
-Windows 3.1
-X-5
-XERXES
-XR
-Yod
-Z-1
-Z-2
-Z-3
-Zed
-Zord
-Mugsy3000
-Terminus
-Decimus
-Robot Devil
-Optimus
-Megatron
-Soundwave
-Ironhide
+PWR-10K
+R0-MAN
+Q-TE
+R.M.
+SED-N
+Station
+TA-IL
+T.O.P.
+U-TM
+VER-T G0
+Wisdom
+XOR
+Y2K
+ZE-M3

config/names/death_commando.txt

@@ -66,5 +66,4 @@ Duke Killington
 AMERICA
 Toolboxl Rose
 Zombie Gandhi
-A whole bunch of spiders in a SWAT suit
-THAT DAMN FAGGOT TRAITOR GEORGE MELONS
+A whole bunch of spiders in a SWAT suit