Commit Graph

13853 Commits

Author SHA1 Message Date
KorPhaeron 6b35034346 Rivers of anything 2015-12-15 07:58:50 -06:00
KorPhaeron 94c6f325aa Nuclear Escape 2015-12-15 07:30:17 -06:00
phil235 b656d84480 Merge pull request #13616 from xxalpha/airlocking
Fixes a specific airlock animation case.
2015-12-15 14:19:31 +01:00
Tkdrg 8ead3e8628 Cult Overhaul
Cult is awful, so let's try to improve it. Idea by KorPhaeron. I also
took some inspiration from adrix89's sacrifice cult, so credits to him.
Also thanks a lot specially to MrPerson and Iamgoofball for helping
me brainstorm this, and Joan for the sprites for the summoning orb,
the large nar-sie shell, and the new cult antag hud.

Basically, we remove conversion, and turn cult into a magic version of
nuke, with a small team of stealth elite cultists that have to build a
base in the station and sacrifice people in order to build an army of
constructs and get materials to eventually summon Nar-Sie.

Stun talismans and conversion are gone. Nar-Sie is now the only
objective. Sacrifice runes now provide summoning orbs, which you can use
to drop a large shell. Insert enough orbs in the shell and you trigger a
Delta. Defend the shell for 3 minutes and Nar-sie will arise. This shell
is bombproof and singularityproof. It may be summoned up to three times
if destroyed, but you will have to start from the beginning sac-wise.

Runes are now RNG. Each cultist only gets 50% of the runes. Inspiration
is basically The Binding of Isaac here (thank you MrPerson for this!).
Furthermore, many old runes were merged/removed and other new ones were
added. Almost all were massively rebalanced. Cult now also has a
stealthy ritual dagger with high bleeding and throw effects.
2015-12-15 04:59:31 -03:00
Nerd Lord 6ad8d63c1d No stealing other people's resource nodes, shitface. 2015-12-14 21:32:44 -05:00
Nerd Lord 2e71b5e122 Changes blob pulsing to use ultra_range and orange.
Blobs now properly remember their overmind and get color from it predictably.
Oh god, I hope I did this right.
2015-12-14 21:05:03 -05:00
duncathan salt 7481afe9fe Merge pull request #13651 from KorPhaeron/fire_defines
Everything is fire
2015-12-14 20:03:48 -06:00
KorPhaeron f32da8b449 jesus christ 2015-12-14 19:56:54 -06:00
KorPhaeron 249c8a8789 No teleporter nonsense 2015-12-14 19:38:21 -06:00
duncathan salt 7df19dedb9 Merge pull request #13647 from KorPhaeron/fire_defines
[s] Buckling a mob to a comfy chair will no longer set them on fire
2015-12-14 19:16:37 -06:00
KorPhaeron 884a3a0264 Fixes 2015-12-14 16:40:00 -06:00
bgobandit e79301c304 dead AIs too 2015-12-14 14:50:35 -05:00
bgobandit 112cf3c96c AIs with wireless disabled can no longer interact with papers held up to cameras. 2015-12-14 14:47:32 -05:00
bgobandit a1634f2b51 Santa will no longer deliver the parent types of action figures. Certain action figures will now play appropriate sounds. 2015-12-14 14:32:27 -05:00
Cheridan 2a6a63253b Merge pull request #13608 from KorPhaeron/fire_defines
Makes burn_state use defines
2015-12-14 10:44:10 -06:00
CPTANT 20c6659c4a changes robocop law priority 2015-12-14 17:28:36 +01:00
KorPhaeron 316be423a5 Merge remote-tracking branch 'refs/remotes/tgstation/master' into nuclear_challenge
# Conflicts:
#	code/game/machinery/computer/syndicate_shuttle.dm
2015-12-14 05:48:09 -06:00
KorPhaeron a6194f4725 Adds an optional challenge mode to nuclear operatives 2015-12-14 05:40:19 -06:00
Cheridan ff2bc4d022 Merge pull request #13529 from KorPhaeron/tele_ops
Ops can't fly to abandoned satellite or derelict
2015-12-13 20:58:40 -06:00
xxalpha e9e4ff735d Added maintenance glass airlock and external glass airlock. 2015-12-14 00:48:01 +00:00
xxalpha 4278334f09 Fixes airlock animation on a specific case. 2015-12-13 22:42:27 +00:00
AnturK 2c9adb12f3 Fixes spell logging runtime
Fixes lava runtime
Fixes mecha ore scanner runtime
Fixes crayon writing runtime
Fixes latejoin headrev runtime
2015-12-13 15:04:12 +01:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Cheridan 1019b057c5 Merge pull request #13557 from bgobandit/nanomedfix
Wall-mounted nanomeds no longer have more contents than the Nanomed Plus.
2015-12-13 00:04:25 -06:00
Cheridan 6a9a5c820e Merge pull request #13560 from Incoming5643/and_as_the_sword_looked_upon_the_infinite_cosmos_it_knew_it_just_had_to_try_and_fuck_everything_up
Supermatter swords and the infinite void
2015-12-12 23:22:48 -06:00
KorPhaeron f1a254fc27 Ups the chance a bit, makes it actually work 2015-12-12 17:16:35 -06:00
duncathan salt e97f647158 Merge pull request #13499 from AnturK/turretfix
Fixes syndicate turrets shooting after breaking
2015-12-12 14:54:19 -06:00
bgobandit 0b505eeff0 cloning buffer 2015-12-12 15:15:34 -05:00
Cheridan 5dcc208ee2 Merge pull request #13569 from KorPhaeron/low_layer
Fixes girders being on a low layer
2015-12-12 13:01:32 -06:00
Cheridan 45c06ae2cd Merge pull request #13555 from bgobandit/sexyhonk
Buffs the sexy clown.
2015-12-12 13:00:46 -06:00
Cheridan 99e7506731 Merge pull request #13572 from KorPhaeron/creepy_crawly
Various Spider Fixes
2015-12-12 12:43:03 -06:00
KorPhaeron 1f09a14f58 Merge remote-tracking branch 'refs/remotes/tgstation/master' into reactive_expansion
# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm
2015-12-12 01:12:59 -06:00
KorPhaeron 09c95d9551 Grenades, flamethrowers, better shields 2015-12-12 00:34:04 -06:00
MMMiracles 50db868f63 lets try that again 2015-12-11 22:54:07 -05:00
duncathan salt 9716702fb6 Merge pull request #13537 from KorPhaeron/work_place_hazard
Standing between activating shield generators is now deadly
2015-12-11 18:29:54 -06:00
KorPhaeron bce927ef72 Removes syndicate destinations 2015-12-11 18:17:26 -06:00
KorPhaeron f5c35298c9 Visible message update 2015-12-11 18:03:38 -06:00
bgobandit 5fa93e0e55 Adds the re-attachment of tails. Adds the attachment of tails to humans. Adds lizard clubs, liz o' nine tails and lizard cloche hats. 2015-12-11 19:03:09 -05:00
Nerd Lord b274d3ddc5 Dualsabers will now make you flip only twice, instead of up to twelve times. 2015-12-11 18:33:00 -05:00
Cheridan c641643c55 Merge pull request #13539 from KorPhaeron/dance_moves
Hitting someone with a dualsaber now has a chance to make you *flip
2015-12-11 17:27:42 -06:00
Cheridan 78093c0bf0 Merge pull request #13556 from bgobandit/matsagainfuckina
Adds mats/origin tech/burn_state to more items.
2015-12-11 17:13:42 -06:00
MMMiracles b3d992a832 conflict fix 2015-12-11 16:21:18 -05:00
Razharas 7929c027fa Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up
Apprentice clean up / bugfixes
2015-12-11 22:50:46 +03:00
AnturK 2c9c4f7a0a Adds Cloaker Belt 2015-12-11 20:50:09 +01:00
Razharas a251002d6f Merge pull request #13532 from Jalleo/pAI
Personal Artificial Intelligence Fix
2015-12-11 22:46:24 +03:00
Razharas 83bb88868c Merge pull request #13153 from Jordie0608/arguablyallgunsareenergygunsandallbeamsareprojectiles
Unifies energy gun self charging
2015-12-11 22:38:07 +03:00
Remie Richards 53172fa9ce Merge pull request #13516 from Anonus/whymode
Fixes up blob code some
2015-12-11 18:14:56 +00:00
Cheridan a002ca8917 Merge pull request #13542 from KorPhaeron/gigantic_epipens
Fixes small objects covering the entire tile after a fire
2015-12-11 07:23:00 -06:00
Cheridan 41709c7016 Merge pull request #13546 from KorPhaeron/RADIATION_PULSE_DETECTED
Removes rad pulse admin notice
2015-12-11 07:14:15 -06:00
KorPhaeron 44873907f4 More spider fixes 2015-12-11 04:42:04 -06:00