" + dirsel += render_dir_img(1,"pipe.png","Pipe") + dirsel += "
" + else + dirsel+={" ++ ↕ +
+ "} dat = {" @@ -450,20 +463,20 @@ var/global/list/RPD_recipes=list( return if(loc != user) return - if(!isrobot(user) && !ishuman(user)) - return 0 if(istype(A,/area/shuttle)||istype(A,/turf/space/transit)) return 0 switch(p_class) if(PAINT_MODE) // Paint pipes - if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated)) + if(!istype(A,/obj/machinery/atmospherics/pipe)) // Avoid spewing errors about invalid mode -2 when clicking on stuff that aren't pipes. user << "\The [src]'s error light flickers. Perhaps you need to only use it on pipes and pipe meters?" return 0 var/obj/machinery/atmospherics/pipe/P = A playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) - P.pipe_color = paint_color + P.color = paint_colors[paint_color] + P.pipe_color = paint_colors[paint_color] + P.stored.color = paint_colors[paint_color] user.visible_message("[user] paints \the [P] [paint_color].","You paint \the [P] [paint_color].") P.update_icon() return 1 @@ -539,6 +552,8 @@ var/global/list/RPD_recipes=list( if(7) C.ptype = 8 C.density = 1 + if(8) + C.ptype = 9 C.add_fingerprint(usr) C.update() return 1 diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 0fbfa179960..5a988ca06b4 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -25,83 +25,12 @@ icon_state = "baton" item_state = "classic_baton" slot_flags = SLOT_BELT - force = 10 - -/obj/item/weapon/melee/classic_baton/attack(mob/M, mob/living/user) - add_fingerprint(user) - if((CLUMSY in user.mutations) && prob(50)) - user << "You club yourself over the head!" - user.Weaken(3 * force) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - H.apply_damage(2 * force, BRUTE, "head") - H.forcesay(hit_appends) - else - user.take_organ_damage(2 * force) - return - add_logs(user, M, "attacked", object="[src.name]") - - if(isrobot(M)) // Don't stun borgs, fix for issue #2436 - ..() - return - if(!isliving(M)) // Don't stun nonhuman things - return - - if(user.a_intent == "harm") - if(!..()) return - if(M.stuttering < 7 && !(HULK in M.mutations)) - M.stuttering = 7 - M.Stun(7) - M.Weaken(7) - M.visible_message("[user] has beaten [M] with [src]!", \ - "[user] has beaten [M] with [src]!") - else - playsound(loc, 'sound/effects/woodhit.ogg', 50, 1, -1) - M.Stun(7) - M.Weaken(7) - M.visible_message("[user] has stunned [M] with [src]!", \ - "[user] has stunned [M] with [src]!") - - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.forcesay(hit_appends) - - - -/obj/item/weapon/melee/telebaton - name = "telescopic baton" - desc = "A compact yet robust personal defense weapon. Can be concealed when folded." - icon = 'icons/obj/weapons.dmi' - icon_state = "telebaton_0" - item_state = "telebaton_0" - slot_flags = SLOT_BELT - w_class = 2 - force = 3 + force = 12 //9 hit crit + w_class = 3 var/cooldown = 0 - var/on = 0 + var/on = 1 -/obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) - on = !on - if(on) - user << "You extend the baton." - icon_state = "telebaton_1" - item_state = "nullrod" - w_class = 4 //doesnt fit in backpack when its on for balance - force = 10 //seclite damage - attack_verb = list("smacked", "struck", "cracked", "beaten") - else - user << "You collapse the baton." - icon_state = "telebaton_0" - item_state = "telebaton_0" //no sprite in other words - slot_flags = SLOT_BELT - w_class = 2 - force = 3 //not so robust now - attack_verb = list("hit", "poked") - - playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) - add_fingerprint(user) - -/obj/item/weapon/melee/telebaton/attack(mob/target as mob, mob/living/user as mob) +/obj/item/weapon/melee/classic_baton/attack(mob/target as mob, mob/living/user as mob) if(on) add_fingerprint(user) if((CLUMSY in user.mutations) && prob(50)) @@ -125,7 +54,7 @@ if(cooldown <= 0) playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1) target.Weaken(3) - add_logs(user, target, "stunned", object="telescopic baton") + add_logs(user, target, "stunned", object="classic baton") src.add_fingerprint(user) target.visible_message("[user] has knocked down [target] with \the [src]!", \ "[user] has knocked down [target] with \the [src]!") @@ -138,4 +67,38 @@ cooldown = 0 return else - return ..() \ No newline at end of file + return ..() + + + +/obj/item/weapon/melee/classic_baton/telescopic + name = "telescopic baton" + desc = "A compact yet robust personal defense weapon. Can be concealed when folded." + icon = 'icons/obj/weapons.dmi' + icon_state = "telebaton_0" + item_state = null + slot_flags = SLOT_BELT + w_class = 2 + force = 0 + on = 0 + +/obj/item/weapon/melee/classic_baton/telescopic/attack_self(mob/user as mob) + on = !on + if(on) + user << "You extend the baton." + icon_state = "telebaton_1" + item_state = "nullrod" + w_class = 4 //doesnt fit in backpack when its on for balance + force = 10 //stunbaton damage + attack_verb = list("smacked", "struck", "cracked", "beaten") + else + user << "You collapse the baton." + icon_state = "telebaton_0" + item_state = null //no sprite for concealment even when in hand + slot_flags = SLOT_BELT + w_class = 2 + force = 0 //not so robust now + attack_verb = list("hit", "poked") + + playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) + add_fingerprint(user) \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 3124979681f..f95e9b011dd 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -121,7 +121,7 @@ /obj/item/weapon/reagent_containers/food/snacks/donut/normal, /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, /obj/item/device/flashlight/seclite, - /obj/item/weapon/melee/telebaton + /obj/item/weapon/melee/classic_baton/telescopic ) /obj/item/weapon/storage/belt/security/New() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 1d58269c6dd..3995d527137 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -83,13 +83,13 @@ /obj/item/weapon/storage/box/gloves/New() ..() - new /obj/item/clothing/gloves/latex(src) - new /obj/item/clothing/gloves/latex(src) - new /obj/item/clothing/gloves/latex(src) - new /obj/item/clothing/gloves/latex(src) - new /obj/item/clothing/gloves/latex(src) - new /obj/item/clothing/gloves/latex(src) - new /obj/item/clothing/gloves/latex(src) + new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/gloves/color/latex(src) /obj/item/weapon/storage/box/masks name = "box of sterile masks" diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index b894effd228..19b664e2c4f 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -61,7 +61,7 @@ new /obj/item/stack/cable_coil(src,30,color) new /obj/item/stack/cable_coil(src,30,color) if(prob(5)) - new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/gloves/color/yellow(src) else new /obj/item/stack/cable_coil(src,30,color) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index eadb7c6d32d..ac90c38347b 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -12,7 +12,6 @@ /obj/structure/mech_melee_attack(obj/mecha/M) if(M.damtype == "brute") - M.occupant_message("You hit [src].") visible_message("[M.name] has hit [src].") return 1 return 0 diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index d3ffa71fe14..1068afe8657 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -68,7 +68,7 @@ ..() new /obj/item/clothing/under/rank/janitor(src) new /obj/item/weapon/cartridge/janitor(src) - new /obj/item/clothing/gloves/black(src) + new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/head/soft/purple(src) new /obj/item/device/flashlight(src) new /obj/item/weapon/caution(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index ae268783c38..8a3aad19172 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -20,7 +20,7 @@ new /obj/item/clothing/under/rank/chief_engineer(src) new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/welding(src) - new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/gloves/color/yellow(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/weapon/cartridge/ce(src) new /obj/item/device/radio/headset/heads/ce(src) @@ -46,8 +46,8 @@ /obj/structure/closet/secure_closet/engineering_electrical/New() ..() - new /obj/item/clothing/gloves/yellow(src) - new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/gloves/color/yellow(src) + new /obj/item/clothing/gloves/color/yellow(src) new /obj/item/weapon/storage/toolbox/electrical(src) new /obj/item/weapon/storage/toolbox/electrical(src) new /obj/item/weapon/storage/toolbox/electrical(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 7b3ec9d7f02..247ee620425 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -70,7 +70,7 @@ new /obj/item/clothing/shoes/sneakers/white(src) new /obj/item/device/radio/headset/headset_med(src) new /obj/item/weapon/defibrillator/loaded(src) - new /obj/item/clothing/gloves/latex/nitrile(src) + new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/weapon/storage/belt/medical(src) new /obj/item/clothing/glasses/hud/health(src) new /obj/item/clothing/suit/toggle/wintercoat/medical(src) @@ -102,7 +102,7 @@ new /obj/item/weapon/cartridge/cmo(src) new /obj/item/device/radio/headset/heads/cmo(src) new /obj/item/weapon/defibrillator/loaded(src) - new /obj/item/clothing/gloves/latex/nitrile(src) + new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/weapon/storage/belt/medical(src) new /obj/item/device/flash/handheld(src) new /obj/item/clothing/suit/toggle/wintercoat/medical(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 4146accd389..174f2e748c9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -42,7 +42,7 @@ new /obj/item/clothing/under/rank/research_director/turtleneck(src) new /obj/item/weapon/cartridge/rd(src) new /obj/item/clothing/shoes/sneakers/white(src) - new /obj/item/clothing/gloves/latex(src) + new /obj/item/clothing/gloves/color/latex(src) new /obj/item/device/radio/headset/heads/rd(src) new /obj/item/weapon/tank/air(src) new /obj/item/clothing/mask/gas(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 325757eef6d..f45405202f9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -22,7 +22,7 @@ new /obj/item/weapon/cartridge/captain(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/device/radio/headset/heads/captain/alt(src) - new /obj/item/clothing/gloves/captain(src) + new /obj/item/clothing/gloves/color/captain(src) new /obj/item/clothing/suit/toggle/wintercoat/captain(src) new /obj/item/clothing/head/santa(src) new /obj/item/weapon/gun/energy/gun(src) @@ -198,7 +198,7 @@ new /obj/item/clothing/under/rank/det(src) new /obj/item/clothing/suit/det_suit(src) new /obj/item/clothing/head/det_hat(src) - new /obj/item/clothing/gloves/black(src) + new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/under/rank/det/grey(src) new /obj/item/clothing/suit/det_suit/grey(src) new /obj/item/clothing/head/fedora(src) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index ee80b8ea7ff..27c2655da50 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -132,7 +132,7 @@ if(prob(20)) new /obj/item/device/multitool(src) if(prob(5)) - new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/gloves/color/yellow(src) if(prob(40)) new /obj/item/clothing/head/hardhat(src) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index d953775363d..52e4b1a48a5 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -1,6 +1,6 @@ /obj/structure/lattice - desc = "A lightweight support lattice." name = "lattice" + desc = "A lightweight support lattice." icon = 'icons/obj/structures.dmi' icon_state = "latticefull" density = 0 @@ -18,7 +18,6 @@ qdel(LAT) stored = new/obj/item/stack/rods(src) icon = 'icons/obj/smoothlattice.dmi' - icon_state = "latticeblank" updateOverlays() for (var/dir in cardinal) var/obj/structure/lattice/L @@ -52,15 +51,15 @@ return /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob) - + var/turf/T = get_turf(src) if (istype(C, /obj/item/stack/tile/plasteel)) - var/turf/T = get_turf(src) - T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead - return + T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead (for building plating) + if(istype(C, /obj/item/stack/rods)) + T.attackby(C, user) //see above, for building catwalks if (istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) - user << "Slicing lattice joints ..." + user << "Slicing [name] joints ..." Deconstruct() return @@ -78,14 +77,61 @@ if(!(istype(get_step(src, direction), /turf/space))) dir_sum += direction - icon_state = "lattice[dir_sum]" + icon_state = "[name][dir_sum]" return /obj/structure/lattice/Deconstruct() var/turf/T = loc stored.loc = T + updateOverlays() ..() /obj/structure/lattice/singularity_pull(S, current_size) if(current_size >= STAGE_FOUR) - Deconstruct() \ No newline at end of file + Deconstruct() + +/obj/structure/lattice/catwalk + name = "catwalk" + desc = "A catwalk for easier EVA manuevering and cable placement." + icon_state = "catwalkfull" + +/obj/structure/lattice/catwalk/New() + var/turf/T = loc + T.cancable = 1 + ..() + +/obj/structure/lattice/catwalk/Destroy() + var/turf/T = loc + T.cancable = 0 + for(var/obj/structure/cable/C in T) + C.Destroy() + ..() + +/obj/structure/lattice/catwalk/Deconstruct() + var/turf/T = loc + T.cancable = 0 + for(var/obj/structure/cable/C in T) + C.Deconstruct() + ..() + +/obj/structure/lattice/catwalk/attackby(obj/item/C as obj, mob/user as mob) + ..() + if(istype(C, /obj/item/stack/cable_coil)) + var/turf/T = get_turf(src) + T.attackby(C, user) //catwalks 'enable' coil laying on space tiles, not the catwalks themselves + return + +/obj/structure/lattice/catwalk/updateOverlays() + overlays.Cut() + + var/dir_sum = 0 + + for (var/direction in cardinal) + if(locate(/obj/structure/lattice/catwalk, get_step(src, direction))) + dir_sum += direction + else + if(!(istype(get_step(src, direction), /turf/space))) + dir_sum += direction + + icon_state = "[name][dir_sum]" + return \ No newline at end of file diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e5e02663f55..775656ead7d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -18,8 +18,10 @@ /obj/structure/toilet/attack_hand(mob/living/user) if(swirlie) - user.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "You slam the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.") - swirlie.adjustBruteLoss(8) + user.changeNext_move(CLICK_CD_MELEE) + playsound(src.loc, "swing_hit", 25, 1) + swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.") + swirlie.adjustBruteLoss(5) return if(cistern && !open) @@ -55,6 +57,7 @@ return if(istype(I, /obj/item/weapon/grab)) + user.changeNext_move(CLICK_CD_MELEE) var/obj/item/weapon/grab/G = I if(!G.confirm()) return @@ -64,21 +67,23 @@ if(GM.loc != get_turf(src)) user << "[GM] needs to be on [src]." return - if(open && !swirlie) - user.visible_message("[user] starts to give [GM] a swirlie!", "You start to give [GM] a swirlie!") - swirlie = GM - if(do_after(user, 30, 5, 0)) - user.visible_message("[user] gives [GM] a swirlie!", "You give [GM] a swirlie!", "You hear a toilet flushing.") - if(iscarbon(GM)) - var/mob/living/carbon/C = GM - if(!C.internal) - C.adjustOxyLoss(5) - else - GM.adjustOxyLoss(5) - swirlie = null - else - user.visible_message("[user] slams [GM.name] into [src]!", "You slam [GM] into [src]!") - GM.adjustBruteLoss(8) + if(!swirlie) + if(open) + GM.visible_message("[user] starts to give [GM] a swirlie!", "[user] starts to give [GM] a swirlie!") + swirlie = GM + if(do_after(user, 30, 5, 0)) + GM.visible_message("[user] gives [GM] a swirlie!", "[user] gives [GM] a swirlie!", "You hear a toilet flushing.") + if(iscarbon(GM)) + var/mob/living/carbon/C = GM + if(!C.internal) + C.adjustOxyLoss(5) + else + GM.adjustOxyLoss(5) + swirlie = null + else + playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) + GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams [GM.name] into [src]!") + GM.adjustBruteLoss(5) else user << "You need a tighter grip." diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index d748bdd960d..d8e698559c2 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -263,10 +263,6 @@ if(I.damtype == BRUTE || I.damtype == BURN) user.changeNext_move(CLICK_CD_MELEE) hit(I.force) - if(health <= 7) - anchored = 0 - update_nearby_icons() - step(src, get_dir(user, src)) else playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1) ..() diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index bd74639bd6d..6955c0a429d 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -12,6 +12,7 @@ name = "plating" icon_state = "plating" intact = 0 + cancable = 1 broken_states = list("platingdmg1", "platingdmg2", "platingdmg3") burnt_states = list("panelscorched") @@ -63,7 +64,7 @@ if((LC.d1==0)||(LC.d2==0)) LC.attackby(C,user) return - coil.turf_place(src, user) + coil.place_turf(src, user) else if(istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/welder = C if( welder.isOn() && (broken || burnt) ) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index d30300fd82e..d519784cd61 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -76,11 +76,9 @@ /turf/simulated/wall/mech_melee_attack(obj/mecha/M) if(M.damtype == "brute") playsound(src, 'sound/weapons/punch4.ogg', 50, 1) - M.occupant_message("You hit [src].") visible_message("[M.name] has hit [src]!") if(prob(5) && M.force > 20) dismantle_wall(1) - M.occupant_message("You smash through the wall.") visible_message("[src.name] smashes through the wall!") playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 954c4ed91e4..3f422108c16 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -23,15 +23,25 @@ if(istype(C, /obj/item/stack/rods)) var/obj/item/stack/rods/R = C var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) + var/obj/structure/lattice/catwalk/W = locate(/obj/structure/lattice/catwalk, src) + if(W) + user << "There is already a catwalk here." + return if(L) - user << "There is already a lattice." + if(R.use(2)) + user << "Constructing catwalk..." + playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) + qdel(L) + ReplaceWithCatwalk() + else + user << "You need two rods to build a catwalk." return if(R.use(1)) user << "Constructing support lattice..." playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() else - user << "You need one rod to build lattice." + user << "You need one rod to build a lattice." return if(istype(C, /obj/item/stack/tile/plasteel)) var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) @@ -46,6 +56,13 @@ user << "You need one floor tile to build a floor." else user << "The plating is going to need some support. Place metal rods first." + if(istype(C, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = C + for(var/obj/structure/cable/LC in src) + if((LC.d1==0)||(LC.d2==0)) + LC.attackby(C,user) + return + coil.place_turf(src, user) /turf/space/Entered(atom/movable/A) ..() diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 219180b4c3b..a02822d11b2 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -3,6 +3,7 @@ level = 1.0 var/intact = 1 + var/cancable = 0 //Properties for open tiles (/floor) var/oxygen = 0 @@ -173,7 +174,12 @@ /turf/proc/ReplaceWithLattice() src.ChangeTurf(/turf/space) - new /obj/structure/lattice( locate(src.x, src.y, src.z) ) + new /obj/structure/lattice(locate(src.x, src.y, src.z) ) + +/turf/proc/ReplaceWithCatwalk() + src.ChangeTurf(/turf/space) + src.cancable = 1//so cables can be laid + new /obj/structure/lattice/catwalk(locate(src.x, src.y, src.z) ) /turf/proc/phase_damage_creatures(damage,mob/U = null)//>Ninja Code. Hurts and knocks out creatures on this turf for(var/mob/living/M in src) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 20e86957187..77a5b65105e 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -111,3 +111,14 @@ var/global/normal_ooc_colour = "#002eb8" src << ""
dat += "General Settings" dat += "UI Style: [UI_style]" + dat += "Use Custom Pointers: [custom_pointer ? "Yes" : "No"] " dat += "Play admin midis: [(toggles & SOUND_MIDI) ? "Yes" : "No"] " dat += "Play lobby music: [(toggles & SOUND_LOBBY) ? "Yes" : "No"] " dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"] " @@ -739,6 +741,9 @@ datum/preferences else UI_style = "Midnight" + if("pointer") + custom_pointer = !custom_pointer + if("be_special") var/num = text2num(href_list["num"]) be_special ^= (1< " - - buttons -= button - possible_txt -= button_txt - - return start_txt + mocktxt + end_txt + " |