From 77ee2ded62a2c285ccdda4ba2fd7e64f05ef4e3e Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 20 Feb 2016 13:33:51 +0100 Subject: [PATCH 1/4] Renames click intercept method to avoid collision with ClickOn --- code/_onclick/ai.dm | 4 ++-- code/_onclick/click.dm | 2 +- code/_onclick/cyborg.dm | 2 +- code/_onclick/observer.dm | 4 ++-- code/modules/admin/verbs/buildmode.dm | 2 +- code/modules/client/client defines.dm | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index e354fbbe2d4..92590a9c361 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -11,7 +11,7 @@ */ /mob/living/silicon/ai/DblClickOn(var/atom/A, params) if(client.click_intercept) - if(call(client.click_intercept, "ClickOn")(src, params, A)) + if(call(client.click_intercept, "InterceptClickOn")(src, params, A)) return if(control_disabled || stat) return @@ -28,7 +28,7 @@ next_click = world.time + 1 if(client.click_intercept) - if(call(client.click_intercept, "ClickOn")(src, params, A)) + if(call(client.click_intercept, "InterceptClickOn")(src, params, A)) return if(control_disabled || stat) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 294b5361da6..0231e7b0bdd 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -54,7 +54,7 @@ next_click = world.time + 1 if(client.click_intercept) - if(call(client.click_intercept, "ClickOn")(src, params, A)) + if(call(client.click_intercept, "InterceptClickOn")(src, params, A)) return var/list/modifiers = params2list(params) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 3d32ee284cb..e0052ef1aaf 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -12,7 +12,7 @@ next_click = world.time + 1 if(client.click_intercept) - if(call(client.click_intercept,"ClickOn")(src,params,A)) + if(call(client.click_intercept,"InterceptClickOn")(src,params,A)) return if(stat || lockcharge || weakened || stunned || paralysis) diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index ba3c1c05783..8f818f47a88 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -1,6 +1,6 @@ /mob/dead/observer/DblClickOn(var/atom/A, var/params) if(client.click_intercept) - if(call(client.click_intercept,"ClickOn")(src,params,A)) + if(call(client.click_intercept,"InterceptClickOn")(src,params,A)) return if(can_reenter_corpse && mind && mind.current) @@ -19,7 +19,7 @@ /mob/dead/observer/ClickOn(var/atom/A, var/params) if(client.click_intercept) - if(call(client.click_intercept,"ClickOn")(src,params,A)) + if(call(client.click_intercept,"InterceptClickOn")(src,params,A)) return var/list/modifiers = params2list(params) diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index bd04c75653b..ee06e3a1f8a 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -232,7 +232,7 @@ log_admin("[key_name(usr)] has entered build mode.") -/datum/buildmode/proc/ClickOn(user,params,atom/object) //Click Intercept +/datum/buildmode/proc/InterceptClickOn(user,params,atom/object) //Click Intercept var/list/pa = params2list(params) var/right_click = pa.Find("right") var/left_click = pa.Find("left") diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index ca9ced5dc8e..c0241ba6b74 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -4,7 +4,7 @@ //ADMIN THINGS// //////////////// var/datum/admins/holder = null - var/datum/click_intercept = null // Needs to implement ClickOn(user,params,atom) proc + var/datum/click_intercept = null // Needs to implement InterceptClickOn(user,params,atom) proc var/AI_Interact = 0 var/jobbancache = null //Used to cache this client's jobbans to save on DB queries From 1a59dbaee189320ce01fab13d0f9f16b0c3e02df Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 20 Feb 2016 13:34:12 +0100 Subject: [PATCH 2/4] Fixes Experimentor runtime --- code/modules/research/experimentor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 66a1e5925c0..d1cfb270184 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -1,4 +1,4 @@ -//this is designed to replace the destructive analyzer +f//this is designed to replace the destructive analyzer #define SCANTYPE_POKE 1 #define SCANTYPE_IRRADIATE 2 @@ -576,7 +576,7 @@ var/list/temp_tech = ConvertReqString2List(process.origin_tech) for(var/T in temp_tech) linked_console.files.UpdateTech(T, temp_tech[T]) - linked_console.files.UpdateDesigns(process,process.type) + linked_console.files.UpdateDesigns(process,temp_tech) src.updateUsrDialog() return From 48e9fb731f0390a18d9dbb228f09019fc5906f9f Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 20 Feb 2016 13:35:43 +0100 Subject: [PATCH 3/4] Adds missing ..() in SSU New --- code/game/machinery/suit_storage_unit.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 097ca74cc44..ca12ad9a4a5 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -97,6 +97,7 @@ storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/New() + ..() wires = new /datum/wires/suit_storage_unit(src) if(suit_type) suit = new suit_type(src) From ceb9af945c9b52b9c6ae6192dc1fd24bba39a8c7 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 20 Feb 2016 18:12:20 +0100 Subject: [PATCH 4/4] Removes typo. Makes Load Template verb get turf after input. --- code/modules/admin/verbs/map_template_loadverb.dm | 8 ++++---- code/modules/research/experimentor.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm index be9bc8c4aec..2801c0477c9 100644 --- a/code/modules/admin/verbs/map_template_loadverb.dm +++ b/code/modules/admin/verbs/map_template_loadverb.dm @@ -2,16 +2,16 @@ set category = "Debug" set name = "Map template - Place" + var/map = input(usr, "Choose a Map Template to place at your CURRENT LOCATION","Place Map Template") as null|anything in map_templates + if(!map) + return + var/turf/T = get_turf(mob) if(!T) return var/datum/map_template/template - var/map = input(usr, "Choose a Map Template to place at your CURRENT LOCATION","Place Map Template") as null|anything in map_templates - if(!map) - return - template = map_templates[map] template.load(T) message_admins("[key_name_admin(usr)] has placed a map template ([template.name]) at (JMP)") diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index d1cfb270184..73a714916d6 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -1,4 +1,4 @@ -f//this is designed to replace the destructive analyzer +//this is designed to replace the destructive analyzer #define SCANTYPE_POKE 1 #define SCANTYPE_IRRADIATE 2