a3a883444c
Last minute tweaks
2014-01-22 23:12:50 -05:00
af06d61d85
Merge pull request #124 from alex-gh/singuloth_armor
...
Added singuloth armor.
2014-01-22 20:12:40 -08:00
d7b0537c50
Merge pull request #125 from alex-gh/schoolgirl_fix
...
Schoolgirl_black jumpsuit should properly display now.
2014-01-22 20:12:31 -08:00
372b00f58c
Merge pull request #126 from SamCroswell/master
...
Random Drug Pills / CentComm tweaks
2014-01-22 20:12:20 -08:00
fc4877b301
Added a few more drug names
2014-01-22 22:55:19 -05:00
86ad8a5a17
Drugs/Minor CentComm Updates
2014-01-22 22:26:01 -05:00
f7be59165b
Schoolgirl_black jumpsuit should properly display now.
2014-01-22 23:18:34 +01:00
7bd3df0b3b
More hostile mob work with behavior vars, getting rid of idle_env_destroyer nobody uses it, other tweaks
...
Conflicts:
code/modules/mob/living/simple_animal/hostile/hostile.dm
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
2014-01-22 16:45:20 -05:00
adc2469aa9
Added singuloth armor.
2014-01-22 22:44:52 +01:00
78bea65a44
Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc
...
Conflicts:
code/modules/mob/living/simple_animal/hostile/hostile.dm
code/modules/projectiles/ammunition/energy.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/projectile.dm
code/modules/projectiles/projectile/special.dm
icons/mob/animal.dmi
icons/obj/projectiles.dmi
2014-01-22 16:39:54 -05:00
9428677ab6
Asteroid/Mining Mobs ver 1
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
icons/mob/animal.dmi
2014-01-22 16:11:20 -05:00
983b151e6b
- Hacking borgs via robotics console will now also properly update their HUD with their hidden inventory.
...
Conflicts:
code/game/machinery/computer/robot.dm
2014-01-22 11:14:30 -05:00
4a0aa60443
- Emagged borgs' hidden inventory will now become visible in the module selection section.
...
- Also removed the now outdated module selection UI button and rearranged borg UI buttons to reflect this.
Screenshot: http://www.ss13.eu/borg_ui_smaller_bottom_right.png
Conflicts:
code/_onclick/hud/robot.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-01-22 11:13:12 -05:00
7a10f3c626
Black Baseball Caps [FIXED]
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/job_closets.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-01-22 11:07:39 -05:00
92344f89dd
err
2014-01-22 10:30:27 -05:00
6a1b03aa24
Throw impacts play the thrown object's hitsound
...
Conflicts:
code/modules/mob/living/living_defense.dm
2014-01-22 10:26:58 -05:00
67c88c42e7
Adds generic impact noises to all projectiles
...
Overrides the generic sounds with specific ones for electrodes and
lasers.
Conflicts:
code/modules/projectiles/projectile.dm
code/modules/projectiles/projectile/energy.dm
2014-01-22 10:20:16 -05:00
95f7280781
Generic attack sounds for all melee weapons
...
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.
Conflicts:
code/game/gamemodes/wizard/artefact.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/melee/misc.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/weapons.dm
code/modules/hydroponics/hydroitemdefines.dm
code/modules/surgery/tools.dm
2014-01-22 10:15:43 -05:00
35bb181d23
Merge pull request #123 from SamCroswell/master
...
Ninja Teleport Quickfix, ERT Armory now has a blast door
2014-01-21 20:12:10 -08:00
7facce411c
Ninja Quickfix, ERT Armory now has a blast door
2014-01-21 23:04:50 -05:00
dcaf8d4e49
Add check_mutations to detective and bartender, just in case
2014-01-21 23:01:59 -05:00
1a94d400f7
Add SOBER mutation to detective and bartender.
...
Conflicts:
code/game/jobs/job/security.dm
2014-01-21 23:01:45 -05:00
02d01626fb
Fix M_FAT'd strings.
2014-01-21 23:00:16 -05:00
7892eeb7cc
Standardize LASER, NOCLONE, and HUSK
...
Conflicts:
code/game/gamemodes/changeling/changeling_powers.dm
code/modules/mob/living/carbon/human/death.dm
maps/RandomZLevels/wildwest.dm
2014-01-21 22:59:53 -05:00
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
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
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
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
SamCroswell
