diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index 3a7fb09aa5f6..a751740c08a2 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -1859,15 +1859,8 @@ pixel_y = -32; pixel_x = 32 }, -/obj/item/reagent_containers/food/drinks/britcup{ - desc = "A cup with a strange flag emblazoned on it."; - pixel_y = 4; - pixel_x = 9 - }, -/obj/item/reagent_containers/food/drinks/britcup{ - desc = "A cup with a strange flag emblazoned on it."; - pixel_y = -2 - }, +/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/food/drinks/mug, /obj/item/reagent_containers/food/drinks/bottle/wine{ pixel_y = 10; pixel_x = -9 diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm index d17c4f371728..82c054f8fabf 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm @@ -1480,7 +1480,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ +/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{ pixel_y = 12; pixel_x = -7 }, diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm index e664dfec8d96..397dff3689ee 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm @@ -1156,10 +1156,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ruin/whitesands/pubbycrash/engine_room) "Ak" = ( -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = 9; - pixel_y = -3 - }, +/obj/item/reagent_containers/food/drinks/mug, /obj/item/trash/pistachios{ pixel_y = 5 }, diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm index 28f84c6dfea9..45591d25dde5 100644 --- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm +++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm @@ -3821,7 +3821,7 @@ pixel_x = 5; pixel_y = -5 }, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{ +/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx{ pixel_x = -4; pixel_y = 2 }, @@ -4180,7 +4180,7 @@ /area/ruin/space/has_grav/singularitylab/civvie) "qt" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{ +/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail{ pixel_x = -6 }, /obj/item/radio/intercom/directional/east, @@ -13228,7 +13228,7 @@ default_raw_text = "Whatever happens. Happens." }, /obj/item/pen, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ +/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{ pixel_x = 10; pixel_y = 4 }, diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm index 05d9a042df56..322ab73490f9 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm @@ -5554,11 +5554,11 @@ /obj/item/reagent_containers/food/drinks/soda_cans/cola{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ +/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{ pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ +/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch, +/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{ pixel_x = 5 }, /obj/item/storage/box/drinkingglasses, diff --git a/_maps/configs/srm_elder.json b/_maps/configs/srm_elder.json index 82e104096b00..03caf7196183 100644 --- a/_maps/configs/srm_elder.json +++ b/_maps/configs/srm_elder.json @@ -22,17 +22,30 @@ "officer": true, "slots": 1 }, + "Hunter Colligne": { + "outfit": "/datum/outfit/job/roumain/hop", + "officer": true, + "slots": 1 + }, "Hunter Doctor": { "outfit": "/datum/outfit/job/roumain/doctor", "slots": 1 }, + "Machinist": { + "outfit": "/datum/outfit/job/roumain/engineer", + "slots": 1 + }, "Hunter": { "outfit": "/datum/outfit/job/roumain/security", "slots": 3 }, + "Flamebearer": { + "outfit": "/datum/outfit/job/roumain/flamebearer", + "slots": 1 + }, "Shadow": { "outfit": "/datum/outfit/job/roumain/assistant", - "slots": 3 + "slots": 2 } }, "enabled": true diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 0f8565b7ecec..b37a44a0c8f6 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -4179,7 +4179,7 @@ "aNr" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/mug, /obj/structure/window/reinforced{ dir = 8 }, @@ -4527,7 +4527,7 @@ /obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/mug, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index a55df014f4f9..d1a184d736fc 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -3689,10 +3689,7 @@ pixel_y = -5; pixel_x = -9 }, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = -7; - pixel_y = 10 - }, +/obj/item/reagent_containers/food/drinks/mug, /obj/effect/turf_decal/trimline/opaque/blue/filled/line{ dir = 4 }, @@ -9793,7 +9790,7 @@ pixel_y = -3 }, /obj/item/reagent_containers/food/snacks/meatbun, -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{ +/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda{ pixel_y = 12; pixel_x = -8 }, @@ -12833,7 +12830,7 @@ /obj/item/reagent_containers/food/snacks/nachos{ pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ +/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{ pixel_x = 8; pixel_y = 3 }, diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index 3975c649b490..1eae63fcac48 100644 --- a/_maps/shuttles/independent/independent_beluga.dmm +++ b/_maps/shuttles/independent/independent_beluga.dmm @@ -1341,10 +1341,7 @@ pixel_x = 8; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = -6; - pixel_y = -1 - }, +/obj/item/reagent_containers/food/drinks/mug, /obj/item/phone{ pixel_x = 9; pixel_y = -2 @@ -3155,10 +3152,7 @@ pixel_x = 4; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = -5; - pixel_y = 7 - }, +/obj/item/reagent_containers/food/drinks/mug, /obj/effect/turf_decal/siding/wood, /obj/item/lipstick{ pixel_x = -5; @@ -4831,9 +4825,7 @@ dir = 4 }, /obj/structure/table/wood/reinforced, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = 9 - }, +/obj/item/reagent_containers/food/drinks/mug, /turf/open/floor/plasteel/sepia, /area/ship/crew/canteen) "VK" = ( diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm index 1ac7b7fb0d33..08738bbe821f 100644 --- a/_maps/shuttles/independent/independent_tranquility.dmm +++ b/_maps/shuttles/independent/independent_tranquility.dmm @@ -995,9 +995,9 @@ name = "Minifridge" }, /obj/item/reagent_containers/food/drinks/soda_cans/molten, -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, +/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda, +/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel, +/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel, /obj/item/reagent_containers/food/drinks/soda_cans/random, /obj/item/reagent_containers/food/drinks/soda_cans/random, /obj/item/reagent_containers/food/drinks/soda_cans/sodawater, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index 3f761da4dd08..ea1b99d7d1c4 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -11028,10 +11028,7 @@ pixel_x = -5; pixel_y = -12 }, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = 8; - pixel_y = -4 - }, +/obj/item/reagent_containers/food/drinks/mug, /obj/item/newspaper{ pixel_x = -8; pixel_y = 5 diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm index cb47d2024536..d8d7b6714d6e 100644 --- a/_maps/shuttles/roumain/srm_elder.dmm +++ b/_maps/shuttles/roumain/srm_elder.dmm @@ -1056,12 +1056,12 @@ /area/ship/roumain) "lA" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/mining/independent, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/emergency_oxygen/double, /obj/effect/turf_decal/spline/fancy/wood{ dir = 6 }, +/obj/item/clothing/suit/space/hardsuit/solgov/roumain, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/wood/mahogany, /area/ship/bridge) "lM" = ( @@ -1523,6 +1523,24 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering/atmospherics) +"rN" = ( +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/obj/item/flashlight/lantern, +/obj/structure/closet/secure_closet/shadow, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/combat, +/obj/item/kitchen/knife/hunting, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/storage/backpack/satchel/leather, +/obj/item/clothing/accessory/waistcoat/roumain, +/turf/open/floor/wood/ebony, +/area/ship/storage) "rW" = ( /obj/machinery/smartfridge/drying_rack, /turf/open/floor/ship/dirt/dark, @@ -1669,6 +1687,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/chair/wood/wings, /turf/open/floor/wood/mahogany, /area/ship/bridge) "up" = ( @@ -1987,8 +2006,8 @@ /obj/item/clothing/shoes/cowboy, /obj/item/clothing/shoes/cowboy/black, /obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/hos/roumain/montagne, -/obj/item/clothing/head/HoS/cowboy/montagne, +/obj/item/clothing/suit/armor/roumain/montagne, +/obj/item/clothing/head/cowboy/sec/roumain/montagne, /obj/item/flashlight/lantern, /obj/item/storage/fancy/candle_box{ pixel_y = 3; @@ -2010,6 +2029,7 @@ /obj/item/ammo_box/a44roum_speedloader, /obj/item/ammo_box/a44roum_speedloader, /obj/item/ammo_box/a44roum, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/mahogany, /area/ship/bridge) "zH" = ( @@ -2435,6 +2455,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/destructible/tribal_torch, /turf/open/floor/plating, /area/ship/engineering/engine) "DV" = ( @@ -2629,6 +2650,7 @@ pixel_x = -7 }, /obj/item/storage/backpack/satchel/leather, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/ebony, /area/ship/storage) "HB" = ( @@ -2656,10 +2678,33 @@ /turf/open/floor/wood/maple, /area/ship/hallway/starboard) "HO" = ( -/obj/structure/chair/wood/wings, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/suit/roumain, +/obj/item/flashlight/lantern, +/obj/item/storage/fancy/candle_box{ + pixel_y = 3; + pixel_x = 8 + }, +/obj/item/lighter{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/kitchen/knife/combat, /obj/effect/turf_decal/spline/fancy/wood{ dir = 5 }, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/storage/backpack/satchel/leather, +/obj/item/gun/ballistic/revolver/detective, +/obj/item/ammo_box/c38, +/obj/item/ammo_box/c38, +/obj/item/ammo_box/c38_box, +/obj/item/clothing/head/cowboy/sec/roumain/colligne, +/obj/item/clothing/suit/armor/roumain/colligne, +/obj/structure/closet/secure_closet/collignes, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/mahogany, /area/ship/bridge) "Ii" = ( @@ -3254,17 +3299,26 @@ /turf/open/floor/wood/mahogany, /area/ship/bridge) "Od" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/destructible/tribal_torch, +/obj/item/clothing/head/hardhat/solgov, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/head/welding, +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/item/clothing/suit/hazardvest/roumain, +/obj/item/clothing/head/cowboy/sec/roumain/machinist, +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/storage/belt, +/obj/structure/closet/secure_closet/machinist, /turf/open/floor/plating, /area/ship/engineering/engine) "Oo" = ( @@ -3595,11 +3649,11 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "SR" = ( +/obj/structure/closet/secure_closet/flamebearer, /obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/obj/item/clothing/suit/armor/roumain/flamebearer, +/obj/item/clothing/head/cowboy/sec/roumain/flamebearer, /obj/item/flashlight/lantern, -/obj/structure/closet/secure_closet/shadow, /obj/item/lighter, /obj/item/clothing/shoes/cowboy, /obj/item/clothing/shoes/cowboy/black, @@ -3609,6 +3663,7 @@ pixel_x = -7 }, /obj/item/storage/backpack/satchel/leather, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/ebony, /area/ship/storage) "Tc" = ( @@ -5069,7 +5124,7 @@ sH sH sH LN -SR +rN sT ds LX @@ -5106,7 +5161,7 @@ sH sH sH LN -SR +rN AN al cY diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 59f25efe9823..532ed3f888d7 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -212,7 +212,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items ) = 1, list(//drinks /obj/item/reagent_containers/food/drinks/bottle/vodka = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1, + /obj/item/reagent_containers/food/drinks/soda_cans/crosstalk = 1, ) = 1, list(//sprayers /obj/item/reagent_containers/spray = 1, diff --git a/code/datums/components/edible.dm b/code/datums/components/edible.dm index cf0199d05e18..b65a2d8b7e32 100644 --- a/code/datums/components/edible.dm +++ b/code/datums/components/edible.dm @@ -33,8 +33,10 @@ Behavior that's still missing from this component that original food items had t var/datum/callback/after_eat ///Last time we checked for food likes var/last_check_time + ///Color we use when stuffed in things + var/filling_color = "#FFFFFF" -/datum/component/edible/Initialize(list/initial_reagents, food_flags = NONE, foodtypes = NONE, volume = 50, eat_time = 30, list/tastes, list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"), bite_consumption = 2, datum/callback/after_eat) +/datum/component/edible/Initialize(list/initial_reagents, food_flags = NONE, foodtypes = NONE, volume = 50, eat_time = 30, list/tastes, list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"), bite_consumption = 2, filling_color = "#FFFFFF", datum/callback/after_eat) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE @@ -52,6 +54,7 @@ Behavior that's still missing from this component that original food items had t src.eatverbs = eatverbs src.junkiness = junkiness src.after_eat = after_eat + src.filling_color = filling_color var/atom/owner = parent diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 5724d4327bee..89831dafab72 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -258,7 +258,7 @@ return var/datum/progressbar/progress = new(M, len, I.loc) var/list/rejections = list() - while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress))) + while(do_after(M, 10, parent, TRUE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress))) stoplag(1) progress.end_progress() to_chat(M, "You put everything you could [insert_preposition] [parent].") diff --git a/code/datums/materials/pizza.dm b/code/datums/materials/pizza.dm index aed6577a5af9..62479d90e0d3 100644 --- a/code/datums/materials/pizza.dm +++ b/code/datums/materials/pizza.dm @@ -28,4 +28,4 @@ /datum/material/pizza/proc/make_edible(atom/source, amount, material_flags) var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT) var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT) - source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, GRAIN | MEAT | DAIRY | VEGETABLES, null, 30, list("crust", "tomato", "cheese", "meat")) + source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, GRAIN | MEAT | DAIRY | VEGETABLES, null, 30, list("crust", "tomato", "cheese", "meat"), filling_color = COLOR_YELLOW) diff --git a/code/game/MapData/shuttles/srm_elder.dm b/code/game/MapData/shuttles/srm_elder.dm index db6561b6550c..71580b599f62 100644 --- a/code/game/MapData/shuttles/srm_elder.dm +++ b/code/game/MapData/shuttles/srm_elder.dm @@ -21,14 +21,31 @@ desc = "The closet of equipment and attire for the aspiring shadow." icon_state = "cabinet" +/obj/structure/closet/secure_closet/flamebearer + name = "flamebearer's locker" + desc = "The closet of equipment an ascetic Flamebearer would require." + icon_state = "cabinet" + /obj/structure/closet/secure_closet/hunter name = "hunter's locker" desc = "Everything a hunter will need, held in one secure closet." icon_state = "cabinet" req_access = list(ACCESS_SECURITY) +/obj/structure/closet/secure_closet/machinist + name = "machinist's Locker" + desc = "The personal closet with tools of a Machinist." + req_access = list(ACCESS_ENGINE) + icon_state = "eng_secure" + +/obj/structure/closet/secure_closet/collignes + name = "\proper hunter colligne's locker" + desc = "The posessions of the Hunter Colligne aboard the vessel." + req_access = list(ACCESS_HOP) + icon_state = "hop" + /obj/structure/closet/secure_closet/montagnes - name = "\proper Hunter Montagnes Locker" + name = "\proper hunter montagne's locker" desc = "The posessions of the owning Hunter Montagnes." req_access = list(ACCESS_HOS) icon_state = "hos" diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 81cb1908ce89..1ab88896accb 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -104,7 +104,7 @@ if(!welded && !operating && !(machine_stat & NOPOWER) && (!density || allow_hand_open(user))) user.visible_message("[user] tries to open \the [src] manually.", "You operate the manual lever on \the [src].") - if (!do_after(user, 30, TRUE, src)) + if (!do_after(user, 30, src)) return FALSE add_fingerprint(user) if(density) @@ -174,7 +174,7 @@ if(is_holding_pressure()) // tell the user that this is a bad idea, and have a do_after as well to_chat(user, "As you begin crowbarring \the [src] a gush of air blows in your face... maybe you should reconsider?") - if(!do_after(user, 20, TRUE, src)) // give them a few seconds to reconsider their decision. + if(!do_after(user, 20, src)) // give them a few seconds to reconsider their decision. return log_game("[key_name(user)] has opened a firelock with a pressure difference at [AREACOORD(loc)]") user.log_message("has opened a firelock with a pressure difference at [AREACOORD(loc)]", LOG_ATTACK) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 3882fe8d5a6f..63d308f69558 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -101,13 +101,13 @@ chassis.use_power(energy_drain) addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown) -/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target, mob/user, interaction_key) +/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target) if(!chassis) return var/C = chassis.loc set_ready_state(0) chassis.use_power(energy_drain) - . = do_after(user, equip_cooldown, target=target, interaction_key = interaction_key) + . = do_after(chassis.occupant, equip_cooldown, target=target) set_ready_state(1) if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir)) return 0 diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm index e62b1e52f7b3..4a85f9321154 100644 --- a/code/game/objects/effects/anomalies/_anomalies.dm +++ b/code/game/objects/effects/anomalies/_anomalies.dm @@ -133,7 +133,7 @@ /obj/effect/anomaly/attackby(obj/item/weapon, mob/user, params) if(weapon.tool_behaviour == TOOL_ANALYZER && aSignal) to_chat(user, span_notice("You start analyzing [src].")) - if(do_after(user, 20, TRUE, src)) + if(do_after(user, 20, src, hidden = TRUE)) to_chat(user, span_notice("[src]'s primary field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].")) if(bSignal) to_chat(user, span_notice("A second field is fluctuating along [format_frequency(bSignal.frequency)], code [bSignal.code]. It is highly unstable." )) diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index f3cdfb068944..50da920b06f1 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -12,7 +12,7 @@ /obj/item/book/granter/proc/turn_page(mob/user) playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, TRUE) - if(do_after(user, 50, TRUE, src)) + if(do_after(user, 50, src, hidden = TRUE)) if(remarks.len) to_chat(user, "[pick(remarks)]") else @@ -57,7 +57,7 @@ on_reading_stopped() reading = FALSE return - if(do_after(user, 50, TRUE, src)) + if(do_after(user, 50, src, hidden = TRUE)) on_reading_finished(user) reading = FALSE return TRUE diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index a0e5865e1528..243b84b7e1ec 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -176,7 +176,7 @@ return to_chat(user, "You connect to [M]'s power line...") - while(do_after(user, 15, target = M, progress = 0)) + while(do_after(user, 15, target = M, progress = TRUE)) if(!user || !user.cell || mode != "draw") return @@ -210,7 +210,7 @@ to_chat(user, "You connect to [target]'s power port...") - while(do_after(user, 15, target = target, progress = 0)) + while(do_after(user, 15, target = target, progress = TRUE)) if(!user || !user.cell || mode != "draw") return @@ -248,7 +248,7 @@ to_chat(user, "You connect to [target]'s power port...") - while(do_after(user, 15, target = target, progress = 0)) + while(do_after(user, 15, target = target, progress = TRUE)) if(!user || !user.cell || mode != "charge") return diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 802eeee2d45f..2904745f25aa 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -524,13 +524,12 @@ /obj/item/reagent_containers/food/snacks/rofflewaffles, /obj/item/reagent_containers/food/snacks/donkpocket, /obj/item/reagent_containers/food/drinks/soda_cans/cola, - /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind, - /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, - /obj/item/reagent_containers/food/drinks/soda_cans/starkist, + /obj/item/reagent_containers/food/drinks/soda_cans/comet_trail, + /obj/item/reagent_containers/food/drinks/soda_cans/tadrixx, + /obj/item/reagent_containers/food/drinks/soda_cans/lunapunch, /obj/item/reagent_containers/food/drinks/soda_cans/space_up, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, - /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola + /obj/item/reagent_containers/food/drinks/soda_cans/pacfuel, + /obj/item/reagent_containers/food/drinks/soda_cans/orange_soda )) new rig_snacks(src) diff --git a/code/game/objects/items/survery_handheld.dm b/code/game/objects/items/survery_handheld.dm index 547bdc150237..a10097031485 100644 --- a/code/game/objects/items/survery_handheld.dm +++ b/code/game/objects/items/survery_handheld.dm @@ -51,7 +51,7 @@ src_turf.visible_message("Warning: unable to locate valuable information in current sector.") break - if(!do_after(user, list(src), survey_delay / penalty)) + if(!do_after(user, survey_delay / penalty, src)) flick(icon_state + "-corrupted", src) playsound(src, 'sound/machines/buzz-sigh.ogg', 20) src_turf.visible_message("Warning: results corrupted. Please try again.") diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 91085fe9f104..93cdfcaa9a23 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -797,9 +797,9 @@ GLOBAL_LIST_INIT(ore_probability, list( visible_message("You hear a geiger counter click and smell ash.") playsound(loc,'sound/items/radiostatic.ogg', 100, FALSE, 50, TRUE, TRUE) if(prob(50)) - new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola(loc) - new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola(loc) - new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola(loc) + new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc) + new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc) + new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc) new /mob/living/simple_animal/hostile/cockroach/glockroach(loc) if(prob(50)) new /obj/structure/radioactive/stack(loc) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 27c10f244c37..4ebd416675b8 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -106,6 +106,8 @@ return TRUE if(locate(/obj/structure/table) in get_turf(mover)) return TRUE + if(mover.movement_type & FLOATING) + return TRUE /obj/structure/table/CanAStarPass(ID, dir, caller) . = !density @@ -372,7 +374,7 @@ check_break(M) /obj/structure/table/glass/proc/check_break(mob/living/M) - if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & FLYING)) + if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & (FLYING || FLOATING))) table_shatter(M) /obj/structure/table/glass/proc/table_shatter(mob/living/L) diff --git a/code/game/turfs/open/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm index 89f48aee49a1..996d122a4ac9 100644 --- a/code/game/turfs/open/floor/plating/asteroid.dm +++ b/code/game/turfs/open/floor/plating/asteroid.dm @@ -101,7 +101,7 @@ to_chat(user, "There is already a grave there!") return to_chat(user, "You start piling the dirt...") - if(do_after(user,30, target = src)) + if(do_after(user, 30, target = src)) if(locate(/obj/structure/closet/crate/grave) in dest_turf) return if(istype(W, /obj/item/stack/sheet/mineral/wood)) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 4ed4b47297a2..e5cc9709559c 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -461,12 +461,12 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists) return if(length(src_object.contents())) to_chat(usr, "You start dumping out the contents...") - if(!do_after(usr,20,target=src_object.parent)) + if(!do_after(usr, 20, target=src_object.parent)) return FALSE var/list/things = src_object.contents() var/datum/progressbar/progress = new(user, things.len, src) - while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, TYPE_PROC_REF(/datum/component/storage, mass_remove_from_storage), src, things, progress))) + while (do_after(usr, 10, src, TRUE, FALSE, CALLBACK(src_object, TYPE_PROC_REF(/datum/component/storage, mass_remove_from_storage), src, things, progress))) stoplag(1) progress.end_progress() diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm index 6036ae1d00f6..f158499d8b0f 100644 --- a/code/modules/antagonists/changeling/powers/linglink.dm +++ b/code/modules/antagonists/changeling/powers/linglink.dm @@ -67,7 +67,7 @@ to_chat(user, "We must keep holding on to [target] to sustain the link. ") while(user.pulling && user.grab_state >= GRAB_NECK) target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 0.5) // So they don't choke to death while you interrogate them - do_after(user, 10 SECONDS, target, TRUE) + do_after(user, 10 SECONDS, target, hidden = TRUE) changeling.islinking = 0 target.mind.linglink = 0 diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index f3d6bb31abf4..648803185661 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -126,7 +126,7 @@ if(istype(I, /obj/item/nuke_core_container)) var/obj/item/nuke_core_container/core_box = I to_chat(user, "You start loading the plutonium core into [core_box]...") - if(do_after(user,50,target=src, hidden = TRUE)) + if(do_after(user, 50, target = src, hidden = TRUE)) if(core_box.load(core, user)) to_chat(user, "You load the plutonium core into [core_box].") deconstruction_state = NUKESTATE_CORE_REMOVED diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 3705cb361d82..5ff6b2e396b5 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -299,7 +299,7 @@ close_machine(target) else user.visible_message("[user] starts shoving [target] inside [src].", "You start shoving [target] inside [src].") - if (do_after(user, 25, target=target)) + if (do_after(user, 25, target = target)) close_machine(target) /obj/machinery/atmospherics/components/unary/cryo_cell/attackby(obj/item/I, mob/user, params) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm index 6e6551b58e86..e3a20e0e8905 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm @@ -161,10 +161,10 @@ availability_prob = 80 unlimited = TRUE -/datum/blackmarket_item/consumable/thirteenloko - name = "Can of Thirteen Loko" +/datum/blackmarket_item/consumable/vimukti + name = "Can of Vimukti" desc = "This product was quietly discontinued after multiple health related incidents. But you aren't a coward, are you?" - item = /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko + item = /obj/item/reagent_containers/food/drinks/soda_cans/vimukti price_min = 10 price_max = 50 diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index a3ece1cce8c6..0fcbbf4f1794 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -71,7 +71,7 @@ /datum/reagent/consumable/ethanol/syndicatebomb,\ /datum/reagent/consumable/ethanol/tequila_sunrise,\ /datum/reagent/consumable/ethanol/manly_dorf,\ - /datum/reagent/consumable/ethanol/thirteenloko,\ + /datum/reagent/consumable/ethanol/vimukti,\ /datum/reagent/consumable/triple_citrus,\ /datum/reagent/consumable/ethanol/vodkamartini,\ /datum/reagent/consumable/ethanol/whiskeysoda,\ @@ -100,10 +100,7 @@ /datum/reagent/consumable/ethanol/booger,\ /datum/reagent/consumable/ethanol/hippies_delight,\ /datum/reagent/consumable/ethanol/drunkenblumpkin,\ - /datum/reagent/consumable/ethanol/fetching_fizz,\ /datum/reagent/consumable/ethanol/goldschlager,\ - /datum/reagent/consumable/ethanol/manhattan_proj,\ - /datum/reagent/consumable/ethanol/narsour,\ /datum/reagent/consumable/ethanol/neurotoxin,\ /datum/reagent/consumable/ethanol/patron,\ /datum/reagent/consumable/ethanol/quadruple_sec,\ diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm index bf16fb592e21..7abc0188f9d9 100644 --- a/code/modules/cargo/packs/food.dm +++ b/code/modules/cargo/packs/food.dm @@ -184,7 +184,7 @@ cost = 5000 contains = list(/obj/item/stack/sheet/mineral/coal/five, /obj/machinery/grill/unwrenched, - /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy) + /obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy) crate_name = "grilling starter kit crate" crate_type = /obj/structure/closet/crate/large diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index b9a4fb8f0ca3..006074e74bcd 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -879,18 +879,19 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 - if(generic_adjective) - if(!mutant_category) - dat += APPEARANCE_CATEGORY_COLUMN + // begin generic adjective + if(!mutant_category) + dat += APPEARANCE_CATEGORY_COLUMN - dat += "

Character Adjective

" + dat += "

Character Adjective

" - dat += "[generic_adjective]
" + dat += "[generic_adjective]
" - mutant_category++ - if(mutant_category >= MAX_MUTANT_ROWS) - dat += "" - mutant_category = 0 + mutant_category++ + if(mutant_category >= MAX_MUTANT_ROWS) + dat += "" + mutant_category = 0 + // end generic adjective if("wings" in pref_species.default_features && GLOB.r_wings_list.len >1) if(!mutant_category) diff --git a/code/modules/clothing/factions/srm.dm b/code/modules/clothing/factions/srm.dm new file mode 100644 index 000000000000..84b1f0b12640 --- /dev/null +++ b/code/modules/clothing/factions/srm.dm @@ -0,0 +1,154 @@ +////////////// +//Jumpsuits// +///////////// + +/obj/item/clothing/under/suit/roumain + name = "saint-roumain's worksuit" + desc = "A simple, hard-wearing suit designed for the hardworking hunters of the Saint-Roumain Militia." + icon_state = "rouma_work" + item_state = "rouma_work" + can_adjust = FALSE + icon = 'icons/obj/clothing/faction/srm/uniforms.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/uniforms.dmi' + +////////////////// +//Armored suits// +///////////////// + +/obj/item/clothing/suit/armor/roumain + name = "saint-roumain duster" + desc = "A coat made from hard leather. Meant to withstand long hunts in harsh wilderness." + icon_state = "armor_rouma" + item_state = "rouma_coat" + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + heat_protection = CHEST|GROIN|ARMS + icon = 'icons/obj/clothing/faction/srm/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' + +/obj/item/clothing/suit/armor/roumain/shadow + name = "saint-roumain shadow duster" + desc = "A coat made from hard leather. Its rough, barely-treated finish is typical of one of the Saint-Roumain Militia's trainees." + icon_state = "armor_rouma_shadow" + item_state = "rouma_shadow_coat" + +/obj/item/clothing/suit/toggle/labcoat/roumain_med + name = "saint-roumain medical duster" + desc = "A coat made from hard leather and further treated with exotic sterilizing oils and wax. The treatment and its more closed design offers much better protection against biological hazards." + icon = 'icons/obj/clothing/faction/srm/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' + icon_state = "rouma_med_coat" + armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/item/clothing/suit/hazardvest/roumain + name = "saint-roumain machinist leather vest" + desc = "A modified Roumain leather duster with its large flaps and sleeves cut off to provide extra mobility when maintaining weapons and vessels belonging to the Church of Saint Roumain. Its specialty treatment grants it better protection against acid and fire." + icon = 'icons/obj/clothing/faction/srm/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' + icon_state = "armor_rouma_machinist" + item_state = "rouma_coat" + armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 40, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) + +/obj/item/clothing/suit/armor/roumain/flamebearer + name = "saint-roumain flamebearer robes" + desc = "A set of ashy-grey robes made from hard leather, adorned with gold trims. Its rough finish after a near-char and application of aromatics is heavily favored for the ecclesiastical sect of the Church of Saint Roumain, a living reminder of the Ashen Huntsman himself." + icon_state = "armor_rouma_flamebearer" + +/obj/item/clothing/suit/armor/roumain/colligne + name = "saint-roumain colligne coat" + desc = "A well-maintained hard leather coat typically worn to denote the rank of Colligne, a trainee Hunter Montagne. It is treated with bullet-resistant materials, and lined with the dark fur of Illestrian dire wolves." + icon_state = "armor_rouma_colligne" + item_state = "rouma_coat" + body_parts_covered = CHEST|GROIN|ARMS|LEGS + cold_protection = CHEST|GROIN|LEGS|ARMS + heat_protection = CHEST|GROIN|LEGS|ARMS + +/obj/item/clothing/suit/armor/roumain/montagne + name = "saint-roumain montagne coat" + desc = "A stylish red coat to indicate that you are, in fact, a Hunter Montagne. Made of extra hard exotic leather, treated with bullet-resistant materials, and lined with the fur of some unidentifiable creature." + icon_state = "armor_rouma_montagne" + item_state = "rouma_montagne_coat" + body_parts_covered = CHEST|GROIN|ARMS|LEGS + armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90) + cold_protection = CHEST|GROIN|LEGS|ARMS + heat_protection = CHEST|GROIN|LEGS|ARMS + +/////////////// +//Spacesuits// +////////////// + +/obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain + name = "\improper roumain hardsuit helmet" + desc = "An armored helmet with an unusual design that recalls both pre-industrial Solarian armor and iconography depicting the Ashen Huntsman. Though hand-made, it is surprisingly quite spaceworthy." + icon = 'icons/obj/clothing/faction/srm/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/head.dmi' + icon_state = "hardsuit0-roumain" + item_state = "hardsuit0-roumain" + hardsuit_type = "roumain" + worn_y_offset = 4 + +/obj/item/clothing/suit/space/hardsuit/solgov/roumain + name = "\improper roumain hardsuit" + desc = "A hand-crafted suit of armor either modified from a set of normal plate armor or designed to resemble one. A powered exoskeleton has been cleverly integrated into the design and, surprisingly, it is completely vacuum-proof. Suits like this are a testament to what the master craftsmen of Hunter's Pride are capable of." + icon = 'icons/obj/clothing/faction/srm/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' + icon_state = "hardsuit-roumain" + item_state = "hardsuit-roumain" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain + slowdown = 0.5 + +///////// +//Hats// +//////// + +/obj/item/clothing/head/cowboy/sec/roumain + name = "hunter's hat" + desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass." + icon_state = "rouma_hat" + icon = 'icons/obj/clothing/faction/srm/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/head.dmi' + +/obj/item/clothing/head/cowboy/sec/roumain/shadow + name = "shadow's hat" + desc = "A rough, simple hat. The way it covers your eyes makes you feel badass, but you just look like a wannabe hunter." + icon_state = "rouma_shadow_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/machinist + name = "machinist's hat" + desc = "A small, humble leather top hat. It gives you the gnawing urge to create classical gizmos and goobers, or alternatively repair any breaches within your vessel." + icon_state = "rouma_machinist_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/med + name = "medical hunter's hat" + desc = "A very wide-brimmed, round hat treated with oil and wax. Somehow manages to look stylish and creepy at the same time." + icon_state = "rouma_med_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/flamebearer + name = "flamebearer's hat" + desc = "A wide-brimmed, pointed hat with charred leather, granting it an ash-grey appearance. The design honors the one the Ashen Huntsman himself wore, according to legend." + icon_state = "rouma_flamebearer_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/colligne + name = "colligne's hat" + desc = "A fancy, pointy leather hat with a large feather plume to signal that you are, in fact... A Hunter Colligne. You still have some ways to go before you gain the title of Montagne." + icon_state = "rouma_colligne_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/montagne + name = "montagne's hat" + desc = "A very fancy hat with a large feather plume to signal that you are, in fact, a Hunter Montagne. The exotic fur lining is impeccably soft and bafflingly bulletproof." + icon_state = "rouma_montagne_hat" + +/////////////// +//Accessories// +/////////////// + +//These are stored in clothing/accessories.dmi instead of a factional variant due to accessory code being dogwater +//Please transfer them over to a factional file if accessory code is ever fixed + +/obj/item/clothing/accessory/waistcoat/roumain + name = "roumain waistcoat" + desc = "A warm, red wool waistcoat, worn by any member of the Church of Saint Roumain, though heavily favored by Machinists for the added warmth given to their rather breezy outfit." + icon_state = "rouma_waistcoat" + icon = 'icons/obj/clothing/accessories.dmi' + mob_overlay_icon = 'icons/mob/clothing/accessories.dmi' + minimize_when_attached = TRUE diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index eb76c13fb541..3e04245e1a14 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -138,26 +138,6 @@ desc = "A robust stetson adorned with a deputy's badge. Its imitation leather is thick and worn." icon_state = "cowboysec" -/obj/item/clothing/head/cowboy/sec/roumain - name = "hunter's hat" - desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass." - icon_state = "rouma_hat" - -/obj/item/clothing/head/cowboy/sec/roumain/shadow - name = "shadow's hat" - desc = "A rough, simple hat. The way it covers your eyes makes you feel badass, but you just look like a wannabe hunter." - icon_state = "rouma_shadow_hat" - -/obj/item/clothing/head/cowboy/sec/roumain/med - name = "medical hunter's hat" - desc = "A very wide-brimmed, round hat treated with oil and wax. Somehow manages to look stylish and creepy at the same time." - icon_state = "rouma_med_hat" - -/obj/item/clothing/head/HoS/cowboy/montagne - name = "montagne's hat" - desc = "A very fancy hat with a large feather plume to signal that you are, in fact, a Hunter Montagne. The exotic fur lining is impeccably soft and bafflingly bulletproof." - icon_state = "rouma_montagne_hat" - /obj/item/clothing/head/HoS/syndicate name = "syndicate cap" desc = "A black cap fit for a high ranking syndicate officer." diff --git a/code/modules/clothing/outfits/factions/roumain.dm b/code/modules/clothing/outfits/factions/roumain.dm index 424827e69010..fe31fddd9041 100644 --- a/code/modules/clothing/outfits/factions/roumain.dm +++ b/code/modules/clothing/outfits/factions/roumain.dm @@ -19,7 +19,7 @@ name = "Saint-Roumain Militia - Shadow" id_assignment = "Shadow" jobtype = /datum/job/assistant - job_icon = "assistant" + job_icon = "srm_shadow" uniform = /obj/item/clothing/under/suit/roumain alt_uniform = null @@ -33,14 +33,40 @@ /datum/outfit/job/roumain/captain name = "Saint-Roumain Militia - Hunter Montagne" id_assignment = "Hunter Montagne" - job_icon = "captain" + job_icon = "srm_montagne" jobtype = /datum/job/captain + ears = /obj/item/radio/headset/headset_com/alt + uniform = /obj/item/clothing/under/suit/roumain + shoes = /obj/item/clothing/shoes/workboots/mining + suit = /obj/item/clothing/suit/armor/roumain/montagne + head = /obj/item/clothing/head/cowboy/sec/roumain/montagne + id = /obj/item/card/id/gold + + duffelbag = /obj/item/storage/backpack/cultpack + courierbag = /obj/item/storage/backpack/cultpack + backpack = /obj/item/storage/backpack/cultpack + satchel = /obj/item/storage/backpack/cultpack + + backpack_contents = list(/obj/item/book/manual/srmlore=1, + /obj/item/stamp/chap = 1, + /obj/item/melee/classic_baton/telescopic=1, + ) + chameleon_extras = null + +// Second-In-Command + +/datum/outfit/job/roumain/hop + name = "Saint-Roumain Militia - Hunter Colligne" + id_assignment = "Hunter Colligne" + job_icon = "srm_colligne" + jobtype = /datum/job/head_of_personnel + ears = /obj/item/radio/headset/headset_com uniform = /obj/item/clothing/under/suit/roumain shoes = /obj/item/clothing/shoes/workboots/mining - suit = /obj/item/clothing/suit/armor/hos/roumain/montagne - head = /obj/item/clothing/head/HoS/cowboy/montagne + suit = /obj/item/clothing/suit/armor/roumain/colligne + head = /obj/item/clothing/head/cowboy/sec/roumain/colligne id = /obj/item/card/id/silver duffelbag = /obj/item/storage/backpack/cultpack @@ -58,7 +84,7 @@ name = "Saint-Roumain Militia - Hunter" id_assignment = "Hunter" jobtype = /datum/job/officer - job_icon = "securityofficer" + job_icon = "hsrm_hunter" uniform = /obj/item/clothing/under/suit/roumain alt_uniform = null @@ -74,12 +100,34 @@ backpack_contents = null +// engineer + +/datum/outfit/job/roumain/engineer + name = "Saint-Roumain Militia - Machinist" + id_assignment = "Machinist" + job_icon = "srm_machinist" + jobtype = /datum/job/engineer + + uniform = /obj/item/clothing/under/suit/roumain + alt_uniform = null + shoes = /obj/item/clothing/shoes/workboots/mining + belt = /obj/item/storage/belt/utility/full/engi + suit = /obj/item/clothing/suit/hazardvest/roumain + head = /obj/item/clothing/head/cowboy/sec/roumain/machinist + accessory = /obj/item/clothing/accessory/waistcoat/roumain + gloves = null + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + // Medical Doctor /datum/outfit/job/roumain/doctor name = "Saint-Roumain Militia - Hunter Doctor" id_assignment = "Hunter Doctor" - job_icon = "medicaldoctor" + job_icon = "srm_doctor" jobtype = /datum/job/doctor uniform = /obj/item/clothing/under/suit/roumain @@ -94,3 +142,27 @@ satchel = /obj/item/storage/backpack/satchel duffelbag = /obj/item/storage/backpack/duffelbag courierbag = /obj/item/storage/backpack/messenger + +// Chaplain + +/datum/outfit/job/roumain/flamebearer + name = "Saint-Roumain Militia - Flamebearer" + id_assignment = "Flamebearer" + job_icon = "srm_flamebearer" + jobtype = /datum/job/chaplain + + uniform = /obj/item/clothing/under/suit/roumain + alt_uniform = null + shoes = /obj/item/clothing/shoes/workboots/mining + suit = /obj/item/clothing/suit/armor/roumain/flamebearer + head = /obj/item/clothing/head/cowboy/sec/roumain/flamebearer + gloves = null + + duffelbag = /obj/item/storage/backpack/cultpack + courierbag = /obj/item/storage/backpack/cultpack + backpack = /obj/item/storage/backpack/cultpack + satchel = /obj/item/storage/backpack/cultpack + + backpack_contents = list(/obj/item/book/manual/srmlore=1, + /obj/item/stamp/chap = 1, + ) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 557a69c5acb2..4827186a95c5 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -166,7 +166,7 @@ if(L.status) to_chat(user, "This bulb is too damaged to use as a replacement!") return - if(do_after(user, 50, 1, src)) + if(do_after(user, 50, src)) qdel(I) helmet = new helmettype(src) to_chat(user, "You have successfully repaired [src]'s helmet.") @@ -444,27 +444,6 @@ combat_slowdown = 0.5 jetpack = null -//Hardliner Syndie suit -/obj/item/clothing/head/helmet/space/hardsuit/syndi/hl - name = "white-red hardsuit helmet" - desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup." - alt_desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in combat mode. Manufactured by Second Battlegroup." - icon_state = "hardsuit1-hl" - item_state = "hardsuit1-hl" - hardsuit_type = "hl" - -/obj/item/clothing/suit/space/hardsuit/syndi/hl - name = "white-red hardsuit" - desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup." - alt_desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in combat mode. Manufactured by the Second Battlegroup." - icon_state = "hardsuit1-hl" - item_state = "hardsuit1-hl" - hardsuit_type = "hl" - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl - lightweight = 1 - jetpack = null - - //Elite Syndie suit /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite name = "elite syndicate hardsuit helmet" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index ee72151d9567..9dfd23210d9c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -360,27 +360,6 @@ /obj/item/melee/baton, ) -/obj/item/clothing/suit/armor/roumain - name = "saint-roumain duster" - desc = "A coat made from hard leather. Meant to withstand long hunts in harsh wilderness." - icon_state = "armor_rouma" - item_state = "rouma_coat" - body_parts_covered = CHEST|GROIN|ARMS - cold_protection = CHEST|GROIN|ARMS - heat_protection = CHEST|GROIN|ARMS - -/obj/item/clothing/suit/armor/roumain/shadow - name = "saint-roumain shadow duster" - desc = "A coat made from hard leather. Its rough, barely-treated finish is typical of one of the Saint-Roumain Militia's trainees." - icon_state = "armor_rouma_shadow" - item_state = "rouma_shadow_coat" - -/obj/item/clothing/suit/armor/hos/roumain/montagne - name = "saint-roumain montagne coat" - desc = "A stylish red coat to indicate that you are, in fact, a Hunter Montagne. Made of extra hard exotic leather, treated with bullet-resistant materials, and lined with the fur of some unidentifiable creature." - icon_state = "armor_rouma_montagne" - item_state = "rouma_montagne_coat" - /obj/item/clothing/suit/armor/vest/bulletproof/solgov name = "\improper Sonnensoldner gambison" desc = "A standard armor vest fielded for SolGov's Sonnensoldners." diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index f95a91ab27fe..858b494564e6 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -68,12 +68,6 @@ You're pretty sure this is just a raincoat. icon_state = "raincoat" item_state = "raincoat" -/obj/item/clothing/suit/toggle/labcoat/roumain_med - name = "saint-roumain medical duster" - desc = "A coat made from hard leather and further treated with exotic sterilizing oils and wax. The treatment and its more closed design offers much better protection against biological hazards." - icon_state = "rouma_med_coat" - armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) - /obj/item/clothing/suit/longcoat name = "longcoat" desc = "A long, victorian styled labcoat." diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index 5344ec98d06b..a0ec0a4da5e5 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -139,12 +139,6 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR -/obj/item/clothing/under/suit/roumain - name = "saint-roumain's worksuit" - desc = "A simple, hard-wearing suit designed for the hardworking hunters of the Saint-Roumain Militia." - icon_state = "rouma_work" - item_state = "rouma_work" - /obj/item/clothing/under/suit/dresssuit name = "navy dress-suit" desc = "A very strange piece of clothing. Mostly navy, but with a pink undershirt. Who would even wear this?" diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 2eb4b1e8564b..32c4b1a9a09f 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -221,8 +221,8 @@ // Formatting is the same as food. /obj/item/reagent_containers/food/drinks/coffee - name = "robust coffee" - desc = "Careful, the beverage you're about to enjoy is extremely hot." + name = "Solar's Best black coffee" + desc = "A cup of piping hot black coffee. Made from beans grown across the solar cantons for the caffeine that every spacer needs." icon_state = "coffee" list_reagents = list(/datum/reagent/consumable/coffee = 30) spillable = TRUE @@ -258,13 +258,13 @@ icon_state = "tea_empty" /obj/item/reagent_containers/food/drinks/mug/tea - name = "Duke Purple tea" - desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." + name = "Guildmaiden's tea" + desc = "Dark tea, made from pressed, fermented tea leaves. Originally from Sol, it became wildly popular among the Rachnid Guilds, and has become a staple." list_reagents = list(/datum/reagent/consumable/tea = 30) /obj/item/reagent_containers/food/drinks/mug/coco - name = "Pearl Hot Chocolate" - desc = "A rich delicacy from the humid regions of Terra." + name = "Solar's Best Hot Cocoa" + desc = "A cup of hot water mixed with chocolate and malted milk powder. A classic hot drink from the Solarian Confederation." list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5) foodtype = SUGAR resistance_flags = FREEZE_PROOF @@ -286,7 +286,7 @@ /obj/item/reagent_containers/food/drinks/dry_ramen name = "cup ramen" - desc = "Just add 5ml of water, self heats! A taste that reminds you of your school years. Now new with salty flavour!" + desc = "A cup full of dried noodles, premixed with a flavor powder. Adding 5 units of water will cause the cup to self-heat, cooking it rapidly. Commonly eaten under dozens of brands, from students to eating on a budget. Always umami!" icon_state = "ramen" list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3) foodtype = GRAIN @@ -294,12 +294,12 @@ custom_price = 95 /obj/item/reagent_containers/food/drinks/waterbottle - name = "bottle of water" - desc = "A bottle of water filled at an old Earth bottling facility." + name = "Ryuunosuke Reserve" //we still have to find a way to make multiple variants as per the plan + desc = "Water bottled from a plant somewhere on Ryuunosuke. It has a mild, mineral-y flavor." icon = 'icons/obj/drinks/drinks.dmi' icon_state = "smallbottle" item_state = "bottle" - list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard + list_reagents = list(/datum/reagent/water = 50) custom_materials = list(/datum/material/plastic=1000) volume = 50 amount_per_transfer_from_this = 10 @@ -369,8 +369,8 @@ update_appearance() /obj/item/reagent_containers/food/drinks/beer - name = "space beer" - desc = "Beer. In space." + name = "Bizircan Brewery GDM" //ditto the plan for bottled water, need to find a way to make multiple variants + desc = "A popular Gezenan drink made of fermented honey and spices, known as Gezenan Dark Mead, or GDM for short." icon_state = "beer" list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) foodtype = GRAIN | ALCOHOL @@ -382,8 +382,8 @@ list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30) /obj/item/reagent_containers/food/drinks/ale - name = "Magm-Ale" - desc = "A true dorf's drink of choice." + name = "RHIMBASA TAP" + desc = "An ale that is brewed on Reh'himl, named after the planet that shields it from their sun. Telh'aim Pale Ales are shortened to TAP, with most breweries reducing their names to acronyms alongside it." icon_state = "alebottle" item_state = "beer" list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30) @@ -454,17 +454,17 @@ if(/datum/reagent/consumable/pineapplejuice) icon_state = "pineapplebox" name = "pineapple juice box" - desc = "Why would you even want this?" + desc = "Sweet, tart pineapple juice." foodtype = FRUIT | PINEAPPLE if(/datum/reagent/consumable/milk/chocolate_milk) icon_state = "chocolatebox" name = "carton of chocolate milk" - desc = "Milk for cool kids!" + desc = "Milk mixed with chocolate, a common childhood favorite!" foodtype = SUGAR if(/datum/reagent/consumable/ethanol/eggnog) icon_state = "nog2" name = "carton of eggnog" - desc = "For enjoying the most wonderful time of the year." + desc = "A carton of eggnog, a drink of choice for celebrating Winter Solstice." foodtype = MEAT else icon_state = "juicebox" @@ -511,7 +511,7 @@ /obj/item/reagent_containers/food/drinks/flask name = "flask" - desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go." + desc = "Every good spacer knows it's a good idea to bring along a couple of pints of whiskey wherever they go." custom_price = 200 icon_state = "flask" custom_materials = list(/datum/material/iron=250) @@ -530,10 +530,10 @@ icon_state = "detflask" list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30) -/obj/item/reagent_containers/food/drinks/britcup +/obj/item/reagent_containers/food/drinks/mug name = "cup" - desc = "A cup with the british flag emblazoned on it." - icon_state = "britcup" + desc = "A mug. Stylishly plain." + icon_state = "tea_empty" volume = 30 spillable = TRUE @@ -643,35 +643,35 @@ . = ..() /obj/item/reagent_containers/food/drinks/soda_cans/cola - name = "Space Cola" - desc = "Cola. in space." + name = "Master Cola" + desc = "Originally a commission to the Rachnid culinary guilds from Solarian historical reenactors on creating an authentic cola that, at some point, dominated the globe in popularity, this soft drink comes as close to anyone might be able to taste the sodas of yore... But it's still a pretty alright drink." icon_state = "cola" list_reagents = list(/datum/reagent/consumable/space_cola = 30) foodtype = SUGAR /obj/item/reagent_containers/food/drinks/soda_cans/tonic - name = "T-Borg's tonic water" - desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." + name = "Sixikirtchia's Tonic" + desc = "A can of water mixed with quinine, which the label purportedly states that it has more health benefits for the Vox than fending off malaria. Most people use it for mixing drinks, Vox or otherwise." icon_state = "tonic" list_reagents = list(/datum/reagent/consumable/tonic = 50) foodtype = ALCOHOL /obj/item/reagent_containers/food/drinks/soda_cans/sodawater - name = "soda water" - desc = "A can of soda water. Why not make a scotch and soda?" + name = "Stitiamix Club" + desc = "Mineral-flavored carbonated water, infused on some part of The Shoal. Touts being made out of minerals from embedded asteroids, apparently!" icon_state = "sodawater" list_reagents = list(/datum/reagent/consumable/sodawater = 50) -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime - name = "lemon-lime soda" - desc = "Is it lemon? Is it lime? The expert opinions vary." - icon_state = "lemon-lime" - list_reagents = list(/datum/reagent/consumable/lemon_lime = 30) +/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda + name = "Sol Sparkler: Orange Remembrance" + desc = "A line of flavored seltzer water from the Solarian Confederation. Its infamy stems from being flavored sparingly enough to warrant it being referred to as being vague memories of the fruit in question." + icon_state = "orange_soda" + list_reagents = list(/datum/reagent/consumable/orangejuice = 5, /datum/reagent/consumable/sodawater = 25) foodtype = FRUIT /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry name = "Sol Dry" - desc = "Maybe this will help your tummy feel better. Maybe not." + desc = "A can of ginger ale, known for helping those with upset stomachs. Popularized due to a widespread belief from Solarians that drinking it will alleviate the nausea from bluespace travel." icon_state = "sol_dry" list_reagents = list(/datum/reagent/consumable/sol_dry = 30) foodtype = SUGAR @@ -683,86 +683,79 @@ list_reagents = list(/datum/reagent/consumable/space_up = 30) foodtype = SUGAR | JUNKFOOD -/obj/item/reagent_containers/food/drinks/soda_cans/starkist - name = "Star-kist" - desc = "The taste of a star in liquid form. And, a bit of tuna...?" - icon_state = "starkist" - list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15) +/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch + name = "Lunapunch" + desc = "A soda with a distinctly herbal sweetness and a bitter aftertaste, popular across the C.L.I.P. colonies. Originally marketed as a health soft-drink for members of the CMM, the herbs used in its recipe claim to have health benefits... to dubious results." + icon_state = "lunapunch" + list_reagents = list(/datum/reagent/consumable/lunapunch = 30) foodtype = SUGAR | FRUIT | JUNKFOOD -/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind - name = "Space Mountain Wind" - desc = "Blows right through you like a space wind." - icon_state = "space_mountain_wind" - list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30) +/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail + name = "Comet Trail" + desc = "A citrusy drink from the Kepori space installation known as The Ring. Known for its sharp flavor and refreshing carbonation -- best served cold." + icon_state = "comet_trail" + list_reagents = list(/datum/reagent/consumable/comet_trail = 30) foodtype = SUGAR | JUNKFOOD -/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko - name = "Thirteen Loko" - desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." +/obj/item/reagent_containers/food/drinks/soda_cans/vimukti + name = "Vimukti" + desc = "A liquor brewed from sweet lichen scraped off the walls of Shoal water condensers. Stamped with the thirteen-spoked wheel of enlightenment. Spiritual Vox consider it to open the mind's boundaries." icon_state = "thirteen_loko" - list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30) + list_reagents = list(/datum/reagent/consumable/ethanol/vimukti = 30) foodtype = SUGAR | JUNKFOOD -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb - name = "Dr. Gibb" - desc = "A delicious mixture of 42 different flavors." - icon_state = "dr_gibb" - list_reagents = list(/datum/reagent/consumable/dr_gibb = 30) +/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx + name = "Tadrixx" + desc = "A Kalixcian drink made from a plant that tastes similar to sassafrass, which is used in root beer. A stumpy drake holding a mug of it is on the front." + icon_state = "tadrixx" + list_reagents = list(/datum/reagent/consumable/tadrixx = 30) foodtype = SUGAR | JUNKFOOD -/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game - name = "Pwr Game" - desc = "The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to." +/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel + name = "PAC-Fuel" + desc = "A carbonated energy drink themed after the purple coloration, similar to plasma. It seems to have gotten a sponsorship with the the G.E.C., with a special offer for some sort of deal on... gaming gear and industrial equipment?" icon_state = "purple_can" - list_reagents = list(/datum/reagent/consumable/pwr_game = 30) + list_reagents = list(/datum/reagent/consumable/pacfuel = 30) -/obj/item/reagent_containers/food/drinks/soda_cans/shamblers - name = "Shambler's juice" - desc = "~Shake me up some of that Shambler's Juice!~" - icon_state = "shamblers" - list_reagents = list(/datum/reagent/consumable/shamblers = 30) +/obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch + name = "Shoal Punch" + desc = "Carbonated fruit soda, made from a mix of dozens of fruits collected and grown on The Shoal. There's an extensive list of potential allergens on the back." + icon_state = "shoal_punch" + list_reagents = list(/datum/reagent/consumable/shoal_punch = 30) foodtype = SUGAR | JUNKFOOD -/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull - name = "Grey Bull" - desc = "Grey Bull, it gives you gloves!" +/obj/item/reagent_containers/food/drinks/soda_cans/crosstalk + name = "Crosstalk" + desc = "Crosstalk! Share the energy with everyone! The can is a little thin to be passing it around to actually share the energy drink around, though." icon_state = "energy_drink" - list_reagents = list(/datum/reagent/consumable/grey_bull = 20) + list_reagents = list(/datum/reagent/consumable/crosstalk = 20) foodtype = SUGAR | JUNKFOOD -/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy - name = "Monkey Energy" - desc = "Unleash the ape!" - icon_state = "monkey_energy" - item_state = "monkey_energy" - list_reagents = list(/datum/reagent/consumable/monkey_energy = 40, /datum/reagent/consumable/electrolytes = 10) +/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy + name = "Xeno-Energy" + desc = "A sickly green energy drink that poses itself as made from the real blood of xenomorphs. Deeply controversial among the BARD ranks." + icon_state = "xeno_energy" + item_state = "xeno_energy" + list_reagents = list(/datum/reagent/consumable/xeno_energy = 40, /datum/reagent/consumable/electrolytes = 10) foodtype = SUGAR | JUNKFOOD -/obj/item/reagent_containers/food/drinks/soda_cans/efuel - name = "E-Fuel" - desc = "Shocking for the Elzu!" - icon_state = "monkey_energy" - item_state = "monkey_energy" - list_reagents = list(/datum/reagent/consumable/electrolytes = 50) - /obj/item/reagent_containers/food/drinks/soda_cans/air - name = "canned air" - desc = "There is no air shortage. Do not drink." + name = "Tradewind Canned" + desc = "Intended to be filled with air from home planets for the sake of nostalgia after it's initial failure as an emergency method of 'canning air'. Tradewind Canned - a breath from home." icon_state = "air" list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6) /obj/item/reagent_containers/food/drinks/soda_cans/molten name = "Molten Bubbles" - desc = "A spicy cola to cool the nerves and burn the soul." + desc = "A spicy soft drink made from a coca-like plant from Kalixcis. Popularly served both cold -and- hot, depending on the weather." icon_state = "molten" - list_reagents = list(/datum/reagent/medicine/molten_bubbles = 50) + list_reagents = list(/datum/reagent/consumable/molten = 50) /obj/item/reagent_containers/food/drinks/soda_cans/plasma name = "Plasma Fizz" - desc = "A dangerous fusion of flavors!" + desc = "A spinoff of the popular Molten Bubbles drink from Kalixcis, made to emulate the flavor of spiced grape instead. It's... not exactly convincing or a very good mix." icon_state = "plasma" - list_reagents = list(/datum/reagent/medicine/molten_bubbles/plasma = 50) + list_reagents = list(/datum/reagent/consumable/molten/plasma_fizz = 50) /obj/item/reagent_containers/food/drinks/ration name = "empty ration pouch" diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 3ea468d19c1f..57d84ee22397 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -124,20 +124,20 @@ AddComponent(/datum/component/butchering, 200, 55) /obj/item/reagent_containers/food/drinks/bottle/gin - name = "Griffeater gin" - desc = "A bottle of high quality gin, produced in the New London Space Station." + name = "Neue Wacholder Gin" + desc = "A bottle of high quality gin, cultivated from juniper berries grown across the Solar cantons. Brewed in Stuteföhle." icon_state = "ginbottle" list_reagents = list(/datum/reagent/consumable/ethanol/gin = 100) /obj/item/reagent_containers/food/drinks/bottle/whiskey - name = "Uncle Git's special reserve" - desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES." + name = "Kadi-Witka Reserve" + desc = "An equivalent to single-malt whiskey, commonly enjoyed and brewed in a brewery originally founded Zohil. While different from traditionally used wheat, it can be safely enjoyed by every species." icon_state = "whiskeybottle" list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100) /obj/item/reagent_containers/food/drinks/bottle/kong name = "Kong" - desc = "Makes You Go Ape!®" + desc = "Makes You Go Ape!" list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/kong = 100) /obj/item/reagent_containers/food/drinks/bottle/candycornliquor @@ -146,8 +146,8 @@ list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/candycorn = 100) /obj/item/reagent_containers/food/drinks/bottle/vodka - name = "Tunguska triple distilled" - desc = "Vodka, prime choice of drink and fuel." + name = "Triple Horned" + desc = "Potato-based liquor commonly known as Vodka, distilled thrice to the standards of the PGF's requirements for their rations." icon_state = "vodkabottle" list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100) @@ -158,8 +158,8 @@ list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100) /obj/item/reagent_containers/food/drinks/bottle/tequila - name = "Caccavo guaranteed quality tequila" - desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" + name = "Rimeki Letisa" + desc = "Originally made from fermented succulents growing near Teceti's equator-deserts, this brand considers itself equivalent to the original tequila." icon_state = "tequilabottle" list_reagents = list(/datum/reagent/consumable/ethanol/tequila = 100) @@ -173,19 +173,19 @@ /obj/item/reagent_containers/food/drinks/bottle/patron name = "Wrapp Artiste Patron" - desc = "Silver laced tequila, served in space night clubs across the galaxy." + desc = "Tequila laced with silver, showy enough to impress when ordered in nightclubs across the galaxy." icon_state = "patronbottle" list_reagents = list(/datum/reagent/consumable/ethanol/patron = 100) /obj/item/reagent_containers/food/drinks/bottle/rum - name = "Captain Pete's Cuban spiced rum" - desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." + name = "Ahkskra Spiced" + desc = "Ahkskra Spiced - a spiced rum for the vox folkhero in everyone. Features a gallant-looking vox on the front of the bottle." icon_state = "rumbottle" list_reagents = list(/datum/reagent/consumable/ethanol/rum = 100) /obj/item/reagent_containers/food/drinks/bottle/holywater name = "flask of holy water" - desc = "A flask of the chaplain's holy water." + desc = "A flask of water, sanctified in some way by the supertitious." icon_state = "holyflask" list_reagents = list(/datum/reagent/water/holywater = 100) foodtype = NONE @@ -195,136 +195,94 @@ list_reagents = list(/datum/reagent/hellwater = 100) /obj/item/reagent_containers/food/drinks/bottle/vermouth - name = "Goldeneye vermouth" - desc = "Sweet, sweet dryness~" + name = "Whitespear Dry" + desc = "Dry and sweet vermouth, commonly used for mixed drinks. Some Solarians drink it as a digestive before meals." icon_state = "vermouthbottle" list_reagents = list(/datum/reagent/consumable/ethanol/vermouth = 100) /obj/item/reagent_containers/food/drinks/bottle/kahlua - name = "Robert Robust's coffee liqueur" - desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK." + name = "Keh'Lu'Tex Liqueur" + desc = "An adapted recipe of a caffeine-mixed liqueur originating from Reh'himl, which replaces it's original ingredient with coffee from Terra." icon_state = "kahluabottle" list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100) foodtype = VEGETABLES /obj/item/reagent_containers/food/drinks/bottle/goldschlager - name = "College Girl goldschlager" - desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." + name = "Student-Union's Gold Standard" + desc = "Extremely high-proof cinnamon schnapps, typically found in commemorative bottles by those in the Student-Union Association of Naturalistic Sciences. Nigh-undrinkable and with a tasteless amount of gold flakes floating within." icon_state = "goldschlagerbottle" list_reagents = list(/datum/reagent/consumable/ethanol/goldschlager = 100) /obj/item/reagent_containers/food/drinks/bottle/cognac - name = "Chateau de Baton premium cognac" - desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." + name = "Geheimnis Cognac" + desc = "While the origins of the name 'cognac' are lost to time, this type of brandy is reserved as a high-class drink with particular methods of brewing." icon_state = "cognacbottle" list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 100) /obj/item/reagent_containers/food/drinks/bottle/wine - name = "Doublebeard's bearded special wine" - desc = "A faint aura of unease and asspainery surrounds the bottle." + name = "Waldstätte Sauvignon" + desc = "A bottle of wine, brewed from grapes specifically grown in Neue Waldstätte. You've mostly seen these in bottles sold specifically for tourists." icon_state = "winebottle" list_reagents = list(/datum/reagent/consumable/ethanol/wine = 100) foodtype = FRUIT | ALCOHOL /obj/item/reagent_containers/food/drinks/bottle/absinthe - name = "extra-strong absinthe" - desc = "An strong alcoholic drink brewed and distributed by" + name = "Severtail Green" + desc = "Strong absinthe brewed in the Pan-Gezenan Federation, with their own transplants of Wormwood gifted to them during the first contact with humankind. If the legend (and label) means anything, the first attempt at brewing this caused some poor sarathi's tail to fall off." icon_state = "absinthebottle" list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100) -/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize() - . = ..() - redact() - -/obj/item/reagent_containers/food/drinks/bottle/absinthe/proc/redact() - // There was a large fight in the coderbus about a player reference - // in absinthe. Ergo, this is why the name generation is now so - // complicated. Judge us kindly. - var/shortname = pickweight( - list("T&T" = 1, "A&A" = 1, "Generic" = 1)) - var/fullname - switch(shortname) - if("T&T") - fullname = "Teal and Tealer" - if("A&A") - fullname = "Ash and Asher" - if("Generic") - fullname = "Nanotrasen Cheap Imitations" - var/removals = list("\[REDACTED\]", "\[EXPLETIVE DELETED\]", - "\[EXPUNGED\]", "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]", - "\[MOVE ALONG CITIZEN\]", "\[NOTHING TO SEE HERE\]") - var/chance = 50 - - if(prob(chance)) - shortname = pick_n_take(removals) - - var/list/final_fullname = list() - for(var/word in splittext(fullname, " ")) - if(prob(chance)) - word = pick_n_take(removals) - final_fullname += word - - fullname = jointext(final_fullname, " ") - - // Actually finally setting the new name and desc - name = "[shortname] [name]" - desc = "[desc] [fullname] Inc." - - /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium - name = "Gwyn's premium absinthe" - desc = "A potent alcoholic beverage, almost makes you forget the ash in your lungs." + name = "Chacheyi Gold" + desc = "A higher shelf absinthe, distributed primarily from The Shoal. Features the folkhero Chacheyi on the label, alongside their goldgrub companions." icon_state = "absinthepremium" -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium/redact() - return - /obj/item/reagent_containers/food/drinks/bottle/lizardwine - name = "bottle of 'kalixcis' wine" - desc = "An alcoholic beverage of sarathi origin, now so widespread that knock-offs can be found everywhere. Check the label for point of origin." + name = "bottle of Blueflame Pyrecask" + desc = "An alcoholic beverage originating from isolated vineyards on Zohil, maintained by the reclusive religious sects of the Blueflame. Now considered so popular and high quality, imitation bottles can be found everywhere. Check the label for point of origin." icon_state = "lizardwine" list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100) foodtype = FRUIT | ALCOHOL /obj/item/reagent_containers/food/drinks/bottle/hcider - name = "Jian Hard Cider" - desc = "Apple juice for adults." + name = "Neue Hamburg Spiced" + desc = "One of the main exports of Neue Hamburg - hard, spiced cider. Enjoyed all across the cantons and beyond." icon_state = "hcider" volume = 50 list_reagents = list(/datum/reagent/consumable/ethanol/hcider = 50) /obj/item/reagent_containers/food/drinks/bottle/amaretto - name = "Luini Amaretto" - desc = "A gentle and syrup like drink, tastes of almonds and apricots" + name = "Lu'Ni'Xer'Nan Amaretto" + desc = "A popular Rachnid take on the recipe for Amaretto, which fell to obscurity after only being semi-rediscovered by Solarian historians. Features a semi-reconstructed depiction of a supposed origin story, with the painter Lu'Ni'Xer'Nan and her muse, an innkeeper." icon_state = "disaronno" list_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 100) /obj/item/reagent_containers/food/drinks/bottle/grappa - name = "Phillipes well-aged Grappa" - desc = "Bottle of Grappa." + name = "Neue Maynila Grappamiel" + desc = "A bottle of Grappa, premixed with honey-based spirits. Commonly seen as a drink for recycling grapes after their use in winemaking, and commonly seen as a winter drink." icon_state = "grappabottle" list_reagents = list(/datum/reagent/consumable/ethanol/grappa = 100) /obj/item/reagent_containers/food/drinks/bottle/sake - name = "Ryo's traditional sake" - desc = "Sweet as can be, and burns like fire going down." + name = "Sakamai Sake" + desc = "An alcoholic drink derived from rice, rediscovered by Solarian historians and reintroduced to the best of their ability to reproduce it." icon_state = "sakebottle" list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100) /obj/item/reagent_containers/food/drinks/bottle/sake/Initialize() . = ..() if(prob(10)) - name = "Fluffy Tail Sake" - desc += " On the bottle is a picture of a kitsune with nine touchable tails." + name = "Fluffy Tail" + desc += "This particular brand's mascot is a human with nine fox tails - which is an impressive amount of genemodding." icon_state = "sakebottle_k" else if(prob(10)) name = "Inubashiri's Home Brew" - desc += " Awoo." + desc += "This particular brand's mascot is a human with vaguely canine ears and a tail." icon_state = "sakebottle_i" /obj/item/reagent_containers/food/drinks/bottle/fernet name = "Fernet Bronca" - desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station" + desc = "A bitter and aromatic drink, commonly enjoyed in the intersolar cantons due to relaxed alcoholic tariffs from being technically classified as a medicinal beverage. Commonly mixed with cola-based soft drinks." icon_state = "fernetbottle" list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100) @@ -338,7 +296,7 @@ /obj/item/reagent_containers/food/drinks/bottle/orangejuice name = "orange juice" - desc = "Full of vitamins and deliciousness!" + desc = "Sweet and tart orange juice. Usually found fortified to make it more nutritious. Full of vitamin C!" custom_price = 100 icon_state = "orangejuice" item_state = "carton" @@ -362,7 +320,7 @@ /obj/item/reagent_containers/food/drinks/bottle/cream name = "milk cream" - desc = "It's cream. Made from milk. What else did you think you'd find in there?" + desc = "Cream made from milk. It's thicker than milk, which hopefully prevents any mixups." custom_price = 100 icon_state = "cream" item_state = "carton" @@ -374,7 +332,7 @@ /obj/item/reagent_containers/food/drinks/bottle/tomatojuice name = "tomato juice" - desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." + desc = "Juice from tomatoes and salt. You'll often find some technicians soaking in this if they've been working with plasma." custom_price = 100 icon_state = "tomatojuice" item_state = "carton" @@ -386,7 +344,7 @@ /obj/item/reagent_containers/food/drinks/bottle/limejuice name = "lime juice" - desc = "Sweet-sour goodness." + desc = "Lime juice. You might want to mix something with this instead of drinking it straight..." custom_price = 100 icon_state = "limejuice" item_state = "carton" @@ -398,7 +356,7 @@ /obj/item/reagent_containers/food/drinks/bottle/pineapplejuice name = "pineapple juice" - desc = "Extremely tart, yellow juice." + desc = "Tart, sweet juice from the tropical pineapple." custom_price = 100 icon_state = "pineapplejuice" item_state = "carton" @@ -421,8 +379,8 @@ list_reagents = list(/datum/reagent/consumable/menthol = 100) /obj/item/reagent_containers/food/drinks/bottle/grenadine - name = "Jester Grenadine" - desc = "Contains 0% real cherries!" + name = "Three-Star Grenadine" + desc = "A commonly seen bottle of grenadine - or sweet fruit syrup. It might even contain real cherries, as well as some blackcurrant for color." custom_price = 100 icon_state = "grenadine" isGlass = TRUE @@ -431,8 +389,8 @@ /obj/item/reagent_containers/food/drinks/bottle/applejack - name = "Buckin' Bronco's Applejack" - desc = "Kicks like a horse, tastes like an apple!" + name = "Mars Lightning" + desc = "A strong brandy originating from apples, considered the older sibling to hard cider. Mars Lightning is often partnered with anti-gravity racing companies, leading to it often being served straight or for impromptu mixes." custom_price = 100 icon_state = "applejack_bottle" isGlass = TRUE @@ -440,22 +398,22 @@ foodtype = FRUIT /obj/item/reagent_containers/food/drinks/bottle/champagne - name = "Eau d' Dandy Brut Champagne" - desc = "Finely sourced from only the most pretentious French vineyards." + name = "Treu Champagne" + desc = "Finely sourced from entire canton planets dedicated to faithful reproduction of pre-Night Of Fire vineyards. Typically enjoyed for celebrations and the turn of new years." custom_premium_price = 250 icon_state = "champagne_bottle" isGlass = TRUE list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100) /obj/item/reagent_containers/food/drinks/bottle/blazaam - name = "Ginbad's Blazaam" - desc = "You feel like you should give the bottle a good rub before opening." + name = "Hyperspace Highball" + desc = "Infamously expensive, infamously contains bluespace 'flakes' for bragging rights, and infamously removed from most shelves due to accidents involving teleportation accidents upon ingestion." icon_state = "blazaambottle" list_reagents = list(/datum/reagent/consumable/ethanol/blazaam = 100) /obj/item/reagent_containers/food/drinks/bottle/trappist - name = "Mont de Requin Trappistes Bleu" - desc = "Brewed in space-Belgium. Fancy!" + name = "Roumain Trapper's" + desc = "Traditionally (and heavily monitored for authenticity) made beer brewed on Illestren. Trapper's beer must be brewed by Saint Roumain Hunters or Shadows, made to fit the needs of their community first, and must never be made for profit... which makes it a common sight in the Frontier." custom_premium_price = 170 icon_state = "trappistbottle" volume = 50 @@ -463,19 +421,19 @@ /obj/item/reagent_containers/food/drinks/bottle/hooch name = "hooch bottle" - desc = "A bottle of rotgut. Its owner has applied some street wisdom to cleverly disguise it as a brown paper bag." + desc = "A bottle of homebrewed, low quality alcohol. The paper wrapping is covered in little signatures and messages - how many hands have passed this bottle before you came around?" icon_state = "hoochbottle" list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100) /obj/item/reagent_containers/food/drinks/bottle/moonshine name = "moonshine jug" - desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle." + desc = "High-proof hard liquor, most likely made in the privacy of a bootlegger's ship. Permanent marker on packaging tape is the most you'll get for a label. Remember: if it doesn't burn blue, don't drink it!" icon_state = "moonshinebottle" list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100) /obj/item/reagent_containers/food/drinks/bottle/coconut - name = "Tali's Pure Coconut Delight" - desc = "Seems to be some promotional product for a Teceti video game. You're pretty certain this stuff is synthetic." + name = "T4l1's Pure Coconut Delight" + desc = "A fanmade, promotional bottle of coconut cream liquor. There's a stylized picture of a synthetic kepori on the side, along with a blurb about whoever she is. You're pretty certain this stuff is synthetic, despite Teceti growing actual coconut trees..." //if i have to recognize rilena here, I'm going to have fun with it icon_state = "coconutbottle" list_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 100) isGlass = TRUE @@ -497,7 +455,7 @@ ////////////////////////// MOLOTOV /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/molotov name = "molotov cocktail" - desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss." + desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by desperate militias and revolutionaries. Light and toss." icon_state = "vodkabottle" list_reagents = list() var/active = 0 @@ -557,7 +515,7 @@ /obj/item/reagent_containers/food/drinks/bottle/pruno name = "pruno mix" - desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet. Security would love to confiscate this, one of the many things wrong with them." + desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet." icon = 'icons/obj/janitor.dmi' icon_state = "trashbag" list_reagents = list(/datum/reagent/consumable/prunomix = 50) @@ -601,7 +559,7 @@ else reagents.add_reagent(/datum/reagent/consumable/ethanol/pruno, 50) name = "bag of pruno" - desc = "Fermented prison wine made from fruit, sugar, and despair. You probably shouldn't drink this around Security." + desc = "Fermented prison wine made from fruit, sugar, and despair." icon_state = "trashbag1" // pruno releases air as it ferments, we don't want to simulate this in atmos, but we can make it look like it did for (var/mob/living/M in view(2, get_turf(src))) // letting people and/or narcs know when the pruno is done to_chat(M, "A pungent smell emanates from [src], like fruit puking out its guts.") @@ -609,7 +567,7 @@ /obj/item/reagent_containers/food/drinks/colocup/lean name = "lean" - desc = "A cup of that purple drank, the stuff that makes you go WHEEZY BABY." + desc = "Despite this mix of codeine-based cough syrup and a soft drink of choice being popular online, you're not sure anyone talking about ever tried it. First time for everything?" icon_state = "lean" list_reagents = list(/datum/reagent/consumable/lean = 50) random_sprite = FALSE @@ -619,7 +577,7 @@ desc = "Sealed for a guaranteed fresh taste in every bottle." icon_state = "sandbottle" volume = 50 - list_reagents = list(/datum/reagent/medicine/molten_bubbles/sand = 50) + list_reagents = list(/datum/reagent/consumable/molten/sand = 50) reagent_flags = null //Cap's on /obj/item/reagent_containers/food/drinks/bottle/sarsaparilla/attack_self(mob/user) @@ -694,7 +652,7 @@ . = ..() if(sealed) var/datum/component/storage/S = GetComponent(/datum/component/storage) - user.visible_message("[user] prys open \the [src].", "You pry open \the [src]") + user.visible_message("[user] pries open \the [src].", "You pry open \the [src]") playsound(src, 'sound/machines/wooden_closet_close.ogg', 20, 1) sealed = FALSE S.locked = FALSE @@ -704,7 +662,7 @@ /obj/item/storage/bottles/sandblast name = "sarsaparilla bottle crate" - desc = "Holds six bottles of the finest sarsaparilla this side of the sector." + desc = "Holds six bottles of the finest sarsaparilla this side of the Frontier." sealed = TRUE /obj/item/storage/bottles/sandblast/PopulateContents() diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 1d7adb7db4f2..2f73f7678e38 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -100,10 +100,6 @@ name = "Space Cola" list_reagents = list(/datum/reagent/consumable/space_cola = 50) -/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola - name = "Nuka Cola" - list_reagents = list(/datum/reagent/consumable/nuka_cola = 50) - /obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs var/obj/item/reagent_containers/food/snacks/egg/E = I diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index c4daa88869a7..fc3df2f74713 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -24,7 +24,7 @@ /obj/item/reagent_containers/food/snacks/customizable/examine(mob/user) . = ..() var/ingredients_listed = "" - for(var/obj/item/reagent_containers/food/snacks/ING in ingredients) + for(var/obj/item/ING in ingredients) ingredients_listed += "[ING.name], " var/size = "standard" if(ingredients.len<2) @@ -36,8 +36,11 @@ . += "It contains [ingredients.len?"[ingredients_listed]":"no ingredient, "]making a [size]-sized [initial(name)]." /obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params) - if(!istype(I, /obj/item/reagent_containers/food/snacks/customizable) && istype(I, /obj/item/reagent_containers/food/snacks)) - var/obj/item/reagent_containers/food/snacks/S = I + if(istype(I, /obj/item/reagent_containers/food/snacks/customizable)) + return + var/datum/component/edible/E = I.GetComponent(/datum/component/edible) + var/obj/item/reagent_containers/food/snacks/S = I + if(istype(S) || E) if(I.w_class > WEIGHT_CLASS_SMALL) to_chat(user, "The ingredient is too big for [src]!") else if((ingredients.len >= ingMax) || (reagents.total_volume >= volume)) @@ -47,20 +50,25 @@ else if(!user.transferItemToLoc(I, src)) return - if(S.trash) - S.generate_trash(get_turf(user)) - ingredients += S - mix_filling_color(S) - S.reagents.trans_to(src,min(S.reagents.total_volume, 15), transfered_by = user) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume. - foodtype |= S.foodtype - update_customizable_overlays(S) + ingredients += I + I.reagents.trans_to(src,min(S.reagents.total_volume, 15), transfered_by = user) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume. + if(istype(S)) + if(S.trash) + S.generate_trash(get_turf(user)) + mix_filling_color(S.filling_color) + foodtype |= S.foodtype + update_customizable_overlays(S.filling_color) + else + mix_filling_color(E.filling_color) + foodtype |= E.foodtypes + update_customizable_overlays(E.filling_color) to_chat(user, "You add the [I.name] to the [name].") - update_food_name(S) + update_food_name(I) else . = ..() -/obj/item/reagent_containers/food/snacks/customizable/proc/update_food_name(obj/item/reagent_containers/food/snacks/S) +/obj/item/reagent_containers/food/snacks/customizable/proc/update_food_name(obj/item/S) for(var/obj/item/I in ingredients) if(!istype(S, I.type)) customname = "custom" @@ -88,25 +96,25 @@ attackby(I, user) qdel(BASE) -/obj/item/reagent_containers/food/snacks/customizable/proc/mix_filling_color(obj/item/reagent_containers/food/snacks/S) +/obj/item/reagent_containers/food/snacks/customizable/proc/mix_filling_color(newcolor) if(ingredients.len == 1) - filling_color = S.filling_color + filling_color = newcolor else var/list/rgbcolor = list(0,0,0,0) var/customcolor = GetColors(filling_color) - var/ingcolor = GetColors(S.filling_color) + var/ingcolor = GetColors(newcolor) rgbcolor[1] = (customcolor[1]+ingcolor[1])/2 rgbcolor[2] = (customcolor[2]+ingcolor[2])/2 rgbcolor[3] = (customcolor[3]+ingcolor[3])/2 rgbcolor[4] = (customcolor[4]+ingcolor[4])/2 filling_color = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3], rgbcolor[4]) -/obj/item/reagent_containers/food/snacks/customizable/update_customizable_overlays(obj/item/reagent_containers/food/snacks/S) +/obj/item/reagent_containers/food/snacks/customizable/update_customizable_overlays(filling_color = "#FFFFFF") var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling") - if(S.filling_color == "#FFFFFF") + if(filling_color == "#FFFFFF") filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00") else - filling.color = S.filling_color + filling.color = filling_color switch(ingredients_placement) if(INGREDIENTS_SCATTER) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index b64d52eea54a..61121a3ca950 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -167,26 +167,27 @@ All foods are distributed among various categories. Use common sense. /obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/storage)) ..() // -> item/attackby() - return 0 - if(istype(W, /obj/item/reagent_containers/food/snacks)) + return FALSE + var/datum/component/edible/E = W.GetComponent(/datum/component/edible) + if(istype(W, /obj/item/reagent_containers/food/snacks) || E) var/obj/item/reagent_containers/food/snacks/S = W if(custom_food_type && ispath(custom_food_type)) - if(S.w_class > WEIGHT_CLASS_SMALL) - to_chat(user, "[S] is too big for [src]!") - return 0 - if(!S.customfoodfilling || istype(W, /obj/item/reagent_containers/food/snacks/customizable) || istype(W, /obj/item/reagent_containers/food/snacks/pizzaslice/custom) || istype(W, /obj/item/reagent_containers/food/snacks/cakeslice/custom)) - to_chat(user, "[src] can't be filled with [S]!") - return 0 + if(W.w_class > WEIGHT_CLASS_SMALL) + to_chat(user, span_warning("[S] is too big for [src]!")) + return FALSE + if(istype(S) && (!S.customfoodfilling || istype(W, /obj/item/reagent_containers/food/snacks/customizable) || istype(W, /obj/item/reagent_containers/food/snacks/pizzaslice/custom) || istype(W, /obj/item/reagent_containers/food/snacks/cakeslice/custom))) + to_chat(user, span_warning("[src] can't be filled with [S]!")) + return FALSE if(contents.len >= 20) - to_chat(user, "You can't add more ingredients to [src]!") - return 0 + to_chat(user, span_warning("You can't add more ingredients to [src]!")) + return FALSE var/obj/item/reagent_containers/food/snacks/customizable/C = new custom_food_type(get_turf(src)) - C.initialize_custom_food(src, S, user) - return 0 + C.initialize_custom_food(src, W, user) + return FALSE var/sharp = W.get_sharpness() if(sharp) if(slice(sharp, W, user)) - return 1 + return TRUE else ..() diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index a048fb0e4371..d6f6151d47ac 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -195,7 +195,7 @@ force = 5 hitsound = 'sound/weapons/blade1.ogg' slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy - list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/pwr_game = 10, /datum/reagent/consumable/liquidelectricity = 10) + list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/pacfuel = 10, /datum/reagent/consumable/liquidelectricity = 10) tastes = list("cake" = 3, "a Vlad's Salad" = 1) /obj/item/reagent_containers/food/snacks/store/cake/birthday/energy/proc/energy_bite(mob/living/user) @@ -220,7 +220,7 @@ force = 2 hitsound = 'sound/weapons/blade1.ogg' filling_color = "#00FF00" - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/pwr_game = 2, /datum/reagent/consumable/liquidelectricity = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/pacfuel = 2, /datum/reagent/consumable/liquidelectricity = 2) tastes = list("cake" = 3, "a Vlad's Salad" = 1) /obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy/proc/energy_bite(mob/living/user) diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm index 930fabc31775..e35cb7eeb5fe 100644 --- a/code/modules/food_and_drinks/food/snacks_frozen.dm +++ b/code/modules/food_and_drinks/food/snacks_frozen.dm @@ -178,7 +178,7 @@ name = "Space Mountain Wind snowcone" desc = "Space Mountain Wind drizzled over a snowball in a paper cup." icon_state = "mountainwind_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/spacemountainwind = 5) + list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/comet_trail = 5) tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5) @@ -186,7 +186,7 @@ name = "pwrgame snowcone" desc = "Pwrgame soda drizzled over a snowball in a paper cup." icon_state = "pwrgame_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pwr_game = 5) + list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pacfuel = 5) tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5) /obj/item/reagent_containers/food/snacks/snowcones/honey diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 4c1a8695d838..f76bdb462539 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -61,10 +61,10 @@ grill_loop.start() return else - if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy)) - grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy))) + if(I.reagents.has_reagent(/datum/reagent/consumable/xeno_energy)) + grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/xeno_energy))) to_chat(user, "You pour the Monkey Energy in [src].") - I.reagents.remove_reagent(/datum/reagent/consumable/monkey_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)) + I.reagents.remove_reagent(/datum/reagent/consumable/xeno_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/xeno_energy)) update_appearance() return ..() diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index acd768347327..2474d1d53501 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -25,10 +25,6 @@ results = list(/datum/reagent/consumable/hot_ice_coffee = 3) required_reagents = list(/datum/reagent/toxin/hot_ice = 1, /datum/reagent/consumable/coffee = 2) -/datum/chemical_reaction/nuka_cola - results = list(/datum/reagent/consumable/nuka_cola = 6) - required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/consumable/space_cola = 6) - /datum/chemical_reaction/moonshine results = list(/datum/reagent/consumable/ethanol/moonshine = 10) required_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5) @@ -173,16 +169,12 @@ /datum/chemical_reaction/hiveminderaser results = list(/datum/reagent/consumable/ethanol/hiveminderaser = 4) - required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/thirteenloko = 1, /datum/reagent/consumable/grenadine = 1) + required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/vimukti = 1, /datum/reagent/consumable/grenadine = 1) /datum/chemical_reaction/manhattan results = list(/datum/reagent/consumable/ethanol/manhattan = 3) required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/ethanol/vermouth = 1) -/datum/chemical_reaction/manhattan_proj - results = list(/datum/reagent/consumable/ethanol/manhattan_proj = 10) - required_reagents = list(/datum/reagent/consumable/ethanol/manhattan = 10, /datum/reagent/uranium = 1) - /datum/chemical_reaction/vodka_tonic results = list(/datum/reagent/consumable/ethanol/vodkatonic = 3) required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/tonic = 1) @@ -205,7 +197,7 @@ /datum/chemical_reaction/demonsblood results = list(/datum/reagent/consumable/ethanol/demonsblood = 4) - required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/spacemountainwind = 1, /datum/reagent/blood = 1, /datum/reagent/consumable/dr_gibb = 1) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/comet_trail = 1, /datum/reagent/blood = 1, /datum/reagent/consumable/tadrixx = 1) /datum/chemical_reaction/booger results = list(/datum/reagent/consumable/ethanol/booger = 4) @@ -340,8 +332,8 @@ results = list(/datum/reagent/consumable/ethanol/driestmartini = 2) required_reagents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/ethanol/gin = 1) -/datum/chemical_reaction/thirteenloko - results = list(/datum/reagent/consumable/ethanol/thirteenloko = 3) +/datum/chemical_reaction/vimukti + results = list(/datum/reagent/consumable/ethanol/vimukti = 3) required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/limejuice = 1) /datum/chemical_reaction/chocolatepudding @@ -368,9 +360,9 @@ results = list(/datum/reagent/consumable/pumpkin_latte = 15) required_reagents = list(/datum/reagent/consumable/pumpkinjuice = 5, /datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/cream = 5) -/datum/chemical_reaction/gibbfloats - results = list(/datum/reagent/consumable/gibbfloats = 15) - required_reagents = list(/datum/reagent/consumable/dr_gibb = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/cream = 5) +/datum/chemical_reaction/tadrixxfloat + results = list(/datum/reagent/consumable/tadrixxfloat = 15) + required_reagents = list(/datum/reagent/consumable/tadrixx = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/cream = 5) /datum/chemical_reaction/triple_citrus results = list(/datum/reagent/consumable/triple_citrus = 5) @@ -390,11 +382,6 @@ required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/sugar = 1) mix_message = "The mixture darkens to a rich gold hue." -/datum/chemical_reaction/fetching_fizz - results = list(/datum/reagent/consumable/ethanol/fetching_fizz = 3) - required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/iron = 1) //Manufacturable from only the mining station - mix_message = "The mixture slightly vibrates before settling." - /datum/chemical_reaction/hearty_punch results = list(/datum/reagent/consumable/ethanol/hearty_punch = 1) //Very little, for balance reasons required_reagents = list(/datum/reagent/consumable/ethanol/brave_bull = 5, /datum/reagent/consumable/ethanol/syndicatebomb = 5, /datum/reagent/consumable/ethanol/absinthe = 5) @@ -438,12 +425,6 @@ results = list(/datum/reagent/consumable/ethanol/eggnog = 15) required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/eggyolk = 5) -/datum/chemical_reaction/narsour - results = list(/datum/reagent/consumable/ethanol/narsour = 1) - required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/ethanol/demonsblood = 1) - mix_message = "The mixture develops a sinister glow." - mix_sound = 'sound/effects/singlebeat.ogg' - /datum/chemical_reaction/quadruplesec results = list(/datum/reagent/consumable/ethanol/quadruple_sec = 15) required_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 5, /datum/reagent/consumable/triple_citrus = 5, /datum/reagent/consumable/ethanol/creme_de_menthe = 5) @@ -525,7 +506,6 @@ results = list(/datum/reagent/consumable/ethanol/fernet_cola = 2) required_reagents = list(/datum/reagent/consumable/ethanol/fernet = 1, /datum/reagent/consumable/space_cola = 1) - /datum/chemical_reaction/fanciulli results = list(/datum/reagent/consumable/ethanol/fanciulli = 2) required_reagents = list(/datum/reagent/consumable/ethanol/manhattan = 1, /datum/reagent/consumable/ethanol/fernet = 1) @@ -536,8 +516,7 @@ /datum/chemical_reaction/blank_paper results = list(/datum/reagent/consumable/ethanol/blank_paper = 3) - required_reagents = list(/datum/reagent/consumable/ethanol/silencer = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nuka_cola = 1) - + required_reagents = list(/datum/reagent/consumable/ethanol/silencer = 1, /datum/reagent/consumable/nothing = 1) /datum/chemical_reaction/wizz_fizz results = list(/datum/reagent/consumable/ethanol/wizz_fizz = 3) @@ -545,7 +524,6 @@ mix_message = "The beverage starts to froth with an almost mystical zeal!" mix_sound = 'sound/effects/bubbles2.ogg' - /datum/chemical_reaction/bug_spray results = list(/datum/reagent/consumable/ethanol/bug_spray = 5) required_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 2, /datum/reagent/consumable/lemon_lime = 1, /datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ethanol/vodka = 1) @@ -559,7 +537,7 @@ /datum/chemical_reaction/turbo results = list(/datum/reagent/consumable/ethanol/turbo = 5) - required_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 2, /datum/reagent/nitrous_oxide = 1, /datum/reagent/consumable/ethanol/sugar_rush = 1, /datum/reagent/consumable/pwr_game = 1) + required_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 2, /datum/reagent/nitrous_oxide = 1, /datum/reagent/consumable/ethanol/sugar_rush = 1, /datum/reagent/consumable/pacfuel = 1) /datum/chemical_reaction/old_timer results = list(/datum/reagent/consumable/ethanol/old_timer = 6) @@ -567,7 +545,7 @@ /datum/chemical_reaction/rubberneck results = list(/datum/reagent/consumable/ethanol/rubberneck = 10) - required_reagents = list(/datum/reagent/consumable/ethanol = 4, /datum/reagent/consumable/grey_bull = 5, /datum/reagent/consumable/astrotame = 1) + required_reagents = list(/datum/reagent/consumable/ethanol = 4, /datum/reagent/consumable/crosstalk = 5, /datum/reagent/consumable/astrotame = 1) /datum/chemical_reaction/duplex results = list(/datum/reagent/consumable/ethanol/duplex = 4) @@ -629,22 +607,11 @@ required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/creme_de_cacao = 2, /datum/reagent/consumable/ethanol/irishcarbomb = 1) mix_message = "The area around the glass seems to darken as the mixture forms!" -/datum/chemical_reaction/archmagus_brew - results = list(/datum/reagent/consumable/ethanol/archmagus_brew = 4) - required_reagents = list(/datum/reagent/consumable/ethanol/wizz_fizz = 2, /datum/reagent/consumable/ethanol/crevice_spike = 1, /datum/reagent/consumable/ethanol/stinger = 1) - mix_message = "The mixture bubbles intensely before settling in the glass." - /datum/chemical_reaction/out_of_lime results = list(/datum/reagent/consumable/ethanol/out_of_lime = 4) required_reagents = list(/datum/reagent/consumable/lemonade = 1, /datum/reagent/consumable/ethanol/beer/green = 1, /datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/ethanol/out_of_touch = 1) mix_message = "The glass cycles through different colors before settling on one." -/datum/chemical_reaction/cogchamp - results = list(/datum/reagent/consumable/ethanol/cogchamp = 3) - required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol/screwdrivercocktail = 1) - mix_message = "You hear faint sounds of gears turning as it mixes." - mix_sound = 'sound/effects/clockcult_gateway_closing.ogg' - /datum/chemical_reaction/ash_wine results = list(/datum/reagent/consumable/ethanol/trickwine/ash_wine = 5) required_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 3, /datum/reagent/ash = 1, /datum/reagent/drug/mushroomhallucinogen = 1) @@ -671,7 +638,7 @@ /datum/chemical_reaction/force_wine results = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 5) - required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 3, /datum/reagent/calcium = 1, /datum/reagent/consumable/spacemountainwind = 1) + required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 3, /datum/reagent/calcium = 1, /datum/reagent/consumable/comet_trail = 1) required_container = /obj/structure/fermenting_barrel/distiller mix_sound ='sound/magic/forcewall.ogg' @@ -680,3 +647,18 @@ required_reagents = list(/datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/tinlux = 1) required_container = /obj/structure/fermenting_barrel/distiller mix_sound ='sound/weapons/laser.ogg' + +/datum/chemical_reaction/molten_bubbles + results = list(/datum/reagent/consumable/molten = 30) + required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1) + +/datum/chemical_reaction/plasma_bubbles + results = list(/datum/reagent/consumable/molten/plasma_fizz = 3) + required_reagents = list(/datum/reagent/consumable/molten = 3, /datum/reagent/toxin/plasma = 2) + +/datum/chemical_reaction/sand_bubbles + results = list(/datum/reagent/consumable/molten/sand = 3) + required_reagents = list(/datum/reagent/consumable/molten = 3, /datum/reagent/silicon = 2) + +/datum/chemical_reaction/sand_bubbles/plasma // Subbing plasma bubbles for reg + required_reagents = list(/datum/reagent/consumable/molten/plasma_fizz = 3, /datum/reagent/silicon = 2) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 92647559d9cd..edca42fda076 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -27,7 +27,7 @@ name ="Space freezy" reqs = list( /datum/reagent/consumable/bluecherryjelly = 5, - /datum/reagent/consumable/spacemountainwind = 15, + /datum/reagent/consumable/comet_trail = 15, /obj/item/reagent_containers/food/snacks/icecream = 1 ) result = /obj/item/reagent_containers/food/snacks/spacefreezy @@ -217,7 +217,7 @@ reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/spacemountainwind = 5 + /datum/reagent/consumable/comet_trail = 5 ) result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind subcategory = CAT_ICE @@ -227,7 +227,7 @@ reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/pwr_game = 15 + /datum/reagent/consumable/pacfuel = 15 ) result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame subcategory = CAT_ICE diff --git a/code/modules/mining/drill.dm b/code/modules/mining/drill.dm index 281097be7842..9a35c2b4bf11 100644 --- a/code/modules/mining/drill.dm +++ b/code/modules/mining/drill.dm @@ -218,7 +218,7 @@ /obj/machinery/drill/AltClick(mob/user) if(active) to_chat(user, "You begin the manual shutoff process.") - if(do_after(user,10)) + if(do_after(user, 10, src)) active = FALSE soundloop.stop() deltimer(current_timerid) diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 4ad5297b73d9..27362b348cab 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -271,7 +271,7 @@ var/static/mutable_appearance/overcharge //shameless copycode from lightning spell overcharge = overcharge || mutable_appearance('icons/effects/effects.dmi', "electricity", EFFECTS_LAYER) _human.add_overlay(overcharge) - if(do_after(_human, 50, _human, 1)) + if(do_after(_human, 50, _human, TRUE)) _human.flash_lighting_fx(5, 7, current_color) var/obj/item/organ/stomach/ethereal/stomach = _human.getorganslot(ORGAN_SLOT_STOMACH) playsound(_human, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 30f3d5f74b58..14526059354d 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -313,7 +313,7 @@ H.notransform = TRUE - if(do_after(owner, delay=60, target=owner, progress=TRUE, timed_action_flags = IGNORE_HELD_ITEM)) + if(do_after(owner, delay = 60, target = owner, progress = TRUE, timed_action_flags = IGNORE_HELD_ITEM)) if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT) make_dupe() else diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm index 9c0f58dc8312..764a7166ff2d 100644 --- a/code/modules/mob/living/carbon/human/species_types/spider.dm +++ b/code/modules/mob/living/carbon/human/species_types/spider.dm @@ -147,7 +147,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt")) var/nutrition_threshold = NUTRITION_LEVEL_FED if (H.nutrition >= nutrition_threshold) to_chat(H, "You begin spinning some web...") - if(!do_after(H, 10 SECONDS, 1, T)) + if(!do_after(H, 10 SECONDS, T, hidden = TRUE)) to_chat(H, "Your web spinning was interrupted!") return if(prob(75)) @@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt")) to_chat(H, "You cannot wrap this.") return H.visible_message("[H] starts to wrap [A] into a cocoon!","You start to wrap [A] into a cocoon.") - if(!do_after(H, 10 SECONDS, 1, A)) + if(!do_after(H, 10 SECONDS, A, hidden = TRUE)) to_chat(H, "Your web spinning was interrupted!") return H.adjust_nutrition(E.spinner_rate * -3.5) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 6a66c0546f6e..755c674a107d 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -75,8 +75,6 @@ var/amount if(reagents.has_reagent(/datum/reagent/medicine/morphine)) amount = -1 - if(reagents.has_reagent(/datum/reagent/consumable/nuka_cola)) - amount = -1 if(amount) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_reagent_speedmod, TRUE, amount) diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index ec49e59ecace..4a3e284addd6 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -50,7 +50,7 @@ user.do_attack_animation(src) if (user.name == master) visible_message("Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.") - if(do_after(user, 1 SECONDS, TRUE, src)) + if(do_after(user, 1 SECONDS, src, hidden = TRUE)) fold_in() if(user.put_in_hands(card)) user.visible_message("[user] promptly scoops up [user.p_their()] pAI's card.") diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm index 104d4363bc3b..16f377cb1b01 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -17,7 +17,7 @@ if("Cannibalize") if(D.health < D.maxHealth) D.visible_message("[D] begins to cannibalize parts from [src].", "You begin to cannibalize parts from [src]...") - if(do_after(D, 60, 0, target = src)) + if(do_after(D, 60, src, FALSE)) D.visible_message("[D] repairs itself using [src]'s remains!", "You repair yourself using [src]'s remains.") D.adjustBruteLoss(-src.maxHealth) new /obj/effect/decal/cleanable/oil/streak(get_turf(src)) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index cf1b0de8ae70..f2fbf6e5b262 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -165,7 +165,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) visible_message( "[src] starts eating away [A]...", "You start eating the [A]...") - if(do_after(src, 30, FALSE, A)) + if(do_after(src, 30, A, hidden = TRUE)) if(QDELETED(A)) return visible_message( diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index d8aedc292ca0..bf8552ba5cb0 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -213,7 +213,7 @@ /mob/living/simple_animal/hostile/asteroid/goliath/beast/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/saddle) && !saddled) - if(tame && do_after(user,55,target=src)) + if(tame && do_after(user, 55, target=src)) user.visible_message("You manage to put [O] on [src], you can now ride [p_them()].") qdel(O) saddled = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm index eaf546b3f627..19334bc84fcd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm @@ -75,7 +75,8 @@ ..(gibbed) /mob/living/simple_animal/hostile/asteroid/proc/spawn_mob_trophy() - butcher_results[mob_trophy] = 1 + if(mob_trophy) + butcher_results[mob_trophy] = 1 /mob/living/simple_animal/hostile/asteroid/handle_temperature_damage() if(bodytemperature < minbodytemp) diff --git a/code/modules/movespeed/modifiers/reagent.dm b/code/modules/movespeed/modifiers/reagent.dm index d6b0703ccb59..ecf91d0760fa 100644 --- a/code/modules/movespeed/modifiers/reagent.dm +++ b/code/modules/movespeed/modifiers/reagent.dm @@ -13,7 +13,7 @@ /datum/movespeed_modifier/reagent/badstims multiplicative_slowdown = -0.45 -/datum/movespeed_modifier/reagent/monkey_energy +/datum/movespeed_modifier/reagent/xeno_energy multiplicative_slowdown = -0.35 /datum/movespeed_modifier/reagent/changelinghaste diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index 4939686ee9fd..f45c231c7098 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -85,7 +85,7 @@ They *could* go in their appropriate files, but this is supposed to be modular drain = S.cell.maxcharge - S.cell.charge maxcapacity = 1 - if (do_after(H,10, target = src, hidden = TRUE)) + if (do_after(H, 10, target = src, hidden = TRUE)) spark_system.start() playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) charge -= drain @@ -235,7 +235,7 @@ They *could* go in their appropriate files, but this is supposed to be modular if(S.cell.charge+drain > S.cell.maxcharge) drain = S.cell.maxcharge - S.cell.charge maxcapacity = 1 - if (do_after(H,10, hidden = TRUE)) + if (do_after(H, 10, hidden = TRUE)) spark_system.start() playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) cell.use(drain) diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index f9641a7a63ff..b700e22156fa 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -21,7 +21,7 @@ var/obj/item/stock_parts/cell/CELL = I if(CELL.maxcharge > cell.maxcharge && n_gloves && n_gloves.candrain) to_chat(U, "Higher maximum capacity detected.\nUpgrading...") - if (n_gloves && n_gloves.candrain && do_after(U,s_delay, target = src)) + if (n_gloves && n_gloves.candrain && do_after(U, s_delay, target = src)) U.transferItemToLoc(CELL, src) CELL.charge = min(CELL.charge+cell.charge, CELL.maxcharge) var/obj/item/stock_parts/cell/old_cell = cell diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 4c3c8b736c4d..3b1bdbc6eb1c 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -98,7 +98,7 @@ if(istype(attacking_obj, /obj/item/ammo_box)) var/obj/item/ammo_box/attacking_box = attacking_obj for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo) - if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, list(attacking_box)))) + if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box))) break var/did_load = give_round(casing_to_insert, replace_spent) if(!did_load) diff --git a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm index f8ce8223748d..658eef2d781c 100644 --- a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm +++ b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm @@ -66,7 +66,7 @@ var/list/ammo_list_no_empty = ammo_list(FALSE) listclearnulls(ammo_list_no_empty) for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo) - if(!((instant_load && attacking_box.instant_load) || (ammo_list_no_empty.len >= max_ammo) || do_after(user, 1 SECONDS, list(attacking_box)))) //stupid work around for revolvers + if(!((instant_load && attacking_box.instant_load) || (ammo_list_no_empty.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box))) //stupid work around for revolvers break var/did_load = give_round(casing_to_insert, replace_spent) if(!did_load) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index e5345c0eab45..71a291f301de 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -241,7 +241,7 @@ update_appearance() SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) if (tac_load) - if(do_after(user, tactical_reload_delay, TRUE, src)) + if(do_after(user, tactical_reload_delay, src, hidden = TRUE)) if (insert_magazine(user, tac_load, FALSE)) to_chat(user, "You perform a tactical reload on \the [src].") else diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm index 4e9abd0cd70c..afa111c6bbf8 100644 --- a/code/modules/projectiles/guns/ballistic/hmg.dm +++ b/code/modules/projectiles/guns/ballistic/hmg.dm @@ -88,7 +88,7 @@ if(!can_deploy) to_chat(user, "You need to brace against something to deploy [src]'s bipod! Either lie on the floor or stand next to a waist high object like a table!") return - if(!do_after(user, deploy_time, src, FALSE, TRUE, CALLBACK(src, PROC_REF(is_wielded)))) + if(!do_after(user, deploy_time, src, NONE, TRUE, CALLBACK(src, PROC_REF(is_wielded)))) to_chat(user, "You need to hold still to deploy [src]'s bipod!") return playsound(src, 'sound/machines/click.ogg', 75, TRUE) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index d06ad71d206d..dffa9a7fe7b1 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -158,7 +158,7 @@ to_chat(user, "You pull the cell out of \the [src].") update_appearance() if(tac_load && tac_reloads) - if(do_after(user, tactical_reload_delay, TRUE, src)) + if(do_after(user, tactical_reload_delay, src, hidden = TRUE)) if(insert_cell(user, tac_load)) to_chat(user, "You perform a tactical reload on \the [src].") else diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 037256db302f..2fa26e8f4bfb 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -470,14 +470,14 @@ /datum/reagent/consumable/tea, /datum/reagent/consumable/icetea, /datum/reagent/consumable/space_cola, - /datum/reagent/consumable/spacemountainwind, - /datum/reagent/consumable/dr_gibb, + /datum/reagent/consumable/comet_trail, + /datum/reagent/consumable/tadrixx, /datum/reagent/consumable/space_up, /datum/reagent/consumable/tonic, /datum/reagent/consumable/sodawater, /datum/reagent/consumable/lemon_lime, - /datum/reagent/consumable/pwr_game, - /datum/reagent/consumable/shamblers, + /datum/reagent/consumable/pacfuel, + /datum/reagent/consumable/shoal_punch, /datum/reagent/consumable/sugar, /datum/reagent/consumable/pineapplejuice, /datum/reagent/consumable/orangejuice, @@ -489,7 +489,7 @@ ) upgrade_reagents = null emagged_reagents = list( - /datum/reagent/consumable/ethanol/thirteenloko, + /datum/reagent/consumable/ethanol/vimukti, /datum/reagent/consumable/ethanol/whiskey_cola, /datum/reagent/toxin/mindbreaker, /datum/reagent/toxin/staminatoxin diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 5902665e85c9..10519c75c434 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -87,30 +87,30 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/beer name = "Beer" - description = "An alcoholic beverage brewed since ancient times on Old Earth. Still popular today." + description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. A timeless classic." color = "#664300" // rgb: 102, 67, 0 nutriment_factor = 1 * REAGENTS_METABOLISM boozepwr = 25 - taste_description = "piss water" + taste_description = "bad water" glass_name = "glass of beer" - glass_desc = "A freezing pint of beer." + glass_desc = "A pint of beer." /datum/reagent/consumable/ethanol/beer/light name = "Light Beer" - description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety has reduced calorie and alcohol content." + description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. This variety has reduced calorie and alcohol content." boozepwr = 5 //Space Europeans hate it taste_description = "dish water" glass_name = "glass of light beer" - glass_desc = "A freezing pint of watery light beer." + glass_desc = "A pint of watery light beer." /datum/reagent/consumable/ethanol/beer/green name = "Green Beer" - description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety is dyed a festive green." + description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. This variety is dyed green, but you're not sure why." color = "#A8E61D" - taste_description = "green piss water" + taste_description = "green bad water" glass_icon_state = "greenbeerglass" glass_name = "glass of green beer" - glass_desc = "A freezing pint of green beer. Festive." + glass_desc = "A pint of green beer. You get the feeling this had some sort of meaning, once." /datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/M) if(M.color != color) @@ -122,12 +122,12 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/kahlua name = "Kahlua" - description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" + description = "A widely known coffee-flavoured liqueur. Still labeled under an old name from Earth, despite the loss of history." color = "#664300" // rgb: 102, 67, 0 boozepwr = 45 glass_icon_state = "kahluaglass" - glass_name = "glass of RR coffee liquor" - glass_desc = "DAMN, THIS THING LOOKS ROBUST!" + glass_name = "glass of coffee liquor" + glass_desc = "Bitter from the coffee and alcohol alike!" shot_glass_icon_state = "shotglasscream" /datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/M) @@ -141,23 +141,23 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/whiskey name = "Whiskey" - description = "A superb and well-aged single-malt whiskey. Damn." + description = "A well-aged whiskey." color = "#664300" // rgb: 102, 67, 0 boozepwr = 75 taste_description = "molasses" glass_icon_state = "whiskeyglass" glass_name = "glass of whiskey" - glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." + glass_desc = "Often described as having a silky mouthfeel and a smokey aftertaste. The brown-amber color catches the light very well." shot_glass_icon_state = "shotglassbrown" /datum/reagent/consumable/ethanol/whiskey/kong name = "Kong" - description = "Makes You Go Ape!®" + description = "Makes You Go Ape!" color = "#332100" // rgb: 51, 33, 0 addiction_threshold = 15 taste_description = "the grip of a giant ape" glass_name = "glass of Kong" - glass_desc = "Makes You Go Ape!®" + glass_desc = "Makes You Go Ape!" /datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage1(mob/living/M) if(prob(5)) @@ -200,21 +200,21 @@ All effects don't start immediately, but rather get worse over time; the rate is M.hallucination += hal_amt //conscious dreamers can be treasurers to their own currency ..() -/datum/reagent/consumable/ethanol/thirteenloko - name = "Thirteen Loko" - description = "A potent mixture of caffeine and alcohol." +/datum/reagent/consumable/ethanol/vimukti + name = "Vimukti" + description = "A potent, fermented sweet lichen drink from the Shoal." color = "#ce871d" nutriment_factor = 1 * REAGENTS_METABOLISM boozepwr = 80 quality = DRINK_GOOD overdose_threshold = 60 addiction_threshold = 30 - taste_description = "jitters and death" - glass_icon_state = "thirteen_loko_glass" - glass_name = "glass of Thirteen Loko" - glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass." + taste_description = "oily syrup" + glass_icon_state = "vimukti_glass" + glass_name = "glass of Vimukti" + glass_desc = "A spiritually-taxing drink from the Shoal. Numerous warnings about this drink tell you to not drink too much, lest you incur some sort of wrath... or an overdose of a psychoactive lichen." -/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/ethanol/vimukti/on_mob_life(mob/living/carbon/M) M.drowsyness = max(0,M.drowsyness-7) M.AdjustSleeping(-40) M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) @@ -222,12 +222,12 @@ All effects don't start immediately, but rather get worse over time; the rate is M.Jitter(5) return ..() -/datum/reagent/consumable/ethanol/thirteenloko/overdose_start(mob/living/M) +/datum/reagent/consumable/ethanol/vimukti/overdose_start(mob/living/M) to_chat(M, "Your entire body violently jitters as you start to feel queasy. You really shouldn't have drank all of that [name]!") M.Jitter(20) M.Stun(15) -/datum/reagent/consumable/ethanol/thirteenloko/overdose_process(mob/living/M) +/datum/reagent/consumable/ethanol/vimukti/overdose_process(mob/living/M) if(prob(7) && iscarbon(M)) var/obj/item/I = M.get_active_held_item() if(I) @@ -260,18 +260,18 @@ All effects don't start immediately, but rather get worse over time; the rate is if(prob(1) && iscarbon(M)) var/datum/disease/D = new /datum/disease/heart_failure M.ForceContractDisease(D) - to_chat(M, "You're pretty sure you just felt your heart stop for a second there..") + to_chat(M, "You're pretty sure you just felt your heart stop for a second there...") M.playsound_local(M, 'sound/effects/singlebeat.ogg', 100, 0) /datum/reagent/consumable/ethanol/vodka name = "Vodka" - description = "Number one drink that also serves as fuel." + description = "A clear, hard liquor. Doubles as a flammable fuel source, if you really need it." color = "#0064C8" // rgb: 0, 100, 200 boozepwr = 65 taste_description = "grain alcohol" glass_icon_state = "ginvodkaglass" glass_name = "glass of vodka" - glass_desc = "The glass contain wodka. Xynta." + glass_desc = "It's almost difficult to tell the glass is full of vodka until you tip it around. The smell makes your nose wrinkle... but it might just be worth it." shot_glass_icon_state = "shotglassclear" /datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/carbon/M) @@ -280,14 +280,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/bilk name = "Bilk" - description = "This appears to be beer mixed with milk. Disgusting." + description = "This appears to be beer mixed with milk. Creative...?" color = "#895C4C" // rgb: 137, 92, 76 nutriment_factor = 2 * REAGENTS_METABOLISM boozepwr = 15 taste_description = "desperation and lactate" glass_icon_state = "glass_brown" glass_name = "glass of bilk" - glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." + glass_desc = "A brew of milk and beer. You have to wonder if this was made by accident just from the smell." /datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/M) if(M.getBruteLoss() && prob(10)) @@ -297,14 +297,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/threemileisland name = "Three Mile Island Iced Tea" - description = "Made for a woman, strong enough for a man." + description = "The extreme version of fruity cocktails." color = "#666340" // rgb: 102, 99, 64 boozepwr = 10 quality = DRINK_FANTASTIC - taste_description = "dryness" + taste_description = "sweet dryness" glass_icon_state = "threemileislandglass" glass_name = "Three Mile Island Ice Tea" - glass_desc = "A glass of this is sure to prevent a meltdown." + glass_desc = "A glass of Three Mile Island Ice Tea, named after a cordoned-off set of islands on Earth, for some reason. You almost can't taste the alcohol in it..." /datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/M) M.set_drugginess(50) @@ -312,75 +312,75 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/gin name = "Gin" - description = "It's gin. In space. I say, good sir." + description = "A very sharp alcohol, with a flavor that's distinctly fresh." color = "#664300" // rgb: 102, 67, 0 boozepwr = 45 - taste_description = "an alcoholic christmas tree" + taste_description = "an alcoholic pine tree" glass_icon_state = "ginvodkaglass" glass_name = "glass of gin" - glass_desc = "A crystal clear glass of Griffeater gin." + glass_desc = "A glass of gin, made with a specific type of berry that leaves it smelling like the tree it came from. It's enough to wet your eyes." /datum/reagent/consumable/ethanol/rum name = "Rum" - description = "Yohoho and all that." + description = "The liquor of choice for sailors and spacers alike." color = "#664300" // rgb: 102, 67, 0 boozepwr = 60 taste_description = "spiked butterscotch" glass_icon_state = "rumglass" glass_name = "glass of rum" - glass_desc = "Now you want to Pray for a pirate suit, don't you?" + glass_desc = "There's no need to worry about being seen as a pirate with one of these. If you add enough ice and let it melt, it'll turn into grog." shot_glass_icon_state = "shotglassbrown" /datum/reagent/consumable/ethanol/tequila name = "Tequila" - description = "A strong and mildly flavoured, Mexican produced spirit. Feeling thirsty, hombre?" + description = "A strongly flavoured spirit." color = "#FFFF91" // rgb: 255, 255, 145 boozepwr = 70 taste_description = "paint stripper" glass_icon_state = "tequilaglass" glass_name = "glass of tequila" - glass_desc = "Now all that's missing is the weird colored shades!" + glass_desc = "Despite the strong, woody taste, there's just enough sweetness to keep you coming for more." shot_glass_icon_state = "shotglassgold" /datum/reagent/consumable/ethanol/vermouth name = "Vermouth" - description = "You suddenly feel a craving for a martini..." + description = "A fine wine to go with a meal." color = "#91FF91" // rgb: 145, 255, 145 boozepwr = 45 taste_description = "dry alcohol" glass_icon_state = "vermouthglass" glass_name = "glass of vermouth" - glass_desc = "You wonder why you're even drinking this straight." + glass_desc = "Vermouth was used as a medicine in the past, and the flavor makes sure to remind you of that." shot_glass_icon_state = "shotglassclear" /datum/reagent/consumable/ethanol/wine name = "Wine" - description = "A premium alcoholic beverage made from distilled grape juice." + description = "An alcoholic beverage made from fermented grapes of all kinds." color = "#7E4043" // rgb: 126, 64, 67 boozepwr = 35 taste_description = "bitter sweetness" glass_icon_state = "wineglass" glass_name = "glass of wine" - glass_desc = "A very classy looking drink." + glass_desc = "Deeply red wine in a glass. You're not enough of a sommelier to really describe how it smells." shot_glass_icon_state = "shotglassred" /datum/reagent/consumable/ethanol/lizardwine - name = "Kalixcis Wine" - description = "A relatively popular Kalixcane beverage, made by infusing cacti in ethanol." + name = "Blueflame Pyrecask" + description = "A popular Zohil beverage, made by infusing specially-gathered cacti and grapes in ethanol." color = "#7E4043" // rgb: 126, 64, 67 boozepwr = 45 quality = DRINK_FANTASTIC - taste_description = "scaley sweetness" + taste_description = "warm sweetness" /datum/reagent/consumable/ethanol/grappa name = "Grappa" - description = "A fine Italian brandy, for when regular wine just isn't alcoholic enough for you." + description = "A fine brandy mixed with spirits." color = "#F8EBF1" boozepwr = 60 taste_description = "classy bitter sweetness" glass_icon_state = "grappa" glass_name = "glass of grappa" - glass_desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking." + glass_desc = "Despite being made from the recycled remains of wine grapes, it's not bad at all." /datum/reagent/consumable/ethanol/amaretto name = "Amaretto" @@ -390,28 +390,28 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "fruity and nutty sweetness" glass_icon_state = "amarettoglass" glass_name = "glass of amaretto" - glass_desc = "A sweet and syrupy looking drink." + glass_desc = "A sweet and syrupy looking alcohol. You're lucky it wasn't lost to history." /datum/reagent/consumable/ethanol/cognac name = "Cognac" - description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. Classy as fornication." + description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing." color = "#AB3C05" // rgb: 171, 60, 5 boozepwr = 75 - taste_description = "angry and irish" + taste_description = "sharp and relaxing" glass_icon_state = "cognacglass" glass_name = "glass of cognac" - glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this." + glass_desc = "You wonder how many exhausted Solarian bureaucrats are drinking this the same way you are, right now." shot_glass_icon_state = "shotglassbrown" /datum/reagent/consumable/ethanol/absinthe name = "Absinthe" - description = "A powerful alcoholic drink. Rumored to cause hallucinations but does not." + description = "A powerful alcoholic drink. Rumored to cause hallucinations if taken irresponsibly." color = rgb(10, 206, 0) boozepwr = 80 //Very strong even by default taste_description = "death and licorice" glass_icon_state = "absinthe" glass_name = "glass of absinthe" - glass_desc = "It's as strong as it smells." + glass_desc = "The smell is enough to bring you to the verge of tears. The hint of liquorice threatens to bring you over the edge." shot_glass_icon_state = "shotglassgreen" /datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/M) @@ -421,13 +421,13 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/hooch name = "Hooch" - description = "Either someone's failure at cocktail making or attempt in alcohol production. In any case, do you really want to drink that?" + description = "Low quality, low grade, and low expectations." color = "#664300" // rgb: 102, 67, 0 boozepwr = 100 taste_description = "pure resignation" glass_icon_state = "glass_brown2" glass_name = "Hooch" - glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + glass_desc = "You can't help but feel like you'd rather drink anything else right now, just from looking at it." /datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M) if(M.mind && M.mind.assigned_role == "Assistant") @@ -440,67 +440,67 @@ All effects don't start immediately, but rather get worse over time; the rate is description = "A dark alcoholic beverage made with malted barley and yeast." color = "#664300" // rgb: 102, 67, 0 boozepwr = 65 - taste_description = "hearty barley ale" + taste_description = "hearty alcoholic grains" glass_icon_state = "aleglass" glass_name = "glass of ale" - glass_desc = "A freezing pint of delicious Ale." + glass_desc = "A pint of ale. A classic for the working class." /datum/reagent/consumable/ethanol/goldschlager name = "Goldschlager" - description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." + description = "100 proof cinnamon schnapps, made for the Student Unions' unbearable tastes." color = "#FFFF91" // rgb: 255, 255, 145 boozepwr = 25 quality = DRINK_VERYGOOD taste_description = "burning cinnamon" glass_icon_state = "goldschlagerglass" glass_name = "glass of goldschlager" - glass_desc = "100% proof that teen girls will drink anything with gold in it." + glass_desc = "Extremely high proof, with cinnamon to boot. At least the light catches the gold flakes nicely enough to distract you from the imminent sting." shot_glass_icon_state = "shotglassgold" /datum/reagent/consumable/ethanol/patron name = "Patron" - description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." + description = "Tequila with silver in it, often found in nightclubs." color = "#585840" // rgb: 88, 88, 64 boozepwr = 60 quality = DRINK_VERYGOOD taste_description = "metallic and expensive" glass_icon_state = "patronglass" glass_name = "glass of patron" - glass_desc = "Drinking patron in the bar, with all the subpar ladies." + glass_desc = "A glass of Patron. The silver is for show, but you can't help but wonder how you would show it off to anyone." shot_glass_icon_state = "shotglassclear" /datum/reagent/consumable/ethanol/gintonic name = "Gin and Tonic" - description = "An all time classic, mild cocktail." + description = "A classic cocktail, with quinine for flavor." color = "#664300" // rgb: 102, 67, 0 boozepwr = 25 quality = DRINK_NICE taste_description = "mild and tart" glass_icon_state = "gintonicglass" glass_name = "Gin and Tonic" - glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman." + glass_desc = "A mild, venerable cocktail. You wonder if the quinine is doing anything for you." /datum/reagent/consumable/ethanol/rum_coke name = "Rum and Coke" description = "Rum, mixed with cola." - taste_description = "cola" + taste_description = "cola and alcohol" boozepwr = 40 quality = DRINK_NICE color = "#6b2f01" glass_icon_state = "whiskeycolaglass" glass_name = "Rum and Coke" - glass_desc = "The classic go-to of space-fratboys." + glass_desc = "The classic for mixing drinks on the fly." /datum/reagent/consumable/ethanol/cuba_libre - name = "Cuba Libre" - description = "Viva la Revolucion! Viva Cuba Libre!" + name = "Frontier Libre" + description = "For a freer Frontier, everywhere!" color = "#692e01" boozepwr = 50 quality = DRINK_GOOD taste_description = "a refreshing marriage of citrus and rum" glass_icon_state = "cubalibreglass" - glass_name = "Cuba Libre" - glass_desc = "A classic mix of rum, cola, and lime. A favorite of revolutionaries everywhere!" + glass_name = "Frontier Libre" + glass_desc = "A mix of rum, cola, and lime. A favorite of among independent spacers and the Frontiersmen alike, who named it in the spirit of securing a free Frontier." /datum/reagent/consumable/ethanol/whiskey_cola name = "Whiskey Cola" @@ -508,55 +508,55 @@ All effects don't start immediately, but rather get worse over time; the rate is color = "#602a00" boozepwr = 70 quality = DRINK_NICE - taste_description = "cola" + taste_description = "sweet soda and bitter alcohol" glass_icon_state = "whiskeycolaglass" glass_name = "whiskey cola" - glass_desc = "An innocent-looking mixture of cola and whiskey. Delicious." + glass_desc = "An sweet-and-bitter mixture of cola and whiskey." /datum/reagent/consumable/ethanol/martini name = "Classic Martini" - description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." + description = "Vermouth with gin." color = "#9e8c67" boozepwr = 60 quality = DRINK_NICE - taste_description = "dry class" + taste_description = "dry" glass_icon_state = "martiniglass" glass_name = "Classic Martini" - glass_desc = "Damn, the bartender even stirred it, not shook it." + glass_desc = "Rumored to be a favorite amongst the Evidenzkompanien, much to their chagrin." /datum/reagent/consumable/ethanol/vodkamartini name = "Vodka Martini" - description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." + description = "Vodka with gin." color = "#664300" // rgb: 102, 67, 0 boozepwr = 65 quality = DRINK_NICE taste_description = "shaken, not stirred" glass_icon_state = "martiniglass" glass_name = "Vodka martini" - glass_desc ="A bastardisation of the classic martini. Still great." + glass_desc ="Rumored to be a favorite amongst the Verwaltungskompanien, to their entertainment." /datum/reagent/consumable/ethanol/white_russian - name = "White Russian" - description = "That's just, like, your opinion, man..." + name = "White Gezenan" + description = "Cream and vodka." color = "#A68340" // rgb: 166, 131, 64 boozepwr = 50 quality = DRINK_GOOD taste_description = "bitter cream" glass_icon_state = "whiterussianglass" - glass_name = "White Russian" - glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." + glass_name = "White Gezenan" + glass_desc = "A mix of traditionally PGF-sourced vodka and cream derived from nut milk. You can still drink this if you're not from Gezena, though." /datum/reagent/consumable/ethanol/screwdrivercocktail name = "Screwdriver" - description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." + description = "Vodka mixed with orange juice." color = "#A68310" // rgb: 166, 131, 16 boozepwr = 55 quality = DRINK_NICE taste_description = "oranges" glass_icon_state = "screwdriverglass" glass_name = "Screwdriver" - glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + glass_desc = "You won't be turning any screws with this, but you're far from lamenting that." /datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/M) var/static/list/increased_rad_loss = list("Station Engineer", "Atmospheric Technician", "Chief Engineer") @@ -572,18 +572,18 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "sweet 'n creamy" glass_icon_state = "booger" glass_name = "Booger" - glass_desc = "Ewww..." + glass_desc = "The name isn't selling the drink very well, is it..." /datum/reagent/consumable/ethanol/bloody_mary name = "Bloody Mary" - description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." + description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice." color = "#664300" // rgb: 102, 67, 0 boozepwr = 55 quality = DRINK_GOOD taste_description = "tomatoes with a hint of lime" glass_icon_state = "bloodymaryglass" glass_name = "Bloody Mary" - glass_desc = "Tomato juice, mixed with Vodka and a li'l bit of lime. Tastes like liquid murder." + glass_desc = "Tomato juice, mixed with Vodka and a li'l bit of lime. The taste is acquired, and usually acquired through tgrying to use it as a hangover remedy." /datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/C) if(C.blood_volume < BLOOD_VOLUME_NORMAL) @@ -592,14 +592,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/brave_bull name = "Brave Bull" - description = "It's just as effective as Dutch-Courage!" + description = "Liquid courage is as good as any courage!" color = "#664300" // rgb: 102, 67, 0 boozepwr = 60 quality = DRINK_NICE taste_description = "alcoholic bravery" glass_icon_state = "bravebullglass" glass_name = "Brave Bull" - glass_desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up." + glass_desc = "Tequila and coffee liqueur, brought together to give you the will to pick fights. Don't drink enough to ruin your sense of safety, though." var/tough_text /datum/reagent/consumable/ethanol/brave_bull/on_mob_metabolize(mob/living/M) @@ -615,14 +615,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/tequila_sunrise name = "Tequila Sunrise" - description = "Tequila, Grenadine, and Orange Juice." + description = "Tequila, grenadine, and orange juice." color = "#FFE48C" // rgb: 255, 228, 140 boozepwr = 45 quality = DRINK_GOOD taste_description = "oranges with a hint of pomegranate" glass_icon_state = "tequilasunriseglass" glass_name = "tequila Sunrise" - glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." + glass_desc = "You feel a distinct sense of nostalgia - when's the last time you felt the sun on your face?" var/obj/effect/light_holder /datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_metabolize(mob/living/M) @@ -643,14 +643,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/toxins_special name = "Toxins Special" - description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!" + description = "It's a bit tasteless to name your drink after industrial accidents." color = "#780162" boozepwr = 25 quality = DRINK_VERYGOOD taste_description = "spicy toxins" glass_icon_state = "toxinsspecialglass" glass_name = "Toxins Special" - glass_desc = "Whoah, this thing is on FIRE!" + glass_desc = "Traditionally lit with a welder while the server is blindfolded, but you don't want to cause an ACTUAL accident here." shot_glass_icon_state = "toxinsspecialglass" /datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M) @@ -659,15 +659,15 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/beepsky_smash name = "Beepsky Smash" - description = "Drink this and prepare for the LAW." + description = "A drink for those who pick fights with automated security." color = "#664300" // rgb: 102, 67, 0 boozepwr = 60 //THE FIST OF THE LAW IS STRONG AND HARD quality = DRINK_GOOD metabolization_rate = 0.5 - taste_description = "JUSTICE" + taste_description = "electrified justice" glass_icon_state = "beepskysmashglass" glass_name = "Beepsky Smash" - glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." + glass_desc = "Heavy, hot and strong. Just like the sting of a stunbaton." overdose_threshold = 40 var/datum/brain_trauma/special/beepsky/B @@ -700,26 +700,26 @@ All effects don't start immediately, but rather get worse over time; the rate is M.gain_trauma(/datum/brain_trauma/mild/phobia/security, TRAUMA_RESILIENCE_BASIC) /datum/reagent/consumable/ethanol/irish_cream - name = "Irish Cream" - description = "Whiskey-imbued cream, what else would you expect from the Irish?" + name = "Zohil Cream" + description = "Whiskey-imbued cream." color = "#664300" // rgb: 102, 67, 0 boozepwr = 50 quality = DRINK_NICE taste_description = "creamy alcohol" glass_icon_state = "irishcreamglass" - glass_name = "Irish Cream" - glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" + glass_name = "Zohil Cream" + glass_desc = "Cream mixed with whiskey. Don't expect to learn anything about the Blueflame from just a drink, though." /datum/reagent/consumable/ethanol/manly_dorf - name = "The Manly Dorf" - description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." + name = "The Shortstop" + description = "Beer and ale, brought together in a very grain-flavored mix." color = "#664300" // rgb: 102, 67, 0 boozepwr = 100 //For the manly only quality = DRINK_NICE - taste_description = "hair on your chest and your chin" + taste_description = "fire in your chest and windburn on your chin" glass_icon_state = "manlydorfglass" - glass_name = "The Manly Dorf" - glass_desc = "A manly concoction made from Ale and Beer. Intended for true men only." + glass_name = "The Shortstop" + glass_desc = "A concoction made from ale and beer. Named after a joke that only short people would order this to prove a point." var/dorf_mode /datum/reagent/consumable/ethanol/manly_dorf/on_mob_metabolize(mob/living/carbon/human/badlands_chugs) @@ -742,14 +742,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/longislandicedtea name = "Long Island Iced Tea" - description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." + description = "The entire liquor cabinet brought together with enough sugar to hide it." color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 quality = DRINK_VERYGOOD taste_description = "a mixture of cola and alcohol" glass_icon_state = "longislandicedteaglass" glass_name = "Long Island Iced Tea" - glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." + glass_desc = "The entire liquor cabinet brought together with enough sugar to hide it." /datum/reagent/consumable/ethanol/moonshine @@ -763,103 +763,86 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." /datum/reagent/consumable/ethanol/b52 - name = "B-52" - description = "Coffee, Irish Cream, and cognac. You will get bombed." + name = "AM-G" + description = "Coffee liquor, Zohil Cream, and cognac." color = "#664300" // rgb: 102, 67, 0 boozepwr = 85 quality = DRINK_GOOD - taste_description = "angry and irish" + taste_description = "angry and intense" glass_icon_state = "b52glass" - glass_name = "B-52" - glass_desc = "Kahlua, Irish Cream, and cognac. You will get bombed." + glass_name = "AM-G" + glass_desc = "Coffee liquor, Zohil Cream, and cognac. Enough to make you hide before the blast." shot_glass_icon_state = "b52glass" /datum/reagent/consumable/ethanol/b52/on_mob_metabolize(mob/living/M) playsound(M, 'sound/effects/explosion_distant.ogg', 100, FALSE) /datum/reagent/consumable/ethanol/irishcoffee - name = "Irish Coffee" - description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." + name = "Gezenan Coffee" + description = "Coffee, and alcohol. Traditionally enjoyed in the morning on lazy days." color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 quality = DRINK_NICE taste_description = "giving up on the day" glass_icon_state = "irishcoffeeglass" - glass_name = "Irish Coffee" - glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." + glass_name = "Gezenan Coffee" + glass_desc = "Coffee and alcohol. Traditionally enjoyed in the morning on lazy days." /datum/reagent/consumable/ethanol/margarita name = "Margarita" - description = "On the rocks with salt on the rim. Arriba~!" + description = "A fruity, tropical drink with a salted rim around the glass." color = "#8CFF8C" // rgb: 140, 255, 140 boozepwr = 35 quality = DRINK_NICE taste_description = "dry and salty" glass_icon_state = "margaritaglass" glass_name = "Margarita" - glass_desc = "On the rocks with salt on the rim. Arriba~!" + glass_desc = "On the rocks with salt on the rim. Apparently the name meant something in a language long lost on Earth." /datum/reagent/consumable/ethanol/black_russian - name = "Black Russian" - description = "For the lactose-intolerant. Still as classy as a White Russian." + name = "Black Rachnid" + description = "An alternative take to the White Gezenan. Doubles as an option for those who can't handle lactose." color = "#360000" // rgb: 54, 0, 0 boozepwr = 70 quality = DRINK_NICE taste_description = "bitterness" glass_icon_state = "blackrussianglass" - glass_name = "Black Russian" - glass_desc = "For the lactose-intolerant. Still as classy as a White Russian." + glass_name = "Black Rachnid" + glass_desc = "An alternative take to the White Gezenan. Doubles as an option for those who can't handle lactose." /datum/reagent/consumable/ethanol/manhattan - name = "Manhattan" - description = "The Detective's undercover drink of choice. He never could stomach gin..." + name = "Twelve Crossings" + description = "A mixed drink popularized by a murder mystery book series from Teceti." color = "#664300" // rgb: 102, 67, 0 boozepwr = 30 quality = DRINK_NICE taste_description = "mild dryness" glass_icon_state = "manhattanglass" - glass_name = "Manhattan" - glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..." - - -/datum/reagent/consumable/ethanol/manhattan_proj - name = "Manhattan Project" - description = "A scientist's drink of choice, for pondering ways to blow up the sector." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 45 - quality = DRINK_VERYGOOD - taste_description = "death, the destroyer of worlds" - glass_icon_state = "proj_manhattanglass" - glass_name = "Manhattan Project" - glass_desc = "A scientist's drink of choice, for thinking how to blow up the sector." - - -/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/M) - M.set_drugginess(30) - return ..() + glass_name = "Twelve Crossings" + glass_desc = "A mixed drink popularized by a murder mystery book series from Teceti. The Detective's undercover drink of choice. He never could stomach gin..." /datum/reagent/consumable/ethanol/whiskeysoda name = "Whiskey Soda" - description = "For the more refined griffon." + description = "Whiskey and soda water, a simple mixed drink." color = "#664300" // rgb: 102, 67, 0 boozepwr = 70 quality = DRINK_NICE taste_description = "soda" glass_icon_state = "whiskeysodaglass2" glass_name = "whiskey soda" - glass_desc = "Ultimate refreshment." + glass_desc = "Bitter and refreshing." /datum/reagent/consumable/ethanol/antifreeze name = "Anti-freeze" - description = "The ultimate refreshment. Not what it sounds like." + description = "The ultimate refreshment. Not actually made of antifreeze!" color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 quality = DRINK_NICE - taste_description = "Jack Frost's piss" + taste_description = "frigid heat" glass_icon_state = "antifreeze" glass_name = "Anti-freeze" - glass_desc = "The ultimate refreshment." + glass_desc = "Vodka, cream, and ice. No actual antifreeze included, of course." /datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal() + 20) //310.15 is the normal bodytemp. @@ -867,14 +850,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/barefoot name = "Barefoot" - description = "Barefoot and pregnant." + description = "To be enjoyed on the beach or by a pool. You should keep your shoes on, though." color = "#664300" // rgb: 102, 67, 0 boozepwr = 45 quality = DRINK_VERYGOOD taste_description = "creamy berries" glass_icon_state = "b&p" glass_name = "Barefoot" - glass_desc = "Barefoot and pregnant." + glass_desc = "To be enjoyed on the beach or by a pool. You should keep your shoes on, though." /datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/M) if(ishuman(M)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes. @@ -893,40 +876,40 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "refreshing cold" glass_icon_state = "snowwhite" glass_name = "Snow White" - glass_desc = "A cold refreshment." + glass_desc = "A cold refreshment of beer and lemon-lime soda. Not exactly princess material, is it?" /datum/reagent/consumable/ethanol/demonsblood //Prevents the imbiber from being dragged into a pool of blood by a slaughter demon. name = "Demon's Blood" - description = "AHHHH!!!!" + description = "A mix of two sodas, rum, and... real blood." color = "#820000" // rgb: 130, 0, 0 boozepwr = 75 quality = DRINK_VERYGOOD taste_description = "sweet tasting iron" glass_icon_state = "demonsblood" - glass_name = "Demons Blood" - glass_desc = "Just looking at this thing makes the hair at the back of your neck stand up." + glass_name = "Demon's Blood" + glass_desc = "A drink made with the blood of the server or the patron, which usually results in said patron being thrown out. While most substitute real blood for a saline solution, that drink is actually referred to as 'Demon's Sweat'." /datum/reagent/consumable/ethanol/devilskiss //If eaten by a slaughter demon, the demon will regret it. name = "Devil's Kiss" - description = "Creepy time!" + description = "Asking for a kiss to go with the blood drawing is pushing it." color = "#A68310" // rgb: 166, 131, 16 boozepwr = 70 quality = DRINK_VERYGOOD taste_description = "bitter iron" glass_icon_state = "devilskiss" - glass_name = "Devils Kiss" - glass_desc = "Creepy time!" + glass_name = "Devil's Kiss" + glass_desc = "The boozier cousin of the Demon's Blood. Typically served in a glass shaped to specifically cut and draw blood from the patron's lip... which deters most." /datum/reagent/consumable/ethanol/vodkatonic name = "Vodka and Tonic" - description = "For when a gin and tonic isn't Russian enough." + description = "The stronger sibling of the Gin and Tonic." color = "#0064C8" // rgb: 0, 100, 200 boozepwr = 70 quality = DRINK_NICE taste_description = "tart bitterness" glass_icon_state = "vodkatonicglass" - glass_name = "vodka and tonic" - glass_desc = "For when a gin and tonic isn't Russian enough." + glass_name = "Vodka and Tonic" + glass_desc = "The stronger sibling of the Gin and Tonic." /datum/reagent/consumable/ethanol/ginfizz @@ -943,55 +926,55 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/bahama_mama name = "Bahama Mama" - description = "A tropical cocktail with a complex blend of flavors." + description = "A tropical cocktail with a complex blend of fruity flavors." color = "#FF7F3B" // rgb: 255, 127, 59 boozepwr = 35 quality = DRINK_GOOD taste_description = "pineapple, coconut, and a hint of coffee" glass_icon_state = "bahama_mama" glass_name = "Bahama Mama" - glass_desc = "A tropical cocktail with a complex blend of flavors." + glass_desc = "A tropical cocktail with a complex blend of fruity flavors. It makes you think about going on vacation someday..." /datum/reagent/consumable/ethanol/singulo name = "Singulo" - description = "A blue-space beverage!" + description = "Named after a tragic industrial accident!" color = "#2E6671" // rgb: 46, 102, 113 boozepwr = 35 quality = DRINK_VERYGOOD taste_description = "concentrated matter" glass_icon_state = "singulo" glass_name = "Singulo" - glass_desc = "A blue-space beverage." + glass_desc = "Named after a tragic industrial accident involving a singularity escaping containment. This drink doesn't taste particularly commemorative - it's too enjoyable!" /datum/reagent/consumable/ethanol/sbiten name = "Sbiten" - description = "A spicy Vodka! Might be a little hot for the little guys!" + description = "Vodka with capsaicin for the extra feeling of intense warmth." color = "#664300" // rgb: 102, 67, 0 boozepwr = 70 quality = DRINK_GOOD taste_description = "hot and spice" glass_icon_state = "sbitenglass" glass_name = "Sbiten" - glass_desc = "A spicy mix of Vodka and Spice. Very hot." + glass_desc = "Vodka with capsaicin for the extra feeling of intense warmth. Difficult to take large swallows." /datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(50 * TEMPERATURE_DAMAGE_COEFFICIENT, 0 , M.dna.species.bodytemp_heat_damage_limit) //310.15 is the normal bodytemp. return ..() /datum/reagent/consumable/ethanol/red_mead - name = "Red Mead" - description = "The true Viking drink! Even though it has a strange red color." + name = "Drop-pod" + description = "A commemorative drink, made in the name of those who died during failed orbital drop-pod landings." color = "#C73C00" // rgb: 199, 60, 0 boozepwr = 31 //Red drinks are stronger quality = DRINK_GOOD taste_description = "sweet and salty alcohol" glass_icon_state = "red_meadglass" - glass_name = "Red Mead" - glass_desc = "A true Viking's beverage, made with the blood of their enemies." + glass_name = "Drop-pod" + glass_desc = "A commemorative drink, made in the name of those who died during failed orbital drop-pod landings. Technically intended to use the blood of your enemies, but..." /datum/reagent/consumable/ethanol/mead name = "Mead" - description = "A Viking drink, though a cheap one." + description = "Fermented honey. The gentler sibling to the beer." color = "#664300" // rgb: 102, 67, 0 nutriment_factor = 1 * REAGENTS_METABOLISM boozepwr = 30 @@ -999,17 +982,17 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "sweet, sweet alcohol" glass_icon_state = "meadglass" glass_name = "Mead" - glass_desc = "A drink from Valhalla." + glass_desc = "Fermented honey. The gentler sibling to the beer - and almost just as old." /datum/reagent/consumable/ethanol/iced_beer - name = "Iced Beer" - description = "A beer which is so cold the air around it freezes." + name = "Iced beer" + description = "Iced beer, served in a chilled glass." color = "#664300" // rgb: 102, 67, 0 boozepwr = 15 taste_description = "refreshingly cold" glass_icon_state = "iced_beerglass" glass_name = "iced beer" - glass_desc = "A beer so frosty, the air around it freezes." + glass_desc = "Iced beer, served in a chilled glass. It's cold enough to leave a trail in the air." /datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C) //310.15 is the normal bodytemp. @@ -1017,25 +1000,25 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/grog name = "Grog" - description = "Watered-down rum, Nanotrasen approves!" + description = "Watered-down rum, to really stretch out your alcohol rations. A Belter classic." color = "#664300" // rgb: 102, 67, 0 boozepwr = 1 //Basically nothing taste_description = "a poor excuse for alcohol" glass_icon_state = "grogglass" glass_name = "Grog" - glass_desc = "A fine and cepa drink for Space." + glass_desc = "Watered-down rum, to really stretch out your alcohol rations. A Belter classic." /datum/reagent/consumable/ethanol/aloe name = "Aloe" - description = "So very, very, very good." + description = "Zohil Cream and watermelon juice. Mellows out the alcoholic bite for a mild drink." color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 quality = DRINK_VERYGOOD taste_description = "sweet 'n creamy" glass_icon_state = "aloe" glass_name = "Aloe" - glass_desc = "Very, very, very good." + glass_desc = "Zohil Cream and watermelon juice. Mellows out the alcoholic bite for a mild drink." /datum/reagent/consumable/ethanol/andalusia name = "Andalusia" @@ -1046,51 +1029,51 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "lemons" glass_icon_state = "andalusia" glass_name = "Andalusia" - glass_desc = "A nice, strangely named drink." + glass_desc = "A nice, strangely named drink. Theoretically named after a particular region on Terra, but no one's quite sure where." /datum/reagent/consumable/ethanol/alliescocktail - name = "Allies Cocktail" - description = "A drink made from your allies. Not as sweet as those made from your enemies." + name = "Canton Cocktail" + description = "A drink intended to be shared across the Solarian cantons." color = "#664300" // rgb: 102, 67, 0 boozepwr = 45 quality = DRINK_NICE taste_description = "bitter yet free" glass_icon_state = "alliescocktail" - glass_name = "Allies cocktail" - glass_desc = "A drink made from your allies." + glass_name = "Canton cocktail" + glass_desc = "A drink intended to be shared across the Solarian cantons." /datum/reagent/consumable/ethanol/acid_spit - name = "Acid Spit" - description = "A drink for the daring, can be deadly if incorrectly prepared!" + name = "Cracked Moon" + description = "Typically made on a dare by CLIP-BARD crews. It's deadly if incorrectly prepared!" color = "#365000" // rgb: 54, 80, 0 boozepwr = 70 quality = DRINK_VERYGOOD - taste_description = "stomach acid" + taste_description = "alien stomach acid" glass_icon_state = "acidspitglass" - glass_name = "Acid Spit" - glass_desc = "A drink from Nanotrasen. Made from live aliens." + glass_name = "Cracked Moon" + glass_desc = "Typically made on a dare by CLIP-BARD crews. It's deadly if incorrectly prepared!" /datum/reagent/consumable/ethanol/amasec - name = "Amasec" - description = "Official drink of the Nanotrasen Gun-Club!" + name = "Ren Kirsi" + description = "A Teceian drink mainly enjoyed on The Ring and it's sibling colonies." color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 quality = DRINK_GOOD taste_description = "dark and metallic" glass_icon_state = "amasecglass" - glass_name = "Amasec" - glass_desc = "Always handy before COMBAT!!!" + glass_name = "Ren Kirsi" + glass_desc = "There's no way you're getting your hands on metal shavings from The Ring itself, but it's the thought that counts." /datum/reagent/consumable/ethanol/changelingsting name = "Changeling Sting" - description = "You take a tiny sip and feel a burning sensation..." + description = "Made by the superstitous. Keeps the changelings away... whereever they may be." color = "#2E6671" // rgb: 46, 102, 113 boozepwr = 50 quality = DRINK_GOOD taste_description = "your brain coming out your nose" glass_icon_state = "changelingsting" glass_name = "Changeling Sting" - glass_desc = "A stingy drink." + glass_desc = "Made by the superstitous. Keeps the changelings away... whereever they may be." /datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/M) if(M.mind) //Changeling Sting assists in the recharging of changeling chemicals. @@ -1101,26 +1084,26 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() /datum/reagent/consumable/ethanol/irishcarbomb - name = "Irish Car Bomb" - description = "Mmm, tastes like the free Irish state." + name = "Lightspeed" + description = "A shot of Zohil cream in a pinch of ale, meant to be downed in one chug - hits you as fast as the name." color = "#2E6671" // rgb: 46, 102, 113 boozepwr = 25 quality = DRINK_GOOD - taste_description = "the spirit of Ireland" + taste_description = "the rush of hyperspace" glass_icon_state = "irishcarbomb" - glass_name = "Irish Car Bomb" - glass_desc = "An Irish car bomb." + glass_name = "Lightspeed" + glass_desc = "A shot of Zohil cream in a pinch of ale, meant to be downed in one chug - hits you as fast as the name." /datum/reagent/consumable/ethanol/syndicatebomb - name = "Syndicate Bomb" - description = "Tastes like terrorism!" + name = "Gorlex Surprise" + description = "Infamously named after the accusations of Syndicate-led bombings of space installations. It's a blast!" color = "#2E6671" // rgb: 46, 102, 113 boozepwr = 90 quality = DRINK_GOOD - taste_description = "purified antagonism" + taste_description = "anti-Nanotrasen sentiments" glass_icon_state = "syndicatebomb" - glass_name = "Syndicate Bomb" - glass_desc = "A syndicate bomb." + glass_name = "Gorlex Surprise" + glass_desc = "Infamously named after the accusations of Syndicate-led bombings of space installations. It's a blast!" /datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/M) if(prob(5)) @@ -1128,50 +1111,50 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() /datum/reagent/consumable/ethanol/hiveminderaser - name = "Hivemind Eraser" + name = "Hivemind" description = "A vessel of pure flavor." color = "#FF80FC" // rgb: 255, 128, 252 boozepwr = 40 quality = DRINK_GOOD taste_description = "psychic links" glass_icon_state = "hiveminderaser" - glass_name = "Hivemind Eraser" - glass_desc = "For when even mindshields can't save you." + glass_name = "Hivemind" + glass_desc = "A legend around this drink states that drinking this at the same time as someone else links your mind with theirs. Are you going to find out?" /datum/reagent/consumable/ethanol/erikasurprise - name = "Erika Surprise" - description = "The surprise is, it's green!" + name = "Terraformer Surprise" + description = "It's as green as the first terraforming experiments, allegedly." color = "#2E6671" // rgb: 46, 102, 113 boozepwr = 35 quality = DRINK_VERYGOOD taste_description = "tartness and bananas" glass_icon_state = "erikasurprise" - glass_name = "Erika Surprise" - glass_desc = "The surprise is, it's green!" + glass_name = "Terraformer Surprise" + glass_desc = "It's as green as the first terraforming experiments, allegedly." /datum/reagent/consumable/ethanol/driestmartini - name = "Driest Martini" - description = "Only for the experienced. You think you see sand floating in the glass." + name = "Saltflat" + description = "Nigh-dehydratingly dry. Intended to be a challenge." nutriment_factor = 1 * REAGENTS_METABOLISM color = "#2E6671" // rgb: 46, 102, 113 boozepwr = 65 quality = DRINK_GOOD taste_description = "a beach" glass_icon_state = "driestmartiniglass" - glass_name = "Driest Martini" - glass_desc = "Only for the experienced. You think you see sand floating in the glass." + glass_name = "Saltflat" + glass_desc = "Nigh-dehydratingly dry. Intended to be a challenge." /datum/reagent/consumable/ethanol/bananahonk - name = "Banana Honk" - description = "A drink from Clown Heaven." + name = "Creamtruck" + description = "A distinctly non-kid friendly equivalent to the ice cream truck." nutriment_factor = 1 * REAGENTS_METABOLISM color = "#FFFF91" // rgb: 255, 255, 140 boozepwr = 60 quality = DRINK_GOOD - taste_description = "a bad joke" + taste_description = "bananas and cream" glass_icon_state = "bananahonkglass" - glass_name = "Banana Honk" - glass_desc = "A drink from Clown Heaven." + glass_name = "Creamtruck" + glass_desc = "A distinctly non-kid friendly equivalent to the ice cream truck." /datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/M) if((ishuman(M) && M.job == "Clown") || ismonkey(M)) @@ -1180,16 +1163,16 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() || . /datum/reagent/consumable/ethanol/silencer - name = "Silencer" - description = "A drink from Mime Heaven." + name = "Choker" + description = "It takes a moment of quiet to really appreciate some drinks - this one doesn't give you the illusion of choice." nutriment_factor = 1 * REAGENTS_METABOLISM color = "#664300" // rgb: 102, 67, 0 - boozepwr = 59 //Proof that clowns are better than mimes right here + boozepwr = 59 quality = DRINK_GOOD - taste_description = "a pencil eraser" + taste_description = "peace and quiet" glass_icon_state = "silencerglass" - glass_name = "Silencer" - glass_desc = "A drink from Mime Heaven." + glass_name = "Choker" + glass_desc = "It takes a moment of quiet to really appreciate some drinks - this one doesn't give you the illusion of choice." /datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/M) if(ishuman(M) && M.mind?.miming) @@ -1200,18 +1183,18 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/drunkenblumpkin name = "Drunken Blumpkin" - description = "A weird mix of whiskey and blumpkin juice." + description = "A weird mix of whiskey and... chlorine-pumpkin juice?" color = "#1EA0FF" // rgb: 102, 67, 0 boozepwr = 50 quality = DRINK_VERYGOOD taste_description = "molasses and a mouthful of pool water" glass_icon_state = "drunkenblumpkin" glass_name = "Drunken Blumpkin" - glass_desc = "A drink for the drunks." + glass_desc = "A drink for the confused hydropon worker." /datum/reagent/consumable/ethanol/whiskey_sour //Requested since we had whiskey cola and soda but not sour. name = "Whiskey Sour" - description = "Lemon juice/whiskey/sugar mixture. Moderate alcohol content." + description = "A mix of lemon juice, whiskey, and sugar." color = rgb(255, 201, 49) boozepwr = 35 quality = DRINK_GOOD @@ -1222,35 +1205,16 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/hcider name = "Hard Cider" - description = "Apple juice, for adults." + description = "The alcoholic sibling to apple cider." color = "#CD6839" nutriment_factor = 1 * REAGENTS_METABOLISM boozepwr = 25 taste_description = "the season that falls between summer and winter" glass_icon_state = "whiskeyglass" glass_name = "hard cider" - glass_desc = "Tastes like autumn... no wait, fall!" + glass_desc = "Sharper tasting, alcoholic apple cider." shot_glass_icon_state = "shotglassbrown" - -/datum/reagent/consumable/ethanol/fetching_fizz //A reference to one of my favorite games of all time. Pulls nearby ores to the imbiber! - name = "Fetching Fizz" - description = "Whiskey sour/iron/uranium mixture resulting in a highly magnetic slurry. Mild alcohol content." //Requires no alcohol to make but has alcohol anyway because ~magic~ - color = rgb(255, 91, 15) - boozepwr = 10 - quality = DRINK_VERYGOOD - metabolization_rate = 0.1 * REAGENTS_METABOLISM - taste_description = "charged metal" // the same as teslium, honk honk. - glass_icon_state = "fetching_fizz" - glass_name = "Fetching Fizz" - glass_desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste." - - -/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/M) - for(var/obj/item/stack/ore/O in orange(3, M)) - step_towards(O, get_turf(M)) - return ..() - //Another reference. Heals those in critical condition extremely quickly. /datum/reagent/consumable/ethanol/hearty_punch name = "Hearty Punch" @@ -1262,7 +1226,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "bravado in the face of disaster" glass_icon_state = "hearty_punch" glass_name = "Hearty Punch" - glass_desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead." + glass_desc = "An aromatic beverage, served piping hot. According to folktales, it can almost wake the dead." /datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/M) if(M.health <= 0) @@ -1295,7 +1259,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "da bomb" glass_icon_state = "atomicbombglass" glass_name = "Atomic Bomb" - glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing." + glass_desc = "Devastating to you and everyone around you, especially if you get drunk enough from it." /datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/M) M.set_drugginess(50) @@ -1353,7 +1317,7 @@ All effects don't start immediately, but rather get worse over time; the rate is metabolization_rate = 1 * REAGENTS_METABOLISM glass_icon_state = "neurotoxinglass" glass_name = "Neurotoxin" - glass_desc = "A drink that is guaranteed to knock you silly." + glass_desc = "The story goes that this drink was made on a bet between Cybersun chemists, debating if a drink could be used to put down a suspected Nanotrasen spy. While morphine wasn't supposed to be used, it put them down all the same." /datum/reagent/consumable/ethanol/neurotoxin/proc/pickt() return (pick(TRAIT_PARALYSIS_L_ARM,TRAIT_PARALYSIS_R_ARM,TRAIT_PARALYSIS_R_LEG,TRAIT_PARALYSIS_L_LEG)) @@ -1365,7 +1329,7 @@ All effects don't start immediately, but rather get worse over time; the rate is if(prob(20)) M.adjustStaminaLoss(10) M.drop_all_held_items() - to_chat(M, "You cant feel your hands!") + to_chat(M, "You can't feel your hands!") if(current_cycle > 5) if(prob(20)) var/t = pickt() @@ -1390,17 +1354,17 @@ All effects don't start immediately, but rather get worse over time; the rate is ..() /datum/reagent/consumable/ethanol/hippies_delight - name = "Hippie's Delight" - description = "You just don't get it maaaan." + name = "Between the Mandibles" + description = "Mushroom-supplied hallucinogens and strong alcohol." color = "#664300" // rgb: 102, 67, 0 nutriment_factor = 0 boozepwr = 0 //custom drunk effect quality = DRINK_FANTASTIC metabolization_rate = 0.2 * REAGENTS_METABOLISM - taste_description = "giving peace a chance" + taste_description = "two finger-sized bites on your tongue" glass_icon_state = "hippiesdelightglass" - glass_name = "Hippie's Delight" - glass_desc = "A drink enjoyed by people during the 1960's." + glass_name = "Between the Mandibles" + glass_desc = "Named after a request from a clueless spacer who asked for Rachnid venom to be mixed in a house special. While Rachnids don't have venom glands, this'll have you reeling all the same." /datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/M) if (!M.slurring) @@ -1436,7 +1400,7 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/eggnog name = "Eggnog" - description = "For enjoying the most wonderful time of the year." + description = "For enjoying the Winter Solstice." color = "#fcfdc6" // rgb: 252, 253, 198 nutriment_factor = 2 * REAGENTS_METABOLISM boozepwr = 1 @@ -1444,34 +1408,17 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "custard and alcohol" glass_icon_state = "glass_yellow" glass_name = "eggnog" - glass_desc = "For enjoying the most wonderful time of the year." - - -/datum/reagent/consumable/ethanol/narsour - name = "Nar'Sour" - description = "Side effects include self-mutilation and hoarding plasteel." - color = RUNE_COLOR_DARKRED - boozepwr = 10 - quality = DRINK_FANTASTIC - taste_description = "bloody" - glass_icon_state = "narsour" - glass_name = "Nar'Sour" - glass_desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!" - -/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/M) - M.cultslurring = min(M.cultslurring + 3, 3) - M.stuttering = min(M.stuttering + 3, 3) - ..() + glass_desc = "For enjoying the Winter Solstice." /datum/reagent/consumable/ethanol/triple_sec name = "Triple Sec" description = "A sweet and vibrant orange liqueur." color = "#ffcc66" boozepwr = 30 - taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of the caribbean" + taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of distant shores" glass_icon_state = "glass_orange" glass_name = "Triple Sec" - glass_desc = "A glass of straight Triple Sec." + glass_desc = "A glass of straight triple sec. Citrusy and warm." /datum/reagent/consumable/ethanol/creme_de_menthe name = "Creme de Menthe" @@ -1481,17 +1428,17 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "a minty, cool, and invigorating splash of cold streamwater" glass_icon_state = "glass_green" glass_name = "Creme de Menthe" - glass_desc = "You can almost feel the first breath of spring just looking at it." + glass_desc = "Bright green and minty - enough to tell you what it's going to taste like." /datum/reagent/consumable/ethanol/creme_de_cacao name = "Creme de Cacao" - description = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities." + description = "A chocolatey liqueur excellent for adding dessert notes to beverages." color = "#996633" boozepwr = 20 taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol" glass_icon_state = "glass_brown" glass_name = "Creme de Cacao" - glass_desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient." + glass_desc = "Creme de Cacao - chocolate-wine, essentially. Not milk chocolate, so expect some bite." /datum/reagent/consumable/ethanol/creme_de_coconut name = "Creme de Coconut" @@ -1501,7 +1448,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "a sweet milky flavor with notes of toasted sugar" glass_icon_state = "glass_white" glass_name = "Creme de Coconut" - glass_desc = "An unintimidating glass of coconut liqueur." + glass_desc = "A white glass of coconut liqueur." /datum/reagent/consumable/ethanol/quadruple_sec name = "Quadruple Sec" @@ -1509,10 +1456,10 @@ All effects don't start immediately, but rather get worse over time; the rate is color = "#cc0000" boozepwr = 35 quality = DRINK_GOOD - taste_description = "an invigorating bitter freshness which suffuses your being; no enemy of the corporation will go unrobusted this day" + taste_description = "an invigorating bitter freshness which suffuses your being; you can take on anyone who messes with your vessel" glass_icon_state = "quadruple_sec" glass_name = "Quadruple Sec" - glass_desc = "An intimidating and lawful beverage dares you to violate the law and make its day. Still can't drink it on duty, though." + glass_desc = "A glass of Quadruple Sec. Popularized for being a mixed drink of choice across multiple independent security agencies, and notably among Nanotrasen's internal security culture. It's not recommended to drink while manning a vessel, though!" /datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/M) //Securidrink in line with the Screwdriver for engineers or Nothing for mimes @@ -1524,14 +1471,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/quintuple_sec name = "Quintuple Sec" - description = "Law, Order, Alcohol, and Police Brutality distilled into one single elixir of JUSTICE." + description = "Law, order and alcohol distilled into one single elixir." color = "#ff3300" boozepwr = 55 quality = DRINK_FANTASTIC - taste_description = "THE LAW" + taste_description = "drinking on duty" glass_icon_state = "quintuple_sec" glass_name = "Quintuple Sec" - glass_desc = "Now you are become law, destroyer of clowns." + glass_desc = "The logical endpoint of the Quadruple Sec. Often had in the hands of senior security staff, though you really should not be drinking this while on-duty." /datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/M) //Securidrink in line with the Screwdriver for engineers or Nothing for mimes but STRONG.. @@ -1546,14 +1493,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/grasshopper name = "Grasshopper" - description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this." + description = "A fresh and sweet dessert shooter." color = "#00ff00" boozepwr = 25 quality = DRINK_GOOD taste_description = "chocolate and mint dancing around your mouth" glass_icon_state = "grasshopper" glass_name = "Grasshopper" - glass_desc = "You weren't aware edible beverages could be that green." + glass_desc = "Named after a particularly green insect. Theoretically, there's always adding vodka to this and making it a Flying Grasshopper..." /datum/reagent/consumable/ethanol/stinger name = "Stinger" @@ -1564,7 +1511,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "a slap on the face in the best possible way" glass_icon_state = "stinger" glass_name = "Stinger" - glass_desc = "You wonder what would happen if you pointed this at a heat source..." + glass_desc = "A brandy-and-menthe mixed drink to end the day with. While often found in the hands of the upper class, there's nothing wrong with feeling a little fancy." /datum/reagent/consumable/ethanol/bastion_bourbon name = "Bastion Bourbon" @@ -1664,13 +1611,13 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/sake name = "Sake" - description = "A sweet rice wine of questionable legality and extreme potency." + description = "A sweet rice wine." color = "#DDDDDD" boozepwr = 70 taste_description = "sweet rice wine" glass_icon_state = "sakecup" glass_name = "cup of sake" - glass_desc = "A traditional cup of sake." + glass_desc = "A cup of sake. Capable of being served hot, cold, or at room temperature, and served in a traditionally-sized little cup." /datum/reagent/consumable/ethanol/peppermint_patty name = "Peppermint Patty" @@ -1681,7 +1628,7 @@ All effects don't start immediately, but rather get worse over time; the rate is quality = DRINK_GOOD glass_icon_state = "peppermint_patty" glass_name = "Peppermint Patty" - glass_desc = "A boozy minty hot cocoa that warms your belly on a cold night." + glass_desc = "A boozy, minty hot cocoa that warms your belly on a cold night." /datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/M) M.apply_status_effect(/datum/status_effect/throat_soothed) @@ -1689,15 +1636,15 @@ All effects don't start immediately, but rather get worse over time; the rate is ..() /datum/reagent/consumable/ethanol/alexander - name = "Alexander" - description = "Named after a Greek hero, this mix is said to embolden a user's shield as if they were in a phalanx." + name = "Ash-Shield" + description = "While not a traditional trickwine by any means, this mix is said to embolden a user's shield under certain circumstance." color = "#F5E9D3" boozepwr = 50 quality = DRINK_GOOD taste_description = "bitter, creamy cacao" glass_icon_state = "alexander" - glass_name = "Alexander" - glass_desc = "A creamy, indulgent delight that is stronger than it seems." + glass_name = "Ash-Shield" + glass_desc = "While not a traditional trickwine by any means (and considered in poor taste in mixing), this drink is said to embolden the shield in the imbiber's hand. Just don't let it engender passivity." var/obj/item/shield/mighty_shield /datum/reagent/consumable/ethanol/alexander/on_mob_metabolize(mob/living/L) @@ -1721,37 +1668,37 @@ All effects don't start immediately, but rather get worse over time; the rate is ..() /datum/reagent/consumable/ethanol/amaretto_alexander - name = "Amaretto Alexander" - description = "A weaker version of the Alexander, what it lacks in strength it makes up for in flavor." + name = "Happy Huntsman" + description = "A cousin of the Ash-Shield, what it lacks in strength (and mysterious power), it makes up for in flavor." color = "#DBD5AE" boozepwr = 35 quality = DRINK_VERYGOOD taste_description = "sweet, creamy cacao" glass_icon_state = "alexanderam" - glass_name = "Amaretto Alexander" - glass_desc = "A creamy, indulgent delight that is in fact as gentle as it seems." + glass_name = "Happy Huntsman" + glass_desc = "A gentle, creamy drink, enjoyed on rare occasions by the Saint Roumain's followers." /datum/reagent/consumable/ethanol/sidecar - name = "Sidecar" - description = "The one ride you'll gladly give up the wheel for." + name = "Bridge Bunny" + description = "You're happy to not pilot the ship after having one of these." color = "#FFC55B" boozepwr = 45 quality = DRINK_GOOD taste_description = "delicious freedom" glass_icon_state = "sidecar" - glass_name = "Sidecar" - glass_desc = "The one ride you'll gladly give up the wheel for." + glass_name = "Bridge Bunny" + glass_desc = "You're happy to not pilot the ship after having one of these." /datum/reagent/consumable/ethanol/between_the_sheets name = "Between the Sheets" - description = "A provocatively named classic. Funny enough, doctors recommend drinking it before taking a nap." + description = "A provocatively named classic." color = "#F4C35A" boozepwr = 55 quality = DRINK_GOOD - taste_description = "seduction" + taste_description = "rum, lemons, and mild embarrassment" glass_icon_state = "between_the_sheets" glass_name = "Between the Sheets" - glass_desc = "The only drink that comes with a label reminding you of Nanotrasen's zero-tolerance promiscuity policy." + glass_desc = "Also known as The Maiden's Prayer, if you're not willing to say the original name aloud." /datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/L) ..() @@ -1767,15 +1714,15 @@ All effects don't start immediately, but rather get worse over time; the rate is L.adjustFireLoss(-0.2) /datum/reagent/consumable/ethanol/kamikaze - name = "Kamikaze" - description = "Divinely windy." + name = "Mothball" + description = "Vodka, triple sec, and lime juice. Moth dust not usually included." color = "#EEF191" boozepwr = 60 quality = DRINK_GOOD - taste_description = "divine windiness" + taste_description = "fluttery sour-sweetness" glass_icon_state = "kamikaze" - glass_name = "Kamikaze" - glass_desc = "Divinely windy." + glass_name = "Mothball" + glass_desc = "Made in an attempt to commemorate the supposed original place mothpeople were created in, though it was since disproven. While moth dust could be used as a garnish, don't go asking for it unless you are one." /datum/reagent/consumable/ethanol/mojito name = "Mojito" @@ -1789,15 +1736,15 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "A drink that looks as refreshing as it tastes." /datum/reagent/consumable/ethanol/moscow_mule - name = "Moscow Mule" - description = "A chilly drink that reminds you of the Derelict." + name = "Gorlex Gator" + description = "A chilly drink made in remembrance of Gorlex IV." color = "#EEF1AA" boozepwr = 30 quality = DRINK_GOOD taste_description = "refreshing spiciness" glass_icon_state = "moscow_mule" - glass_name = "Moscow Mule" - glass_desc = "A chilly drink that reminds you of the Derelict." + glass_name = "Gorlex Gator" + glass_desc = "A chilly drink made in remembrance of Gorlex IV. It's not a wise idea to go ordering this when the PGF are in town, though." /datum/reagent/consumable/ethanol/fernet name = "Fernet" @@ -1806,7 +1753,7 @@ All effects don't start immediately, but rather get worse over time; the rate is boozepwr = 80 taste_description = "utter bitterness" glass_name = "glass of fernet" - glass_desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum + glass_desc = "A glass of pure Fernet. Intensely bitter and reserved to being a digestive more than something to be enjoyed." //Hi Kevum /datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/M) if(M.nutrition <= NUTRITION_LEVEL_STARVING) @@ -1816,15 +1763,15 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() /datum/reagent/consumable/ethanol/fernet_cola - name = "Fernet Cola" + name = "Weldline" description = "A very popular and bittersweet digestif, ideal after a heavy meal. Best served on a sawed-off cola bottle as per tradition." color = "#390600" // rgb: 57, 6, boozepwr = 25 quality = DRINK_NICE taste_description = "sweet relief" glass_icon_state = "godlyblend" - glass_name = "glass of fernet cola" - glass_desc = "A sawed-off cola bottle filled with Fernet Cola. Nothing better after eating like a lardass." + glass_name = "glass of weldline" + glass_desc = "A shorn-off cola bottle filled with fernet and cola soft drink. A tradition among cargo workers and hull technicians is to use a welder to cut the cola can in half." /datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/M) if(M.nutrition <= NUTRITION_LEVEL_STARVING) @@ -1834,7 +1781,6 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() /datum/reagent/consumable/ethanol/fanciulli - name = "Fanciulli" description = "What if the Manhattan cocktail ACTUALLY used a bitter herb liquour? Helps you sober up." //also causes a bit of stamina damage to symbolize the afterdrink lazyness color = "#CA933F" // rgb: 202, 147, 63 @@ -1843,7 +1789,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "a sweet sobering mix" glass_icon_state = "fanciulli" glass_name = "glass of fanciulli" - glass_desc = "A glass of Fanciulli. It's just Manhattan with Fernet." + glass_desc = "A glass of Fanciulli: a Manhattan with fernet mixed in. Bitter enough to knock some sense into your drunk self." /datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/M) M.adjust_nutrition(-5) @@ -1858,15 +1804,15 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/branca_menta - name = "Branca Menta" + name = "Mirage" description = "A refreshing mixture of bitter Fernet with mint creme liquour." color = "#4B5746" // rgb: 75, 87, 70 boozepwr = 35 quality = DRINK_GOOD taste_description = "a bitter freshness" glass_icon_state= "minted_fernet" - glass_name = "glass of branca menta" - glass_desc = "A glass of Branca Menta, perfect for those lazy and hot Sunday summer afternoons." //Get lazy literally by drinking this + glass_name = "glass of Mirage" + glass_desc = "A glass of fernet and mint creme liquor, enjoyed on the warmer days on Teceti." //Get lazy literally by drinking this /datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/M) @@ -2014,7 +1960,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "auspicious occasions and bad decisions" glass_icon_state = "champagne_glass" glass_name = "Champagne" - glass_desc = "The flute clearly displays the slowly rising bubbles." + glass_desc = "A sparkling wine, traditionally served in a flute that clearly displays the slowly rising bubbles." /datum/reagent/consumable/ethanol/wizz_fizz @@ -2023,7 +1969,7 @@ All effects don't start immediately, but rather get worse over time; the rate is color = "#4235d0" //Just pretend that the triple-sec was blue curacao. boozepwr = 50 quality = DRINK_GOOD - taste_description = "friendship! It is magic, after all" + taste_description = "whimsy and carbonation" glass_icon_state = "wizz_fizz" glass_name = "Wizz Fizz" glass_desc = "The glass bubbles and froths with an almost magical intensity." @@ -2037,48 +1983,36 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() /datum/reagent/consumable/ethanol/bug_spray - name = "Bug Spray" + name = "Stunball" description = "A harsh, acrid, bitter drink, for those who need something to brace themselves." color = "#33ff33" boozepwr = 50 quality = DRINK_GOOD - taste_description = "the pain of ten thousand slain mosquitos" + taste_description = "the distinct sense of drinking diluted poison" glass_icon_state = "bug_spray" - glass_name = "Bug Spray" - glass_desc = "Your eyes begin to water as the sting of alcohol reaches them." - -/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/M) -//Bugs should not drink Bug spray. - if(ismoth(M) || isflyperson(M) || isspiderperson(M)) - M.adjustToxLoss(1,0) - return ..() -/datum/reagent/consumable/ethanol/bug_spray/on_mob_metabolize(mob/living/carbon/M) - - if(ismoth(M) || isflyperson(M)) - M.emote("scream") - return ..() - + glass_name = "Stunball" + glass_desc = "Made in protest of the Mothball mixed drink being recognized by the Interstellar Bartenders Association, who refute the idea of a singular point of origin. The taste is as spiteful as its history." /datum/reagent/consumable/ethanol/applejack name = "Applejack" - description = "The perfect beverage for when you feel the need to horse around." + description = "The officially sponsored drink by the National Association for Anti-Gravity Automobile Dragracing (NAAGAD)." color = "#ff6633" boozepwr = 20 - taste_description = "an honest day's work at the orchard" + taste_description = "resisting gravity through brandy" glass_icon_state = "applejack_glass" glass_name = "Applejack" - glass_desc = "You feel like you could drink this all neight." + glass_desc = "You lament you can't watch any Agrav Races while out here." /datum/reagent/consumable/ethanol/jack_rose - name = "Jack Rose" - description = "A light cocktail perfect for sipping with a slice of pie." + name = "Jackalope" + description = "A light cocktail named after a famous anti-gravity racer." color = "#ff6633" boozepwr = 15 quality = DRINK_NICE taste_description = "a sweet and sour slice of apple" glass_icon_state = "jack_rose" - glass_name = "Jack Rose" - glass_desc = "Enough of these, and you really will start to suppose your toeses are roses." + glass_name = "Jackalope" + glass_desc = "Enough of these, and you might feel like you're floating. Just don't think you can pilot!" /datum/reagent/consumable/ethanol/turbo name = "Turbo" @@ -2089,11 +2023,11 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "the outlaw spirit" glass_icon_state = "turbo" glass_name = "Turbo" - glass_desc = "A turbulent cocktail for outlaw hoverbikers." + glass_desc = "A turbulent cocktail for outlaw hoverbikers. Not officially recognized by National Association for Anti-Gravity Automobile Dragracing (NAAGAD)... but they're sticks in the mud, anyway!" /datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/M) if(prob(4)) - to_chat(M, "[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing..")]") + to_chat(M, "[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing...")]") M.adjustStaminaLoss(-M.drunkenness * 0.25) return ..() @@ -2106,7 +2040,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "simpler times" glass_icon_state = "old_timer" glass_name = "Old Timer" - glass_desc = "WARNING! May cause premature aging!" + glass_desc = "You might not be the target audience of this drink if you're still out in the Frontier, though." /datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/M) if(prob(20)) @@ -2119,9 +2053,6 @@ All effects don't start immediately, but rather get worse over time; the rate is N.update_hair() if(N.age > N.dna.species.species_age_max * 0.8) N.become_nearsighted(type) - if(N.gender == MALE) - N.facial_hairstyle = "Beard (Very Long)" - N.update_hair() if(N.age > N.dna.species.species_age_max * 1.2) //Best not let people get older than this or i might incur G-ds wrath M.visible_message("[M] becomes older than any man should be.. and crumbles into dust!") @@ -2135,42 +2066,42 @@ All effects don't start immediately, but rather get worse over time; the rate is color = "#ffe65b" boozepwr = 60 quality = DRINK_GOOD - taste_description = "artifical fruityness" + taste_description = "artifical fruitiness" glass_icon_state = "rubberneck" glass_name = "Rubberneck" - glass_desc = "A popular drink amongst those adhering to an all synthetic diet." + glass_desc = "A popular drink amongst those adhering to an all-synthetic diet, popularized briefly as a counterculture movement." /datum/reagent/consumable/ethanol/duplex - name = "Duplex" + name = "North-South" description = "An inseparable combination of two fruity drinks." color = "#50e5cf" boozepwr = 25 quality = DRINK_NICE taste_description = "green apples and blue raspberries" glass_icon_state = "duplex" - glass_name = "Duplex" - glass_desc = "To imbibe one component separately from the other is consider a great faux pas." + glass_name = "North-South" + glass_desc = "A fruity drink made, apparently, to represent North and South Teceti. You're supposed to hold it in a way that both vials pour together - one on top of the other." /datum/reagent/consumable/ethanol/trappist - name = "Trappist Beer" - description = "A strong dark ale brewed by space-monks." + name = "Trapper's Beer" + description = "A strong dark ale brewed by the Saint Roumain Militia." color = "#390c00" boozepwr = 40 quality = DRINK_VERYGOOD - taste_description = "dried plums and malt" + taste_description = "dried plums, ash, and malt" glass_icon_state = "trappistglass" - glass_name = "Trappist Beer" - glass_desc = "boozy Catholicism in a glass." + glass_name = "Trapper's Beer" + glass_desc = "The Ashen Huntsman's blessings, in a glass. Despite proclaiming an ascetic lifestyle, it's okay to have a little fun once in a while." /datum/reagent/consumable/ethanol/blazaam - name = "Blazaam" - description = "A strange drink that few people seem to remember existing. Doubles as a Berenstain remover." + name = "Hyperspace Highball" + description = "A strange drink mixed with bluespace crystal flakes, which is already extremely expensive on its own merit." boozepwr = 70 quality = DRINK_FANTASTIC taste_description = "alternate realities" glass_icon_state = "blazaamglass" - glass_name = "Blazaam" - glass_desc = "The glass seems to be sliding between realities. Doubles as a Berenstain remover." + glass_name = "Hyperspace Highball" + glass_desc = "The glass is seemingly reacting with the bluespace flakes... maybe making this was a poor decision?" var/stored_teleports = 0 /datum/reagent/consumable/ethanol/blazaam/on_mob_life(mob/living/carbon/M) @@ -2185,15 +2116,15 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() /datum/reagent/consumable/ethanol/mauna_loa - name = "Mauna Loa" + name = "Inner Fire" description = "Extremely hot; not for the faint of heart!" boozepwr = 40 color = "#fe8308" // 254, 131, 8 quality = DRINK_FANTASTIC taste_description = "fiery, with an aftertaste of burnt flesh" glass_icon_state = "mauna_loa" - glass_name = "Mauna Loa" - glass_desc = "Lavaland in a drink... mug... volcano... thing." + glass_name = "Inner Fire" + glass_desc = "Not at all made by the Saint Roumain, this drink still bases itself as a test of will used by the hunters to test their endurance to intense heat... and alcohol." /datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/M) // Heats the user up while the reagent is in the body. Occasionally makes you burst into flames. @@ -2212,7 +2143,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "sugary tartness" glass_icon_state = "painkiller" glass_name = "Painkiller" - glass_desc = "A combination of tropical juices and rum. Surely this will make you feel better." + glass_desc = "A combination of tropical juices and rum. Surely, this will make you feel better." /datum/reagent/consumable/ethanol/pina_colada name = "Pina Colada" @@ -2229,12 +2160,12 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/pruno // pruno mix is in drink_reagents name = "pruno" color = "#E78108" - description = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done." + description = "Fermented prison wine made from fruit, sugar, and despair." boozepwr = 85 - taste_description = "your tastebuds being individually shanked" + taste_description = "your tastebuds crying out" glass_icon_state = "glass_orange" glass_name = "glass of pruno" - glass_desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done." + glass_desc = "Fermented prison wine made from fruit, sugar, and despair." /datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/M) M.adjust_disgust(5) @@ -2249,7 +2180,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "sweetness followed by a soft sourness and warmth" glass_icon_state = "gingeramaretto" glass_name = "Ginger Amaretto" - glass_desc = "The sprig of rosemary adds a nice aroma to the drink, and isn't just to be pretentious afterall!" + glass_desc = "Technically intended to come with a sprig of rosemary... but where are you going to get your hands on that?" /datum/reagent/consumable/ethanol/godfather name = "Godfather" @@ -2260,28 +2191,28 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "a delightful softened punch" glass_icon_state = "godfather" glass_name = "Godfather" - glass_desc = "A classic from old Italy and enjoyed by gangsters, pray the orange peel doesnt end up in your mouth." + glass_desc = "Technically still enjoyed by members of the Intersolar Mafia, though the homage is much older. Pray the orange peel doesn't end up in your mouth." /datum/reagent/consumable/ethanol/godmother name = "Godmother" - description = "A twist on a classic, liked more by mature women." + description = "A twist on a classic, made as a sibling drink to the Godfather." boozepwr = 50 color = "#E68F00" quality = DRINK_GOOD taste_description = "sweetness and a zesty twist" glass_icon_state = "godmother" glass_name = "Godmother" - glass_desc = "A lovely fresh smelling cocktail, a true Sicilian delight." + glass_desc = "Just as enjoyed (and related to) the Intersolar Mafia. You're technically supposed to drink this alongside someone else having a Godfather." /datum/reagent/consumable/ethanol/mudders_milk - name = "mudder's milk" + name = "Miner's Milk" color = "#dfc794" - description = "All the protein, vitamins and carbs of your grandma's best turkey dinner, plus 15 percent alcohol." + description = "All the protein, vitamins and carbs of two full ration packs, plus 15% alcohol." boozepwr = 15 - taste_description = "thick, nutty milk with a boozy kick" + taste_description = "thick, nut-flavored milk with a boozy kick" glass_icon_state = "muddersmilk" - glass_name = "Mudder's Milk" - glass_desc = "All the protein, vitamins and carbs of your grandma's best turkey dinner, plus 15 percent alcohol." + glass_name = "Miner's Milk" + glass_desc = "All the protein, vitamins and carbs of two full ration packs, plus 15% alcohol. Created by Nanotrasen's Mining and Exploration League, and often still enjoyed in the New Gorlex Republic." /datum/reagent/consumable/ethanol/mudders_milk/on_mob_life(mob/living/carbon/M) if(prob(1)) @@ -2331,15 +2262,15 @@ All effects don't start immediately, but rather get worse over time; the rate is ..() /datum/reagent/consumable/ethanol/freezer_burn - name = "Freezer Burn" + name = "Hullbreach" description = "Fire and ice combine in your mouth! Drinking slowly recommended." boozepwr = 40 color = "#ba3100" quality = DRINK_FANTASTIC - taste_description = "fire and ice" + taste_description = "frigid, hot stings" glass_icon_state = "freezer_burn" - glass_name = "Freezer Burn" - glass_desc = "Fire and ice combine in your mouth! Drinking slowly recommended." + glass_name = "Hullbreach" + glass_desc = "Fire and ice combine in your mouth, like being pulled out into space." /datum/reagent/consumable/ethanol/freezer_burn/on_mob_life(mob/living/carbon/M) M.adjustFireLoss(-0.2, 0) @@ -2367,14 +2298,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/darkest_chocolate name = "Darkest Chocolate" - description = "Darkness within darkness awaits you, spaceman!" + description = "Darkness within darkness awaits you, spacer!" boozepwr = 40 color = "#240c0c" quality = DRINK_FANTASTIC taste_description = "bitter, chocolatey darkness with a note of cream" glass_icon_state = "darkest_chocolate" glass_name = "Darkest Chocolate" - glass_desc = "Darkness within darkness awaits you, spaceman!" + glass_desc = "Darkness within darkness awaits you, spacer!" var/obj/effect/light_holder /datum/reagent/consumable/ethanol/darkest_chocolate/on_mob_metabolize(mob/living/M) @@ -2393,28 +2324,6 @@ All effects don't start immediately, but rather get worse over time; the rate is to_chat(M, "The darkness subsides.") QDEL_NULL(light_holder) -/datum/reagent/consumable/ethanol/archmagus_brew - name = "Archmagus' Brew" - description = "Said to have been requested by a great Archmagus, hence the name. Tastes like tough love." - boozepwr = 40 - color = "#c75295" - quality = DRINK_FANTASTIC - taste_description = "tough love" - glass_icon_state = "archmagus_brew" - glass_name = "Archmagus' Brew" - glass_desc = "Said to have been requested by a great Archmagus, hence the name. Tastes like tough love." - -/datum/reagent/consumable/ethanol/archmagus_brew/on_mob_life(mob/living/carbon/human/M) - if(M.mind && M.mind.spell_list.len != 0) - var/spell_improved = FALSE - for(var/obj/effect/proc_holder/spell/S in M.mind.spell_list) - if(S.clothes_req) - S.clothes_req = 0 - spell_improved = TRUE - if(spell_improved) - to_chat(M, "You suddenly feel like you never needed those garish robes in the first place...") - return ..() - /datum/reagent/consumable/ethanol/out_of_lime name = "Out of Lime" description = "A spin on the classic. Artists and street fighters swear by this stuff." @@ -2433,22 +2342,6 @@ All effects don't start immediately, but rather get worse over time; the rate is consumer.facial_hair_color = pick("0ad","a0f","f73","d14","0b5","fc2","084","05e","d22","fa0") consumer.update_hair() -/datum/reagent/consumable/ethanol/cogchamp - name = "CogChamp" - description = "Now you can fill yourself with the power of Ratvar!" - color = rgb(255, 201, 49) - boozepwr = 10 - quality = DRINK_FANTASTIC - taste_description = "a brass taste with a hint of oil" - glass_icon_state = "cogchamp" - glass_name = "CogChamp" - glass_desc = "Not one of Ratvar's Four Generals could withstand this! Qevax Jryy!" - -/datum/reagent/consumable/ethanol/cogchamp/on_mob_life(mob/living/carbon/M) - 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." @@ -2458,7 +2351,7 @@ All effects don't start immediately, but rather get worse over time; the rate is 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." + glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Contains traces of gold from the real bullet inside... which wouldn't make sense outside of the series it comes from." /datum/reagent/consumable/ethanol/bullethell name = "Bullet Hell" diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index d359600b0102..8cb74f4ad51e 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -11,7 +11,7 @@ taste_description = "oranges" glass_icon_state = "glass_orange" glass_name = "glass of orange juice" - glass_desc = "Vitamins! Yay!" + glass_desc = "Tart and sweet. It might have pulp, if that's what you wanted." /datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/M) if(M.getOxyLoss() && prob(30)) @@ -26,7 +26,7 @@ taste_description = "tomatoes" glass_icon_state = "glass_red" glass_name = "glass of tomato juice" - glass_desc = "Are you sure this is tomato juice?" + glass_desc = "Some part of you wonders if this could have been a soup at some point." /datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/M) if(M.getFireLoss() && prob(20)) @@ -41,7 +41,7 @@ taste_description = "unbearable sourness" glass_icon_state = "glass_green" glass_name = "glass of lime juice" - glass_desc = "A glass of sweet-sour lime juice." + glass_desc = "A glass of intensely sour lime juice. You wonder to yourself: how much do you really need to ward off scurvy for it to come to the point?" /datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/M) if(M.getToxLoss() && prob(20)) @@ -56,7 +56,7 @@ taste_description = "carrots" glass_icon_state = "carrotjuice" glass_name = "glass of carrot juice" - glass_desc = "It's just like a carrot but without crunching." + glass_desc = "Mildly sweet, but it won't actually improve your eyesight all that much beyond the baseline..." /datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/M) M.adjust_blurriness(-1) @@ -77,7 +77,7 @@ taste_description = "berries" glass_icon_state = "berryjuice" glass_name = "glass of berry juice" - glass_desc = "Berry juice. Or maybe it's jam. Who cares?" + glass_desc = "Berry juice. Technically a fruit punch all on its own!" /datum/reagent/consumable/applejuice name = "Apple Juice" @@ -92,7 +92,7 @@ taste_description = "berries" glass_icon_state = "poisonberryjuice" glass_name = "glass of berry juice" - glass_desc = "Berry juice. Or maybe it's poison. Who cares?" + glass_desc = "Berry juice. Technically a fruit punch all on its own!" /datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/M) M.adjustToxLoss(1, 0) @@ -106,7 +106,7 @@ taste_description = "juicy watermelon" glass_icon_state = "glass_red" glass_name = "glass of watermelon juice" - glass_desc = "A glass of watermelon juice." + glass_desc = "A glass of watermelon juice. Mild and sweet." /datum/reagent/consumable/lemonjuice name = "Lemon Juice" @@ -115,16 +115,16 @@ taste_description = "sourness" glass_icon_state = "lemonglass" glass_name = "glass of lemon juice" - glass_desc = "Sour..." + glass_desc = "A glass of intensely sour lime juice. You wonder to yourself: how much do you really need to ward off scurvy for it to come to the point?" /datum/reagent/consumable/banana name = "Banana Juice" - description = "The raw essence of a banana. HONK" + description = "The raw essence of a banana." color = "#e6d283" taste_description = "banana" glass_icon_state = "banana" glass_name = "glass of banana juice" - glass_desc = "The raw essence of a banana. HONK." + glass_desc = "While staring down at this glass, some part of you wonders what went through the minds of those who decided to add this to milk." /datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/M) if((ishuman(M) && M.job == "Clown") || ismonkey(M)) @@ -179,25 +179,25 @@ description = "Juice of the potato. Bleh." nutriment_factor = 2 * REAGENTS_METABOLISM color = "#9e8045" // rgb: 48, 32, 0 - taste_description = "irish sadness" + taste_description = "starchy water" glass_icon_state = "glass_brown" glass_name = "glass of potato juice" - glass_desc = "Bleh..." + glass_desc = "Starchy. It coats your mouth with a filament afterwards, which really isn't helping it's case." /datum/reagent/consumable/grapejuice name = "Grape Juice" description = "The juice of a bunch of grapes. Guaranteed non-alcoholic." color = "#790b79" // dark purple - taste_description = "grape soda" + taste_description = "grapes" /datum/reagent/consumable/milk name = "Milk" - description = "An opaque white liquid produced by the mammary glands of mammals." + description = "An opaque white liquid produced by the mammary glands of mammals, some arthropods, biogenerators, chemical factories..." color = "#DFDFDF" // rgb: 223, 223, 223 taste_description = "milk" glass_icon_state = "glass_white" glass_name = "glass of milk" - glass_desc = "White and nutritious goodness!" + glass_desc = "A glass of frothy milk. You wonder what animal this could have come from, if at all." /datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/M) if(M.getBruteLoss() && prob(20)) @@ -214,7 +214,7 @@ taste_description = "soy milk" glass_icon_state = "glass_white" glass_name = "glass of soy milk" - glass_desc = "White and nutritious soy goodness!" + glass_desc = "Despite being made from soybeans, it sates the same desire to have an entire glass of milk." /datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/M) if(M.getBruteLoss() && prob(20)) @@ -224,12 +224,12 @@ /datum/reagent/consumable/cream name = "Cream" - description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" + description = "The fatty, still liquid part of milk." color = "#DFD7AF" // rgb: 223, 215, 175 taste_description = "creamy milk" glass_icon_state = "glass_white" glass_name = "glass of cream" - glass_desc = "Ewwww..." + glass_desc = "It's a bit thick to drink straight." /datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/M) if(M.getBruteLoss() && prob(20)) @@ -246,7 +246,7 @@ taste_description = "bitterness" glass_icon_state = "glass_brown" glass_name = "glass of coffee" - glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." + glass_desc = "Black coffee, served straight. It'll be pretty bitter without anything else in it!" /datum/reagent/consumable/coffee/overdose_process(mob/living/M) M.Jitter(5) @@ -265,13 +265,13 @@ /datum/reagent/consumable/tea name = "Tea" - description = "Tasty black tea, it has antioxidants, it's good for you!" + description = "Warm, dark tea." color = "#5f4a05" nutriment_factor = 0 - taste_description = "tart black tea" + taste_description = "tart dark tea" glass_icon_state = "teaglass" glass_name = "glass of tea" - glass_desc = "Drinking it from here would not seem right." + glass_desc = "There's a latent desire to drink this out of a teacup, but there's no time for teatime out here." /datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-2) @@ -289,25 +289,25 @@ description = "Sweet, tangy lemonade. Good for the soul." color = "#FFE978" quality = DRINK_NICE - taste_description = "sunshine and summertime" + taste_description = "sunshine and distant shores" glass_icon_state = "lemonpitcher" glass_name = "pitcher of lemonade" - glass_desc = "This drink leaves you feeling nostalgic for some reason." + glass_desc = "Sweet, slightly tart, and refreshing. You feel some misplaced nostalgia when you have this, even though you're not sure you've ever squeezed a lemon before." /datum/reagent/consumable/tea/arnold_palmer name = "Arnold Palmer" - description = "Encourages the patient to go golfing." + description = "Iced sweet tea and lemonade." color = "#FFB766" quality = DRINK_NICE nutriment_factor = 2 taste_description = "bitter tea" glass_icon_state = "arnold_palmer" glass_name = "Arnold Palmer" - glass_desc = "You feel like taking a few golf swings after a few swigs of this." + glass_desc = "Iced tea and lemonade. You don't think you know any Arnolds, though." /datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/M) if(prob(5)) - to_chat(M, "[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game.")]") + to_chat(M, "[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game... whatever that is.")]") ..() . = 1 @@ -319,7 +319,7 @@ taste_description = "bitter coldness" glass_icon_state = "icedcoffeeglass" glass_name = "iced coffee" - glass_desc = "A drink to perk you up and refresh you!" + glass_desc = "Iced black coffee. It's still going to be pretty bitter on it's own, though!" /datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-5) @@ -339,7 +339,7 @@ taste_description = "bitter coldness and a hint of smoke" glass_icon_state = "hoticecoffee" glass_name = "hot ice coffee" - glass_desc = "A sharp drink, this can't have come cheap." + glass_desc = "The wonders of fusion mixed into a cup of coffee, resulting in an extremely hot-cold drink." /datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-5) @@ -353,13 +353,13 @@ /datum/reagent/consumable/icetea name = "Iced Tea" - description = "No relation to a certain rap artist/actor." + description = "Iced, sweetened tea." color = "#104038" // rgb: 16, 64, 56 nutriment_factor = 0 taste_description = "sweet tea" glass_icon_state = "icedteaglass" glass_name = "iced tea" - glass_desc = "All natural, antioxidant-rich flavour sensation." + glass_desc = "A much more appealing way to have tea while dealing with the heat." /datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-2) @@ -377,61 +377,33 @@ color = "#743c05" // rgb: 16, 8, 0 taste_description = "cola" glass_icon_state = "glass_brown" - glass_name = "glass of Space Cola" - glass_desc = "A glass of refreshing Space Cola." + glass_name = "glass of cola" + glass_desc = "A carbonated cola. You should drink it before it gets flat!" /datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/M) M.drowsyness = max(0,M.drowsyness-5) M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) ..() -/datum/reagent/consumable/nuka_cola - name = "Nuka Cola" - description = "Cola, cola never changes." - color = "#3b6c0e" // rgb: 16, 8, 0 - quality = DRINK_VERYGOOD - taste_description = "the future" - glass_icon_state = "nuka_colaglass" - glass_name = "glass of Nuka Cola" - glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland." - -/datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/L) - ..() - L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola) - -/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L) - L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola) - ..() - -/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M) - M.Jitter(20) - M.set_drugginess(30) - M.dizziness +=1.5 - M.drowsyness = 0 - M.AdjustSleeping(-40) - M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) - ..() - . = 1 - -/datum/reagent/consumable/grey_bull - name = "Grey Bull" - description = "Grey Bull, it gives you gloves!" +/datum/reagent/consumable/crosstalk + name = "Crosstalk" + description = "Crosstalk! Share the energy with everyone!" color = "#EEFF00" // rgb: 238, 255, 0 quality = DRINK_VERYGOOD - taste_description = "carbonated oil" - glass_icon_state = "grey_bull_glass" - glass_name = "glass of Grey Bull" - glass_desc = "Surprisingly it isnt grey." + taste_description = "carbonated battery acid with a spoonful of sugar" + glass_icon_state = "crosstalk_glass" + glass_name = "glass of Crosstalk" + glass_desc = "The amount of sugar and chemicals in this drink makes your eyes water." -/datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/L) +/datum/reagent/consumable/crosstalk/on_mob_metabolize(mob/living/L) ..() ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, type) -/datum/reagent/consumable/grey_bull/on_mob_end_metabolize(mob/living/L) +/datum/reagent/consumable/crosstalk/on_mob_end_metabolize(mob/living/L) REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, type) ..() -/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/crosstalk/on_mob_life(mob/living/carbon/M) M.Jitter(20) M.dizziness +=1 M.drowsyness = 0 @@ -439,16 +411,16 @@ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) ..() -/datum/reagent/consumable/spacemountainwind - name = "SM Wind" - description = "Blows right through you like a space wind." +/datum/reagent/consumable/comet_trail + name = "Comet Trail" + description = "A citrusy drink from the Kepori space installation known as The Ring." color = "#c4ff2d" // rgb: 16, 32, 0 taste_description = "sweet citrus soda" - glass_icon_state = "Space_mountain_wind_glass" - glass_name = "glass of Space Mountain Wind" - glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind." + glass_icon_state = "Comet_trail_glass" + glass_name = "glass of Comet Trail" + glass_desc = "A glass of Comet Trail. Taste the stars!" -/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/comet_trail/on_mob_life(mob/living/carbon/M) M.drowsyness = max(0,M.drowsyness-7) M.AdjustSleeping(-20) M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) @@ -456,16 +428,16 @@ ..() . = 1 -/datum/reagent/consumable/dr_gibb - name = "Dr. Gibb" - description = "A delicious blend of 42 different flavours." +/datum/reagent/consumable/tadrixx + name = "Tadrixx" + description = "A Kalixcian drink made from a plant that tastes similar to sassafrass, which is used in root beer. A stumpy drake holding a mug of it is on the front." color = "#732a03" - taste_description = "cherry soda" // FALSE ADVERTISING - glass_icon_state = "dr_gibb_glass" - glass_name = "glass of Dr. Gibb" - glass_desc = "Dr. Gibb. Not as dangerous as the glass_name might imply." + taste_description = "root beer" // FALSE ADVERTISING + glass_icon_state = "tadrixx_glass" + glass_name = "glass of Tadrixx" + glass_desc = "A cup of fizzy Tadrixx. It smells sweet." -/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/tadrixx/on_mob_life(mob/living/carbon/M) M.drowsyness = max(0,M.drowsyness-6) M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) ..() @@ -484,6 +456,38 @@ M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) ..() +/datum/reagent/consumable/molten + name = "Molten Bubbles" + description = "A spicy soft drink made from a coca-like plant from Kalixcis. Popularly served both cold -and- hot, depending on the weather." + color = "#5f2010" + taste_description = "spiced cola" + glass_icon_state = "molten_glass" + glass_name = "glass of Molten Bubbles" + glass_desc = "A glass of Molten Bubbles. The spices tickle your nose." + +/datum/reagent/consumable/molten/on_mob_life(mob/living/carbon/M) + M.heal_bodypart_damage(1,1,0) + if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE)) + M.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE)) + else if(M.bodytemperature < (M.get_body_temp_normal(apply_change=FALSE) + 1)) + M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE)) + ..() + +/datum/reagent/consumable/molten/plasma_fizz + name = "Plasma Fizz" + description = "A spinoff of the popular Molten Bubbles drink from Kalixcis, made to emulate the flavor of spiced grape instead. It's... not exactly convincing or a very good mix." + color = "#5f2010" + taste_description = "spiced grape soda" + glass_icon_state = "plasma_fizz_glass" + glass_name = "glass of Plasma Fizz" + glass_desc = "A glass of Plasma Fizz. The spices (and fake grape flavoring) wrinkles your nose." + +/datum/reagent/consumable/molten/sand + name = "Sandblast Sarsaparilla" + description = "Extra refreshing for those long desert days." + color = "#af9938" + taste_description = "root-beer and asbestos" + /datum/reagent/consumable/lemon_lime name = "Lemon Lime" description = "A tangy substance made of 0.5% natural citrus!" @@ -499,48 +503,48 @@ ..() -/datum/reagent/consumable/pwr_game - name = "Pwr Game" - description = "The only drink with the PWR that true gamers crave." +/datum/reagent/consumable/pacfuel + name = "PAC-Fuel" + description = "A carbonated energy drink themed after the purple coloration, similar to plasma." color = "#9385bf" // rgb: 58, 52, 75 taste_description = "sweet and salty tang" glass_icon_state = "glass_red" - glass_name = "glass of Pwr Game" - glass_desc = "Goes well with a Vlad's salad." + glass_name = "glass of PAC-Fuel" + glass_desc = "A glass of PAC-Fuel energy drink. It smells vaguely like acidic cotton candy..." -/datum/reagent/consumable/pwr_game/expose_mob(mob/living/C, method=TOUCH, reac_volume) +/datum/reagent/consumable/pacfuel/expose_mob(mob/living/C, method=TOUCH, reac_volume) ..() if(C?.mind?.get_skill_level(/datum/skill/gaming) >= SKILL_LEVEL_LEGENDARY && method==INGEST && !HAS_TRAIT(C, TRAIT_GAMERGOD)) ADD_TRAIT(C, TRAIT_GAMERGOD, "pwr_game") - to_chat(C, "As you imbibe the Pwr Game, your gamer third eye opens... \ + to_chat(C, "As you imbibe the PAC-Fuel, your gamer third eye opens... \ You feel as though a great secret of the universe has been made known to you...") -/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/pacfuel/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) if(prob(10)) M?.mind.adjust_experience(/datum/skill/gaming, 5) ..() -/datum/reagent/consumable/shamblers - name = "Shambler's Juice" - description = "~Shake me up some of that Shambler's Juice!~" +/datum/reagent/consumable/shoal_punch + name = "Shoal Punch" + description = "Sugary, and from the Shoal." color = "#f00060" // rgb: 94, 0, 38 - taste_description = "carbonated metallic soda" + taste_description = "sugary fruity soda" glass_icon_state = "glass_red" - glass_name = "glass of Shambler's juice" - glass_desc = "Mmm mm, shambly." + glass_name = "glass of Shoal Punch" + glass_desc = "It's hard to imagine all those fruits getting condensed into a cup like this." -/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/shoal_punch/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) ..() /datum/reagent/consumable/sodawater name = "Soda Water" - description = "A can of club soda. Why not make a scotch and soda?" + description = "A can of club soda." color = "#619494" // rgb: 97, 148, 148 taste_description = "carbonated water" glass_icon_state = "glass_clear" glass_name = "glass of soda water" - glass_desc = "Soda water. Why not make a scotch and soda?" + glass_desc = "Soda water. You feel like you should add something to this..." /datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-5) @@ -550,12 +554,12 @@ /datum/reagent/consumable/tonic name = "Tonic Water" - description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." + description = "It tastes strange, and it's not like malaria is much of an issue anymore." color = "#709fce" taste_description = "tart and fresh" glass_icon_state = "glass_clear" glass_name = "glass of tonic water" - glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." + glass_desc = "Quinine and carbonated water. You really should add something to this..." /datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-5) @@ -565,17 +569,17 @@ ..() . = 1 -/datum/reagent/consumable/monkey_energy - name = "Monkey Energy" - description = "The only drink that will make you unleash the ape." - color = "#f39b03" // rgb: 243, 155, 3 +/datum/reagent/consumable/xeno_energy + name = "Xeno-Energy" + description = "An unbearably sugary, fizzy green drink." + color = "#88b488" // rgb: 243, 155, 3 overdose_threshold = 60 - taste_description = "barbecue and nostalgia" - glass_icon_state = "monkey_energy_glass" - glass_name = "glass of Monkey Energy" - glass_desc = "You can unleash the ape, but without the pop of the can?" + taste_description = "tooth-rotting sweetness" + glass_icon_state = "xeno_energy_glass" + glass_name = "glass of Xeno Energy" + glass_desc = "A glass of Xeno Energy. It seems to swirl and roil outside of the can..." -/datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/xeno_energy/on_mob_life(mob/living/carbon/M) M.Jitter(20) M.dizziness +=1 M.drowsyness = 0 @@ -583,18 +587,13 @@ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) ..() -/datum/reagent/consumable/monkey_energy/on_mob_metabolize(mob/living/L) +/datum/reagent/consumable/xeno_energy/on_mob_metabolize(mob/living/L) ..() if(ismonkey(L)) - L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy) + L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/xeno_energy) -/datum/reagent/consumable/monkey_energy/on_mob_end_metabolize(mob/living/L) - L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy) - ..() - -/datum/reagent/consumable/monkey_energy/overdose_process(mob/living/M) - if(prob(15)) - M.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/monkey_energy) +/datum/reagent/consumable/xeno_energy/on_mob_end_metabolize(mob/living/L) + L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/xeno_energy) ..() /datum/reagent/consumable/ice @@ -605,7 +604,7 @@ taste_description = "ice" glass_icon_state = "iceglass" glass_name = "glass of ice" - glass_desc = "Generally, you're supposed to put something else in there too..." + glass_desc = "Generally, you're supposed to put something else in there, too..." /datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) @@ -613,13 +612,13 @@ /datum/reagent/consumable/soy_latte name = "Soy Latte" - description = "A nice and tasty beverage while you are reading your hippie books." + description = "A hot beverage for those who can't handle the lactose." color = "#664300" // rgb: 102, 67, 0 quality = DRINK_NICE taste_description = "creamy coffee" glass_icon_state = "soy_latte" glass_name = "soy latte" - glass_desc = "A nice and refreshing beverage while you're reading." + glass_desc = "A nice and refreshing beverage. It goes well with a book, if you have the time to read." /datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-5) @@ -640,7 +639,7 @@ taste_description = "bitter cream" glass_icon_state = "cafe_latte" glass_name = "cafe latte" - glass_desc = "A nice, strong and refreshing beverage while you're reading." + glass_desc = "A nice, strong and refreshing beverage. It goes well with a book, if you have the time to read." /datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-5) @@ -655,13 +654,13 @@ /datum/reagent/consumable/doctor_delight name = "The Doctor's Delight" - description = "A gulp a day keeps the Medibot away! A mixture of juices that heals most damage types fairly quickly at the cost of hunger." + description = "A homemade curative. A mixture of juices that helps your body heal against most damage, at the cost of leaving you hungry." color = "#FF8CFF" // rgb: 255, 140, 255 quality = DRINK_VERYGOOD taste_description = "homely fruit" glass_icon_state = "doctorsdelightglass" glass_name = "Doctor's Delight" - glass_desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger." + glass_desc = "A homemade curative. Helps the body heal with the nutrition density, but it leaves a gnawing hunger afterwards." /datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/M) M.adjustBruteLoss(-0.5, 0) @@ -683,7 +682,7 @@ taste_description = "sweet chocolate" glass_icon_state = "chocolatepudding" glass_name = "chocolate pudding" - glass_desc = "Tasty." + glass_desc = "Thick, sweet, and chocolatey." /datum/reagent/consumable/vanillapudding name = "Vanilla Pudding" @@ -694,7 +693,7 @@ taste_description = "sweet vanilla" glass_icon_state = "vanillapudding" glass_name = "vanilla pudding" - glass_desc = "Tasty." + glass_desc = "Thick, sweet, and pleasantly vanilla." /datum/reagent/consumable/cherryshake name = "Cherry Shake" @@ -705,7 +704,7 @@ taste_description = "creamy cherry" glass_icon_state = "cherryshake" glass_name = "cherry shake" - glass_desc = "A cherry flavored milkshake." + glass_desc = "A cherry flavored milkshake. Don't get any on your jumpsuit!" /datum/reagent/consumable/bluecherryshake name = "Blue Cherry Shake" @@ -716,33 +715,33 @@ taste_description = "creamy blue cherry" glass_icon_state = "bluecherryshake" glass_name = "blue cherry shake" - glass_desc = "An exotic blue milkshake." + glass_desc = "A blue-cherry milkshake. Generally, the blue is meant to be figurative, but..." /datum/reagent/consumable/pumpkin_latte name = "Pumpkin Latte" - description = "A mix of pumpkin juice and coffee." + description = "A mix of spices and coffee. It doesn't actually contain any pumpkin, though." color = "#F4A460" quality = DRINK_VERYGOOD nutriment_factor = 3 * REAGENTS_METABOLISM taste_description = "creamy pumpkin" glass_icon_state = "pumpkin_latte" glass_name = "pumpkin latte" - glass_desc = "A mix of coffee and pumpkin juice." + glass_desc = "A mix of coffee and pumpkin juice would taste a whole lot different than what you're having right now, you know." -/datum/reagent/consumable/gibbfloats - name = "Gibb Floats" - description = "Ice cream on top of a Dr. Gibb glass." - color = "#B22222" +/datum/reagent/consumable/tadrixxfloat + name = "Tadrixx Float" + description = "Ice cream on top of a glass of Tadrixx." + color = "#533713" quality = DRINK_NICE nutriment_factor = 3 * REAGENTS_METABOLISM - taste_description = "creamy cherry" - glass_icon_state = "gibbfloats" - glass_name = "Gibbfloat" - glass_desc = "Dr. Gibb with ice cream on top." + taste_description = "creamy root beer" + glass_icon_state = "tadrixxfloat" + glass_name = "Tadrixxfloat" + glass_desc = "A glass of Tadrixx with ice cream on top." /datum/reagent/consumable/pumpkinjuice name = "Pumpkin Juice" - description = "Juiced from real pumpkin." + description = "Juiced from real pumpkins." color = "#FFA500" taste_description = "pumpkin" @@ -757,18 +756,18 @@ description = "A solution." color = "#EEFF00" quality = DRINK_NICE - taste_description = "extreme bitterness" + taste_description = "extreme sourness" glass_icon_state = "triplecitrus" //needs own sprite mine are trash //your sprite is great tho glass_name = "glass of triple citrus" - glass_desc = "A mixture of citrus juices. Tangy, yet smooth." + glass_desc = "A mixture of citrus juices. Intensely sour, and leaves you reeling afterwards." /datum/reagent/consumable/grape_soda name = "Grape soda" - description = "Beloved by children and teetotalers." + description = "Artificial grape soda." color = "#E6CDFF" taste_description = "grape soda" glass_name = "glass of grape juice" - glass_desc = "It's grape (soda)!" + glass_desc = "It's grape soda!" /datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) @@ -776,20 +775,28 @@ /datum/reagent/consumable/milk/chocolate_milk name = "Chocolate Milk" - description = "Milk for cool kids." + description = "Milk mixed with chocolate powder. Beloved by children everywhere." color = "#7D4E29" quality = DRINK_NICE taste_description = "chocolate milk" +/datum/reagent/consumable/lunapunch + name = "Lunapunch" + description = "An herbal-sweet carbonated drink with a bitter bite." + color = "#7D4E29" + quality = DRINK_NICE + taste_description = "sweet herbs and lingering bitterness" + glass_name = "glass of Lunapunch" + glass_desc = "An herbal-sweet soft drink. The bitter bite after each sip is enough to make you wince, but leaves you wanting more." /datum/reagent/consumable/hot_coco - name = "Hot Coco" - description = "Made with love! And coco beans." + name = "Hot Cocoa" + description = "Made with love and cocoa beans. Or from a vending machine." nutriment_factor = 3 * REAGENTS_METABOLISM color = "#4f3a11" // rgb: 64, 48, 16 taste_description = "creamy chocolate" glass_icon_state = "chocolateglass" - glass_name = "glass of hot coco" - glass_desc = "A favorite winter drink to warm you up." + glass_name = "glass of hot cocoa." + glass_desc = "A favorite winter drink from the Solar Confederation. Good for warming yourself up." /datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal()) @@ -810,7 +817,7 @@ taste_description = "mint" glass_icon_state = "glass_green" glass_name = "glass of menthol" - glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation." + glass_desc = "Tastes naturally and sharply minty, with a mild numbing sensation." /datum/reagent/consumable/menthol/on_mob_life(mob/living/L) L.apply_status_effect(/datum/status_effect/throat_soothed) @@ -818,26 +825,27 @@ /datum/reagent/consumable/grenadine name = "Grenadine" - description = "Not cherry flavored!" + description = "More blackcurrant than cherry, actually." color = "#EA1D26" taste_description = "sweet pomegranates" glass_name = "glass of grenadine" - glass_desc = "Delicious flavored syrup." + glass_desc = "Flavored syrup, traditionally used for mixing drinks. Having it straight is certainly a choice." /datum/reagent/consumable/parsnipjuice name = "Parsnip Juice" - description = "Why..." + description = "Starchy and uncommon." color = "#FFA500" taste_description = "parsnip" glass_name = "glass of parsnip juice" + glass_desc = "It doesn't really count as a soup this way. Maybe it'd better if it was a soup." /datum/reagent/consumable/pineapplejuice name = "Pineapple Juice" - description = "Tart, tropical, and hotly debated." + description = "Tart, tropical, and sweet." color = "#F7D435" taste_description = "pineapple" glass_name = "glass of pineapple juice" - glass_desc = "Tart, tropical, and hotly debated." + glass_desc = "Tart, tropical, and sweet." /datum/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink name = "Peach Juice" @@ -845,16 +853,17 @@ color = "#E78108" taste_description = "peaches" glass_name = "glass of peach juice" + glass_desc = "A glass full of sweet peach juice. Strange, you don't often see it out this far into the Frontier..." /datum/reagent/consumable/cream_soda name = "Cream Soda" - description = "A classic space-American vanilla flavored soft drink." + description = "A classic vanilla flavored soft drink." color = "#dcb137" quality = DRINK_VERYGOOD taste_description = "fizzy vanilla" glass_icon_state = "cream_soda" glass_name = "Cream Soda" - glass_desc = "A classic space-American vanilla flavored soft drink." + glass_desc = "A classic vanilla flavored soft drink." /datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/M) M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) @@ -867,7 +876,7 @@ quality = DRINK_NICE taste_description = "sweet ginger spice" glass_name = "Sol Dry" - glass_desc = "A soothing, mellow drink made from ginger." + glass_desc = "A soothing, mellow drink made from ginger. You can't imagine drinking a carbonated drink while in microgravity, though, nausea or not..." /datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M) M.adjust_disgust(-5) @@ -875,13 +884,13 @@ /datum/reagent/consumable/red_queen name = "Red Queen" - description = "DRINK ME." + description = "You feel inclined to drink it, somehow." color = "#e6ddc3" quality = DRINK_GOOD taste_description = "wonder" glass_icon_state = "red_queen" glass_name = "Red Queen" - glass_desc = "DRINK ME." + glass_desc = "A cup of red tea. A small note is tied around the handle of it, which asks you to drink it." var/current_size = RESIZE_DEFAULT_SIZE /datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/H) @@ -905,11 +914,11 @@ /datum/reagent/consumable/bungojuice name = "Bungo Juice" color = "#F9E43D" - description = "Exotic! You feel like you are on vactation already." + description = "A botanical experiment gone right." taste_description = "succulent bungo" glass_icon_state = "glass_yellow" glass_name = "glass of bungo juice" - glass_desc = "Exotic! You feel like you are on vactation already." + glass_desc = "A botanical experiment in creating a new fruit. It smells faintly citrusy, along with a hint of... banana?" /datum/reagent/consumable/prunomix name = "pruno mixture" @@ -927,7 +936,7 @@ taste_description = "vegetable" glass_icon_state = "glass_yellow" glass_name = "glass of aloe juice" - glass_desc = "A healthy and refreshing juice." + glass_desc = "Juiced aloe vera. It's an acquired taste." /datum/reagent/consumable/aloejuice/on_mob_life(mob/living/M) if(M.getToxLoss() && prob(30)) @@ -943,7 +952,7 @@ taste_description = "purple and a hint of opioid." glass_icon_state = "lean" glass_name = "Lean" - glass_desc = "A drink that makes your life less miserable." + glass_desc = "You just don't often get to see cough syrup out here, and someone had enough to mix it with soda. You're left wondering why." /datum/reagent/consumable/lean/on_mob_life(mob/living/carbon/M) if(M.slurring < 3) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 4c4ad36b2413..6084311b3507 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -2113,30 +2113,3 @@ ADD_TRAIT(M, TRAIT_ALLBREAK, TRAIT_GENERIC) REMOVE_TRAIT(M, TRAIT_NOBREAK, TRAIT_GENERIC) ..() - -/datum/reagent/medicine/molten_bubbles - name = "Molten Bubbles" - description = "Refreshing softdrink made for the desert." - color = "#3d1916" - metabolization_rate = REAGENTS_METABOLISM - taste_description = "boiling sugar" - -/datum/reagent/medicine/molten_bubbles/on_mob_life(mob/living/carbon/M) - M.heal_bodypart_damage(1,1,0) - if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE)) - M.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE)) - else if(M.bodytemperature < (M.get_body_temp_normal(apply_change=FALSE) + 1)) - M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE)) - ..() - -/datum/reagent/medicine/molten_bubbles/plasma - name = "Plasma Bubbles" - description = "Molten Bubbles with the refreshing taste of plasma." - color = "#852e63" - taste_description = "grape flavored cleaning solution" - -/datum/reagent/medicine/molten_bubbles/sand - name = "Sandblast Sarsaparilla" - description = "Extra refreshing for those long desert days." - color = "#af9938" - taste_description = "root-beer and asbestos" diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 302d05f0712b..2397d67a1d2c 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -325,18 +325,3 @@ WS End */ /datum/chemical_reaction/chartreuse results = list(/datum/reagent/medicine/chartreuse = 10) required_reagents = list(/datum/reagent/medicine/puce_essence = 5, /datum/reagent/consumable/tinlux = 5, /datum/reagent/consumable/entpoly = 1) - -/datum/chemical_reaction/molten_bubbles - results = list(/datum/reagent/medicine/molten_bubbles = 30) - required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1) - -/datum/chemical_reaction/plasma_bubbles - results = list(/datum/reagent/medicine/molten_bubbles/plasma = 3) - required_reagents = list(/datum/reagent/medicine/molten_bubbles = 3, /datum/reagent/toxin/plasma = 2) - -/datum/chemical_reaction/sand_bubbles - results = list(/datum/reagent/medicine/molten_bubbles/sand = 3) - required_reagents = list(/datum/reagent/medicine/molten_bubbles = 3, /datum/reagent/silicon = 2) - -/datum/chemical_reaction/sand_bubbles/plasma // Subbing plasma bubbles for reg - required_reagents = list(/datum/reagent/medicine/molten_bubbles/plasma = 3, /datum/reagent/silicon = 2) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ee288feb0bac..149743c47e3c 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -184,12 +184,12 @@ Borg Shaker accepts_reagent_upgrades = FALSE reagent_ids = list(/datum/reagent/consumable/applejuice, /datum/reagent/consumable/banana, /datum/reagent/consumable/coffee, - /datum/reagent/consumable/cream, /datum/reagent/consumable/dr_gibb, /datum/reagent/consumable/grenadine, + /datum/reagent/consumable/cream, /datum/reagent/consumable/tadrixx, /datum/reagent/consumable/grenadine, /datum/reagent/consumable/ice, /datum/reagent/consumable/lemonjuice, /datum/reagent/consumable/lemon_lime, /datum/reagent/consumable/limejuice, /datum/reagent/consumable/menthol, /datum/reagent/consumable/milk, /datum/reagent/consumable/nothing, /datum/reagent/consumable/orangejuice, /datum/reagent/consumable/peachjuice, - /datum/reagent/consumable/sodawater, /datum/reagent/consumable/space_cola, /datum/reagent/consumable/spacemountainwind, - /datum/reagent/consumable/pwr_game, /datum/reagent/consumable/shamblers, /datum/reagent/consumable/soymilk, + /datum/reagent/consumable/sodawater, /datum/reagent/consumable/space_cola, /datum/reagent/consumable/comet_trail, + /datum/reagent/consumable/pacfuel, /datum/reagent/consumable/shoal_punch, /datum/reagent/consumable/soymilk, /datum/reagent/consumable/space_up, /datum/reagent/consumable/sugar, /datum/reagent/consumable/tea, /datum/reagent/consumable/tomatojuice, /datum/reagent/consumable/tonic, /datum/reagent/water, /datum/reagent/consumable/pineapplejuice, /datum/reagent/consumable/sol_dry, diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 4b5dd9a49717..b8871b21524e 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -38,7 +38,7 @@ /obj/item/organ/Initialize() . = ..() if(organ_flags & ORGAN_EDIBLE) - AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GORE, null, 10, null, null, null, CALLBACK(src, PROC_REF(OnEatFrom))) + AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GORE, null, 10, null, null, null, COLOR_PINK, CALLBACK(src, PROC_REF(OnEatFrom))) ///When you take a bite you cant jam it in for surgery anymore. /obj/item/organ/proc/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE) diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm index 2914d6dda279..4d327c7a8234 100644 --- a/code/modules/vehicles/secway.dm +++ b/code/modules/vehicles/secway.dm @@ -47,7 +47,7 @@ if(istype(W, /obj/item/reagent_containers/food/snacks/grown/banana)) // ignore the occupants because they're presumably too distracted to notice the guy stuffing fruit into their vehicle's exhaust. do segways have exhausts? they do now! user.visible_message("[user] begins stuffing [W] into [src]'s tailpipe.", "You begin stuffing [W] into [src]'s tailpipe...", ignored_mobs = occupants) - if(do_after(user, 30, TRUE, src)) + if(do_after(user, 30, src)) if(user.transferItemToLoc(W, src)) user.visible_message("[user] stuffs [W] into [src]'s tailpipe.", "You stuff [W] into [src]'s tailpipe.", ignored_mobs = occupants) eddie_murphy = W diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index dd240887ae46..45dc055e1b21 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -19,17 +19,17 @@ /obj/item/reagent_containers/food/drinks/bottle/pineapplejuice = 4, /obj/item/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, - /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 4, - /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 4, - /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 4, + /obj/item/reagent_containers/food/drinks/soda_cans/comet_trail = 4, + /obj/item/reagent_containers/food/drinks/soda_cans/tadrixx = 4, + /obj/item/reagent_containers/food/drinks/soda_cans/lunapunch = 4, /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 4, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 4, - /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 4, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 4, + /obj/item/reagent_containers/food/drinks/soda_cans/pacfuel = 4, + /obj/item/reagent_containers/food/drinks/soda_cans/orange_soda = 4, + /obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch = 4, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, /obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 8, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 4, - /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 4, + /obj/item/reagent_containers/food/drinks/soda_cans/vimukti = 4, /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4, /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, /obj/item/reagent_containers/food/drinks/mug/tea = 8, @@ -70,8 +70,8 @@ /obj/item/reagent_containers/food/drinks/bottle/champagne = 5, /obj/item/reagent_containers/food/drinks/bottle/trappist = 5) - product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty 'round this sector?" - product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" + product_slogans = "I hope nobody asks me for a cup of tea...;Alcohol is everyone's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty 'round this sector?" + product_ads = "Drink up!;Booze is good for you!;Alcohol is everyone's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 53 FSC!;Award-winning wine!;Maximum alcohol!;Everyone loves beer.;A toast for progress!" req_access = list(ACCESS_BAR) refill_canister = /obj/item/vending_refill/boozeomat default_price = 120 diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index 3cff7d3c361d..1c377c309464 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -1,8 +1,8 @@ /obj/machinery/vending/cigarette name = "\improper ShadyCigs Deluxe" desc = "If you want to get cancer, might as well do it in style." - product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!" - product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." + product_slogans = "Space cigs taste good like a cigarette should.;I'd rather die than switch.;Smoke!;Don't believe the reports - smoke today!" + product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 150 FSC.;Award-winning cigs." icon_state = "cigs" products = list( /obj/item/storage/fancy/cigarettes = 5, diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 4a9f4a456eee..84f82d81a2e2 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -1,35 +1,34 @@ /obj/machinery/vending/cola - name = "\improper Robust Softdrinks" - desc = "A softdrink vendor provided by Robust Industries, LLC." + name = "\improper RobustMore Softdrinks" + desc = "A softdrink vendor provided by RobustMore DrinkFoods Industries, LLC." icon_state = "Cola_Machine" - product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" - product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." + product_slogans = "RobustMore Softdrinks: More robust than a toolbox to the head!" + product_ads = "Refreshing!;Hope you're thirsty!;Over 10 trillion drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks this side of the galaxy." products = list( /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/comet_trail = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/tadrixx = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/lunapunch = 10, /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/pacfuel = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/orange_soda = 10, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/food/drinks/waterbottle = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/efuel = 5, - /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) + /obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy = 5, + /obj/item/reagent_containers/food/drinks/soda_cans/vimukti = 6, + /obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch = 6) premium = list( - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, /obj/item/reagent_containers/food/drinks/soda_cans/air = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1) + /obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy = 1, + /obj/item/reagent_containers/food/drinks/soda_cans/crosstalk = 1) refill_canister = /obj/item/vending_refill/cola default_price = 45 extra_price = 200 /obj/item/vending_refill/cola - machine_name = "Robust Softdrinks" + machine_name = "RobustMore Softdrinks" icon_state = "refill_cola" /obj/machinery/vending/cola/random @@ -54,9 +53,9 @@ /obj/machinery/vending/cola/red icon_state = "red_cola" - name = "\improper Space Cola Vendor" - desc = "It vends cola, in space." - product_slogans = "Cola in space!" + name = "\improper Master Cola Vendor" + desc = "This vending machine offers Master Cola. Master Cola - have a drink from the past!" + product_slogans = "Master Cola - have a drink from the past!" light_mask = "red_cola-light-mask" light_color = COLOR_DARK_RED @@ -70,9 +69,9 @@ /obj/machinery/vending/cola/starkist icon_state = "starkist" - name = "\improper Star-kist Vendor" - desc = "The taste of a star in liquid form." - product_slogans = "Drink the stars! Star-kist!" + name = "\improper Lunapunch Vendor" + desc = "What keeps the colonies running - Lunapunch." + product_slogans = "The Colonies run on Lunapunch!" light_mask = "starkist-light-mask" light_color = COLOR_LIGHT_ORANGE @@ -83,27 +82,27 @@ /obj/machinery/vending/cola/pwr_game icon_state = "pwr_game" - name = "\improper Pwr Game Vendor" - desc = "You want it, we got it. Brought to you in partnership with Vlad's Salads." - product_slogans = "The POWER that gamers crave! PWR GAME!" + name = "\improper PAC-Fuel Vendor" + desc = "PAC-Fuel: stay flying straight. Enter the code on every can for a chance to win gamer merch or industrial equipment!" + product_slogans = "Keep flying steady with PAC-Fuel!" light_mask = "pwr_game-light-mask" light_color = COLOR_STRONG_VIOLET /obj/machinery/vending/cola/shamblers - name = "\improper Shambler's Vendor" - desc = "~Shake me up some of that Shambler's Juice!~" + name = "\improper Shoal Punch Vendor" + desc = "Every fruit you could want, at your beak! Shoal Punch!" icon_state = "shamblers_juice" products = list( /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/comet_trail = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/tadrixx = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/lunapunch = 10, /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/pacfuel = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/orange_soda = 10, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10) - product_slogans = "~Shake me up some of that Shambler's Juice!~" - product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp." + /obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch = 10) + product_slogans = "very fruit you could want, at your beak! Shoal Punch!" + product_ads = "Every fruit you could want, at your beak!;Don't go flying dry!;Over two trillion served!;Thirsty? Get punched!;Skrikira trikxti skrmikr rakti!;Don't go dry, get Shoal Punch." light_mask = "shamblers-light-mask" light_color = COLOR_MOSTLY_PURE_PINK diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 5dbd8ea733db..3e51271093ad 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -1,7 +1,7 @@ /obj/machinery/vending/dinnerware name = "\improper Plasteel Chef's Dinnerware Vendor" desc = "A kitchen and restaurant equipment vendor." - product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." + product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils." icon_state = "dinnerware" products = list( /obj/item/storage/bag/tray = 8, diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index d27a1f6ffe6e..c803fa347e9f 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -1,7 +1,7 @@ /obj/machinery/vending/games name = "\improper Good Clean Fun" desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..." - product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!" + product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Fun times forever!" icon_state = "games" products = list( /obj/item/toy/cards/deck = 5, diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm index 03d532c804e7..5f06b35f76b5 100644 --- a/code/modules/vending/liberation.dm +++ b/code/modules/vending/liberation.dm @@ -2,7 +2,7 @@ name = "\improper Liberation Station" desc = "An overwhelming amount of ancient patriotism washes over you just by looking at the machine." icon_state = "liberationstation" - product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!" + product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!" product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?" vend_reply = "Remember the name: Liberation Station!" products = list( diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm index 989bd721a79c..911a190703f4 100644 --- a/code/modules/vending/liberation_toy.dm +++ b/code/modules/vending/liberation_toy.dm @@ -2,8 +2,8 @@ name = "\improper Syndicate Donksoft Toy Vendor" desc = "An ages 8 and up approved vendor that dispenses toys. If you were to find the right wires, you can unlock the adult mode setting!" icon_state = "syndi" - product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!" - product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" + product_slogans = "Get your cool toys today!;Quality toy weapons for cheap prices!" + product_ads = "Feel tough with your toys!;Express your inner child today!;Toy weapons don't kill people, but boredom does!;Who needs responsibilities when you have toy weapons?;Make your next foam fight FUN!" vend_reply = "Come back for more!" circuit = /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor products = list(/obj/item/gun/ballistic/automatic/toy = 10, diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index d0130d7358fc..45d76a4754fa 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -1,8 +1,8 @@ /obj/machinery/vending/snack name = "\improper Getmore Chocolate Corp" - desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars." + desc = "A snack machine courtesy of the RobustMore DrinkFoods LLC." product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" - product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" + product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Have a snack.;Snacks are good for you!;Have something better! Get RobustMore!;Best quality snacks!;We love chocolate!;Try our new jerky!" icon_state = "snack" light_mask = "snack-light-mask" products = list( @@ -24,7 +24,7 @@ input_display_header = "Chef's Food Selection" /obj/item/vending_refill/snack - machine_name = "Getmore Chocolate Corp" + machine_name = "RobustMore DrinkFoods LLC" /obj/machinery/vending/snack/random name = "\improper Random Snackies" diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index 8fefa1015536..a5092cf7373f 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -2,8 +2,8 @@ name = "\improper Donksoft Toy Vendor" desc = "Ages 8 and up approved vendor that dispenses toys." icon_state = "nt-donk" - product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!" - product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" + product_slogans = "Get your cool toys today!;Quality toy weapons for cheap prices!" + product_ads = "Feel tough with your toys!;Express your inner child today!;Toy weapons don't kill people, but bordeom does!;Who needs responsibilities when you have toy weapons?;Make your next foam fight FUN!" vend_reply = "Come back for more!" light_mask = "donksoft-light-mask" circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor diff --git a/html/changelogs/AutoChangeLog-pr-3099.yml b/html/changelogs/AutoChangeLog-pr-3099.yml new file mode 100644 index 000000000000..47820cfdd00a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3099.yml @@ -0,0 +1,5 @@ +author: Skies-Of-Blue +changes: + - {balance: you can now float over tables when in 0g} + - {balance: you no longer shatter glass tables when floating} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3104.yml b/html/changelogs/AutoChangeLog-pr-3104.yml deleted file mode 100644 index 4666a37cf056..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3104.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: meemofcourse -changes: - - {code_imp: A lot of SUNS decals.} -delete-after: true diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml index 6eb29f13598a..0a3fe084958d 100644 --- a/html/changelogs/archive/2024-06.yml +++ b/html/changelogs/archive/2024-06.yml @@ -243,3 +243,26 @@ 2024-06-16: DIB-DOG: - rscadd: Added 1 Raksha Helmet to the sergeant's locker on the PGFN Crying Sun +2024-06-17: + meemofcourse: + - code_imp: A lot of SUNS decals. +2024-06-18: + '@thestripes, @meemofcourse , @GenericDM ': + - tweak: reflavors nearly every drink ingame + SomeguyManperson: + - rscadd: you can now put organs inside burgers or on pizzas +2024-06-19: + Anticept: + - bugfix: Generic adjective selection will show for everyone. + FalloutFalcon: + - bugfix: fixed multiple of the do_afters not working due to misplaced args + PositiveEntropy: + - rscadd: The Hunters of Illestren have now allowed for Hunter Collignes, Machinists + and Flamebearers to now roam the Frontier aboard their humble fleet! + - imageadd: The Saint Roumain's Militia has been fully resprited! + - imageadd: All SRM jobs now have unique HUD icons! + - imageadd: The Unknown Job HUD icon has been resprited! + SomeguyManperson: + - bugfix: mobs will no longer stick around after being butchered sometimes + Yata9ar4su: + - bugfix: Atmos mask sprite diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index d23ebfae4756..861bb2701699 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/clothing/faction/srm/head.dmi b/icons/mob/clothing/faction/srm/head.dmi new file mode 100644 index 000000000000..186d021abeb3 Binary files /dev/null and b/icons/mob/clothing/faction/srm/head.dmi differ diff --git a/icons/mob/clothing/faction/srm/suits.dmi b/icons/mob/clothing/faction/srm/suits.dmi new file mode 100644 index 000000000000..801414dceec7 Binary files /dev/null and b/icons/mob/clothing/faction/srm/suits.dmi differ diff --git a/icons/mob/clothing/faction/srm/uniforms.dmi b/icons/mob/clothing/faction/srm/uniforms.dmi new file mode 100644 index 000000000000..b43a33a34e8d Binary files /dev/null and b/icons/mob/clothing/faction/srm/uniforms.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index c2a73da609b9..f207b2bfd826 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index 385b3b37918e..bfcc9970930f 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index d64a4cbbf04f..4c37ff4d8bff 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/suits/toggle.dmi b/icons/mob/clothing/suits/toggle.dmi index 8ceffd1312c0..99fddcf51169 100644 Binary files a/icons/mob/clothing/suits/toggle.dmi and b/icons/mob/clothing/suits/toggle.dmi differ diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 3926bce0f3b1..dced69dc5b6f 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/mob/inhands/misc/food_lefthand.dmi b/icons/mob/inhands/misc/food_lefthand.dmi index 740c63c4b370..63dee7bfea44 100644 Binary files a/icons/mob/inhands/misc/food_lefthand.dmi and b/icons/mob/inhands/misc/food_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/misc/food_righthand.dmi index 1e90ac3cb75a..bb1bd3f960fb 100644 Binary files a/icons/mob/inhands/misc/food_righthand.dmi and b/icons/mob/inhands/misc/food_righthand.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index e0818c6853df..4de00230ac76 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/faction/srm/head.dmi b/icons/obj/clothing/faction/srm/head.dmi new file mode 100644 index 000000000000..8503fda7e3cf Binary files /dev/null and b/icons/obj/clothing/faction/srm/head.dmi differ diff --git a/icons/obj/clothing/faction/srm/suits.dmi b/icons/obj/clothing/faction/srm/suits.dmi new file mode 100644 index 000000000000..031fb45e3ba6 Binary files /dev/null and b/icons/obj/clothing/faction/srm/suits.dmi differ diff --git a/icons/obj/clothing/faction/srm/uniforms.dmi b/icons/obj/clothing/faction/srm/uniforms.dmi new file mode 100644 index 000000000000..ec410e52e600 Binary files /dev/null and b/icons/obj/clothing/faction/srm/uniforms.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index cf7f5ff09bd0..402ce131a988 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index 9eaa67f04a42..232a2f6ec2bd 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/suits/toggle.dmi b/icons/obj/clothing/suits/toggle.dmi index 54df84ad5def..75a2f1a891b3 100644 Binary files a/icons/obj/clothing/suits/toggle.dmi and b/icons/obj/clothing/suits/toggle.dmi differ diff --git a/icons/obj/drinks/drinks.dmi b/icons/obj/drinks/drinks.dmi index 6db6f9bb80a6..fa3df8febf1a 100644 Binary files a/icons/obj/drinks/drinks.dmi and b/icons/obj/drinks/drinks.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 70a39551e007..7bb3288356ed 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1968,6 +1968,7 @@ #include "code\modules\clothing\factions\hardliners.dm" #include "code\modules\clothing\factions\nanotrasen.dm" #include "code\modules\clothing\factions\ngr.dm" +#include "code\modules\clothing\factions\srm.dm" #include "code\modules\clothing\factions\suns.dm" #include "code\modules\clothing\glasses\_glasses.dm" #include "code\modules\clothing\glasses\engine_goggles.dm" diff --git a/tools/UpdatePaths/Scripts/3109_drinks_lore_update.txt b/tools/UpdatePaths/Scripts/3109_drinks_lore_update.txt new file mode 100644 index 000000000000..712c2a906ffc --- /dev/null +++ b/tools/UpdatePaths/Scripts/3109_drinks_lore_update.txt @@ -0,0 +1,11 @@ +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game : /obj/item/reagent_containers/food/drinks/soda_cans/pacfuel +/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime : /obj/item/reagent_containers/food/drinks/soda_cans/orange_soda +/obj/item/reagent_containers/food/drinks/soda_cans/starkist : /obj/item/reagent_containers/food/drinks/soda_cans/lunapunch +/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind : /obj/item/reagent_containers/food/drinks/soda_cans/comet_trail +/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko : /obj/item/reagent_containers/food/drinks/soda_cans/vimukti +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb : /obj/item/reagent_containers/food/drinks/soda_cans/tadrixx +/obj/item/reagent_containers/food/drinks/soda_cans/shamblers : /obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch +/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull : /obj/item/reagent_containers/food/drinks/soda_cans/crosstalk +/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy : /obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy +/obj/item/reagent_containers/food/drinks/britcup : /obj/item/reagent_containers/food/drinks/mug +/obj/item/reagent_containers/food/drinks/solgovcup : /obj/item/reagent_containers/food/drinks/mug