diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index c55ada2a766..41e3290920b 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -212,7 +212,7 @@ var/hsboxspawn = 1 if("hsbrcd") if(!hsboxspawn) return - new/obj/item/weapon/rcd{matter=30;canRwall=1}(usr.loc) + new/obj/item/weapon/rcd{matter=30;canRturf=1}(usr.loc) // // New sandbox airlock maker diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 8a0c26f1b1e..b5ffd7faa7a 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -26,17 +26,44 @@ RCD var/max_matter = 160 var/working = 0 var/mode = 1 - var/canRwall = 0 + var/canRturf = 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/plasteelmultiplier = 3 //Plasteel is worth 3 times more than glass or metal 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 + /* Construction costs */ + + var/wallcost = 16 + var/floorcost = 2 + var/grillecost = 4 + var/windowcost = 8 + var/airlockcost = 16 + var/deconwallcost = 26 + var/deconfloorcost = 33 + var/decongrillecost = 4 + var/deconwindowcost = 8 + var/deconairlockcost = 32 + + /* Build delays (deciseconds) */ + + var/walldelay = 20 + var/floordelay = null //space wind's a bitch + var/grilledelay = 40 + var/windowdelay = 40 + var/airlockdelay = 50 + var/deconwalldelay = 40 + var/deconfloordelay = 50 + var/decongrilledelay = null //as rapid as wirecutters + var/deconwindowdelay = 50 + var/deconairlockdelay = 50 + /obj/item/weapon/rcd/verb/change_airlock_access() set name = "Change Airlock Access" set category = "Object" @@ -199,7 +226,7 @@ RCD /obj/item/weapon/rcd/New() - desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." + desc = "An RCD. It currently holds [matter]/[max_matter] matter-units." src.spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) spark_system.attach(src) @@ -230,7 +257,7 @@ RCD 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 + loaded = loadwithsheets(W, plasteelmultiplier*sheetmultiplier, user) //Plasteel is worth 3 times more than glass or metal if(loaded) user << "The RCD now holds [matter]/[max_matter] matter-units." desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." @@ -294,7 +321,7 @@ RCD if(1) if(istype(A, /turf/space)) var/turf/space/S = A - if(useResource(1, user)) + if(useResource(floorcost, user)) user << "You start building floor..." activate() S.ChangeTurf(/turf/simulated/floor/plating) @@ -303,11 +330,11 @@ RCD if(istype(A, /turf/simulated/floor)) var/turf/simulated/floor/F = A - if(checkResource(3, user)) + if(checkResource(wallcost, user)) user << "You start building wall..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 20, target = A)) - if(!useResource(3, user)) return 0 + if(do_after(user, walldelay, target = A)) + if(!useResource(wallcost, user)) return 0 activate() F.ChangeTurf(/turf/simulated/wall) return 1 @@ -315,7 +342,7 @@ RCD if(2) if(istype(A, /turf/simulated/floor)) - if(checkResource(10, user)) + if(checkResource(airlockcost, user)) var/door_check = 1 for(var/obj/machinery/door/D in A) if(!D.sub_door) @@ -325,8 +352,8 @@ RCD if(door_check) user << "You start building airlock..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 50, target = A)) - if(!useResource(10, user)) return 0 + if(do_after(user, airlockdelay, target = A)) + if(!useResource(airlockcost, user)) return 0 activate() var/obj/machinery/door/airlock/T = new airlock_type( A ) @@ -345,7 +372,7 @@ RCD if(!T.checkForMultipleDoors()) qdel(T) - useResource(-10, user) + useResource(-airlockcost, user) return 0 T.autoclose = 1 return 1 @@ -358,13 +385,13 @@ RCD if(3) if(istype(A, /turf/simulated/wall)) var/turf/simulated/wall/W = A - if(istype(W, /turf/simulated/wall/r_wall) && !canRwall) + if(istype(W, /turf/simulated/wall/r_wall) && !canRturf) return 0 - if(checkResource(5, user)) + if(checkResource(deconwallcost, user)) user << "You start deconstructing wall..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 40, target = A)) - if(!useResource(5, user)) return 0 + if(do_after(user, deconwalldelay, target = A)) + if(!useResource(deconwallcost, user)) return 0 activate() W.ChangeTurf(/turf/simulated/floor/plating) return 1 @@ -372,63 +399,64 @@ RCD if(istype(A, /turf/simulated/floor)) var/turf/simulated/floor/F = A + if(istype(F, /turf/simulated/floor/engine) && !canRturf) + return 0 if(istype(F, F.baseturf)) user << "You can't dig any deeper!" return 0 - else if(checkResource(5, user)) + else if(checkResource(deconfloorcost, user)) user << "You start deconstructing floor..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 50, target = A)) - if(!useResource(5, user)) return 0 + if(do_after(user, deconfloordelay, target = A)) + if(!useResource(deconfloorcost, user)) return 0 activate() F.ChangeTurf(F.baseturf) return 1 return 0 if(istype(A, /obj/machinery/door/airlock)) - if(checkResource(20, user)) + if(checkResource(deconairlockcost, user)) user << "You start deconstructing airlock..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 50, target = A)) - if(!useResource(20, user)) return 0 + if(do_after(user, deconairlockdelay, target = A)) + if(!useResource(deconairlockcost, user)) return 0 activate() qdel(A) return 1 return 0 if(istype(A, /obj/structure/window)) - if(checkResource(5, user)) + if(checkResource(deconwindowcost, user)) user << "You start deconstructing the window..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 50, target = A)) - if(!useResource(5, user)) return 0 + if(do_after(user, deconwindowdelay, target = A)) + if(!useResource(deconwindowcost, user)) return 0 activate() qdel(A) return 1 return 0 if(istype(A, /obj/structure/grille)) - if(checkResource(5, user)) - user << "You start deconstructing the grille..." - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 50, target = A)) - if(!useResource(5, user)) return 0 + var/obj/structure/grille/G = A + if(!G.shock(user, 90)) //if it's shocked, try to shock them + if(useResource(decongrillecost, user)) + user << "You start deconstructing the grille..." activate() + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) qdel(A) return 1 - return 0 - return 0 + return 0 if (4) if(istype(A, /turf/simulated/floor)) - if(checkResource(5, user)) + if(checkResource(grillecost, user)) for(var/obj/structure/grille/GRILLE in A) user << "There is already a grille there!" return 0 user << "You start building a grille..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 40, target = A)) - if(!useResource(5, user)) return 0 + if(do_after(user, grilledelay, target = A)) + if(!useResource(grillecost, user)) return 0 activate() var/obj/structure/grille/G = new/obj/structure/grille(A) G.anchored = 1 @@ -436,12 +464,12 @@ RCD return 0 return 0 if(istype(A, /obj/structure/grille)) - if(checkResource(5, user)) + if(checkResource(windowcost, user)) user << "You start building a window..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - if(do_after(user, 40, target = A)) + if(do_after(user, windowdelay, target = A)) if(locate(/obj/structure/window) in A.loc) return 0 - if(!useResource(5, user)) return 0 + if(!useResource(windowcost, user)) return 0 activate() var/obj/structure/window/WD = new/obj/structure/window/fulltile(A.loc) WD.anchored = 1 @@ -457,7 +485,7 @@ RCD if(matter < amount) return 0 matter -= amount - desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." + desc = "An RCD. It currently holds [matter]/[max_matter] matter-units." return 1 /obj/item/weapon/rcd/proc/checkResource(amount, mob/user) @@ -474,8 +502,8 @@ RCD /obj/item/weapon/rcd/borg/New() ..() - desc = "A device used to rapidly build walls/floor." - canRwall = 1 + desc = "A device used to rapidly build walls and floors." + canRturf = 1 /obj/item/weapon/rcd/loaded matter = 160 @@ -484,7 +512,7 @@ RCD name = "combat RCD" max_matter = 500 matter = 500 - canRwall = 1 + canRturf = 1 /obj/item/weapon/rcd_ammo name = "compressed matter cartridge" @@ -496,8 +524,8 @@ RCD density = 0 anchored = 0.0 origin_tech = "materials=2" - materials = list(MAT_METAL=16000, MAT_GLASS=8000) - var/ammoamt = 20 + materials = list(MAT_METAL=3000, MAT_GLASS=2000) + var/ammoamt = 40 /obj/item/weapon/rcd_ammo/large - ammoamt = 100 \ No newline at end of file + ammoamt = 160 \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index aab27eea79b..c628df81cc1 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -45,7 +45,7 @@ icon_state = "medicalcrate" /obj/structure/closet/crate/rcd - desc = "A crate for the storage of the RCD." + desc = "A crate for the storage of an RCD." name = "\improper RCD crate" /obj/structure/closet/crate/rcd/New() @@ -53,6 +53,7 @@ new /obj/item/weapon/rcd_ammo(src) new /obj/item/weapon/rcd_ammo(src) new /obj/item/weapon/rcd_ammo(src) + new /obj/item/weapon/rcd_ammo(src) new /obj/item/weapon/rcd(src) /obj/structure/closet/crate/freezer diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 5a68e76e7e2..a9ef8e34eed 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -190,7 +190,7 @@ name = "Compressed matter cardridge" id = "rcd_ammo" build_type = AUTOLATHE - materials = list(MAT_METAL = 16000, MAT_GLASS=8000) + materials = list(MAT_METAL = 3000, MAT_GLASS=2000) build_path = /obj/item/weapon/rcd_ammo category = list("initial","Construction")