diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 7e657c718ca..cb18cc0c7a4 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -292,7 +292,7 @@ Code:
menu += " Lockdown |"
menu += " Biohazard \]
"
- if (43) //Muskets' and Rockdtben's power monitor :D
+ if (43)
menu = "
Power Monitors - Please select one
"
powmonitor = null
powermonitors = list()
@@ -318,7 +318,7 @@ Code:
menu += ""
- if (433) //Muskets' and Rockdtben's power monitor :D
+ if (433)
menu = "
Power Monitor
"
if(!powmonitor)
menu += "\red No connection
"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index 93d736cdaa7..f64ce5a9246 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -365,7 +365,7 @@
update_icons()
if(weakened)
- weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times
+ weakened = max(weakened-1,0)
if(stuttering)
stuttering = max(stuttering-1, 0)
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index 56e02fd1552..a41fe0f9f5a 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -278,7 +278,7 @@
AdjustStunned(-1)
if(weakened)
- weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times
+ weakened = max(weakened-1,0)
if(stuttering)
stuttering = max(stuttering-1, 0)
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index 6e546c5d4be..b76f6f5f568 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -191,7 +191,7 @@
AdjustStunned(-1)
if(weakened)
- weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times
+ weakened = max(weakened-1,0)
if(stuttering)
stuttering = max(stuttering-1, 0)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 18b1c266ff6..c8af73fd799 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -231,8 +231,6 @@
/mob/living/carbon/proc/tintcheck()
return 0
-// ++++ROCKDTBEN++++ MOB PROCS //END
-
/mob/living/carbon/clean_blood()
if(ishuman(src))
var/mob/living/carbon/human/H = src
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index a72de69a1a0..58246bda071 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -947,7 +947,7 @@
AdjustStunned(-1)
if(weakened)
- weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times
+ weakened = max(weakened-1,0)
if(stuttering)
stuttering = max(stuttering-1, 0)
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index f7817caf4c4..657a2ef15f7 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -455,7 +455,7 @@
AdjustStunned(-1)
if(weakened)
- weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times
+ weakened = max(weakened-1,0)
if(stuttering)
stuttering = max(stuttering-1, 0)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7e08abafbbe..d9c6b90a4e1 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -82,77 +82,74 @@
return temperature
-// ++++ROCKDTBEN++++ MOB PROCS -- Ask me before touching.
-// Stop! ... Hammertime! ~Carn
-// I touched them without asking... I'm soooo edgy ~Erro (added nodamage checks)
-
+// MOB PROCS
/mob/living/proc/getBruteLoss()
return bruteloss
/mob/living/proc/adjustBruteLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
bruteloss = min(max(bruteloss + amount, 0),(maxHealth*2))
/mob/living/proc/getOxyLoss()
return oxyloss
/mob/living/proc/adjustOxyLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
oxyloss = min(max(oxyloss + amount, 0),(maxHealth*2))
/mob/living/proc/setOxyLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
oxyloss = amount
/mob/living/proc/getToxLoss()
return toxloss
/mob/living/proc/adjustToxLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
toxloss = min(max(toxloss + amount, 0),(maxHealth*2))
/mob/living/proc/setToxLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
toxloss = amount
/mob/living/proc/getFireLoss()
return fireloss
/mob/living/proc/adjustFireLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
fireloss = min(max(fireloss + amount, 0),(maxHealth*2))
/mob/living/proc/getCloneLoss()
return cloneloss
/mob/living/proc/adjustCloneLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
cloneloss = min(max(cloneloss + amount, 0),(maxHealth*2))
/mob/living/proc/setCloneLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
cloneloss = amount
/mob/living/proc/getBrainLoss()
return brainloss
/mob/living/proc/adjustBrainLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
brainloss = min(max(brainloss + amount, 0),(maxHealth*2))
/mob/living/proc/setBrainLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
brainloss = amount
/mob/living/proc/getStaminaLoss()
return staminaloss
/mob/living/proc/adjustStaminaLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
staminaloss = min(max(staminaloss + amount, 0),(maxHealth*2))
/mob/living/proc/setStaminaLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
+ if(status_flags & GODMODE) return 0
staminaloss = amount
/mob/living/proc/getMaxHealth()
@@ -161,7 +158,7 @@
/mob/living/proc/setMaxHealth(var/newMaxHealth)
maxHealth = newMaxHealth
-// ++++ROCKDTBEN++++ MOB PROCS //END
+// MOB PROCS //END
/mob/proc/get_contents()
diff --git a/code/modules/mob/mob_cleanup.dm b/code/modules/mob/mob_cleanup.dm
index 0ce017c3039..3e365042c48 100644
--- a/code/modules/mob/mob_cleanup.dm
+++ b/code/modules/mob/mob_cleanup.dm
@@ -10,7 +10,6 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
return 1
return 0
-// This proc has some procs that should be extracted from it. I believe we can develop some helper procs from it - Rockdtben
/mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0, var/force_species_check=1, var/spread_type = -5)
//world << "Contract_disease called by [src] with virus [virus]"
if(stat >=2)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index dff934bf361..c960d2b850a 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -450,8 +450,7 @@
else
return 0
-//The powernet that calls this proc will consume the other powernet - Rockdtben
-//TODO: rewrite so the larger net absorbs the smaller net
+//The powernet that calls this proc will consume the other powernet
/proc/merge_powernets(var/datum/powernet/net1, var/datum/powernet/net2)
if(!net1 || !net2) return
if(net1 == net2) return