Merge branch 'smithing' of https://github.com/dwasint/Monkestation2.0 …

…into smithing
Monkestation · Apr 10, 2024 · 96c7f70 · 96c7f70
2 parents bff6e8e + ae310fd
commit 96c7f70
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/_maps/~monkestation/RandomBars/Tram/tram_rvb_bar.dmm b/_maps/~monkestation/RandomBars/Tram/tram_rvb_bar.dmm
@@ -1810,7 +1810,7 @@
 /area/station/commons/lounge)
 "BV" = (
 /obj/effect/spawner/structure/window,
-/turf/open/space/basic,
+/turf/open/floor/plating,
 /area/station/commons/lounge)
 "Cd" = (
 /obj/machinery/door/airlock/public/glass{

diff --git a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
@@ -101,3 +101,7 @@
 	name = "Nuka Cola"
 	list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
 
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/pina_colada
+	name = "Pina Colada"
+	list_reagents = list(/datum/reagent/consumable/ethanol/pina_colada = 50)
+
diff --git a/html/changelogs/AutoChangeLog-pr-1607.yml b/html/changelogs/AutoChangeLog-pr-1607.yml
diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml
@@ -126,3 +126,11 @@
   Tractor Mann:
   - bugfix: fixed Rocket Jump Waltz in the jukebox, you can actually listen to it
       end now hopefully.
+2024-04-09:
+  DimWhat:
+  - bugfix: Simians no longer turn invisible when husked.
+  KnigTheThrasher:
+  - rscadd: Added a new reagent container (aka. I fixed the bitrunning beach bar)
+2024-04-10:
+  JohnFulpWillard:
+  - bugfix: Malkavian bloodsuckers now whisper revelations again.
diff --git a/monkestation/code/modules/bloodsuckers/clans/malkavian.dm b/monkestation/code/modules/bloodsuckers/clans/malkavian.dm
@@ -41,7 +41,7 @@
 	if(prob(85) || bloodsuckerdatum.owner.current.stat != CONSCIOUS || HAS_TRAIT(bloodsuckerdatum.owner.current, TRAIT_MASQUERADE))
 		return
 	var/message = pick(strings("malkavian_revelations.json", "revelations", "fulp_modules/strings/bloodsuckers"))
-	INVOKE_ASYNC(bloodsuckerdatum.owner.current, /atom/movable/proc/say, message, , , , , , CLAN_MALKAVIAN)
+	INVOKE_ASYNC(bloodsuckerdatum.owner.current, TYPE_PROC_REF(/atom/movable, say), message, , , , , , CLAN_MALKAVIAN)
 
 /datum/bloodsucker_clan/malkavian/on_favorite_vassal(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum)
 	var/mob/living/carbon/carbonowner = vassaldatum.owner.current

diff --git a/...e/slime_accessories.dm/_base_accessory.dm → ...core/slime_accessories/_base_accessory.dm b/...e/slime_accessories.dm/_base_accessory.dm → ...core/slime_accessories/_base_accessory.dm
diff --git a/tgstation.dme b/tgstation.dme
@@ -6725,7 +6725,6 @@
 #include "monkestation\code\modules\skyrat_snipes\vending_machines\vendors.dm"
 #include "monkestation\code\modules\slash_commands\world_topics.dm"
 #include "monkestation\code\modules\slimecore\research_and_recipes.dm"
-#include "monkestation\code\modules\slimecore\slime_accessories.dm\_base_accessory.dm"
 #include "monkestation\code\modules\slimecore\animations\slime_effects.dm"
 #include "monkestation\code\modules\slimecore\assets\xenobiology.dm"
 #include "monkestation\code\modules\slimecore\components\basic_scared_of_item.dm"
@@ -6788,6 +6787,7 @@
 #include "monkestation\code\modules\slimecore\mobs\pet_commands\stop_feeding.dm"
 #include "monkestation\code\modules\slimecore\reagents\_base_reagent.dm"
 #include "monkestation\code\modules\slimecore\reagents\base_colors.dm"
+#include "monkestation\code\modules\slimecore\slime_accessories\_base_accessory.dm"
 #include "monkestation\code\modules\slimecore\slime_color_mutations\_base_color.dm"
 #include "monkestation\code\modules\slimecore\slime_color_mutations\colors.dm"
 #include "monkestation\code\modules\slimecore\slime_color_mutations\mutations\_base_mutation.dm"