Skip to content

Commit af3ca2e

Browse files
committed
513 memes
1 parent eae143a commit af3ca2e

File tree

17 files changed

+59
-54
lines changed

17 files changed

+59
-54
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tgstation/byond:512.1488 as base
1+
FROM tgstation/byond:513.1490 as base
22

33
FROM base as build_base
44

code/__DEFINES/misc.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
279279
#define STATION_DESTROYED_NUKE 4
280280
#define STATION_EVACUATED 5
281281
#define GANG_LOSS 6
282-
#define GANG_TAKEOVER 7
282+
#define GANG_TAKEOVER 7
283283
#define BLOB_WIN 8
284284
#define BLOB_NUKE 9
285285
#define BLOB_DESTROYED 10
@@ -396,7 +396,7 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
396396
#define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"}
397397

398398
//Filters
399-
#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, border=4, color="#04080FAA")
399+
#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, color="#04080FAA")
400400
#define GAUSSIAN_BLUR(filter_size) filter(type="blur", size=filter_size)
401401

402402
#define STANDARD_GRAVITY 1 //! Anything above this is high gravity, anything below no grav

code/__DEFINES/typeids.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define TYPEID_NULL "0"
33
#define TYPEID_NORMAL_LIST "f"
44
//helper macros
5-
#define GET_TYPEID(ref) ( ( (lentext(ref) <= 10) ? "TYPEID_NULL" : copytext(ref, 4, lentext(ref)-6) ) )
5+
#define GET_TYPEID(ref) ( ( (length(ref) <= 10) ? "TYPEID_NULL" : copytext(ref, 4, length(ref)-6) ) )
66
#define IS_NORMAL_LIST(L) (GET_TYPEID("\ref[L]") == TYPEID_NORMAL_LIST)
77

88

code/__HELPERS/_lists.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@
559559
used_key_list[input_key] = 1
560560
return input_key
561561

562-
#if DM_VERSION > 512
562+
#if DM_VERSION > 513
563563
#error Remie said that lummox was adding a way to get a lists
564564
#error contents via list.values, if that is true remove this
565565
#error otherwise, update the version and bug lummox

code/__HELPERS/text.dm

+11-11
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@
303303
/proc/stringmerge(text,compare,replace = "*")
304304

305305
var/newtext = text
306-
if(lentext(text) != lentext(compare))
306+
if(length(text) != length(compare))
307307
return 0
308-
for(var/i = 1, i < lentext(text), i++)
308+
for(var/i = 1, i < length(text), i++)
309309
var/a = copytext(text,i,i+1)
310310
var/b = copytext(compare,i,i+1)
311311
//if it isn't both the same letter, or if they are both the replacement character
@@ -324,7 +324,7 @@
324324
if(!text || !character)
325325
return 0
326326
var/count = 0
327-
for(var/i = 1, i <= lentext(text), i++)
327+
for(var/i = 1, i <= length(text), i++)
328328
var/a = copytext(text,i,i+1)
329329
if(a == character)
330330
count++
@@ -615,18 +615,18 @@ This was coded to handle DNA gene-splicing.
615615
continue
616616
var/buffer = ""
617617
var/early_culling = TRUE
618-
for(var/pos = 1, pos <= lentext(string), pos++)
619-
var/let = copytext(string, pos, (pos + 1) % lentext(string))
618+
for(var/pos = 1, pos <= length(string), pos++)
619+
var/let = copytext(string, pos, (pos + 1) % length(string))
620620
if(early_culling && !findtext(let,GLOB.is_alphanumeric))
621621
continue
622622
early_culling = FALSE
623623
buffer += let
624624
if(!findtext(buffer,GLOB.is_alphanumeric))
625625
continue
626626
var/punctbuffer = ""
627-
var/cutoff = lentext(buffer)
628-
for(var/pos = lentext(buffer), pos >= 0, pos--)
629-
var/let = copytext(buffer, pos, (pos + 1) % lentext(buffer))
627+
var/cutoff = length(buffer)
628+
for(var/pos = length(buffer), pos >= 0, pos--)
629+
var/let = copytext(buffer, pos, (pos + 1) % length(buffer))
630630
if(findtext(let,GLOB.is_alphanumeric))
631631
break
632632
if(findtext(let,GLOB.is_punctuation))
@@ -636,8 +636,8 @@ This was coded to handle DNA gene-splicing.
636636
var/exclaim = FALSE
637637
var/question = FALSE
638638
var/periods = 0
639-
for(var/pos = lentext(punctbuffer), pos >= 0, pos--)
640-
var/punct = copytext(punctbuffer, pos, (pos + 1) % lentext(punctbuffer))
639+
for(var/pos = length(punctbuffer), pos >= 0, pos--)
640+
var/punct = copytext(punctbuffer, pos, (pos + 1) % length(punctbuffer))
641641
if(!exclaim && findtext(punct,"!"))
642642
exclaim = TRUE
643643
if(!question && findtext(punct,"?"))
@@ -659,7 +659,7 @@ This was coded to handle DNA gene-splicing.
659659
buffer = copytext(buffer, 1, cutoff) + punctbuffer
660660
if(!findtext(buffer,GLOB.is_alphanumeric))
661661
continue
662-
if(!buffer || lentext(buffer) > 280 || lentext(buffer) <= cullshort || buffer in accepted)
662+
if(!buffer || length(buffer) > 280 || length(buffer) <= cullshort || buffer in accepted)
663663
continue
664664

665665
accepted += buffer

code/__HELPERS/unsorted.dm

+5
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,14 @@ Turf and target are separate in case you want to teleport some distance from a t
455455
var/y = min(world.maxy, max(1, A.y + dy))
456456
return locate(x,y,A.z)
457457

458+
#if DM_VERSION > 513
459+
#warn 513 is definitely stable now, remove this
460+
#endif
461+
#if DM_VERSION < 513
458462
/proc/arctan(x)
459463
var/y=arcsin(x/sqrt(1+x*x))
460464
return y
465+
#endif
461466

462467
/// Gets all contents of contents and returns them all in a list.
463468
/atom/proc/GetAllContents(var/T)

code/_onclick/hud/plane_master.dm

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525

2626
/obj/screen/plane_master/openspace/backdrop(mob/mymob)
2727
filters = list()
28-
filters += filter(type = "drop_shadow", color = "#04080FAA", border = 5, size = -10)
29-
filters += filter(type = "drop_shadow", color = "#04080FAA", border = 5, size = -15)
30-
filters += filter(type = "drop_shadow", color = "#04080FAA", border = 5, size = -20)
28+
filters += filter(type = "drop_shadow", color = "#04080FAA", size = -10)
29+
filters += filter(type = "drop_shadow", color = "#04080FAA", size = -15)
30+
filters += filter(type = "drop_shadow", color = "#04080FAA", size = -20)
3131

3232
/obj/screen/plane_master/proc/outline(_size, _color)
3333
filters += filter(type = "outline", size = _size, color = _color)
3434

3535
/obj/screen/plane_master/proc/shadow(_size, _border, _offset = 0, _x = 0, _y = 0, _color = "#04080FAA")
36-
filters += filter(type = "drop_shadow", x = _x, y = _y, color = _color, size = _size, offset = _offset, border = _border)
36+
filters += filter(type = "drop_shadow", x = _x, y = _y, color = _color, size = _size, offset = _offset)
3737

3838
/obj/screen/plane_master/proc/clear_filters()
3939
filters = list()

code/datums/emotes.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656

5757
if(!msg)
5858
return
59-
60-
var/end = copytext(msg, lentext(message))
59+
60+
var/end = copytext(msg, length(message))
6161
if(!(end in list("!", ".", "?", ":", "\"", "-")))
6262
msg += "."
6363

code/game/machinery/newscaster.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ GLOBAL_LIST_EMPTY(allCasters)
519519
if(href_list["set_channel_name"])
520520
channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN)
521521
while (findtext(channel_name," ") == 1)
522-
channel_name = copytext(channel_name,2,lentext(channel_name)+1)
522+
channel_name = copytext(channel_name,2,length(channel_name)+1)
523523
updateUsrDialog()
524524
else if(href_list["set_channel_lock"])
525525
c_locked = !c_locked

code/game/machinery/status_display.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
else
246246
line1 = "CARGO"
247247
line2 = SSshuttle.supply.getTimerStr()
248-
if(lentext(line2) > CHARS_PER_LINE)
248+
if(length(line2) > CHARS_PER_LINE)
249249
line2 = "Error"
250250
update_display(line1, line2)
251251

code/game/objects/structures/musician.dm

+7-7
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@
107107
playing = FALSE
108108
hearing_mobs = null
109109
return
110-
if(!lentext(note))
110+
if(!length(note))
111111
continue
112112
var/cur_note = text2ascii(note) - 96
113113
if(cur_note < 1 || cur_note > 7)
114114
continue
115-
for(var/i=2 to lentext(note))
115+
for(var/i=2 to length(note))
116116
var/ni = copytext(note,i,i+1)
117117
if(!text2num(ni))
118118
if(ni == "#" || ni == "b" || ni == "n")
@@ -212,7 +212,7 @@
212212
lines.Cut(MUSIC_MAXLINES + 1)
213213
var/linenum = 1
214214
for(var/l in lines)
215-
if(lentext(l) > MUSIC_MAXLINECHARS)
215+
if(length(l) > MUSIC_MAXLINECHARS)
216216
to_chat(usr, "Line [linenum] too long!")
217217
lines.Remove(l)
218218
else
@@ -239,13 +239,13 @@
239239
if(!usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK))
240240
return
241241

242-
if(lentext(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
242+
if(length(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
243243
var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
244244
if(!usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK))
245245
return
246246
if(cont == "no")
247247
break
248-
while(lentext(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
248+
while(length(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
249249
ParseSong(t)
250250

251251
else if(href_list["help"])
@@ -277,7 +277,7 @@
277277
return
278278
if(lines.len > MUSIC_MAXLINES)
279279
return
280-
if(lentext(newline) > MUSIC_MAXLINECHARS)
280+
if(length(newline) > MUSIC_MAXLINECHARS)
281281
newline = copytext(newline, 1, MUSIC_MAXLINECHARS)
282282
lines.Add(newline)
283283

@@ -292,7 +292,7 @@
292292
var/content = html_encode(input("Enter your line: ", instrumentObj.name, lines[num]) as text|null)
293293
if(!content || !usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK))
294294
return
295-
if(lentext(content) > MUSIC_MAXLINECHARS)
295+
if(length(content) > MUSIC_MAXLINECHARS)
296296
content = copytext(content, 1, MUSIC_MAXLINECHARS)
297297
if(num > lines.len || num < 1)
298298
return

code/modules/admin/topic.dm

+6-6
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
GLOB.dynamic_stacking_limit = input(usr,"Change the threat limit at which round-endings rulesets will start to stack.", "Change stacking limit", null) as num
454454
log_admin("[key_name(usr)] set 'stacking_limit' to [GLOB.dynamic_stacking_limit].")
455455
message_admins("[key_name(usr)] set 'stacking_limit' to [GLOB.dynamic_stacking_limit].")
456-
dynamic_mode_options(usr)
456+
dynamic_mode_options(usr)
457457

458458
else if(href_list["f_dynamic_high_pop_limit"])
459459
if(!check_rights(R_ADMIN))
@@ -472,7 +472,7 @@
472472

473473
log_admin("[key_name(usr)] set 'high_pop_limit' to [GLOB.dynamic_high_pop_limit].")
474474
message_admins("[key_name(usr)] set 'high_pop_limit' to [GLOB.dynamic_high_pop_limit].")
475-
dynamic_mode_options(usr)
475+
dynamic_mode_options(usr)
476476

477477
else if(href_list["f_dynamic_forced_threat"])
478478
if(!check_rights(R_ADMIN))
@@ -1729,7 +1729,7 @@
17291729
return
17301730
src.admincaster_feed_channel.channel_name = stripped_input(usr, "Provide a Feed Channel Name.", "Network Channel Handler", "")
17311731
while (findtext(src.admincaster_feed_channel.channel_name," ") == 1)
1732-
src.admincaster_feed_channel.channel_name = copytext(src.admincaster_feed_channel.channel_name,2,lentext(src.admincaster_feed_channel.channel_name)+1)
1732+
src.admincaster_feed_channel.channel_name = copytext(src.admincaster_feed_channel.channel_name,2,length(src.admincaster_feed_channel.channel_name)+1)
17331733
src.access_news_network()
17341734

17351735
else if(href_list["ac_set_channel_lock"])
@@ -1771,7 +1771,7 @@
17711771
return
17721772
src.admincaster_feed_message.body = adminscrub(input(usr, "Write your Feed story.", "Network Channel Handler", ""))
17731773
while (findtext(src.admincaster_feed_message.returnBody(-1)," ") == 1)
1774-
src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.returnBody(-1),2,lentext(src.admincaster_feed_message.returnBody(-1))+1)
1774+
src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.returnBody(-1),2,length(src.admincaster_feed_message.returnBody(-1))+1)
17751775
src.access_news_network()
17761776

17771777
else if(href_list["ac_submit_new_message"])
@@ -1832,15 +1832,15 @@
18321832
return
18331833
src.admincaster_wanted_message.criminal = adminscrub(input(usr, "Provide the name of the Wanted person.", "Network Security Handler", ""))
18341834
while(findtext(src.admincaster_wanted_message.criminal," ") == 1)
1835-
src.admincaster_wanted_message.criminal = copytext(admincaster_wanted_message.criminal,2,lentext(admincaster_wanted_message.criminal)+1)
1835+
src.admincaster_wanted_message.criminal = copytext(admincaster_wanted_message.criminal,2,length(admincaster_wanted_message.criminal)+1)
18361836
src.access_news_network()
18371837

18381838
else if(href_list["ac_set_wanted_desc"])
18391839
if(!check_rights(R_ADMIN))
18401840
return
18411841
src.admincaster_wanted_message.body = adminscrub(input(usr, "Provide the a description of the Wanted person and any other details you deem important.", "Network Security Handler", ""))
18421842
while (findtext(src.admincaster_wanted_message.body," ") == 1)
1843-
src.admincaster_wanted_message.body = copytext(src.admincaster_wanted_message.body,2,lentext(src.admincaster_wanted_message.body)+1)
1843+
src.admincaster_wanted_message.body = copytext(src.admincaster_wanted_message.body,2,length(src.admincaster_wanted_message.body)+1)
18441844
src.access_news_network()
18451845

18461846
else if(href_list["ac_submit_wanted"])

code/modules/admin/verbs/modifyvariables.dm

+5-5
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ GLOBAL_PROTECT(VVpixelmovement)
307307
// the type with the base type removed from the begaining
308308
var/fancytype = types[D.type]
309309
if (findtext(fancytype, types[type]))
310-
fancytype = copytext(fancytype, lentext(types[type])+1)
311-
var/shorttype = copytext("[D.type]", lentext("[type]")+1)
312-
if (lentext(shorttype) > lentext(fancytype))
310+
fancytype = copytext(fancytype, length(types[type])+1)
311+
var/shorttype = copytext("[D.type]", length("[type]")+1)
312+
if (length(shorttype) > length(fancytype))
313313
shorttype = fancytype
314-
if (!lentext(shorttype))
314+
if (!length(shorttype))
315315
shorttype = "/"
316316

317317
.["[D]([shorttype])[REF(D)]#[i]"] = D
@@ -534,7 +534,7 @@ GLOBAL_PROTECT(VVpixelmovement)
534534
if (prompt != "Continue")
535535
return FALSE
536536
return TRUE
537-
537+
538538

539539
/client/proc/modify_variables(atom/O, param_var_name = null, autodetect_class = 0)
540540
if(!check_rights(R_VAREDIT))

code/modules/mob/dead/observer/observer.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
236236
var/r_val
237237
var/b_val
238238
var/g_val
239-
var/color_format = lentext(input_color)
239+
var/color_format = length(input_color)
240240
if(color_format == 3)
241241
r_val = hex2num(copytext(input_color, 1, 2))*16
242242
g_val = hex2num(copytext(input_color, 2, 3))*16
@@ -354,7 +354,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
354354

355355
var/response = alert(src, "Are you sure you want to prevent (almost) all means of resuscitation? This cannot be undone. ","Are you sure you want to stay dead?","DNR","Save Me")
356356
if(response != "DNR")
357-
return
357+
return
358358

359359
can_reenter_corpse = FALSE
360360
to_chat(src, "You can no longer be brought back into your body.")

code/modules/mob/living/say.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
369369
message = cultslur(message)
370370

371371
// check for and apply punctuation
372-
var/end = copytext(message, lentext(message))
372+
var/end = copytext(message, length(message))
373373
if(!(end in list("!", ".", "?", ":", "\"", "-")))
374374
message += "."
375375

code/modules/mob/mob_helpers.dm

+8-8
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
*/
8383
/proc/slur(n)
8484
var/phrase = html_decode(n)
85-
var/leng = lentext(phrase)
86-
var/counter=lentext(phrase)
85+
var/leng = length(phrase)
86+
var/counter=length(phrase)
8787
var/newphrase=""
8888
var/newletter=""
8989
while(counter>=1)
@@ -117,8 +117,8 @@
117117
/// Makes you talk like you got cult stunned, which is slurring but with some dark messages
118118
/proc/cultslur(n) // Inflicted on victims of a stun talisman
119119
var/phrase = html_decode(n)
120-
var/leng = lentext(phrase)
121-
var/counter=lentext(phrase)
120+
var/leng = length(phrase)
121+
var/counter=length(phrase)
122122
var/newphrase=""
123123
var/newletter=""
124124
while(counter>=1)
@@ -223,7 +223,7 @@
223223

224224
/**
225225
* Convert a message into leet non gaijin speak
226-
*
226+
*
227227
* The difference with stutter is that this proc can stutter more than 1 letter
228228
*
229229
* The issue here is that anything that does not have a space is treated as one word (in many instances). For instance, "LOOKING," is a word, including the comma.
@@ -398,7 +398,7 @@
398398
* The kitchen sink of notification procs
399399
*
400400
* Arguments:
401-
* * message
401+
* * message
402402
* * ghost_sound sound to play
403403
* * enter_link Href link to enter the ghost role being notified for
404404
* * source The source of the notification
@@ -477,7 +477,7 @@
477477
return
478478
return TRUE
479479

480-
/**
480+
/**
481481
* Offer control of the passed in mob to dead player
482482
*
483483
* Automatic logging and uses pollCandidatesForMob, how convenient
@@ -564,7 +564,7 @@
564564
. = TRUE
565565

566566
/mob/proc/has_mouth()
567-
return FALSE
567+
return FALSE
568568

569569
/**
570570
* Examine text for traits shared by multiple types.

0 commit comments

Comments
 (0)