Renames a bunch of variables; prevents possible exploit

code/__HELPERS/global_lists.dm

@@ -55,7 +55,7 @@
 	init_subtypes(/datum/pipes/atmospheric, temp_pipe_list)
 	init_subtypes(/datum/pipes/disposal, temp_pipe_list)
 	for(var/datum/pipes/P in temp_pipe_list) //Yes I know the list(list(...)) thing looks weird, but it allows us to group pipe metadata into ordered lists instead of being one big list
-		GLOB.construction_pipe_list += list(list("pipename" = P.pipename, "pipeid" = P.pipeid, "atmosordisposals" = P.pipetype, "category" = P.category, "orientations" = P.orientations, "icon" = P.previewicon, "bendy" = P.bendy))
+		GLOB.construction_pipe_list += list(list("pipe_name" = P.pipe_name, "pipe_id" = P.pipe_id, "pipe_type" = P.pipe_type, "pipe_category" = P.pipe_category, "orientations" = P.orientations, "pipe_icon" = P.pipe_icon, "bendy" = P.bendy))
 
 	return 1
 

code/datums/pipe_datums.dm

@@ -6,308 +6,308 @@
 GLOBAL_LIST_EMPTY(construction_pipe_list)	//List of all pipe datums
 
 /datum/pipes
-	var/pipename //What the pipe is called in the interface
-	var/pipeid //Use the pipe define for this
-	var/pipetype //Atmos, disposals etc.
-	var/category //What category of pipe
+	var/pipe_name //What the pipe is called in the interface
+	var/pipe_id //Use the pipe define for this
+	var/pipe_type //Atmos, disposals etc.
+	var/pipe_category //What category of pipe
 	var/bendy = FALSE//Is this pipe bendy?
 	var/orientations //Number of orientations (for interface purposes)
-	var/previewicon //icon_state of the dispensed pipe (for interface purposes)
+	var/pipe_icon //icon_state of the dispensed pipe (for interface purposes)
 
 /datum/pipes/atmospheric
-	pipetype = RPD_ATMOS
-	category = RPD_ATMOS_PIPING
+	pipe_type = RPD_ATMOS
+	pipe_category = RPD_ATMOS_PIPING
 
 /datum/pipes/disposal
-	pipetype = RPD_DISPOSAL
+	pipe_type = RPD_DISPOSAL
 
 //Normal pipes
 
 /datum/pipes/atmospheric/simple
-	pipename = "Straight pipe"
-	pipeid = PIPE_SIMPLE_STRAIGHT
+	pipe_name = "Straight pipe"
+	pipe_id = PIPE_SIMPLE_STRAIGHT
 	orientations = 2
-	previewicon = "simple"
+	pipe_icon = "simple"
 
 /datum/pipes/atmospheric/bent //Why is this not atmospheric/simple/bent you ask? Because otherwise the ordering of the pipes in the UI menu gets weird
-	pipename = "Bent pipe"
-	pipeid = PIPE_SIMPLE_BENT
+	pipe_name = "Bent pipe"
+	pipe_id = PIPE_SIMPLE_BENT
 	orientations = 4
 	bendy = TRUE
-	previewicon = "simple"
+	pipe_icon = "simple"
 
 /datum/pipes/atmospheric/manifold
-	pipename = "T-manifold"
-	pipeid = PIPE_MANIFOLD
+	pipe_name = "T-manifold"
+	pipe_id = PIPE_MANIFOLD
 	orientations = 4
-	previewicon = "manifold"
+	pipe_icon = "manifold"
 
 /datum/pipes/atmospheric/manifold4w
-	pipename = "4-way manifold"
-	pipeid = PIPE_MANIFOLD4W
+	pipe_name = "4-way manifold"
+	pipe_id = PIPE_MANIFOLD4W
 	orientations = 1
-	previewicon = "manifold4w"
+	pipe_icon = "manifold4w"
 
 /datum/pipes/atmospheric/cap
-	pipename = "Pipe cap"
-	pipeid = PIPE_CAP
+	pipe_name = "Pipe cap"
+	pipe_id = PIPE_CAP
 	orientations = 4
-	previewicon = "cap"
+	pipe_icon = "cap"
 
 /datum/pipes/atmospheric/valve
-	pipename = "Manual valve"
-	pipeid = PIPE_MVALVE
+	pipe_name = "Manual valve"
+	pipe_id = PIPE_MVALVE
 	orientations = 2
-	previewicon = "mvalve"
+	pipe_icon = "mvalve"
 
 /datum/pipes/atmospheric/valve/digital
-	pipename = "Digital valve"
-	pipeid = PIPE_DVALVE
-	previewicon = "dvalve"
+	pipe_name = "Digital valve"
+	pipe_id = PIPE_DVALVE
+	pipe_icon = "dvalve"
 
 /datum/pipes/atmospheric/tvalve
-	pipename = "Manual T-valve"
-	pipeid = PIPE_TVALVE
+	pipe_name = "Manual T-valve"
+	pipe_id = PIPE_TVALVE
 	orientations = 4
-	previewicon = "tvalve"
+	pipe_icon = "tvalve"
 
 /datum/pipes/atmospheric/tvalve/digital
-	pipename = "Digital T-valve"
-	pipeid = PIPE_DTVALVE
-	previewicon = "dtvalve"
+	pipe_name = "Digital T-valve"
+	pipe_id = PIPE_DTVALVE
+	pipe_icon = "dtvalve"
 
 //Supply pipes
 
 /datum/pipes/atmospheric/simple/supply
-	pipename = "Straight supply pipe"
-	pipeid = PIPE_SUPPLY_STRAIGHT
-	category = RPD_SUPPLY_PIPING
+	pipe_name = "Straight supply pipe"
+	pipe_id = PIPE_SUPPLY_STRAIGHT
+	pipe_category = RPD_SUPPLY_PIPING
 
 /datum/pipes/atmospheric/bent/supply
-	pipename = "Bent supply pipe"
-	pipeid = PIPE_SUPPLY_BENT
-	category = RPD_SUPPLY_PIPING
+	pipe_name = "Bent supply pipe"
+	pipe_id = PIPE_SUPPLY_BENT
+	pipe_category = RPD_SUPPLY_PIPING
 
 /datum/pipes/atmospheric/manifold/supply
-	pipename = "Supply T-manifold"
-	pipeid = PIPE_SUPPLY_MANIFOLD
-	category = RPD_SUPPLY_PIPING
+	pipe_name = "Supply T-manifold"
+	pipe_id = PIPE_SUPPLY_MANIFOLD
+	pipe_category = RPD_SUPPLY_PIPING
 
 /datum/pipes/atmospheric/manifold4w/supply
-	pipename = "4-way supply manifold"
-	pipeid = PIPE_SUPPLY_MANIFOLD4W
-	category = RPD_SUPPLY_PIPING
+	pipe_name = "4-way supply manifold"
+	pipe_id = PIPE_SUPPLY_MANIFOLD4W
+	pipe_category = RPD_SUPPLY_PIPING
 
 /datum/pipes/atmospheric/cap/supply
-	pipename = "Supply pipe cap"
-	pipeid = PIPE_SUPPLY_CAP
-	category = RPD_SUPPLY_PIPING
+	pipe_name = "Supply pipe cap"
+	pipe_id = PIPE_SUPPLY_CAP
+	pipe_category = RPD_SUPPLY_PIPING
 
 //Scrubbers pipes
 
 /datum/pipes/atmospheric/simple/scrubbers
-	pipename = "Straight scrubbers pipe"
-	pipeid = PIPE_SCRUBBERS_STRAIGHT
-	category = RPD_SCRUBBERS_PIPING
+	pipe_name = "Straight scrubbers pipe"
+	pipe_id = PIPE_SCRUBBERS_STRAIGHT
+	pipe_category = RPD_SCRUBBERS_PIPING
 
 /datum/pipes/atmospheric/bent/scrubbers
-	pipename = "Bent scrubbers pipe"
-	pipeid = PIPE_SCRUBBERS_BENT
-	category = RPD_SCRUBBERS_PIPING
+	pipe_name = "Bent scrubbers pipe"
+	pipe_id = PIPE_SCRUBBERS_BENT
+	pipe_category = RPD_SCRUBBERS_PIPING
 
 /datum/pipes/atmospheric/manifold/scrubbers
-	pipename = "Scrubbers T-manifold"
-	pipeid = PIPE_SCRUBBERS_MANIFOLD
-	category = RPD_SCRUBBERS_PIPING
+	pipe_name = "Scrubbers T-manifold"
+	pipe_id = PIPE_SCRUBBERS_MANIFOLD
+	pipe_category = RPD_SCRUBBERS_PIPING
 
 /datum/pipes/atmospheric/manifold4w/scrubbers
-	pipename = "4-way scrubbers manifold"
-	pipeid = PIPE_SCRUBBERS_MANIFOLD4W
-	category = RPD_SCRUBBERS_PIPING
+	pipe_name = "4-way scrubbers manifold"
+	pipe_id = PIPE_SCRUBBERS_MANIFOLD4W
+	pipe_category = RPD_SCRUBBERS_PIPING
 
 /datum/pipes/atmospheric/cap/scrubbers
-	pipename = "Scrubbers pipe cap"
-	pipeid = PIPE_SCRUBBERS_CAP
-	category = RPD_SCRUBBERS_PIPING
+	pipe_name = "Scrubbers pipe cap"
+	pipe_id = PIPE_SCRUBBERS_CAP
+	pipe_category = RPD_SCRUBBERS_PIPING
 
 //Devices
 
 /datum/pipes/atmospheric/upa
-	pipename = "Universal pipe adapter"
-	pipeid = PIPE_UNIVERSAL
+	pipe_name = "Universal pipe adapter"
+	pipe_id = PIPE_UNIVERSAL
 	orientations = 2
-	previewicon = "universal"
-	category = RPD_DEVICES
+	pipe_icon = "universal"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/connector
-	pipename = "Connector"
-	pipeid = PIPE_CONNECTOR
+	pipe_name = "Connector"
+	pipe_id = PIPE_CONNECTOR
 	orientations = 4
-	previewicon = "connector"
-	category = RPD_DEVICES
+	pipe_icon = "connector"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/unaryvent
-	pipename = "Unary vent"
-	pipeid = PIPE_UVENT
+	pipe_name = "Unary vent"
+	pipe_id = PIPE_UVENT
 	orientations = 4
-	previewicon = "uvent"
-	category = RPD_DEVICES
+	pipe_icon = "uvent"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/scrubber
-	pipename = "Scrubber"
-	pipeid = PIPE_SCRUBBER
+	pipe_name = "Scrubber"
+	pipe_id = PIPE_SCRUBBER
 	orientations = 4
-	previewicon = "scrubber"
-	category = RPD_DEVICES
+	pipe_icon = "scrubber"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/pump
-	pipename = "Gas pump"
-	pipeid = PIPE_PUMP
+	pipe_name = "Gas pump"
+	pipe_id = PIPE_PUMP
 	orientations = 4
-	previewicon = "pump"
-	category = RPD_DEVICES
+	pipe_icon = "pump"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/volume_pump
-	pipename = "Volume pump"
-	pipeid = PIPE_VOLUME_PUMP
+	pipe_name = "Volume pump"
+	pipe_id = PIPE_VOLUME_PUMP
 	orientations = 4
-	previewicon = "volumepump"
-	category = RPD_DEVICES
+	pipe_icon = "volumepump"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/gate
-	pipename = "Passive gate"
-	pipeid = PIPE_PASSIVE_GATE
+	pipe_name = "Passive gate"
+	pipe_id = PIPE_PASSIVE_GATE
 	orientations = 4
-	previewicon = "passivegate"
-	category = RPD_DEVICES
+	pipe_icon = "passivegate"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/filter
-	pipename = "Gas filter"
-	pipeid = PIPE_GAS_FILTER
+	pipe_name = "Gas filter"
+	pipe_id = PIPE_GAS_FILTER
 	orientations = 4
-	previewicon = "filter"
-	category = RPD_DEVICES
+	pipe_icon = "filter"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/mixer
-	pipename = "Gas mixer"
-	pipeid = PIPE_GAS_MIXER
+	pipe_name = "Gas mixer"
+	pipe_id = PIPE_GAS_MIXER
 	orientations = 4
-	previewicon = "mixer"
-	category = RPD_DEVICES
+	pipe_icon = "mixer"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/sensor
-	pipename = "Gas sensor"
-	pipeid = PIPE_GAS_SENSOR
+	pipe_name = "Gas sensor"
+	pipe_id = PIPE_GAS_SENSOR
 	orientations = 1
-	previewicon = "sensor"
-	category = RPD_DEVICES
+	pipe_icon = "sensor"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/meter
-	pipename = "Gas meter"
-	pipeid = PIPE_METER
+	pipe_name = "Gas meter"
+	pipe_id = PIPE_METER
 	orientations = 1
-	previewicon = "meter"
-	category = RPD_DEVICES
+	pipe_icon = "meter"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/passive_vent
-	pipename = "Passive vent"
-	pipeid = PIPE_PASV_VENT
+	pipe_name = "Passive vent"
+	pipe_id = PIPE_PASV_VENT
 	orientations = 4
-	previewicon = "passive vent"
-	category = RPD_DEVICES
+	pipe_icon = "passive vent"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/dual_vent_pump
-	pipename = "Dual-port vent pump"
-	pipeid = PIPE_DP_VENT
+	pipe_name = "Dual-port vent pump"
+	pipe_id = PIPE_DP_VENT
 	orientations = 2
-	previewicon = "dual-port vent"
-	category = RPD_DEVICES
+	pipe_icon = "dual-port vent"
+	pipe_category = RPD_DEVICES
 
 /datum/pipes/atmospheric/injector
-	pipename = "Air injector"
-	pipeid = PIPE_INJECTOR
+	pipe_name = "Air injector"
+	pipe_id = PIPE_INJECTOR
 	orientations = 4
-	previewicon = "injector"
-	category = RPD_DEVICES
+	pipe_icon = "injector"
+	pipe_category = RPD_DEVICES
 
 //Heat exchange pipes
 
 /datum/pipes/atmospheric/he
-	pipename = "Straight pipe"
-	pipeid = PIPE_HE_STRAIGHT
+	pipe_name = "Straight pipe"
+	pipe_id = PIPE_HE_STRAIGHT
 	orientations = 2
-	previewicon = "he"
-	category = RPD_HEAT_PIPING
+	pipe_icon = "he"
+	pipe_category = RPD_HEAT_PIPING
 
 /datum/pipes/atmospheric/he/bent
-	pipename = "Bent pipe"
-	pipeid = PIPE_HE_BENT
+	pipe_name = "Bent pipe"
+	pipe_id = PIPE_HE_BENT
 	orientations = 4
 	bendy = TRUE
 
 /datum/pipes/atmospheric/he_junction
-	pipename = "Junction"
-	pipeid = PIPE_JUNCTION
+	pipe_name = "Junction"
+	pipe_id = PIPE_JUNCTION
 	orientations = 4
-	previewicon = "junction"
-	category = RPD_HEAT_PIPING
+	pipe_icon = "junction"
+	pipe_category = RPD_HEAT_PIPING
 
 /datum/pipes/atmospheric/heat_exchanger
-	pipename = "Heat exchanger"
-	pipeid = PIPE_HEAT_EXCHANGE
+	pipe_name = "Heat exchanger"
+	pipe_id = PIPE_HEAT_EXCHANGE
 	orientations = 4
-	previewicon = "heunary"
-	category = RPD_HEAT_PIPING
+	pipe_icon = "heunary"
+	pipe_category = RPD_HEAT_PIPING
 
 //DISPOSALS PIPES
 
 /datum/pipes/disposal/straight
-	pipename = "Straight pipe"
-	pipeid = PIPE_DISPOSALS_STRAIGHT
+	pipe_name = "Straight pipe"
+	pipe_id = PIPE_DISPOSALS_STRAIGHT
 	orientations = 2
-	previewicon = "conpipe-s"
+	pipe_icon = "conpipe-s"
 
 /datum/pipes/disposal/bent
-	pipename = "Bent pipe"
-	pipeid = PIPE_DISPOSALS_BENT
+	pipe_name = "Bent pipe"
+	pipe_id = PIPE_DISPOSALS_BENT
 	orientations = 4
-	previewicon = "conpipe-c"
+	pipe_icon = "conpipe-c"
 
 /datum/pipes/disposal/junction
-	pipename = "Junction"
-	pipeid = PIPE_DISPOSALS_JUNCTION
+	pipe_name = "Junction"
+	pipe_id = PIPE_DISPOSALS_JUNCTION
 	orientations = 4
-	previewicon = "conpipe-j1"
+	pipe_icon = "conpipe-j1"
 
 /datum/pipes/disposal/y_junction
-	pipename = "Y-junction"
-	pipeid = PIPE_DISPOSALS_Y_JUNCTION
+	pipe_name = "Y-junction"
+	pipe_id = PIPE_DISPOSALS_Y_JUNCTION
 	orientations = 4
-	previewicon = "conpipe-y"
+	pipe_icon = "conpipe-y"
 
 /datum/pipes/disposal/trunk
-	pipename = "Trunk"
-	pipeid = PIPE_DISPOSALS_TRUNK
+	pipe_name = "Trunk"
+	pipe_id = PIPE_DISPOSALS_TRUNK
 	orientations = 4
-	previewicon = "conpipe-t"
+	pipe_icon = "conpipe-t"
 
 /datum/pipes/disposal/bin
-	pipename = "Bin"
-	pipeid = PIPE_DISPOSALS_BIN
+	pipe_name = "Bin"
+	pipe_id = PIPE_DISPOSALS_BIN
 	orientations = 1
-	previewicon = "condisposal"
+	pipe_icon = "condisposal"
 
 /datum/pipes/disposal/outlet
-	pipename = "Outlet"
-	pipeid = PIPE_DISPOSALS_OUTLET
+	pipe_name = "Outlet"
+	pipe_id = PIPE_DISPOSALS_OUTLET
 	orientations = 4
-	previewicon = "outlet"
+	pipe_icon = "outlet"
 
 /datum/pipes/disposal/chute
-	pipename = "Chute"
-	pipeid = PIPE_DISPOSALS_CHUTE
+	pipe_name = "Chute"
+	pipe_id = PIPE_DISPOSALS_CHUTE
 	orientations = 4
-	previewicon = "intake"
+	pipe_icon = "intake"
 
 #undef RPD_ATMOS
 #undef RPD_DISPOSAL

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

@@ -25,7 +25,7 @@
 	var/lastused
 	var/iconrotation = 0 //Used to orient icons and pipes
 	var/mode = RPD_ATMOS_MODE //Disposals, atmospherics, etc.
-	var/pipetype = RPD_ATMOS_PIPING//For nanoUI menus, this is a subtype of pipes e.g. scrubbers pipes, devices
+	var/pipe_category = RPD_ATMOS_PIPING//For nanoUI menus, this is a subtype of pipes e.g. scrubbers pipes, devices
 	var/whatpipe = PIPE_SIMPLE_STRAIGHT //What kind of atmos pipe is it?
 	var/whatdpipe = PIPE_DISPOSALS_STRAIGHT //What kind of disposals pipe is it?
 	var/spawndelay = RPD_COOLDOWN_TIME
@@ -50,7 +50,17 @@
 	if(delay)
 		lastused = world.time
 
+/obj/item/rpd/proc/can_dispense_pipe(var/pipe_id, var/pipe_type) //Returns TRUE if this is a legit pipe we can dispense, otherwise returns FALSE
+	for(var/list/L in GLOB.construction_pipe_list)
+		if(pipe_type != L["pipe_type"]) //Sometimes pipes in different categories have the same pipe_id, so we need to skip anything not in the category we want
+			continue
+		if(pipe_id == L["pipe_id"]) //Found the pipe, we can dispense it
+			return TRUE
+
 /obj/item/rpd/proc/create_atmos_pipe(mob/user, turf/T) //Make an atmos pipe, meter, or gas sensor
+	if(!can_dispense_pipe(whatpipe, RPD_ATMOS_MODE))
+		to_chat(user, "<span class='warning'>[src] beeps, \"ERROR\" </span>") //Damn dirty apes -- I mean hackers
+		return
 	var/obj/item/pipe/P
 	if(whatpipe == PIPE_GAS_SENSOR)
 		P = new /obj/item/pipe_gsensor(T)
@@ -70,6 +80,9 @@
 	activate_rpd(TRUE)
 
 /obj/item/rpd/proc/create_disposals_pipe(mob/user, turf/T) //Make a disposals pipe / construct
+	if(!can_dispense_pipe(whatdpipe, RPD_DISPOSALS_MODE))
+		to_chat(user, "<span class='warning'>[src] beeps, \"ERROR\" </span>")
+		return
 	var/obj/structure/disposalconstruct/P = new(T, whatdpipe, iconrotation)
 	if(!iconrotation) //Automatic rotation
 		P.dir = user.dir
@@ -125,11 +138,11 @@ var/list/mainmenu = list(
 	list("category" = "Flip", "mode" = RPD_FLIP_MODE, "icon" = "exchange"),
 	list("category" = "Recycle", "mode" = RPD_DELETE_MODE, "icon" = "trash"))
 var/list/pipemenu = list(
-	list("pipecategory" = "Normal", "pipemode" = RPD_ATMOS_PIPING),
-	list("pipecategory" = "Supply", "pipemode" = RPD_SUPPLY_PIPING),
-	list("pipecategory" = "Scrubber", "pipemode" = RPD_SCRUBBERS_PIPING),
-	list("pipecategory" = "Devices", "pipemode" = RPD_DEVICES),
-	list("pipecategory" = "Heat exchange", "pipemode" = RPD_HEAT_PIPING))
+	list("category" = "Normal", "pipemode" = RPD_ATMOS_PIPING),
+	list("category" = "Supply", "pipemode" = RPD_SUPPLY_PIPING),
+	list("category" = "Scrubber", "pipemode" = RPD_SCRUBBERS_PIPING),
+	list("category" = "Devices", "pipemode" = RPD_DEVICES),
+	list("category" = "Heat exchange", "pipemode" = RPD_HEAT_PIPING))
 
 //NanoUI stuff
 
@@ -150,7 +163,7 @@ var/list/pipemenu = list(
 	data["mode"] = mode
 	data["pipelist"] = GLOB.construction_pipe_list
 	data["pipemenu"] = pipemenu
-	data["pipetype"] = pipetype
+	data["pipe_category"] = pipe_category
 	data["whatdpipe"] = whatdpipe
 	data["whatpipe"] = whatpipe
 	return data
@@ -163,8 +176,8 @@ var/list/pipemenu = list(
 		whatpipe = text2num(sanitize(href_list["whatpipe"]))
 	else if(href_list["whatdpipe"])
 		whatdpipe = text2num(sanitize(href_list["whatdpipe"]))
-	else if(href_list["pipetype"])
-		pipetype = text2num(sanitize(href_list["pipetype"]))
+	else if(href_list["pipe_category"])
+		pipe_category = text2num(sanitize(href_list["pipe_category"]))
 	else if(href_list["mode"])
 		mode = text2num(sanitize(href_list["mode"]))
 	else

nano/templates/rpd.tmpl

@@ -11,19 +11,19 @@ Used In File(s): /code/game/objects/items/weapons/rpd.dm
 	<h3>Pipe type:</strong></h3>
 	<div>
 		{{for data.pipemenu}} <!--We loop through the pipe menu (normal, scrubbers, etc.) and display all entries-->
-			{{:helper.link(value.pipecategory, null, {pipetype: value.pipemode}, data.pipetype == value.pipemode ? "linkOn" : null)}}
+			{{:helper.link(value.category, null, {pipe_category: value.pipemode}, data.pipe_category == value.pipemode ? "linkOn" : null)}}
 		{{/for}}
 	</div>
 	<h4>Available pipes:</h4>
 	<div style = "float:left;margin-right:30pt;">
 		{{for data.pipelist}} <!--Display all pipes that match the selected menu-->
-			{{if value.atmosordisposals == 1 && value.category == data.pipetype}}
-				<div class = "item">{{:helper.link(value.pipename, "arrow-right", {whatpipe: value.pipeid}, data.whatpipe == value.pipeid ? "linkOn" : null)}}</div>
+			{{if value.pipe_type == 1 && value.pipe_category == data.pipe_category}}
+				<div class = "item">{{:helper.link(value.pipe_name, "arrow-right", {whatpipe: value.pipe_id}, data.whatpipe == value.pipe_id ? "linkOn" : null)}}</div>
 			{{/if}}
 		{{/for}}
 	</div>
 	{{for data.pipelist}} <!-- For the selected pipe, we want to show a preview to allow the user to select a rotation-->
-		{{if value.atmosordisposals != 1 || value.pipeid != data.whatpipe || value.orientations == 1}}	<!--Skip all this icon nonsense if the pipe is: not an atmos pipe; not the pipe we selected; or pipe has one orientation-->
+		{{if value.pipe_type != 1 || value.pipe_id != data.whatpipe || value.orientations == 1}}	<!--Skip all this icon nonsense if the pipe is: not an atmos pipe; not the pipe we selected; or pipe has one orientation-->
 			{{continue;}}
 		{{/if}}
 		<div style = "float:left;">
@@ -33,37 +33,37 @@ Used In File(s): /code/game/objects/items/weapons/rpd.dm
 			{{if value.bendy}} <!--If the pipe is bendy-->
 				<div>
 					{{:helper.link("", "arrow-right", {iconrotation: 1}, data.iconrotation == 1 ? "linkOn" : null)}}
-					<img src = "{{:value.icon}}-northeast.png">
+					<img src = "{{:value.pipe_icon}}-northeast.png">
 				</div>
 				<div>
 					{{:helper.link("", "arrow-right", {iconrotation: 4}, data.iconrotation == 4 ? "linkOn" : null)}}
-					<img src = "{{:value.icon}}-southeast.png">
+					<img src = "{{:value.pipe_icon}}-southeast.png">
 				</div>
 				<div>
 					{{:helper.link("", "arrow-right", {iconrotation: 2}, data.iconrotation == 2 ? "linkOn" : null)}}
-					<img src = "{{:value.icon}}-southwest.png">
+					<img src = "{{:value.pipe_icon}}-southwest.png">
 				</div>
 				<div>
 					{{:helper.link("", "arrow-right", {iconrotation: 8}, data.iconrotation == 8 ? "linkOn" : null)}}
-					<img src = "{{:value.icon}}-northwest.png">
+					<img src = "{{:value.pipe_icon}}-northwest.png">
 				</div>
 			{{else}}
 				<div>
 					{{:helper.link("", "arrow-right", {iconrotation: 1}, data.iconrotation == 1 ? "linkOn" : null)}}
-					<img src = "{{:value.icon}}-north.png">
+					<img src = "{{:value.pipe_icon}}-north.png">
 				</div>
 				<div>
 					{{:helper.link("", "arrow-right", {iconrotation: 4}, data.iconrotation == 4 ? "linkOn" : null)}}
-					<img src = "{{:value.icon}}-east.png">
+					<img src = "{{:value.pipe_icon}}-east.png">
 				</div>
 				{{if value.orientations == 4}}
 					<div>
 						{{:helper.link("", "arrow-right", {iconrotation: 2}, data.iconrotation == 2 ? "linkOn" : null)}}
-						<img src = "{{:value.icon}}-south.png">
+						<img src = "{{:value.pipe_icon}}-south.png">
 					</div>
 					<div>
 						{{:helper.link("", "arrow-right", {iconrotation: 8}, data.iconrotation == 8 ? "linkOn" : null)}}
-						<img src = "{{:value.icon}}-west.png">
+						<img src = "{{:value.pipe_icon}}-west.png">
 					</div>
 				{{/if}}
 			{{/if}}
@@ -73,13 +73,13 @@ Used In File(s): /code/game/objects/items/weapons/rpd.dm
 	<h4>Available pipes:</h4>
 	<div style = "float:left;margin-right:30pt;">
 	{{for data.pipelist}}
-			{{if value.atmosordisposals == 2}}
-				<div class = "item">{{:helper.link(value.pipename, "arrow-right", {whatdpipe: value.pipeid}, data.whatdpipe == value.pipeid ? "linkOn" : null)}}</div>
+			{{if value.pipe_type == 2}}
+				<div class = "item">{{:helper.link(value.pipe_name, "arrow-right", {whatdpipe: value.pipe_id}, data.whatdpipe == value.pipe_id ? "linkOn" : null)}}</div>
 			{{/if}}
 	{{/for}}
 	</div>
 	{{for data.pipelist}}
-		{{if value.atmosordisposals != 2 || value.pipeid != data.whatdpipe || value.orientations == 1}}	<!--Skip all this icon nonsense if the pipe is: not a disposals pipe; not the pipe we selected; or pipe has one orientation-->
+		{{if value.pipe_type != 2 || value.pipe_id != data.whatdpipe || value.orientations == 1}}	<!--Skip all this icon nonsense if the pipe is: not a disposals pipe; not the pipe we selected; or pipe has one orientation-->
 			{{continue;}}
 		{{/if}}
 		<div style = "float:left;">
@@ -88,20 +88,20 @@ Used In File(s): /code/game/objects/items/weapons/rpd.dm
 			</div>
 			<div>
 				{{:helper.link("", "arrow-right", {iconrotation: 1}, data.iconrotation == 1 ? "linkOn" : null)}}
-				<img src = "{{:value.icon}}-north.png">
+				<img src = "{{:value.pipe_icon}}-north.png">
 			</div>
 			<div>
 				{{:helper.link("", "arrow-right", {iconrotation: 4}, data.iconrotation == 4 ? "linkOn" : null)}}
-				<img src = "{{:value.icon}}-east.png">
+				<img src = "{{:value.pipe_icon}}-east.png">
 			</div>
 			{{if value.orientations == 4}}
 				<div>
 					{{:helper.link("", "arrow-right", {iconrotation: 2}, data.iconrotation == 2 ? "linkOn" : null)}}
-					<img src = "{{:value.icon}}-south.png">
+					<img src = "{{:value.pipe_icon}}-south.png">
 				</div>
 				<div>
 					{{:helper.link("", "arrow-right", {iconrotation: 8}, data.iconrotation == 8 ? "linkOn" : null)}}
-					<img src = "{{:value.icon}}-west.png">
+					<img src = "{{:value.pipe_icon}}-west.png">
 				</div>
 			{{/if}}
 		</div>