Commit Graph

6582 Commits

Author SHA1 Message Date
tkdrg
130a4e0242 Merge pull request #13877 from LanCartwright/thesethingsdontgrowontreesyouknow
Removes Bulldogs from roundstart syndicate ship
2015-12-24 22:21:55 -03:00
LanCartwright
019f460dc9 Update uplinks.dm 2015-12-25 01:15:49 +00:00
Akke
c7d91019ec final revision 2015-12-25 01:02:29 +00:00
Akke
db23604952 adds 10 more tc to op uplink for total of 30 2015-12-24 18:56:36 +00:00
tkdrg
75fe5b095c Merge pull request #13961 from MrStonedOne/patch-101
freeform law boards no longer silently return when entering invalid law number, but rather ask if the user would like to change it to 15
2015-12-24 14:18:23 -03:00
tkdrg
fbe8c02ed1 Merge pull request #13915 from KorPhaeron/command_headset
Using command headsets makes you have larger radio speech
2015-12-23 17:00:01 -03:00
tkdrg
4532f90aa7 Merge pull request #13906 from KorPhaeron/typo_fix
Fixes energy axe typo
2015-12-23 14:46:33 -03:00
Kyle Spier-Swenson
671388ca2b freeform law boards are now easier to use
I default the input to 15, and ask them if they want to set it to 15 if they enter in an invalid number, rather than silently return
2015-12-23 03:47:03 -08:00
tkdrg
434598b0e4 Merge pull request #13853 from KorPhaeron/NOSHIELD
Removes NOSHIELD flag, gives NOSHIELD items armour penetration
2015-12-23 03:17:01 -03:00
KorPhaeron
66ed7605d7 Command Headsets 2015-12-22 09:36:10 -06:00
KorPhaeron
3704b1f7ce Typo 2015-12-22 05:38:43 -06:00
tkdrg
d8cd0638d8 Merge pull request #13823 from Xhuis/misc_fixes
Stun batons respect shields on hit
2015-12-21 19:43:12 -03:00
tkdrg
bbe96caee1 Merge pull request #13785 from KorPhaeron/we_dune_now
Eshields have 100% block vs energy ,but 0 vs everything else
2015-12-21 19:42:52 -03:00
tkdrg
0397ce0b54 Merge pull request #13848 from AnturK/emplight
Fixes emp flashlight firing when storing it
2015-12-21 18:33:03 -03:00
Cheridan
b7c0d8cbb3 Merge pull request #13836 from KorPhaeron/mounted_chainsaws
Fixes mounted chainsaw deletion
2015-12-21 09:18:16 -06:00
tkdrg
ef415278aa Merge pull request #13830 from Incoming5643/nothing_ever_works_right_away_its_just_the_way_things_are
Unbricks the rpgloot event
2015-12-21 12:14:36 -03:00
Cheridan
7154edb16a Merge pull request #13838 from KorPhaeron/stealth_weapons
Screwdriver attack animation fix
2015-12-21 08:50:10 -06:00
Akke
5821dd81ad we dont have a shotgun tree you know 2015-12-21 13:37:31 +00:00
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
KorPhaeron
a0923daa0e Removes NOSHIELD 2015-12-20 15:21:58 -06: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
AnturK
1a7c2a1eca Fixes emp flashlight firing when storing it 2015-12-20 21:33:29 +01: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
KorPhaeron
b7efa4ca3c Nerfs the ultimate stealth weapon 2015-12-20 05:32:42 -06:00
KorPhaeron
00e322da3a Fixes mounted chainsaws 2015-12-20 04:30:35 -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
Incoming
1e7fcd3e9f unbricks the rpgloot event.
fixes a rare issue with the imposter event.
2015-12-20 01:15:03 -05:00
Xhuis
4136e49b2b Makes stun batons respect shields upon hit 2015-12-19 22:05:35 -05: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