diff --git a/aquila/code/game/objects/effects/contraband.dm b/aquila/code/game/objects/effects/contraband.dm index 1521978f115..d81e94a9fc4 100644 --- a/aquila/code/game/objects/effects/contraband.dm +++ b/aquila/code/game/objects/effects/contraband.dm @@ -421,3 +421,53 @@ name = "PRACA PRACA" desc = "Coś trzeba zrobić?" icon_state = "poster48_legit" + +/obj/structure/sign/poster/official/nfz_sor + name = "SOR" + desc = "Plakat oznaczający Szpitalny Oddział Ratunkowy" + icon_state = "poster49_legit" + +/obj/structure/sign/poster/official/nfz_pij_mleko + name = "NFZ - Pij mleko!" + desc = "Plakat promujący szeroko zakrojoną akcję " + icon_state = "poster50_legit" + +/obj/structure/sign/poster/official/nfz_koronawirus + name = "NFZ - UWAGA, KORONAWIRUS!" + desc = "Plakat ostrzegający przed koronawirusem łudząco przypominającym wschodzące słońce." + icon_state = "poster51_legit" + +/obj/structure/sign/poster/official/nfz_krwiodawstwo + name = "Punkt Krwiodawstwa" + desc = "Plakat oznaczający Punkt Krwiodawstwa" + icon_state = "poster52_legit" + +/obj/structure/sign/poster/official/nfz_myj_rece + name = "MYJ RĘCE!" + desc = "Plakat przypominający o konieczności mycia rąk, brudasie." + icon_state = "poster53_legit" + +/obj/structure/sign/poster/official/nfz_infolinia + name = "Infolinia NFZ" + desc = "Plakat reklamujący Infolinię NFZ - dziwnym trafem nie zawiera numeru telefonu." + icon_state = "poster54_legit" + +/obj/structure/sign/poster/official/nfz_rak_piersi + name = "Uważaj na raka piersi!" + desc = "Plakat NFZ z symbolem różowej wstążki - międzynarodowym symbolem oznaczającym walkę z rakiem piersi." + icon_state = "poster55_legit" + +/obj/structure/sign/poster/official/nfz_poz + name = "POZ+" + desc = "Plakat reklamujący pionierski system opieki zdrowotnej organizacji opieki koordynowanej." + icon_state = "poster56_legit" + +/obj/structure/sign/poster/official/nfz_leki75 + name = "Darmowe leki 75+" + desc = "Plakat informujący pacjentów o darmowych lekach dla osób w wieku powyżej 75 lat." + icon_state = "poster57_legit" + +/obj/structure/sign/poster/official/nfz_ewus + name = "eWUŚ" + desc = "Plakat informujący o wdrożeniu systemu eWUŚ - Elektronicznej Weryfikacja Uprawnień Świadczeniobiorców. Chyba jesteś ubezpieczony, prawda?" + icon_state = "poster58_legit" diff --git a/aquila/code/modules/food_and_drinks/drinks/drinks.dm b/aquila/code/modules/food_and_drinks/drinks/drinks.dm index c4b46d4ab7f..f485eeec173 100644 --- a/aquila/code/modules/food_and_drinks/drinks/drinks.dm +++ b/aquila/code/modules/food_and_drinks/drinks/drinks.dm @@ -17,5 +17,30 @@ desc = "Najlepsze w całym kosmosie." icon = 'aquila/icons/obj/drinks.dmi' icon_state = "mocnyfull" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) foodtype = GRAIN | ALCOHOL + +/obj/item/reagent_containers/food/drinks/bottle/tymbark + name = "Tymbark jabłko - mięta" + desc = "Smak wakacji." + custom_price = 10 + icon = 'aquila/icons/obj/drinks.dmi' + icon_state = "tymkapsel" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + isGlass = TRUE + list_reagents = list(/datum/reagent/consumable/applejuice = 50) + foodtype = FRUIT | SUGAR + +/obj/item/reagent_containers/food/drinks/soda_cans/helenka + name = "Helena jabłko - truskawka" + desc = "Smak działki." + custom_price = 20 + icon = 'aquila/icons/obj/drinks.dmi' + icon_state = "helenka" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + list_reagents = list(/datum/reagent/consumable/applejuice = 100) + foodtype = FRUIT | SUGAR diff --git a/aquila/code/modules/vending/boozeomat.dm b/aquila/code/modules/vending/boozeomat.dm index bc97d8bb337..1a546fa3137 100644 --- a/aquila/code/modules/vending/boozeomat.dm +++ b/aquila/code/modules/vending/boozeomat.dm @@ -14,6 +14,7 @@ /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, /obj/item/reagent_containers/food/drinks/ale = 6, /obj/item/reagent_containers/food/drinks/beer = 6, + /obj/item/reagent_containers/food/drinks/bottle/amarena = 5, /obj/item/reagent_containers/food/drinks/bottle/gin = 5, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5, /obj/item/reagent_containers/food/drinks/bottle/tequila = 5, @@ -32,4 +33,5 @@ /obj/item/reagent_containers/food/drinks/bottle/blank/small = 15, /obj/item/reagent_containers/food/drinks/bottle/blank/small = 15, /obj/item/reagent_containers/food/drinks/soda_cans/mocnyfull = 6, - ) + /obj/item/reagent_containers/food/drinks/bottle/tymbark = 6, + /obj/item/reagent_containers/food/drinks/soda_cans/helenka = 6) diff --git a/aquila/icons/obj/contraband.dmi b/aquila/icons/obj/contraband.dmi index 2d83d85700a..4ba3d1370b2 100644 Binary files a/aquila/icons/obj/contraband.dmi and b/aquila/icons/obj/contraband.dmi differ diff --git a/aquila/icons/obj/drinks.dmi b/aquila/icons/obj/drinks.dmi index fc235db6356..0c4b6087fe0 100644 Binary files a/aquila/icons/obj/drinks.dmi and b/aquila/icons/obj/drinks.dmi differ diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 22e080f291e..7afbeba5ad9 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -139,7 +139,7 @@ icon_state = "pand[(beaker) ? "1" : "0"][powered() ? "" : "_nopower"]" if(wait) - add_overlay("waitlight") + add_overlay("waitlight_pand") else cut_overlays() diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 182ca1b4ac9..2a5180cd377 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -95,6 +95,9 @@ color = "#ECFF56" // rgb: 236, 255, 86 chem_flags = NONE taste_description = "apples" + glass_icon_state = "glass_orange" + glass_name = "glass of apple juice" + glass_desc = "Apple juice. Or maybe it's cider. Who cares?" hydration_factor = 12 * REAGENTS_METABOLISM /datum/reagent/consumable/poisonberryjuice diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 41e7a67d481..0b8160ec1d4 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -267,13 +267,13 @@ /obj/item/reagent_containers/pill/floorpill name = "floorpill" - desc = "A strange pill found in the depths of maintenance. Somehow, it can't be dissolved or used in a grinder." + desc = "A strange pill found in the depths of maintenance."// Somehow, it can't be dissolved or used in a grinder." icon_state = "pill21" var/static/list/names = list("maintenance pill","floorpill","mystery pill","suspicious pill","strange pill") var/static/list/descs = list("Your feeling is telling you no, but...","Drugs are expensive, you can't afford not to eat any pills that you find."\ , "Surely, there's no way this could go bad.") - prevent_grinding = TRUE - dissolvable = FALSE + //prevent_grinding = TRUE // AQ EDIT - floor pills now grindable + //dissolvable = FALSE // AQ EDIT - and dissolvable! /obj/item/reagent_containers/pill/floorpill/Initialize(mapload) list_reagents = list(get_random_reagent_id(CHEMICAL_RNG_FUN) = rand(10,50)) diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index c2be728b86f..73ae961f3c5 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -13,7 +13,9 @@ /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/glass/waterbottle = 10) + /obj/item/reagent_containers/glass/waterbottle = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/helenka = 10, + /obj/item/reagent_containers/food/drinks/bottle/tymbark = 10,) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index f448b6a8d48..f2d5b45e502 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index acbfe70cf6f..a8ed614e55b 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 72b3cb33bb6..8bee778d165 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/nsv13/icons/obj/card.dmi b/nsv13/icons/obj/card.dmi index 320b985d479..f2d2748e0fb 100644 Binary files a/nsv13/icons/obj/card.dmi and b/nsv13/icons/obj/card.dmi differ