7ad68dd693
Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash
...
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/game/objects/structures/tables_racks.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/simple_animal/hostile/hostile.dm
2014-01-23 23:31:36 -05:00
d4890fb2f5
Additional Drug Names
2014-01-23 19:26:32 -05:00
f59fa5474e
Contraband Crate Changes, Minor Drug Tweaks
...
More little tweaks to the random drugs, added actual contraband to the
contraband crate. Maybe people will have a reason to buy it now, eh?
2014-01-23 18:01:41 -05:00
6478e2e1d7
silent is broken as fuck
...
Removes the message that checks if a mob is silent; silent is just plain broken.
2014-01-23 10:34:41 -05:00
f54a35db72
Prevents mimes from using the megaphone.
...
if(user.silent) didn't work. This is the next best thing.
2014-01-23 10:34:03 -05:00
a3a883444c
Last minute tweaks
2014-01-22 23:12:50 -05: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
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
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
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
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
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
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
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
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
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
Ergovisavi