2f4f9d59cd
HoG Fix
2015-12-19 18:42:54 -06:00
16f09a0bf8
bioterror grenades
2015-12-20 00:14:17 +00:00
d0c4089a33
whoops that was a mistake
2015-12-19 23:08:51 +00:00
bc450c1f76
Update backpack.dm
2015-12-19 22:56:02 +00:00
3818c227d2
For a 60 crew round, this theoretically allows all operatives to own a gun and some ammo, and still have some points left over for luxuries.
...
This mainly balances gun prices and adds new bundles
2015-12-19 22:44:49 +00:00
1ab5e80458
Tesla map removal to fix merge
2015-12-19 12:32:50 -08:00
5330a6571f
Fixes HoG ghost image
2015-12-19 19:06:19 +01:00
af4dae58e1
Area name
2015-12-19 08:14:31 -06:00
c7018ff580
Removes cloak of shadows
2015-12-19 08:04:43 -06:00
6ad132df53
Stacking decals
2015-12-19 07:41:22 -06:00
02d4260cda
megaphone fix
2015-12-19 07:26:44 -06:00
342ca5098c
adds christmas related suicide messages
2015-12-19 03:00:59 -05:00
c5c0b6cc74
Extra checks for grey tide
2015-12-18 22:41:13 -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
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
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
a50c5aac6f
Revert "changes robocop law priority"
2015-12-19 00:50:51 +01: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
7fc726c00a
Changes bloodcrawl define location
2015-12-18 17:51:10 -05:00
3da34e671c
Eshield
2015-12-18 16:44:08 -06:00
58b9ea0174
Merge remote-tracking branch 'refs/remotes/tgstation/master' into lava_rivers
2015-12-18 15:33:48 -06:00
b9ebbb6ed6
Merge pull request #13729 from KorPhaeron/admin_items
...
Grey Tide + Tesla Armor
2015-12-18 18:01:38 -03:00
fe093d4e20
Fixes Travis failure
2015-12-18 15:27:29 -05:00
17006ed3f8
I'm not paying any attention at all right now sorry
2015-12-18 14:18:28 -06:00
02bfab8c07
Finally fixes special completion for real
2015-12-18 17:11:12 -03:00
c735e1ab3c
Updates the readme
2015-12-18 15:05:32 -05:00
2034c3f878
Merges all side-antagonists into a new folder
2015-12-18 15:02:15 -05: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
57d29d11d4
Replaces malf with traitor AI
2015-12-18 00:05:30 -06: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
KorPhaeron
Akke
AndrewJacksonThe2nd
AnturK
bgobandit
Jordie
tkdrg
Incoming
Pieter Vlasblom
Cheridan
Xhuis
KorPhaeron
Nerd Lord
PKPenguin321