From fea8d9cee0709399ba2a3aa5c96992decbb6c74c Mon Sep 17 00:00:00 2001
From: LordME <58342752+TheLordME@users.noreply.github.com>
Date: Sat, 19 Feb 2022 01:55:26 +0100
Subject: [PATCH] fixes sdmm warnings
---
code/__HELPERS/text/scramble.dm | 1 +
code/__HELPERS/type2type.dm | 4 ++--
code/game/machinery/suit_storage/suit_cycler.dm | 4 ++--
code/game/machinery/syndicatebeacon.dm | 11 +++++------
code/modules/atmospherics/components/valve.dm | 4 ++--
code/modules/atmospherics/mainspipe.dm | 4 ++--
code/modules/flufftext/TextFilters.dm | 3 ++-
code/modules/mob/living/carbon/human/emote.dm | 2 +-
code/modules/power/singularity/singularity.dm | 4 ++--
code/modules/vore/eating/leave_remains_vr.dm | 2 +-
10 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/code/__HELPERS/text/scramble.dm b/code/__HELPERS/text/scramble.dm
index 07e4ae0dfca..c5475aed61b 100644
--- a/code/__HELPERS/text/scramble.dm
+++ b/code/__HELPERS/text/scramble.dm
@@ -45,6 +45,7 @@ proc/slur(phrase)
if(1,3,5,8) newletter="[lowertext(newletter)]"
if(2,4,6,15) newletter="[uppertext(newletter)]"
if(7) newletter+="'"
+ if(9,10,11,12,13,14) newletter = newletter
//if(9,10) newletter="[newletter]"
//if(11,12) newletter="[newletter]"
//if(13) newletter="[newletter]"
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 39b8512ab64..70c1f3980ec 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -259,9 +259,9 @@
switch(child)
if(/datum)
return null
- if(/obj || /mob)
+ if(/obj, /mob)
return /atom/movable
- if(/area || /turf)
+ if(/area, /turf)
return /atom
else
return /datum
diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm
index 977a53cb1bd..01da4bb4415 100644
--- a/code/game/machinery/suit_storage/suit_cycler.dm
+++ b/code/game/machinery/suit_storage/suit_cycler.dm
@@ -540,13 +540,13 @@
parent_helmet = /obj/item/clothing/head/helmet/space/void/pilot/alt
parent_suit = /obj/item/clothing/suit/space/void/pilot/alt
//Special styles
- if("^%###^%$" || "Mercenary")
+ if("^%###^%$", "Mercenary")
parent_helmet = /obj/item/clothing/head/helmet/space/void/merc
parent_suit = /obj/item/clothing/suit/space/void/merc
if("Charring")
parent_helmet = /obj/item/clothing/head/helmet/space/void/merc/fire
parent_suit = /obj/item/clothing/suit/space/void/merc/fire
- if("Gem-Encrusted" || "Wizard")
+ if("Gem-Encrusted", "Wizard")
parent_helmet = /obj/item/clothing/head/helmet/space/void/wizard
parent_suit = /obj/item/clothing/suit/space/void/wizard
if("Director")
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index b3bfce44bbe..47c99a8c629 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -48,12 +48,11 @@
updateUsrDialog()
return
charges -= 1
- switch(rand(1,2))
- if(1)
- temptext = "Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind."
- updateUsrDialog()
- spawn(rand(50,200)) selfdestruct()
- return
+ if(prob(50))
+ temptext = "Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind."
+ updateUsrDialog()
+ spawn(rand(50,200)) selfdestruct()
+ return
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/N = M
to_chat(N, "You have joined the ranks of the Syndicate and become a traitor to the station!")
diff --git a/code/modules/atmospherics/components/valve.dm b/code/modules/atmospherics/components/valve.dm
index a057e3a605f..3ad803179e7 100644
--- a/code/modules/atmospherics/components/valve.dm
+++ b/code/modules/atmospherics/components/valve.dm
@@ -42,9 +42,9 @@
/obj/machinery/atmospherics/valve/init_dir()
switch(dir)
- if(NORTH || SOUTH)
+ if(NORTH, SOUTH)
initialize_directions = NORTH|SOUTH
- if(EAST || WEST)
+ if(EAST, WEST)
initialize_directions = EAST|WEST
/obj/machinery/atmospherics/valve/get_neighbor_nodes_for_init()
diff --git a/code/modules/atmospherics/mainspipe.dm b/code/modules/atmospherics/mainspipe.dm
index 732b31beed2..ffe5d047580 100644
--- a/code/modules/atmospherics/mainspipe.dm
+++ b/code/modules/atmospherics/mainspipe.dm
@@ -124,9 +124,9 @@
nodes.len = 2
. = ..()
switch(dir)
- if(SOUTH || NORTH)
+ if(SOUTH, NORTH)
initialize_mains_directions = SOUTH|NORTH
- if(EAST || WEST)
+ if(EAST, WEST)
initialize_mains_directions = EAST|WEST
if(NORTHEAST)
initialize_mains_directions = NORTH|EAST
diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm
index bc133a83b8c..17af453c332 100644
--- a/code/modules/flufftext/TextFilters.dm
+++ b/code/modules/flufftext/TextFilters.dm
@@ -13,10 +13,11 @@ proc/Intoxicated(phrase)
if(lowertext(newletter)=="s") newletter="ch"
if(lowertext(newletter)=="a") newletter="ah"
if(lowertext(newletter)=="c") newletter="k"
- switch(rand(1,7))
+ switch(rand(1,15))
if(1,3,5,8) newletter="[lowertext(newletter)]"
if(2,4,6,15) newletter="[uppertext(newletter)]"
if(7) newletter+="'"
+ if(9,10,11,12,13,14) newletter = newletter
//if(9,10) newletter="[newletter]"
//if(11,12) newletter="[newletter]"
//if(13) newletter="[newletter]"
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 61ccf6dcd31..edd2f827ea0 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -848,7 +848,7 @@
vomit()
return
- if("whistle" || "whistles")
+ if("whistle", "whistles")
if(!muzzled)
message = "whistles a tune."
playsound(loc, 'sound/misc/longwhistle.ogg') //praying this doesn't get abused
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 0c01eadf877..7c993400eb1 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -347,10 +347,10 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
var/dir2 = 0
var/dir3 = 0
switch(direction)
- if(NORTH||SOUTH)
+ if(NORTH,SOUTH)
dir2 = 4
dir3 = 8
- if(EAST||WEST)
+ if(EAST,WEST)
dir2 = 1
dir3 = 2
var/turf/T2 = T
diff --git a/code/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm
index 88e63e2b63c..f2830f2512a 100644
--- a/code/modules/vore/eating/leave_remains_vr.dm
+++ b/code/modules/vore/eating/leave_remains_vr.dm
@@ -46,7 +46,7 @@
if(SPECIES_SERGAL)
new /obj/item/digestion_remains/skull/sergal(src,owner)
skull_amount--
- if(SPECIES_ZORREN_FLAT || SPECIES_ZORREN_HIGH)
+ if(SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH)
new /obj/item/digestion_remains/skull/zorren(src,owner)
skull_amount--
if(SPECIES_NEVREAN)