From f9af83f20f12b39a893128b886239c50881af4f4 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 15 Nov 2015 21:38:57 +0100 Subject: [PATCH 01/11] Fixes invisible wrapping paper --- icons/obj/storage.dmi | Bin 75593 -> 76841 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index b74424a54851f26432fe4dd1756e2296178ea239..8c930f53059eeebfc8eb4b879bce1d51a816ac58 100644 GIT binary patch delta 17642 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 delta 16408 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 Date: Sun, 15 Nov 2015 21:53:21 +0100 Subject: [PATCH 02/11] Fixes Sonic Jackhammer --- code/game/objects/structures/false_walls.dm | 4 ++-- code/game/objects/structures/girders.dm | 6 ++++++ code/game/turfs/simulated/walls.dm | 9 +++++++++ code/game/turfs/simulated/walls_reinforced.dm | 9 ++++++++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 21208b26ca6..d24a92d87b6 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -120,7 +120,7 @@ else user << "You can't reach, close it first!" - if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/melee/energy/blade)) + if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/pickaxe/drill/jackhammer) || istype(W, /obj/item/weapon/melee/energy/blade)) dismantle(user) /obj/structure/falsewall/proc/dismantle(mob/user) @@ -221,7 +221,7 @@ icon_state = "" mineral = "plasma" walltype = "plasma" - + /obj/structure/falsewall/plasma/attackby(obj/item/weapon/W, mob/user, params) if(is_hot(W) > 300) message_admins("Plasma falsewall ignited by [key_name_admin(user)] in ([x],[y],[z] - JMP)",0,1) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 19c2dd13ec8..33083acf9e8 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -37,6 +37,12 @@ new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src) + else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) + playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 100, 1) + user << "\blue You disintegrate the girder!" + new /obj/item/stack/sheet/metal(get_turf(src)) + qdel(src) + else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user << "\blue Now unsecuring support struts" diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 1de9e588ef1..a54a2ddf1d9 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -385,6 +385,15 @@ dismantle_wall() visible_message("[user] drills through \the [src]!","You hear the grinding of metal.") + else if (istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) + + user << "You begin to disintegrate the wall." + + if(do_after(user, mineral == "diamond" ? 60 : 30, target = src)) + user << "Your jackhammer disintegrate the reinforced plating." + dismantle_wall() + visible_message("[user] disintegrates \the [src]!","You hear the grinding of metal.") + else if(istype(W, /obj/item/weapon/melee/energy/blade)) var/obj/item/weapon/melee/energy/blade/EB = W diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 1bba122d39e..fb8e6e78c07 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -202,7 +202,14 @@ user << "You begin to drill though the wall." if(do_after(user, 200, target = src)) - user << "Your drill tears though the last of the reinforced plating." + user << "Your drill tears through the last of the reinforced plating." + dismantle_wall() + + if(istype(W,/obj/item/weapon/pickaxe/drill/jackhammer)) + user << "You begin to disintegrate the wall." + + if(do_after(user, 100, target = src)) + user << "Your sonic jackhammer disintegrate the reinforced plating." dismantle_wall() //REPAIRING From 723e168f1e93c02842f3d6845716e462decefbfc Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 15 Nov 2015 22:17:33 +0100 Subject: [PATCH 03/11] Gives Drones ventcrawl --- code/modules/mob/living/silicon/robot/drone/drone.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index bd7b023b5b6..5bffc3175f3 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -12,6 +12,7 @@ braintype = "Robot" lawupdate = 0 density = 1 + ventcrawler = 2 req_access = list(access_engine, access_robotics) local_transmit = 1 From 5a714bae2ac766ae2bc80f54172c1e21dab9e453 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 15 Nov 2015 23:04:26 +0100 Subject: [PATCH 04/11] Fixes Hulk and TK sometimes not being visible --- code/game/dna/genes/powers.dm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index 19cab0c0bfc..effe084697a 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -113,10 +113,16 @@ activate(var/mob/M, var/connected, var/flags) ..(M,connected,flags) M.pass_flags |= PASSTABLE + M.resize = 0.8 + if(TK in M.mutations) + M.flying =1 + deactivate(var/mob/M, var/connected, var/flags) ..() M.pass_flags &= ~PASSTABLE + M.resize = 1.25 + M.flying = 0 // OLD HULK BEHAVIOR /datum/dna/gene/basic/hulk @@ -138,10 +144,12 @@ ..() var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH M.status_flags &= ~status + M.resize = 1.25 deactivate(var/mob/M, var/connected, var/flags) ..() M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH + M.resize = 0.8 OnDrawUnderlays(var/mob/M,var/g,var/fat) if(HULK in M.mutations) @@ -184,4 +192,14 @@ block=TELEBLOCK OnDrawUnderlays(var/mob/M,var/g,var/fat) - return "telekinesishead[fat]_s" \ No newline at end of file + return "telekinesishead[fat]_s" + + activate(var/mob/M, var/connected, var/flags) + ..(M,connected,flags) + if(DWARF in M.mutations) + M.flying =1 + + + deactivate(var/mob/M, var/connected, var/flags) + ..() + M.flying = 0 \ No newline at end of file From 5c50d20d676a7477fb45a8f80ab173d13e0a6435 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Mon, 16 Nov 2015 08:51:43 +0100 Subject: [PATCH 05/11] Fixes field surgical kits --- code/game/objects/items/weapons/storage/firstaid.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 011d337cea0..c4da0fe3a19 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -154,6 +154,7 @@ icon_state = "duffel-med" desc = "A kit for surgery in the field." max_w_class = 4 + max_combined_w_class = 21 storage_slots = 10 can_hold = list("/obj/item/roller","/obj/item/weapon/bonesetter","/obj/item/weapon/bonegel", "/obj/item/weapon/scalpel", "/obj/item/weapon/hemostat", "/obj/item/weapon/cautery", "/obj/item/weapon/retractor", "/obj/item/weapon/FixOVein", "/obj/item/weapon/surgicaldrill", "/obj/item/weapon/circular_saw") From e92a59d67f495e8d930b85bc1d664a3c7eb050ff Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Tue, 17 Nov 2015 07:54:45 +0100 Subject: [PATCH 06/11] Revert Dwarf, TK and Hulk visibility --- code/game/dna/genes/powers.dm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index effe084697a..19cab0c0bfc 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -113,16 +113,10 @@ activate(var/mob/M, var/connected, var/flags) ..(M,connected,flags) M.pass_flags |= PASSTABLE - M.resize = 0.8 - if(TK in M.mutations) - M.flying =1 - deactivate(var/mob/M, var/connected, var/flags) ..() M.pass_flags &= ~PASSTABLE - M.resize = 1.25 - M.flying = 0 // OLD HULK BEHAVIOR /datum/dna/gene/basic/hulk @@ -144,12 +138,10 @@ ..() var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH M.status_flags &= ~status - M.resize = 1.25 deactivate(var/mob/M, var/connected, var/flags) ..() M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH - M.resize = 0.8 OnDrawUnderlays(var/mob/M,var/g,var/fat) if(HULK in M.mutations) @@ -192,14 +184,4 @@ block=TELEBLOCK OnDrawUnderlays(var/mob/M,var/g,var/fat) - return "telekinesishead[fat]_s" - - activate(var/mob/M, var/connected, var/flags) - ..(M,connected,flags) - if(DWARF in M.mutations) - M.flying =1 - - - deactivate(var/mob/M, var/connected, var/flags) - ..() - M.flying = 0 \ No newline at end of file + return "telekinesishead[fat]_s" \ No newline at end of file From a2a814d04a33ad608633283a682a5fda683b19fb Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Wed, 18 Nov 2015 01:31:44 +0100 Subject: [PATCH 07/11] Fixes conflict --- code/modules/mob/living/silicon/robot/drone/drone.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 5bffc3175f3..5fefccbdd4f 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -11,7 +11,7 @@ pass_flags = PASSTABLE braintype = "Robot" lawupdate = 0 - density = 1 + density = 0 ventcrawler = 2 req_access = list(access_engine, access_robotics) local_transmit = 1 @@ -336,4 +336,8 @@ src.verbs |= silicon_subsystems /mob/living/silicon/robot/drone/remove_robot_verbs() - src.verbs -= silicon_subsystems \ No newline at end of file + src.verbs -= silicon_subsystems + +/mob/living/silicon/robot/drone/update_canmove() + . = ..() + density = 0 //this is reset every canmove update otherwise \ No newline at end of file From 72cef933fd67830bbaf824bae607a388a24cfd5c Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Wed, 18 Nov 2015 01:36:49 +0100 Subject: [PATCH 08/11] Second try on fixing conflict --- .../modules/mob/living/silicon/robot/drone/drone.dm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 5fefccbdd4f..c26186232c2 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -78,15 +78,12 @@ aiCamera = new/obj/item/device/camera/siliconcam/drone_camera(src) additional_law_channels["Drone"] = ";" - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) - //Redefining some robot procs... /mob/living/silicon/robot/drone/SetName(pickedName as text) // Would prefer to call the grandparent proc but this isn't possible, so.. real_name = pickedName name = real_name - //Redefining some robot procs... /mob/living/silicon/robot/drone/updatename() real_name = "maintenance drone ([rand(100,999)])" @@ -289,7 +286,6 @@ src << "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI." src << "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets." src << "Make sure crew members do not notice you.." - /* sprite["Default"] = "repairbot" sprite["Mk2 Mousedrone"] = "mk2" @@ -298,11 +294,8 @@ icontype = input(player,"Pick an icon") in sprite icon_state = sprite[icontype] updateicon() - choose_icon(6,sprite) */ - - /mob/living/silicon/robot/drone/Bump(atom/movable/AM as mob|obj, yes) if (!yes || ( \ !istype(AM,/obj/machinery/door) && \ @@ -313,12 +306,9 @@ )) return ..() return - /mob/living/silicon/robot/drone/Bumped(AM as mob|obj) return - /mob/living/silicon/robot/drone/start_pulling(var/atom/movable/AM) - if(istype(AM,/obj/item/pipe) || istype(AM,/obj/structure/disposalconstruct)) ..() else if(istype(AM,/obj/item)) @@ -331,13 +321,10 @@ else src << "You are too small to pull that." return - /mob/living/silicon/robot/drone/add_robot_verbs() src.verbs |= silicon_subsystems - /mob/living/silicon/robot/drone/remove_robot_verbs() src.verbs -= silicon_subsystems - /mob/living/silicon/robot/drone/update_canmove() . = ..() density = 0 //this is reset every canmove update otherwise \ No newline at end of file From a917442674346f596b6ca656a3ac634e9b619efb Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Wed, 18 Nov 2015 01:38:07 +0100 Subject: [PATCH 09/11] Removes drone changes --- .../mob/living/silicon/robot/drone/drone.dm | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index c26186232c2..bd7b023b5b6 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -11,8 +11,7 @@ pass_flags = PASSTABLE braintype = "Robot" lawupdate = 0 - density = 0 - ventcrawler = 2 + density = 1 req_access = list(access_engine, access_robotics) local_transmit = 1 @@ -78,12 +77,15 @@ aiCamera = new/obj/item/device/camera/siliconcam/drone_camera(src) additional_law_channels["Drone"] = ";" + playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) + //Redefining some robot procs... /mob/living/silicon/robot/drone/SetName(pickedName as text) // Would prefer to call the grandparent proc but this isn't possible, so.. real_name = pickedName name = real_name + //Redefining some robot procs... /mob/living/silicon/robot/drone/updatename() real_name = "maintenance drone ([rand(100,999)])" @@ -286,6 +288,7 @@ src << "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI." src << "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets." src << "Make sure crew members do not notice you.." + /* sprite["Default"] = "repairbot" sprite["Mk2 Mousedrone"] = "mk2" @@ -294,8 +297,11 @@ icontype = input(player,"Pick an icon") in sprite icon_state = sprite[icontype] updateicon() + choose_icon(6,sprite) */ + + /mob/living/silicon/robot/drone/Bump(atom/movable/AM as mob|obj, yes) if (!yes || ( \ !istype(AM,/obj/machinery/door) && \ @@ -306,9 +312,12 @@ )) return ..() return + /mob/living/silicon/robot/drone/Bumped(AM as mob|obj) return + /mob/living/silicon/robot/drone/start_pulling(var/atom/movable/AM) + if(istype(AM,/obj/item/pipe) || istype(AM,/obj/structure/disposalconstruct)) ..() else if(istype(AM,/obj/item)) @@ -321,10 +330,9 @@ else src << "You are too small to pull that." return + /mob/living/silicon/robot/drone/add_robot_verbs() src.verbs |= silicon_subsystems + /mob/living/silicon/robot/drone/remove_robot_verbs() - src.verbs -= silicon_subsystems -/mob/living/silicon/robot/drone/update_canmove() - . = ..() - density = 0 //this is reset every canmove update otherwise \ No newline at end of file + src.verbs -= silicon_subsystems \ No newline at end of file From 51d3724abf263827842a442bb0804f3c982f5e12 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Thu, 19 Nov 2015 00:36:56 +0100 Subject: [PATCH 10/11] Typos, fixes and whatnot --- code/game/objects/structures/girders.dm | 4 ++-- code/game/turfs/simulated/walls.dm | 2 +- code/game/turfs/simulated/walls_reinforced.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 33083acf9e8..e3861348f95 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -37,9 +37,9 @@ new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src) - else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) + else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 100, 1) - user << "\blue You disintegrate the girder!" + user << You Disintegrate the girder! new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index a54a2ddf1d9..46cad11d9c5 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -387,7 +387,7 @@ else if (istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) - user << "You begin to disintegrate the wall." + user << "You begin to disintegrates the wall." if(do_after(user, mineral == "diamond" ? 60 : 30, target = src)) user << "Your jackhammer disintegrate the reinforced plating." diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index fb8e6e78c07..4c7f1baf020 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -209,7 +209,7 @@ user << "You begin to disintegrate the wall." if(do_after(user, 100, target = src)) - user << "Your sonic jackhammer disintegrate the reinforced plating." + user << "Your sonic jackhammer disintegrates the reinforced plating." dismantle_wall() //REPAIRING From b774e54a4dccffda503aa8b17372560eb59906b9 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Thu, 19 Nov 2015 00:41:18 +0100 Subject: [PATCH 11/11] Forgot two " --- code/game/objects/structures/girders.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index e3861348f95..f227df88ed6 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -39,7 +39,7 @@ else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 100, 1) - user << You Disintegrate the girder! + user << "You Disintegrate the girder!" new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src)