Commit Graph
11748 Commits
Author SHA1 Message Date
Rob NelsonandZomgPonies e3a2a9238d Fix typo before someone notices. 2014-01-24 12:24:14 -05:00
ZomgPonies 47e8c640a2 New display case code 2014-01-24 12:23:26 -05:00
Rob NelsonandZomgPonies 22dcaec46f Fix lithp 2014-01-24 12:17:40 -05:00
Rob NelsonandZomgPonies 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
d3athrowandZomgPonies e937bdd4c2 Should in fact, really fix the monkey dna 2014-01-24 12:05:54 -05:00
Rob NelsonandZomgPonies 341d210c99 Fix some issues with the radio, like talking on common when calling for command. 2014-01-24 12:04:52 -05:00
d3athrowandZomgPonies 1cbf6abaa9 Fix monkeys not having their monkey block set high enough 2014-01-24 12:03:55 -05:00
VincentandZomgPonies 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
VincentandZomgPonies 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
TenebrosityandZomgPonies 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 NelsonandZomgPonies 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
Rob NelsonandZomgPonies ba5a389df6 Fix horns, add horn sprite.
Conflicts:
	icons/effects/genetics.dmi
2014-01-23 23:44:08 -05:00
Rob NelsonandZomgPonies bd25990ce2 Fix MONKEYBLOCK 2014-01-23 23:42:23 -05:00
ZomgPonies f1c80be06f Merge pull request #127 from SamCroswell/master
Tweaks 'n shit
2014-01-23 20:34:50 -08:00
ErgovisaviandZomgPonies 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
SamCroswell d4890fb2f5 Additional Drug Names 2014-01-23 19:26:32 -05:00
SamCroswell 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
Cluwnes HonkandZomgPonies 8ef0c5c859 Gives Namepick an actual category 2014-01-23 10:38:18 -05:00
Cluwnes HonkandZomgPonies 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
Cluwnes HonkandZomgPonies 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
Cluwnes HonkandZomgPonies 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
ZomgPonies 959d3137da compile fix 2014-01-23 10:26:25 -05:00
ErgovisaviandZomgPonies 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
SkyMarshalandZomgPonies 5dc5c451a5 Fixes an error with the explosions-deleting-zone-air detection. 2014-01-23 10:14:25 -05:00
SamCroswell a3a883444c Last minute tweaks 2014-01-22 23:12:50 -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
ZomgPonies 372b00f58c Merge pull request #126 from SamCroswell/master
Random Drug Pills / CentComm tweaks
2014-01-22 20:12:20 -08:00
SamCroswell fc4877b301 Added a few more drug names 2014-01-22 22:55:19 -05:00
SamCroswell 86ad8a5a17 Drugs/Minor CentComm Updates 2014-01-22 22:26:01 -05:00
alex-gh f7be59165b Schoolgirl_black jumpsuit should properly display now. 2014-01-22 23:18:34 +01:00
ErgovisaviandZomgPonies 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
ErgovisaviandZomgPonies 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
ErgovisaviandZomgPonies 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
errorageandZomgPonies 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
errorageandZomgPonies 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 SmithandZomgPonies 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
TenebrosityandZomgPonies 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
TenebrosityandZomgPonies 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 ChrisandZomgPonies 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
ZomgPonies 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
SamCroswell 7facce411c Ninja Quickfix, ERT Armory now has a blast door 2014-01-21 23:04:50 -05:00
Rob NelsonandZomgPonies dcaf8d4e49 Add check_mutations to detective and bartender, just in case 2014-01-21 23:01:59 -05:00
Rob NelsonandZomgPonies 1a94d400f7 Add SOBER mutation to detective and bartender.
Conflicts:
	code/game/jobs/job/security.dm
2014-01-21 23:01:45 -05:00
Rob NelsonandZomgPonies 02d01626fb Fix M_FAT'd strings. 2014-01-21 23:00:16 -05:00
Rob NelsonandZomgPonies 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 NelsonandZomgPonies 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 NelsonandZomgPonies 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