 duncathan salt
|
397025b292
|
Merge pull request #14074 from MrStonedOne/HOLYFUCKINGGHOSTPOPUPS
[ready]Ghost popup re-work
|
2015-12-31 23:58:03 +01:00 |
|
 bawhoppen
|
3f5101d84d
|
oops?
|
2015-12-31 16:39:28 -06:00 |
|
 Lularian
|
8e8526fd14
|
did I do it mum
|
2015-12-31 16:37:22 -06:00 |
|
 MrStonedOne
|
3ebc6749af
|
Brings shade selection into the pollCanidates system
|
2015-12-31 14:15:49 -08:00 |
|
 blah
|
5ad9a1c655
|
adds a single unset to the user in attackby to fix the issue of when moving away and activating the OK button on the camera console.
|
2015-12-31 20:52:20 +00:00 |
|
 tkdrg
|
28ca4ec1be
|
Merge pull request #14167 from okaw/newshoes
Changing bartender security icon + shoes to laceups
|
2015-12-31 16:14:15 -03:00 |
|
|
tkdrg
|
153304ddc8
|
Merge pull request #14165 from SouDescolado/SouDescolado-patch-1
Stacks the papers inside a folder inside briefcase
|
2015-12-31 16:07:24 -03:00 |
|
 KorPhaeron
|
7fd33d23a5
|
Meat spike
|
2015-12-31 12:50:05 -06:00 |
|
|
tkdrg
|
ff57d7e485
|
Merge pull request #14163 from swankcookie/Holopad_Layer_Fix
Holopad layer fix
|
2015-12-31 03:41:55 -03:00 |
|
|
tkdrg
|
52a45b6292
|
Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework
OBJECTIVES REWORK: Better Objectives Generation
|
2015-12-31 03:11:41 -03:00 |
|
 Nerd Lord
|
071cb63930
|
fine okay no helper
|
2015-12-30 23:32:58 -05:00 |
|
|
Nerd Lord
|
96f1ec92b0
|
ACTION CONFLICTING
|
2015-12-30 23:14:32 -05:00 |
|
 Buggy123
|
44879bceb1
|
Added small explosion as suggested
|
2015-12-30 23:05:26 -05:00 |
|
|
tkdrg
|
da97c0fb58
|
Merge pull request #14107 from LanCartwright/newvirogrenades
Viro-terror grenade renovation
|
2015-12-31 00:04:38 -03:00 |
|
|
tkdrg
|
4485cc3dfb
|
Merge pull request #14146 from KorPhaeron/guns
Lesser Summon Guns
|
2015-12-30 23:32:13 -03:00 |
|
|
tkdrg
|
b381ff2b31
|
Merge pull request #14132 from KorPhaeron/pda_spaces
Fixes PDA formatting
|
2015-12-30 23:27:28 -03:00 |
|
 LanCartwright
|
02dc51db6f
|
Update uplink_kits.dm
|
2015-12-31 02:17:30 +00:00 |
|
 KorPhaeron
|
d969d4442e
|
Revert "Multiverse clones are now identical to the summoner"
|
2015-12-30 20:13:55 -06:00 |
|
|
LanCartwright
|
fa2276fca6
|
fixes random tab
actually I hit tab instead of space
|
2015-12-31 02:13:36 +00:00 |
|
|
KorPhaeron
|
4b78a51361
|
Wrong place
|
2015-12-30 19:44:22 -06:00 |
|
|
tkdrg
|
51a28ab055
|
Merge pull request #14159 from somnium13/fix-in-prec
Fixes 'in' operator precedence issues.
|
2015-12-30 22:38:13 -03:00 |
|
|
KorPhaeron
|
1fee3c83a6
|
Span classes
|
2015-12-30 19:12:56 -06:00 |
|
|
KorPhaeron
|
943ce2ff95
|
Shuttle Delay
|
2015-12-30 18:49:01 -06:00 |
|
|
Buggy123
|
9bb5283e65
|
Buffed IED - no explosion, but very large fireball
|
2015-12-30 17:31:36 -05:00 |
|
|
Buggy123
|
942ce3baef
|
Update ghettobomb.dm
|
2015-12-30 17:21:45 -05:00 |
|
|
Buggy123
|
df2fd583a5
|
reverted changes to avoid issues with guard PR
|
2015-12-30 17:20:46 -05:00 |
|
 Okaw
|
8ddae3850b
|
Really changing bartender spawnshoes to laceup
Because last time it was just the security icons
|
2015-12-30 16:58:31 -05:00 |
|
|
tkdrg
|
f58c4bf635
|
Merge pull request #14127 from AnturK/pickups
Adds a few special mines/pickups
|
2015-12-30 18:52:42 -03:00 |
|
 AnturK
|
032c8a4222
|
Adds nodrop to pickup chainsaw
|
2015-12-30 22:39:15 +01:00 |
|
 AndrewJacksonThe2nd
|
0121f6691f
|
fixes
|
2015-12-30 13:14:28 -08:00 |
|
 SouDescolado
|
b9f7390786
|
Update briefcase.dm
Fixed bogus
Cookies to travis
|
2015-12-30 17:50:00 -02:00 |
|
|
SouDescolado
|
3aa209f2b8
|
Update briefcase.dm
Complete code overhaul
|
2015-12-30 17:43:28 -02:00 |
|
|
SouDescolado
|
25f6abbf15
|
Changes lawyer briefcase
Gives a special spaceman a special briefcase (Actually a normal briefcase with other contents)
|
2015-12-30 17:01:35 -02:00 |
|
|
SouDescolado
|
66cfbb7316
|
Fixes folder color. Defined a new briefcase type
Cookies for travis
Need to fix lawyers spawned briefcase. Will try to fix it.
|
2015-12-30 16:50:56 -02:00 |
|
|
SouDescolado
|
4f0fc81b44
|
Changing folder to generic yellow color
Cookies to Travis.
|
2015-12-30 16:10:58 -02:00 |
|
|
SouDescolado
|
4d92cb1506
|
Update briefcase.dm
Removed Law Stamp from briefcases (Not all briefcases spawn at the law office)
Tried to bribe travis with cookies.
|
2015-12-30 14:12:59 -02:00 |
|
|
SouDescolado
|
379cdde284
|
Update briefcase.dm
gah
|
2015-12-30 14:05:51 -02:00 |
|
|
SouDescolado
|
4a31ab7b3e
|
Update briefcase.dm
Fixed travis(?), added law stamp to briefcase
|
2015-12-30 14:00:55 -02:00 |
|
|
SouDescolado
|
37d8bf27be
|
Update briefcase.dm
|
2015-12-30 13:48:21 -02:00 |
|
|
SouDescolado
|
3841d8b8ea
|
Update briefcase.dm
|
2015-12-30 13:35:00 -02:00 |
|
|
SouDescolado
|
43bf151814
|
Stacks the papers inside a folder inside briefcase
Briefcases now spawn with a pen and a blue folder, filled with papers, instead of spawning filled with papers.
|
2015-12-30 13:26:24 -02:00 |
|
|
SouDescolado
|
9a021cff3d
|
Stacks the papers inside a folder inside briefcase
Makes all paper be neatly stacked inside a folder in the briefcase.
|
2015-12-30 13:11:04 -02:00 |
|
 TheRealGLH
|
9cb962cbc1
|
removes argument that did not need to be specified
|
2015-12-30 09:34:42 +01:00 |
|
 swankcookie
|
c5a8eb061a
|
corrected layer
|
2015-12-30 01:06:11 -06:00 |
|
|
swankcookie
|
2634d44fd9
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into holopad_layer_fix
|
2015-12-30 00:52:39 -06:00 |
|
|
swankcookie
|
d29c1d59bd
|
fixes holopad layer
|
2015-12-30 00:52:26 -06:00 |
|
|
AndrewJacksonThe2nd
|
59d6768610
|
fixes
|
2015-12-29 22:00:24 -08:00 |
|
|
duncathan
|
8392974ad0
|
fixes associative list; adds gas_overlay to "datum gases"
|
2015-12-29 22:50:09 -06:00 |
|
|
tkdrg
|
2ccec93fa6
|
Merge pull request #14131 from Incoming5643/it_wasnt_intentional
Fixes High Volume Mode not toggling properly
|
2015-12-29 22:48:59 -03:00 |
|
 Melichior
|
53db2cbcd1
|
Fixed 'in' precedence errors.
|
2015-12-29 17:16:09 -07:00 |
|