Drip expansion: Syndicate garment bag (#29764)
* repair droid sprite update
* biochips
* syndie drip 1
* Update code/game/objects/items/weapons/storage/garment.dm
Indeed, my apologies
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/head/beret.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/neck/cloaks.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* merge conflict resolve attempt 1
* Merge conflict resolve attempt 2
* mergre conflict RESOLUTION attempt 3
* Revert "mergre conflict RESOLUTION attempt 3"
This reverts commit 06e0f77564.
* Merge conflict resolution attempt 4: hooks edition
* maybe i shouldn't have commented that one thing out
* updated garment bag description, removed stashed change
* removed garment bag contents stashed changes
* removed syndie beret stashed changes
* removed syndie cloak stashed changes
* fixing my fuckup part 1
* fixing my shit part 2
* fixing my shit part 3
* fixing my shit part 4
---------
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
YoursTrulyHollow
@@ -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
|
||||
////////////////////////////////////////
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -682,9 +682,11 @@
|
||||
danger_counter = 0
|
||||
|
||||
U.purchase_log += "<BIG>[bicon(src)]</BIG>"
|
||||
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 += "<BIG>[bicon(purchased)]</BIG>"
|
||||
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]")
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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'
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 63 KiB |
@@ -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"
|
||||
|
||||