diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 9c1aa48ef51..25103fd9be9 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -1010,6 +1010,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/clothing/suit/storage/iaa/blackjacket/armored cost = 3 +/datum/uplink_item/badass/syndie_garments + name = "Syndicate Garment Bag" + desc = "A customised garment bag filled with all kinds of Syndicate attire, for the fashionable agent's needs. Proclaim your allegiance with style!" + reference = "GRMT" + item = /obj/item/storage/bag/garment/syndie + cost = 5 + //////////////////////////////////////// // MARK: BUNDLES AND TELECRYSTALS //////////////////////////////////////// diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 789bacac3a3..96746f61434 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -369,3 +369,26 @@ new /obj/item/clothing/shoes/workboots/smithing(src) new /obj/item/clothing/under/plasmaman/smith(src) new /obj/item/clothing/head/helmet/space/plasmaman/smith(src) + +/obj/item/storage/bag/garment/syndie + name = "suspicious garment bag" + icon_state = "garment_bag_syndie" + desc = "A bag for storing extra clothes and shoes. Judging by the colors, this one belongs to someone with malicious intent." + +/obj/item/storage/bag/garment/syndie/populate_contents() + new /obj/item/clothing/under/syndicate/tacticool(src) + new /obj/item/clothing/under/syndicate(src) + new /obj/item/clothing/under/syndicate/combat(src) + new /obj/item/clothing/under/syndicate/greyman(src) + new /obj/item/clothing/under/syndicate/sniper(src) + new /obj/item/clothing/mask/gas/syndicate(src) + new /obj/item/clothing/mask/balaclava(src) + new /obj/item/clothing/suit/storage/iaa/blackjacket(src) + new /obj/item/clothing/suit/blacktrenchcoat(src) + new /obj/item/clothing/head/beret/syndicate(src) + new /obj/item/clothing/glasses/syndie(src) + new /obj/item/clothing/neck/cloak/syndicate(src) + new /obj/item/clothing/gloves/color/black(src) + new /obj/item/clothing/gloves/fingerless(src) + new /obj/item/clothing/shoes/combat(src) + new /obj/item/clothing/shoes/laceup(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 9a5c04b001e..58efd6a329b 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -682,9 +682,11 @@ danger_counter = 0 U.purchase_log += "[bicon(src)]" + bought_items += /obj/item/storage/bag/garment/syndie // Guaranteed to spawn with drip (doesn't affect balance, it's only a bunch of fancy clothing) for(var/item in bought_items) var/obj/purchased = new item(src) U.purchase_log += "[bicon(purchased)]" + itemlog += purchased.name // To make the item more readable for the log compared to just uplink_item.item var/item_list = jointext(sortList(itemlog), ", ") log_game("[key_name(user)] purchased a surplus crate with [item_list]") user.create_log(MISC_LOG, "Surplus crate purchase with spawned items [item_list]") diff --git a/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm b/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm index 9d5e38cb0d0..8581222b518 100644 --- a/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm +++ b/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm @@ -5,6 +5,6 @@ /obj/structure/closet/wardrobe/atmospherics_yellow/empty -/obj/structure/closet/wardrobe/atmospherics_yellow/empty/populate_contents() +/obj/structure/closet/wardrobe/atmospherics_yellow/populate_contents() return diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 8f11a642f12..ce8312ebe2a 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -335,6 +335,37 @@ ) prescription_upgradable = TRUE +/obj/item/clothing/glasses/syndie + name = "suspicious glasses" + desc = "Suspicious-looking, stylish glasses. They don't look like they could protect you from a flash, however they have a slot around their lenses where something could easily be inserted." + icon_state = "syndieglasses" + item_state = "syndieglasses" + + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi' + ) + prescription_upgradable = TRUE + +/obj/item/clothing/glasses/syndie_sun + name = "suspicious shaded glasses" + desc = "Suspicious-looking, dark red, stylish glasses. They appear to have an additional eye-shielding layer over the lenses." + icon_state = "syndieglasses_sun" + item_state = "syndieglasses_sun" + + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi' + ) + see_in_dark = 1 + flash_protect = FLASH_PROTECTION_FLASH + tint = FLASH_PROTECTION_FLASH + prescription_upgradable = TRUE + /obj/item/clothing/glasses/sunglasses name = "sunglasses" desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes." @@ -351,7 +382,6 @@ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', "Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi' ) - hide_examine = TRUE /obj/item/clothing/glasses/sunglasses_fake diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index cb19769dc6a..06b02881d01 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -267,6 +267,7 @@ "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' ) + //NT Career Trainer /obj/item/clothing/head/beret/nct/black name = "\improper NT Career Trainer's beret" @@ -307,3 +308,15 @@ icon_state = "beret_solgovcelite" item_color = "solgovcelite" resistance_flags = FIRE_PROOF + +//Traitor +/obj/item/clothing/head/beret/syndicate + name = "syndicate beret" + desc = "A dark grey beret with the Syndicate’s unmistakable 'S' logo emblazoned on it. Wearing this just for the looks might not be the wisest idea..." + icon_state = "beret_syndie" + item_color = "beret_syndie" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) diff --git a/code/modules/clothing/neck/cloaks.dm b/code/modules/clothing/neck/cloaks.dm index e0aaa9d8dd6..cd8abd5c4b1 100644 --- a/code/modules/clothing/neck/cloaks.dm +++ b/code/modules/clothing/neck/cloaks.dm @@ -45,6 +45,11 @@ desc = "Worn by the Head of Personnel. It smells faintly of bureaucracy." icon_state = "hopcloak" +/obj/item/clothing/neck/cloak/syndicate + name = "suspicious cloak" + desc = "A half-cloak worn around the neck, featuring a color scheme that's both suspicious and stylish." + icon_state = "syndiecloak" + //Mantles. /obj/item/clothing/neck/cloak/mantle diff --git a/code/modules/crafting/tailoring.dm b/code/modules/crafting/tailoring.dm index 435f5196d55..d85f38065cb 100644 --- a/code/modules/crafting/tailoring.dm +++ b/code/modules/crafting/tailoring.dm @@ -305,6 +305,24 @@ reqs = list(/obj/item/clothing/glasses/meson/sunglasses = 1) category = CAT_CLOTHING +/datum/crafting_recipe/hudsyndiesun + name = "Suspicious sunglasses" + result = list(/obj/item/clothing/glasses/syndie_sun) + time = 1 SECONDS + tools = list(TOOL_SCREWDRIVER) + reqs = list(/obj/item/clothing/glasses/sunglasses = 1, + /obj/item/clothing/glasses/syndie = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudsyndiesunremoval + name = "Suspicious glasses flash protection removal" + result = list(/obj/item/clothing/glasses/sunglasses = 1, + /obj/item/clothing/glasses/syndie = 1,) + time = 1 SECONDS + tools = list(TOOL_SCREWDRIVER) + reqs = list(/obj/item/clothing/glasses/syndie_sun = 1) + category = CAT_CLOTHING + /datum/crafting_recipe/beergoggles name = "Sunscanners" result = list(/obj/item/clothing/glasses/sunglasses/reagent) diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index 728ea3f4a8b..edb356df0af 100644 Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi index 160b9dbeea3..60597c195c0 100644 Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index f7484d57d10..08941942172 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/clothing/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi index ef6bd08d672..db53f3b8029 100644 Binary files a/icons/mob/clothing/species/drask/eyes.dmi and b/icons/mob/clothing/species/drask/eyes.dmi differ diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi index 537dd06649b..c86a59301fe 100644 Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ diff --git a/icons/mob/clothing/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi index e0e4773e323..7cfeab7d075 100644 Binary files a/icons/mob/clothing/species/grey/eyes.dmi and b/icons/mob/clothing/species/grey/eyes.dmi differ diff --git a/icons/mob/clothing/species/kidan/eyes.dmi b/icons/mob/clothing/species/kidan/eyes.dmi index 92644b15eb5..c1628944af7 100644 Binary files a/icons/mob/clothing/species/kidan/eyes.dmi and b/icons/mob/clothing/species/kidan/eyes.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/beret.dmi b/icons/mob/clothing/species/kidan/head/beret.dmi index 4e4facb6b88..0594c08205c 100644 Binary files a/icons/mob/clothing/species/kidan/head/beret.dmi and b/icons/mob/clothing/species/kidan/head/beret.dmi differ diff --git a/icons/mob/clothing/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi index f3dbd860e1a..3786ea4db3f 100644 Binary files a/icons/mob/clothing/species/vox/eyes.dmi and b/icons/mob/clothing/species/vox/eyes.dmi differ diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi index 2fd32f31f07..0eb1cac6269 100644 Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ diff --git a/icons/obj/bio_chips.dmi b/icons/obj/bio_chips.dmi index be78aa87567..022e54e6032 100644 Binary files a/icons/obj/bio_chips.dmi and b/icons/obj/bio_chips.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index ca7685c79d4..db490fef186 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi index 6bbe1d91fa7..7008897a4ee 100644 Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 0bbb516382f..0c83fe1a6fb 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 6621c3da0e9..18c9534c3f8 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/paradise.dme b/paradise.dme index 85034a94f7e..086cbc82429 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2408,34 +2408,34 @@ #include "code\modules\mob\living\stat_states.dm" #include "code\modules\mob\living\taste.dm" #include "code\modules\mob\living\basic\basic_mob.dm" -#include "code\modules\mob\living\basic\hostile\creature.dm" -#include "code\modules\mob\living\basic\hostile\feral_cat.dm" -#include "code\modules\mob\living\basic\hostile\killertomato.dm" -#include "code\modules\mob\living\basic\farm_animals\pig.dm" -#include "code\modules\mob\living\basic\farm_animals\deer_ai.dm" +#include "code\modules\mob\living\basic\farm_animals\cow.dm" #include "code\modules\mob\living\basic\farm_animals\deer.dm" +#include "code\modules\mob\living\basic\farm_animals\deer_ai.dm" +#include "code\modules\mob\living\basic\farm_animals\pig.dm" #include "code\modules\mob\living\basic\hostile\bats.dm" #include "code\modules\mob\living\basic\hostile\bear.dm" #include "code\modules\mob\living\basic\hostile\carp.dm" +#include "code\modules\mob\living\basic\hostile\creature.dm" +#include "code\modules\mob\living\basic\hostile\feral_cat.dm" +#include "code\modules\mob\living\basic\hostile\hellhound.dm" +#include "code\modules\mob\living\basic\hostile\hellhound_ai.dm" #include "code\modules\mob\living\basic\hostile\hivebot.dm" #include "code\modules\mob\living\basic\hostile\hivebot_ai.dm" +#include "code\modules\mob\living\basic\hostile\killertomato.dm" #include "code\modules\mob\living\basic\hostile\skeleton_mob.dm" #include "code\modules\mob\living\basic\hostile\giant_spider\giant_spider.dm" #include "code\modules\mob\living\basic\hostile\giant_spider\giant_spider_actions.dm" #include "code\modules\mob\living\basic\hostile\giant_spider\giant_spider_ai.dm" #include "code\modules\mob\living\basic\hostile\gorilla\gorilla.dm" #include "code\modules\mob\living\basic\hostile\gorilla\gorilla_emote.dm" -#include "code\modules\mob\living\basic\nether_mobs\blankbody.dm" -#include "code\modules\mob\living\basic\nether_mobs\faithless.dm" -#include "code\modules\mob\living\basic\nether_mobs\migo.dm" -#include "code\modules\mob\living\basic\nether_mobs\nether_mobs.dm" -#include "code\modules\mob\living\basic\farm_animals\cow.dm" -#include "code\modules\mob\living\basic\hostile\hellhound.dm" -#include "code\modules\mob\living\basic\hostile\hellhound_ai.dm" #include "code\modules\mob\living\basic\minebots\minebot.dm" #include "code\modules\mob\living\basic\minebots\minebot_abilities.dm" #include "code\modules\mob\living\basic\minebots\minebot_ai.dm" #include "code\modules\mob\living\basic\minebots\minebot_upgrades.dm" +#include "code\modules\mob\living\basic\nether_mobs\blankbody.dm" +#include "code\modules\mob\living\basic\nether_mobs\faithless.dm" +#include "code\modules\mob\living\basic\nether_mobs\migo.dm" +#include "code\modules\mob\living\basic\nether_mobs\nether_mobs.dm" #include "code\modules\mob\living\basic\retaliate\clown.dm" #include "code\modules\mob\living\brain\brain_death.dm" #include "code\modules\mob\living\brain\brain_emote.dm"