diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 5d2d843cec62..69de29d4cd70 100644 --- a/code/__DEFINES/traits.dm +++ b/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" diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index b5b8113384df..826eceffc4a1 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/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 Fana"), \ list("Bad Touch", "Friendly")) species_blacklist = list("Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE)) diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index c16655ae59e3..2e7d92a13dfc 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -113,6 +113,14 @@ description = "I love showing off my mime pin!\n" mood_change = 1 +/datum/mood_event/rilena_fan + description = "I love my RILENA merch!\n" + mood_change = 1 + +/datum/mood_event/rilena_super_fan + description = "I love my RILENA hoodie!\n" + mood_change = 3 + /datum/mood_event/goodmusic description = "There is something soothing about this music.\n" mood_change = 3 diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index c3a473ecd992..9351adc1d2d7 100644 --- a/code/datums/traits/good.dm +++ b/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 = "You are a huge fan of RILENA: LMR." + gain_text = "Suddenly, RILENA doesn't seem all that interesting anymore..." + 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." diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 4c5553c4bfbc..14d8709ad43c 100644 --- a/code/game/objects/effects/contraband.dm +++ b/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,47 @@ /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/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 diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index e2461af4175a..374c2c22bea7 100644 --- a/code/game/objects/items/plushes.dm +++ b/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 = "RILENA:LMR 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 = "rilena_ri" + attack_verb = list("blasted", "shot", "shmupped") + //squeak_override = list('sound/voice/ //kepori lack a voice :( + gender = FEMALE + +/obj/item/toy/plush/tali + name = "RILENA:LMR 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 = "rilena_t4l1" + attack_verb = list("blasted", "shot", "cannoned") + gender = FEMALE + +/obj/item/toy/plush/sharai + name = "RILENA:LMR Sharai plushie" + desc = "A plushie of the four winged kepori boss from the popular combination video game series and webcomic RILENA." + icon_state = "rilena_sharai" + attack_verb = list("blasted", "shot", "radial bursted") + gender = FEMALE + +/obj/item/toy/plush/xader + name = "RILENA:LMR Xader plushie" + desc = "A plushie of the recurring transdimensional transgender shopkeep from the popular webseries RILENA." + icon_state = "rilena_xader" + gender = FEMALE + +/obj/item/toy/plush/mora + name = "RILENA:LMR Mora plushie" + desc = "A plushie of insert mora lore here from the popular webseries RILENA." + icon_state = "rilena_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€." diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a4ec930ec0e2..9517a1b73a8b 100644 --- a/code/game/objects/items/toys.dm +++ b/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 = "RILENA:LMR 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." diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm index 671c0efe9602..22287d89784f 100644 --- a/code/modules/client/loadout/loadout_general.dm +++ b/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,7 @@ /datum/gear/surgical_mask display_name = "surgical mask" path = /obj/item/clothing/mask/surgical + +/datum/gear/rilena_poster + display_name = "poster, rilena" + path = /obj/structure/sign/poster/rilena/random \ No newline at end of file diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm index e2800a87e9e1..ec9fc916723e 100644 --- a/code/modules/client/loadout/loadout_suit.dm +++ b/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 diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm index 4edb59b74076..e943ece726d9 100644 --- a/code/modules/client/loadout/loadout_uniform.dm +++ b/code/modules/client/loadout/loadout_uniform.dm @@ -57,6 +57,10 @@ display_name = "jumpsuit, rainbow" path = /obj/item/clothing/under/color/rainbow +/datum/gear/uniform/color/rilena + display_name = "jumpsuit, t4l1" + path = /obj/item/clothing/under/color/rilena + //Shorts /datum/gear/uniform/athshortsred @@ -233,6 +237,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" diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index 82e4d86bc3d3..34b403d8c131 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/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 = "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 = "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 = "RILENA:LMR 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" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 5fc4cc67390b..8a8a1adf3644 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/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") \ No newline at end of file diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 1a2cfdd33fd7..0d0f7b877eb2 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -233,3 +233,10 @@ icon_state = "rainbow_skirt" item_state = "rainbow" can_adjust = FALSE + +/obj/item/clothing/under/color/rilena + name = "RILENA t-shirt" + desc = "A t-shirt with the character T4L1 from RILENA: LMR on it." + icon_state = "rilena_shirt" + item_state = "rilena_shirt" + supports_variations = KEPORI_VARIATION \ No newline at end of file diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index 64500724d01e..6dee5b6a0f13 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/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 \ No newline at end of file diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index cd372392b927..08a87b6f9193 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -515,6 +515,13 @@ volume = 30 spillable = TRUE +/obj/item/reagent_containers/food/drinks/rilenacup + name = "RILENA mug" + desc = "A mug with RILENA: LMR protagonist Ri's face on it." + icon_state = "rilenacup" + volume = 30 + spillable = TRUE + //////////////////////////soda_cans// //These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 3d759bce3fd2..c82a451339be 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -237,6 +237,18 @@ required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ethanol/irish_cream = 3, /datum/reagent/consumable/ethanol/beer = 2) required_catalysts = list(/datum/reagent/consumable/ethanol/creme_de_cacao = 1) +/datum/chemical_reaction/bullet_hell + results = list(/datum/reagent/consumable/ethanol/bullethell = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/fuel = 2, /datum/reagent/consumable/ethanol/absinthe = 3) + +/datum/chemical_reaction/shotinthedark + results = list(/datum/reagent/consumable/ethanol/shotinthedark = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/ethanol/vodka = 5, /datum/reagent/gold = 3) + +/datum/chemical_reaction/homesick + results = list(/datum/reagent/consumable/ethanol/homesick = 15) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/ethanol/creme_de_menthe = 5) + ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri///// /datum/chemical_reaction/sbiten diff --git a/code/modules/modular_computers/computers/item/laptop_presets.dm b/code/modules/modular_computers/computers/item/laptop_presets.dm index 6bc2919bea3b..80590f7ab7d9 100644 --- a/code/modules/modular_computers/computers/item/laptop_presets.dm +++ b/code/modules/modular_computers/computers/item/laptop_presets.dm @@ -20,3 +20,15 @@ /obj/item/modular_computer/laptop/preset/civilian/install_programs() var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD] hard_drive.store_file(new/datum/computer_file/program/chatclient()) + +/obj/item/modular_computer/laptop/preset/civilian/rilena + name = "RILENA:LMR laptop" + desc = "A laptop themed around the popular combination webcomic and video game series RILENA." + icon_state = "laptop-closed_rilena" + icon_state_powered = "laptop_rilena" + icon_state_unpowered = "laptop-off_rilena" + icon_state_closed = "laptop-closed_rilena" + +/obj/item/modular_computer/laptop/preset/civilian/rilena/install_programs() + //var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD] + //hard_drive.store_file(new/datum/computer_file/program/rilena()) //temporarily disabling this so it doesn't ruin anything \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/rilena.dm b/code/modules/modular_computers/file_system/programs/rilena.dm new file mode 100644 index 000000000000..4926f25aa412 --- /dev/null +++ b/code/modules/modular_computers/file_system/programs/rilena.dm @@ -0,0 +1,13 @@ +/datum/computer_file/program/rilena + filename = "rilena" + filedesc = "RILENA:LMR Part 1" + program_icon_state = "holocontrol" + extended_desc = "The first entry in the popular RILENA webseries games. Not counting the countless fan prequels." + usage_flags = PROGRAM_LAPTOP + requires_ntnet = TRUE + available_on_ntnet = FALSE //don't let people download for now, since it doesn't do anything + program_icon = "gamepad" + size = 8 + tgui_id = "NtosRilena" + +//insert stuff here, empty for now \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/energy/special.dm b/code/modules/projectiles/ammunition/energy/special.dm index e7e465e69cfa..1d47f19d0667 100644 --- a/code/modules/projectiles/ammunition/energy/special.dm +++ b/code/modules/projectiles/ammunition/energy/special.dm @@ -84,3 +84,10 @@ projectile_type = /obj/projectile/beam/shrink select_name = "shrink ray" e_cost = 2000 + +/obj/item/ammo_casing/energy/buster + projectile_type = /obj/projectile/energy/buster + select_name = "T4L1 buster replica" + e_cost = 100 //should have a lot of energy + fire_sound = 'sound/effects/empulse.ogg' + delay = 3 SECONDS \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 5b16a06a0ef5..45c77618f7ab 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -404,3 +404,11 @@ /obj/item/gun/energy/tesla_cannon/ComponentInitialize() . = ..() AddComponent(/datum/component/automatic_fire, 0.1 SECONDS) + +/obj/item/gun/energy/buster + name = "replica buster cannon" + icon_state = "buster" + item_state = "buster" + desc = "A replica of T4L1's buster cannon from the popular webseries RILENA. Fires a harmless energy pellet at the target." + ammo_type = list(/obj/item/ammo_casing/energy/buster) + weapon_weight = WEAPON_LIGHT \ No newline at end of file diff --git a/code/modules/projectiles/projectile/energy/misc.dm b/code/modules/projectiles/projectile/energy/misc.dm index 79ee634a3e66..4a753d3dda62 100644 --- a/code/modules/projectiles/projectile/energy/misc.dm +++ b/code/modules/projectiles/projectile/energy/misc.dm @@ -17,3 +17,9 @@ damage_type = TOX paralyze = 100 range = 7 + +/obj/projectile/energy/buster + name = "buster blast" + icon_state = "pulse1" + damage = 0 + damage_type = BURN \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 0e6b166ff810..71df32c54109 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2455,3 +2455,47 @@ All effects don't start immediately, but rather get worse over time; the rate is M.clockcultslurring = min(M.clockcultslurring + 3, 3) M.stuttering = min(M.stuttering + 3, 3) ..() + +/datum/reagent/consumable/ethanol/shotinthedark + name = "Shot in the Dark" + description = "A coconut elixir with a golden tinge." + color = "#bbebff" + boozepwr = 40 + quality = DRINK_VERYGOOD + taste_description = "an incoming bullet" + glass_icon_state = "shotinthedark" + glass_name = "Shot in the Dark" + glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Contains traces of gold from the real bullet inside." + +/datum/reagent/consumable/ethanol/bullethell + name = "Bullet Hell" + description = "An incredibly potent combination drink and fire hazard, typically served in a brass shell casing. May spontaneously combust." + color = "#c33206" + boozepwr = 80 + quality = DRINK_VERYGOOD + taste_description = "being shot in the head several times and then set on fire" + glass_icon_state = "bullethell" + glass_name = "Bullet Hell" + glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Served in an oversized brass shell casing, since glass would probably melt from how intense it is." + accelerant_quality = 20 + +/datum/reagent/consumable/ethanol/bullethell/on_mob_life(mob/living/carbon/M) //rarely sets you on fire + if (prob(5)) + M.adjust_fire_stacks(1) + M.IgniteMob() + ..() + +/datum/reagent/consumable/ethanol/homesick + name = "Homesick" + description = "A soft, creamy drink that tastes like home, and hurts just as much." + color = "#a9c6e5" + boozepwr = 10 + quality = DRINK_GOOD + taste_description = "home, in a way that hurts" + glass_icon_state = "homesick" + glass_name = "Homesick" + glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Ri's mother's favorite drink." + +/datum/reagent/consumable/ethanol/homesick/on_mob_metabolize(mob/living/M) + var/drink_message = pick("You think of what you've left behind...", "You think of the people who miss you...", "You think of where you're from...") + to_chat(M, "[drink_message]") \ No newline at end of file diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index 5d4ee686cde5..bfde13162237 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 24468d662a5e..39e9cd3f329a 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi index a19af8b7aa64..71255a115ee0 100644 Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ diff --git a/icons/mob/clothing/under/color.dmi b/icons/mob/clothing/under/color.dmi index 8bda1f9c7d6c..1f4ebcca9b2b 100644 Binary files a/icons/mob/clothing/under/color.dmi and b/icons/mob/clothing/under/color.dmi differ diff --git a/icons/mob/clothing/under/dress.dmi b/icons/mob/clothing/under/dress.dmi index eac316815846..a67fcb85331f 100644 Binary files a/icons/mob/clothing/under/dress.dmi and b/icons/mob/clothing/under/dress.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 1febae88e98c..9ae2124fa4c5 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index 4a6ec93b5f21..f77386a90062 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index cd7fd6d859b8..7b15fb84a247 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index d7e395ff5b57..0f2433459af1 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/mob/species/kepori/onmob_suit_kepori.dmi b/icons/mob/species/kepori/onmob_suit_kepori.dmi index 9253a5b0be28..4d5eaaab1196 100644 Binary files a/icons/mob/species/kepori/onmob_suit_kepori.dmi and b/icons/mob/species/kepori/onmob_suit_kepori.dmi differ diff --git a/icons/mob/species/kepori/onmob_uniform_kepori.dmi b/icons/mob/species/kepori/onmob_uniform_kepori.dmi index 6f28d759ba5f..b8881ef81638 100644 Binary files a/icons/mob/species/kepori/onmob_uniform_kepori.dmi and b/icons/mob/species/kepori/onmob_uniform_kepori.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index 62d085bd97e7..dff8070e67e4 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi index eaf68b6f9cbd..120e9443fcb9 100644 Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ diff --git a/icons/obj/clothing/under/color.dmi b/icons/obj/clothing/under/color.dmi index 7a616f4c3362..6adbeeb7d8d6 100644 Binary files a/icons/obj/clothing/under/color.dmi and b/icons/obj/clothing/under/color.dmi differ diff --git a/icons/obj/clothing/under/dress.dmi b/icons/obj/clothing/under/dress.dmi index 6227cb21a9b7..2d60ebdf800b 100644 Binary files a/icons/obj/clothing/under/dress.dmi and b/icons/obj/clothing/under/dress.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index 89c576fb6069..5508cf0b3c8e 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index dbc04307a37a..03fdf63dd00b 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 1e250d4c9a5c..3208083cd0bd 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/modular_laptop.dmi b/icons/obj/modular_laptop.dmi index 5d1c3dee66ac..e2405820bb47 100644 Binary files a/icons/obj/modular_laptop.dmi and b/icons/obj/modular_laptop.dmi differ diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 8d1f4993e770..2c982a8ac8f9 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 583a9fe6c7c6..78aebb9416c4 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/shiptest.dme b/shiptest.dme index ea4b5af13172..ee73ad6e786b 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -2777,6 +2777,7 @@ #include "code\modules\modular_computers\file_system\programs\ntnrc_client.dm" #include "code\modules\modular_computers\file_system\programs\powermonitor.dm" #include "code\modules\modular_computers\file_system\programs\radar.dm" +#include "code\modules\modular_computers\file_system\programs\rilena.dm" #include "code\modules\modular_computers\file_system\programs\robocontrol.dm" #include "code\modules\modular_computers\file_system\programs\robotact.dm" #include "code\modules\modular_computers\file_system\programs\secureye.dm"