From 13b7aeb4a5573eed1836bc6b3fce7f13ac0f05d3 Mon Sep 17 00:00:00 2001 From: Repede Date: Fri, 3 Jul 2020 16:56:42 -0400 Subject: [PATCH 01/11] https://github.com/CHOMPStation2/CHOMPStation2/pull/207 --- .../loadout/loadout_xeno_yw.dm | 15 + .../clothing/suits/aliens/seromi_yw.dm | 315 ++++++++++++++++++ icons/mob/species/seromi/teshari_cloak_yw.dmi | Bin 0 -> 2412 bytes icons/mob/species/seromi/teshari_hood_yw.dmi | Bin 0 -> 20582 bytes 4 files changed, 330 insertions(+) create mode 100644 code/modules/clothing/suits/aliens/seromi_yw.dm create mode 100644 icons/mob/species/seromi/teshari_cloak_yw.dmi create mode 100644 icons/mob/species/seromi/teshari_hood_yw.dmi diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm index b55c3d8a8e..1a8c8ef01a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm @@ -18,3 +18,18 @@ whitelisted = SPECIES_ZADDAT allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer") + +//Added from CHOMP +/datum/gear/suit/hood + display_name = "hooded cloak selection (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/standard + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/hood/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) \ No newline at end of file diff --git a/code/modules/clothing/suits/aliens/seromi_yw.dm b/code/modules/clothing/suits/aliens/seromi_yw.dm new file mode 100644 index 0000000000..440d355cc6 --- /dev/null +++ b/code/modules/clothing/suits/aliens/seromi_yw.dm @@ -0,0 +1,315 @@ +//Added from CHOMP https://github.com/CHOMPStation2/CHOMPStation2/pull/207 +//Chompstation teshari cloaks +/obj/item/clothing/suit/storage/seromi/cloak/standard/dark_retrowave + name = "dark aesthetic cloak" + icon_state = "tesh_cloak_dretrowave" + item_state = "tesh_cloak_dretrowave" + icon = 'icons/mob/species/seromi/teshari_cloak_yw.dmi' + icon_override = 'icons/mob/species/seromi/teshari_cloak_yw.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_glow + name = "black and glowing cloak" + icon_state = "tesh_cloak_bglowing" + item_state = "tesh_cloak_bglowing" + icon = 'icons/mob/species/seromi/teshari_cloak_yw.dmi' + icon_override = 'icons/mob/species/seromi/teshari_cloak_yw.dmi' + +//Hooded teshari cloaks +/obj/item/clothing/suit/storage/hooded/teshari + name = "Hooded Teshari Cloak" + desc = "A soft teshari cloak with an added hood." + icon_override = 'icons/mob/species/seromi/teshari_hood_yw.dmi' + icon = 'icons/mob/species/seromi/teshari_hood_yw.dmi' + icon_state = "tesh_hcloak_bo" + item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo") + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER|HIDETIE + //hooded = 1 Variable no longer exists, hood is now handled by code/modules/clothing/suit/storage/hooded.dm + action_button_name = "Toggle Cloak Hood" + hoodtype = /obj/item/clothing/head/tesh_hood + allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) + +/obj/item/clothing/head/tesh_hood + name = "Cloak Hood" + desc = "A hood attached to a teshari cloak." + icon_override = 'icons/mob/species/seromi/teshari_hood_yw.dmi' + icon = 'icons/mob/species/seromi/teshari_hood_yw.dmi' + icon_state = "tesh_hood_bo" + item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo") + flags_inv = BLOCKHAIR + body_parts_covered = HEAD + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_orange + name = "black and orange hooded cloak" + icon_state = "tesh_hcloak_bo" + item_state = "tesh_hcloak_bo" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_orange + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_grey + name = "black and grey hooded cloak" + icon_state = "tesh_hcloak_bg" + item_state = "tesh_hcloak_bg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_midgrey + name = "black and medium grey hooded cloak" + icon_state = "tesh_hcloak_bmg" + item_state = "tesh_hcloak_bmg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_midgrey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_lightgrey + name = "black and light grey hooded cloak" + icon_state = "tesh_hcloak_blg" + item_state = "tesh_hcloak_blg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_lightgrey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_white + name = "black and white hooded cloak" + icon_state = "tesh_hcloak_bw" + item_state = "tesh_hcloak_bw" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_white + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_red + name = "black and red hooded cloak" + icon_state = "tesh_hcloak_br" + item_state = "tesh_hcloak_br" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_red + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black + name = "black hooded cloak" + icon_state = "tesh_hcloak_bn" + item_state = "tesh_hcloak_bn" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_yellow + name = "black and yellow hooded cloak" + icon_state = "tesh_hcloak_by" + item_state = "tesh_hcloak_by" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_yellow + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_green + name = "black and green hooded cloak" + icon_state = "tesh_hcloak_bgr" + item_state = "tesh_hcloak_bgr" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_green + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_blue + name = "black and blue hooded cloak" + icon_state = "tesh_hcloak_bbl" + item_state = "tesh_hcloak_bbl" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_blue + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_purple + name = "black and purple hooded cloak" + icon_state = "tesh_hcloak_bp" + item_state = "tesh_hcloak_bp" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_purple + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_pink + name = "black and pink hooded cloak" + icon_state = "tesh_hcloak_bpi" + item_state = "tesh_hcloak_bpi" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_pink + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_brown + name = "black and brown hooded cloak" + icon_state = "tesh_hcloak_bbr" + item_state = "tesh_hcloak_bbr" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_brown + +/obj/item/clothing/suit/storage/hooded/teshari/standard/orange_grey + name = "orange and grey hooded cloak" + icon_state = "tesh_hcloak_og" + item_state = "tesh_hcloak_og" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/orange_grey + +///obj/item/clothing/suit/storage/hooded/teshari/standard/rainbow +// name = "rainbow hooded cloak" +// icon_state = "tesh_hcloak_rainbow" +// item_state = "tesh_hcloak_rainbow" +// hoodtype = /obj/item/clothing/head/tesh_hood/standard/rainbow + +/obj/item/clothing/suit/storage/hooded/teshari/standard/lightgrey_grey + name = "light grey and grey hooded cloak" + icon_state = "tesh_hcloak_lgg" + item_state = "tesh_hcloak_lgg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/lightgrey_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/white_grey + name = "white and grey hooded cloak" + icon_state = "tesh_hcloak_wg" + item_state = "tesh_hcloak_wg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/white_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/red_grey + name = "red and grey hooded cloak" + icon_state = "tesh_hcloak_rg" + item_state = "tesh_hcloak_rg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/red_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/orange + name = "orange hooded cloak" + icon_state = "tesh_hcloak_on" + item_state = "tesh_hcloak_on" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/orange + +/obj/item/clothing/suit/storage/hooded/teshari/standard/yellow_grey + name = "yellow and grey hooded cloak" + icon_state = "tesh_hcloak_yg" + item_state = "tesh_hcloak_yg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/yellow_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/green_grey + name = "green and grey hooded cloak" + icon_state = "tesh_hcloak_gg" + item_state = "tesh_hcloak_gg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/green_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/blue_grey + name = "blue and grey hooded cloak" + icon_state = "tesh_hcloak_blug" + item_state = "tesh_hcloak_blug" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/blue_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/purple_grey + name = "purple and grey hooded cloak" + icon_state = "tesh_hcloak_pg" + item_state = "tesh_hcloak_pg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/purple_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/pink_grey + name = "pink and grey hooded cloak" + icon_state = "tesh_hcloak_pig" + item_state = "tesh_hcloak_pig" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/pink_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/brown_grey + name = "brown and grey hooded cloak" + icon_state = "tesh_hcloak_brg" + item_state = "tesh_hcloak_brg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/brown_grey + +/obj/item/clothing/head/tesh_hood/standard/black_orange + name = "black and orange cloak hood" + icon_state = "tesh_hood_bo" + item_state = "tesh_hood_bo" + +/obj/item/clothing/head/tesh_hood/standard/black_grey + name = "black and grey cloak hood" + icon_state = "tesh_hood_bg" + item_state = "tesh_hood_bg" + +/obj/item/clothing/head/tesh_hood/standard/black_midgrey + name = "black and medium grey cloak hood" + icon_state = "tesh_hood_bmg" + item_state = "tesh_hood_bmg" + +/obj/item/clothing/head/tesh_hood/standard/black_lightgrey + name = "black and light grey cloak hood" + icon_state = "tesh_hood_blg" + item_state = "tesh_hood_blg" + +/obj/item/clothing/head/tesh_hood/standard/black_white + name = "black and white cloak hood" + icon_state = "tesh_hood_bw" + item_state = "tesh_hood_bw" + +/obj/item/clothing/head/tesh_hood/standard/black_red + name = "black and red cloak hood" + icon_state = "tesh_hood_br" + item_state = "tesh_hood_br" + +/obj/item/clothing/head/tesh_hood/standard/black + name = "black cloak hood" + icon_state = "tesh_hood_bn" + item_state = "tesh_hood_bn" + +/obj/item/clothing/head/tesh_hood/standard/black_yellow + name = "black and yellow cloak hood" + icon_state = "tesh_hood_by" + item_state = "tesh_hood_by" + +/obj/item/clothing/head/tesh_hood/standard/black_green + name = "black and green cloak hood" + icon_state = "tesh_hood_bgr" + item_state = "tesh_hood_bgr" + +/obj/item/clothing/head/tesh_hood/standard/black_blue + name = "black and blue cloak hood" + icon_state = "tesh_hood_bbl" + item_state = "tesh_hood_bbl" + +/obj/item/clothing/head/tesh_hood/standard/black_purple + name = "black and purple cloak hood" + icon_state = "tesh_hood_bp" + item_state = "tesh_hood_bp" + +/obj/item/clothing/head/tesh_hood/standard/black_pink + name = "black and pink cloak hood" + icon_state = "tesh_hood_bpi" + item_state = "tesh_hood_bpi" + +/obj/item/clothing/head/tesh_hood/standard/black_brown + name = "black and brown cloak hood" + icon_state = "tesh_hood_bbr" + item_state = "tesh_hood_bbr" + +/obj/item/clothing/head/tesh_hood/standard/orange_grey + name = "orange and grey cloak hood" + icon_state = "tesh_hood_og" + item_state = "tesh_hood_og" + +/obj/item/clothing/head/tesh_hood/standard/rainbow + name = "rainbow cloak hood" + icon_state = "tesh_hood_rainbow" + item_state = "tesh_hood_rainbow" + +/obj/item/clothing/head/tesh_hood/standard/lightgrey_grey + name = "light grey and grey cloak hood" + icon_state = "tesh_hood_lgg" + item_state = "tesh_hood_lgg" + +/obj/item/clothing/head/tesh_hood/standard/white_grey + name = "white and grey cloak hood" + icon_state = "tesh_hood_wg" + item_state = "tesh_hood_wg" + +/obj/item/clothing/head/tesh_hood/standard/red_grey + name = "red and grey cloak hood" + icon_state = "tesh_hood_rg" + item_state = "tesh_hood_rg" + +/obj/item/clothing/head/tesh_hood/standard/orange + name = "orange cloak hood" + icon_state = "tesh_hood_on" + item_state = "tesh_hood_on" + +/obj/item/clothing/head/tesh_hood/standard/yellow_grey + name = "yellow and grey cloak hood" + icon_state = "tesh_hood_yg" + item_state = "tesh_hood_yg" + +/obj/item/clothing/head/tesh_hood/standard/green_grey + name = "green and grey cloak hood" + icon_state = "tesh_hood_gg" + item_state = "tesh_hood_gg" + +/obj/item/clothing/head/tesh_hood/standard/blue_grey + name = "blue and grey cloak hood" + icon_state = "tesh_hood_blug" + item_state = "tesh_hood_blug" + +/obj/item/clothing/head/tesh_hood/standard/purple_grey + name = "purple and grey cloak hood" + icon_state = "tesh_hood_pg" + item_state = "tesh_hood_pg" + +/obj/item/clothing/head/tesh_hood/standard/pink_grey + name = "pink and grey cloak hood" + icon_state = "tesh_hood_pig" + item_state = "tesh_hood_pig" + +/obj/item/clothing/head/tesh_hood/standard/brown_grey + name = "brown and grey cloak hood" + icon_state = "tesh_hood_brg" + item_state = "tesh_hood_brg" \ No newline at end of file diff --git a/icons/mob/species/seromi/teshari_cloak_yw.dmi b/icons/mob/species/seromi/teshari_cloak_yw.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0c48f9bd87d712244058c06e4e93ff1d9cab7b2d GIT binary patch literal 2412 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 ZkYf34=p Date: Fri, 3 Jul 2020 17:06:10 -0400 Subject: [PATCH 02/11] one more include --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index 749f7d7185..9f2d8b6601 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1974,6 +1974,7 @@ #include "code\modules\clothing\suits\wiz_robe.dm" #include "code\modules\clothing\suits\wolfbrigade.dm" #include "code\modules\clothing\suits\aliens\seromi.dm" +#include "code\modules\clothing\suits\aliens\seromi_yw.dm" #include "code\modules\clothing\suits\aliens\tajara.dm" #include "code\modules\clothing\suits\aliens\unathi.dm" #include "code\modules\clothing\suits\aliens\vox.dm" From 2098a55ae7bb1c2d6c78edba0f82a3b750985560 Mon Sep 17 00:00:00 2001 From: Luke Vale Date: Sat, 4 Jul 2020 01:18:26 -0500 Subject: [PATCH 03/11] Adds in the other carpet types as a buyable crate. --- code/game/objects/items/stacks/tiles/tile_types.dm | 4 ++-- vorestation.dme | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 901158ffe0..38efb1b544 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -92,7 +92,7 @@ icon_state = "tile-tealcarpet" no_variants = FALSE -/obj/item/stack/tile/carpet/bcarpet +/*/obj/item/stack/tile/carpet/bcarpet //Commented out to help with upstream merging. Get on this you fucking virgo bois. icon_state = "tile-carpet" /obj/item/stack/tile/carpet/blucarpet icon_state = "tile-carpet" @@ -105,7 +105,7 @@ /obj/item/stack/tile/carpet/purcarpet icon_state = "tile-carpet" /obj/item/stack/tile/carpet/oracarpet - icon_state = "tile-carpet" + icon_state = "tile-carpet"*/ /obj/item/stack/tile/floor name = "floor tile" diff --git a/vorestation.dme b/vorestation.dme index 9f2d8b6601..86615c68d1 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -416,6 +416,7 @@ #include "code\datums\supplypacks\hydroponics.dm" #include "code\datums\supplypacks\hydroponics_vr.dm" #include "code\datums\supplypacks\materials.dm" +#include "code\datums\supplypacks\materials_yw.dm" #include "code\datums\supplypacks\medical.dm" #include "code\datums\supplypacks\medical_vr.dm" #include "code\datums\supplypacks\misc.dm" @@ -1201,7 +1202,9 @@ #include "code\game\objects\items\stacks\telecrystal.dm" #include "code\game\objects\items\stacks\sheets\leather.dm" #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm" +#include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles_yw.dm" #include "code\game\objects\items\stacks\tiles\tile_types.dm" +#include "code\game\objects\items\stacks\tiles\tile_types_yw.dm" #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\autopsy.dm" #include "code\game\objects\items\weapons\bones.dm" From 8221cbc4adb80910ca71382d1a63c3fb9d19a656 Mon Sep 17 00:00:00 2001 From: Luke Vale Date: Sat, 4 Jul 2020 01:25:23 -0500 Subject: [PATCH 04/11] Adds in the files because I'm a dummy --- code/datums/supplypacks/materials_yw.dm | 14 ++++++++++ .../stacks/tiles/fifty_spawner_tiles_yw.dm | 27 +++++++++++++++++++ .../objects/items/stacks/tiles/tile_types.dm | 2 +- .../items/stacks/tiles/tile_types_yw.dm | 21 +++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 code/datums/supplypacks/materials_yw.dm create mode 100644 code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm create mode 100644 code/game/objects/items/stacks/tiles/tile_types_yw.dm diff --git a/code/datums/supplypacks/materials_yw.dm b/code/datums/supplypacks/materials_yw.dm new file mode 100644 index 0000000000..b56127433b --- /dev/null +++ b/code/datums/supplypacks/materials_yw.dm @@ -0,0 +1,14 @@ +/datum/supply_pack/materials/carpet_fancy + name = "Fancy Imported carpet" + containertype = /obj/structure/closet/crate + containername = "Fancy Imported carpet crate" + cost = 50 + contains = list( + /obj/fiftyspawner/bcarpet, + /obj/fiftyspawner/blucarpet, + /obj/fiftyspawner/turcarpet, + /obj/fiftyspawner/sblucarpet, + /obj/fiftyspawner/gaycarpet, + /obj/fiftyspawner/purcarpet, + /obj/fiftyspawner/oracarpet + ) \ No newline at end of file diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm new file mode 100644 index 0000000000..6b1018021b --- /dev/null +++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm @@ -0,0 +1,27 @@ +/obj/fiftyspawner/bcarpet + name = "stack of black carpet" + type_to_spawn = /obj/item/stack/tile/carpet/bcarpet + +/obj/fiftyspawner/blucarpet + name = "stack of blue carpet" + type_to_spawn = /obj/item/stack/tile/carpet/blucarpet + +/obj/fiftyspawner/turcarpet + name = "stack of tue carpet" + type_to_spawn = /obj/item/stack/tile/carpet/turcarpet + +/obj/fiftyspawner/sblucarpet + name = "stack of silver blue carpet" + type_to_spawn = /obj/item/stack/tile/carpet/sblucarpet + +/obj/fiftyspawner/gaycarpet + name = "stack of clown carpet" + type_to_spawn = /obj/item/stack/tile/carpet/gaycarpet + +/obj/fiftyspawner/purcarpet + name = "stack of purple carpet" + type_to_spawn = /obj/item/stack/tile/carpet/purcarpet + +/obj/fiftyspawner/oracarpet + name = "stack of orange carpet" + type_to_spawn = /obj/item/stack/tile/carpet/oracarpet \ No newline at end of file diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 38efb1b544..5a62b39671 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -92,7 +92,7 @@ icon_state = "tile-tealcarpet" no_variants = FALSE -/*/obj/item/stack/tile/carpet/bcarpet //Commented out to help with upstream merging. Get on this you fucking virgo bois. +/*/obj/item/stack/tile/carpet/bcarpet //Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw icon_state = "tile-carpet" /obj/item/stack/tile/carpet/blucarpet icon_state = "tile-carpet" diff --git a/code/game/objects/items/stacks/tiles/tile_types_yw.dm b/code/game/objects/items/stacks/tiles/tile_types_yw.dm new file mode 100644 index 0000000000..a78efd1045 --- /dev/null +++ b/code/game/objects/items/stacks/tiles/tile_types_yw.dm @@ -0,0 +1,21 @@ +/obj/item/stack/tile/carpet/bcarpet + name = "black carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/blucarpet + name = "blue carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/turcarpet + name = "tur carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/sblucarpet + name = "silver blue carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/gaycarpet + name = "Clown Carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/purcarpet + name = "purple carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/oracarpet + name = "orange carpet" + icon_state = "tile-carpet" \ No newline at end of file From cf891ce999e8c565e45989ad17e960e3ae63e249 Mon Sep 17 00:00:00 2001 From: Izac Joof Forsgren Date: Sat, 4 Jul 2020 08:26:15 +0200 Subject: [PATCH 05/11] Update code/game/objects/items/stacks/tiles/tile_types.dm --- code/game/objects/items/stacks/tiles/tile_types.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 5a62b39671..1b7d04b14a 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -92,7 +92,8 @@ icon_state = "tile-tealcarpet" no_variants = FALSE -/*/obj/item/stack/tile/carpet/bcarpet //Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw +/*/obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw + icon_state = "tile-carpet" /obj/item/stack/tile/carpet/blucarpet icon_state = "tile-carpet" @@ -238,4 +239,4 @@ uses_charge = 1 charge_costs = list(250) stacktype = /obj/item/stack/tile/roofing - build_type = /obj/item/stack/tile/roofing \ No newline at end of file + build_type = /obj/item/stack/tile/roofing From 925657e9d0f26287a9bccbe1f8ce9bb06f4e145c Mon Sep 17 00:00:00 2001 From: Luke Vale Date: Sat, 4 Jul 2020 03:56:00 -0500 Subject: [PATCH 06/11] AAAAAAAAAAAAAAAAAAAAAAAAAAA --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ad06a4bdf..7fb49ca3dd 100644 --- a/README.md +++ b/README.md @@ -95,4 +95,4 @@ For a basic setup, simply copy every file from config/example to config. ### SQL Setup -The SQL backend for the library and stats tracking requires a MySQL server. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql. More detailed setup instructions arecoming soon, for now ask in our Discord. \ No newline at end of file +The SQL backend for the library and stats tracking requires a MySQL server. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql. More detailed setup instructions arecoming soon, for now ask in our Discord. From aae26a2b548c6d9e1d30fba297c15c3a676ec52d Mon Sep 17 00:00:00 2001 From: Luke Vale Date: Sat, 4 Jul 2020 04:03:19 -0500 Subject: [PATCH 07/11] more screaming --- code/datums/supplypacks/materials_yw.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/supplypacks/materials_yw.dm b/code/datums/supplypacks/materials_yw.dm index b56127433b..de73a90b35 100644 --- a/code/datums/supplypacks/materials_yw.dm +++ b/code/datums/supplypacks/materials_yw.dm @@ -11,4 +11,4 @@ /obj/fiftyspawner/gaycarpet, /obj/fiftyspawner/purcarpet, /obj/fiftyspawner/oracarpet - ) \ No newline at end of file + ) //REEE \ No newline at end of file From 4b55c8b507298c987346e1192567bf1df6e851d1 Mon Sep 17 00:00:00 2001 From: izac112 Date: Sat, 4 Jul 2020 23:37:42 +0200 Subject: [PATCH 08/11] Preparations for tgs 4 (does not actually change anything for current tgs version) --- code/modules/DMAPI/st_commands.dm | 2 ++ code/modules/DMAPI/st_interface.dm | 2 ++ code/modules/DMAPI/yawnDMAPI.dm | 2 ++ code/modules/tgs/v5/chat_commands.dm | 22 ++++++++++++++++++++-- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/code/modules/DMAPI/st_commands.dm b/code/modules/DMAPI/st_commands.dm index dc707d8b71..33d4caabb3 100644 --- a/code/modules/DMAPI/st_commands.dm +++ b/code/modules/DMAPI/st_commands.dm @@ -1,3 +1,5 @@ +//File DEFUNCT + /datum/server_tools_command var/name = "" //the string to trigger this command on a chat bot. e.g. TGS3_BOT: do_this_command var/help_text = "" //help text for this command diff --git a/code/modules/DMAPI/st_interface.dm b/code/modules/DMAPI/st_interface.dm index 4e975b14c2..544da9434c 100644 --- a/code/modules/DMAPI/st_interface.dm +++ b/code/modules/DMAPI/st_interface.dm @@ -1,3 +1,5 @@ +//File DEFUNCT + SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(reboot_mode, REBOOT_MODE_NORMAL) SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE) diff --git a/code/modules/DMAPI/yawnDMAPI.dm b/code/modules/DMAPI/yawnDMAPI.dm index d37a0a225a..8f2c5b7605 100644 --- a/code/modules/DMAPI/yawnDMAPI.dm +++ b/code/modules/DMAPI/yawnDMAPI.dm @@ -1,3 +1,5 @@ +//File DEFUNCT + /datum/server_tools_command/status name = "status" //the string to trigger this command on a chat bot. e.g. TGS3_BOT: do_this_command help_text = "Will broadcast the current player count and other round information" //help text for this command diff --git a/code/modules/tgs/v5/chat_commands.dm b/code/modules/tgs/v5/chat_commands.dm index acae136587..53aeb57a3a 100644 --- a/code/modules/tgs/v5/chat_commands.dm +++ b/code/modules/tgs/v5/chat_commands.dm @@ -2,10 +2,10 @@ name = "status" help_text = "Shows the current production server status" admin_only = FALSE - +/* YW EDIT: replaced by yw variant /datum/tgs_chat_command/status/Run(datum/tgs_chat_user/sender, params) return "Current server status:\n**Web Manifest:** \n**Players:** [TGS_CLIENT_COUNT]\n**Round Duration:** [roundduration2text()]" - +*/ /datum/tgs_chat_command/parsetest name = "parsetest" help_text = "Shows the current production server status" @@ -117,3 +117,21 @@ GLOBAL_LIST_EMPTY(pending_discord_registrations) GLOB.pending_discord_registrations[GLOB.pending_discord_registrations.len] = list("ckey" = key_to_find, "id" = sender.id, "time" = world.realtime) return "[sender.friendly_name], I've sent you a message in-game. Please verify your username there to complete your registration within 10 minutes." + +//YW Commands +//Status +/datum/tgs_chat_command/status/Run(datum/tgs_chat_user/sender, params) + return "Current server status:**Players:** [TGS_CLIENT_COUNT]\n**Round Duration:** [roundduration2text()]" + +// - FAX +/datum/tgs_chat_command/readfax + name = "readfax" + help_text = "Reads a fax with specified faxid" + //required_parameters = 1 Is not a thing + admin_only = TRUE + +/datum/tgs_chat_command/readfax/Run(sender, params) + var/list/all_params = splittext(params, " ") + var/faxid = all_params[1] + var/faxmsg = return_file_text("[config.fax_export_dir]/fax_[faxid].html") + return "FAX: ```[strip_html_properly(faxmsg)]```" \ No newline at end of file From 4c9cd195e4f9c411a7fc1d00cc0a5793dc8f6a13 Mon Sep 17 00:00:00 2001 From: lukevale Date: Sun, 5 Jul 2020 02:40:55 -0500 Subject: [PATCH 09/11] Adds in cyber dragon wings. --- .../vore/appearance/sprite_accessories_yw.dm | 8 ++++++++ icons/mob/vore/wings_yw.dmi | Bin 2909 -> 6330 bytes 2 files changed, 8 insertions(+) diff --git a/code/modules/vore/appearance/sprite_accessories_yw.dm b/code/modules/vore/appearance/sprite_accessories_yw.dm index 5d9df5a5d4..759c4ef425 100644 --- a/code/modules/vore/appearance/sprite_accessories_yw.dm +++ b/code/modules/vore/appearance/sprite_accessories_yw.dm @@ -41,6 +41,14 @@ icon_state = "cyberdoe_s" do_colouration = 0 +/datum/sprite_accessory/wing/cyberangel + name = "Cyber angel wing (colorable)" + desc = "" + icon = 'icons/mob/vore/wings_yw.dmi' + icon_state = "cyber_angel" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + //Tails /datum/sprite_accessory/tail/tripplekitsune_colorable_yw icon = 'icons/mob/vore/tails_yw.dmi' diff --git a/icons/mob/vore/wings_yw.dmi b/icons/mob/vore/wings_yw.dmi index c6c4d7a548f6e16bf0b2fd260eef90c29d49030d..b4e9630aa6d673e87f44be1f59ec70e8942180d5 100644 GIT binary patch literal 6330 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 literal 2909 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 Date: Sun, 5 Jul 2020 09:22:21 -0500 Subject: [PATCH 10/11] Jean's chocolate box Time for her to money shot with dat girl scout chocolates --- .../loadout/loadout_fluffitems_yw.dm | 9 ++++- .../vore/fluffstuff/custom_items_yw.dm | 33 ++++++++++++++++++ icons/vore/custom_items_left_hand_yw.dmi | Bin 1252 -> 1429 bytes icons/vore/custom_items_right_hand_yw.dmi | Bin 1246 -> 1441 bytes icons/vore/custom_items_yw.dmi | Bin 25335 -> 25774 bytes 5 files changed, 41 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index 11c4082794..0bfe5bd45a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -284,7 +284,14 @@ ckeywhitelist = list("dawidoe") character_name = list("Melissa Krutz") allowed_roles = list("Security Officer") - +//Dopiotl +//Jeanne Petite +/datum/gear/fluff/jeans_chocolates + path = /obj/item/weapon/storage/secure/briefcase/fluff/jeans + display_name = "ChocoBox" + description = "M-M-M-M-MONEY SHOT" + ckeywhitelist = list("dopiotl") + character_name = list("Jeanne Petite") //dwaggy90 //Saur Darastrix /datum/gear/fluff/saur_rig diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm index 0ff0ea5c69..c9de33290a 100644 --- a/code/modules/vore/fluffstuff/custom_items_yw.dm +++ b/code/modules/vore/fluffstuff/custom_items_yw.dm @@ -650,3 +650,36 @@ H.resize(1) if("Large") H.resize(1.22) + +// ************* +// Dopiotl +// ************* +/obj/item/weapon/storage/secure/briefcase/fluff/jeans + name = "Sweet Ebony" + desc = "An ebony/wooden secure case lined with gold. It looks thick, heavy, expensive, and incredibly sturdy. The design is sleek and elegant, adorned in intricate markings on the side, with hand-crafted artwork of a constellation you can't quite seem to recollect. It is surprisingly cold to the touch." + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "jeans_lockbox" + item_state_slots = list(slot_r_hand_str = "jeans_lockbox", slot_l_hand_str = "jeans_lockbox") + item_icons = list( + slot_l_hand_str = 'icons/vore/custom_items_left_hand_yw.dmi', + slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi', + ) + var/list/has_items = list( + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + ) + +/obj/item/weapon/storage/secure/briefcase/fluff/jeans/New() //this is entierly nessicary to spawn stuff. "FUN" -luke + storage_slots = has_items.len + allowed = list() + for(var/P in has_items) + allowed += P + new P(src) + ..() + return \ No newline at end of file diff --git a/icons/vore/custom_items_left_hand_yw.dmi b/icons/vore/custom_items_left_hand_yw.dmi index b527bcd0a8b85f713c96ead3f68d64b063c8d2b5..b503889d558452d170e505d3f00e966f04847d88 100644 GIT binary patch delta 1399 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 literal 1246 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1IRQQ)t}oGvSI(O!L@P<%>i^dNg z>74h`Jjqbh)4RjMILP?2v6sS}N0W|B3Q-6?X}W#Ek|0HiBcYET`JB|zV(XGBDqJS2 z`fQogje@NwC09P>a8WUbnH}j8uYq^}6e^Bw%5zUYly z@4q`=uM6LKSCDPSW2+c8tG9CAj6@1`G0p z@*X^Xyxe^+ULt*tln%m3Wx zUwr5mr?GmI#J%mu9~YnhctfskgRwv3o>EJuJ0crJO>an6{JZ)2j^u;oU2I}&>L)T+ zy?Dd*A%DS^=7ece46GB_te88e)w3^^Wtsgz#*ICuvieWyqTNh;nlJM)nSP3nc*Juj zq-f=vN~_&WhkRcEbw#vr>X#HJ_Jd^y|n}+0gS0?;iy&haVM65_4okwFv3Fo_0vPYxr5sB zC!gE0e}eV>^4HJLec$_Q=jYn(b?<8KubmGS`im)a7bx`Cq84fpgM!rU=`V~oz4`q+ zJVoE`e*DZIHTAKNKL4HCdH#F28dM+`T_E+*=URq!GxvX(wRM_R5z8BpX`ZfrF6*2U FngC)2JnjGh diff --git a/icons/vore/custom_items_yw.dmi b/icons/vore/custom_items_yw.dmi index 293396d8cc79eb073d410ca10ebd1a2ccd29af63..a4bce86d2c64d7bf79a98d29b2205beec81a2886 100644 GIT binary patch delta 4037 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 YJD$TqWURJ0WJBPxv87R&p=;#-04wLJIsgCw delta 3595 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 From d9af2a4ccaa47966c5699822dc4c6c7f22b766d8 Mon Sep 17 00:00:00 2001 From: izac112 Date: Mon, 6 Jul 2020 15:38:55 +0200 Subject: [PATCH 11/11] updates client procs.dm --- code/modules/client/client procs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index a775bf2568..82d68d7a47 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -92,8 +92,8 @@ var/DBQuery/query = dbcon.NewQuery("UPDATE erro_player SET discord_id = '[sql_discord]' WHERE ckey = '[sql_ckey]'") if(query.Execute()) to_chat(src, "Registration complete! Thank you for taking the time to register your Discord ID.") - log_and_message_admins("[ckey] has registered their Discord ID to obtain the Crew Member role. Their Discord snowflake ID is: [their_id]") - admin_chat_message(message = "[ckey] has registered their Discord ID to obtain the Crew Member role. Their Discord is: <@[their_id]>", color = "#4eff22") + log_and_message_admins("[ckey] has registered their Discord ID. Their Discord snowflake ID is: [their_id]") //YW EDIT + admin_chat_message(message = "[ckey] has registered their Discord ID. Their Discord is: <@[their_id]>", color = "#4eff22") //YW EDIT notes_add(ckey, "Discord ID: [their_id]") world.VgsAddMemberRole(their_id) else