Commit Graph

14295 Commits

Author SHA1 Message Date
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 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
MMMiracles 1c1e892ddf New Away Mission: Research Facility 2015-12-22 17:34:04 -05:00
Lularian f77ac2a14e tactical gear 2015-12-22 13:59:02 -06:00
Kyle Spier-Swenson cfdcb51f78 Slows down stat panels a bit more
I'll see these rise to the top of profile during high pop while nothing else is going on.
2015-12-22 11:57:11 -08: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
tkdrg aad01cec73 Merge pull request #13874 from KorPhaeron/steelrifles
Removes pointless toggle fire button from autorifles
2015-12-22 15:00:56 -03:00
KorPhaeron ef30f9e64d Less copypaste 2015-12-22 10:29:27 -06:00
KorPhaeron 772451816d Code clean up 2015-12-22 10:18:06 -06: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 70060cb6c1 Weather datums 2015-12-22 05:31:46 -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
KorPhaeron b4b1f7b714 RELOADING 2015-12-22 00:54:09 -06:00
tkdrg 4c244c3851 Merge pull request #13870 from KorPhaeron/shard_logging
Supermatter logging fix
2015-12-22 03:22:15 -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
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
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
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 48b5c9c85f Fixes ghost preferences 2015-12-21 21:37:11 +01:00
AnturK 2a521cd823 Fixes medbots ignoring tabled people 2015-12-21 20:18:33 +01:00
AnturK 7145db861f Fixes check antagonists not displaying bursted blobs 2015-12-21 20:08:05 +01:00
tkdrg c9ad9af2c5 Merge pull request #13809 from AnturK/ghosthudpref
Makes Ghost HUD toggle persistent
2015-12-21 14:36:19 -03:00
tkdrg 1074e7d161 Merge pull request #13831 from KorPhaeron/dual_wield
Dual wielding guns
2015-12-21 14:11:09 -03:00
AnturK 31a89ff320 Makes inquisitiveness client preference 2015-12-21 17:28:36 +01:00
tkdrg ef415278aa Merge pull request #13830 from Incoming5643/nothing_ever_works_right_away_its_just_the_way_things_are
Unbricks the rpgloot event
2015-12-21 12:14:36 -03:00
KorPhaeron 71d8a929a4 My stealth buff was defeated by code review 2015-12-21 09:08:26 -06: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 23cd403fca Removes pointless toggle fire button 2015-12-21 07:07:27 -06:00
KorPhaeron e988bc0a2a Slimes 2015-12-21 06:42:44 -06:00
KorPhaeron 7200c74d90 Fixes various ghost replacement things 2015-12-21 02:43:42 -06:00
KorPhaeron 2aac9a2b1c SM shard logging 2015-12-21 00:25:25 -06:00
tkdrg 96855b3094 Merge pull request #13800 from KorPhaeron/voices
Prayer response voice is generalized again
2015-12-21 03:16:31 -03:00