Commit Graph

6821 Commits

Author SHA1 Message Date
Cheridan
4bbdeaa9fa Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers 2016-04-29 17:06:53 -05:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205)
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
2016-04-29 20:29:20 +02:00
Cheridan
1e0c5acd1f Merge pull request #17211 from phil235/FixThermiteBorg
Fix bundle: borg module, thermite, chairs
2016-04-29 13:22:50 -05:00
Razharas
ae78dd582a Merge pull request #17208 from phil235/FixMechaMaskToxin
Fix bundle and mech melee attack animation
2016-04-29 19:32:38 +03:00
KorPhaeron
29baead8a5 Merge pull request #17165 from Incoming5643/no_cat_cucks
Fixes? Catsploision? [Maybe?]
2016-04-29 11:18:24 -05:00
Razharas
81dadcec5f Merge pull request #17086 from MrPerson/planes_on_a_snake
Move some stuff from different layers to different planes
2016-04-29 15:51:41 +03:00
Razharas
c986212ddb Merge pull request #16778 from Robustin/commitcommoncult
The Cult Rises...
2016-04-29 15:10:16 +03:00
Cheridan
6e27f01c94 Merge pull request #17185 from phil235/FixBundle48
Fix Bundle: holosign creator, status procs, teleporter hub, timestop effect
2016-04-28 22:11:29 -05:00
TechnoAlchemist
e2a6dac71f Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff
fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi
2016-04-28 12:03:31 -07:00
phil235
d3fa99e58b Fixes runtime when thermiting a wall
Fixes not being able to put down a chair on a tile with a border window.
Fixes Borg module cycling not working when the first module is empty.
2016-04-28 20:44:02 +02:00
phil235
b8164b7b92 * Add an attack animation for mech melee attack.
* Fixes mech action button icon not updating whent the button is activated.
* Fixes internal tank action button icon not updating to off when we adjusted our masks out.
* Fixes mime/clown mask not updating their action button icon when adjusting. Fixes clown mask not updating
its on mob icon if adjusted when worn.
* Fixes typo in the human threshold for toxin in the air.
* Fixes changing the thermomachine circuitboard settings not giving any feedback.
2016-04-28 18:56:14 +02:00
Robustin
b5952c94cc Merge branch 'master' of https://github.com/tgstation/-tg-station into commitcommoncult
# Conflicts:
#	icons/obj/items.dmi
2016-04-27 22:04:06 -04:00
MrPerson
b50e0ee42c Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake 2016-04-27 17:03:32 -07:00
phil235
8a9422e45f derp, copypasta error 2016-04-28 00:24:50 +02:00
phil235
2ad8d4a392 * Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.
* Fixes the lack of second argument in alien/stun()
* Fixes the sleeping alert not being updated properly when a mob asleep is killed then revived.
* Fixes timestop effect leaving mobs unable to move forever in some cases.
* Fixes teleporter hub and station staying active when the hub's panel is open, despite the hub's open panel sprite looking offline. The Hub and station now use their own iconfile icons/obj/machines/teleporter.dmi (similar what most machines have).

* I've moved all mob's status adjustment procs (Stun(), Paralyse(), blur_eyes() adjust_drugginess(), etc...) into specific files (named "status_procs.dm") so they're easier to find. I've added a third argument to stun adjustments procs to ignore the CANSTUN flag. I've also changed the weaken procs to have the ignore_canweaken argument be the third argument, so all status adjustment procs have amount as first arg, updating the mob or not as second, and when necessary an ignore_x as third arg.
2016-04-28 00:13:15 +02:00
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
Incoming5643
f612c83c87 negates nullcats 2016-04-27 14:23:38 -04:00
Cheridan
eb7b0e528c Merge pull request #17097 from Shadowlight213/Jetpackimplant
Fixes jetpack implant speed boost inconsistency.
2016-04-27 13:13:28 -05:00
Incoming
f1e840fd1c Shuffles a line that could have potentially been delayed from running by rapid catting. The delay of reading said line might have allowed "deploy_the_cats" to fire more than once. 2016-04-27 10:37:20 -04:00
TechnoAlchemist
926e351fee adds sinew restraints, changes sinew droprate. 2016-04-26 14:10:42 -07: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
Cheridan
8351f0a2fa Adds scavengers for ash walkers. Udder refactoring. Minor typo fixes, etc. 2016-04-26 13:42:51 -05: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
MrPerson
3f70f880ac Move some stuff from different layers to different planes
Moves everything on a 15+ layer to a plane. So now you get screen catcher (-99, was already on a plane), lighting (15), effects that ignore lighting (16), fullscreen UI effects (18), screen objects used to build the UI (19), actual equipment in the UI slots (20), and everything else (0).

Also created a file to contain plane and layer defines for hopeful eventual use.

Hopefully this doesn't change anything now but does enable some nifty new features in the future.
2016-04-24 04:03:41 -07: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