cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

wot

Browse Source
This commit is contained in:
Aurorablade
2015-12-25 01:05:47 -05:00
parent 027d9660de
commit 4e1f63da7e
17 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_eyes.dm
+4 -4
View File
@@ -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 << "<span class='notice'>[aug_message]</span>"
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]
code/modules/surgery/organs/augments_internal.dm
+2 -2
View File
@@ -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()
code/modules/surgery/organs/body_egg.dm
+4 -4
View File
@@ -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()
code/modules/surgery/organs/organ_internal.dm
+7 -7
View File
@@ -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)
// ..()
code/modules/surgery/organs/subtypes/machine.dm
+2 -2
View File
@@ -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)
code/modules/surgery/organs/subtypes/misc.dm
+1 -1
View File
@@ -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)
..()
code/modules/surgery/organs/subtypes/xenos.dm
+6 -6
View File
@@ -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"
..()