Commit Graph

12635 Commits

Author SHA1 Message Date
Jordie
18181d2ac4 Merge pull request #13981 from tkdrg/gololem
Adds xeno golems to admin log
2015-12-25 16:02:17 +11: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
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
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
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
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
tkdrg
a86c47a970 Merge pull request #13954 from MrStonedOne/patch-96
alt click will no longer show atoms overridden by a client image
2015-12-24 05:12:43 -03:00
tkdrg
edc79bdc22 Merge pull request #13953 from Incoming5643/death_by_dixel
Fixes synth "women" looking suspiciously like men
2015-12-24 05:12:31 -03:00
tkdrg
4d5d926316 Merge pull request #13946 from Shadowlight213/Beepskyhackfix
Fixes admin bot unhacking
2015-12-24 05:10:22 -03:00
tkdrg
fcc10d6f7b Merge pull request #13939 from Shadowlight213/SInguloprints
Adds fingerprint transfer from sing generator to sing.
2015-12-24 01:16:08 -03:00
Tkdrg
8947b4e94f Adds xeno golems to admin log
Also makes golems use key_name(), key_name_admin() and adminmoreinfo.
2015-12-24 00:45:00 -03:00
tkdrg
b054f18b2a Merge pull request #13931 from bgobandit/peoplewillmergeandtestmergeretardedlyuselessshit
Fixes a critical gap in Ian hat coverage.
2015-12-23 21:20:17 -03:00
Kyle Spier-Swenson
49e112b189 Fixes lib machines spamming refreshes when printing 2015-12-23 14:20:42 -08:00
tkdrg
02aff598b2 Merge pull request #13852 from RemieRichards/AdminQuickMapDrop
Map Template Load Verb + Maploader Improvements
2015-12-23 17:51:20 -03:00
Remie Richards
965b6642ad smarter extension detection 2015-12-23 20:34:31 +00:00
Nerd Lord
246d2c2ae7 unnecessary commit due to slow github updating 2015-12-23 15:13:23 -05:00
Nerd Lord
1059beeb28 if(!screaming) 2015-12-23 15:09:33 -05:00
Nerd Lord
53d0bc5d72 Rebalances blobbernaut creation; blobbernauts no longer destroy the factory, but instead do heavy damage to it, prevent it from spawning spores for one minute, and are player-controlled if possible.
Also fixes some runtimes when killing mice.
2015-12-23 14:50:43 -05:00
tkdrg
b6488bad6e Merge pull request #13925 from MrStonedOne/patch-95
Slows down stat panels a bit more
2015-12-23 16:14:17 -03:00
tkdrg
607c9f94c5 Merge pull request #13916 from MrStonedOne/patch-94
Removes distance check from ai nano ui interaction checks
2015-12-23 14:49:00 -03:00
tkdrg
6a645cc997 Merge pull request #13908 from KorPhaeron/creature
Fixes the wizards pet dying every round
2015-12-23 14:47:04 -03:00
tkdrg
146f97fcd6 Merge pull request #13917 from AnturK/dailyfix
Makes cyborg module failure instant
2015-12-23 14:45:37 -03:00
KorPhaeron
b4a02cea5f Updates phrases 2015-12-23 11:21:03 -06:00
KorPhaeron
d8c82020ef Makes mining mobs fireproof 2015-12-23 07:17:12 -06:00
Kyle Spier-Swenson
842025a9ac Update mob_movement.dm 2015-12-23 04:39:43 -08:00
KorPhaeron
3441170c69 Guardian Fixes 2015-12-23 05:49:15 -06:00
AnturK
503a8a3557 Fixes SQDL2 paren escaping 2015-12-23 12:27:24 +01:00
AnturK
6f6bd244d2 Fixes statues pointing when visible 2015-12-23 12:26:14 +01:00
Kyle Spier-Swenson
b220679de3 no grav movement now uses can_pass rather then density 2015-12-23 02:12:50 -08:00
Kyle Spier-Swenson
3207c2f2aa fixes gateway move delay typo 2015-12-23 01:58:35 -08:00
Incoming
2c40dd1e3a Officer beepsky will actually drop a potato battery and a shot of whiskey upon his death. 2015-12-23 04:31:15 -05:00
Kyle Spier-Swenson
537d638042 gateways now pause movement briefly to prevent chain teleports 2015-12-23 01:29:37 -08:00
Kyle Spier-Swenson
0b73f1190f alt click will no longer show atoms overridden by a client image 2015-12-23 00:54:55 -08:00
Incoming
193d4456dd Synths emulating females will now properly fake female clothing 2015-12-23 03:38:40 -05:00
KorPhaeron
c79c6e4671 Properly reverts dual wielding 2015-12-23 01:59:02 -06:00
tkdrg
434598b0e4 Merge pull request #13853 from KorPhaeron/NOSHIELD
Removes NOSHIELD flag, gives NOSHIELD items armour penetration
2015-12-23 03:17:01 -03:00
Shadowlight213
a28abc1f9b Whitespace fix 2015-12-22 22:12:59 -08:00
Shadowlight213
32156f9555 Fixes Admin bot unhacking 2015-12-22 22:12:10 -08:00