diff --git a/GainStation13/code/obj/items/gato.dm b/GainStation13/code/obj/items/gato.dm index 30796df4d9..674e9d7138 100644 --- a/GainStation13/code/obj/items/gato.dm +++ b/GainStation13/code/obj/items/gato.dm @@ -1,2 +1,21 @@ -/////GS13 - reflavoring of items into GATO corp, mostly seperated variants so we don't overwrite NT +/////GS13 - reflavoring of random items into GATO corp, mostly seperated variants so we don't overwrite NT +/obj/item/storage/fancy/cigarettes/gatito + name = "\improper HumoGatitos packet" + desc = "Strangely tasty for a cigarette." + icon = 'GainStation13/icons/obj/cigarettes.dmi' + icon_state = "smokegatitos" + spawn_type = /obj/item/clothing/mask/cigarette/dromedary + +/obj/item/clothing/mask/cigarette/gatito + desc = "A HumoGatitos brand cigarette." + +/obj/item/banner/gato + name = "GATO banner" + desc = "The banner of GATO, our corporate overlords." + icon = 'GainStation13/icons/obj/items_and_weapons.dmi' + icon_state = "banner_gato" + job_loyalties = list("Command") + warcry = "FOR THE INTEREST OF GATO!!" + lefthand_file = 'GainStation13/icons/mob/inhands/equipment/banners_lefthand.dmi' + righthand_file = 'GainStation13/icons/mob/inhands/equipment/banners_righthand.dmi' diff --git a/GainStation13/icons/mob/inhands/equipment/banners_lefthand.dmi b/GainStation13/icons/mob/inhands/equipment/banners_lefthand.dmi new file mode 100644 index 0000000000..1cc462a86b Binary files /dev/null and b/GainStation13/icons/mob/inhands/equipment/banners_lefthand.dmi differ diff --git a/GainStation13/icons/mob/inhands/equipment/banners_righthand.dmi b/GainStation13/icons/mob/inhands/equipment/banners_righthand.dmi new file mode 100644 index 0000000000..a8850aceab Binary files /dev/null and b/GainStation13/icons/mob/inhands/equipment/banners_righthand.dmi differ diff --git a/GainStation13/icons/obj/cigarettes.dmi b/GainStation13/icons/obj/cigarettes.dmi new file mode 100644 index 0000000000..89a299b2b8 Binary files /dev/null and b/GainStation13/icons/obj/cigarettes.dmi differ diff --git a/GainStation13/icons/obj/items_and_weapons.dmi b/GainStation13/icons/obj/items_and_weapons.dmi new file mode 100644 index 0000000000..43c902fe2d Binary files /dev/null and b/GainStation13/icons/obj/items_and_weapons.dmi differ diff --git a/GainStation13/icons/obj/janitor.dmi b/GainStation13/icons/obj/janitor.dmi new file mode 100644 index 0000000000..96980b3eb8 Binary files /dev/null and b/GainStation13/icons/obj/janitor.dmi differ diff --git a/GainStation13/icons/obj/modular_console.dmi b/GainStation13/icons/obj/modular_console.dmi new file mode 100644 index 0000000000..4828293e12 Binary files /dev/null and b/GainStation13/icons/obj/modular_console.dmi differ diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index d8d471abaf..0a97c2ef41 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -32,6 +32,11 @@ AddComponent(/datum/component/slippery, 80) /obj/item/soap/nanotrasen + desc = "A Nanotrasen brand bar of soap. Smells of plasma." + icon = 'GainStation13/icons/obj/items_and_weapons.dmi' //GS13 - sorry not sorry, but it's just easier to replace this sprite instead of rebranding all instances of nanotrasen soap + icon_state = "soapgt" + +/obj/item/soap/nanotrasenreal //GS13 - this is the real NT soap :3 desc = "A Nanotrasen brand bar of soap. Smells of plasma." icon_state = "soapnt" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 857f3d8f4a..2327f5846b 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -29,6 +29,7 @@ /obj/item/trash/popcorn name = "popcorn" + icon = 'GainStation13/icons/obj/janitor.dmi' //GS13 - GATO palette icon_state = "popcorn" /obj/item/trash/sosjerky diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index bd707cece7..477f249b13 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -71,6 +71,7 @@ /obj/item/reagent_containers/food/snacks/popcorn name = "popcorn" desc = "Now let's find some cinema." + icon = 'GainStation13/icons/obj/food/food.dmi' //GS13 - GATO palette icon_state = "popcorn" trash = /obj/item/trash/popcorn list_reagents = list(/datum/reagent/consumable/nutriment = 2) diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm index 3cbdc4a923..ac2aa7b80d 100644 --- a/code/modules/modular_computers/computers/machinery/modular_console.dm +++ b/code/modules/modular_computers/computers/machinery/modular_console.dm @@ -2,7 +2,7 @@ name = "console" desc = "A stationary computer." - icon = 'icons/obj/modular_console.dmi' + icon = 'GainStation13/icons/obj/modular_console.dmi' //GS13 - gatofication sprites icon_state = "console" icon_state_powered = "console" icon_state_unpowered = "console-off"