Permalink
Browse files

Removed DNA, cloning, changeling, genetics, disabilities, powers.

  • Loading branch information...
MistakeNot4892 committed Jan 5, 2018
1 parent 28d38fc commit 8bc6ee61d11ce3c6dab3225706d87bd34581d683
Showing with 456 additions and 7,177 deletions.
  1. +0 −8 code/ZAS/Phoron.dm
  2. +1 −0 code/__defines/damage_organs.dm
  3. +0 −76 code/__defines/dna.dm
  4. +31 −12 code/_helpers/mobs.dm
  5. +4 −13 code/_onclick/click.dm
  6. +1 −1 code/_onclick/hud/human.dm
  7. +1 −6 code/_onclick/item_attack.dm
  8. +3 −8 code/_onclick/other_mobs.dm
  9. +0 −171 code/_onclick/telekinesis.dm
  10. +0 −1 code/controllers/subsystems/initialization/legacy_init.dm
  11. +6 −6 code/datums/datacore.dm
  12. +0 −28 code/datums/extensions/multitool/machinery/cloning.dm
  13. +0 −12 code/datums/mind.dm
  14. +0 −1 code/game/antagonist/antagonist_create.dm
  15. +0 −75 code/game/antagonist/station/changeling.dm
  16. +3 −20 code/game/atoms.dm
  17. +0 −3 code/game/atoms_movable.dm
  18. +0 −369 code/game/dna/dna2.dm
  19. +0 −47 code/game/dna/dna2_domutcheck.dm
  20. +0 −188 code/game/dna/dna2_helpers.dm
  21. +0 −794 code/game/dna/dna_modifier.dm
  22. +0 −129 code/game/dna/genes/disabilities.dm
  23. +0 −122 code/game/dna/genes/gene.dm
  24. +0 −175 code/game/dna/genes/monkey.dm
  25. +0 −195 code/game/dna/genes/powers.dm
  26. +0 −12 code/game/gamemodes/changeling/absorbed_dna.dm
  27. +0 −18 code/game/gamemodes/changeling/changeling.dm
  28. +0 −841 code/game/gamemodes/changeling/changeling_powers.dm
  29. +0 −499 code/game/gamemodes/changeling/modularchangling.dm
  30. +2 −2 code/game/gamemodes/cult/ritual.dm
  31. +4 −14 code/game/gamemodes/cult/runes.dm
  32. +1 −7 code/game/gamemodes/events.dm
  33. +1 −3 code/game/gamemodes/nuclear/pinpointer.dm
  34. +0 −83 code/game/gamemodes/setupgame.dm
  35. +0 −7 code/game/jobs/job_controller.dm
  36. +0 −7 code/game/machinery/OpTable.dm
  37. +0 −6 code/game/machinery/adv_med.dm
  38. +0 −6 code/game/machinery/bioprinter.dm
  39. +0 −500 code/game/machinery/cloning.dm
  40. +0 −433 code/game/machinery/computer/cloning.dm
  41. +0 −5 code/game/machinery/doors/door.dm
  42. +0 −4 code/game/machinery/iv_drip.dm
  43. +0 −8 code/game/machinery/lathes/designs/designs_circuits.dm
  44. +0 −70 code/game/machinery/wishgranter.dm
  45. +0 −24 code/game/objectives/objectives_changeling.dm
  46. +1 −6 code/game/objects/effects/chem/foam.dm
  47. +7 −10 code/game/objects/effects/gibs.dm
  48. +0 −2 code/game/objects/effects/mines.dm
  49. +3 −11 code/game/objects/items.dm
  50. +1 −4 code/game/objects/items/devices/PDA/PDA.dm
  51. +2 −12 code/game/objects/items/devices/flash.dm
  52. +0 −5 code/game/objects/items/devices/flashlight.dm
  53. +5 −6 code/game/objects/items/devices/paicard.dm
  54. +2 −5 code/game/objects/items/weapons/cards_ids.dm
  55. +4 −9 code/game/objects/items/weapons/cards_ids_syndicate.dm
  56. +0 −11 code/game/objects/items/weapons/circuitboards/computer/computer.dm
  57. +0 −23 code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
  58. +0 −602 code/game/objects/items/weapons/dna_injector.dm
  59. +1 −1 code/game/objects/items/weapons/grenades/chem_grenade.dm
  60. +1 −6 code/game/objects/items/weapons/grenades/flashbang.dm
  61. +6 −40 code/game/objects/items/weapons/grenades/grenade.dm
  62. +0 −5 code/game/objects/items/weapons/handcuffs.dm
  63. +16 −0 code/game/objects/items/weapons/implants/implant.dm
  64. +0 −18 code/game/objects/items/weapons/material/kitchen.dm
  65. +0 −4 code/game/objects/items/weapons/melee/energy.dm
  66. +0 −3 code/game/objects/items/weapons/shields.dm
  67. +0 −1 code/game/objects/items/weapons/storage/belt.dm
  68. +0 −6 code/game/objects/items/weapons/storage/boxes.dm
  69. +0 −8 code/game/objects/items/weapons/stunbaton.dm
  70. +0 −29 code/game/objects/items/weapons/swords_axes_etc.dm
  71. +1 −9 code/game/objects/items/weapons/tools.dm
  72. +0 −15 code/game/objects/items/weapons/trays.dm
  73. +0 −9 code/game/objects/items/weapons/weaponry.dm
  74. +0 −9 code/game/objects/objs.dm
  75. +4 −11 code/game/objects/structures.dm
  76. +10 −16 code/game/objects/structures/alien/resin.dm
  77. +0 −24 code/game/objects/structures/bedsheet_bin.dm
  78. +0 −11 code/game/objects/structures/crates_lockers/closets.dm
  79. +0 −2 code/game/objects/structures/crates_lockers/closets/statue.dm
  80. +0 −10 code/game/objects/structures/extinguisher.dm
  81. +0 −8 code/game/objects/structures/girders.dm
  82. +1 −5 code/game/objects/structures/grille.dm
  83. +0 −7 code/game/objects/structures/stool_bed_chair_nest/chairs.dm
  84. +5 −17 code/game/objects/structures/window.dm
  85. +3 −2 code/game/turfs/simulated.dm
  86. +1 −9 code/game/turfs/simulated/wall_attacks.dm
  87. +0 −1 code/modules/acting/acting_items.dm
  88. +0 −19 code/modules/admin/admin.dm
  89. +1 −3 code/modules/admin/admin_verbs.dm
  90. +0 −14 code/modules/admin/secrets/admin_secrets/list_dna.dm
  91. +1 −6 code/modules/admin/secrets/admin_secrets/list_fingerprints.dm
  92. +0 −13 code/modules/admin/topic.dm
  93. +0 −16 code/modules/admin/verbs/debug.dm
  94. +0 −1 code/modules/admin/verbs/mapping.dm
  95. +0 −114 code/modules/admin/verbs/randomverbs.dm
  96. +0 −1 code/modules/admin/view_variables/helpers.dm
  97. +0 −11 code/modules/admin/view_variables/topic.dm
  98. +0 −21 code/modules/assembly/mousetrap.dm
  99. +0 −1 code/modules/client/preference_setup/general/03_body.dm
  100. +0 −1 code/modules/client/preferences.dm
  101. +0 −5 code/modules/clothing/glasses/glasses.dm
  102. +1 −1 code/modules/clothing/suits/suits_protective.dm
  103. +0 −3 code/modules/codex/entries/reagents.dm
  104. +1 −5 code/modules/detectivework/tools/swabs.dm
  105. +0 −6 code/modules/events/radiation_storm.dm
  106. +0 −6 code/modules/hydroponics/trays/tray.dm
  107. +0 −3 code/modules/item_worth/reagents.dm
  108. +0 −4 code/modules/item_worth/worths_list.dm
  109. +1 −3 code/modules/mining/abandonedcrates.dm
  110. +0 −1 code/modules/mmi/_mmi.dm
  111. +0 −1 code/modules/mmi/mmi_digital.dm
  112. +1 −1 code/modules/mob/death.dm
  113. +3 −3 code/modules/mob/hear_say.dm
  114. +0 −15 code/modules/mob/language/outsider.dm
  115. +0 −5 code/modules/mob/living/carbon/alien/alien_attacks.dm
  116. +2 −3 code/modules/mob/living/carbon/alien/life.dm
  117. +0 −1 code/modules/mob/living/carbon/brain/brain_item.dm
  118. +4 −5 code/modules/mob/living/carbon/brain/life.dm
  119. +0 −18 code/modules/mob/living/carbon/carbon.dm
  120. +0 −4 code/modules/mob/living/carbon/carbon_defense.dm
  121. +7 −13 code/modules/mob/living/carbon/human/appearance.dm
  122. +1 −36 code/modules/mob/living/carbon/human/death.dm
  123. +0 −3 code/modules/mob/living/carbon/human/examine.dm
  124. +20 −236 code/modules/mob/living/carbon/human/human.dm
  125. +0 −6 code/modules/mob/living/carbon/human/human_attackhand.dm
  126. +0 −14 code/modules/mob/living/carbon/human/human_damage.dm
  127. +0 −3 code/modules/mob/living/carbon/human/human_defines.dm
  128. +11 −0 code/modules/mob/living/carbon/human/human_dna.dm
  129. +0 −5 code/modules/mob/living/carbon/human/human_movement.dm
  130. +1 −1 code/modules/mob/living/carbon/human/human_organs.dm
  131. +151 −0 code/modules/mob/living/carbon/human/human_powers.dm
  132. +3 −60 code/modules/mob/living/carbon/human/life.dm
  133. +1 −3 code/modules/mob/living/carbon/human/say.dm
  134. +1 −1 code/modules/mob/living/carbon/human/species/species.dm
  135. +27 −85 code/modules/mob/living/carbon/human/update_icons.dm
  136. +0 −5 code/modules/mob/living/carbon/metroid/life.dm
  137. +0 −13 code/modules/mob/living/carbon/metroid/metroid.dm
  138. +1 −2 code/modules/mob/living/carbon/resist.dm
  139. +0 −1 code/modules/mob/living/damage_procs.dm
  140. +2 −5 code/modules/mob/living/life.dm
  141. +1 −13 code/modules/mob/living/living.dm
  142. +0 −7 code/modules/mob/living/living_defense.dm
  143. +0 −5 code/modules/mob/living/say.dm
  144. +2 −2 code/modules/mob/living/silicon/pai/pai.dm
  145. +9 −9 code/modules/mob/living/silicon/pai/software_modules.dm
  146. +0 −9 code/modules/mob/living/silicon/robot/analyzer.dm
  147. +1 −7 code/modules/mob/living/silicon/robot/life.dm
  148. +0 −2 code/modules/mob/living/simple_animal/borer/borer_powers.dm
  149. +1 −2 code/modules/mob/living/simple_animal/parrot.dm
  150. +2 −2 code/modules/mob/mob.dm
  151. +2 −7 code/modules/mob/mob_defines.dm
  152. +2 −4 code/modules/mob/mob_helpers.dm
  153. +0 −3 code/modules/mob/mob_transformation_simple.dm
  154. +1 −6 code/modules/mob/new_player/new_player.dm
  155. +0 −2 code/modules/mob/transform_procs.dm
  156. +0 −3 code/modules/mob/update_icons.dm
  157. +0 −2 code/modules/nano/interaction/default.dm
  158. +0 −10 code/modules/nano/modules/human_appearance.dm
  159. +3 −4 code/modules/organs/blood.dm
  160. +4 −4 code/modules/organs/internal/lungs.dm
  161. +32 −42 code/modules/organs/organ.dm
  162. +10 −11 code/modules/organs/organ_icon.dm
  163. +8 −0 code/modules/organs/subtypes/standard.dm
  164. +0 −25 code/modules/paperwork/filingcabinet.dm
  165. +0 −3 code/modules/paperwork/paper.dm
  166. +0 −4 code/modules/power/cable.dm
  167. +1 −12 code/modules/power/lighting.dm
  168. +0 −19 code/modules/projectiles/gun.dm
  169. +2 −10 code/modules/projectiles/projectile/special.dm
  170. +0 −20 code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
  171. +0 −2 code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
  172. +0 −12 code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
  173. +0 −7 code/modules/reagents/Chemistry-Recipes.dm
  174. +0 −1 code/modules/reagents/dispenser/cartridge_presets.dm
  175. +0 −1 code/modules/reagents/dispenser/dispenser_presets.dm
  176. +0 −1 code/modules/reagents/reagent_containers/glass.dm
  177. +0 −3 code/modules/tables/interactions.dm
  178. +0 −16 code/modules/virus2/effect.dm
  179. +1 −5 code/modules/virus2/items_devices.dm
  180. +0 −49 code/unit_tests/extension_tests.dm
  181. +0 −1 config/example/config.txt
  182. +1 −23 europa.dme
@@ -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)
@@ -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

This file was deleted.

Oops, something went wrong.
@@ -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>")
@@ -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
@@ -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
@@ -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()
@@ -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)
@@ -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
Oops, something went wrong.

0 comments on commit 8bc6ee6

Please sign in to comment.