Commit Graph

12675 Commits

Author SHA1 Message Date
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
Akke
ba02c80bdf better be gpd da,m gicco at thos [pomt 2015-12-28 01:33:59 +00: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
AnturK
72bc9591a2 This is bit better. 2015-12-26 14:10:09 +01:00
KorPhaeron
bcdc028c3b Initial transform 2015-12-26 07:06:57 -06:00
Tkdrg
42cd502626 Fixes indentation in cockroach death()
Thanks @phil235 !
2015-12-26 09:33:56 -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
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
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
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
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
Jordie
18181d2ac4 Merge pull request #13981 from tkdrg/gololem
Adds xeno golems to admin log
2015-12-25 16:02:17 +11:00
PKPenguin321
93aa422c2a fixes statue.dm
anotha one
2015-12-24 19:33:50 -08:00
tkdrg
e8fdbd911e Merge pull request #13972 from Anonus/blobbernaut
Rebalances blobbernaut creation
2015-12-25 00:16:57 -03:00
tkdrg
d0ac4427c2 Merge pull request #13861 from Incoming5643/once_again_kors_fix_to_a_wizard_mechanic_has_forced_my_hand
Objects created by the staff of animation eventually revert if there's no one to attack
2015-12-25 00:14:42 -03:00
tkdrg
e3fbe54fb2 Merge pull request #13957 from Incoming5643/what_do_you_mean_its_a_metaphor
Bonus drops from killing beepsky
2015-12-25 00:03:25 -03:00
Incoming5643
76b59e1d4c does the mso 2015-12-24 21:22:18 -05:00
Incoming
8e9e6891d3 Makes the shot of whiskey actually a shot glass since some people wanted it and it's an easier problem to solve. 2015-12-24 21:18:19 -05:00
tkdrg
3d1b6f5f03 Merge pull request #13974 from MrStonedOne/patch-102
Fixes lib machines spamming refreshes when printing
2015-12-24 23:00:28 -03:00
tkdrg
dae30404ae Merge pull request #13958 from MrStonedOne/patch-99
no grav movement now uses !can_pass as well as density
2015-12-24 14:49:37 -03:00
duncathan salt
6ee2c7c227 Merge pull request #13873 from KorPhaeron/slimes
Fixes slime processor giving an extra core
2015-12-24 15:29:42 +01:00
AnturK
8abfd04756 Makes resetting thunderdome also reset air 2015-12-24 15:26:12 +01:00
Kyle Spier-Swenson
36dd0889bf fixes flashes being stupid on emp.
now, if i understand this code right, the old code would flash in the viewers(3) of ***FUCKING USR*** on emp, meaning the person to trigger the emp, not the person holding the flash.

The documents say that if the second arg is null, ***it defaults to usr.***

I have it doing loc because this way it flashes from inside a pocket, but not a backpack or other container.
2015-12-24 06:25:36 -08:00
KorPhaeron
4145dc16c9 Stand Names 2015-12-24 08:09:14 -06:00
duncathan salt
6b4000ff66 Merge pull request #13956 from MrStonedOne/patch-98
gateways now pause movement briefly to prevent chain teleports
2015-12-24 15:06:26 +01:00
KorPhaeron
447c9c3c87 Fixes pamphlet desc 2015-12-24 07:50:52 -06:00
duncathan salt
ede1cdb511 Merge pull request #13960 from AnturK/nuclearoption
Random fixes
2015-12-24 14:12:24 +01:00
duncathan salt
582a4c7c12 Merge pull request #13962 from KorPhaeron/guardian_fix
Guardian Fixes
2015-12-24 14:11:59 +01:00
AnturK
fd76e601ab Fixes nojumpsuit species strip panel hiding the jumpsuit slots 2015-12-24 14:09:55 +01:00
AnturK
bce90c0863 Makes cyborg hypospray regenerate all reagents regardless of current mode 2015-12-24 14:03:52 +01:00
KorPhaeron
8d8a1cbe38 Fixes cryo description typo 2015-12-24 07:01:55 -06:00
duncathan salt
a34a2c5480 Merge pull request #13964 from KorPhaeron/lava_mobs
Makes mining mobs fireproof
2015-12-24 13:53:51 +01:00
Kyle Spier-Swenson
92d727fe99 Update gateway.dm 2015-12-24 04:40:45 -08:00
Jordie0608
3eba936d34 generalises simple animal loot drops and removes copypasta 2015-12-24 23:34:46 +11:00
KorPhaeron
1fdfb5b270 Fixes the loop for real this time 2015-12-24 06:15:58 -06:00
duncathan salt
b4519573c2 Merge pull request #13901 from KorPhaeron/new_clip_in
Spacemens will loudly announce that they are changing magazines
2015-12-24 12:51:08 +01:00
KorPhaeron
f8404eff5f Tactical reloads 2015-12-24 05:03:29 -06:00
KorPhaeron
a1dad4e445 Remie loop 2015-12-24 05:01:57 -06:00