Commit Graph

6797 Commits

Author SHA1 Message Date
KorPhaeron 44b276859e Merge pull request #17140 from ChangelingRain/shaketheroom
Charger holoparasites now shake the target's camera
2016-04-27 13:24:54 -05:00
Cheridan eb7b0e528c Merge pull request #17097 from Shadowlight213/Jetpackimplant
Fixes jetpack implant speed boost inconsistency.
2016-04-27 13:13:28 -05:00
phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
Nerd Lord fe0f4e2ad0 Charger holoparasites now shake the target's camera 2016-04-26 11:22:22 -04:00
KorPhaeron 08eca42e00 Merge pull request #17061 from TechnoAlchemisto/Bracers
Adds craftable bracers, adds watchers dropping bones.
2016-04-26 01:39:50 -05:00
KorPhaeron c1987f699a Merge pull request #17093 from RandomMarine/cockroach
Drones stop squishing cockroaches.
2016-04-26 01:17:40 -05:00
KorPhaeron 5b6d1386fd Merge pull request #17101 from TechnoAlchemisto/goliathplateREFACTOR
Makes goliath plates stackable.
2016-04-25 22:35:43 -05:00
Joan Lung ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
Jack Edge 1a6ad107af Refactoring and tweaks 2016-04-25 09:01:52 +01:00
TechnoAlchemist 497e1ae3a9 fixes plate consumption in upgrades. 2016-04-24 23:50:01 -07:00
Jack Edge bb4f035fd6 Merge branch 'master' into slaughter-fixes 2016-04-25 07:32:40 +01:00
TechnoAlchemist 556f611278 makes the path /animalhide 2016-04-24 22:07:51 -07:00
TechnoAlchemist 581a13975b makes goliath plates stackable. 2016-04-24 21:27:48 -07:00
RandomMarine f3f2962d26 buffs cockroach survivability 2016-04-24 18:26:23 -07:00
Shadowlight213 e32b9700a8 Fixes jetpack implant inconsistency 2016-04-24 18:01:43 -07:00
phil235 fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
RandomMarine 950d8e4dfa drones can't squish cockroaches (by accident) 2016-04-24 12:06:18 -07:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
coiax 5d7db5637c Added animal overlay to drone filters (#17009)
* Added animal overlay to drone filters
2016-04-24 16:51:16 +01:00
Jack Edge 8534e3dbb9 Code review 2016-04-24 16:29:17 +01:00
Jack Edge de76cecc47 DM initial() doesn't work on lists 2016-04-24 15:23:38 +01:00
Jack Edge 4c0a553c1d Bug fix 2016-04-24 15:06:39 +01:00
Jack Edge 2c48313d4f Istype/ispath memes, and tidying 2016-04-24 14:56:56 +01:00
Jack Edge 2bf9caa07b I'M BRINGING FASHION BACK 2016-04-24 14:44:55 +01:00
Jack Edge 1927fc73e6 Dog fashion on the back 2016-04-24 14:40:08 +01:00
Jack Edge 2f26b8eabc Compilation! 2016-04-24 13:54:37 +01:00
Jack Edge 6bc4fbf700 More changes 2016-04-24 13:23:33 +01:00
Jack Edge 0fd1f3c7e4 Made /datum/dog_fashion 2016-04-24 13:18:43 +01:00
Remie Richards f098ddd60b Merge pull request #17055 from coiax/stolen-red-wizard-hats
Red Wizard Hat enabled on Corgis
2016-04-23 16:26:25 +01:00
Cheridan 07f3fcf01a Merge pull request #17049 from Shadowlight213/robinject
Fixes syringe gun and bee injection reactions
2016-04-23 00:55:14 -05:00
Joan Lung b7efe0ad4f Merge pull request #17033 from coiax/B-E-E-D-R-O-N-E
Removes ishuman() check for beekeeping
2016-04-22 23:06:21 -04:00
TechnoAlchemist b1d438893b ROOKIE MISTAKE 2016-04-22 19:20:59 -07:00
TechnoAlchemist c5506d19af Adds craftable bracers, adds watchers dropping bones. 2016-04-22 19:06:41 -07:00
Frank A 400d8473fa Red Wizard Hat enabled on Corgis
Allow all corgis to wear red wizard hats
2016-04-22 14:15:22 +01:00
Shadowlight213 5f393e5143 Fixes bee injecting while we're at it 2016-04-21 18:51:53 -07:00
TechnoAlchemist 7b79508b17 bone ore and path REFACTOR. 2016-04-21 15:36:27 -07:00
TechnoAlchemist e61fba82ea Adds Bones and sinew to butchering results. Adds bone armor. 2016-04-21 12:58:15 -07:00
Jack Edge 0ffeaa46fa Removes ishuman() check for beekeeping 2016-04-21 17:54:17 +01:00
Joan Lung f99d4cd97e Merge pull request #17012 from coiax/flying-immunity
Flying simple animal mobs are immune to chasms
2016-04-20 18:13:49 -04:00
Jack Edge 68e459e4ac Guardians no longer float up and down 2016-04-20 23:03:39 +01:00
Joan Lung 7da74ad023 Merge pull request #16922 from GunHog/Show_ALL_The_HUDs!
Ghost DataHUD toggle now shows all HUDs at once
2016-04-20 16:38:09 -04:00
Cheridan c53887e4c1 Merge pull request #16987 from ChangelingRain/overlay
Makes a few things use temporary overlays
2016-04-20 12:11:58 -05:00
Cheridan b1428dbeb8 Merge pull request #16955 from Robustin/zombietweak
Zombie Tweaks
2016-04-20 12:05:39 -05:00
Jack Edge c5d9f6becc Butterflies fly 2016-04-20 08:25:24 +01:00
Jack Edge d7c7d51404 Holoparasites now fly, and always float
Floating is used by float() to keep track of whether you're doing the no
gravity bouncing animation. Now the guardian is always gonna be set to
bounce up and down, unless it's buckled or something. (Can you even
buckle guardians?)
2016-04-20 08:22:42 +01:00
Cheridan 7440811987 Merge pull request #16982 from Incoming5643/ok_but_no_tongue
Fixes the tongueless human mobs
2016-04-20 01:30:36 -05:00
KorPhaeron d2b03c6837 Merge pull request #16966 from tgstation/RemieRichards-patch-meme
Adds failure message for cyborgs attempting to check alerts while dead
2016-04-19 16:04:43 -05:00
Nerd Lord 147485dcee walls can't stop the law 2016-04-19 10:31:19 -04:00
Nerd Lord ff44a04f3b Makes a few things use the temporary overlays instead of doing stuff manually 2016-04-19 10:28:40 -04:00
Incoming f265dacd92 Fixes the tongueless human mobs
The solution isn't great, but it's the only one I've found that works properly. For those keeping track yes this is a bit redundant in some situations, but just dundant enough for others. Blame the mass of procs that have to fire in a very specific order on the mob, dna, species, and client level to create a functional spessman for this one.
2016-04-19 03:23:10 -04:00