Commit Graph

5761 Commits

Author SHA1 Message Date
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
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
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
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
b054f18b2a Merge pull request #13931 from bgobandit/peoplewillmergeandtestmergeretardedlyuselessshit
Fixes a critical gap in Ian hat coverage.
2015-12-23 21:20:17 -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
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
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
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
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
bgobandit
76392cda86 Ian can now wear a clown hat. 2015-12-22 18:19:09 -05:00
tkdrg
f16da0d02b Merge pull request #13882 from KorPhaeron/layer_fix
Fixes monster spawners being on the same layer as mobs
2015-12-22 20:02:25 -03:00
tkdrg
830e50c1ba Merge pull request #13889 from Incoming5643/Mulebot_#11_I_am_coming_for_YOU
The MULE's "run your dumb ass over" attack now respects armor
2015-12-22 19:48:41 -03:00
tkdrg
4c4a413943 Merge pull request #13886 from AnturK/denyfreezegreentext
A handful of fixes.
2015-12-22 15:53:08 -03:00
tkdrg
e65df708b6 Merge pull request #13881 from KorPhaeron/nest_fix
Simple animals tell their nest when they die
2015-12-22 15:04:31 -03:00
tkdrg
b33863c911 Merge pull request #13876 from KorPhaeron/slaughter_means_slaughter
Slaughter Demons delete consumed victims again
2015-12-22 15:02:46 -03:00
AnturK
3d51605a21 Makes cyborg module failure instant 2015-12-22 16:46:45 +01:00
KorPhaeron
23c891ddbe Creature 2015-12-22 07:53:54 -06:00
Jordie
cc7da70520 Merge pull request #13843 from MrStonedOne/justshakeitoff
Smooth pixel screens shakes!
2015-12-22 21:50:18 +11:00
MrStonedOne
5bcc40aeae improves pixel screen shakes 2015-12-22 02:08:21 -08:00
tkdrg
7817f9d745 Merge pull request #13871 from KorPhaeron/ghostize
[s] Fixes being able to return to your body after another ghost takes control
2015-12-22 04:28:18 -03:00
tkdrg
661b168d18 Merge pull request #13868 from Incoming5643/Always_a_follow_up_pull_these_are_the_rules_see_I'm_doing_it_on_purpose_guys_it's_a_meme_hahahahahahahaaaaaaaaaaa
Fixes human tail wagging being an endless nightmare that can only end in death
2015-12-22 02:59:00 -03:00
tkdrg
82da7c6768 Merge pull request #13833 from KazeEspada/Cockroaches
Adds dirty fucking cockroaches.
2015-12-21 23:08:51 -03:00
KazeEspada
40be68eaf7 Span classed
Added span classes and a missing \The.
2015-12-21 19:02:39 -07:00
KazeEspada
139d1d1f5c Ready for merge!
All issues resolved and cockroaches should be ready for merging.
2015-12-21 17:23:47 -07:00
tkdrg
a08afebf02 Merge pull request #13857 from xxalpha/drycleaning
Adds a bottle of drying agent spray to janiborg.
2015-12-21 19:39:13 -03:00
AnturK
4f975e2768 Fixes medbots ignoring tabled victims. 2015-12-21 22:49:05 +01:00
Incoming
6b3055426c MULE's "run your dumb ass over" attack now respects armor 2015-12-21 15:48:59 -05:00
AnturK
2a521cd823 Fixes medbots ignoring tabled people 2015-12-21 20:18:33 +01:00
tkdrg
c9ad9af2c5 Merge pull request #13809 from AnturK/ghosthudpref
Makes Ghost HUD toggle persistent
2015-12-21 14:36:19 -03:00
KorPhaeron
c805331bdf Fixes nest layer 2015-12-21 08:57:18 -06:00
KorPhaeron
fac3665f0f Infinite skeletons 2015-12-21 08:54:34 -06:00
KorPhaeron
03ead46f44 Slaughter Demon Devour 2015-12-21 07:24:02 -06:00
KorPhaeron
7200c74d90 Fixes various ghost replacement things 2015-12-21 02:43:42 -06:00