Commit Graph

4969 Commits

Author SHA1 Message Date
Jordie
01c362f069 Merge pull request #11757 from Xhuis/side_antagonist_tweaks
Side Antagonist Tweaks
2015-09-22 12:26:00 +10:00
Xhuis
979ae3ade6 Cleans up heart eating code 2015-09-20 12:01:50 -04:00
Xhuis
a4d99a528d Adds a missing parentheses 2015-09-19 23:25:52 -04:00
Xhuis
4a1c7c0481 Two small changes 2015-09-19 23:10:51 -04:00
Xhuis
38c277f42e Adds swarmer spawn event and changes demon hearts 2015-09-19 18:38:01 -04:00
Xhuis
d32d3287d1 Adds revenant tweaks 2015-09-19 14:03:04 -04:00
phil235
bfa06222ea Merge pull request #11830 from Aranclanos/updatetriggerthis
Removes update_triggers.dm
2015-09-19 16:47:19 +02:00
Remie Richards
9363a14d2f Merge pull request #11743 from Delimusca/cleanconfusion
changes confusion to be less RNG garbage
2015-09-19 14:01:58 +01:00
phil235
966ff4b05a Merge pull request #11853 from feemjmeem/11850-fix
partial revert of #11699, fixes #11850 without breaking #11699
2015-09-19 03:18:11 +02:00
Xhuis
9e1f857afc Doubles boost time for slaughter demons 2015-09-18 18:36:25 -04:00
Xhuis
01005f6b82 Prevents blood crawling with held items 2015-09-18 18:30:44 -04:00
Xhuis
67ca94c5fa Merge remote-tracking branch 'remotes/upstream/master' into slaughter_demon_stuff 2015-09-18 16:54:13 -04:00
Xhuis
c0d3a67f0e Side antagonist tweaks 2015-09-18 16:54:01 -04:00
phil235
d83f6f6d5f Merge pull request #11608 from Xhuis/blings
A few shadowling changes
2015-09-18 13:47:30 +02:00
Marc R. Uchniat
75e6b70fbe partial revert of #11699, fixes #11850 without breaking #11699 2015-09-17 15:12:18 -07:00
Razharas
a48254f31a Merge pull request #11589 from Ergovisavi/swarmers_revision_2
Swarmer rev 2 fixes/changes | Some hostile mob range attack tweaks
2015-09-17 18:27:15 +03:00
Aranclanos
caf4d7d5a5 Removes update_triggers.dm and moves the code inside of it to their respective procs. Most of the procs on this file were duplicated. 2015-09-16 21:52:25 -03:00
Xhuis
1178fbe079 Major cult changes
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.

It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.

Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.

Miscellaneous tweaks:

    Blood boil runes now explode when used
    Convert runes can now work solo, but take time
    Armor runes now only provide the basic armor set
    Tomes now do a static 15 burn damage and play a sound
    If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
2015-09-16 10:04:49 +12:00
Razharas
73db85100c Merge pull request #11769 from phil235/FixMutations
Some dna fixes
2015-09-15 22:31:59 +03:00
Cheridan
3f3d24f063 Merge pull request #11707 from phil235/ShieldThrowTableFixes
Shield blocking stuff
2015-09-14 23:08:57 -05:00
Swag McYolosteinen
606c6e0ae4 Merge pull request #11677 from xxalpha/aliums
Xeno tweaks and bugfixes.
2015-09-14 17:00:14 +02:00
phil235
428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
unknown
68b824e727 increased confusion multiplier, increased confusion sources 2015-09-13 12:39:41 -06:00
Remie Richards
38605d1aee Merge pull request #11712 from MrStonedOne/patch-37
Ghost follow is now an orbit!
2015-09-13 16:42:05 +01:00
Swag McYolosteinen
ed2858c2e2 Merge pull request #11737 from xxalpha/itsakindofmagic
Fixed eye wear overriding see_invisible when it shouldn't.
2015-09-13 17:27:19 +02:00
Swag McYolosteinen
ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
Swag McYolosteinen
d57fac141a Merge pull request #11724 from RemieRichards/LargeInhands
Inhands can now come in ANY SIZE, not just 32x32!
2015-09-13 17:23:36 +02:00
Jordie
a4549ee9b3 Merge pull request #11727 from Aranclanos/goliathstentacles
Fixes goliath tentacles not deleting themselves
2015-09-13 21:56:22 +10:00
Jordie
15e50de0fe Merge pull request #11694 from bear1ake/point-zero
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
Jordie
5a34de7bd3 Merge pull request #11699 from Incoming5643/dirtyspaceman
Fixes lizard looking odd with helmets
2015-09-13 21:45:44 +10:00
unknown
16ac3baa88 made confusion directional and probabilistic 2015-09-12 13:15:45 -06:00
xxalpha
701a5c7949 Fixed eye wear overriding see_invisible when it shouldn't.
minmax
2015-09-12 17:34:03 +01:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero
Conflicts:
	code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
Razharas
fbe1781374 Merge pull request #11609 from AnturK/outfits
Outfit datum
2015-09-12 08:56:12 +03:00
Aranclanos
4b7cc90478 Fixes goliath tentacles not deleting themselves on a really particular situation, killing the mob with the tentacle hit. The mob must also delete itself on death. 2015-09-12 00:40:42 -03:00
Remie Richards
82e577be0b Items may now have inhands from 1x1 (why) to INFINITYxINFINITY (again, WHY), this allows for ridiculously large items!
Adds a center_image() proc that centers an image larger or smaller than world.icon_size (32) so that it appears in the center of a human mob, like inhands.
2015-09-12 00:45:14 +01:00
phil235
c069ea0a7d Fixes runtime in monkey/attack_hand()
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
Fixes runtime with krokodil addiction
Xenomorph can no longer get addicted or overdose on reagents.
2015-09-11 18:08:54 +02:00
phil235
b13509b9f0 Removed some unneeded istype checks in check_shields().
Changed shield block chance to default at 80% for thrown items, 50% for xeno leap.
Moved the tableclimbing fixes to another PR.
2015-09-11 17:11:55 +02:00
xxalpha
eb7e466dfe Changed facehuggers and alien eggs layers to MOB_LAYER 2015-09-11 14:31:17 +01:00
Kyle Spier-Swenson
d3a61455a2 Ghost follow is now an orbit! 2015-09-10 23:13:28 -07:00
xxalpha
7cff554a15 Tweaked values. Added ability to block pounces with shields. Changelog.
Removed conflicting code.
2015-09-11 01:29:43 +01:00
phil235
de9e6475f1 Fixes runtime in monkey/attack_hand()
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.

You now have a chance to block things thrown at you with a riot/energy shield, including xeno leap(40% chance).
2015-09-11 02:03:28 +02:00
Razharas
17e5d0eea5 Merge pull request #11525 from xxalpha/dryshoes
Absorbent galoshes.
2015-09-10 22:01:03 +03:00
Incoming
2fab4fe3b6 Fixes a very specific appearance bug where lizard ears/horns wouldn't be properly updated by adding/removing helmets. 2015-09-10 14:23:11 -04:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Aranclanos
f587588eb9 Merge pull request #11636 from duncathan/lol
distro fix + fixes runtimes
2015-09-09 20:37:51 -03:00
xxalpha
b238ac02e8 Xeno tweaks and bugfixes. 2015-09-09 17:54:59 +01:00
duncathan
b86464f573 woo more runtimes 2015-09-08 22:59:18 -06:00
xxalpha
a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes
Conflicts:
	code/__DEFINES/misc.dm
2015-09-08 16:56:37 +01:00
Xhuis
95ca1cb4d2 Some tweaks to Shadowling 2015-09-07 21:46:35 -04:00