From 810590e5df87c0847416649112c2c727478a08bb Mon Sep 17 00:00:00 2001 From: Backsea Date: Thu, 9 Nov 2023 17:17:11 -0600 Subject: [PATCH] Colonial Space Grunts --- code/game/machinery/vending/vending_types.dm | 4 ++-- code/modules/asset_cache/asset_list_items.dm | 2 +- code/modules/paperwork/paper.dm | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index 35d81b0b9b5a..a57bbfe7d29f 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -412,7 +412,7 @@ /obj/item/device/camera_film = 10, /obj/item/notepad = 5, /obj/item/device/toner = 5, - /obj/item/paper/Almayer/CSG = 15, + /obj/item/paper/colonial_grunts = 15, /obj/item/toy/dice/d20 = 10, /obj/item/tool/pen = 10, /obj/item/tool/pen/blue = 10, @@ -439,7 +439,7 @@ /obj/item/toy/deck/uno = 15, /obj/item/device/camera = 30, /obj/item/device/toner = 15, - /obj/item/paper/Almayer/CSG = 5, + /obj/item/paper/colonial_grunts = 5, /obj/item/toy/dice/d20 = 1, /obj/item/tool/pen = 2, /obj/item/tool/pen/blue = 2, diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index dc761971b77f..fbb9e5d06ac1 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -147,7 +147,7 @@ "cmblogo.png" = 'html/images/cmblogo.png', "faxwylogo.png" = 'html/images/faxwylogo.png', "faxbackground.jpg" = 'html/images/faxbackground.jpg', - "colonialspacegruntsEZ.png" = 'html/images/ColonialSpaceGruntsEZ.png', + "colonialspacegruntsEZ.png" = 'html/images/colonialspacegruntsEZ.png', ) /datum/asset/spritesheet/chat diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 36db832c366d..751dbe5bf7cd 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -907,7 +907,13 @@ info = parsepencode(template, null, null, FALSE) #undef MAX_FIELDS -/obj/item/paper/Almayer/CSG +/obj/item/paper/colonial_grunts + icon = 'icons/obj/items/paper.dmi' + icon_state = "paper_stack_words" name = "Colonial Space Grunts" desc = "A tabletop game based around the USCM, easy to get into, simple to play, and most inportantly fun for the whole squad." - info = "
" + +/obj/item/paper/colonial_grunts/Initialize(mapload, ...) + . = ..() + info = "
" + update_icon()