special fran changes episode 4

modular_zapoc/modules/areas/code/areas.dm

@@ -76,6 +76,12 @@
 	icon_state = "shop"
 	fire_controled = TRUE
 
+/area/vtm/interior/shop/music
+	name = "Music Store"
+
+/area/vtm/interior/shop/wharf_shop
+	name = "Wharfside Coffee"
+
 /area/vtm/interior/radio
 	name = "Nightwolf Radio"
 	icon_state = "shop"
@@ -96,3 +102,113 @@
 	name = "76er Basement"
 	icon_state = "shop"
 	fire_controled = TRUE
+
+/area/vtm/interior/shop/chinese
+	name = "Chinese Restaurant"
+	fire_controled = TRUE
+
+/area/vtm/interior/caves/beach
+	name = "Beachside Cave"
+
+/area/vtm/interior/caves/ghetto
+	name = "Fisherman's Wharf Ghetto Cave"
+
+// Special Fran Misc
+/area/vtm/interior/supply/underpass
+	name = "Supply Underpass"
+	icon_state = "supply"
+	ambience_index = AMBIENCE_CITY
+	domain = FALSE
+
+/area/vtm/interior/supply/shed
+	name = "Supply Utility Shed"
+	domain = FALSE
+
+/area/vtm/interior/commerce_tower
+	name = "Commerce Tower"
+	fire_controled = TRUE
+
+/area/vtm/interior/commerce_tower/vacant_office
+	name = "Vacant Office"
+
+/area/vtm/interior/apartment/hallway
+	name = "Millenium Apartments Hallway"
+	domain = FALSE
+
+/area/vtm/interior/apartment/overhang
+	name = "Millenium Apartments Overhang"
+	domain = FALSE
+	ambience_index = AMBIENCE_CITY
+	fire_controled = FALSE
+
+/area/vtm/interior/apartment/fishermanswharf
+	name = "Fisherman's Wharf Suburb Housing"
+	domain = FALSE
+	fire_controled = FALSE
+
+/area/vtm/interior/ghetto/sewer
+	name = "Sewer Apartments"
+	zone_type = ZONE_NO_MASQUERADE
+	domain = FALSE
+
+/area/vtm/interior/ghetto/fishermanswharf
+	name = "Fisherman's Wharf Ghetto Apartments"
+
+/area/vtm/interior/ghetto/sewer/north
+	name = "Sewer Apartments North"
+
+/area/vtm/interior/millennium_tower/overhang
+	name = "Millennium Tower Overhang"
+	icon_state = "millenniumtowerf2"
+	ambience_index = AMBIENCE_CITY
+	ambient_buzz = null
+	music_index = null
+	zone_type = ZONE_MASQUERADE
+	fire_controled = FALSE
+	domain = FALSE
+
+// Special fran misc exterior
+/area/vtm/outside/rooftops
+	name = "Rooftops"
+
+/area/vtm/outside/financialdistrict/rooftops
+	name = "Financial District Rooftops"
+	domain = FALSE
+
+/area/vtm/outside/ghetto/rooftops
+	name = "Ghetto Rooftops"
+	domain = FALSE
+
+/area/vtm/outside/pacificheights/rooftops
+	name = "Pacific Heights"
+	domain = FALSE
+
+/area/vtm/outside/chinatown/rooftops
+	name = "Chinatown Rooftops"
+	domain = FALSE
+
+/area/vtm/outside/fishermanswharf/rooftops
+	name = "Fisherman's Wharf Rooftops"
+	domain = FALSE
+
+/area/vtm/outside/fishermanswharf/suburbs
+	name = "Fisherman's Wharf Suburbs"
+	domain = FALSE
+
+/area/vtm/outside/fishermanswharf/suburbs/rooftops
+	name = "Fisherman's Wharf Suburb Rooftops"
+	domain = FALSE
+
+/area/vtm/outside/fishermanswharf/ghetto/rooftops
+	name = "Fisherman's Wharf Ghetto Rooftops"
+
+/area/vtm/outside/unionsquare/rooftops
+	name = "Union Square Rooftops"
+	domain = FALSE
+
+/area/vtm/outside/supply/rooftops
+	name = "Supply Rooftops"
+	domain = FALSE
+
+/area/vtm/outside/northbeach/ocean
+	name = "Ocean"

modular_zapoc/modules/areas/code/voivodate.dm

@@ -6,13 +6,12 @@
 	icon_state = "old_clan_tzimisce"
 	// zone_type = "elysium"
 	music_index = MUSIC_PRINCE
+	zone_type = ZONE_ELYSIUM
 
 /area/vtm/interior/voivodate/sanctum
 	name = "Seer's Estate Sanctum"
 	icon_state = "old_clan_sanctum"
-	//zone_type = "elysium"
-	//musictracks = list('sound/musictracks/nosferatu.ogg')
 
 /area/vtm/interior/voivodate/cave
 	name = "Seer's Estate Cave"
-	// zone_type = "battle"
+	zone_type = ZONE_NO_MASQUERADE

modular_zapoc/modules/areas/code/western_eye.dm

@@ -1,13 +1,17 @@
 /area/vtm/interior/forest
 	name = "Forest"
 	music_index = MUSIC_FOREST
+	zone_type = ZONE_NO_MASQUERADE
 
 /area/vtm/outside/forest/sept
 	name = "Sinkhole Cave"
 	sound_environment = SOUND_ENVIRONMENT_CAVE
+	zone_type = ZONE_ELYSIUM
+
 /area/vtm/interior/forest/sept
 	name = "Sinkhole Cave"
 	sound_environment = SOUND_ENVIRONMENT_CAVE
+	zone_type = ZONE_ELYSIUM
 
 /area/vtm/interior/forest/cave
 	name = "Forest Cave"

modular_zapoc/modules/items/fluff/notes.dm

@@ -0,0 +1,64 @@
+// Church notes
+/obj/item/paper/fluff/lasombra_haven
+	name = "memo"
+	default_raw_text = {"Please make this hallway shorter.<br>
+		<br>
+		Signed,<br>
+		*BT*
+	"}
+
+/obj/item/paper/fluff/lasombra_haven/two
+	name = "second memo"
+	default_raw_text = {"Your obedience is appreciated.<br>
+	<br>
+	Signed,<br>
+	*BT*
+	"}
+
+/obj/item/paper/fluff/lasombra_haven/three
+	name = "final memo"
+	default_raw_text = {"Funding has been pulled. Find somewhere else to loiter.<br>
+	<br>
+	Signed,<br>
+	*BT*
+	"}
+
+// Clinic notes
+/obj/item/paper/fluff/formaldehyde
+	name = "formaldehyde memo"
+	default_raw_text = {"<h2><center><b>Regarding Formaldehyde</b></center></h2>
+	<hr>
+	After a long time of begging the city, they've agreed to give us funding to purchase medical formaldehyde.
+	However, they were very clear that we were <b>NOT</b> to waste it. Consider this note a guide, unless you want to talk
+	to someone who can do more than just write a note.
+	<hr>
+	<h3>\"Section A.: My patient was deceased when they arrived!\"</h3><br>
+	● Take an eyedropper from the storage room (if your coworkers aren't savages, there will be a few on the table where you found this note).<br>
+	● Draw 1 unit of formaldehyde from the bottle on the table with this note (once again, assuming your coworkers aren't savages).<br>
+	● Apply the solution into the open eye of the cadaver. This will prevent decay of the cadaver's organs.<br>
+	● Mend the wounds of the patient as much as possible.<br>
+	● Perform neurosurgery.<br>
+	● Perform a coronary bypass <b>ONLY IF NEEDED</b>.<br>
+	● Perform lobectomy <b>ONLY IF NEEDED</b>.<br>
+	● Perform a hepatectomy <b>ONLY IF NEEDED</b>.<br>
+	● Perform a gastrectomy <b>ONLY IF NEEDED</b>.<br>
+	● Make sure they have enough blood to sustain respiration.<br>
+	● Apply shock.<br>
+	● Perform CPR <b>OR</b> treat with 2 to 5 units of convermol (or 5 units of salbutomol).<br>
+	● When respirtory distress subsides, apply anesthetic mask.<br>
+	● Continue surgery until patient is stable.<br>
+	● Success! You've saved a life!<br>
+	<hr>
+	<h3>\"Section B.: We're all out of formaldehyde!\"</h3><br>
+	● Are you sure? Check the morgue.<br>
+	● Extend the injection tube from the tank into your bottle.<br>
+	<hr>
+	<h3>\"Section C.: The patient's organ has already been treated!\"</h3><br>
+	● Don't panic. Obtain a replacement organ from storage. The freezer should be in the corner of this room (we're assuming things again).<br>
+	<hr>
+	<h3>\"Section D.: There are no more organs in storage!\"</h3><br>
+	● Follow steps 1-5 of section A.<br>
+	● File an organ transplant form (FFr-99b)<br>
+	● <del>Keep the body frozen for up to 4 hours and no more.</del><br>
+	<h6><font color=\"#708090\">There are other ways. None that I can write down with the director watching. Be smart. See the <del>dealer</del>.</font><h6>
+	"}

modular_zapoc/modules/structures/formaldehyde_tank.dm

@@ -0,0 +1,15 @@
+/obj/machinery/iv_drip/formaldehyde
+	name = "formaldehyde tank"
+	desc = "An all-you-can-drip formaldehyde canister designed to supply a hospital without running out, with a scary looking pump rigged to inject formaldehyde into containers, but filling people directly might be a bad idea."
+	icon_state = "plumb_donating"
+	base_icon_state = "plumb_donating"
+	density = TRUE
+	inject_only = TRUE
+	anchored = TRUE
+	use_internal_storage = TRUE
+	internal_list_reagents = list(/datum/reagent/toxin/formaldehyde = 5000)
+	internal_volume_maximum = 5000
+
+/obj/machinery/iv_drip/formaldehyde/Initialize(mapload)
+	AddElement(/datum/element/update_icon_blocker)
+	. = ..()

tgstation.dme

@@ -8328,6 +8328,7 @@
 #include "modular_zapoc\modules\gray_masses\code\gray_man.dm"
 #include "modular_zapoc\modules\gray_masses\code\tall_gray_man.dm"
 #include "modular_zapoc\modules\items\code\keys.dm"
+#include "modular_zapoc\modules\items\fluff\notes.dm"
 #include "modular_zapoc\modules\jobs\code\_departments.dm"
 #include "modular_zapoc\modules\jobs\code\voivode.dm"
 #include "modular_zapoc\modules\jobs\code\ocean76\handler.dm"
@@ -8338,4 +8339,5 @@
 #include "modular_zapoc\modules\mapping\code\transfer_zones.dm"
 #include "modular_zapoc\modules\mobs\code\cockroach.dm"
 #include "modular_zapoc\modules\smites\code\crystal.dm"
+#include "modular_zapoc\modules\structures\formaldehyde_tank.dm"
 // END_INCLUDE