Merge branch 'master' into patch-1

ss220club · Dec 6, 2023 · 695d9ff · 695d9ff
2 parents a15c5e2 + d8fc877
commit 695d9ff
Show file tree

Hide file tree

Showing 17 changed files with 6,497 additions and 6,407 deletions.
diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm
diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm
@@ -4425,6 +4425,25 @@
 /area/station/security/lobby)
 "asY" = (
 /obj/structure/chair/office/dark,
+/obj/machinery/door_control/normal/east{
+	id = "BrigRight";
+	name = "Brig Foyer Right Doors";
+	req_one_access_txt = "63"
+	},
+/obj/machinery/door_control/normal/east{
+	pixel_y = 8;
+	name = "Brig Foyer Left Doors";
+	req_one_access_txt = "63";
+	desc = "A remote control switch for the brig foyer.";
+	id = "BrigLeft"
+	},
+/obj/machinery/door_control/normal/east{
+	pixel_y = -8;
+	desc = "A remote control switch for the brig foyer.";
+	id = "BrigEast";
+	name = "Brig Foyer East Doors";
+	req_one_access_txt = "63"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "darkred"
@@ -4877,29 +4896,13 @@
 	icon_state = "4-8"
 	},
 /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general,
-/obj/machinery/door_control/normal{
-	desc = "A remote control switch for the brig foyer.";
-	id = "BrigLeft";
-	name = "Brig Foyer Left Doors";
-	pixel_x = -5;
-	pixel_y = 6;
-	req_one_access_txt = "63"
-	},
-/obj/machinery/door_control/normal{
-	desc = "A remote control switch for the brig foyer.";
-	id = "BrigRight";
-	name = "Brig Foyer Right Doors";
-	pixel_x = 5;
-	pixel_y = 6;
-	req_one_access_txt = "63"
+/obj/item/paper_bin{
+	pixel_y = 3;
+	pixel_x = -4
 	},
-/obj/machinery/door_control/normal{
-	desc = "A remote control switch for the brig foyer.";
-	id = "BrigEast";
-	name = "Brig Foyer East Doors";
-	pixel_x = 5;
-	pixel_y = -2;
-	req_one_access_txt = "63"
+/obj/item/pen{
+	pixel_x = -2;
+	pixel_y = 5
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull"
@@ -54276,7 +54279,7 @@
 /obj/effect/turf_decal/arrows/black{
 	dir = 8
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 8;
 	id_tag = "hopqueue";
 	name = "Privacy Shutters"
@@ -60578,6 +60581,8 @@
 /obj/item/radio/intercom/custom{
 	pixel_y = 36
 	},
+/obj/structure/filingcabinet/security,
+/obj/machinery/light/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "darkred"
@@ -64752,10 +64757,9 @@
 /obj/machinery/door/airlock/medical/glass{
 	name = "Isolator"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 1;
-	id_tag = "durka2";
-	layer = 4
+	id_tag = "durka2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -69724,10 +69728,9 @@
 /obj/item/reagent_containers/glass/beaker/waterbottle/large{
 	pixel_x = 7
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 1;
-	id_tag = "durka2";
-	layer = 4
+	id_tag = "durka2"
 	},
 /obj/machinery/door/window/reinforced/normal{
 	dir = 1;
@@ -76973,7 +76976,7 @@
 /obj/effect/turf_decal/arrows/black{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 8;
 	id_tag = "hopqueue";
 	name = "Privacy Shutters"
@@ -78677,14 +78680,13 @@
 /obj/machinery/door/airlock/medical/glass{
 	name = "Isolator"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
-	id_tag = "durka1";
-	layer = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/mapping_helpers/airlock/access/any/medical/psychology,
+/obj/machinery/door/poddoor/shutters/window/preopen{
+	dir = 1;
+	id_tag = "durka1"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -78987,11 +78989,6 @@
 	},
 /area/station/engineering/atmos)
 "pTa" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
-	id_tag = "durka1";
-	layer = 4
-	},
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/reinforced/normal{
 	name = "Secure Desk"
@@ -79003,6 +79000,10 @@
 /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/psychology{
 	dir = 1
 	},
+/obj/machinery/door/poddoor/shutters/window/preopen{
+	dir = 1;
+	id_tag = "durka1"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},

diff --git a/code/modules/newscaster/obj/newspaper.dm b/code/modules/newscaster/obj/newspaper.dm
@@ -43,7 +43,7 @@
 		return
 	if(ishuman(user))
 		var/mob/living/carbon/human/human_user = user
-		var/dat
+		var/dat = {"<meta charset="UTF-8">"} // SS220 ADDITION
 		pages = 0
 		switch(screen)
 			if(SCREEN_COVER) //Cover
@@ -164,7 +164,7 @@
 			to_chat(user, "<span class='notice'>There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?</span>")
 		else
 			var/s = strip_html(input(user, "Write something", "Newspaper", ""))
-			s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN))	// SS220 EDIT - ORIGINAL: copytext
+			s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN))
 			if(!s || !Adjacent(user))
 				return
 			scribble_page = curr_page

diff --git a/modular_ss220/aesthetics/shutters/code/shutters.dm b/modular_ss220/aesthetics/shutters/code/shutters.dm
@@ -1,5 +1,6 @@
 /obj/machinery/door/poddoor/shutters
 	icon = 'modular_ss220/aesthetics/shutters/icons/shutters.dmi'
+	layer = CLOSED_BLASTDOOR_LAYER
 	var/door_open_sound = 'modular_ss220/aesthetics/shutters/sound/shutters_open.ogg'
 	var/door_close_sound = 'modular_ss220/aesthetics/shutters/sound/shutters_close.ogg'
 
@@ -11,3 +12,15 @@
 		if("closing")
 			flick("closing", src)
 			playsound(src, door_close_sound, 30, TRUE)
+
+/obj/machinery/door/poddoor/shutters/window
+	name = "windowed shutters"
+	desc = "A shutter with a thick see-through polycarbonate window."
+	icon = 'modular_ss220/aesthetics/shutters/icons/shutters_glass.dmi'
+	icon_state = "closed"
+	opacity = FALSE
+	glass = TRUE
+
+/obj/machinery/door/poddoor/shutters/window/preopen
+	icon_state = "open"
+	density = FALSE
diff --git a/modular_ss220/aesthetics/shutters/icons/shutters_glass.dmi b/modular_ss220/aesthetics/shutters/icons/shutters_glass.dmi
diff --git a/modular_ss220/clothing/code/hev_suit.dm b/modular_ss220/clothing/code/hev_suit.dm
@@ -35,8 +35,6 @@
 
 	var/list/sound_queue = list()
 
-	var/emag_doses_left = 5
-
 	var/mob/living/carbon/owner
 
 	var/obj/item/geiger_counter/GC
@@ -61,7 +59,7 @@
 	var/sound_file = sound_data[1]
 	var/sound_delay = sound_data[2]
 
-	playsound(src, sound_file, 50)
+	playsound(owner, sound_file, 20)
 
 	sound_queue.Cut(1,2)
 
@@ -70,16 +68,6 @@
 
 	addtimer(CALLBACK(src, PROC_REF(process_sound_queue)), sound_delay)
 
-/obj/item/clothing/suit/space/hev/emag_act(mob/user, obj/item/card/emag/emag_card)
-	if(flags & emagged)
-		return FALSE
-	if(owner)
-		to_chat(owner, span_warning("You need to take off \the [name] before emagging it."))
-		return FALSE
-	flags |= emagged
-	do_sparks(8, FALSE, get_turf(src))
-	return TRUE
-
 /obj/item/clothing/suit/space/hev/proc/add_queue(desired_file, desired_delay, purge_queue=FALSE)
 
 	var/was_empty_sound_queue = !length(sound_queue)
@@ -100,12 +88,10 @@
 	if(slot == SLOT_HUD_OUTER_SUIT && iscarbon(M))
 		for(var/voice in funny_signals)
 			RegisterSignal(M, voice, funny_signals[voice])
-			add_queue('modular_ss220/aesthetics_sounds/sound/hev/blip.ogg', 2 SECONDS, purge_queue=TRUE)
 			owner = M
+			add_queue('modular_ss220/aesthetics_sounds/sound/hev/blip.ogg', 2 SECONDS, purge_queue=TRUE)
 			add_queue('modular_ss220/aesthetics_sounds/sound/hev/01_hev_logon.ogg', 11 SECONDS)
-			add_queue('modular_ss220/aesthetics_sounds/sound/hev/03_atmospherics_on.ogg', 6 SECONDS)
-			add_queue('modular_ss220/aesthetics_sounds/sound/hev/08_communications_on.ogg', 5 SECONDS)
-			add_queue('modular_ss220/aesthetics_sounds/sound/hev/04_vitalsigns_on.ogg', 5 SECONDS)
+			add_queue('modular_ss220/aesthetics_sounds/sound/hev/04_vitalsigns_on.ogg', 4 SECONDS)
 			add_queue('modular_ss220/aesthetics_sounds/sound/hev/09_safe_day.ogg', 8 SECONDS)
 	else
 		for(var/voice in funny_signals)
@@ -124,15 +110,14 @@
 //Mute
 /obj/item/clothing/suit/space/hev/proc/handle_speech(datum/source, mob/speech_args)
 	SIGNAL_HANDLER
-	if(!(flags & emagged))
-		var/static/list/cancel_messages = list(
-			"Вам трудно говорить, когда костюм туго сдавливает ваше горло...",
-			"Ваши связки ощущаются сдавленными, что пресекает любую попытку выдавить хоть какой-то звук...",
-			"Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..."
-		)
-
-		speech_args[SPEECH_MESSAGE] = "..."
-		to_chat(source, span_warning(pick(cancel_messages)))
+	var/static/list/cancel_messages = list(
+		"Вам трудно говорить, когда костюм туго сдавливает ваше горло...",
+		"Ваши связки ощущаются сдавленными, что пресекает любую попытку выдавить хоть какой-то звук...",
+		"Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..."
+	)
+
+	speech_args[SPEECH_MESSAGE] = "..."
+	to_chat(source, span_warning(pick(cancel_messages)))
 
 //Fire
 /obj/item/clothing/suit/space/hev/proc/handle_ignite(mob/living)