Commit Graph

24890 Commits

Author SHA1 Message Date
Buggy123 829f68f39c Reverted Holo nerf for IED buff PR 2015-12-30 17:34:51 -05: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
Buggy123 7fbfaef890 Nerfed holos: Owner always takes cloneloss 2015-12-30 17:17:13 -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
AnturK b875ab18cf Makes simple mob drift properly 2015-12-30 22:31:51 +01:00
AndrewJacksonThe2nd 0121f6691f fixes 2015-12-30 13:14:28 -08:00
tkdrg 44a0a1b079 Merge pull request #14152 from KorPhaeron/lizards
Fixes lizard hats being uncraftable
2015-12-30 18:12:24 -03:00
tkdrg e681243c44 Merge pull request #14151 from SouDescolado/patch-1
Add telescopic baton item to detective trenchcoat
2015-12-30 18:12:09 -03:00
tkdrg f04936251a Merge pull request #14149 from SouDescolado/patch-2
Add telescopic baton item to detective armor
2015-12-30 18:10:20 -03:00
AnturK 06946ca53c Adds timeout to player hivelord brood spawning. 2015-12-30 21:46:54 +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 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
tkdrg 17e495f4cf Merge pull request #14142 from PKPenguin321/patch-6
Lowers thermals TC cost
2015-12-30 15:18:28 -03:00
SouDescolado 4f0fc81b44 Changing folder to generic yellow color
Cookies to Travis.
2015-12-30 16:10:58 -02:00
KorPhaeron 83f4661f05 Missing checks 2015-12-30 10:28:27 -06: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
KorPhaeron e0157185fc Blacklist 2015-12-30 10:10:54 -06: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
duncathan 4e22cb20ac further listmos optimizations + documentation 2015-12-30 09:52:07 -06: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
Okaw 92c125cf05 Changing bartender shoes icon to "laceups"
For fancy bartending.
2015-12-30 10:08:39 -05: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
duncathan 9e77fffe2a maps and nano 2015-12-30 00:06:42 -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 e57b43276d Merge pull request #14134 from GunHog/In_This_Episode_Gun_Hog_Teaches_MATH!
Fixes Abductor event
2015-12-29 22:51:17 -03: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
tkdrg ffd5374fe1 Merge pull request #14128 from KorPhaeron/offer_control
Offer control improvements
2015-12-29 22:43:36 -03:00
TrustyGun a72a66cab2 Fixes literally everything 2015-12-29 19:47:39 -05:00
Melichior 53db2cbcd1 Fixed 'in' precedence errors. 2015-12-29 17:16:09 -07:00
tkdrg ab7a3837d9 Merge pull request #14121 from AnturK/martialfix
Makes martial arts reset combos on target change.
2015-12-29 20:09:32 -03:00
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
TrustyGun d51a6d7969 Adds two new UI styles: Slimecore, and Operative 2015-12-29 16:52:21 -05: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
Razharas fd0738aff8 Merge pull request #14125 from KorPhaeron/gold_grub
Gold grub fix
2015-12-30 00:38:06 +03:00
Cheridan a40b732fe4 Merge pull request #13943 from tkdrg/abos
Checking antagonists will now message admins
2015-12-29 15:02:00 -06:00