diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm index 2b57806d0e0..ed58a1f0a5f 100644 --- a/code/game/objects/items/weapons/alien_specific.dm +++ b/code/game/objects/items/weapons/alien_specific.dm @@ -19,14 +19,14 @@ //Bottles for borg liquid squirters. PSSH PSSH /obj/item/reagent_containers/spray/alien - name = "liquid synthesizer" - desc = "squirts alien liquids." + name = "generic chemical synthesizer" + desc = "If you can see this, make an issue report on GitHub. Something has gone wrong!" icon = 'icons/mob/alien.dmi' icon_state = "borg-default" /obj/item/reagent_containers/spray/alien/smoke - name = "smoke synthesizer" - desc = "squirts smokey liquids." + name = "smokescreen module" + desc = "Releases a dense smoke cloud that cannot be seen through. Your thermal vision is still able to see targets through it." icon = 'icons/mob/alien.dmi' icon_state = "borg-spray-smoke" list_reagents = list("water" = 50) @@ -50,8 +50,8 @@ reagents.check_and_add("water", volume, 2 * coeff) /obj/item/reagent_containers/spray/alien/acid - name = "acid synthesizer" - desc = "squirts burny liquids." + name = "polyacid synthesizer" + desc = "Sprays concentrated polyacid." icon = 'icons/mob/alien.dmi' icon_state = "borg-spray-acid" list_reagents = list("facid" = 125, "sacid" = 125) @@ -60,20 +60,14 @@ reagents.check_and_add("facid", volume / 2, 2 * coeff) // Volume / 2 here becuase there should be an even amount of both chems. reagents.check_and_add("sacid", volume / 2, 2 * coeff) -/obj/item/reagent_containers/spray/alien/stun - name = "paralytic toxin synthesizer" - desc = "squirts ether." - icon = 'icons/mob/alien.dmi' - icon_state = "borg-spray-stun" - list_reagents = list("ether" = 250) - -/obj/item/reagent_containers/spray/alien/stun/cyborg_recharge(coeff, emagged) - reagents.check_and_add("ether", volume, 2 * coeff) - -//SKREEEEEEEEEEEE tool - /obj/item/flash/cyborg/alien name = "eye flash" desc = "Useful for taking pictures, making friends and flash-frying chips." icon = 'icons/mob/alien.dmi' icon_state = "borg-flash" + +/obj/item/flash/cyborg/alien/cyborg_recharge(coeff, emagged) + if(broken) + broken = FALSE + times_used = 0 + icon_state = "borg-flash" diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 5e8d534d65a..1b20fa56aa4 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -821,13 +821,11 @@ /obj/item/crowbar/cyborg/red, /obj/item/melee/energy/alien/claws, /obj/item/flash/cyborg/alien, - /obj/item/reagent_containers/spray/alien/stun, /obj/item/reagent_containers/spray/alien/smoke, ) emag_override_modules = list(/obj/item/reagent_containers/spray/alien/acid) special_rechargables = list( /obj/item/reagent_containers/spray/alien/acid, - /obj/item/reagent_containers/spray/alien/stun, /obj/item/reagent_containers/spray/alien/smoke ) diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi index aa921ea1343..e9fd3d3c594 100644 Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ