From d46cf2d98137463f4860e5100dcaafe74af7fd65 Mon Sep 17 00:00:00 2001
From: Pinta <124479862+deertools@users.noreply.github.com>
Date: Sun, 24 Mar 2024 05:20:10 -0400
Subject: [PATCH] a start
---
.../machinery/computer/telecrystalconsoles.dm | 1 -
code/game/objects/items/storage/toolbox.dm | 1 -
.../traitor/IAA/internal_affairs.dm | 3 +-
code/modules/clothing/clothing.dm | 2 --
.../core/special_pins/list_pin.dm | 1 -
.../integrated_electronics/subtypes/smart.dm | 4 +--
code/modules/reagents/chemistry/holder.dm | 30 +++++++++----------
.../chemistry/reagents/alcohol_reagents.dm | 9 +++---
code/modules/surgery/organs/heart.dm | 1 -
.../antagonists/wendigo/mob/metabolization.dm | 2 +-
hyperstation/code/modules/arousal/creampie.dm | 1 -
hyperstation/code/obj/leash.dm | 1 -
.../code/game/machinery/cryopod.dm | 3 +-
13 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm
index f3af0f9b..768faa83 100644
--- a/code/game/machinery/computer/telecrystalconsoles.dm
+++ b/code/game/machinery/computer/telecrystalconsoles.dm
@@ -148,7 +148,6 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
virgin = 0
/obj/machinery/computer/telecrystals/boss/proc/getDangerous()//This scales the TC assigned with the round population.
- ..()
var/list/nukeops = get_antag_minds(/datum/antagonist/nukeop)
var/danger = GLOB.joined_player_list.len - nukeops.len
danger = CEILING(danger, 10)
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index c8fa3050..ebc49dc6 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -290,7 +290,6 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
generate_rubber_toolbox_icon()
icon = GLOB.rubber_toolbox_icons[icon_state]
AddComponent(/datum/component/bouncy)
- . = ..()
/obj/item/storage/toolbox/proc/generate_rubber_toolbox_icon()
var/icon/new_icon = icon(icon, icon_state)
diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm
index 7ccdf156..1ba1ea39 100644
--- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm
+++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm
@@ -224,8 +224,7 @@
special_role = TRAITOR_AGENT_ROLE
syndicate = TRUE
forge_single_objective()
- else
- ..() // Give them standard objectives.
+
return
/datum/antagonist/traitor/internal_affairs/forge_traitor_objectives()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 731baf2a..b4ce5069 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -239,8 +239,6 @@ BLIND // can't see anything
if(H.w_uniform == src)
H.update_suit_sensors()
- ..()
-
/obj/item/clothing/under/CtrlClick(mob/user)
. = ..()
diff --git a/code/modules/integrated_electronics/core/special_pins/list_pin.dm b/code/modules/integrated_electronics/core/special_pins/list_pin.dm
index 9e4731ac..3532d68d 100644
--- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/list_pin.dm
@@ -7,7 +7,6 @@
interact(user)
/datum/integrated_io/lists/proc/interact(mob/user)
- . = ..()
var/list/my_list = data
var/t = "[src]
"
t += "List length: [my_list.len]
"
diff --git a/code/modules/integrated_electronics/subtypes/smart.dm b/code/modules/integrated_electronics/subtypes/smart.dm
index 1959fb55..74cbad79 100644
--- a/code/modules/integrated_electronics/subtypes/smart.dm
+++ b/code/modules/integrated_electronics/subtypes/smart.dm
@@ -199,7 +199,8 @@
set_pin_data(IC_OUTPUT, 1, WEAKREF(null))
if(installed_brain.brainmob)
installed_brain.brainmob.remote_control = null
- ..()
+
+ return
//Brain changes
@@ -329,7 +330,6 @@
installed_pai.forceMove(drop_location())
set_pin_data(IC_OUTPUT, 1, WEAKREF(null))
installed_pai.pai.remote_control = null
- ..()
//pAI changes
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 58be35a1..f077adf2 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -309,21 +309,21 @@
var/datum/reagent/R = addiction
if(C && R)
R.addiction_stage++
- switch(R.addiction_stage)
- if(1 to R.addiction_stage1_end)
- need_mob_update += R.addiction_act_stage1(C)
- if(R.addiction_stage1_end to R.addiction_stage2_end)
- need_mob_update += R.addiction_act_stage2(C)
- if(R.addiction_stage2_end to R.addiction_stage3_end)
- need_mob_update += R.addiction_act_stage3(C)
- if(R.addiction_stage3_end to R.addiction_stage4_end)
- need_mob_update += R.addiction_act_stage4(C)
- if(R.addiction_stage4_end to INFINITY)
- to_chat(C, "You feel like you've gotten over your need for [R.name].")
- SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_addiction")
- cached_addictions.Remove(R)
- else
- SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
+ var/stage = R.addiction_stage
+ if(stage in 1 to R.addiction_stage1_end)
+ need_mob_update += R.addiction_act_stage1(C)
+ else if(stage in R.addiction_stage1_end to R.addiction_stage2_end)
+ need_mob_update += R.addiction_act_stage2(C)
+ else if(stage in R.addiction_stage2_end to R.addiction_stage3_end)
+ need_mob_update += R.addiction_act_stage3(C)
+ else if(stage in R.addiction_stage3_end to R.addiction_stage4_end)
+ need_mob_update += R.addiction_act_stage4(C)
+ else if(stage in R.addiction_stage4_end to INFINITY)
+ to_chat(C, "You feel like you've gotten over your need for [R.name].")
+ SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_addiction")
+ cached_addictions.Remove(R)
+ else
+ SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
addiction_tick++
if(C && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates.
C.updatehealth()
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index bc28e129..69678927 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2243,11 +2243,10 @@ datum/reagent/consumable/ethanol/creme_de_coconut
glass_name = "glass of [name]"
glass_desc = description
for(var/taste in tastes)
- switch(tastes[taste])
- if(minimum_percent*2 to INFINITY)
- primary_tastes += taste
- if(minimum_percent to minimum_percent*2)
- secondary_tastes += taste
+ if(tastes[taste] > (minimum_percent * 2))
+ primary_tastes += taste
+ else if(tastes[taste] > minimum_percent)
+ secondary_tastes += taste
var/minimum_name_percent = 0.35
name = ""
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 71863be9..212b41b9 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -217,7 +217,6 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
ramount += regen_amount
/obj/item/organ/heart/cybernetic/upgraded/proc/used_dose()
- . = ..()
addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
ramount = 0
diff --git a/hyperstation/code/modules/antagonists/wendigo/mob/metabolization.dm b/hyperstation/code/modules/antagonists/wendigo/mob/metabolization.dm
index 691a15ce..e9437e33 100644
--- a/hyperstation/code/modules/antagonists/wendigo/mob/metabolization.dm
+++ b/hyperstation/code/modules/antagonists/wendigo/mob/metabolization.dm
@@ -15,7 +15,7 @@
throw_alert("nutrition", /obj/screen/alert/fat)
if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FULL)
clear_alert("nutrition")
- if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_STARVING)
+ if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
throw_alert("nutrition", /obj/screen/alert/hungry)
if(0 to NUTRITION_LEVEL_STARVING)
throw_alert("nutrition", /obj/screen/alert/starving)
diff --git a/hyperstation/code/modules/arousal/creampie.dm b/hyperstation/code/modules/arousal/creampie.dm
index 321efa81..4ae67493 100644
--- a/hyperstation/code/modules/arousal/creampie.dm
+++ b/hyperstation/code/modules/arousal/creampie.dm
@@ -11,6 +11,5 @@
cumdrip()
/mob/living/carbon/human/proc/cumdrip()
- .=..()
if(isturf(loc))
new/obj/effect/decal/cleanable/semendrip(get_turf(src))
\ No newline at end of file
diff --git a/hyperstation/code/obj/leash.dm b/hyperstation/code/obj/leash.dm
index 46dcc35c..8db84da0 100644
--- a/hyperstation/code/obj/leash.dm
+++ b/hyperstation/code/obj/leash.dm
@@ -307,7 +307,6 @@ Icons, maybe?
step(leash_pet, NORTH, 1)
/obj/item/leash/proc/on_freepet_move()
- . = ..()
//Pet is on the run. Let's drag the leash behind them.
if(!leash_master == "null") //If there is a master, don't do this
return
diff --git a/modular_citadel/code/game/machinery/cryopod.dm b/modular_citadel/code/game/machinery/cryopod.dm
index e70306ee..3ee9a1f0 100644
--- a/modular_citadel/code/game/machinery/cryopod.dm
+++ b/modular_citadel/code/game/machinery/cryopod.dm
@@ -308,7 +308,8 @@
if(iscyborg(mob_occupant))
var/mob/living/silicon/robot/R = occupant
- if(!istype(R)) return ..()
+ if(!istype(R))
+ return
R.contents -= R.mmi
qdel(R.mmi)