Reduce lines by removing blank lines added by PJ's script

This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
-1
View File
@@ -50,7 +50,6 @@
if(!Checks())
return
to_chat(owner, "<span class='caution'>You grit your teeth and burst the implanted [target]!</span>")
add_logs(owner, null, "swallowed an implanted pill", target)
if(target.reagents.total_volume)
target.reagents.reaction(owner, INGEST)
-2
View File
@@ -58,7 +58,6 @@
if(current_surgery.status == 1 )
M.surgeries -= current_surgery
to_chat(user, "You stop the surgery.")
qdel(current_surgery)
else if(istype(user.get_inactive_hand(), /obj/item/weapon/cautery) && current_surgery.can_cancel)
M.surgeries -= current_surgery
@@ -73,7 +72,6 @@
to_chat(user, "<span class='warning'>You need to hold a cautery in inactive hand to stop [M]'s surgery!</span>")
return 1
return 0
-9
View File
@@ -157,7 +157,6 @@
break
if(istype(tool,/obj/item/weapon/cautery))
to_chat(user, "you prepare to close the cavity wall.")
else if(tool)
user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \
"You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." )
@@ -174,17 +173,14 @@
if(istype(tool, /obj/item/weapon/disk/nuclear))
to_chat(user, "<span class='warning'>Central command would kill you if you implanted the disk into someone.</span>")
return 0//fail
if(istype(tool,/obj/item/organ))
to_chat(user, "<span class='warning'>This isn't the type of surgery for organ transplants!</span>")
return 0//fail
if(!user.canUnEquip(tool, 0))
to_chat(user, "<span class='warning'>[tool] is stuck to your hand, you can't put it in [target]!</span>")
return 0
if(istype(tool,/obj/item/weapon/cautery))
@@ -192,14 +188,12 @@
else if(tool)
if(IC)
to_chat(user, "<span class='notice'>There seems to be something in there already!</span>")
return 1
else
user.visible_message("<span class='notice'> [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.</span>", \
"<span class='notice'> You put \the [tool] inside [target]'s [get_cavity(affected)] cavity.</span>" )
if((tool.w_class > get_max_wclass(affected)/2 && prob(50) && !(affected.status & ORGAN_ROBOT)))
to_chat(user, "<span class='warning'> You tear some vessels trying to fit the object in the cavity.</span>")
var/datum/wound/internal_bleeding/I = new ()
affected.wounds += I
affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1)
@@ -216,7 +210,6 @@
return 1
else
to_chat(user, "<span class='warning'>You don't find anything in [target]'s [target_zone].</span>")
return 0
@@ -372,9 +365,7 @@
user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.limb_name]!", "<span class='notice'>You sucessfully remove [objects] objects from [H]'s [L.limb_name].</span>")
else
to_chat(user, "<span class='warning'>You find no objects embedded in [H]'s [L.limb_name]!</span>")
else
to_chat(user, "<span class='warning'>You can't find [target]'s [target_zone], let alone any objects embedded in it!</span>")
return 1
@@ -37,7 +37,6 @@
HMN.update_eyes()
if(aug_message && !special)
to_chat(owner, "<span class='notice'>[aug_message]</span>")
M.sight |= vision_flags
/obj/item/organ/internal/cyberimp/eyes/remove(var/mob/living/carbon/M, var/special = 0)
@@ -61,7 +60,6 @@
if(prob(10 * severity))
return
to_chat(owner, "<span class='warning'>Static obfuscates your vision!</span>")
owner.flash_eyes(visual = 1)
@@ -35,7 +35,6 @@
var/stun_amount = 5 + (severity-1 ? 0 : 5)
owner.Stun(stun_amount)
to_chat(owner, "<span class='warning'>Your body seizes up!</span>")
return stun_amount
@@ -73,7 +72,6 @@
if(!l_hand_obj && !r_hand_obj)
to_chat(owner, "<span class='notice'>You are not holding any items, your hands relax...</span>")
active = 0
else
var/msg = 0
@@ -82,17 +80,13 @@
switch(msg)
if(1)
to_chat(owner, "<span class='notice'>Your left hand's grip tightens.</span>")
if(2)
to_chat(owner, "<span class='notice'>Your right hand's grip tightens.</span>")
if(3)
to_chat(owner, "<span class='notice'>Both of your hand's grips tighten.</span>")
else
release_items()
to_chat(owner, "<span class='notice'>Your hands relax...</span>")
l_hand_obj = null
r_hand_obj = null
@@ -110,13 +104,11 @@
A = pick(oview(range))
L_item.throw_at(A, range, 2)
to_chat(owner, "<span class='notice'>Your left arm spasms and throws the [L_item.name]!</span>")
if(R_item)
A = pick(oview(range))
R_item.throw_at(A, range, 2)
to_chat(owner, "<span class='notice'>Your right arm spasms and throws the [R_item.name]!</span>")
/obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items()
if(!l_hand_ignore && l_hand_obj in owner.contents)
l_hand_obj.flags ^= NODROP
@@ -181,7 +173,6 @@
if(owner.nutrition <= hunger_threshold)
synthesizing = 1
to_chat(owner, "<span class='notice'>You feel less hungry...</span>")
owner.nutrition += 50
spawn(50)
synthesizing = 0
@@ -192,7 +183,6 @@
owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning
to_chat(owner, "<span class='warning'>You feel like your insides are burning.</span>")
/obj/item/organ/internal/cyberimp/chest/nutriment/plus
name = "Nutriment pump implant PLUS"
desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are hungry."
@@ -258,7 +248,6 @@
if(H.stat == CONSCIOUS)
to_chat(H, "<span class='notice'>You feel your heart beating again!</span>")
//ARM...THAT GO IN THE CHEST
/obj/item/organ/internal/cyberimp/chest/arm_mod//dummy parent item for making arm-mod implants. works best with nodrop items that are sent to nullspace upon being dropped.
name = "Arm-mounted item implant"
@@ -276,7 +265,6 @@
/obj/item/organ/internal/cyberimp/chest/arm_mod/ui_action_click()
if(overloaded)//ensure the implant isn't broken
to_chat(owner, "<span class='warning'>The implant doesn't respond. It seems to be broken...</span>")
return
if(out)//check if the owner has the item out already
owner.unEquip(holder, 1)//if he does, take it away. then,
@@ -294,7 +282,6 @@
holder.loc = null//keep it in nullspace
to_chat(owner, "<span class='warning'>You can't extend [holder] if you can't use your hands!</span>")
/obj/item/organ/internal/cyberimp/chest/arm_mod/emp_act(severity)//if the implant gets EMPed...
if(!owner || overloaded)//ensure that it's in an owner and that it's not already EMPed, then...
return
@@ -306,7 +293,6 @@
owner.visible_message("<span class='danger'>A loud bang comes from [owner]...</span>")
playsound(get_turf(owner), 'sound/effects/bang.ogg', 100, 1)
to_chat(owner, "<span class='warning'>You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?</span>")
owner.adjust_fire_stacks(20)
owner.IgniteMob()//ignite the owner, as well as
owner.say("AUUUUUUUUUUUUUUUUUUGH!!")
@@ -9,7 +9,6 @@
/obj/item/device/autoimplanter/attack_self(mob/user)//when the object it used...
if(!storedorgan)
to_chat(user, "<span class='notice'>[src] currently has no implant stored.</span>")
return
storedorgan.insert(user)//insert stored organ into the user
user.visible_message("<span class='notice'>[user] presses a button on [src], and you hear a short mechanical noise.</span>", "<span class='notice'>You feel a sharp sting as [src] plunges into your body.</span>")
@@ -20,21 +19,17 @@
if(istype(I, /obj/item/organ/internal/cyberimp))
if(storedorgan)
to_chat(user, "<span class='notice'>[src] already has an implant stored.</span>")
return
if(!user.drop_item())
return
I.forceMove(src)
storedorgan = I
to_chat(user, "<span class='notice'>You insert the [I] into [src].</span>")
else if(istype(I, /obj/item/weapon/screwdriver))
if(!storedorgan)
to_chat(user, "<span class='notice'>There's no implant in [src] for you to remove.</span>")
else
storedorgan.forceMove(get_turf(user))
storedorgan = null
to_chat(user, "<span class='notice'>You remove the [storedorgan] from [src].</span>")
playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
-4
View File
@@ -127,11 +127,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
update_body()
var/word = pick("dizzy","woosey","faint")
to_chat(src, "\red You feel [word]")
if(prob(1))
var/word = pick("dizzy","woosey","faint")
to_chat(src, "\red You feel [word]")
if(oxyloss < 20)
oxyloss += 3
if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
@@ -146,7 +144,6 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
Paralyse(rand(1,3))
var/word = pick("dizzy","woosey","faint")
to_chat(src, "\red You feel very [word]")
if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
if(!pale)
pale = 1
@@ -158,7 +155,6 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
Paralyse(rand(1,3))
var/word = pick("dizzy","woosey","faint")
to_chat(src, "\red You feel extremely [word]")
if(0 to BLOOD_VOLUME_SURVIVE)
death()
-1
View File
@@ -10,7 +10,6 @@
..()
to_chat(finder, "<span class='warning'>You found an unknown alien organism in [owner]'s [parent_organ]!</span>")
/obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0)
..()
owner.status_flags |= XENO_HOST
-1
View File
@@ -145,7 +145,6 @@ var/list/organ_cache = list()
if(status & ORGAN_DEAD)
to_chat(user, "<span class='notice'>The decay has set in.</span>")
/obj/item/organ/proc/handle_germ_effects()
//** Handle the effects of infections
var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin")
@@ -294,7 +294,6 @@
var/obj/item/organ/external/stump/S = locate() in children
if(S)
// to_chat(world, "Extra healing to go around ([brute+burn]) and [owner] needs a replacement limb.")
*/
//Sync the organ's damage with its wounds
@@ -530,7 +529,6 @@ Note that amputating the affected organ does in fact remove the infection from t
if (!(status & ORGAN_DEAD))
status |= ORGAN_DEAD
to_chat(owner, "<span class='notice'>You can't feel your [name] anymore...</span>")
owner.update_body(1)
germ_level++
@@ -303,7 +303,6 @@
if (germ_level > INFECTION_LEVEL_ONE)
if(prob(1))
to_chat(owner, "<span class='warning'> Your skin itches.</span>")
if (germ_level > INFECTION_LEVEL_TWO)
if(prob(1))
spawn owner.vomit()
@@ -460,13 +459,11 @@
if(organhonked < world.time)
organhonked = world.time+900
to_chat(owner, "<font color='red' size='7'>HONK</font>")
owner.sleeping = 0
owner.stuttering = 20
owner.ear_deaf = 30
owner.Weaken(3)
to_chat(owner, 'sound/items/AirHorn.ogg')
if(prob(30))
owner.Stun(10)
owner.Paralyse(4)
-2
View File
@@ -41,7 +41,6 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
if(msg && (msg != last_pain_message || prob(10)))
last_pain_message = msg
to_chat(src, msg)
next_pain_time = world.time + (100 - amount)
@@ -66,7 +65,6 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time)))
last_pain_message = msg
to_chat(src, msg)
next_pain_time = world.time + 100
mob/living/carbon/human/proc/handle_pain()
-1
View File
@@ -20,7 +20,6 @@
owner.reagents.add_reagent("histamine", 5)
if(5)
to_chat(owner, "<span class='danger'>You feel like something is tearing its way out of your skin...</span>")
owner.reagents.add_reagent("histamine", 10)
if(prob(30))
owner.emote("scream")
@@ -134,7 +134,6 @@
if(!special)
to_chat(owner, "Error 404:Optical Sensors not found.")
. = ..()
/obj/item/organ/internal/optical_sensor/surgeryize()
-8
View File
@@ -88,17 +88,14 @@
I = tool
if(target_zone != I.parent_organ || target.get_organ_slot(I.slot))
to_chat(user, "<span class='notice'>There is no room for [I] in [target]'s [parse_zone(target_zone)]!</span>")
return -1
if(I.damage > (I.max_damage * 0.75))
to_chat(user, "<span class='notice'> \The [I] is in no state to be transplanted.</span>")
return -1
if(target.get_int_organ(I))
to_chat(user, "<span class='warning'> \The [target] already has [I].</span>")
return -1
if(affected)
user.visible_message("[user] starts transplanting \the [tool] into [target]'s [affected.name].", \
@@ -127,7 +124,6 @@
var/list/organs = target.get_organs_zone(target_zone)
if(!organs.len)
to_chat(user, "<span class='notice'>There are no removeable organs in [target]'s [parse_zone(target_zone)]!</span>")
return -1
else
for(var/obj/item/organ/internal/O in organs)
@@ -158,7 +154,6 @@
if(!hasorgans(target))
to_chat(user, "They do not have organs to mend!")
return
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I && I.damage > 0)
@@ -172,12 +167,10 @@
"You start treating damage to [target]'s [I.name] with [tool_name]." )
to_chat(user, "[I] does not appear to be damaged.")
H.custom_pain("The pain in your [affected.name] is living hell!",1)
else if(istype(tool, /obj/item/weapon/reagent_containers/food/snacks/organ))
to_chat(user, "<span class='warning'>[tool] was biten by someone! It's too damaged to use!</span>")
return -1
..()
@@ -213,7 +206,6 @@
spread_germs_to_organ(I, user)
if(!user.canUnEquip(I, 0))
to_chat(user, "<span class='warning'>[I] is stuck to your hand, you can't put it in [target]!</span>")
return 0
if(affected)
-2
View File
@@ -241,13 +241,11 @@
var/braincase = target.named_organ_parent("brain")
user.visible_message("[user] reaches into [target]'s head with [tool].", "<span class='notice'>You begin aligning [tool]'s light to the tumor on [target]'s brain...</span>")
to_chat(target, "<span class='boldannounce'>A small part of your [braincase] pulses with agony as the light impacts it.</span>")
..()
/datum/surgery_step/internal/dethrall/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
if(target.get_species() == "Lesser Shadowling") //Empowered thralls cannot be deconverted
to_chat(target, "<span class='shadowling'><b><i>NOT LIKE THIS!</i></b></span>")
user.visible_message("<span class='warning'>[target] suddenly slams upward and knocks down [user]!</span>", \
"<span class='userdanger'>[target] suddenly bolts up and slams you with tremendous force!</span>")
user.resting = 0 //Remove all stuns
-18
View File
@@ -233,7 +233,6 @@
if(istype(C))
if(!C.get_amount() >= 3)
to_chat(user, "<span class='warning'>You need three or more cable pieces to repair this damage.</span>")
return 2
C.use(3)
return 1
@@ -291,20 +290,16 @@
if(I.status != ORGAN_ROBOT || I.robotic != 2)
to_chat(user, "<span class='notice'>You can only implant cybernetic organs.</span>")
if(target_zone != I.parent_organ || target.get_organ_slot(I.slot))
to_chat(user, "<span class='notice'>There is no room for [I] in [target]'s [parse_zone(target_zone)]!</span>")
return -1
if(I.damage > (I.max_damage * 0.75))
to_chat(user, "<span class='notice'> \The [I] is in no state to be transplanted.</span>")
return -1
if(target.get_int_organ(I))
to_chat(user, "<span class='warning'> \The [target] already has [I].</span>")
return -1
user.visible_message("[user] begins reattaching [target]'s [tool].", \
@@ -316,7 +311,6 @@
if(target_zone != "chest")
to_chat(user, "<span class='notice'> You must target the chest cavity.</span>")
return -1
var/obj/item/device/mmi/M = tool
@@ -329,27 +323,22 @@
if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD)
to_chat(user, "<span class='danger'>That brain is not usable.</span>")
return -1
if(!(affected.status & ORGAN_ROBOT))
to_chat(user, "<span class='danger'>You cannot install a computer brain into a meat enclosure.</span>")
return -1
if(!target.species)
to_chat(user, "<span class='danger'>You have no idea what species this person is. Report this on the bug tracker.</span>")
return -1
if(!target.species.has_organ["brain"])
to_chat(user, "<span class='danger'>You're pretty sure [target.species.name_plural] don't normally have a brain.</span>")
return -1
if(target.get_int_organ(/obj/item/organ/internal/brain/))
to_chat(user, "<span class='danger'>Your subject already has a brain.</span>")
return -1
user.visible_message("[user] starts installing \the [tool] into [target]'s [affected.name].", \
@@ -364,7 +353,6 @@
return -1
if(!organs.len)
to_chat(user, "<span class='notice'>There is no removeable organs in [target]'s [parse_zone(target_zone)]!</span>")
return -1
else
for(var/obj/item/organ/internal/O in organs)
@@ -421,7 +409,6 @@
if(!user.canUnEquip(I, 0))
to_chat(user, "<span class='warning'>[I] is stuck to your hand, you can't put it in [target]!</span>")
return 0
user.drop_item()
@@ -529,27 +516,22 @@
if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD)
to_chat(user, "<span class='danger'>That brain is not usable.</span>")
return 2
if(!(affected.status & ORGAN_ROBOT))
to_chat(user, "<span class='danger'>You cannot install a computer brain into a meat enclosure.</span>")
return 2
if(!target.species)
to_chat(user, "<span class='danger'>You have no idea what species this person is. Report this on the bug tracker.</span>")
return 2
if(!target.species.has_organ["brain"])
to_chat(user, "<span class='danger'>You're pretty sure [target.species.name_plural] don't normally have a brain.</span>")
return 2
if(target.get_int_organ(/obj/item/organ/internal/brain/))
to_chat(user, "<span class='danger'>Your subject already has a brain.</span>")
return 2
return 1
-1
View File
@@ -182,7 +182,6 @@
/proc/spread_germs_to_organ(obj/item/organ/E, mob/living/carbon/human/user)
if(!istype(user) || !istype(E)) return
// to_chat(world, "Germ spread: [E] : [E.owner]")
var/germ_level = user.germ_level
if(user.gloves)
germ_level = user.gloves.germ_level