f44ff1d7aa
Standardize FAT
...
Conflicts:
code/modules/client/preferences.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/mob.dm
code/modules/mob/mob_grab.dm
2014-01-21 22:57:10 -05:00
d49e6d3bf4
Standardize CLUMSY
...
Conflicts:
code/game/jobs/job/civilian.dm
code/game/objects/items/weapons/defib.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
22a2df1115
Standardize HULK.
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
5784cf61df
Compile fixes XRAY
2014-01-21 22:38:35 -05:00
dd8c8c12ab
Standardize XRAY.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
maps/RandomZLevels/wildwest.dm
2014-01-21 22:37:37 -05:00
95cc6a27b5
Standardize mutation constants, remove ambiguity, remove non-implemented muts.
...
Conflicts:
code/_onclick/click.dm
code/game/dna/genes/powers.dm
code/game/machinery/wishgranter.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_movement.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/damage_procs.dm
code/modules/mob/living/living.dm
code/modules/power/lighting.dm
code/modules/reagents/Chemistry-Recipes.dm
code/setup.dm
maps/RandomZLevels/wildwest.dm
2014-01-21 22:36:19 -05:00
0f5f78fcc9
fix for muting deadme as well.
2014-01-21 21:48:05 -05:00
73e66bde07
Admin requested addition of a global dsay toggle.
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-01-21 21:47:38 -05:00
cb5367ed96
Switching cable coils to stacks
2014-01-21 21:23:26 -05:00
8f71ea55e3
Added tools and time handling
...
Well yeah
2014-01-21 21:05:50 -05:00
56e56b31a6
Implemented crude crafting
...
Debug messages are still inside, pushing only cozx pete asked me to
Conflicts:
code/_globalvars/lists/objects.dm
code/game/objects/structures/tables_racks.dm
2014-01-21 21:05:42 -05:00
c21586250d
Fixed cat2 sprites
2014-01-21 16:38:12 -05:00
9fb2bcd473
Merge pull request #122 from Regen1/master
...
Added new Fluff sprite from Wisewill
2014-01-21 13:24:16 -08:00
6927592524
Fix
2014-01-21 22:19:29 +01:00
0e6b3fb165
Added new Fluff sprite
...
Black schoolgirl uniform, made my Wisewill~
2014-01-21 22:14:25 +01:00
460621bf97
Sober gene implementation
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-01-21 14:39:32 -05:00
32c6268b59
Implement psy-resist block (and fix some naughty remoteview behavior).
2014-01-21 14:36:12 -05:00
57dc0ddd50
Implement toxic farts.
...
Conflicts:
code/game/objects/effects/effect_system.dm
code/modules/mob/living/carbon/human/human_defines.dm
2014-01-21 14:35:15 -05:00
4b14f37adb
Updated projectiles
2014-01-21 14:25:19 -05:00
babc1810ff
Interface update
2014-01-20 13:45:06 -05:00
6091d16262
DNA panel fixed, update changelog.
...
Conflicts:
html/changelog.html
2014-01-20 11:43:07 -05:00
044d6a79cb
Fix monkey UI appends not being completed for DNA2.
...
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm
2014-01-20 05:14:38 -05:00
da78332256
Fix monkey genes.
...
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm
html/changelog.html
2014-01-20 05:06:19 -05:00
4261fa0ae4
Missed a spot
2014-01-20 04:11:31 -05:00
bb853093c1
Intercom runtime fix
2014-01-20 04:05:29 -05:00
c033a83316
Fixing my DNA2 fuckups
2014-01-20 03:43:06 -05:00
fe0a3a2dcd
Fixing Genetics
2014-01-20 03:31:25 -05:00
1c8c96a9eb
Fix hallucination gene.
2014-01-20 03:29:09 -05:00
6ec06e2bd5
Map update
2014-01-20 03:08:29 -05:00
ace34c60b0
DNA2: New powers from Paradise's release of Goon's genetic code. Also added lisp disability.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.dm
html/changelog.html
2014-01-20 02:10:58 -05:00
fbabcb9117
Add missing files.
2014-01-20 02:04:15 -05:00
520a2cd401
NanoUI changes from Faerdan
...
Conflicts:
code/game/dna/dna_modifier.dm
code/game/machinery/cryo.dm
code/modules/nano/nanomanager.dm
code/modules/nano/nanoui.dm
code/modules/reagents/Chemistry-Machinery.dm
2014-01-20 02:02:31 -05:00
d31bc9def9
UI fix from Ccomp5950
2014-01-20 01:59:51 -05:00
ff2d37265c
Screw around with gene logic.
...
Conflicts:
code/game/dna/dna2_domutcheck.dm
2014-01-20 01:59:31 -05:00
b6045a2bbe
Fix move_inside verb exploit across the board
...
Conflicts:
code/game/machinery/Sleeper.dm
2014-01-20 01:58:03 -05:00
dc5a4a8a84
Fix beaker being ejected with occupant.
2014-01-20 01:55:12 -05:00
fe2f161be2
Fix for issue #309
2014-01-20 01:54:58 -05:00
a04324baef
Fix more by-ref issues in DNA
...
Conflicts:
code/game/machinery/hydroponics.dm
2014-01-20 01:54:33 -05:00
36b967d962
I am double-stupid. Thanks to Zuhayr and Chinsky for pointing this out.
...
Conflicts:
html/changelog.html
2014-01-20 01:53:41 -05:00
f81e616f21
lazy setSEstate workaround
2014-01-20 01:53:17 -05:00
211d1bfdbe
Fix not being able to change the buffer label
2014-01-20 01:53:06 -05:00
9e956b63ee
Fix getting "monkey(666)" instead of "Jebediah Jenkins" when dicking with DNA.
2014-01-20 01:52:47 -05:00
7456592afa
I am fucking stupid.
2014-01-20 01:52:36 -05:00
5f89171fc1
Hopefully fix all DNA corruption issues caused by assuming datum pass by-val.
...
Conflicts:
code/modules/mob/transform_procs.dm
2014-01-20 01:52:08 -05:00
c349f761d9
Fixes for DNA2, again,
2014-01-20 01:50:56 -05:00
2f7551cfe1
Now it's fixed.
2014-01-20 01:50:46 -05:00
acdca28e51
Fix for DNA modifier transfer buffers.
2014-01-20 01:50:10 -05:00
20bc568131
Fix DNA injectors breaking shit.
...
Conflicts:
code/game/dna/dna2_helpers.dm
2014-01-20 01:49:49 -05:00
6fe47cfc51
Standardize buffers on all DNA machines in an attempt to fix DNA modifiers. WILL BREAK SHIT
...
Conflicts:
code/game/machinery/computer/cloning.dm
code/game/objects/items/weapons/dna_injector.dm
2014-01-20 01:48:57 -05:00
0e32d72fc2
Fixes #3 , hopefully.
2014-01-20 01:43:27 -05:00
Rob Nelson