Commit Graph

12531 Commits

Author SHA1 Message Date
Fox McCloud
04b5837a8e Merge pull request #3875 from FalseIncarnate/master
Fixes Hardsuits Not Auto-deploying Attached Boots and Helms
2016-03-15 11:17:49 -04:00
Fox McCloud
6dfbcb5dcc Merge pull request #3871 from Tastyfish/chronx2
fluff tweaks
2016-03-15 11:17:15 -04:00
Fox McCloud
bad5eb6b2e Merge pull request #3865 from tigercat2000/tgcam
Port -tg-station cameranets
2016-03-15 11:04:25 -04:00
TheDZD
a858cb75a0 Merge pull request #3770 from tigercat2000/sneks
Enabled the admin-only snake body with sprites from @johannhawk <3
2016-03-14 19:47:17 -04:00
Tigercat2000
b397ac11a8 RAAAAAAAAAAWR. 2016-03-14 15:01:27 -07:00
Tigercat2000
296e689e7e Merge remote-tracking branch 'upstream/master' into tgcam
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2016-03-14 14:45:21 -07:00
TheDZD
bf371094ee Merge pull request #3817 from Fox-McCloud/screaming
Screamtastic
2016-03-14 17:43:29 -04:00
Tigercat2000
562a70fcdf Is all good now, yaya. 2016-03-14 14:43:11 -07:00
TheDZD
7ee864d60e Merge pull request #3873 from Fox-McCloud/eye-augment-fix
Fix Eye Augment EMP
2016-03-14 16:39:18 -04:00
Fox McCloud
55f6134b10 Merge pull request #3876 from Tastyfish/doors-fuck
Derped and forgot to update shuttle dock doors
2016-03-14 08:10:11 -04:00
Tastyfish
ddbd833d7d Derped and forgot to test shuttle door checks 2016-03-14 08:03:55 -04:00
FalseIncarnate
0ffb649278 Fixes Hardsuits Not Auto-deploying Boots and Helms
Apparently slots don't get set before equipped() is called, so a
spawn(1) fixed this.
2016-03-14 07:03:46 -04:00
Fox-McCloud
bb9aab416e Fix Eye Augment EMP 2016-03-14 06:20:21 -04:00
Tastyfish
96e0d10f8e flavor tweaks 2016-03-14 05:26:05 -04:00
Fox McCloud
1e5c7e709e Merge pull request #3869 from Tastyfish/audible_emote
Fixes *beep etc to be audible emotes
2016-03-14 04:43:43 -04:00
Tastyfish
c3de0cf196 Removes picture frames 2016-03-14 04:35:35 -04:00
Tastyfish
31a3313930 Fixes *beep etc to be audible emotes 2016-03-14 03:20:29 -04:00
Fox-McCloud
36905da472 IPC scream 2016-03-14 01:09:23 -04:00
TheDZD
2254815612 Merge pull request #3857 from Fox-McCloud/xeno-tweaks
Xeno Tweaks and Fixes
2016-03-13 22:47:54 -04:00
Fox McCloud
be00b4e4ae Merge pull request #3866 from Tastyfish/talk
Fixes "talks but you cannot hear them" message
2016-03-13 22:37:48 -04:00
Tastyfish
bd7a83e79e Fixes "talks but you cannot hear them" message 2016-03-13 22:18:38 -04:00
Fox McCloud
74838a86f8 Merge pull request #3854 from FlattestGuitar/synthanol_3
Synthanol Upgrade v2
2016-03-13 21:15:32 -04:00
Mieszko Jędrzejczak
01fbaad358 Holy water is water. 2016-03-14 02:09:11 +01:00
Fox McCloud
8ea7ac01c3 Merge pull request #3838 from Crazylemon64/slime_blood_work_right_dangit
Skeletons, Slime people, and other bloodless races no longer bleed
2016-03-13 21:08:47 -04:00
Fox McCloud
846f6deae5 Merge pull request #3861 from VampyrBytes/SyringeFix
Fixes syringes (#3855)
2016-03-13 21:08:40 -04:00
Fox McCloud
71067d3503 Merge pull request #3864 from Tastyfish/virofix
Fixes virology db entries with bad tabs
2016-03-13 21:06:27 -04:00
Tigercat2000
bc78146178 Port -tg-station cameranets
This should make it much easier to port abductors, if we ever want to do
that.

Changes:
  - Fixed a bug where the AI could not delete photos it takes.
  - Ported -tg- cameranets. This means that all of our camera based systems are more or less up to date with -tg-; 510 features are missing.
  - An AI with the 'camera lights' mode on will now, instead of the button toggling the closest camera's light, toggle camera lights on/off as the AI moves.
  - It now takes a minimum of 30 deciseconds between attempting to track someone, and locking on. This number is increased by their distance away from the AI eye.
  - The camera activate/deactivate proc is now called 'toggle_cam'.
  - The 'trackable' proc has been replaced by a more object-oriented 'mob.can_track()' proc.
  - The 'networks' section of the security camera console is now above the camera list.

In laymans terms: This refactors how security cameras calculate what
viewers can see, and adds a few neat features on top.
2016-03-13 15:06:24 -07:00
Tastyfish
090ccd56f7 Fixes virology db entries with bad tabs 2016-03-13 10:13:45 -04:00
Mieszko Jędrzejczak
93d3de8496 isSynthetic(), fizzes the fizzes 2016-03-13 10:25:50 +01:00
VampyrBytes
906a3185a9 Fixes syringes (#3855) 2016-03-13 08:37:39 +00:00
Fox-McCloud
57b6475248 Xeno Tweaks and Fixes 2016-03-12 21:50:06 -05:00
TheDZD
de8fb4345c Merge pull request #3836 from Fox-McCloud/chem-tweaks
Chem tweaks
2016-03-12 20:20:33 -05:00
TheDZD
df8073f12e Merge pull request #3851 from Fox-McCloud/xeno-fixes
Facehugger and Embryo Fixes
2016-03-12 11:29:45 -05:00
Mieszko Jędrzejczak
6e49832e57 WHAT IF I WANT MY FROZEN CIDER FIZZY!? (frozen cider does not fizz anymore) 2016-03-12 17:08:31 +01:00
Mieszko Jędrzejczak
f46fce2b24 Fizzes drinks 2016-03-12 15:45:13 +01:00
Mieszko Jędrzejczak
965ec810e7 Holy water glass looks like water, IPC booze makes organics puke, more synth drinks 2016-03-12 15:39:29 +01:00
Fox McCloud
5b6851bd5d Merge pull request #3839 from Tastyfish/awaymissions
Fixes some things for away missions, and a few missions themselves
2016-03-12 05:45:20 -05:00
Fox McCloud
ee67a63aca Merge pull request #3841 from Crazylemon64/decloner_re_add
Makes the decloner possible to create again
2016-03-12 05:40:49 -05:00
Fox-McCloud
8ec79caf7f double-processing fix 2016-03-12 05:18:20 -05:00
Fox-McCloud
0dc0ada004 Facehugger and Embryo Fixes 2016-03-12 03:00:54 -05:00
Fox-McCloud
28b285754f teslium 2016-03-11 23:15:00 -05:00
Fox McCloud
29f827b98c Merge pull request #3815 from taukausanake/Green_Mile
Picking up mice was easier than I though...
2016-03-11 22:21:00 -05:00
TheDZD
2cfe7bb3e1 Merge pull request #3821 from Crazylemon64/slime_regrow_buff
Slime people can now regrow their limbs at a lower nutrition cost
2016-03-11 21:28:21 -05:00
TheDZD
bdf26d9910 Merge pull request #3832 from monster860/fuckyougit
Spesspod Mining Laser - "Fuck You Git" edition
2016-03-11 21:27:53 -05:00
TheDZD
350086fc85 Merge pull request #3823 from Fox-McCloud/nukies-cybernetics
Implements Nuke Ops Cybernetics
2016-03-11 21:26:44 -05:00
Fox McCloud
6c48c5cc90 Merge pull request #3824 from Tastyfish/vamppow
Refactors vampire abilities, also some vamp fixes
2016-03-11 21:22:44 -05:00
Fox McCloud
dd02e5ac80 Merge pull request #3831 from FalseIncarnate/botany
Xeno-Botany Quality of Life Changes
2016-03-11 21:22:27 -05:00
Fox-McCloud
b6a6b54ff8 final touchups 2016-03-11 21:13:38 -05:00
monster860
f6ccfc9ae7 Merge branch 'master' into fuckyougit 2016-03-11 06:17:16 -05:00
Crazylemon64
bd2b5f11b6 Makes the decloner possible to create again 2016-03-10 23:27:50 -08:00