Commit Graph

7166 Commits

Author SHA1 Message Date
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
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
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 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
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
Razharas 356ec745c1 Merge pull request #13787 from Chnkr/revert-13643-Robocop
Revert "changes robocop law priority"
2015-12-30 00:44:36 +03:00
duncathan salt 42d10a22d3 Merge pull request #13926 from Bawhoppen/czechmilitary
Tactical Gear + small changes
2015-12-29 20:43:14 +01:00
duncathan 17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
tkdrg 5930ee0d66 Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor
Refactor quick-equip verb
2015-12-29 14:26:48 -03:00
Lo6a4evskiy ab6fb1ab36 Refactor using slot_equipment_priority 2015-12-29 17:59:56 +04:00
TheRealGLH d7097594ff removes the burn_skin proc
removes the burn_skin proc
2015-12-29 13:48:38 +01:00
Martijn Daniels a7865bd9cf electrocute_act
Changes containment field and electric chair effects to use
electrocute_act
2015-12-29 13:36:16 +01:00
Remie Richards b39dfd5418 Merge pull request #14064 from tkdrg/litlog
Adds a message_admins() when a flamethrower is lit
2015-12-29 07:05:11 +00:00
tkdrg f42380dfc8 Merge pull request #13945 from Bawhoppen/czechwoodenbuckler
Adds wooden buckler shield
2015-12-28 23:51:53 -03:00
KorPhaeron 7cdc7fc4b0 PDA formatting 2015-12-28 19:07:14 -06:00
Incoming 6296043d85 Fixes High Volume Mode not toggling properly 2015-12-28 19:00:22 -05:00
AnturK 0fb8ac18c3 Adds a few special mines/pickups 2015-12-29 00:20:57 +01:00
tkdrg 2d990ea834 Merge pull request #14076 from RemieRichards/VehicleFramework
Simple Vehicle Framework
2015-12-28 19:41:59 -03:00
tkdrg 28cacc55c7 Merge pull request #14099 from AnturK/crayonstuff
Adds buffered writing mode to crayons/spray cans.
2015-12-28 18:47:47 -03:00
tkdrg 50ab7b824b Merge pull request #14094 from KorPhaeron/pda
PDA messages now have a (F) link for ghosts
2015-12-28 18:24:01 -03:00
duncathan cc9c5768ca Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	code/datums/gas_mixture.dm
2015-12-28 13:59:16 -06:00
duncathan a64b68f76c caches gases in more procs 2015-12-28 13:32:49 -06:00
tkdrg e88bf4e2b5 Merge pull request #14084 from MrStonedOne/GOOOOOF
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
duncathan b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
AnturK 47a7a9656c Makes the write default to current buffer 2015-12-28 11:17:40 +01:00
Lularian 32ca87bc9c lets hope 2015-12-27 22:01:22 -06:00
Buggy123 fbd1175dd9 Increased the buff slightly, has a larger weak explosion now. 2015-12-27 22:51:46 -05:00
Akke d80a8542c3 gotta sstop drinking and doing karaoke 2015-12-28 02:29:54 +00:00
Akke ba02c80bdf better be gpd da,m gicco at thos [pomt 2015-12-28 01:33:59 +00:00
Buggy123 933bfcae03 Update ghettobomb.dm
Reduced the buff, can no longer blow holes to space.
2015-12-27 19:46:30 -05:00
AnturK 8962334555 Adds buffered writing mode to crayons/spray cans. 2015-12-27 20:52:23 +01:00
Lularian 2f248b4630 assault belt sprite 2015-12-27 11:40:48 -06:00
tkdrg f6db2f4ac9 Merge pull request #14067 from AnturK/mulecratefix
Fixes mulebot crates
2015-12-27 14:21:47 -03:00
KorPhaeron 6481c95acd PDA fixes 2015-12-27 10:31:38 -06:00
Buggy123 d57ec85154 Buffed IEDS 2015-12-27 04:12:47 -05:00
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