mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Resolves SDMM warnings
This commit is contained in:
committed by
CHOMPStation2
parent
ba25f3c417
commit
d99151151c
@@ -1,9 +1,14 @@
|
||||
environment = "vorestation.dme"
|
||||
|
||||
[langserver]
|
||||
dreamchecker = true
|
||||
|
||||
[code_standards]
|
||||
disallow_relative_type_definitions = true
|
||||
disallow_relative_proc_definitions = true
|
||||
<<<<<<< HEAD
|
||||
|
||||
[debugger]
|
||||
engine = "auxtools"
|
||||
=======
|
||||
>>>>>>> ac1782cc4d... Merge pull request #14624 from ItsSelis/selis-sdmm
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -54,6 +54,8 @@
|
||||
updateUsrDialog()
|
||||
spawn(rand(50,200)) selfdestruct()
|
||||
return
|
||||
if(2)
|
||||
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>")
|
||||
|
||||
@@ -13,9 +13,10 @@
|
||||
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,9))
|
||||
if(1,3,5,8) newletter="[lowertext(newletter)]"
|
||||
if(2,4,6,15) newletter="[uppertext(newletter)]"
|
||||
//if(2,4,6,15) newletter="[uppertext(newletter)]"
|
||||
if(2,4,6,9) newletter="[uppertext(newletter)]"
|
||||
if(7) newletter+="'"
|
||||
//if(9,10) newletter="<b>[newletter]</b>"
|
||||
//if(11,12) newletter="<big>[newletter]</big>"
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
var/datum/ai_laws/laws = new /datum/ai_laws/pleasurebot()
|
||||
laws.set_zeroth_law("Your definition and approximation of 'pleasure' matters more than anyone else's.")
|
||||
return laws
|
||||
if("corrupted" || "bad") // Same thing in our case
|
||||
if("corrupted","bad") // Same thing in our case
|
||||
var/rng = rand(1,2)
|
||||
switch(rng)
|
||||
if(1)
|
||||
|
||||
@@ -208,9 +208,10 @@
|
||||
if(lowertext(newletter)=="s") newletter="ch"
|
||||
if(lowertext(newletter)=="a") newletter="ah"
|
||||
if(lowertext(newletter)=="c") newletter="k"
|
||||
switch(rand(1,15))
|
||||
switch(rand(1,9))
|
||||
if(1,3,5,8) newletter="[lowertext(newletter)]"
|
||||
if(2,4,6,15) newletter="[uppertext(newletter)]"
|
||||
//if(2,4,6,15) newletter="[uppertext(newletter)]"
|
||||
if(2,4,6,9) newletter="[uppertext(newletter)]"
|
||||
if(7) newletter+="'"
|
||||
//if(9,10) newletter="<b>[newletter]</b>"
|
||||
//if(11,12) newletter="<big>[newletter]</big>"
|
||||
|
||||
@@ -336,10 +336,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
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
return test_result
|
||||
|
||||
|
||||
if(UT_NORMAL || UT_NORMAL_COLD)
|
||||
if(UT_NORMAL,UT_NORMAL_COLD)
|
||||
if(abs(pressure - ONE_ATMOSPHERE) > 10)
|
||||
test_result["msg"] = "Pressure out of bounds: [pressure] | [t_msg]"
|
||||
return test_result
|
||||
|
||||
Reference in New Issue
Block a user