diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index bca44307b85..a045877dc05 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -332,3 +332,9 @@ item_path = /obj/item/clothing/head/costume/fur_cap_quilark donator_only = TRUE requires_purchase = FALSE + +/datum/loadout_item/suit/org_thirteen + name = "Organization 13 Cloak" + item_path = /obj/item/clothing/suit/hooded/org_thirteen + donator_only = TRUE + requires_purchase = FALSE diff --git a/monkestation/code/modules/donator/code/item/clothing.dm b/monkestation/code/modules/donator/code/item/clothing.dm index d7c9e3d3edb..e2ae9a3d457 100644 --- a/monkestation/code/modules/donator/code/item/clothing.dm +++ b/monkestation/code/modules/donator/code/item/clothing.dm @@ -286,3 +286,41 @@ cold_protection = CHEST|ARMS layer = NECK_LAYER +/obj/item/clothing/suit/hooded/org_thirteen + name = "\improper Organization 13 Cloak" + desc = "A large, hooded jacket belonging to an Organization 13 member." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "org_thirteen" + inhand_icon_state = null + body_parts_covered = CHEST|ARMS + cold_protection = CHEST|ARMS + allowed = list() + armor_type = /datum/armor/hooded_wintercoat + hoodtype = /obj/item/clothing/head/hooded/org_thirteen + + +/obj/item/clothing/suit/hooded/org_thirteen/Initialize(mapload) + . = ..() + allowed += list( + /obj/item/flashlight, + /obj/item/lighter, + /obj/item/modular_computer/pda, + /obj/item/radio, + /obj/item/storage/bag/books, + /obj/item/storage/fancy/cigarettes, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/toy, + ) + +/obj/item/clothing/head/hooded/org_thirteen + name = "organization 13 hood" + desc = "A cozy winter hood attached to a heavy winter jacket." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "org_thirteen_hood" + body_parts_covered = HEAD + cold_protection = HEAD + flags_inv = HIDEHAIR|HIDEEARS + armor_type = /datum/armor/hooded_winterhood diff --git a/monkestation/code/modules/donator/icons/mob/clothing.dmi b/monkestation/code/modules/donator/icons/mob/clothing.dmi index cc207010dc3..22f12dbda98 100644 Binary files a/monkestation/code/modules/donator/icons/mob/clothing.dmi and b/monkestation/code/modules/donator/icons/mob/clothing.dmi differ diff --git a/monkestation/code/modules/donator/icons/obj/clothing.dmi b/monkestation/code/modules/donator/icons/obj/clothing.dmi index 4983c3d3d92..02c934c0e24 100644 Binary files a/monkestation/code/modules/donator/icons/obj/clothing.dmi and b/monkestation/code/modules/donator/icons/obj/clothing.dmi differ diff --git a/strings/pill_names.json b/strings/pill_names.json index 0fc51b8511f..e5e2a7e366b 100644 --- a/strings/pill_names.json +++ b/strings/pill_names.json @@ -99,6 +99,7 @@ "Glorious", "Goblin", "God", +"Goo", "Green", "Grief", "Grievous", @@ -118,6 +119,7 @@ "Hyper", "Ian", "Ice", +"Juice", "Jumper", "Kilgor", "Lad", @@ -148,6 +150,7 @@ "One", "One-A-Minute", "Ook", +"Orange", "Organic", "Patrick", "Pete",