diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index a06a52c1a7c..772b2e98157 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -194,25 +194,6 @@ beakers += B1 beakers += B2 icon_state = "chemg_locked" -/* -/obj/item/weapon/chem_grenade/poo - name = "poo grenade" - desc = "A ShiTastic! brand biological warfare charge. Not very effective unless the target is squeamish." - icon_state = "chemg3" - stage = 2 - - New() - ..() - var/obj/item/weapon/reagent_containers/glass/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/B2 = new(src) - - B1.reagents.add_reagent("poo", 30) - B2.reagents.add_reagent("poo", 30) - - beakers += B1 - beakers += B2 -*/ -///////////////////////////////Grenades /obj/syringe_gun_dummy name = "" @@ -306,8 +287,6 @@ return - - /obj/reagent_dispensers name = "Dispenser" desc = "..." @@ -2254,8 +2233,8 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/tea - name = "Sandy Balls Tea" - desc = "The perfect tea for those who enjoy life's simple pleasures." + name = "Duke Purple Tea" + desc = "For excellent taste, you can always bet on Duke Purple." icon_state = "tea" New() ..() diff --git a/code/defines/global.dm b/code/defines/global.dm index 7f74688d0c9..3b72e853f17 100644 --- a/code/defines/global.dm +++ b/code/defines/global.dm @@ -71,7 +71,7 @@ var enter_allowed = 1 shuttle_frozen = 0 shuttle_left = 0 - tinted_weldhelh = 1 + tinted_weldhelh = 0 captainMax = 1 engineerMax = 5 diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index eca75728eee..ce3e20d6003 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -89,6 +89,12 @@ icon_state = "labcoat_cmo" item_state = "labcoat_cmo" +/obj/item/clothing/suit/labcoat/mad + name = "The Mad's labcoat" + desc = "It makes you look capable of konking someone on the noggin and shooting them into space." + icon_state = "labcoat_cmo" + item_state = "labcoat_cmo" + /obj/item/clothing/suit/straight_jacket name = "straight jacket" desc = "A suit that totally restrains an individual" diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index 6c260783a46..33ecfd94f14 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -47,8 +47,8 @@ product_hideamt = "5;2" /obj/machinery/vending/coffee - name = "Warm drinks machine" - desc = "A vending machine which dispenses warm drinks." + name = "Hot Drinks machine" + desc = "A vending machine which dispenses hot drinks." icon_state = "coffee" icon_vend = "coffee-vend" product_paths = "/obj/item/weapon/reagent_containers/food/drinks/coffee;/obj/item/weapon/reagent_containers/food/drinks/tea" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 53a7326b255..f6da9ce8bd4 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -38,8 +38,8 @@ /mob/living/silicon/robot/proc/pick_module() if(src.module) return - //var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Janitor", "Brobot") - var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Janitor", "Brobot", "Security") + //var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Janitor", "Service", "Brobot") + var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Janitor", "Brobot", "Service", "Security") if(src.module) return switch(mod) @@ -48,6 +48,13 @@ src.hands.icon_state = "standard" src.icon_state = "robot" src.modtype = "Stand" + + if("Service") + src.module = new /obj/item/weapon/robot_module/butler(src) + src.hands.icon_state = "service" + src.icon_state = "Service" + src.modtype = "Butler" + /* if("Medical") src.module = new /obj/item/weapon/robot_module/medical(src) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 3534642f8cf..aeb598b16df 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -34,6 +34,9 @@ /obj/item/weapon/robot_module/brobot name = "brobot robot module" +/obj/item/weapon/robot_module/butler + name = "service robot module" + /obj/item/weapon/robot_module/New()//Shit all the mods have src.modules += new /obj/item/device/flash(src) src.emag = new /obj/item/toy/sword(src) @@ -92,6 +95,19 @@ src.modules += new /obj/item/weapon/circular_saw(src) */ + +/obj/item/weapon/robot_module/butler/New() + ..() + src.modules += new /obj/item/weapon/spacecash(src) + src.modules += new /obj/item/weapon/pen(src) + src.modules += new /obj/item/weapon/paper(src) + src.modules += new /obj/item/weapon/reagent_containers/dropper(src) + src.modules += new /obj/item/weapon/tray(src) + src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src) + src.emag = new /obj/item/weapon/sword(src) + src.emag.name = "Helper's Little Helper" + + /obj/item/weapon/robot_module/security/New() ..() src.modules += new /obj/item/weapon/baton(src) diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index b8050f67cf3..ad91fbda59b 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ diff --git a/icons/mob/screen1_robot.dmi b/icons/mob/screen1_robot.dmi index 0e73d977dbf..9db5d1a2416 100644 Binary files a/icons/mob/screen1_robot.dmi and b/icons/mob/screen1_robot.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index a2cf39b48c9..75c719d565b 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 75684812104..f468da9057e 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 4b8d3fa0f9b..2d3936f8676 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ