From 2f7054128d032864944e8ed00b256194137dd604 Mon Sep 17 00:00:00 2001 From: Miniature Date: Tue, 8 Nov 2011 19:50:43 +1030 Subject: [PATCH 1/3] Ported hand labeler --- .../objects/items/weapons/hand_lablers.dm | 104 ++++++++++++++---- icons/obj/items.dmi | Bin 48069 -> 48357 bytes 2 files changed, 80 insertions(+), 24 deletions(-) diff --git a/code/game/objects/items/weapons/hand_lablers.dm b/code/game/objects/items/weapons/hand_lablers.dm index bde3a17c834..d7eb6defa51 100644 --- a/code/game/objects/items/weapons/hand_lablers.dm +++ b/code/game/objects/items/weapons/hand_lablers.dm @@ -1,33 +1,50 @@ +/atom/var/list/labels + +//how to place label: +//1: set label in labeller +//2: pick up label object +//3: click on label with the hand the label is in +//4: place label on something +//how to remove label +//1: use labeller on item +//2: select label to remove (if there is >1 label anyway, if there is only one it will just remove that one) /obj/item/weapon/hand_labeler icon = 'items.dmi' icon_state = "labeler" item_state = "flight" name = "Hand labeler" - var/label = null - var/labels_left = 30 /obj/item/weapon/hand_labeler/afterattack(atom/A, mob/user as mob) - if(A==loc) // if placing the labeller into something (e.g. backpack) - return // don't set a label + if(A==loc) // if placing the labeller into something (e.g. backpack) + return // don't remove any labels + if(A.labels.len == 1) + var/t = A.labels[1] + A.name = copytext(A.name,1,lentext(A.name) - (lentext(t) + 2)) + A.labels -= t + return + if(A.labels.len > 1) + var/t = input(user, "Which label do you want to remove?") as null|anything in A.labels + var/i = 1 + for(, i <= labels.len, i++) //find the thing of the label to remove + if(A.labels[i] == t) + break + if(i != A.labels.len) //if we arent removing the last label + var/k = 0 + for(var/j = i+1, j <= A.labels.len, j++) + k += lentext(A.labels[j]) + 3 // 3 = " (" + ")" + var/labelend = lentext(A.name) - (k-1) + var/labelstart = labelend - (lentext(t)+3) + A.name = addtext(copytext(A.name,1,labelstart),copytext(A.name,labelend,0)) + A.labels -= t + return + if(i == A.labels.len) //if this is the last label we don't need to find the length of the stuff infront of it + var/labelstart = lentext(A.name) - (lentext(t)+3) + A.name = copytext(A.name,1,labelstart) + A.labels -= t + return + user << "\red Something broke. Please report this (that you were trying to remove a label and what the full name of the item was) to an admin or something." - if(!labels_left) - user << "\red No labels left." - return - if(!label || !length(label)) - user << "\red No text set." - return - if(length(A.name) + length(label) > 64) - user << "\red Label too big." - return - if(ishuman(A)) - user << "\red You can't label humans." - return - - for(var/mob/M in viewers()) - M << "\blue [user] labels [A] as [label]." - A.name = "[A.name] ([label])" - -/obj/item/weapon/hand_labeler/attack_self() +/obj/item/weapon/hand_labeler/attack_self(mob/user as mob) var/str = input(usr,"Label text?","Set label","") if(!str || !length(str)) usr << "\red Invalid text." @@ -35,5 +52,44 @@ if(length(str) > 64) usr << "\red Text too long." return - label = str - usr << "\blue You set the text to '[str]'." \ No newline at end of file + var/obj/item/weapon/label/A = new/obj/item/weapon/label + A.label = str + A.loc = user.loc + A.name += " - '[str]'" + +/obj/item/weapon/label + icon = 'items.dmi' + icon_state = "label" + name = "Label" + w_class = 2 + var/label = "" + var/backing = 1 //now with added being able to be put on table-ness! + +/obj/item/weapon/label/afterattack(atom/A, mob/user as mob) + if(!backing) + if(A==loc) // if placing the label into something (e.g. backpack) + return // don't stick it on + if(!label || !length(label)) + user << "\red This label doesn't have any text! How did this happen?!?" + return + if(length(A.name) + length(label) > 64) //this needs to be made bigger too. maybe number of labels instead of a fixed length + user << "\red Label too big." + return + if(ishuman(A)) + user << "\red You can't label humans." + return + for(var/i = 1, i < A.labels.len, i++) + if(label == A.labels[i]) + user << "\red [A] already has that label!" + return + + for(var/mob/M in viewers()) + M << "\blue [user] puts a label on [A]." + A.name = "[A.name] ([label])" + A.labels += label + del(src) + +/obj/item/weapon/label/attack_self(mob/user as mob) //here so you can put them on tables and stuff more easily to stop them from being all over the floor until you want to use them + if(backing) + backing = 0 + user << "\blue You remove the backing from the label." //now it will stick to things \ No newline at end of file diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 5919c6b1839c417443ac790799d1e673adc98eeb..3ef9765223800d44c36b8e5985152b0b2e00ba67 100644 GIT binary patch delta 8069 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 mpTAZ5j|BPOfAxP1uZi!n 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 From 460e23f45a5eed8ed4db3f929a66afd9bb6ba054 Mon Sep 17 00:00:00 2001 From: Miniature Date: Tue, 8 Nov 2011 23:50:36 +1030 Subject: [PATCH 2/3] Removed clown, mime --- code/game/jobs/job/civilian.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 5a1271e0ea4..810185ea97d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -133,6 +133,7 @@ +/* //Griff /datum/job/clown title = "Clown" @@ -189,6 +190,7 @@ H.mind.special_verbs += /client/proc/mimewall H.miming = 1 return 1 +*/ From c450a917d6272dc6c47701ce8fabe9af8316c6e3 Mon Sep 17 00:00:00 2001 From: Miniature Date: Tue, 8 Nov 2011 23:57:40 +1030 Subject: [PATCH 3/3] Made clown mech not buildable --- code/game/mecha/mech_fabricator.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 456745e0eb7..6ee232d1162 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -72,15 +72,6 @@ /obj/item/mecha_parts/part/durand_right_leg, /obj/item/mecha_parts/part/durand_armour ), - "H.O.N.K"=list( - /obj/item/mecha_parts/chassis/honker, - /obj/item/mecha_parts/part/honker_torso, - /obj/item/mecha_parts/part/honker_head, - /obj/item/mecha_parts/part/honker_left_arm, - /obj/item/mecha_parts/part/honker_right_arm, - /obj/item/mecha_parts/part/honker_left_leg, - /obj/item/mecha_parts/part/honker_right_leg - ), "Exosuit Equipment"=list( /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, /obj/item/mecha_parts/mecha_equipment/tool/drill,