Xhuis
7fc726c00a
Changes bloodcrawl define location
2015-12-18 17:51:10 -05:00
Xhuis
fe093d4e20
Fixes Travis failure
2015-12-18 15:27:29 -05:00
Xhuis
c735e1ab3c
Updates the readme
2015-12-18 15:05:32 -05:00
Xhuis
2034c3f878
Merges all side-antagonists into a new folder
2015-12-18 15:02:15 -05:00
tkdrg
3d75589f02
Merge pull request #13689 from KorPhaeron/volcanic_rocks
...
Volcanic Rocks
2015-12-18 03:27:02 -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
bgobandit
66e146237e
merges
2015-12-17 20:02:42 -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
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
Nerd Lord
2fd7816a57
it really wasn't
2015-12-17 15:51:10 -05:00
Cheridan
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
tkdrg
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
Cheridan
6f30a11966
Merge pull request #13681 from swankcookie/lantern_sprite
...
Created lantern in-hands
2015-12-17 07:19:30 -06:00
PKPenguin321
40941c636d
necklaces again
...
round three let's go
2015-12-16 20:47:00 -08:00
KorPhaeron
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
Nerd Lord
849083809e
Buffs Cryogenic Liquid and Reactive Gelatin blobs
...
oranges you fucking citrus autist
2015-12-16 20:43:14 -05: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
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
KorPhaeron
c202574bb2
Barrier clean up
2015-12-16 17:28:50 -06:00
MMMiracles
6a148c2f61
nvm
2015-12-16 17:57:26 -05:00
KorPhaeron
99018c9930
Grenade/flamethrower blocking
2015-12-16 16:14:30 -06:00
tkdrg
71dcf0d890
Merge pull request #13676 from KorPhaeron/shuttle_tweaks
...
Shuttle movement tweaks
2015-12-16 19:01:45 -03:00
tkdrg
4a9c0032dc
Merge pull request #13665 from KorPhaeron/nuke_escape
...
Alternate completion to Escape Alive objective
2015-12-16 18:52:33 -03:00
tkdrg
f66f28761e
Merge pull request #13558 from AnturK/foryou
...
Adds Chemical Autoinjector Backpack
2015-12-16 18:13:40 -03:00
Nerd Lord
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
tkdrg
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
tkdrg
ae76b6f3e8
Merge pull request #13530 from AnturK/ninjaawayistoomuchwork
...
Adds Cloaker Belt
2015-12-16 12:00:13 -03:00
MMMiracles
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -05:00
AnturK
c6140c1c61
Adds Chemical Backpack
2015-12-16 12:11:26 +01:00
MMMiracles
aedb522c7d
wake me up
2015-12-16 06:09:01 -05:00
AnturK
916d00c238
Minor fixes
2015-12-16 12:06:09 +01:00
Jordie
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
Jordie
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
Jordie
6032c3957b
Merge pull request #13644 from bgobandit/fixedtoys
...
FIXES CHRISTMAS
2015-12-16 21:35:23 +11:00
Jordie
b8925a1b49
Merge pull request #13621 from xxalpha/airlox
...
Added maintenance glass airlock and external glass airlock.
2015-12-16 21:34:24 +11:00
tkdrg
a2aee48ece
Merge pull request #13609 from AnturK/runtimes
...
Fixes for few runtime errors
2015-12-16 04:15:21 -03:00
Tkdrg
277effe056
Merge branch 'Shadowlight213-Syndiesecure' into master
2015-12-16 03:12:46 -03:00
Shadowlight213
89189b720e
Changes to use defines
2015-12-16 03:02:03 -03:00
Incoming5643
3bcf8564ef
game mode code strikes again
2015-12-16 00:49:47 -05:00
Incoming
ae5f8bb1db
Fixes up the syndicate telecrystal bonus counting things like roundstart ghosts, new_players, and the nuke ops themselves in their threat assessment. Technically a nerf.
2015-12-16 00:38:24 -05:00
KorPhaeron
571d30a25c
Volcanic rocks
2015-12-15 23:31:14 -06:00
Razharas
9dac032681
Merge pull request #13507 from neersighted/nanoui_compat
...
NanoUI 3.0!
2015-12-16 07:43:29 +03:00
Bjorn Neergaard
da4842dddf
Make NanoUI resistant to Topic spoofs
...
Move Topic() into a NanoUI-specific ui_act proc
Update to @YotaXP's latest JSON code.
Return focus to the mapwindow if a key is pressed in a NanoUI.
2015-12-15 22:37:52 -06:00
Razharas
a50f7806c3
Merge pull request #13653 from Anonus/dontpulsemebro
...
Changes blob pulsing significantly plus a few more blob fixes
2015-12-16 07:13:21 +03:00
Razharas
a349a15469
Merge pull request #13552 from tkdrg/newnewnewnewnewnewnewnewnewnewcult
...
[Ready?] Cult Overhaul. Yep.
2015-12-16 06:07:20 +03:00
Incoming
ee8a99f492
Adds an icon to allow for early bursting of blobs in blob mode. This additionally does double duty as an obvious message that you're a soon to be blob.
2015-12-15 21:39:42 -05:00
swankcookie
fb85b61f73
Created lantern in-hands
2015-12-15 20:00:58 -06:00
MMMiracles
88414e5502
woops
2015-12-15 20:25:02 -05:00
duncathan salt
b9b76ddef1
Merge pull request #13640 from KorPhaeron/nuclear_challenge
...
Optional challenge mode for Nuke Ops
2015-12-15 19:17:07 -05:00
