diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 9a603b4abe8..d7e9aec71db 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -218,6 +218,9 @@ else to_chat(owner, span_userdanger("You feel your heart lurching in your chest...")) owner.adjustOxyLoss(8) + else + //No effect + return /datum/brain_trauma/severe/discoordination name = "Discoordination" diff --git a/code/datums/components/singularity.dm b/code/datums/components/singularity.dm index 04d5690d733..0eea5a8b2da 100644 --- a/code/datums/components/singularity.dm +++ b/code/datums/components/singularity.dm @@ -294,10 +294,10 @@ var/dir2 var/dir3 switch (direction) - if (NORTH || SOUTH) + if (NORTH, SOUTH) dir2 = EAST dir3 = WEST - if (EAST || WEST) + if (EAST, WEST) dir2 = NORTH dir3 = SOUTH var/turf/farthest_perpendicular_turf = farthest_turf diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index e9e87c41424..9a54c48af21 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -313,7 +313,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/requests_console, 30) radio_freq = FREQ_ENGINEERING if("security") radio_freq = FREQ_SECURITY - if("cargobay" || "mining") + if("cargobay", "mining") radio_freq = FREQ_SUPPLY var/datum/signal/subspace/messaging/rc/signal = new(src, list( diff --git a/code/modules/hydroponics/hydroponics_chemreact.dm b/code/modules/hydroponics/hydroponics_chemreact.dm index 99e5f65126a..c9cf3ce8606 100644 --- a/code/modules/hydroponics/hydroponics_chemreact.dm +++ b/code/modules/hydroponics/hydroponics_chemreact.dm @@ -27,6 +27,6 @@ if(11 to 20) mutateweed() return - if(1 to 10) + if(0 to 10) mutatepest(user) return diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 047e6926f3a..3fe3dc9dace 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -83,7 +83,7 @@ var/rawchar = "" for(var/i = 1, i <= leng, i += length(rawchar)) rawchar = newletter = phrase[i] - if(rand(1, 3) == 3) + if(prob(33)) var/lowerletter = lowertext(newletter) if(lowerletter == "o") newletter = "u" @@ -95,18 +95,19 @@ newletter = "oo" else if(lowerletter == "c") newletter = "k" - if(rand(1, 20) == 20) + if(prob(5)) if(newletter == " ") newletter = "...huuuhhh..." else if(newletter == ".") newletter = " *BURP*." - switch(rand(1, 20)) - if(1) - newletter += "'" - if(10) - newletter += "[newletter]" - if(20) - newletter += "[newletter][newletter]" + if(prob(15)) + switch(rand(1,3)) + if(1) + newletter += "'" + if(2) + newletter += "[newletter]" + if(3) + newletter += "[newletter][newletter]" . += "[newletter]" return sanitize(.) @@ -119,7 +120,7 @@ var/rawchar = "" for(var/i = 1, i <= leng, i += length(rawchar)) rawchar = newletter = phrase[i] - if(rand(1, 2) == 2) + if(prob(50)) var/lowerletter = lowertext(newletter) if(lowerletter == "o") newletter = "u" @@ -133,23 +134,24 @@ newletter = " NAR " else if(lowerletter == "s") newletter = " SIE " - if(rand(1, 4) == 4) + if(prob(25)) if(newletter == " ") newletter = " no hope... " else if(newletter == "H") newletter = " IT COMES... " - switch(rand(1, 15)) - if(1) - newletter = "'" - if(2) - newletter += "agn" - if(3) - newletter = "fth" - if(4) - newletter = "nglu" - if(5) - newletter = "glor" + if(prob(33)) + switch(rand(1, 5)) + if(1) + newletter = "'" + if(2) + newletter += "agn" + if(3) + newletter = "fth" + if(4) + newletter = "nglu" + if(5) + newletter = "glor" . += newletter return sanitize(.) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index feb309ce0cf..16253e11401 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -335,10 +335,10 @@ 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/other_turf = considered_turf diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm index f868504a626..5d75a8f66c4 100644 --- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm @@ -157,6 +157,9 @@ if(7) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/mask/cigarette/rollie(src) + else + //empty grave + return /obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S, force = FALSE) if(!opened) diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm index 02a8bde5def..d5e22198901 100644 --- a/code/modules/surgery/advanced/lobotomy.dm +++ b/code/modules/surgery/advanced/lobotomy.dm @@ -51,16 +51,17 @@ target.cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY) if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed)) target.mind.remove_antag_datum(/datum/antagonist/brainwashed) - switch(rand(1,4))//Now let's see what hopefully-not-important part of the brain we cut off - if(1) - target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_MAGIC) - if(2) - if(HAS_TRAIT(target, TRAIT_SPECIAL_TRAUMA_BOOST) && prob(50)) + if(prob(75)) // 75% chance to get a trauma from this + switch(rand(1,3))//Now let's see what hopefully-not-important part of the brain we cut off + if(1) + target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_MAGIC) + if(2) + if(HAS_TRAIT(target, TRAIT_SPECIAL_TRAUMA_BOOST) && prob(50)) + target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_MAGIC) + else + target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_MAGIC) + if(3) target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_MAGIC) - else - target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_MAGIC) - if(3) - target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_MAGIC) return ..() /datum/surgery_step/lobotomize/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index c4448fc798e..16918e08ab4 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -504,6 +504,8 @@ GLOBAL_LIST_EMPTY(vending_products) freebie(user, 2) if(16 to 25) freebie(user, 1) + if(26 to 75) + return if(76 to 90) tilt(user) if(91 to 100)