Merge pull request #9934 from nukeop/rcd

Makes RCDs more useful

code/game/gamemodes/objective_items.dm

@@ -29,12 +29,6 @@
 	difficulty = 5
 	excludefromjob = list("Captain")
 
-/datum/objective_item/steal/rcd
-	name = "a rapid-construction-device"
-	targetitem = /obj/item/weapon/rcd
-	difficulty = 3
-	excludefromjob = list("Chief Engineer", "Quartermaster", "Cargo Technician")
-
 /datum/objective_item/steal/jetpack
 	name = "a jetpack"
 	targetitem = /obj/item/weapon/tank/jetpack

code/game/machinery/vending.dm

@@ -904,7 +904,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
 	req_access_txt = "11" //Engineering Equipment access
-	products = list(/obj/item/clothing/glasses/meson/engine = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10)
+	products = list(/obj/item/clothing/glasses/meson/engine = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10, /obj/item/weapon/rcd/loaded = 3,)
 	contraband = list(/obj/item/weapon/stock_parts/cell/potato = 3)
 	premium = list(/obj/item/weapon/storage/belt/utility = 3)
 

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

@@ -22,13 +22,122 @@ RCD
 	origin_tech = "engineering=4;materials=2"
 	var/datum/effect/effect/system/spark_spread/spark_system
 	var/matter = 0
-	var/max_matter = 100
+	var/max_matter = 160
 	var/working = 0
 	var/mode = 1
 	var/canRwall = 0
 	var/disabled = 0
 	var/airlock_type = /obj/machinery/door/airlock
 	var/advanced_airlock_setting = 1 //Set to 1 if you want more paintjobs available
+	var/sheetmultiplier	= 4			 //Controls the amount of matter added for each glass/metal sheet, triple for plasteel
+
+	var/list/conf_access = null
+	var/use_one_access = 0 //If the airlock should require ALL or only ONE of the listed accesses.
+	var/last_configurator = null
+	var/locked = 1
+
+/obj/item/weapon/rcd/verb/change_airlock_access()
+	set name = "Change Airlock Access"
+	set category = "Object"
+	set src in usr
+
+	if (!ishuman(usr))
+		return ..(usr)
+
+	var/mob/living/carbon/human/H = usr
+	if(H.getBrainLoss() >= 60)
+		return
+
+	var/t1 = text("")
+
+
+	if (last_configurator)
+		t1 += "Operator: [last_configurator]<br>"
+
+	if (locked)
+		t1 += "<a href='?src=\ref[src];login=1'>Swipe ID</a><hr>"
+	else
+		t1 += "<a href='?src=\ref[src];logout=1'>Lock Interface</a><hr>"
+
+		if(use_one_access)
+			t1 += "Restriction Type: <a href='?src=\ref[src];access=one'>At least one access required</a><br>"
+		else
+			t1 += "Restriction Type: <a href='?src=\ref[src];access=one'>All accesses required</a><br>"
+
+		t1 += "<a href='?src=\ref[src];access=all'>Remove All</a><br>"
+
+		var/accesses = ""
+		accesses += "<div align='center'><b>Access</b></div>"
+		accesses += "<table style='width:100%'>"
+		accesses += "<tr>"
+		for(var/i = 1; i <= 7; i++)
+			accesses += "<td style='width:14%'><b>[get_region_accesses_name(i)]:</b></td>"
+		accesses += "</tr><tr>"
+		for(var/i = 1; i <= 7; i++)
+			accesses += "<td style='width:14%' valign='top'>"
+			for(var/A in get_region_accesses(i))
+				if(A in conf_access)
+					accesses += "<a href='?src=\ref[src];access=[A]'><font color=\"red\">[replacetext(get_access_desc(A), " ", "&nbsp")]</font></a> "
+				else
+					accesses += "<a href='?src=\ref[src];access=[A]'>[replacetext(get_access_desc(A), " ", "&nbsp")]</a> "
+				accesses += "<br>"
+			accesses += "</td>"
+		accesses += "</tr></table>"
+		t1 += "<tt>[accesses]</tt>"
+
+	t1 += text("<p><a href='?src=\ref[];close=1'>Close</a></p>\n", src)
+
+	var/datum/browser/popup = new(usr, "airlock_electronics", "Access Control", 900, 500)
+	popup.set_content(t1)
+	popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+	onclose(usr, "airlock")
+
+/obj/item/weapon/rcd/Topic(href, href_list)
+	..()
+	if (usr.stat || usr.restrained() || !ishuman(usr))
+		return
+	if (href_list["close"])
+		usr << browse(null, "window=airlock")
+		return
+
+	if (href_list["login"])
+		var/obj/item/I = usr.get_active_hand()
+		if (istype(I, /obj/item/device/pda))
+			var/obj/item/device/pda/pda = I
+			I = pda.id
+		if (I && src.check_access(I))
+			src.locked = 0
+			src.last_configurator = I:registered_name
+
+	if (locked)
+		return
+
+	if (href_list["logout"])
+		locked = 1
+
+	if (href_list["access"])
+		toggle_access(href_list["access"])
+
+	change_airlock_access()
+
+/obj/item/weapon/rcd/proc/toggle_access(var/acc)
+	if (acc == "all")
+		conf_access = null
+	else if(acc == "one")
+		use_one_access = !use_one_access
+	else
+		var/req = text2num(acc)
+
+		if (conf_access == null)
+			conf_access = list()
+
+		if (!(req in conf_access))
+			conf_access += req
+		else
+			conf_access -= req
+			if (!conf_access.len)
+				conf_access = null
 
 /obj/item/weapon/rcd/verb/change_airlock_setting()
 	set name = "Change Airlock Setting"
@@ -107,6 +216,9 @@ RCD
 
 /obj/item/weapon/rcd/attackby(obj/item/weapon/W, mob/user, params)
 	..()
+	if(isrobot(user))	//Make sure cyborgs can't load their RCDs
+		return
+	var/loaded = 0
 	if(istype(W, /obj/item/weapon/rcd_ammo))
 		var/obj/item/weapon/rcd_ammo/R = W
 		if((matter + R.ammoamt) > max_matter)
@@ -117,10 +229,34 @@ RCD
 		qdel(W)
 		matter += R.ammoamt
 		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+		loaded = 1
+	else if(istype(W, /obj/item/stack/sheet/metal) || istype(W, /obj/item/stack/sheet/glass))
+		loaded = loadwithsheets(W, sheetmultiplier, user)
+	else if(istype(W, /obj/item/stack/sheet/plasteel))
+		loaded = loadwithsheets(W, 3*sheetmultiplier, user) //Plasteel is worth 3 times more than glass or metal
+	if(loaded)
 		user << "<span class='notice'>The RCD now holds [matter]/[max_matter] matter-units.</span>"
 		desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
-		return
+	return
 
+/obj/item/weapon/rcd/proc/loadwithsheets(obj/item/stack/sheet/S, var/value, mob/user)
+    var/maxsheets = round((max_matter-matter)/value)    //calculate the max number of sheets that will fit in RCD
+    if(maxsheets > 0)
+        if(S.amount > maxsheets)
+            //S.amount -= maxsheets
+            S.use(maxsheets)
+            matter += value*maxsheets
+            playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+            user << "<span class='notice'>You insert [maxsheets] [S.name] sheets into the RCD. </span>"
+        else
+            matter += value*(S.amount)
+            playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+            user << "<span class='notice'>You insert [S.amount] [S.name] sheets into the RCD. </span>"
+            user.unEquip()
+            qdel(S)
+        return 1
+    user << "<span class='warning'>You can't insert any more [S.name] sheets into the RCD!"
+    return 0
 
 /obj/item/weapon/rcd/attack_self(mob/user)
 	//Change the mode
@@ -129,21 +265,19 @@ RCD
 		if(1)
 			mode = 2
 			user << "<span class='notice'>You change RCD's mode to 'Airlock'.</span>"
-			if(prob(20))
-				src.spark_system.start()
-			return
 		if(2)
 			mode = 3
 			user << "<span class='notice'>You change RCD's mode to 'Deconstruct'.</span>"
-			if(prob(20))
-				src.spark_system.start()
-			return
 		if(3)
+			mode = 4
+			user << "<span class='notice'>You change RCD's mode to 'Grilles & Windows'.</span>"
+		if(4)
 			mode = 1
 			user << "<span class='notice'>You change RCD's mode to 'Floor & Walls'.</span>"
-			if(prob(20))
-				src.spark_system.start()
-			return
+
+	if(prob(20))
+		src.spark_system.start()
+	return
 
 /obj/item/weapon/rcd/proc/activate()
 	playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
@@ -155,7 +289,7 @@ RCD
 		return 0
 	if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
 		return 0
-	if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock)))
+	if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock) || istype(A, /obj/structure/grille) || istype(A, /obj/structure/window)))
 		return 0
 
 	switch(mode)
@@ -191,12 +325,28 @@ RCD
 							break
 
 					if(door_check)
+						if (!conf_access)
+							user << "<span class='warning'>Configure access first!</span>"
+							return 0
 						user << "<span class='notice'>You start building airlock...</span>"
 						playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 						if(do_after(user, 50, target = A))
 							if(!useResource(10, user)) return 0
 							activate()
 							var/obj/machinery/door/airlock/T = new airlock_type( A )
+
+							T.electronics = new/obj/item/weapon/airlock_electronics( src.loc )
+
+							T.electronics.conf_access = conf_access.Copy()
+							T.electronics.use_one_access = use_one_access
+							T.electronics.last_configurator = last_configurator
+							T.electronics.locked = locked
+
+							if(T.electronics.use_one_access)
+								T.req_one_access = T.electronics.conf_access
+							else
+								T.req_access = T.electronics.conf_access
+
 							if(!T.checkForMultipleDoors())
 								qdel(T)
 								useResource(-10, user)
@@ -249,7 +399,59 @@ RCD
 						qdel(A)
 						return 1
 				return	0
+
+			if(istype(A, /obj/structure/window))
+				if(checkResource(5, user))
+					user << "<span class='notice'>You start deconstructing the window...</span>"
+					playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+					if(do_after(user, 50))
+						if(!useResource(5, user)) return 0
+						activate()
+						qdel(A)
+						return 1
+				return	0
+
+			if(istype(A, /obj/structure/grille))
+				if(checkResource(5, user))
+					user << "<span class='notice'>You start deconstructing the grille...</span>"
+					playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+					if(do_after(user, 50))
+						if(!useResource(5, user)) return 0
+						activate()
+						qdel(A)
+						return 1
+				return	0
 			return 0
+
+		if (4)
+			if(istype(A, /turf/simulated/floor))
+				if(checkResource(5, user))
+					for(var/obj/structure/grille/GRILLE in A)
+						user << "<span class='warning'>There is already a grille there!</span>"
+						return 0
+					user << "<span class='notice'>You start building a grille...</span>"
+					playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+					if(do_after(user, 40))
+						if(!useResource(5, user)) return 0
+						activate()
+						var/obj/structure/grille/G = new/obj/structure/grille(A)
+						G.anchored = 1
+						return 1
+					return 0
+				return 0
+			if(istype(A, /obj/structure/grille))
+				if(checkResource(5, user))
+					user << "<span class='notice'>You start building a window...</span>"
+					playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+					if(do_after(user, 40))
+						if(!useResource(5, user)) return 0
+						activate()
+						var/obj/structure/window/WD = new/obj/structure/window/fulltile(A.loc)
+						WD.anchored = 1
+						return 1
+					return 0
+				return 0
+
 		else
 			user << "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin."
 			return 0
@@ -280,7 +482,7 @@ RCD
 	canRwall = 1
 
 /obj/item/weapon/rcd/loaded
-	matter = 100
+	matter = 160
 
 /obj/item/weapon/rcd/combat
 	name = "combat RCD"

code/game/objects/structures/grille.dm

@@ -158,6 +158,8 @@
 			icon_state = "grille"
 			R.use(1)
 			return
+	else if(istype(W, /obj/item/weapon/rcd) && istype(loc, /turf/simulated)) //Do not attack the grille if the user is holding an RCD
+		return
 
 //window placing begin
 	else if(istype(W, /obj/item/stack/sheet/rglass) || istype(W, /obj/item/stack/sheet/glass))

code/game/objects/structures/window.dm

@@ -256,6 +256,8 @@
 			disassembled = 1
 			user << "<span class='notice'>You successfully disassemble [src].</span>"
 			qdel(src)
+	else if(istype(I, /obj/item/weapon/rcd)) //Do not attack the window if the user is holding an RCD
+		return
 
 	else
 		if(I.damtype == BRUTE || I.damtype == BURN)