Skip to content
This repository has been archived by the owner on Jan 22, 2020. It is now read-only.

Commit

Permalink
Removed DNA, cloning, changeling, genetics, disabilities, powers.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Jan 28, 2018
1 parent 28d38fc commit 8bc6ee6
Show file tree
Hide file tree
Showing 182 changed files with 456 additions and 7,177 deletions.
8 changes: 0 additions & 8 deletions code/ZAS/Phoron.dm
Expand Up @@ -107,14 +107,6 @@ obj/var/contaminated = 0
if(!(wear_mask.body_parts_covered & EYES))
burn_eyes()

//Genetic Corruption
if(vsc.plc.GENETIC_CORRUPTION)
if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
randmutb(src)
src << "<span class='danger'>High levels of toxins cause you to spontaneously mutate!</span>"
domutcheck(src,null)


/mob/living/carbon/human/proc/burn_eyes()
var/obj/item/organ/internal/eyes/E = internal_organs_by_name[BP_EYES]
if(E)
Expand Down
1 change: 1 addition & 0 deletions code/__defines/damage_organs.dm
Expand Up @@ -31,6 +31,7 @@
#define ORGAN_DESTROYED (1<<3)
#define ORGAN_DEAD (1<<4)
#define ORGAN_MUTATED (1<<5)
#define ORGAN_SKELETAL (1<<6)

#define DROPLIMB_EDGE 0
#define DROPLIMB_BLUNT 1
Expand Down
76 changes: 0 additions & 76 deletions code/__defines/dna.dm

This file was deleted.

43 changes: 31 additions & 12 deletions code/_helpers/mobs.dm
Expand Up @@ -297,17 +297,7 @@ Proc for attack log creation, because really why not
if(!visible_msg)
visible_msg = "\The [user] has analyzed \the [M]'s vitals."

if (!ignore_clumsiness && (CLUMSY in user.mutations) && prob(50))
user << text("<span class='warning'>You try to analyze the floor's vitals!</span>")
for(var/mob/O in viewers(M, null))
O.show_message("<span class='warning'>\The [user] has analyzed the floor's vitals!</span>", 1)
user.show_message("<span class='notice'>Analyzing Results for The floor:</span>", 1)
user.show_message("<span class='notice'>Overall Status: Healthy</span>", 1)
user.show_message("<span class='notice'> Damage Specifics: 0-0-0-0</span>", 1)
user.show_message("<span class='notice'>Key: Suffocation/Toxin/Burns/Brute</span>", 1)
user.show_message("<span class='notice'>Body Temperature: ???</span>", 1)
return
if (!ignore_clumsiness && !(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
return
user.visible_message("<span class='notice'>[visible_msg]</span>")
Expand Down Expand Up @@ -435,11 +425,40 @@ Proc for attack log creation, because really why not
if(M:vessel)
var/blood_volume = H.vessel.get_reagent_amount("blood")
var/blood_percent = round((blood_volume / H.species.blood_volume)*100)
var/blood_type = H.dna.b_type
var/blood_type = H.b_type
if((blood_percent <= BLOOD_VOLUME_SAFE) && (blood_percent > BLOOD_VOLUME_BAD))
user.show_message("<span class='danger'>Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl.</span> <span class='notice'>Type: [blood_type]</span>")
else if(blood_percent <= BLOOD_VOLUME_BAD)
user.show_message("<span class='danger'><i>Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl.</i></span> <span class='notice'>Type: [blood_type]</span>")
else
user.show_message("<span class='notice'>Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span>")
user.show_message("<span class='notice'>Subject's pulse: <font color='[H.pulse() == PULSE_THREADY || H.pulse() == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font></span>")

//Find a dead mob with a brain and client.
/proc/find_dead_player(var/find_key, var/include_observers = 0)
if(isnull(find_key))
return

var/mob/selected = null

if(include_observers)
for(var/mob/M in player_list)
if((M.stat != DEAD) || (!M.client))
continue
if(M.ckey == find_key)
selected = M
break
else
for(var/mob/living/M in player_list)
//Dead people only thanks!
if((M.stat != DEAD) || (!M.client))
continue
//They need a brain!
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.should_have_organ(BP_BRAIN) && !H.has_brain())
continue
if(M.ckey == find_key)
selected = M
break
return selected
17 changes: 4 additions & 13 deletions code/_onclick/click.dm
Expand Up @@ -185,23 +185,14 @@
/*
Ranged unarmed attack:
This currently is just a default for all mobs, involving
laser eyes and telekinesis. You could easily add exceptions
for things like ranged glove touches, spitting alien acid/neurotoxin,
animals lunging, etc.
This currently is just a default for all mobs. You could easily add
exceptions for things like ranged glove touches, spitting alien acid/
neurotoxin, animals lunging, etc.
*/
/mob/proc/RangedAttack(var/atom/A, var/params)

if(!mutations.len) return

if((LASER in mutations) && a_intent == I_HURT)
LaserEyes(A) // moved into a proc below
return TRUE

else if(TK in mutations)
setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
A.attack_tk(src)
return TRUE
return

/*
Restrained ClickOn
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/human.dm
Expand Up @@ -281,7 +281,7 @@
//Used for new human mobs created by cloning/etc.
/mob/living/carbon/human/proc/set_cloned_appearance()
f_style = "Shaved"
if(dna.species == "Human") //no more xenos losing ears/tentacles
if(get_species() == "Human") //no more xenos losing ears/tentacles
h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
all_underwear.Cut()
regenerate_icons()
7 changes: 1 addition & 6 deletions code/_onclick/item_attack.dm
Expand Up @@ -88,9 +88,4 @@ avoid code duplication. This includes items that may sometimes act as a standard
/obj/item/proc/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
if(hitsound)
playsound(loc, hitsound, 50, 1, -1)

var/power = force
if(HULK in user.mutations)
power *= 2
return target.hit_with_weapon(src, user, power, hit_zone)

return target.hit_with_weapon(src, user, force, hit_zone)
11 changes: 3 additions & 8 deletions code/_onclick/other_mobs.dm
Expand Up @@ -34,17 +34,12 @@
/mob/living/carbon/human/RangedAttack(var/atom/A)

. = ..()
if(. || (!gloves && !mutations.len))
if(. || !gloves)
return

var/obj/item/clothing/gloves/G = gloves
if((LASER in mutations) && a_intent == I_HURT)
LaserEyes(A) // moved into a proc below
else if(istype(G) && G.Touch(A,0)) // for magic gloves
return
else if(TK in mutations)
A.attack_tk(src)

if(istype(G))
G.Touch(A,0) // for magic gloves
/mob/living/RestrainedClickOn(var/atom/A)
return

Expand Down

0 comments on commit 8bc6ee6

Please sign in to comment.