Commit Graph

6697 Commits

Author SHA1 Message Date
Rob Nelson 1f30243a08 Refactor the fuck out of theft objectives. No more stealing your own jumpsuit.
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/objective.dm
	code/modules/mining/money_bag.dm
	code/modules/mining/ores_coins.dm
	html/changelog.html
2014-01-24 12:16:57 -05:00
d3athrow e937bdd4c2 Should in fact, really fix the monkey dna 2014-01-24 12:05:54 -05:00
d3athrow 1cbf6abaa9 Fix monkeys not having their monkey block set high enough 2014-01-24 12:03:55 -05:00
Vincent 49e8e5a7f8 Alters tenebrosity's fallsound to work with the improved fall stuff
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2014-01-24 00:18:52 -05:00
Vincent 7b58cc04b2 Gives mobs a "fall" proc for the transition between falling and standing. This is not for the rotation code, which occurs on both falling and rising.
Adds a variable to hats to determine how likely they are to fall off.  Makes them fall off with the given probability when disarmed (some percentage of the time) or when the character falls.  Space helmets, bio hoods, helmets, radiation helmets, etc, are unlikely to fall off

Conflicts:
	code/game/gamemodes/cult/cult_items.dm
	code/modules/clothing/clothing.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/head/jobs.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/tgevents/holiday/xmas.dm
	code/modules/mob/mob.dm
2014-01-24 00:16:46 -05:00
Tenebrosity f6603faa52 Adds sounds to falling over
Resting and buckling are still silent.

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2014-01-24 00:01:15 -05:00
Rob Nelson d01ef41eac Radio code in say.dm cleaned up, will use all possible radios when sending a message.
Conflicts:
	code/modules/mob/living/say.dm
2014-01-23 23:48:46 -05:00
Ergovisavi 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
Cluwnes Honk 8ef0c5c859 Gives Namepick an actual category 2014-01-23 10:38:18 -05:00
Cluwnes Honk fb0b5ff8fd Allows borers to be stealthy
Removes some messages that go to a host when a borer does shit. In a world of validhunters, the borer cannot survive.

Conflicts:
	code/modules/mob/living/simple_animal/borer.dm
2014-01-23 10:38:06 -05:00
ZomgPonies 959d3137da compile fix 2014-01-23 10:26:25 -05:00
Ergovisavi 89c23fc494 Kinetic gun can now break through mining tiles due to the goliath being able to possibly trap you in an unwinnable situation otherwise
More mob behavior vars in hostile animal, added Passtable to hivelord and brood and removed their environment smash

Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
2014-01-23 10:22:07 -05:00
ZomgPonies af06d61d85 Merge pull request #124 from alex-gh/singuloth_armor
Added singuloth armor.
2014-01-22 20:12:40 -08:00
ZomgPonies 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
alex-gh f7be59165b Schoolgirl_black jumpsuit should properly display now. 2014-01-22 23:18:34 +01:00
Ergovisavi 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
alex-gh adc2469aa9 Added singuloth armor. 2014-01-22 22:44:52 +01:00
Ergovisavi 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
Ergovisavi 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
errorage 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
John Smith 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
ZomgPonies 92344f89dd err 2014-01-22 10:30:27 -05:00
Tenebrosity 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
Tenebrosity 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
Jesus Hussein Chris 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
Rob Nelson 02d01626fb Fix M_FAT'd strings. 2014-01-21 23:00:16 -05:00
Rob Nelson 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
Rob Nelson 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
Rob Nelson 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
Rob Nelson 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
Rob Nelson dd8c8c12ab Standardize XRAY.
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
2014-01-21 22:37:37 -05:00
Rob Nelson 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
DJSnapshot 0f5f78fcc9 fix for muting deadme as well. 2014-01-21 21:48:05 -05:00
DJSnapshot 73e66bde07 Admin requested addition of a global dsay toggle.
Conflicts:
	code/modules/admin/admin_verbs.dm
2014-01-21 21:47:38 -05:00
ZomgPonies cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies 9fb2bcd473 Merge pull request #122 from Regen1/master
Added new Fluff sprite from Wisewill
2014-01-21 13:24:16 -08:00
Regen 6927592524 Fix 2014-01-21 22:19:29 +01:00
Regen 0e6b3fb165 Added new Fluff sprite
Black schoolgirl uniform, made my Wisewill~
2014-01-21 22:14:25 +01:00
Rob Nelson 460621bf97 Sober gene implementation
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2014-01-21 14:39:32 -05:00
Rob Nelson 32c6268b59 Implement psy-resist block (and fix some naughty remoteview behavior). 2014-01-21 14:36:12 -05:00
Rob Nelson 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
Rob Nelson 6091d16262 DNA panel fixed, update changelog.
Conflicts:
	html/changelog.html
2014-01-20 11:43:07 -05:00
Rob Nelson 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
Rob Nelson da78332256 Fix monkey genes.
Conflicts:
	code/modules/mob/living/carbon/monkey/monkey.dm
	html/changelog.html
2014-01-20 05:06:19 -05:00
ZomgPonies 4261fa0ae4 Missed a spot 2014-01-20 04:11:31 -05:00
ZomgPonies c033a83316 Fixing my DNA2 fuckups 2014-01-20 03:43:06 -05:00
ZomgPonies fe0a3a2dcd Fixing Genetics 2014-01-20 03:31:25 -05:00
Rob Nelson 1c8c96a9eb Fix hallucination gene. 2014-01-20 03:29:09 -05:00
Rob Nelson 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
Rob Nelson 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