fixes sdmm warnings

This commit is contained in:
LordME
2022-02-19 01:55:26 +01:00
parent 4bc693f136
commit fea8d9cee0
10 changed files with 20 additions and 19 deletions
+1
View File
@@ -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="<b>[newletter]</b>"
//if(11,12) newletter="<big>[newletter]</big>"
//if(13) newletter="<small>[newletter]</small>"
+2 -2
View File
@@ -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
@@ -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")
+5 -6
View File
@@ -48,12 +48,11 @@
updateUsrDialog()
return
charges -= 1
switch(rand(1,2))
if(1)
temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
updateUsrDialog()
spawn(rand(50,200)) selfdestruct()
return
if(prob(50))
temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
updateUsrDialog()
spawn(rand(50,200)) selfdestruct()
return
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/N = M
to_chat(N, "<B>You have joined the ranks of the Syndicate and become a traitor to the station!</B>")
@@ -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()
+2 -2
View File
@@ -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
+2 -1
View File
@@ -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="<b>[newletter]</b>"
//if(11,12) newletter="<big>[newletter]</big>"
//if(13) newletter="<small>[newletter]</small>"
@@ -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
@@ -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
+1 -1
View File
@@ -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)