From 8ae76446b70e4052708b9b61a36da7b40f16f3e9 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 8 Jul 2014 19:44:33 +0930 Subject: [PATCH] Temp commit with robot module work Conflicts: icons/mob/head.dmi --- .../mob/living/silicon/robot/robot_items.dm | 30 ++++++++++++++---- .../mob/living/silicon/robot/robot_modules.dm | 18 +++++++++++ icons/mob/roaper.dmi | Bin 0 -> 4938 bytes 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 icons/mob/roaper.dmi diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 1c24a5e75dd..00d1b0abf0c 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -95,14 +95,26 @@ var/mode = 1 /obj/item/weapon/pen/robopen/attack_self(mob/user as mob) + + var/choice = input("Would you like to change colour or mode?") as null|anything in list("Colour","Mode") + if(!choice) return + playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) - if (mode == 1) - mode = 2 - user << "Changed printing mode to 'Rename Paper'" + + switch(choice) + + if("Colour") + var/newcolour = input("Which colour would you like to use?") as null|anything in list("black","blue","red","green","yellow") + if(newcolour) color = newcolour + + if("Mode") + if (mode == 1) + mode = 2 + else + mode = 1 + user << "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'" + return - if (mode == 2) - mode = 1 - user << "Changed printing mode to 'Write Paper'" // Copied over from paper's rename verb // see code\modules\paperwork\paper.dm line 62 @@ -120,6 +132,12 @@ add_fingerprint(user) return +/obj/item/weapon/form_printer + name = "paperwork printer" + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "paper_bin1" + item_state = "sheet-metal" + //Personal shielding for the combat module. /obj/item/borg/combat/shield name = "personal shielding" diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 299e2641f0c..fb933b99f5e 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -283,6 +283,24 @@ return +/obj/item/weapon/robot_module/clerical + name = "clerical robot module" + + New() + src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) + src.modules += new /obj/item/weapon/pen/robopen(src) + + add_languages(var/mob/living/silicon/robot/R) + R.add_language("Sol Common", 1) + R.add_language("Sinta'unathi", 1) + R.add_language("Siik'maas", 1) + R.add_language("Siik'tajr", 0) + R.add_language("Skrellian", 1) + R.add_language("Rootspeak", 1) + R.add_language("Tradeband", 1) + R.add_language("Gutter", 1) + /obj/item/weapon/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R) var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules E.reagents.add_reagent("enzyme", 2) diff --git a/icons/mob/roaper.dmi b/icons/mob/roaper.dmi new file mode 100644 index 0000000000000000000000000000000000000000..272251ec8ae71477500d8a295f13e29c32d6c2a9 GIT binary patch literal 4938 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