 tkdrg
|
c00e773b6d
|
Merge pull request #13818 from LanCartwright/nukeopsrenovation
NukeOps gun renovation with bundles
|
2015-12-20 21:59:17 -03:00 |
|
|
Akke
|
7d5f21259d
|
Changes c90gl to m90gl
|
2015-12-21 00:30:55 +00:00 |
|
|
tkdrg
|
c5106537ef
|
Merge pull request #13801 from bgobandit/hohohogod
Adds Christmas-related suicide messages.
|
2015-12-20 20:49:32 -03:00 |
|
|
LanCartwright
|
b8bdc8fce3
|
merge error
|
2015-12-20 21:04:54 +00:00 |
|
|
LanCartwright
|
986bfc8501
|
merge error
|
2015-12-20 21:04:09 +00:00 |
|
|
Akke
|
12206ae324
|
Merge branch 'nukeopsrenovation' of https://github.com/LanCartwright/-tg-station into nukeopsrenovation
# Conflicts:
# code/game/objects/items/weapons/storage/backpack.dm
|
2015-12-20 21:02:08 +00:00 |
|
|
Akke
|
060ed21b7c
|
adds so much more shit
|
2015-12-20 20:59:23 +00:00 |
|
|
Cheridan
|
10712f9553
|
Merge pull request #13804 from KorPhaeron/megaphone
Megaphone fix
|
2015-12-20 13:48:54 -06:00 |
|
|
tkdrg
|
bab0d21e5a
|
Merge pull request #13759 from KorPhaeron/copyofacopyofacopyofacopyofacopy
Merges Malf AI and traitor AI into a single antag type, no longer has its own mode
|
2015-12-20 16:18:37 -03:00 |
|
|
KorPhaeron
|
e336acaa33
|
Voice changer friendly
|
2015-12-20 11:51:29 -06:00 |
|
|
Cheridan
|
dc5cb310d7
|
Merge pull request #13807 from KorPhaeron/cloak_of_shadows
Removes cloak of shadows
|
2015-12-20 10:56:27 -06:00 |
|
|
tkdrg
|
f85ee6f1b0
|
Merge pull request #13820 from LanCartwright/newchemsmoke
Adds Bioterror foam grenades V2
|
2015-12-20 04:13:29 -03:00 |
|
|
tkdrg
|
f0735982dc
|
Merge pull request #13799 from KorPhaeron/admin_items
Fixes Grey Tide exploits
|
2015-12-20 03:50:13 -03:00 |
|
|
AndrewJacksonThe2nd
|
56be042744
|
fixes
|
2015-12-19 17:35:30 -08:00 |
|
|
Akke
|
16f09a0bf8
|
bioterror grenades
|
2015-12-20 00:14:17 +00:00 |
|
|
LanCartwright
|
d0c4089a33
|
whoops that was a mistake
|
2015-12-19 23:08:51 +00:00 |
|
|
LanCartwright
|
bc450c1f76
|
Update backpack.dm
|
2015-12-19 22:56:02 +00:00 |
|
|
Akke
|
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 |
|
|
AndrewJacksonThe2nd
|
1ab5e80458
|
Tesla map removal to fix merge
|
2015-12-19 12:32:50 -08:00 |
|
|
KorPhaeron
|
c7018ff580
|
Removes cloak of shadows
|
2015-12-19 08:04:43 -06:00 |
|
|
KorPhaeron
|
02d4260cda
|
megaphone fix
|
2015-12-19 07:26:44 -06:00 |
|
|
bgobandit
|
342ca5098c
|
adds christmas related suicide messages
|
2015-12-19 03:00:59 -05:00 |
|
|
KorPhaeron
|
c5c0b6cc74
|
Extra checks for grey tide
|
2015-12-18 22:41:13 -06:00 |
|
|
tkdrg
|
a7ccd084e8
|
Merge pull request #13734 from KorPhaeron/reinforcements
Allows nuke ops to purchase reinforcements
|
2015-12-18 21:47:01 -03:00 |
|
|
Cheridan
|
dd547f8b7a
|
Merge pull request #13643 from CPTANT/Robocop
changes robocop law priority
|
2015-12-18 17:48:21 -06:00 |
|
|
KorPhaeron
|
86a983d361
|
OOP
|
2015-12-18 17:42:49 -06:00 |
|
|
tkdrg
|
b9ebbb6ed6
|
Merge pull request #13729 from KorPhaeron/admin_items
Grey Tide + Tesla Armor
|
2015-12-18 18:01:38 -03:00 |
|
|
KorPhaeron
|
17006ed3f8
|
I'm not paying any attention at all right now sorry
|
2015-12-18 14:18:28 -06:00 |
|
|
KorPhaeron
|
5b0777e2b4
|
Faction copy
|
2015-12-18 13:57:25 -06:00 |
|
|
KorPhaeron
|
89528b1e39
|
User reference
|
2015-12-18 00:54:29 -06:00 |
|
|
tkdrg
|
3d75589f02
|
Merge pull request #13689 from KorPhaeron/volcanic_rocks
Volcanic Rocks
|
2015-12-18 03:27:02 -03:00 |
|
|
KorPhaeron
|
57d29d11d4
|
Replaces malf with traitor AI
|
2015-12-18 00:05:30 -06: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 |
|
|
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 |
|
|
Cheridan
|
6f30a11966
|
Merge pull request #13681 from swankcookie/lantern_sprite
Created lantern in-hands
|
2015-12-17 07:19:30 -06:00 |
|
|
KorPhaeron
|
af6f8c04a6
|
Admin items
|
2015-12-17 01:57:08 -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 |
|
|
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 |
|
|
KorPhaeron
|
99018c9930
|
Grenade/flamethrower blocking
|
2015-12-16 16:14:30 -06:00 |
|
|
tkdrg
|
f66f28761e
|
Merge pull request #13558 from AnturK/foryou
Adds Chemical Autoinjector Backpack
|
2015-12-16 18:13:40 -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 |
|
|
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
|
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 |
|
|
KorPhaeron
|
571d30a25c
|
Volcanic rocks
|
2015-12-15 23:31:14 -06:00 |
|