Browse Source

[Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets (#52733)

Adds wedding content.
master
OnlineGirlfriend 1 year ago
committed by GitHub
parent
commit
c838ba21da
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 38
      code/datums/components/crafting/recipes.dm
  2. 17
      code/game/objects/items/miscellaneous.dm
  3. 7
      code/game/objects/items/storage/belt.dm
  4. 14
      code/modules/cargo/packs.dm
  5. 6
      code/modules/clothing/head/misc.dm
  6. 8
      code/modules/clothing/under/skirt_dress.dm
  7. 7
      code/modules/clothing/under/suits.dm
  8. 6
      code/modules/vending/autodrobe.dm
  9. BIN
      icons/mob/clothing/belt.dmi
  10. BIN
      icons/mob/clothing/head.dmi
  11. BIN
      icons/mob/clothing/under/dress.dmi
  12. BIN
      icons/mob/clothing/under/suits.dmi
  13. BIN
      icons/obj/clothing/belts.dmi
  14. BIN
      icons/obj/clothing/hats.dmi
  15. BIN
      icons/obj/clothing/under/dress.dmi
  16. BIN
      icons/obj/clothing/under/suits.dmi
  17. BIN
      icons/obj/items_and_weapons.dmi

38
code/datums/components/crafting/recipes.dm

@ -363,15 +363,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/spooky_camera
name = "Camera Obscura"
result = /obj/item/camera/spooky
time = 15
reqs = list(/obj/item/camera = 1,
/datum/reagent/water/holywater = 10)
parts = list(/obj/item/camera = 1)
category = CAT_MISC
/datum/crafting_recipe/lizardhat
name = "Lizard Cloche Hat"
result = /obj/item/clothing/head/lizard
@ -394,6 +385,35 @@
/obj/item/organ/ears/cat = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/mixedbouquet
name = "Mixed bouquet"
result = /obj/item/bouquet
reqs = list(/obj/item/reagent_containers/food/snacks/grown/poppy/lily =2,
/obj/item/grown/sunflower = 2,
/obj/item/reagent_containers/food/snacks/grown/poppy/geranium = 2)
category = CAT_MISC
/datum/crafting_recipe/sunbouquet
name = "Sunflower bouquet"
result = /obj/item/bouquet/sunflower
reqs = list(/obj/item/grown/sunflower = 6)
category = CAT_MISC
/datum/crafting_recipe/poppybouquet
name = "Poppy bouquet"
result = /obj/item/bouquet/poppy
reqs = list (/obj/item/reagent_containers/food/snacks/grown/poppy = 6)
category = CAT_MISC
/datum/crafting_recipe/spooky_camera
name = "Camera Obscura"
result = /obj/item/camera/spooky
time = 15
reqs = list(/obj/item/camera = 1,
/datum/reagent/water/holywater = 10)
parts = list(/obj/item/camera = 1)
category = CAT_MISC
/datum/crafting_recipe/skateboard
name = "Skateboard"
result = /obj/vehicle/ridden/scooter/skateboard

17
code/game/objects/items/miscellaneous.dm

@ -218,3 +218,20 @@
/obj/item/virgin_mary/proc/manual_suicide(mob/living/user)
user.adjustOxyLoss(200)
user.death(0)
// Bouquets
/obj/item/bouquet
name = "mixed bouquet"
desc = "A bouquet of sunflowers, lilies, and geraniums. How delightful."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "mixedbouquet"
/obj/item/bouquet/sunflower
name = "sunflower bouquet"
desc = "A bright bouquet of sunflowers."
icon_state = "sunbouquet"
/obj/item/bouquet/poppy
name = "poppy bouquet"
desc = "A bouquet of poppies. You feel loved just looking at it."
icon_state = "poppybouquet"

7
code/game/objects/items/storage/belt.dm

@ -370,6 +370,13 @@
/obj/item/clothing/mask/luchador
))
/obj/item/storage/belt/cummerbund
name = "cummerbund"
desc = "A pleated sash that pairs well with a suit jacket."
icon_state = "cummerbund"
inhand_icon_state = "cummerbund"
worn_icon_state = "cummerbund"
/obj/item/storage/belt/military
name = "chest rig"
desc = "A set of tactical webbing worn by Syndicate boarding parties."

14
code/modules/cargo/packs.dm

@ -1639,6 +1639,20 @@
contains = list(/obj/item/vending_refill/assist)
crate_name = "vendomat supply crate"
/datum/supply_pack/service/wedding
name = "Wedding Crate"
desc = "Everything you need to host a wedding! Now you just need an officiant."
cost = 1500
contains = list(/obj/item/clothing/under/dress/wedding_dress,
/obj/item/clothing/under/suit/tuxedo,
/obj/item/storage/belt/cummerbund,
/obj/item/clothing/head/weddingveil,
/obj/item/bouquet,
/obj/item/bouquet/sunflower,
/obj/item/bouquet/poppy,
/obj/item/reagent_containers/food/drinks/bottle/champagne)
crate_name = "wedding crate"
/datum/supply_pack/service/emptycrate
name = "Empty Crate"
desc = "It's an empty crate, for all your storage needs."

6
code/modules/clothing/head/misc.dm

@ -474,3 +474,9 @@
desc = "Hee-ho!"
icon_state = "JackFrostHat"
inhand_icon_state = "JackFrostHat"
/obj/item/clothing/head/weddingveil
name = "wedding veil"
desc = "A gauzy white veil."
icon_state = "weddingveil"
inhand_icon_state = "weddingveil"

8
code/modules/clothing/under/skirt_dress.dm

@ -30,6 +30,14 @@
icon_state = "sailor_dress"
inhand_icon_state = "sailor_dress"
/obj/item/clothing/under/dress/wedding_dress
name = "wedding dress"
desc = "A luxurious gown for once-in-a-lifetime occasions."
icon_state = "wedding_dress"
inhand_icon_state = "wedding_dress"
body_parts_covered = CHEST|GROIN|LEGS
flags_cover = HIDESHOES
/obj/item/clothing/under/dress/redeveninggown
name = "red evening gown"
desc = "Fancy dress for space bar singers."

7
code/modules/clothing/under/suits.dm

@ -124,6 +124,7 @@
desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit."
icon_state = "beige_suit"
inhand_icon_state = "beige_suit"
/obj/item/clothing/under/suit/henchmen
name = "henchmen jumpsuit"
desc = "A very gaudy jumpsuit for a proper Henchman. Guild regulations, you understand."
@ -133,3 +134,9 @@
inhand_icon_state = "henchmen"
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD
flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR
/obj/item/clothing/under/suit/tuxedo
name = "tuxedo"
desc = "A formal black tuxedo. It exudes classiness."
icon_state = "tuxedo"
inhand_icon_state = "tuxedo"

6
code/modules/vending/autodrobe.dm

@ -140,7 +140,11 @@
/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
/obj/item/clothing/head/clownmitre = 1,
/obj/item/skub = 1,
/obj/item/clothing/suit/hooded/mysticrobe = 1)
/obj/item/clothing/suit/hooded/mysticrobe = 1,
/obj/item/clothing/under/dress/wedding_dress = 1,
/obj/item/clothing/under/suit/tuxedo = 1,
/obj/item/clothing/head/weddingveil = 1,
/obj/item/storage/belt/cummerbund = 1)
refill_canister = /obj/item/vending_refill/autodrobe
default_price = 180
extra_price = 360

BIN
icons/mob/clothing/belt.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

BIN
icons/mob/clothing/head.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 KiB

After

Width:  |  Height:  |  Size: 209 KiB

BIN
icons/mob/clothing/under/dress.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
icons/mob/clothing/under/suits.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
icons/obj/clothing/belts.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
icons/obj/clothing/hats.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 105 KiB

BIN
icons/obj/clothing/under/dress.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
icons/obj/clothing/under/suits.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
icons/obj/items_and_weapons.dmi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Loading…
Cancel
Save