Commit Graph

5675 Commits

Author SHA1 Message Date
Remie Richards
5a53b5294d Properly adds Pentagon orbits. 2015-12-18 16:17:49 +00:00
Remie Richards
163c84344b Orbit improvements:
* Orbit is now less reliant on Animate(), for most ghosts this means 36 calls to Animate, vs the previous INFINITE, for those of you with potato computers, this should ease the pain and crashing.
* Orbits can now be something different to circles!
* Ghosts Byond Members can now choose between orbits! (Circle, Triangle, Square, Hexagon)
2015-12-18 16:12:42 +00:00
tkdrg
b92224b95b Merge pull request #13728 from KorPhaeron/burning_singulo
Lava proofing
2015-12-18 03:49:55 -03:00
bgobandit
a2241e0f6f Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag
Conflicts:
	code/modules/client/preferences.dm
	icons/mob/head.dmi
	tgstation.dme
2015-12-17 20:12:32 -05:00
Cheridan
a973a2518b Merge pull request #13585 from KorPhaeron/reactive_expansion
Reactive mechanics expansion and shooting grenades/flamethrowers out of peoples hands
2015-12-17 17:05:53 -06:00
tkdrg
c342c28e2f Merge pull request #13703 from neersighted/nano_reduction
NanoUI Reduction
2015-12-17 15:07:45 -03:00
tkdrg
197b4d58ea Merge pull request #13693 from MrStonedOne/patch-86
Properly fixes resin exploit
2015-12-17 15:01:22 -03:00
Bjorn Neergaard
332cc5af71 Re-organize NanoUI procs 2015-12-17 10:18:00 -06:00
KorPhaeron
d564e1e2f3 Lava proofing 2015-12-17 01:48:11 -06:00
Cheridan
4f647f1693 Merge pull request #13684 from MMMiracles/idedplsnerf
Gives ranged syndicate mobs no-stamina variant bullets (i died please nerf)
2015-12-16 23:40:03 -06:00
oranges
134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
tkdrg
b6366d82fa Merge pull request #13318 from MMMiracles/snowiscold
New Away Mission: Snow Valley+snow atmos
2015-12-16 21:01:07 -03:00
tkdrg
08b746935e Merge pull request #13678 from AnturK/minorfixes
Fixes statue shuttle/space walking
2015-12-16 19:57:31 -03:00
MMMiracles
cde4df61ae conFLICTS 2015-12-16 06:26:54 -05:00
AnturK
5b45e9ce8f Removes Mindless mobs from Orbit list. 2015-12-16 12:13:19 +01:00
Jordie
8eaaf73972 Merge pull request #13656 from KazeEspada/Lizardspeech
Lizards only triple single s instead of double ss or more.
2015-12-16 21:52:52 +11:00
Jordie
d9be79a11d Merge pull request #13655 from Anonus/reventweak
Tweaks revenant reveal times down slightly
2015-12-16 21:39:20 +11:00
tkdrg
d52b94cc86 Merge pull request #13610 from KorPhaeron/sentience_act
Xenobio sentience clean up/fixes
2015-12-16 04:31:16 -03:00
tkdrg
ae7b3d9d94 Merge pull request #13579 from The-Albinobigfoot/shadowcucks_get_cucked_a_bit_less
Wishgranter malus nerf.
2015-12-16 04:10:30 -03:00
Kyle Spier-Swenson
c69aab191c Properly fixes resin exploit
Fixes #13667

Closes #13669
2015-12-15 22:29:29 -08:00
Razharas
a349a15469 Merge pull request #13552 from tkdrg/newnewnewnewnewnewnewnewnewnewcult
[Ready?] Cult Overhaul. Yep.
2015-12-16 06:07:20 +03:00
MMMiracles
b548de38cd gives syndicate ranged mobs non-stamina giving versions of bullets 2015-12-15 21:53:55 -05:00
MMMiracles
392ca2a505 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 2015-12-15 16:54:22 -05:00
MMMiracles
d07f300063 i did things 2015-12-15 16:46:24 -05:00
AnturK
a8c1dc49d6 Fixes statue shuttle/space walking 2015-12-15 21:48:04 +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
KazeEspada
280b5a3960 Lizard s is now case sensitive. No more "sssYNDICATEsss". ss is now ssss, which makes it Assssissstantsss. 2015-12-15 00:52:38 -07:00
KazeEspada
f160b75229 Lizards only triple single s instead of double ss or more. This makes them slightly less annoying. 2015-12-14 21:51:47 -07:00
Nerd Lord
5202917b9f Tweaks revenant reveal times down slightly.
Fixes blight still doing stamina damage at final stage.
2015-12-14 22:26:51 -05:00
KorPhaeron
c301b51e9a Sentience Fixes 2015-12-13 08:06:54 -06:00
oranges
fc58a3d31c Damage standardisation for hulk punch 2015-12-13 21:53:30 +13:00
oranges
ed03ffd21b standardise damage across slimes 2015-12-13 21:51:57 +13:00
oranges
94af31f7a9 Remove hulk stun punch
Increase hulk damage
2015-12-13 21:49:03 +13:00
duncathan salt
d228f911fa Merge pull request #13522 from KorPhaeron/just_an_illusion
Reactive Illusion Armour
2015-12-12 19:07:30 -06:00
Cheridan
0979b72d29 Merge pull request #13554 from bgobandit/banditfixyourshit
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
Cheridan
91c3d79f09 Merge pull request #13524 from KorPhaeron/heavy_weapon
Slowdown from inhand items
2015-12-12 18:17:47 -06:00
bgobandit
c1e2f9b436 missing copy proc 2015-12-12 15:22:18 -05:00
bgobandit
0b505eeff0 cloning buffer 2015-12-12 15:15:34 -05:00
Cheridan
76ac529d1b Merge pull request #13568 from KorPhaeron/leap_fix
Hunter leap fix
2015-12-12 12:58:10 -06:00
Cheridan
99e7506731 Merge pull request #13572 from KorPhaeron/creepy_crawly
Various Spider Fixes
2015-12-12 12:43:03 -06:00
bgobandit
fb65beeb7c fixed icon paths, edited sprites 2015-12-12 10:03:52 -05: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
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
Cheridan
6fa38380ae Merge pull request #13503 from KorPhaeron/reactive
Fixes all clothing having a chance to block thrown items
2015-12-11 17:46:01 -06:00
The-Albinobigfoot
a54c9632fa Shadowpeople (i.e. ???) born of the Wish-granter can now properly see in the dark as (presumably) intended
🆑
bugfix: The Wishgranter now displays its faith in humans with a bit less enthusiasm.
/🆑
2015-12-11 13:52:12 -08: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
Razharas
550d7779eb Merge pull request #13514 from tkdrg/dadadaDADADA
Fixes human canUseTopic() misbehaving
2015-12-11 22:43:36 +03:00