Commit Graph

13853 Commits

Author SHA1 Message Date
Nerd Lord ab9e0a7fbe Blob mobs now hear overmind chat.
Removes five unused istype helpers.
2015-12-29 17:27:26 -05:00
tkdrg 14da386e28 Merge pull request #14123 from KorPhaeron/multiverse
Multiverse clones are now identical to the summoner
2015-12-29 19:00:35 -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
Nerd Lord f79e871bfd Blob chat is now big and easy to see. 2015-12-29 15:10:24 -05: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
Nerd Lord bf394afb80 Storage blobs are gone, blobbernauts now poll candidates, early blob burst is gone, replaced with a help button(of dubious usefulness) 2015-12-29 13:35:13 -05:00
tkdrg 5930ee0d66 Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor
Refactor quick-equip verb
2015-12-29 14:26:48 -03:00
KorPhaeron 9bcca100ca Lesser Summon Guns 2015-12-29 10:58:27 -06: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 664a3aec11 Merge pull request #14071 from tkdrg/cuuuuult
More cult tweaks
2015-12-29 07:07:07 +00: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
Remie Richards d7fe8cd172 Merge pull request #14077 from tkdrg/windoorfix
Fixes unpowered windoors being stuck closed
2015-12-29 07:04:32 +00:00
AndrewJacksonThe2nd 7bfc5fb4e5 disables Debrain from random objective generation 2015-12-28 19:22:20 -08:00
tkdrg f42380dfc8 Merge pull request #13945 from Bawhoppen/czechwoodenbuckler
Adds wooden buckler shield
2015-12-28 23:51:53 -03:00
tkdrg dc0c056fc9 Merge pull request #14109 from Incoming5643/guns_and_guns_and_more_guns
Summon Guns 2016
2015-12-28 22:58:47 -03:00
Incoming 326937efc6 Merge branch 'guns_and_guns_and_more_guns' of https://github.com/Incoming5643/-tg-station into guns_and_guns_and_more_guns
# Conflicts:
#	code/game/gamemodes/wizard/rightandwrong.dm
2015-12-28 20:50:50 -05:00
Incoming b7ecdf6a2f Adds scatter lasers to the drop list
Changes it so scatter lasers start in scatter mode to drive home the point

CODING STANDARDS
2015-12-28 20:47:32 -05:00
KorPhaeron 863c0c410f Adds follow links 2015-12-28 19:37:37 -06:00
KorPhaeron 7cdc7fc4b0 PDA formatting 2015-12-28 19:07:14 -06:00
AndrewJacksonThe2nd 081aa7099e Removes Frame, fixes 2015-12-28 16:31:30 -08:00
Incoming 6296043d85 Fixes High Volume Mode not toggling properly 2015-12-28 19:00:22 -05:00
AndrewJacksonThe2nd 799a406af4 New Frame Objective, compile fixes 2015-12-28 15:23:42 -08: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 42efa497fc Merge pull request #13907 from optimumtact/meatyores
Reduce count of meteors
2015-12-28 19:08:11 -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 salt b943109a02 Merge pull request #13905 from KorPhaeron/weather
Weather datums [WIP]
2015-12-28 22:06:31 +01:00
duncathan salt 0aca78f381 Merge pull request #14100 from Anonus/blobberno
Blobbernauts can no longer smash walls.
2015-12-28 22:04:11 +01:00
KorPhaeron 0b314ef649 Multiverse 2015-12-28 14:47:44 -06:00
AndrewJacksonThe2nd dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
2015-12-28 12:40:51 -08: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
Tkdrg bc7c25429d More cult tweaks
Shuttle will no longer launch after the large shell is placed.
Summoning Nar-Sie will no longer red alert.
Fixes an edge case with trying to summon shell after nar-sie is out.

Fixes #14042
Fixes #14043
2015-12-28 01:55:04 -03: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
Incoming5643 95dbce902f whoooooooops 2015-12-27 22:13:05 -05:00
Incoming 42f13b9fe7 Whoops 2015-12-27 21:58:53 -05:00
Incoming 5a10810df7 Adds a buttload of guns to summon guns to bring it up to speed for 2016. I intentionally skipped any guns that had enough stopping power to OHKO a spessman from full health.
adds a gun proc, Unlock() that automatically swaps whatever pin the gun has for a generic electronic one.
2015-12-27 21:55:53 -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
tkdrg 1dec16cbb9 Merge pull request #13936 from Shadowlight213/AdminAIToggle2
Makes Admin AI interaction a logged toggle. Take 2
2015-12-27 22:01:01 -03:00
Buggy123 933bfcae03 Update ghettobomb.dm
Reduced the buff, can no longer blow holes to space.
2015-12-27 19:46:30 -05:00
Nerd Lord 87fb506966 Blobbernauts can no longer smash walls.
You know why.
Blobbernauts also get a more accurate description when spawned.
2015-12-27 15:44:18 -05:00