From fe567fabde8ca2bb8257d99d112a615457674a87 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 17 Aug 2017 17:21:44 -0500 Subject: [PATCH] Adds RCL inhands --- code/game/objects/items/weapons/RCL.dm | 34 +++++++++--------- code/game/turfs/turf.dm | 12 +++---- .../mob/inhands/equipment/tools_lefthand.dmi | Bin 4172 -> 4698 bytes .../mob/inhands/equipment/tools_righthand.dmi | Bin 4055 -> 4578 bytes tgstation.dme | 0 5 files changed, 24 insertions(+), 22 deletions(-) mode change 100644 => 100755 tgstation.dme diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm index 495af046af..176b9d19f9 100644 --- a/code/game/objects/items/weapons/RCL.dm +++ b/code/game/objects/items/weapons/RCL.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/twohanded/rcl +/obj/item/twohanded/rcl name = "rapid cable layer" desc = "A device used to rapidly deploy cables. It has screws on the side which can be removed to slide off the cables. Do not use without insulation!" icon = 'icons/obj/tools.dmi' @@ -19,11 +19,13 @@ var/list/colors = list("red", "yellow", "green", "blue", "pink", "orange", "cyan", "white") var/current_color_index = 1 var/ghetto = FALSE + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' -/obj/item/weapon/twohanded/rcl/attackby(obj/item/W, mob/user) +/obj/item/twohanded/rcl/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W - + if(!loaded) if(!user.transferItemToLoc(W, src)) to_chat(user, "[src] is stuck to your hand!") @@ -41,7 +43,7 @@ return update_icon() to_chat(user, "You add the cables to the [src]. It now contains [loaded.amount].") - else if(istype(W, /obj/item/weapon/screwdriver)) + else if(istype(W, /obj/item/screwdriver)) if(!loaded) return if(ghetto && prob(10)) //Is it a ghetto RCL? If so, give it a 10% chance to fall apart @@ -75,18 +77,18 @@ else ..() -/obj/item/weapon/twohanded/rcl/examine(mob/user) +/obj/item/twohanded/rcl/examine(mob/user) ..() if(loaded) to_chat(user, "It contains [loaded.amount]/[max_amount] cables.") -/obj/item/weapon/twohanded/rcl/Destroy() +/obj/item/twohanded/rcl/Destroy() QDEL_NULL(loaded) last = null active = FALSE return ..() -/obj/item/weapon/twohanded/rcl/update_icon() +/obj/item/twohanded/rcl/update_icon() if(!loaded) icon_state = "rcl-0" item_state = "rcl-0" @@ -105,7 +107,7 @@ icon_state = "rcl-0" item_state = "rcl-0" -/obj/item/weapon/twohanded/rcl/proc/is_empty(mob/user, loud = 1) +/obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1) update_icon() if(!loaded || !loaded.amount) if(loud) @@ -118,12 +120,12 @@ return TRUE return FALSE -/obj/item/weapon/twohanded/rcl/dropped(mob/wearer) +/obj/item/twohanded/rcl/dropped(mob/wearer) ..() active = FALSE last = null -/obj/item/weapon/twohanded/rcl/attack_self(mob/user) +/obj/item/twohanded/rcl/attack_self(mob/user) ..() active = wielded if(!active) @@ -134,11 +136,11 @@ last = C break -/obj/item/weapon/twohanded/rcl/on_mob_move(direct, mob/user) +/obj/item/twohanded/rcl/on_mob_move(direct, mob/user) if(active) trigger(user) -/obj/item/weapon/twohanded/rcl/proc/trigger(mob/user) +/obj/item/twohanded/rcl/proc/trigger(mob/user) if(!isturf(user.loc)) return if(is_empty(user, 0)) @@ -170,14 +172,14 @@ is_empty(user) //If we've run out, display message -/obj/item/weapon/twohanded/rcl/pre_loaded/Initialize () //Comes preloaded with cable, for testing stuff +/obj/item/twohanded/rcl/pre_loaded/Initialize () //Comes preloaded with cable, for testing stuff . = ..() loaded = new() loaded.max_amount = max_amount loaded.amount = max_amount update_icon() -/obj/item/weapon/twohanded/rcl/ui_action_click(mob/user, action) +/obj/item/twohanded/rcl/ui_action_click(mob/user, action) if(istype(action, /datum/action/item_action/rcl)) current_color_index++; if (current_color_index > colors.len) @@ -185,13 +187,13 @@ var/cwname = colors[current_color_index] to_chat(user, "Color changed to [cwname]!") -/obj/item/weapon/twohanded/rcl/ghetto +/obj/item/twohanded/rcl/ghetto actions_types = list() max_amount = 30 name = "makeshift rapid cable layer" ghetto = TRUE -/obj/item/weapon/twohanded/rcl/ghetto/update_icon() +/obj/item/twohanded/rcl/ghetto/update_icon() if(!loaded) icon_state = "rclg-0" item_state = "rclg-0" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 4342d12714..a106fdee3d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -85,7 +85,7 @@ /turf/attack_hand(mob/user) user.Move_Pulled(src) -/turf/proc/handleRCL(obj/item/weapon/twohanded/rcl/C, mob/user) +/turf/proc/handleRCL(obj/item/twohanded/rcl/C, mob/user) if(C.loaded) for(var/obj/structure/cable/LC in src) if(!LC.d1 || !LC.d2) @@ -104,7 +104,7 @@ coil.place_turf(src, user) return TRUE - else if(istype(C, /obj/item/weapon/twohanded/rcl)) + else if(istype(C, /obj/item/twohanded/rcl)) handleRCL(C, user) return FALSE @@ -226,7 +226,7 @@ var/old_affecting_lights = affecting_lights var/old_lighting_object = lighting_object var/old_corners = corners - + var/old_exl = explosion_level var/old_exi = explosion_id var/old_bp = blueprint_data @@ -250,7 +250,7 @@ W.AfterChange(ignore_air) W.blueprint_data = old_bp - + if(SSlighting.initialized) recalc_atom_opacity() lighting_object = old_lighting_object @@ -338,7 +338,7 @@ /turf/proc/Bless() flags |= NOJAUNT -/turf/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) +/turf/storage_contents_dump_act(obj/item/storage/src_object, mob/user) if(src_object.contents.len) to_chat(usr, "You start dumping out the contents...") if(!do_after(usr,20,target=src_object)) @@ -346,7 +346,7 @@ var/list/things = src_object.contents.Copy() var/datum/progressbar/progress = new(user, things.len, src) - while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, /obj/item/weapon/storage.proc/mass_remove_from_storage, src, things, progress))) + while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, /obj/item/storage.proc/mass_remove_from_storage, src, things, progress))) sleep(1) qdel(progress) diff --git a/icons/mob/inhands/equipment/tools_lefthand.dmi b/icons/mob/inhands/equipment/tools_lefthand.dmi index c694968cd19dffa60c23fa7cc2d38715035b3c3a..4f256eea92369d1a871f3960673b8b6721f4b4d1 100644 GIT binary patch delta 4185 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 Y=7;nsn92R}#~<-cliS8+Mh`>(3n;l8UH||9 delta 3546 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 UzDw??|Mv}ZQ!A75lg{`410!nO761SM diff --git a/tgstation.dme b/tgstation.dme old mode 100644 new mode 100755