Skip to content

Commit 40ae0d7

Browse files
authored
fixes (#975)
1 parent 129c24f commit 40ae0d7

File tree

4 files changed

+56
-5
lines changed

4 files changed

+56
-5
lines changed

code/controllers/subsystem/holomap.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ SUBSYSTEM_DEF(holomap)
9999

100100
var/icon/south = icon(mini)
101101
south.Turn(180)
102-
minimap_icons[z]["[SOUTH]"] = SOUTH
102+
minimap_icons[z]["[SOUTH]"] = south
103103
minimaps[z]["[SOUTH]"] = image(south)
104104

105105
var/icon/west = icon(mini)
106106
west.Turn(270)
107-
minimap_icons[z]["[WEST]"] = WEST
107+
minimap_icons[z]["[WEST]"] = west
108108
minimaps[z]["[WEST]"] = image(west)
109109

110110
/// Get a holomap icon for a given z level
111111
/datum/controller/subsystem/holomap/proc/get_holomap(z)
112112
if(z < 1 || z > length(holomaps_by_z))
113113
return null
114114

115-
return minimap_icons[z]
115+
return holomaps_by_z[z]

code/game/objects/items/devices/taperecorder.dm

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@
247247
playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i]
248248
if(playsleepseconds > 14 SECONDS)
249249
sleep(1 SECONDS)
250-
say("Skipping [playsleepseconds] seconds of silence.")
251-
playsleepseconds = 1 SECONDS
250+
say("Skipping [playsleepseconds / 10] seconds of silence.")
251+
playsleepseconds = clamp(playsleepseconds / 10, 1 SECONDS, 3 SECONDS)
252252
i++
253253

254254
stop()
@@ -440,3 +440,44 @@
440440

441441
/obj/item/tape/dyed
442442
icon_state = "greyscale"
443+
444+
/obj/item/tape/rats
445+
storedinfo = list(
446+
"\[00:01\] This place is a mess, how do people live here?",
447+
"\[00:04\] It's like this station hasn't been serviced in decades.",
448+
"\[00:07\] Atleast the people here are kind, except for Ann. The wench. |+I CAN HEAR YOU IN THERE!+|",
449+
"\[00:08\] +PISS OFF, ANN!+",
450+
"\[00:42\] |I'll finish this tomorrow.|",
451+
"\[00:50\] How are there |rats| on a space station this far out? This has to be some kind of scientific wonder.",
452+
"\[01:00\] |Tom? Would you mind helping me with something in the botanical lab?|",
453+
"\[01:05\] Yeah, yeah.",
454+
"\[01:10\] Mary, the station's botanist, is a loon. She \"took care\" of a rat with a |monkey wrench|, who does that?!",
455+
"\[01:19\] The squeaking outside my room is driving me mad. I may ask Mary for some help with this.",
456+
"\[01:29\] *Airlock opening*",
457+
"\[01:33\] Mary? What ar-",
458+
"\[01:35\] *|CLANG!|*",
459+
"\[01:37\] *|CLANG!|*",
460+
"\[01:39\] *|CLANG!|*",
461+
"\[01:47\] *Feminine panting*",
462+
"\[01:59\] Mary Ann.",
463+
)
464+
465+
timestamp = list(
466+
1 SECONDS,
467+
4 SECONDS,
468+
7 SECONDS,
469+
8 SECONDS,
470+
42 SECONDS,
471+
50 SECONDS,
472+
1 MINUTES,
473+
1 MINUTES + 5 SECONDS,
474+
1 MINUTES + 10 SECONDS,
475+
1 MINUTES + 19 SECONDS,
476+
1 MINUTES + 29 SECONDS,
477+
1 MINUTES + 33 SECONDS,
478+
1 MINUTES + 35 SECONDS,
479+
1 MINUTES + 37 SECONDS,
480+
1 MINUTES + 39 SECONDS,
481+
1 MINUTES + 47 SECONDS,
482+
1 MINUTES + 59 SECONDS,
483+
)

code/modules/unit_tests/_unit_tests.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
#include "subsystem_init.dm"
166166
#include "subsystem_sanity.dm"
167167
#include "surgeries.dm"
168+
#include "tape_sanity.dm"
168169
#include "teleporters.dm"
169170
#include "tgui_create_message.dm"
170171
#include "timer_sanity.dm"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/datum/unit_test/tape_sanity/Run()
2+
for(var/obj/item/tape/tape as anything in subtypesof(/obj/item/tape))
3+
tape = allocate(tape)
4+
5+
if(length(tape.storedinfo) != length(tape.timestamp))
6+
TEST_FAIL("[tape.type] front side data lengths do not match.")
7+
8+
if(length(tape.storedinfo_otherside) != length(tape.storedinfo_otherside))
9+
TEST_FAIL("[tape.type] back side data lengths do not match.")

0 commit comments

Comments
 (0)