diff --git a/code/__DEFINES/dye_keys.dm b/code/__DEFINES/dye_keys.dm index 95e2a6f1707..a01dcacc18a 100644 --- a/code/__DEFINES/dye_keys.dm +++ b/code/__DEFINES/dye_keys.dm @@ -28,3 +28,5 @@ #define DYE_CMO "cmo" #define DYE_REDCOAT "redcoat" #define DYE_CLOWN "clown" +#define DYE_CHAP "chap" +#define DYE_CENTCOM "centcom" diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index a11b5cb7caf..5dbca3d4ef5 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -12,6 +12,7 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_RAINBOW = /obj/item/clothing/under/color/rainbow, DYE_MIME = /obj/item/clothing/under/rank/civilian/mime, DYE_CLOWN = /obj/item/clothing/under/rank/civilian/clown, + DYE_CHAP = /obj/item/clothing/under/rank/civilian/chaplain, DYE_QM = /obj/item/clothing/under/rank/cargo/qm, DYE_LAW = /obj/item/clothing/under/suit/black, DYE_CAPTAIN = /obj/item/clothing/under/rank/captain, @@ -20,7 +21,9 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_CE = /obj/item/clothing/under/rank/engineering/chief_engineer, DYE_RD = /obj/item/clothing/under/rank/rnd/research_director, DYE_CMO = /obj/item/clothing/under/rank/medical/chief_medical_officer, - DYE_REDCOAT = /obj/item/clothing/under/costume/redcoat + DYE_REDCOAT = /obj/item/clothing/under/costume/redcoat, + DYE_SYNDICATE = /obj/item/clothing/under/syndicate, + DYE_CENTCOM = /obj/item/clothing/under/rank/centcom/commander ), DYE_REGISTRY_JUMPSKIRT = list( DYE_RED = /obj/item/clothing/under/color/jumpskirt/red, @@ -31,7 +34,16 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_PURPLE = /obj/item/clothing/under/color/jumpskirt/lightpurple, DYE_BLACK = /obj/item/clothing/under/color/jumpskirt/black, DYE_WHITE = /obj/item/clothing/under/color/jumpskirt/white, - DYE_RAINBOW = /obj/item/clothing/under/color/jumpskirt/rainbow + DYE_RAINBOW = /obj/item/clothing/under/color/jumpskirt/rainbow, + DYE_MIME = /obj/item/clothing/under/rank/civilian/mime/skirt, + DYE_CHAP = /obj/item/clothing/under/rank/civilian/chaplain/skirt, + DYE_QM = /obj/item/clothing/under/rank/cargo/qm/skirt, + DYE_CAPTAIN = /obj/item/clothing/under/rank/captain/skirt, + DYE_HOP = /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt, + DYE_HOS = /obj/item/clothing/under/rank/security/head_of_security/skirt, + DYE_CE = /obj/item/clothing/under/rank/engineering/chief_engineer/skirt, + DYE_RD = /obj/item/clothing/under/rank/rnd/research_director/skirt, + DYE_CMO = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt, ), DYE_REGISTRY_GLOVES = list( DYE_RED = /obj/item/clothing/gloves/color/red, @@ -52,7 +64,9 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_CE = /obj/item/clothing/gloves/color/black, DYE_RD = /obj/item/clothing/gloves/color/grey, DYE_CMO = /obj/item/clothing/gloves/color/latex/nitrile, - DYE_REDCOAT = /obj/item/clothing/gloves/color/white + DYE_REDCOAT = /obj/item/clothing/gloves/color/white, + DYE_SYNDICATE = /obj/item/clothing/gloves/combat, + DYE_CENTCOM = /obj/item/clothing/gloves/combat ), DYE_REGISTRY_SNEAKERS = list( DYE_RED = /obj/item/clothing/shoes/sneakers/red, @@ -65,12 +79,15 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_WHITE = /obj/item/clothing/shoes/sneakers/white, DYE_RAINBOW = /obj/item/clothing/shoes/sneakers/rainbow, DYE_MIME = /obj/item/clothing/shoes/sneakers/black, + DYE_CLOWN = /obj/item/clothing/shoes/sneakers/rainbow, DYE_QM = /obj/item/clothing/shoes/sneakers/brown, DYE_CAPTAIN = /obj/item/clothing/shoes/sneakers/brown, DYE_HOP = /obj/item/clothing/shoes/sneakers/brown, DYE_CE = /obj/item/clothing/shoes/sneakers/brown, DYE_RD = /obj/item/clothing/shoes/sneakers/brown, - DYE_CMO = /obj/item/clothing/shoes/sneakers/brown + DYE_CMO = /obj/item/clothing/shoes/sneakers/brown, + DYE_SYNDICATE = /obj/item/clothing/shoes/combat, + DYE_CENTCOM = /obj/item/clothing/shoes/combat ), DYE_REGISTRY_FANNYPACK = list( DYE_RED = /obj/item/storage/belt/fannypack/red, @@ -80,7 +97,8 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_BLUE = /obj/item/storage/belt/fannypack/blue, DYE_PURPLE = /obj/item/storage/belt/fannypack/purple, DYE_BLACK = /obj/item/storage/belt/fannypack/black, - DYE_WHITE = /obj/item/storage/belt/fannypack/white + DYE_WHITE = /obj/item/storage/belt/fannypack/white, + DYE_SYNDICATE = /obj/item/storage/belt/military ), DYE_REGISTRY_BEDSHEET = list( DYE_RED = /obj/item/bedsheet/red, @@ -94,6 +112,7 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_RAINBOW = /obj/item/bedsheet/rainbow, DYE_MIME = /obj/item/bedsheet/mime, DYE_CLOWN = /obj/item/bedsheet/clown, + DYE_CHAP = /obj/item/bedsheet/chaplain, DYE_QM = /obj/item/bedsheet/qm, DYE_LAW = /obj/item/bedsheet/black, DYE_CAPTAIN = /obj/item/bedsheet/captain, @@ -102,7 +121,9 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_CE = /obj/item/bedsheet/ce, DYE_RD = /obj/item/bedsheet/rd, DYE_CMO = /obj/item/bedsheet/cmo, - DYE_COSMIC = /obj/item/bedsheet/cosmos + DYE_COSMIC = /obj/item/bedsheet/cosmos, + DYE_SYNDICATE = /obj/item/bedsheet/syndie, + DYE_CENTCOM = /obj/item/bedsheet/centcom ), DYE_LAWYER_SPECIAL = list( DYE_COSMIC = /obj/item/clothing/under/rank/civilian/lawyer/galaxy, diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 366d5489ec8..b01858a670a 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -179,6 +179,13 @@ LINEN BINS item_state = "sheetqm" dream_messages = list("a grey ID", "a shuttle", "a crate", "a sloth", "the quartermaster") +/obj/item/bedsheet/chaplain + name = "chaplain's blanket" + desc = "A blanket woven with the hearts of gods themselves... Wait, that's just linen." + icon_state = "sheetchap" + item_state = "sheetchap" + dream_messages = list("a grey ID", "the gods", "a fulfilled prayer", "a cult", "the chaplain") + /obj/item/bedsheet/brown icon_state = "sheetbrown" item_state = "sheetbrown" diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 19f8bd81c5e..3266f7c663d 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -89,7 +89,11 @@ "stamp-rd" = 'icons/stamp_icons/large_stamp-rd.png', "stamp-cap" = 'icons/stamp_icons/large_stamp-cap.png', "stamp-qm" = 'icons/stamp_icons/large_stamp-qm.png', - "stamp-law" = 'icons/stamp_icons/large_stamp-law.png' + "stamp-law" = 'icons/stamp_icons/large_stamp-law.png', + "stamp-chap" = 'icons/stamp_icons/large_stamp-chap.png', + "stamp-mime" = 'icons/stamp_icons/large_stamp-mime.png', + "stamp-centcom" = 'icons/stamp_icons/large_stamp-centcom.png', + "stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png' ) diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 068c5394bb3..5d6a89c5a0e 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -171,6 +171,7 @@ r_pocket = /obj/item/pda/heads l_hand = /obj/item/clipboard id = /obj/item/card/id/centcom + backpack_contents = list(/obj/item/stamp/centcom=1) /datum/outfit/centcom/centcom_official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(visualsOnly) diff --git a/code/modules/clothing/under/jobs/centcom.dm b/code/modules/clothing/under/jobs/centcom.dm index 209ffcb6afe..7b098735416 100644 --- a/code/modules/clothing/under/jobs/centcom.dm +++ b/code/modules/clothing/under/jobs/centcom.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/under/rank +/obj/item/clothing/under/rank/centcom icon = 'icons/obj/clothing/under/centcom.dmi' mob_overlay_icon = 'icons/mob/clothing/under/centcom.dmi' diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 52b46794f3b..cf621eb417f 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -123,6 +123,12 @@ belt = /obj/item/pda/chaplain ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/chaplain - backpack_contents = list(/obj/item/camera/spooky = 1) + backpack_contents = list( + /obj/item/stamp/chap = 1, + /obj/item/camera/spooky = 1 + ) + backpack = /obj/item/storage/backpack/cultpack satchel = /obj/item/storage/backpack/cultpack + + chameleon_extras = /obj/item/stamp/chap diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index c936b5a3e7d..30cf01ce60f 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -32,11 +32,16 @@ gloves = /obj/item/clothing/gloves/color/white head = /obj/item/clothing/head/frenchberet suit = /obj/item/clothing/suit/toggle/suspenders - backpack_contents = list(/obj/item/book/mimery=1, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing=1) + backpack_contents = list( + /obj/item/stamp/mime = 1, + /obj/item/book/mimery = 1, + /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1 + ) backpack = /obj/item/storage/backpack/mime satchel = /obj/item/storage/backpack/mime + chameleon_extras = /obj/item/stamp/mime /datum/outfit/job/mime/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 6780a0c6f19..a02d7609368 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -66,5 +66,25 @@ icon_state = "stamp-clown" dye_color = DYE_CLOWN +/obj/item/stamp/mime + name = "mime's rubber stamp" + icon_state = "stamp-mime" + dye_color = DYE_MIME + +/obj/item/stamp/chap + name = "chaplain's rubber stamp" + icon_state = "stamp-chap" + dye_color = DYE_CHAP + +/obj/item/stamp/centcom + name = "CentCom rubber stamp" + icon_state = "stamp-centcom" + dye_color = DYE_CENTCOM + +/obj/item/stamp/syndicate + name = "Syndicate rubber stamp" + icon_state = "stamp-syndicate" + dye_color = DYE_SYNDICATE + /obj/item/stamp/attack_paw(mob/user) return attack_hand(user) diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index ad44ec0d311..ff747305686 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/inhands/misc/bedsheet_lefthand.dmi b/icons/mob/inhands/misc/bedsheet_lefthand.dmi index 382da2f2b24..244fc655385 100644 Binary files a/icons/mob/inhands/misc/bedsheet_lefthand.dmi and b/icons/mob/inhands/misc/bedsheet_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/bedsheet_righthand.dmi b/icons/mob/inhands/misc/bedsheet_righthand.dmi index 2110ac1a240..ce2ba3ffdb5 100644 Binary files a/icons/mob/inhands/misc/bedsheet_righthand.dmi and b/icons/mob/inhands/misc/bedsheet_righthand.dmi differ diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi index 73dcad452b3..cdc341004f8 100644 Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 8b9222741ef..e0671833ad6 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/stamp_icons/font.png b/icons/stamp_icons/font.png new file mode 100644 index 00000000000..4297937696d Binary files /dev/null and b/icons/stamp_icons/font.png differ diff --git a/icons/stamp_icons/large_stamp-cap.png b/icons/stamp_icons/large_stamp-cap.png index 7f7ce460a4e..19883563b2c 100644 Binary files a/icons/stamp_icons/large_stamp-cap.png and b/icons/stamp_icons/large_stamp-cap.png differ diff --git a/icons/stamp_icons/large_stamp-ce.png b/icons/stamp_icons/large_stamp-ce.png index 189db310cf8..d07f70c4d57 100644 Binary files a/icons/stamp_icons/large_stamp-ce.png and b/icons/stamp_icons/large_stamp-ce.png differ diff --git a/icons/stamp_icons/large_stamp-centcom.png b/icons/stamp_icons/large_stamp-centcom.png new file mode 100644 index 00000000000..6250cbff885 Binary files /dev/null and b/icons/stamp_icons/large_stamp-centcom.png differ diff --git a/icons/stamp_icons/large_stamp-chap.png b/icons/stamp_icons/large_stamp-chap.png new file mode 100644 index 00000000000..2586c13bade Binary files /dev/null and b/icons/stamp_icons/large_stamp-chap.png differ diff --git a/icons/stamp_icons/large_stamp-clown.png b/icons/stamp_icons/large_stamp-clown.png index 5abbff7113d..d6068705072 100644 Binary files a/icons/stamp_icons/large_stamp-clown.png and b/icons/stamp_icons/large_stamp-clown.png differ diff --git a/icons/stamp_icons/large_stamp-cmo.png b/icons/stamp_icons/large_stamp-cmo.png index eb004be6216..bac4c7b2f91 100644 Binary files a/icons/stamp_icons/large_stamp-cmo.png and b/icons/stamp_icons/large_stamp-cmo.png differ diff --git a/icons/stamp_icons/large_stamp-deny.png b/icons/stamp_icons/large_stamp-deny.png index 7c216fce482..1c7f416597c 100644 Binary files a/icons/stamp_icons/large_stamp-deny.png and b/icons/stamp_icons/large_stamp-deny.png differ diff --git a/icons/stamp_icons/large_stamp-hop.png b/icons/stamp_icons/large_stamp-hop.png index 3f9aa4a76fb..1447d58a875 100644 Binary files a/icons/stamp_icons/large_stamp-hop.png and b/icons/stamp_icons/large_stamp-hop.png differ diff --git a/icons/stamp_icons/large_stamp-hos.png b/icons/stamp_icons/large_stamp-hos.png index 67b69d75039..bd595909757 100644 Binary files a/icons/stamp_icons/large_stamp-hos.png and b/icons/stamp_icons/large_stamp-hos.png differ diff --git a/icons/stamp_icons/large_stamp-law.png b/icons/stamp_icons/large_stamp-law.png index d6d77eee9b6..aee5aa3fbc0 100644 Binary files a/icons/stamp_icons/large_stamp-law.png and b/icons/stamp_icons/large_stamp-law.png differ diff --git a/icons/stamp_icons/large_stamp-mime.png b/icons/stamp_icons/large_stamp-mime.png new file mode 100644 index 00000000000..c9a01434394 Binary files /dev/null and b/icons/stamp_icons/large_stamp-mime.png differ diff --git a/icons/stamp_icons/large_stamp-ok.png b/icons/stamp_icons/large_stamp-ok.png index e568ae0921c..b40d3e3f1bb 100644 Binary files a/icons/stamp_icons/large_stamp-ok.png and b/icons/stamp_icons/large_stamp-ok.png differ diff --git a/icons/stamp_icons/large_stamp-qm.png b/icons/stamp_icons/large_stamp-qm.png index ea863078b43..4ba31b37415 100644 Binary files a/icons/stamp_icons/large_stamp-qm.png and b/icons/stamp_icons/large_stamp-qm.png differ diff --git a/icons/stamp_icons/large_stamp-rd.png b/icons/stamp_icons/large_stamp-rd.png index 35479e805fe..a9e7ad040bc 100644 Binary files a/icons/stamp_icons/large_stamp-rd.png and b/icons/stamp_icons/large_stamp-rd.png differ diff --git a/icons/stamp_icons/large_stamp-syndicate.png b/icons/stamp_icons/large_stamp-syndicate.png new file mode 100644 index 00000000000..68f17d8f5e2 Binary files /dev/null and b/icons/stamp_icons/large_stamp-syndicate.png differ