Merge pull request #193 from Mirag1993/Мердж-с-оффами

RILENA MERCH (shiptest-ss13#2531)

code/__DEFINES/traits.dm

@@ -289,6 +289,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_SPIRITUAL "spiritual"
 #define TRAIT_FAN_CLOWN "fan_clown"
 #define TRAIT_FAN_MIME "fan_mime"
+#define TRAIT_FAN_RILENA "fan_rilena"
 #define TRAIT_VORACIOUS "voracious"
 #define TRAIT_SELF_AWARE "self_aware"
 #define TRAIT_FREERUNNING "freerunning"

code/controllers/subsystem/processing/quirks.dm

@@ -23,7 +23,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 							list("Ageusia","Vegetarian","Deviant Tastes"), \
 							list("Ananas Affinity","Ananas Aversion"), \
 							list("Alcohol Tolerance","Light Drinker"), \
-							list("Clown Fan","Mime Fan"), \
+							list("Clown Fan","Mime Fan", "RILENA Super Fan"), \
 							list("Bad Touch", "Friendly"))
 
 	species_blacklist = list("Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE))

code/datums/components/art.dm

@@ -51,3 +51,17 @@
 	if(!do_after(M, 20, target = parent))
 		return
 	on_obj_examine(source, M)
+
+/datum/component/art/rilena
+
+/datum/component/art/rilena/apply_moodlet(mob/living/user, impress)
+	var/msg
+	if(HAS_TRAIT(user, TRAIT_FAN_RILENA))
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat)
+		msg = "You love this franchise!"
+	else
+		msg = "You don't get it. At least it's not ugly."
+	user.visible_message(
+		"<span class='notice'>[user] stops and looks intently at [parent].</span>",
+		"<span class='notice'>You stop to take in [parent]. [msg]</span>"
+	)

code/datums/mood_events/generic_positive_events.dm

@@ -113,6 +113,14 @@
 	description = "<span class='nicegreen'>I love showing off my mime pin!</span>\n"
 	mood_change = 1
 
+/datum/mood_event/rilena_fan
+	description = "<span class='nicegreen'>I love my RILENA merch!</span>\n"
+	mood_change = 1
+
+/datum/mood_event/rilena_super_fan
+	description = "<span class='nicegreen'>I love my RILENA hoodie!</span>\n"
+	mood_change = 1
+
 /datum/mood_event/goodmusic
 	description = "<span class='nicegreen'>There is something soothing about this music.</span>\n"
 	mood_change = 3

code/datums/traits/good.dm

@@ -82,6 +82,26 @@
 	var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
 	fan.add_hud_to(H)
 
+/datum/quirk/fan_rilena
+	name = "RILENA Super Fan"
+	desc = "You are a major fan of the popular webseries RILENA: LMR. You get a mood boost from plushies of your favorite characters, and wearing your Xader pin."
+	value = 1
+	mob_traits = list(TRAIT_FAN_RILENA)
+	gain_text = "<span class='notice'>You are a huge fan of a certain combination webcomic and bullet hell game.</span>"
+	gain_text = "<span class='danger'>Suddenly, bullet hell games and webcomics don't seem all that interesting anymore...</span>"
+	medical_record_text = "Patient reports being a huge fan of RILENA."
+
+/datum/quirk/fan_rilena/on_spawn()
+	var/mob/living/carbon/human/H = quirk_holder
+	var/obj/item/clothing/accessory/rilena_pin/B = new(get_turf(H))
+	var/list/slots = list (
+		"backpack" = ITEM_SLOT_BACKPACK,
+		"hands" = ITEM_SLOT_HANDS,
+	)
+	H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
+	var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
+	fan.add_hud_to(H)
+
 /datum/quirk/fan_mime
 	name = "Mime Fan"
 	desc = "You enjoy mime antics and get a mood boost from wearing your mime pin."

code/game/objects/effects/contraband.dm

@@ -60,6 +60,11 @@
 	poster_type = /obj/structure/sign/poster/minutemen/random
 	icon_state = "rolled_legit"
 
+/obj/item/poster/random_rilena
+	name = "random rilena poster"
+	poster_type = /obj/structure/sign/poster/rilena/random
+	icon_state = "rolled_rilena"
+
 // The poster sign/structure
 
 /obj/structure/sign/poster
@@ -1015,6 +1020,51 @@
 	/obj/structure/sign/poster/contraband/d_day_promo,
 		)
 
+//RILENA poster pool. There are only five of these, so try not to go overboard with the random posters, okay? Expect not to see these mapped onto ships except in rolled up form, since they're supposed to be bought in the RILENA merch crate.
+
+/obj/structure/sign/poster/rilena
+	poster_item_name = "rilena poster"
+	poster_item_desc = "A poster with a vibrant purple backing, indicating it is for the popular webseries RILENA: LMR. It comes with adhesive backing, for easy pinning to any vertical surface."
+	poster_item_icon_state = "rolled_rilena"
+
+/obj/structure/sign/poster/rilena/Initialize(mapload, obj/structure/sign/poster/new_poster_structure)
+	. = ..()
+	AddComponent(/datum/component/art/rilena, GOOD_ART)
+
+/obj/structure/sign/poster/rilena/random
+	name = "random rilena poster"
+	icon_state = "random_rilena"
+	never_random = TRUE
+	random_basetype = /obj/structure/sign/poster/rilena
+	random_type = POSTER_SUBTYPES
+
+/obj/structure/sign/poster/rilena/rilena
+	name = "RILENA"
+	desc = "A RILENA: LMR poster featuring two of the more fan favorite characters, Ri and T4L1."
+	icon_state = "poster-rilena_rilena"
+
+/obj/structure/sign/poster/rilena/ri
+	name = "Ri"
+	desc = "A RILENA: LMR poster featuring Ri on her own."
+	icon_state = "poster-rilena_ri"
+
+/obj/structure/sign/poster/rilena/tali
+	name = "T4L1"
+	desc = "A RILENA: LMR poster featuring a fan favorite miniboss, T4L1."
+	icon_state = "poster-rilena_tali"
+
+/obj/structure/sign/poster/rilena/run
+	name = "Lenelasa Me Refi"
+	desc = "A RILENA: LMR poster featuring Ri running, a core mechanic of the series."
+	icon_state = "poster-rilena_run"
+
+/obj/structure/sign/poster/rilena/timeline
+	name = "Timeline"
+	desc = "A RILENA: LMR poster split in two to represent the series' disregard for conventional timeline aspects."
+	icon_state = "poster-rilena_timeline"
+
+
+
 #undef PLACE_SPEED
 #undef POSTER_SUBTYPES
 #undef POSTER_LIST

code/game/objects/items/plushes.dm

@@ -653,7 +653,7 @@
 
 /obj/item/toy/plush/moth/punished
 	name = "punished moth plushie"
-	desc = "An adorable mothperson plushy. It's a sad bug... that's quite sad actualy."
+	desc = "An adorable mothperson plushy. It's a sad bug... that's quite sad actually."
 	icon_state = "moffplush_punished"
 
 /obj/item/toy/plush/moth/firewatch
@@ -772,6 +772,46 @@
 	lefthand_file = 'icons/mob/inhands/misc/plushes_lefthand.dmi' //todo: sort the god damn plushie inhands
 	righthand_file = 'icons/mob/inhands/misc/plushes_righthand.dmi'
 
+/obj/item/toy/plush/rilena
+	name = "Ri plushie"
+	desc = "A plush of the protagonist of the popular combination video game series and webcomic RILENA."// Makes the iconic hurt sound from the game!" //sadly does not :pensive:
+	icon_state = "rilenaplush_ri"
+	attack_verb = list("blasted", "shot", "shmupped")
+	//squeak_override = list('sound/voice/ //kepori lack a voice :(
+	gender = FEMALE
+
+/obj/item/toy/plush/tali
+	name = "T4L1 plushie"
+	desc = "A surprisingly soft plushie of a recurring miniboss from the popular combination video game series and webcomic RILENA. The cannon arm does not function."
+	icon_state = "rilenaplush_t4l1"
+	attack_verb = list("blasted", "shot", "cannoned")
+	gender = FEMALE
+
+/obj/item/toy/plush/sharai
+	name = "Sharai plushie"
+	desc = "A plushie of the four winged kepori boss from the popular combination video game series and webcomic RILENA."
+	icon_state = "rilenaplush_sharai"
+	attack_verb = list("blasted", "shot", "radial bursted")
+	gender = FEMALE
+
+/obj/item/toy/plush/xader
+	name = "Xader plushie"
+	desc = "A plushie of the recurring transdimensional transgender shopkeep from the popular webseries RILENA."
+	icon_state = "rilenaplush_xader"
+	gender = FEMALE
+
+/obj/item/toy/plush/mora
+	name = "Mora plushie"
+	desc = "A plushie of Mora from the popular webseries RILENA."
+	icon_state = "rilenaplush_mora"
+	gender = FEMALE
+
+/obj/item/toy/plush/kari
+	name = "knockoff RILENA plushie"
+	desc = "A plushie of a FBP Kepori. The tag calls it 'Kari' and claims it to be from 'RAYALA: RUNNING FROM EVIL'. The cannon arm does not function."
+	icon_state = "fbplush"
+	gender = FEMALE
+
 /obj/item/toy/plush/among
 	name = "amoung pequeño"
 	desc = "A little pill shaped guy, with a price tag of 3€."

code/game/objects/items/toys.dm

@@ -1370,6 +1370,18 @@
 	icon_state = "vanguard"
 	toysay = "I'm too old for this shit."
 
+/obj/item/toy/figure/tali
+	name = "T4L1 action figure"
+	desc = "An action figure modeled after a recurring miniboss from the popular combination webcomic and video game RILENA. Unfortunately, the gun arm does not function."
+	icon_state = "tali"
+	toysay = "I'll take you down this time!"
+
+/obj/item/toy/figure/kari
+	name = "knockoff RILENA action figure"
+	desc = "An action figure that seems to be labeled as 'Kari' from RAYALA: RUNNING FROM EVIL. Unfortunately, the gun arm does not function."
+	icon_state = "kari"
+	toysay = "I will defeat you for good!"
+
 /obj/item/toy/dummy
 	name = "ventriloquist dummy"
 	desc = "It's a dummy, dummy."

code/modules/cargo/packs/costumes_toys.dm

@@ -213,3 +213,21 @@
 	for(var/i in 1 to 3)
 		var/item = pick_n_take(L)
 		new item(C)
+
+/datum/supply_pack/costumes_toys/rilena_merch
+	name = "RILENA Merchandise Crate"
+	desc = "A crate full of all the RILENA merch you could ever want. Except the offbrand stuff. That's not in here."
+	cost = 1000 //lots of loot
+	contains = list(/obj/item/toy/figure/tali,
+					/obj/item/toy/plush/rilena,
+					/obj/item/toy/plush/tali,
+					/obj/item/toy/plush/sharai,
+					/obj/item/toy/plush/xader,
+					/obj/item/toy/plush/mora,
+					/obj/item/poster/random_rilena,
+					/obj/item/poster/random_rilena,
+					/obj/item/poster/random_rilena,
+					/obj/item/clothing/suit/hooded/hoodie/rilena,
+					/obj/item/clothing/under/dress/rilena,
+					/obj/item/gun/energy/buster)
+	crate_name = "collectable merchandise crate"

code/modules/client/loadout/loadout_general.dm

@@ -42,6 +42,10 @@
 	display_name = "coffee mug"
 	path = /obj/item/reagent_containers/food/drinks/britcup
 
+/datum/gear/rilena_mug
+	display_name = "coffee mug, rilena"
+	path = /obj/item/reagent_containers/food/drinks/rilenacup
+
 /datum/gear/lighter
 	display_name = "cheap lighter"
 	path = /obj/item/lighter/greyscale
@@ -78,6 +82,10 @@
 	display_name = "laptop computer"
 	path = /obj/item/modular_computer/laptop/preset/civilian
 
+/datum/gear/rilena_laptop
+	display_name = "rilena laptop computer"
+	path = /obj/item/modular_computer/laptop/preset/civilian/rilena
+
 /datum/gear/pen
 	display_name = "pen, black"
 	path = /obj/item/pen
@@ -123,6 +131,14 @@
 	display_name = "toy, marketable knight plushie"
 	path = /obj/item/toy/plush/knight
 
+/datum/gear/ri
+	display_name = "toy, rilena ri plushie"
+	path = /obj/item/toy/plush/rilena
+
+/datum/gear/tali
+	display_name = "toy, rilena tali plushie"
+	path = /obj/item/toy/plush/tali
+
 // Shiptest edit
 /datum/gear/amongus
 	display_name = "toy, suspicious pill plushie"
@@ -163,3 +179,8 @@
 /datum/gear/surgical_mask
 	display_name = "surgical mask"
 	path = /obj/item/clothing/mask/surgical
+
+/datum/gear/rilena_poster
+	display_name = "poster, rilena"
+	path = /obj/item/poster/random_rilena
+	description = "A random poster of the RILENA series."

code/modules/client/loadout/loadout_suit.dm

@@ -73,6 +73,14 @@
 	display_name = "hoodie, gray"
 	path = /obj/item/clothing/suit/hooded/hoodie/gray
 
+/datum/gear/suit/jacket/hoodie_fbp
+	display_name = "hoodie, fbp kepori"
+	path = /obj/item/clothing/suit/hooded/hoodie/fbp
+
+/datum/gear/suit/jacket/hoodie_rilena
+	display_name = "hoodie, T4L1"
+	path = /obj/item/clothing/suit/hooded/hoodie/rilena
+
 /datum/gear/suit/jacket/highvis
 	display_name = "industrial jacket"
 	path = /obj/item/clothing/suit/toggle/industrial

code/modules/client/loadout/loadout_uniform.dm

@@ -233,6 +233,10 @@
 	display_name = "dress-suitskirt, navy"
 	path = /obj/item/clothing/under/suit/dresssuit/skirt
 
+/datum/gear/uniform/dress/rilena
+	display_name = "red dress, Ri cosplay"
+	path = /obj/item/clothing/under/dress/rilena
+
 //Premium
 /datum/gear/uniform/tacticool
 	display_name = "tacticool turtleneck"

code/modules/clothing/suits/hoodies.dm

@@ -74,3 +74,43 @@
 	desc = "A gray hood for your gray hoodie."
 	icon_state = "hoodie_gray"
 	item_state = "hoodie_gray"
+
+/obj/item/clothing/suit/hooded/hoodie/fbp
+	name = "\improper FBP kepori hoodie"
+	desc = "A hoodie themed to look like a kepori in a Full Body Prosthetic. It has a comfy pocket for keeping your hands warm."
+	icon_state = "hoodie_fbp"
+	item_state = "hoodie_fbp"
+	hoodtype = /obj/item/clothing/head/hooded/hood/fbp
+
+/obj/item/clothing/head/hooded/hood/fbp
+	name = "\improper FBP kepori hood"
+	desc = "A hood for your FBP hoodie."
+	icon_state = "hoodie_fbp"
+	item_state = "hoodie_fbp"
+
+/obj/item/clothing/suit/hooded/hoodie/rilena
+	name = "K4L1 hoodie"
+	desc = "A hoodie themed to look like K4L1 from the popular webseries RILENA. It has a comfy pocket for keeping your hands warm."
+	icon_state = "hoodie_rilena"
+	item_state = "hoodie_rilena"
+	hoodtype = /obj/item/clothing/head/hooded/hood/rilena
+
+/obj/item/clothing/suit/hooded/hoodie/rilena/equipped(mob/user, slot)
+	. = ..()
+	if(slot != ITEM_SLOT_OCLOTHING)
+		return
+	var/mob/living/L = user
+	if(HAS_TRAIT(L, TRAIT_FAN_RILENA))
+		SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "hoodie_rilena", /datum/mood_event/rilena_super_fan)
+
+/obj/item/clothing/suit/hooded/hoodie/rilena/dropped(mob/user)
+	. = ..()
+	var/mob/living/L = user
+	if(HAS_TRAIT(L, TRAIT_FAN_RILENA))
+		SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "hoodie_rilena")
+
+/obj/item/clothing/head/hooded/hood/rilena
+	name = "RILENA: LMR K4L1 hood"
+	desc = "A hood for your RILENA themed hoodie."
+	icon_state = "hoodie_rilena"
+	item_state = "hoodie_rilena"

code/modules/clothing/under/accessories.dm

@@ -523,3 +523,25 @@
 	name = "solgov waistcoat"
 	desc = "A standard issue waistcoat in solgov colors."
 	icon_state = "solgov_waistcoat"
+
+//////////
+//RILENA//
+//////////
+
+/obj/item/clothing/accessory/rilena_pin
+	name = "RILENA: LMR Xader pin"
+	desc = "A pin that shows your love for the webseries RILENA."
+	icon_state = "rilena_pin"
+	above_suit = FALSE
+	minimize_when_attached = TRUE
+	attachment_slot = CHEST
+
+/obj/item/clothing/accessory/rilena_pin/on_uniform_equip(obj/item/clothing/under/U, user)
+	var/mob/living/L = user
+	if(HAS_TRAIT(L, TRAIT_FAN_RILENA))
+		SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "rilena_pin", /datum/mood_event/rilena_fan)
+
+/obj/item/clothing/accessory/rilena_pin/on_uniform_dropped(obj/item/clothing/under/U, user)
+	var/mob/living/L = user
+	if(HAS_TRAIT(L, TRAIT_FAN_RILENA))
+		SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "rilena_pin")

code/modules/clothing/under/skirt_dress.dm

@@ -87,3 +87,10 @@
 	desc = "A preppy green skirt with a white blouse."
 	icon_state = "plaid_green"
 	item_state = "plaid_green"
+
+/obj/item/clothing/under/dress/rilena
+	name = "RILENA: LMR Ri cosplay"
+	desc = "A pretty red dress with big pink ribbons attached. Intended to be worn by Kepori cosplayers, but also fits other species."
+	icon_state = "rilena_dress"
+	item_state = "rilena_dress"
+	supports_variations = KEPORI_VARIATION