2f4f9d59cd
HoG Fix
2015-12-19 18:42:54 -06:00
e873395ffa
Merge pull request #13659 from bgobandit/beepskyfunremoval
...
Beepsky will no longer hunt aliens.
2015-12-19 02:49:33 -03:00
c0e571c61d
Merge pull request #13701 from tkdrg/calt
...
Cult fixes/tweaks
2015-12-19 15:07:48 +11:00
4adb440940
Merge pull request #13758 from KorPhaeron/deepstrike2
...
Gives the nuke ops an assault pod in place of their teleporter
2015-12-19 01:03:39 -03:00
d7c793f7b3
Inconsistent indents
2015-12-18 21:27:25 -06:00
50336adf58
Assault pod fixes
2015-12-18 21:15:44 -06:00
a7ccd084e8
Merge pull request #13734 from KorPhaeron/reinforcements
...
Allows nuke ops to purchase reinforcements
2015-12-18 21:47:01 -03:00
b1f6225de9
Merge pull request #13749 from Anonus/furtherblobtweaks
...
Blobbernaut chem attacks 2, return of the chem attack
2015-12-18 21:33:10 -03:00
20daeabf9e
Proper refunds
2015-12-18 18:26:44 -06:00
c3195d19d4
Refunds
2015-12-18 18:10:26 -06:00
dd547f8b7a
Merge pull request #13643 from CPTANT/Robocop
...
changes robocop law priority
2015-12-18 17:48:21 -06:00
86a983d361
OOP
2015-12-18 17:42:49 -06:00
14916b0cf9
Merge pull request #13629 from MMMiracles/1handed
...
L6 SAW changes
2015-12-18 20:29:16 -03:00
fe066f39b4
Merge pull request #13744 from hornygranny/proccalllogging
...
admin messages for proc calls
2015-12-18 16:03:35 -06:00
ef2ac1b0c8
CONflicts
2015-12-18 16:34:06 -05:00
b9ebbb6ed6
Merge pull request #13729 from KorPhaeron/admin_items
...
Grey Tide + Tesla Armor
2015-12-18 18:01:38 -03:00
17006ed3f8
I'm not paying any attention at all right now sorry
2015-12-18 14:18:28 -06:00
2e06e88a10
Corrects invalid button in Prefs
2015-12-18 20:12:57 +00:00
2601154d63
Slightly better replicate chance for illusions
2015-12-18 14:02:27 -06:00
5b0777e2b4
Faction copy
2015-12-18 13:57:25 -06:00
97e4058fc2
Fixes runtime when VVing datums
...
I'm dumb.
2015-12-18 16:55:44 -03:00
84d26ecc4d
Merge pull request #13730 from KorPhaeron/boss_get_down_a_sniper
...
Penetrator rounds for sniper rifles
2015-12-18 15:43:29 -03:00
eaba3342b9
Darkens lexorin jelly slightly, brightens ripping tendrils slightly.
...
Some fixes to core blobs, as well as increasing the rate at which a core will try to get an overmind.
2015-12-18 13:32:31 -05:00
5a53b5294d
Properly adds Pentagon orbits.
2015-12-18 16:17:49 +00:00
7bab23de9b
Adds pentagon as a possible orbit type
2015-12-18 16:12:45 +00:00
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
84ff5cfc36
Merge pull request #13736 from MrStonedOne/patch-90
...
You can now safely start a subsystem by vv'ing can_fire to 1
2015-12-18 13:06:40 -03:00
b38d9301e6
sigh
2015-12-17 23:53:44 -08:00
89528b1e39
User reference
2015-12-18 00:54:29 -06:00
b92224b95b
Merge pull request #13728 from KorPhaeron/burning_singulo
...
Lava proofing
2015-12-18 03:49:55 -03:00
3d75589f02
Merge pull request #13689 from KorPhaeron/volcanic_rocks
...
Volcanic Rocks
2015-12-18 03:27:02 -03:00
df2c433142
Merge pull request #13726 from MrStonedOne/patch-89
...
Fixes orbiting /mob/camera/
2015-12-17 23:23:42 -06:00
8de9b99182
Deepstrike 2
2015-12-17 23:22:37 -06:00
0047f6e96b
Merge pull request #13561 from bgobandit/lizcannotwag
...
Adds the surgical severing/reattachment of lizard tails, AND MORE!
2015-12-18 01:15:20 -03:00
77928440e2
Merge pull request #13571 from KorPhaeron/gate_destruction
...
Gateway/singularity interaction fix
2015-12-18 00:23:23 -03:00
2e57936f94
Fixes gateway interaction
2015-12-17 21:12:30 -06:00
08e393b8c2
Cult fixes/tweaks
...
Fixes cult input exploits.
Adds two new sexy animations by Joan for the Nar-sie shell.
Fixes the Nar-sie shell layer.
Fixes the shell not being deleted after a successful summoning.
Fixes using teleport/summon cultist runes to/from away missions.
Fixes #13692
2015-12-18 00:10:58 -03:00
6c2731b22b
conflicts are dumb tbh
2015-12-17 21:17:06 -05:00
ba5bc90d75
just gonna not
2015-12-17 21:11:06 -05:00
68edcb4c2b
Merge branch '1handed' of https://github.com/MMMiracles/-tg-station into 1handed
2015-12-17 21:08:52 -05:00
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
66e146237e
merges
2015-12-17 20:02:42 -05:00
83507c31fd
Fixes pressurized slime giving a message on explosions and fire
...
Nerfs the shit out of lexorin jelly's oxygen damage(two-hit crit, holy shit)
Blobbernaut chem attack is baaaaaack, but less absolutely insane this time; blobbernauts with an overmind will do 70% of the normal chem damage(plus 4) and attack at a much slower rate than the blob itself can. (So a blobbernaut with the ripping tendrils overmind would do 15 brute and 10 stamina damage)
Full list of blobbernaut hits to kill/stun, assuming no attempts to escape, armor, or bio protection;
Ripping Tendrils; 7, stun at 5
Reactive Gelatin; 5 to 10, Average of 7(not 7.5)
Energized Fibers; 10, stun at 5
Boiling Oil; 6
Sorium; 7, assuming no nearby objects
Envenomed Filaments; 7, stun at 5
Lexorin Jelly(after nerf), 4
Cryogenic Liquid; 9, stun at 7
Dark Matter; 7, assuming no nearby objects
Hallucinogenic Nectar; 8
Pressurized Slime; 7, stun at 5
2015-12-17 19:23:55 -05:00
cd7511b100
Fixes subsystem on varedit typos
2015-12-17 15:33:45 -08:00
f93aac3cab
Merge pull request #13687 from Buggy123/master
...
Reduces cooldown of the Bluespace Artillery on the space battle away mission
2015-12-17 20:25:25 -03:00
32330eddb4
Merge pull request #13698 from MrStonedOne/patch-87
...
Cleans up turf/get_lumcount
2015-12-17 20:22:09 -03:00
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
f57031ce4a
both proc call verbs will now alert admins when used in addition to being logged
...
fixes #13707
2015-12-17 14:21:04 -08:00
292e5ea424
Update bluespaceartillery.dm
2015-12-17 17:16:59 -05:00
1fe9883e67
Merge pull request #13706 from Anonus/slipblob
...
New blob chemicals plus tweaks to old blob chemicals
2015-12-17 18:36:52 -03:00
KorPhaeron
tkdrg
Jordie
KorPhaeron
Cheridan
MMMiracles
Remie Richards
Nerd Lord
Kyle Spier-Swenson
bgobandit
hornygranny
Buggy123