Commit Graph

22337 Commits

Author SHA1 Message Date
LanCartwright fa2276fca6 fixes random tab
actually I hit tab instead of space
2015-12-31 02:13:36 +00:00
LanCartwright afadb0bbec typo 2015-12-31 02:12:18 +00:00
LanCartwright 3e10ee04f6 god dammit 2015-12-31 01:54:49 +00:00
Akke 11a3cb3d82 indentation 2015-12-30 23:30:55 +00:00
Akke 1135a271f5 nothing works here 2015-12-28 03:46:27 +00:00
Akke f10b0d4ef4 ravuis 2015-12-28 02:36:59 +00:00
Akke d80a8542c3 gotta sstop drinking and doing karaoke 2015-12-28 02:29:54 +00:00
LanCartwright c20c8c0359 Update tuberculosis.dm 2015-12-28 02:20:19 +00:00
Akke 84c2ae3678 now now I'm drunkl 2015-12-28 02:18:50 +00:00
Akke ba02c80bdf better be gpd da,m gicco at thos [pomt 2015-12-28 01:33:59 +00:00
tkdrg 1d80a58d6b Merge pull request #14050 from AssassinT90/master
Fixes Issue #14047
2015-12-26 21:38:00 -03:00
tkdrg 53920e3071 Merge pull request #14051 from AnturK/teleporterfix
Fixes teleporter hub working without power
2015-12-26 21:36:46 -03:00
tkdrg 7ab1cc2968 Merge pull request #14046 from Anonus/whytalyn
Fixes retrovirus referring to ryetalyn as a possible cure
2015-12-26 17:06:28 -03:00
Cheridan 236670dd13 Merge pull request #13941 from Buggy123/master
Makes Salicyclic Acid useful
2015-12-26 09:27:12 -06:00
phil235 68ab5f72ee Merge pull request #14061 from tkdrg/fuckme
Fixes indentation in cockroach death()
2015-12-26 14:54:30 +01:00
tkdrg c64430a0fd Merge pull request #13996 from AnturK/fixfixfix
Minor fixes
2015-12-26 10:23:21 -03:00
tkdrg b689055016 Merge pull request #13986 from KorPhaeron/illusion
Fixes illusions running about on their face
2015-12-26 10:16:45 -03:00
tkdrg d32c045068 Merge pull request #13999 from KorPhaeron/morph
Morph uses appearance
2015-12-26 10:12:16 -03:00
AnturK 72bc9591a2 This is bit better. 2015-12-26 14:10:09 +01:00
tkdrg ac7e0cc036 Merge pull request #13805 from KorPhaeron/stacking_decals
Fixes decal stacking
2015-12-26 10:07:18 -03:00
KorPhaeron bcdc028c3b Initial transform 2015-12-26 07:06:57 -06:00
KorPhaeron c4735d2bc5 Initial 2015-12-26 07:06:07 -06:00
KorPhaeron a47b490d2b That was dumb 2015-12-26 07:00:20 -06:00
KorPhaeron 1a958e83b6 Stacking decals 2015-12-26 06:47:07 -06:00
Tkdrg 42cd502626 Fixes indentation in cockroach death()
Thanks @phil235 !
2015-12-26 09:33:56 -03:00
tkdrg f83b1ccb24 Merge pull request #14039 from KorPhaeron/detective_buff
Detective starts with his bowman on
2015-12-26 04:44:52 -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 6314572c46 Merge pull request #13991 from Jordie0608/thepinatateacheskidsvitalessonsabouthowviolenceisrewarding
Generalises simple animal loot drops and removes copypasta
2015-12-26 04:34:27 -03:00
Jordie 0ee6c6acd0 readds layer hack for mining mob loot 2015-12-26 15:50:54 +11:00
tkdrg 199b0e4776 Merge pull request #14011 from Anonus/moreblobscaling
Tweaks blob burst times upwards, adds LORE
2015-12-26 00:40:17 -03:00
tkdrg 7b2cd63474 Merge pull request #14022 from Incoming5643/please_don't_merge_unfinished_prs
Command headsets being really loud is now a physical toggle
2015-12-25 22:41:47 -03:00
Incoming5643 4fab87989b Removes href value dependency 2015-12-25 19:34:25 -05:00
Nerd Lord 8022bf10da how did I fail to do this 2015-12-25 19:21:54 -05:00
Nerd Lord 4bf0326288 high-end back down 2015-12-25 19:11:40 -05:00
tkdrg 9e7c05e557 Merge pull request #14000 from KorPhaeron/pamphlet
Fixes away mission pamphlet desc
2015-12-25 21:07:21 -03:00
KorPhaeron fad47ae801 missing space 2015-12-25 17:33:33 -06:00
AnturK 429a48cfbc Fixes teleporter hub working without power 2015-12-25 23:43:00 +01:00
AssassinT90 7f112e46ab Update airlock.dm 2015-12-25 18:54:34 -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
tkdrg db2b8a34d4 Merge pull request #14004 from MrStonedOne/patch-103
fixes flashes being stupid on emp.
2015-12-25 15:15:27 -03:00
tkdrg 1180d1f007 Merge pull request #13987 from KorPhaeron/mekhi
[s]Fixes being able to trigger your own reactive armour with thrown objects
2015-12-25 15:06:30 -03:00
Nerd Lord f083948ecb Fixes retrovirus referring to ryetalyn where mutadone replaced it. 2015-12-25 12:22:25 -05:00
tkdrg b8767bea04 Merge pull request #14003 from KorPhaeron/stand_names
Fixes guardians/parasites always being named "Guardian Spirit" after they die
2015-12-25 14:14:56 -03:00
tkdrg 3f29b78b1d Merge pull request #13994 from KorPhaeron/cryo
Fixes cryoxadone description typo
2015-12-25 14:13:34 -03:00
tkdrg f16bf98c1b Merge pull request #13992 from KorPhaeron/department_sec
Fixes department security spawn message error
2015-12-25 14:12:37 -03:00
tkdrg 20e6285c85 Merge pull request #13989 from KorPhaeron/spider_fixes
Spider fixes
2015-12-25 14:11:51 -03:00
tkdrg 72830909c6 Merge pull request #13984 from AndrewJacksonThe2nd/teslameme
TESLA 4.0: less laggy edition
2015-12-25 14:09:36 -03:00
Cheridan c5e305c6f1 Merge pull request #13951 from hornygranny/eall
fixes tesla engine being called energy eall
2015-12-25 06:37:17 -06:00
Cheridan 8d37ca5f24 Merge pull request #13988 from KorPhaeron/emp
Stops EMPs from repairing broken cameras
2015-12-25 06:07:12 -06:00