diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 34aa757e83d..898b78f359d 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -160,8 +160,8 @@ /obj/item/weapon/gun/energy/mousegun name = "\improper NT \"Arodentia\" Pesti-Shock" desc = "A highly sophisticated and probably safe beamgun designed for rapid pest-control." - icon_state = "floramut100" - item_state = "floramut" + icon_state = "pestishock100" + item_state = "pestishock" charge_meter = 0 w_class = 3 fire_sound = 'sound/weapons/taser2.ogg' diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 60c98734eb1..85b22da18df 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1211,7 +1211,7 @@ /datum/reagent/mental/kokoreed name = "Koko Reed Juice" id = "kokoreed" - description = "Juice from the Koko reed plant. Caused unique mental effects in unathi" + description = "Juice from the Koko reed plant. Causes unique mental effects in Unathi." reagent_state = LIQUID color = "#008000" metabolism = 0.0016 * REM diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index f451f041a17..c18f1343bb5 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -514,7 +514,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/koko name = "\improper Koko bar" - desc = "A sweet, yet gritty candy bar cultivated exclusively on the Compact ruled world of Ha zana. It's a good pick-me-up for Unathi, but has no affect on other species." + desc = "A sweet and gritty candy bar cultivated exclusively on the Compact ruled world of Ha'zana. A good pick-me-up for Unathi, but has no effect on other species." icon_state = "kokobar" trash = /obj/item/trash/kokobar filling_color = "#7D5F46" diff --git a/html/changelogs/wezzy_ratgun_impsword_kobar_resprite.yml b/html/changelogs/wezzy_ratgun_impsword_kobar_resprite.yml new file mode 100644 index 00000000000..aa660838ddc --- /dev/null +++ b/html/changelogs/wezzy_ratgun_impsword_kobar_resprite.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "New sprites for improvised swords, Pesti-shocks, Power drills, and Koko bars." + - tweak: "Fixes Koko related grammar." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 660587ef8b4..8e011c9bf30 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index db86a8343cd..4fd29cff4ff 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index db4f06eb8f9..d78ceb18c5b 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 352d5c13c28..30dcd266ec4 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index d8542f78441..c015c834131 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/icons/obj/weapons_build.dmi b/icons/obj/weapons_build.dmi index b8b154c3f7f..b1d9afb9470 100644 Binary files a/icons/obj/weapons_build.dmi and b/icons/obj/weapons_build.dmi differ