 bawhoppen
|
14788a2c1e
|
crying
|
2015-12-26 23:19:19 -06:00 |
|
 MrStonedOne
|
5f68bedcd1
|
Upgrades do_after and progress bars
|
2015-12-26 21:04:19 -08:00 |
|
|
bawhoppen
|
ca272c4980
|
tweaks size
|
2015-12-26 21:54:03 -06:00 |
|
 Lularian
|
f880b3edb5
|
fire in the hole
|
2015-12-26 13:23:59 -06:00 |
|
|
bawhoppen
|
9fc900154e
|
I will make it weaker though
|
2015-12-26 12:55:57 -06:00 |
|
 Tkdrg
|
278d397075
|
Adds a message_admins() when a flamethrower is lit
|
2015-12-26 13:06:46 -03:00 |
|
|
tkdrg
|
c4e7e31c92
|
Merge pull request #14032 from KorPhaeron/chainsaw
Fixes chainsaw surgery
|
2015-12-26 04:43:09 -03:00 |
|
|
tkdrg
|
d4cc57041b
|
Merge pull request #14029 from PKPenguin321/patch-6
Fixes some EZ issues
|
2015-12-26 04:42:51 -03:00 |
|
|
tkdrg
|
0a4b99e2ec
|
Merge pull request #13985 from bgobandit/bugfixesandshit
Fixes some minor bugs and adds minor feedback.
|
2015-12-25 18:24:25 -03:00 |
|
 KorPhaeron
|
85ac583708
|
Fixes chainsaw surgery
|
2015-12-24 21:51:01 -06:00 |
|
 PKPenguin321
|
b1d1f7753e
|
fixes santabag/suicide_act
fixes the path for santabag/suicide_act
|
2015-12-24 19:30:21 -08: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 |
|
|
bawhoppen
|
5c52fb44cb
|
fixes periods
|
2015-12-24 08:47:59 -06:00 |
|
 bgobandit
|
789e3457cb
|
fixes some minor bugs
|
2015-12-24 04:35:08 -05:00 |
|
|
tkdrg
|
4532f90aa7
|
Merge pull request #13906 from KorPhaeron/typo_fix
Fixes energy axe typo
|
2015-12-23 14:46:33 -03:00 |
|
|
bawhoppen
|
3665c03de2
|
nerfs blocking
|
2015-12-23 11:19:44 -06: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 |
|
|
bawhoppen
|
46b453c472
|
compromise
|
2015-12-23 01:07:12 -06:00 |
|
|
bawhoppen
|
8b1ee8b8a0
|
okay i think it can burn now maybe
|
2015-12-23 00:50:26 -06:00 |
|
|
Lularian
|
fed268e5e5
|
wooden buckler
|
2015-12-23 00:36:34 -06: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 |
|
|
Lularian
|
f77ac2a14e
|
tactical gear
|
2015-12-22 13:59:02 -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 |
|
 Cheridan
|
b7c0d8cbb3
|
Merge pull request #13836 from KorPhaeron/mounted_chainsaws
Fixes mounted chainsaw deletion
|
2015-12-21 09:18:16 -06: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 |
|
|
Cheridan
|
dc5cb310d7
|
Merge pull request #13807 from KorPhaeron/cloak_of_shadows
Removes cloak of shadows
|
2015-12-20 10:56:27 -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 |
|
 Xhuis
|
4136e49b2b
|
Makes stun batons respect shields upon hit
|
2015-12-19 22:05:35 -05: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 |
|
|
KorPhaeron
|
c7018ff580
|
Removes cloak of shadows
|
2015-12-19 08:04:43 -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 |
|
 Pieter Vlasblom
|
a50c5aac6f
|
Revert "changes robocop law priority"
|
2015-12-19 00:50:51 +01:00 |
|
|
Cheridan
|
dd547f8b7a
|
Merge pull request #13643 from CPTANT/Robocop
changes robocop law priority
|
2015-12-18 17:48:21 -06:00 |
|
|
KorPhaeron
|
3da34e671c
|
Eshield
|
2015-12-18 16:44:08 -06:00 |
|
|
tkdrg
|
b9ebbb6ed6
|
Merge pull request #13729 from KorPhaeron/admin_items
Grey Tide + Tesla Armor
|
2015-12-18 18:01:38 -03:00 |
|