2edfd114bd
Span class
2015-12-21 02:20:40 -06:00
2f4f9d59cd
HoG Fix
2015-12-19 18:42:54 -06: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
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
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
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
5b0777e2b4
Faction copy
2015-12-18 13:57:25 -06: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
89528b1e39
User reference
2015-12-18 00:54:29 -06:00
3d75589f02
Merge pull request #13689 from KorPhaeron/volcanic_rocks
...
Volcanic Rocks
2015-12-18 03:27:02 -03:00
8de9b99182
Deepstrike 2
2015-12-17 23:22:37 -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
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
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
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
2fd7816a57
it really wasn't
2015-12-17 15:51:10 -05:00
5527d130d0
Merge pull request #13690 from Incoming5643/kor_you_pointed_out_the_specific_line_why_didnt_you_just_do_it_yourself
...
Fix for the nuke op telecrystal bonus
2015-12-17 13:18:57 -06:00
95b5829cde
Fixes potential spawn exploits
2015-12-17 12:55:35 -06:00
1f583f0aaf
Merge pull request #13683 from Incoming5643/once_you_pop_the_fun_don't_stop
...
Adds early bursting for blob mode blobs
2015-12-17 15:24:35 -03:00
6f30a11966
Merge pull request #13681 from swankcookie/lantern_sprite
...
Created lantern in-hands
2015-12-17 07:19:30 -06:00
c2bc05a799
Reinforcements for nuke ops
2015-12-17 06:54:21 -06:00
af6f8c04a6
Admin items
2015-12-17 01:57:08 -06:00
40941c636d
necklaces again
...
round three let's go
2015-12-16 20:47:00 -08:00
a5fb122f49
The Mulligan
...
A syringe which completely randomizes your name and appearance.
Traitor only, and in the spy bundle.
2015-12-17 00:14:18 -03:00
849083809e
Buffs Cryogenic Liquid and Reactive Gelatin blobs
...
oranges you fucking citrus autist
2015-12-16 20:43:14 -05:00
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
b6366d82fa
Merge pull request #13318 from MMMiracles/snowiscold
...
New Away Mission: Snow Valley+snow atmos
2015-12-16 21:01:07 -03:00
a996b056e6
Merge pull request #13525 from KorPhaeron/chest_high_walls
...
More sec barricade changes/general cover changes
2015-12-16 20:39:37 -03:00
c202574bb2
Barrier clean up
2015-12-16 17:28:50 -06:00
6a148c2f61
nvm
2015-12-16 17:57:26 -05:00
99018c9930
Grenade/flamethrower blocking
2015-12-16 16:14:30 -06:00
71dcf0d890
Merge pull request #13676 from KorPhaeron/shuttle_tweaks
...
Shuttle movement tweaks
2015-12-16 19:01:45 -03:00
4a9c0032dc
Merge pull request #13665 from KorPhaeron/nuke_escape
...
Alternate completion to Escape Alive objective
2015-12-16 18:52:33 -03:00
f66f28761e
Merge pull request #13558 from AnturK/foryou
...
Adds Chemical Autoinjector Backpack
2015-12-16 18:13:40 -03:00
4f13183f88
NEW BLOB CHEMS
...
SLIP BLOB, DAMAGE IT AND IT SLIPS YOU
ENERGIZED BLOB, IT DOES STAMINA DAMAGE AND STUNS YOU EVENTUALLY ALSO DISABLERS HEAL IT
DRUG BLOB, IT MAKES YOUR INTERFACE TERRIBLE AND DOES TOXIN DAMAGE
REACTIVE BLOB, HIT IT WITH BRUTE DAMAGE GET HIT BACK
2015-12-16 15:51:17 -05:00
3264261510
Merge pull request #13666 from xxalpha/airlocking
...
Fixed not being able to bolt and unbolt operating doors.
2015-12-16 16:24:51 -03:00
ae76b6f3e8
Merge pull request #13530 from AnturK/ninjaawayistoomuchwork
...
Adds Cloaker Belt
2015-12-16 12:00:13 -03:00
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -05:00
c6140c1c61
Adds Chemical Backpack
2015-12-16 12:11:26 +01:00
aedb522c7d
wake me up
2015-12-16 06:09:01 -05:00
916d00c238
Minor fixes
2015-12-16 12:06:09 +01:00
ab2f151773
Merge pull request #13581 from Anonus/flipless
...
Dualsabers will now make you flip only twice, instead of up to twelve times.
2015-12-16 22:01:28 +11:00
9ea34b4931
Merge pull request #13645 from bgobandit/aicamerafix
...
AIs with wireless disabled will no longer be able to read papers held up to cameras.
2015-12-16 21:37:03 +11:00
6032c3957b
Merge pull request #13644 from bgobandit/fixedtoys
...
FIXES CHRISTMAS
2015-12-16 21:35:23 +11:00
KorPhaeron
KorPhaeron
Jordie
tkdrg
Cheridan
Nerd Lord
bgobandit
PKPenguin321
oranges
MMMiracles
AnturK