From eb2ec423455b5aea30e0936efbae180c810009be Mon Sep 17 00:00:00 2001 From: Whitellama Date: Sat, 19 Jul 2014 16:22:09 -0700 Subject: [PATCH 1/4] Fixed #5697, grammatical error with empty glasses, cans, condiment containers --- code/modules/reagents/reagent_containers/food/cans.dm | 2 +- code/modules/reagents/reagent_containers/food/condiment.dm | 2 +- code/modules/reagents/reagent_containers/food/drinks.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index b83b7623f5..118b8cf6a2 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -17,7 +17,7 @@ var/fillevel = gulp_size if(!R.total_volume || !R) - user << "\red None of [src] left, oh no!" + user << "\red The [src.name] is empty!" return 0 if(M == user) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index dccb59a3e7..ee5be182dd 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -24,7 +24,7 @@ var/datum/reagents/R = src.reagents if(!R || !R.total_volume) - user << "\red None of [src] left, oh no!" + user << "\red The [src.name] is empty!" return 0 if(M == user) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index a9aa234060..1a0fba6426 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -23,7 +23,7 @@ var/fillevel = gulp_size if(!R.total_volume || !R) - user << "\red None of [src] left, oh no!" + user << "\red The [src.name] is empty!" return 0 if(M == user) From 97e3b0e38e4599e6d85efba16f57d55013842faf Mon Sep 17 00:00:00 2001 From: Whitellama Date: Sat, 19 Jul 2014 17:01:28 -0700 Subject: [PATCH 2/4] Gave gardeners access to the rest of the hydroponics pasture, fixing #5690 --- maps/tgstation2.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index d7b9db15d2..82877105a9 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -1649,7 +1649,7 @@ "aFK" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/wall,/area/storage/tools) "aFL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/wall,/area/maintenance/port) "aFM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/wall,/area/storage/tools) -"aFN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass{name = "Hydroponics Pasture"; req_access_txt = "28"},/turf/simulated/floor,/area/hydroponics) +"aFN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass{name = "Hydroponics Pasture"; req_access_txt = "35"},/turf/simulated/floor,/area/hydroponics) "aFO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/wall,/area/crew_quarters/locker) "aFP" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/turf/simulated/floor/plating,/area/maintenance/port) "aFQ" = (/obj/machinery/door/airlock/command{name = "Conference Room"; req_access = null; req_access_txt = "19"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/bridge/meeting_room) From 342a187c8bf856a86bf281c03a758250ff012afb Mon Sep 17 00:00:00 2001 From: Whitellama Date: Sat, 19 Jul 2014 18:33:30 -0700 Subject: [PATCH 3/4] Eating with utensils now produces the eating sound, fixed #5687 --- code/game/objects/items/weapons/kitchen.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 4181ef6e20..5d72495520 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -32,7 +32,7 @@ /obj/item/weapon/kitchen/utensil/New() if (prob(60)) src.pixel_y = rand(0, 4) - + create_reagents(5) return @@ -58,7 +58,7 @@ for(var/mob/O in viewers(M, null)) O.show_message(text("\blue [] feeds [] some [] from \the []", user, M, loaded, src), 1) M.reagents.add_reagent("nutriment", 1) - + playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1) overlays.Cut() return From 266d8d25fa191a0420e8749a788a76cac1372580 Mon Sep 17 00:00:00 2001 From: Whitellama Date: Sat, 19 Jul 2014 19:11:30 -0700 Subject: [PATCH 4/4] Fixed #5685: Changelings now gain the species needed to transform when acquiring DNA using the extract DNA sting --- code/game/gamemodes/changeling/changeling_powers.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index c338b2e42d..be2bb88a17 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -844,11 +844,13 @@ var/list/datum/dna/hivemind_bank = list() if(!changeling) return 0 - var/mob/living/carbon/T = changeling_sting(40, /mob/proc/changeling_extract_dna_sting) + var/mob/living/carbon/human/T = changeling_sting(40, /mob/proc/changeling_extract_dna_sting) if(!T) return 0 T.dna.real_name = T.real_name changeling.absorbed_dna |= T.dna + if(T.species && !(T.species.name in changeling.absorbed_species)) + changeling.absorbed_species += T.species.name feedback_add_details("changeling_powers","ED") return 1 \ No newline at end of file