Commit Graph

12492 Commits

Author SHA1 Message Date
Cheridan bde3995bc1 Merge pull request #13790 from tkdrg/niggers
Fixes invisible mask exploits
2015-12-19 23:10:05 -06:00
tkdrg 0c1855ea18 Merge pull request #13777 from Xhuis/totally_not_for_an_upcoming_project
Merges all things related to side-/mini-antagonists into a single folder
2015-12-19 23:24:33 -03:00
tkdrg c01e4d10a4 Merge pull request #13792 from Incoming5643/isnt_one_tail_bad_enough
Fixes weird lizard feature issues
2015-12-19 23:17:09 -03:00
tkdrg c75a038676 Merge pull request #13796 from KorPhaeron/AI_follow
Clicking the (F) link on AI speech while make you orbit their camera eye
2015-12-19 23:15:46 -03:00
tkdrg df3fd0da7c Merge pull request #13258 from AndrewJacksonThe2nd/inventing_like_its_1891
Adds the Tesla Engine to the game.
2015-12-19 23:10:28 -03:00
AndrewJacksonThe2nd 34733cf01c fuck shit pornhub 2015-12-19 18:01:05 -08:00
AndrewJacksonThe2nd 6207d9e052 haha whoooopppppppsssss 2015-12-19 17:52:06 -08:00
AndrewJacksonThe2nd 0d65351d3f fixes 2015-12-19 17:51:11 -08:00
AndrewJacksonThe2nd dabbb02297 Upgrades orbit to use remie's new features, fixes ball movement. 2015-12-19 16:38:32 -08:00
Cheridan 450b7ebd1a Merge pull request #13763 from AnturK/medfix
Medbeam Fixes
2015-12-19 16:55:14 -06:00
AndrewJacksonThe2nd 5fd85edfb1 Energy ball no longer claims it is a singularity. 2015-12-19 13:04:16 -08:00
AndrewJacksonThe2nd 1ab5e80458 Tesla map removal to fix merge 2015-12-19 12:32:50 -08:00
AndrewJacksonThe2nd 21165f77f5 i heard that sleep in process is a bad idea 2015-12-19 12:27:42 -08:00
AndrewJacksonThe2nd 0037ab3337 removes debug messages 2015-12-19 12:27:40 -08:00
AndrewJacksonThe2nd 7881d26981 WHOOPS FORGOT TO REVERT THIS 2015-12-19 12:27:37 -08:00
AndrewJacksonThe2nd 9582db7247 Adds the Tesla Engine to the game. 2015-12-19 12:27:32 -08:00
Cheridan 52d30c8870 Merge pull request #13761 from KorPhaeron/prayers
Admins can claim prayers
2015-12-19 11:48:11 -06:00
tkdrg e873395ffa Merge pull request #13659 from bgobandit/beepskyfunremoval
Beepsky will no longer hunt aliens.
2015-12-19 02:49:33 -03:00
Incoming b621fb10d5 Removes special handling for mutant features on cloning. It didn't work and is inconsistent with how the rest of cloning works (it takes a snapshot of how you looked at the moment of death, including things that might not strictly be "genetic" like dyed hair color). 2015-12-18 21:48:06 -05:00
KorPhaeron 53ddc11f77 AI following 2015-12-18 20:36:11 -06:00
Incoming 40212b6312 Fixes double tailed lizards
Depriciates *stopwag. *wag is now a toggle
2015-12-18 20:27:15 -05:00
Tkdrg 92240a9d95 Fixes invisible mask exploits
This code is awful and full of copy-paste and I can't be assed/can't
manage to figure out how to fix it properly so I just got the hammer and
made it always update everything whenever you toggle a helmet. Exploit's
dead at least.

Fixes #13486
2015-12-18 21:40:23 -03:00
tkdrg 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
tkdrg 14916b0cf9 Merge pull request #13629 from MMMiracles/1handed
L6 SAW changes
2015-12-18 20:29:16 -03:00
Xhuis 7fc726c00a Changes bloodcrawl define location 2015-12-18 17:51:10 -05:00
Cheridan fe066f39b4 Merge pull request #13744 from hornygranny/proccalllogging
admin messages for proc calls
2015-12-18 16:03:35 -06:00
MMMiracles ef2ac1b0c8 CONflicts 2015-12-18 16:34:06 -05:00
tkdrg b9ebbb6ed6 Merge pull request #13729 from KorPhaeron/admin_items
Grey Tide + Tesla Armor
2015-12-18 18:01:38 -03:00
Remie Richards 2e06e88a10 Corrects invalid button in Prefs 2015-12-18 20:12:57 +00:00
KorPhaeron 2601154d63 Slightly better replicate chance for illusions 2015-12-18 14:02:27 -06:00
Xhuis 2034c3f878 Merges all side-antagonists into a new folder 2015-12-18 15:02:15 -05:00
KorPhaeron 5b0777e2b4 Faction copy 2015-12-18 13:57:25 -06:00
tkdrg 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
Nerd Lord 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
Remie Richards 5a53b5294d Properly adds Pentagon orbits. 2015-12-18 16:17:49 +00:00
Remie Richards 7bab23de9b Adds pentagon as a possible orbit type 2015-12-18 16:12:45 +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
AnturK 510d1acd06 Medbeam Fixes 2015-12-18 10:03:38 +01:00
KorPhaeron 0624603450 Prayers 2015-12-18 01:51:11 -06:00
tkdrg b92224b95b Merge pull request #13728 from KorPhaeron/burning_singulo
Lava proofing
2015-12-18 03:49:55 -03:00
tkdrg 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
tkdrg 77928440e2 Merge pull request #13571 from KorPhaeron/gate_destruction
Gateway/singularity interaction fix
2015-12-18 00:23:23 -03:00
KorPhaeron 2e57936f94 Fixes gateway interaction 2015-12-17 21:12:30 -06:00
MMMiracles 6c2731b22b conflicts are dumb tbh 2015-12-17 21:17:06 -05:00
MMMiracles ba5bc90d75 just gonna not 2015-12-17 21:11:06 -05:00
MMMiracles 68edcb4c2b Merge branch '1handed' of https://github.com/MMMiracles/-tg-station into 1handed 2015-12-17 21:08:52 -05: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
Nerd Lord 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
tkdrg 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
tkdrg 32330eddb4 Merge pull request #13698 from MrStonedOne/patch-87
Cleans up turf/get_lumcount
2015-12-17 20:22:09 -03:00