Commit Graph

22171 Commits

Author SHA1 Message Date
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
f7b126d555 Merge pull request #13895 from Anonus/blobscaling
Replaces the blob Split Consciousness ability with better blob scaling
2015-12-23 14:56:18 -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
4532f90aa7 Merge pull request #13906 from KorPhaeron/typo_fix
Fixes energy axe typo
2015-12-23 14:46:33 -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
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
tkdrg
5dec9b12ac Merge pull request #13899 from Incoming5643/Camo_Index_0
Fixes Chameleon Lizards
2015-12-23 02:56:50 -03: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
822ce165cd Merge pull request #13891 from LanCartwright/wjaskedfor000shotgunrounds
Adds 1 more pellet to rubbers and buck
2015-12-22 19:51:04 -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
fbd8cad45a Merge pull request #13879 from KorPhaeron/holograms_in_space
Fixes holograms drifting in zero gravity
2015-12-22 15:03:40 -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
tkdrg
fbad689e7d Merge pull request #13875 from KorPhaeron/away_missions
Stops minimaps generating for away missions
2015-12-22 15:01:27 -03:00
tkdrg
aad01cec73 Merge pull request #13874 from KorPhaeron/steelrifles
Removes pointless toggle fire button from autorifles
2015-12-22 15:00:56 -03:00
duncathan salt
2471c5e31d Merge pull request #13864 from as334/plasmic
Fixes fusion
2015-12-22 18:23:14 +01:00
Kyle Spier-Swenson
38453eb7e5 Removes distance check from ai nano ui interaction checks
This is either all or nothing, 

Right now ais can always use it if its in view of a camera, even if it's not in their view range. 

Everything but new nano ui acts this way.

Having some things act this way and some not just doesn't make sense.
2015-12-22 07:55:37 -08: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
KorPhaeron
3704b1f7ce Typo 2015-12-22 05:38:43 -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
e1eece71da Merge pull request #13869 from KorPhaeron/cayenne
Syndicate turrets will no longer target Cayenne
2015-12-22 03:22:36 -03:00
tkdrg
4c244c3851 Merge pull request #13870 from KorPhaeron/shard_logging
Supermatter logging fix
2015-12-22 03:22:15 -03:00
KorPhaeron
fd242b3a41 Extra comment 2015-12-22 00:14:13 -06:00
KorPhaeron
e4db0c96ee Parentheses 2015-12-22 00:04:19 -06: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
Incoming
166e8ef036 Lizards will no longer be able to change their features/color on the fly with their save file. 2015-12-22 00:51:23 -05:00
tkdrg
ff51c8519a Merge pull request #13813 from MMMiracles/toomanybullets
Nerfs Saber SMG to 21 per magazine
2015-12-21 23:47:42 -03:00
MMMiracles
36cba7e874 ALL THESE NUMBERS AND YOU CHOOSE 30? 2015-12-21 21:34:55 -05: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
tkdrg
c9bdceff2a Merge pull request #13866 from tgstation/RemieRichards-patch-devicetypeloop
Speeds up DEVICE_TYPE_LOOP
2015-12-21 22:09:59 -03:00
Nerd Lord
8f8d677a73 Replaces Split Consciousness with better blob scaling. 2015-12-21 19:32:34 -05: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
3a910f164e Merge pull request #13858 from Anonus/repliblob
Adds three new blob chemicals
2015-12-21 20:05:18 -03:00
Akke
e5936939a2 adds 1 more pellet 2015-12-21 22:57:16 +00:00
Nerd Lord
ae4d8cc7d0 it doesn't do anything but sure okay 2015-12-21 17:56:06 -05:00
tkdrg
d8cd0638d8 Merge pull request #13823 from Xhuis/misc_fixes
Stun batons respect shields on hit
2015-12-21 19:43:12 -03:00
tkdrg
bbe96caee1 Merge pull request #13785 from KorPhaeron/we_dune_now
Eshields have 100% block vs energy ,but 0 vs everything else
2015-12-21 19:42:52 -03: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
tkdrg
0397ce0b54 Merge pull request #13848 from AnturK/emplight
Fixes emp flashlight firing when storing it
2015-12-21 18:33:03 -03:00
Incoming
6b3055426c MULE's "run your dumb ass over" attack now respects armor 2015-12-21 15:48:59 -05:00
AnturK
48b5c9c85f Fixes ghost preferences 2015-12-21 21:37:11 +01:00