added whitespace to ? :

OpenDream interprets : with no whitespace before it as the .-like operator which leads to ? : failing to get properly parsed
frosty-dev · Apr 18, 2023 · de97f90 · de97f90
1 parent f5ee69e
commit de97f90
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/code/datums/components/geiger_counter.dm b/code/datums/components/geiger_counter.dm
@@ -6,7 +6,7 @@
 
 /datum/component/wearertargeting/geiger/proc/geigerclick(var/mob/owner, var/stage)
 	if(owner && !ON_COOLDOWN(src, "playsound", 1 SECOND))
-		owner.playsound_local(get_turf(owner), "sound/items/geiger/geiger-[stage]-[stage>=4?rand(1,3):rand(1,2)].ogg", 10)
+		owner.playsound_local(get_turf(owner), "sound/items/geiger/geiger-[stage]-[stage >= 4 ? rand(1, 3) : rand(1, 2)].ogg", 10)
 
 
 /datum/component/holdertargeting/geiger
@@ -24,5 +24,5 @@
 	if(owner)
 		var/obj/item/I = parent
 		if(!ON_COOLDOWN(src, "playsound", 1 SECOND))
-			owner.playsound_local(get_turf(owner), "sound/items/geiger/geiger-[stage]-[stage>=4?rand(1,3):rand(1,2)].ogg", 20, flags = SOUND_IGNORE_SPACE)
+			owner.playsound_local(get_turf(owner), "sound/items/geiger/geiger-[stage]-[stage >= 4 ? rand(1, 3) : rand(1, 2)].ogg", 20, flags = SOUND_IGNORE_SPACE)
 		SEND_SIGNAL(I, COMSIG_MOB_GEIGER_TICK, stage)
diff --git a/code/mob/living/carbon/human/gimmick.dm b/code/mob/living/carbon/human/gimmick.dm
@@ -926,9 +926,9 @@ proc/empty_mouse_params()//TODO MOVE THIS!!!
 
 	switch(type)
 		if("spacer")
-			constructed_name = "[prob(10)?SPACER_PICK("honorifics")+" ":""][prob(80)?SPACER_PICK("pejoratives")+" ":SPACER_PICK("superlatives")+" "][prob(10)?SPACER_PICK("stuff")+" ":""][SPACER_PICK("firstnames")]"
+			constructed_name = "[prob(10) ? SPACER_PICK("honorifics")+" " :""][prob(80)?SPACER_PICK("pejoratives")+" ":SPACER_PICK("superlatives")+" "][prob(10) ? SPACER_PICK("stuff")+" " : ""][SPACER_PICK("firstnames")]"
 		if("juicer")
-			constructed_name = "[prob(10)?SPACER_PICK("honorifics")+" ":""][prob(20)?SPACER_PICK("stuff")+" ":""][SPACER_PICK("firstnames")+" "][prob(80)?SPACER_PICK("nicknames")+" ":""][prob(50)?SPACER_PICK("firstnames"):SPACER_PICK("lastnames")]"
+			constructed_name = "[prob(10) ? SPACER_PICK("honorifics")+" " :""][prob(20)?SPACER_PICK("stuff")+" ":""][SPACER_PICK("firstnames")+" "][prob(80) ? SPACER_PICK("nicknames")+" " : ""][prob(50)?SPACER_PICK("firstnames") : SPACER_PICK("lastnames")]"
 
 	return constructed_name
 

diff --git a/code/obj/item/clothing/hats.dm b/code/obj/item/clothing/hats.dm
@@ -997,7 +997,7 @@ proc/filter_trait_hats(var/type)
 			var/turf/T = get_turf(src)
 			T?.fluid_react_single("miasma_s", 5, airborne = 1)
 		if(prob(1))
-			host.real_name = "[prob(10)?SPACER_PICK("honorifics")+" ":""][prob(20)?SPACER_PICK("stuff")+" ":""][SPACER_PICK("firstnames")+" "][prob(80)?SPACER_PICK("nicknames")+" ":""][prob(50)?SPACER_PICK("firstnames"):SPACER_PICK("lastnames")]"
+			host.real_name = "[prob(10) ? SPACER_PICK("honorifics")+" " : ""][prob(20) ? SPACER_PICK("stuff")+" " : ""][SPACER_PICK("firstnames")+" "][prob(80) ? SPACER_PICK("nicknames")+" " : ""][prob(50)?SPACER_PICK("firstnames") : SPACER_PICK("lastnames")]"
 			host.name = host.real_name
 			boutput(host, "<span class='notice'>You suddenly feel a lot more like, uh, well like [host.real_name]!</span>")
 		if(isdead(host))

diff --git a/code/obj/item/storage/weapon_security.dm b/code/obj/item/storage/weapon_security.dm
@@ -337,7 +337,7 @@
 		[name] tested this fucking gun and it blew [gender ? "her" : "his"] goddamn brains out. I dunno why we're even sending this shit to you.<BR>
 		<B>Don't use it. Fuck.</B><BR>
 		<BR>
-		<I>/[prob(50)? pick_string_autokey("names/first_male.txt"):pick_string_autokey("names/first_female.txt")]</I>
+		<I>/[prob(50) ? pick_string_autokey("names/first_male.txt") : pick_string_autokey("names/first_female.txt")]</I>
 		"}
 
 /obj/item/storage/box/costume/safari