diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 47818f24967..1e217acf30a 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -1017,7 +1017,7 @@ client
return
usr << "Removed [rem_organ] from [M]."
- rem_organ.Remove(M)
+ rem_organ.remove(M)
message_admins("[key_name_admin(usr)] has removed the organ [rem_organ] from [key_name_admin(M)]")
log_admin("[key_name(usr)] has removed the organ [rem_organ] from [key_name(M)]")
qdel(rem_organ)
diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
index c276d703996..acdee566889 100644
--- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
@@ -15,11 +15,11 @@
if(user.get_int_organ(/obj/item/organ/internal/cyberimp/eyes/thermals/ling))
user << "Our eyes are protected from flashes."
var/obj/item/organ/internal/cyberimp/eyes/O = new /obj/item/organ/internal/cyberimp/eyes/shield/ling()
- O.Insert(user)
+ O.insert(user)
else
var/obj/item/organ/internal/cyberimp/eyes/O = new /obj/item/organ/internal/cyberimp/eyes/thermals/ling()
- O.Insert(user)
+ O.insert(user)
return 1
@@ -27,7 +27,7 @@
/obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user)
var/obj/item/organ/internal/cyberimp/eyes/O = user.get_organ_slot("eye_ling")
if(O)
- O.Remove(user)
+ O.remove(user)
qdel(O)
@@ -69,13 +69,13 @@
/obj/item/organ/internal/cyberimp/eyes/thermals/ling/emp_act(severity)
return
-/obj/item/organ/internal/cyberimp/eyes/thermals/ling/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/cyberimp/eyes/thermals/ling/insert(mob/living/carbon/M, special = 0)
..()
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
H.weakeyes = 1
-/obj/item/organ/internal/cyberimp/eyes/thermals/ling/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/cyberimp/eyes/thermals/ling/remove(mob/living/carbon/M, special = 0)
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
H.weakeyes = 0
diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm
index 126d30d55ce..c3ee9edcae1 100644
--- a/code/game/gamemodes/changeling/powers/panacea.dm
+++ b/code/game/gamemodes/changeling/powers/panacea.dm
@@ -13,7 +13,7 @@
var/obj/item/organ/internal/body_egg/egg = user.get_int_organ(/obj/item/organ/internal/body_egg)
if(egg)
- egg.Remove(user)
+ egg.remove(user)
if(iscarbon(user))
var/mob/living/carbon/human/C = user
C.vomit()
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index e7656c67dab..a07765d5e82 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -37,7 +37,7 @@
internal_organs += new /obj/item/organ/internal/brain/xeno
internal_organs += new /obj/item/organ/internal/xenos/hivenode
for(var/obj/item/organ/internal/I in internal_organs)
- I.Insert(src)
+ I.insert(src)
..()
/mob/living/carbon/alien/get_default_language()
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index d647b317a42..e253f469da4 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -57,7 +57,7 @@
else
user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.."
-/obj/item/organ/internal/brain/Remove(var/mob/living/user)
+/obj/item/organ/internal/brain/remove(var/mob/living/user)
if(!owner) return ..() // Probably a redundant removal; just bail
@@ -73,7 +73,7 @@
..()
-/obj/item/organ/internal/brain/Insert(var/mob/living/target)
+/obj/item/organ/internal/brain/insert(var/mob/living/target)
var/brain_already_exists = 0
if(istype(target,/mob/living/carbon/human)) // No more IPC multibrain shenanigans
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index fd1560b6ace..dc9b7b6d477 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -15,7 +15,7 @@
for(var/obj/item/organ/internal/I in internal_organs)
if(istype(loc,/turf))
- I.Remove(src)
+ I.remove(src)
spawn()
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 95892601c83..ebb8674e889 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -159,12 +159,13 @@
for(var/organ in has_organ)
var/organ_type = has_organ[organ]
- world << "[organ_type]"//debug print
+ //world << "[organ_type]"//debug print
H.internal_organs_by_name[organ] = new organ_type(H,1)
H.internal_organs += new organ_type
for(var/obj/item/organ/internal/I in H.internal_organs)
- I.Insert(src)
+ if(!H.get_int_organ(I))
+ I.insert(src)
for(var/name in H.organs_by_name)
H.organs |= H.organs_by_name[name]
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index f75d9500e7e..2065b63db67 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -394,7 +394,7 @@ var/global/list/damage_icon_parts = list()
//warning("Invalid h_style for [species.name]: [h_style]")
if(!get_int_organ(/obj/item/organ/internal/brain))
- face_standing += icon("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained_s", "layer" = -HAIR_LAYER)
+ face_standing += icon("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained_s")
overlays_standing[HAIR_LAYER] = image(face_standing)
diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
index e03d2b74a01..70e3161e89d 100644
--- a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
+++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
@@ -161,9 +161,9 @@
user <<"...and you don't feel any different."
user.drop_item()
- src.Insert(user) //Consuming the heart literally replaces your heart with a demon heart. H A R D C O R E
+ src.insert(user) //Consuming the heart literally replaces your heart with a demon heart. H A R D C O R E
-/obj/item/organ/internal/heart/demonheart/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/heart/demonheart/remove(mob/living/carbon/M, special = 0)
..()
if(M.mind)
M.bloodcrawl = 0
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index f1137f58897..fb8c2d051c6 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -24,7 +24,7 @@
)
-/obj/item/organ/internal/cyberimp/eyes/Insert(var/mob/living/carbon/M, var/special = 0)
+/obj/item/organ/internal/cyberimp/eyes/insert(var/mob/living/carbon/M, var/special = 0)
..()
if(istype(owner, /mob/living/carbon/human) && eye_colour)
var/mob/living/carbon/human/HMN = owner
@@ -40,7 +40,7 @@
owner << "[aug_message]"
M.sight |= sight_flags
-/obj/item/organ/internal/cyberimp/eyes/Remove(var/mob/living/carbon/M, var/special = 0)
+/obj/item/organ/internal/cyberimp/eyes/remove(var/mob/living/carbon/M, var/special = 0)
..()
M.sight ^= sight_flags
if(istype(owner,/mob/living/carbon/human) && eye_colour)
@@ -96,14 +96,14 @@
slot = "eye_hud"
var/HUD_type = 0
-/obj/item/organ/internal/cyberimp/eyes/hud/Insert(var/mob/living/carbon/M, var/special = 0)
+/obj/item/organ/internal/cyberimp/eyes/hud/insert(var/mob/living/carbon/M, var/special = 0)
..()
if(HUD_type)
var/datum/atom_hud/H = huds[HUD_type]
H.add_hud_to(M)
M.permanent_huds |= H
-/obj/item/organ/internal/cyberimp/eyes/hud/Remove(var/mob/living/carbon/M, var/special = 0)
+/obj/item/organ/internal/cyberimp/eyes/hud/remove(var/mob/living/carbon/M, var/special = 0)
..()
if(HUD_type)
var/datum/atom_hud/H = huds[HUD_type]
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index fe00f6f2e3e..e01a6c18247 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -11,7 +11,7 @@
/obj/item/organ/internal/cyberimp/New(var/mob/M = null)
if(iscarbon(M))
- src.Insert(M)
+ src.insert(M)
if(implant_overlay)
var/image/overlay = new /image(icon, implant_overlay)
overlay.color = implant_color
@@ -115,7 +115,7 @@
if(!r_hand_ignore && r_hand_obj in owner.contents)
r_hand_obj.flags ^= NODROP
-/obj/item/organ/internal/cyberimp/brain/anti_drop/Remove(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/cyberimp/brain/anti_drop/remove(var/mob/living/carbon/M, special = 0)
..()
if(active)
ui_action_click()
diff --git a/code/modules/surgery/organs/body_egg.dm b/code/modules/surgery/organs/body_egg.dm
index 3a8580cf04f..5fa5df0ab34 100644
--- a/code/modules/surgery/organs/body_egg.dm
+++ b/code/modules/surgery/organs/body_egg.dm
@@ -12,10 +12,10 @@
/obj/item/organ/internal/body_egg/New(loc)
if(iscarbon(loc))
- src.Insert(loc)
+ src.insert(loc)
return ..()
-/obj/item/organ/internal/body_egg/Insert(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0)
..()
owner.status_flags |= XENO_HOST
processing_objects.Add(src)
@@ -23,7 +23,7 @@
spawn(0)
AddInfectionImages(owner)
-/obj/item/organ/internal/body_egg/Remove(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/body_egg/remove(var/mob/living/carbon/M, special = 0)
processing_objects.Remove(src)
if(owner)
owner.status_flags &= ~(XENO_HOST)
@@ -35,7 +35,7 @@
/obj/item/organ/internal/body_egg/process()
if(!owner) return
if(!(src in owner.internal_organs))
- Remove(owner)
+ remove(owner)
return
egg_process()
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 19286ab2784..65543c4d739 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -10,13 +10,13 @@
vital = 0
var/organ_action_name = null
-/obj/item/organ/internal/proc/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0)
if(!iscarbon(M) || owner == M)
return
var/obj/item/organ/internal/replaced = M.get_organ_slot(slot)
if(replaced)
- replaced.Remove(M, special = 1)
+ replaced.remove(M, special = 1)
owner = M
M.internal_organs |= src
@@ -25,7 +25,7 @@
action_button_name = organ_action_name
-/obj/item/organ/internal/proc/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/proc/remove(mob/living/carbon/M, special = 0)
owner = null
if(M)
M.internal_organs -= src
@@ -65,7 +65,7 @@
/obj/item/organ/internal/Destroy()
if(owner)
- Remove(owner, 1)
+ remove(owner, 1)
return ..()
/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
@@ -101,12 +101,12 @@
else
icon_state = "heart-off"
-/obj/item/organ/internal/heart/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/heart/insert(mob/living/carbon/M, special = 0)
..()
beating = 1
update_icon()
-/obj/item/organ/internal/heart/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/heart/remove(mob/living/carbon/M, special = 0)
..()
spawn(120)
beating = 0
@@ -126,7 +126,7 @@
slot = "lungs"
//Insert something neat here.
-///obj/item/organ/internal/heart/Remove(mob/living/carbon/M, special = 0)
+///obj/item/organ/internal/lungs/remove(mob/living/carbon/M, special = 0)
// ..()
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index b0de4619003..91ef793f92d 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -67,7 +67,7 @@
robotize()
..()
-/obj/item/organ/internal/cell/Insert()
+/obj/item/organ/internal/cell/insert()
..()
// This is very ghetto way of rebooting an IPC. TODO better way.
if(owner && owner.stat == DEAD)
@@ -105,7 +105,7 @@
icon = stored_mmi.icon
icon_state = stored_mmi.icon_state
-/obj/item/organ/internal/mmi_holder/Remove(var/mob/living/user)
+/obj/item/organ/internal/mmi_holder/remove(var/mob/living/user)
if(stored_mmi)
stored_mmi.loc = get_turf(src)
if(owner.mind)
diff --git a/code/modules/surgery/organs/subtypes/misc.dm b/code/modules/surgery/organs/subtypes/misc.dm
index adab834919e..c18af376739 100644
--- a/code/modules/surgery/organs/subtypes/misc.dm
+++ b/code/modules/surgery/organs/subtypes/misc.dm
@@ -30,7 +30,7 @@
goo.basecolor = "#412464"
goo.update_icon()
-/obj/item/organ/internal/borer/Remove(var/mob/living/user)
+/obj/item/organ/internal/borer/remove(var/mob/living/user)
..()
diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm
index 7ae770d5551..a2f7daf573c 100644
--- a/code/modules/surgery/organs/subtypes/xenos.dm
+++ b/code/modules/surgery/organs/subtypes/xenos.dm
@@ -11,12 +11,12 @@
..()
///can be changed if xenos get an update..
-/obj/item/organ/internal/xenos/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/xenos/insert(mob/living/carbon/M, special = 0)
..()
for(var/mob/living/carbon/alien/humanoid/verb/P in alien_powers)
verbs += P
-/obj/item/organ/internal/xenos/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/xenos/remove(mob/living/carbon/M, special = 0)
for(var/mob/living/carbon/alien/humanoid/verb/P in alien_powers)
verbs -= P
@@ -95,13 +95,13 @@
owner.adjustOxyLoss(-heal_amt)
owner.adjustCloneLoss(-heal_amt)
-/obj/item/organ/internal/xenos/plasmavessel/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/xenos/plasmavessel/insert(mob/living/carbon/M, special = 0)
..()
if(isalien(M))
var/mob/living/carbon/alien/A = M
A.updatePlasmaDisplay()
-/obj/item/organ/internal/alien/plasmavessel/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/alien/plasmavessel/remove(mob/living/carbon/M, special = 0)
..()
if(isalien(M))
var/mob/living/carbon/alien/A = M
@@ -124,11 +124,11 @@
w_class = 1
alien_powers = list(/mob/living/carbon/alien/humanoid/verb/whisp)
-/obj/item/organ/internal/xenos/hivenode/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/xenos/hivenode/insert(mob/living/carbon/M, special = 0)
..()
M.faction |= "alien"
-/obj/item/organ/internal/xenos/hivenode/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/xenos/hivenode/remove(mob/living/carbon/M, special = 0)
M.faction -= "alien"
..()
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index b55c3deb534..dd33dbb40fc 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -103,7 +103,7 @@
if(prob(10))
A.AttemptGrow()
- A.Remove(target)
+ A.remove(target)
A.loc = get_turf(target)
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -328,7 +328,7 @@
if(O && istype(O))
spread_germs_to_organ(O, user)
- O.Remove(user)
+ O.remove(target)
O.loc = get_turf(target)
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -407,7 +407,7 @@
user.drop_item(tool)
var/obj/item/organ/internal/O = tool
if(istype(O))
- O.Insert(target)
+ O.insert(target)
spread_germs_to_organ(O, user)
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)