Commit Graph

4948 Commits

Author SHA1 Message Date
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
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
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
Cheridan
daa5b5b48e Merge pull request #11599 from Firecage/Spiderwerbs
Adds do_after to the spider verbs.
2015-09-07 09:08:25 -05:00
Razharas
9f0f1a9234 Merge pull request #11531 from RemieRichards/Bloody_footprints
Bloody footprints!
2015-09-07 16:07:03 +03:00
Remie Richards
f0d0a4bf2d Merge pull request #11528 from Aranclanos/undergoingevacuations
Undergoing evacuations latejoin message fix
2015-09-07 13:54:54 +01:00
AnturK
1a9b7ad3c0 Admin equipment & ERT outfits 2015-09-07 01:06:09 +02:00
AnturK
ff8063c68c Adds outfit datum 2015-09-06 20:06:10 +02:00
Razharas
889643deae Merge pull request #11564 from Jordie0608/thisbranchnameisalie
Config announce admin login/out
2015-09-06 06:40:15 +03:00
Firecage
d701946cd4 Adds do_after to the spider verbs. 2015-09-06 00:02:22 +02:00
Aranclanos
ee458bb3db Merge pull request #11254 from duncathan/pipecleanup
Pipe code cleanup
2015-09-05 04:12:36 -03:00
Cheridan
a816ff5f8f Merge pull request #11385 from Aranclanos/extrapug
Fixes pugs not following their tail.
2015-09-04 23:20:25 -05:00
Jordie0608
b7754d5ed7 announce login message as a config 2015-09-04 21:49:09 +10:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Aranclanos
8a4260a311 Merge pull request #11545 from xxalpha/crawlinginmyskin
Fixed wizard slaughter demons not getting bloodcrawl
2015-09-03 12:17:25 -03:00
Jordie0608
9de0f3567d config announce admin login/out 2015-09-03 20:38:36 +10:00
Razharas
c2d3998e82 Merge pull request #11217 from Ergovisavi/fire_in_the_disco
Small changes to mobs on fire
2015-09-02 14:38:20 +03:00
xxalpha
4e7d0c6ed5 Fixed wizard slaughterdmssmsmsms
asdasdasd
2015-09-02 10:47:37 +01:00
Ergovisavi
bf69c85f71 Mobs on fire adjustments:
-You heat up faster based on fire stacks
-Reduced the amount of fire stacks you lose over time per tick
-Increased the damage you take while on fire at the highest temperature point
-Increased the amount of fire stacks you get from hotspots
2015-09-01 22:04:10 -07:00
duncathan
381139422c Merge branch 'master' of https://github.com/tgstation/-tg-station into pipecleanup
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/components_base.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/ATMOSPHERICS/pipes/manifold.dm
	code/ATMOSPHERICS/pipes/manifold4w.dm
	code/ATMOSPHERICS/pipes/simple.dm
	code/_compile_options.dm
	code/controllers/subsystem/garbage.dm
	code/game/machinery/bots/mulebot.dm
	code/modules/mob/living/carbon/alien/say.dm
	code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm
	html/changelogs/.all_changelog.yml
2015-09-01 20:29:00 -06:00
Remie Richards
c560841438 Moves bloody footprint code out of step_action() and into human/Move() 2015-09-02 01:48:20 +01:00
Remie Richards
ff07337841 Bloody footprints! Human blood, Xeno blood, and Oil can now produce bloody footprints that fade off as the blood on the shoe fades. Affects gibs too. 2015-09-02 01:32:02 +01:00
xxalpha
4ead972306 Drying agent. Recolor dry shoes
use define
2015-09-01 22:59:30 +01:00