Commit Graph

4632 Commits

Author SHA1 Message Date
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
Chinsky
1e1d5a6d01 Enables logging of people beating monkey.
Also updates it to species code and visible message helper. Shit is anicent.
2014-07-26 04:09:20 +04:00
Zuhayr
d8336061b4 Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev 2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
DJSnapshot
2c7bb6c48d Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request. 2014-07-24 17:01:52 -07:00
Zuhayr
61d38a3e86 Merge pull request #5740 from Ccomp5950/taser_slow_down
Tasers will now cause movement slow downs on the first hit
2014-07-23 17:46:55 +09:30
Ccomp5950
fe9785d630 Tasers will now cause movement slow downs on the first hit
Before:  Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.

After:  If you have any halloss you will slow down some.  I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
2014-07-23 02:55:37 -05:00
Ccomp5950
98abc5bfc4 Compromise on speach_sound, will check distance instead of just checking if ghost. 2014-07-23 01:48:48 -05:00
Ccomp5950
477d32ff64 Ghosts will no longer hear clientless mobs random talking unless they are in view.
Experiment 97B says, 'EHEHEHEHEHEHEHE!'
2014-07-22 19:33:56 -05:00
Ccomp5950
75803c5140 Positronic brains (and every other mob) using binary chat will no longer send their messages twice.
Fixes: #5444
2014-07-22 19:32:52 -05:00
Ccomp5950
e01e081cbb screen_shake (meteors, etc.) made more robust and works with aiEyes
Before:  multiple screen_shake's could queue up prior to screenshake being set on the mob setting
oldeye on the last one to queue up to be the random location from the previous screen shake
so sometimes peoples clients were stuck on a location instead of back on the mob.

Now we set screenshake before the spawn so we don't spawn up multiple screen_shakes on the same mob.

Test:  Be ghost, hammer the spawn meteors secret 10 times or so, watch as your camera returns back to your mob.

Yay.
2014-07-22 19:05:04 -05:00
Mloc-Argent
3d390998f1 make gas mask filtering more generic
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 20:31:20 +01:00
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Mloc
a9bd931345 Merge pull request #5734 from Walter0o/borer_hotfix
borer mindcontrol release hotfix
2014-07-22 18:50:59 +01:00
Zuhayr
5feb5b8a93 Merge pull request #5726 from Ccomp5950/fix_antagHUD_mutiny
Mutineers and Loyalist will now show up properly in antagHUD.
2014-07-23 00:27:08 +09:30
Walter0o
a274cd7326 borer mindcontrol release hotfix
forgot to remove this remnant ckey check
2014-07-22 16:49:09 +02:00
Chinsky
3668cc5b1d Merge pull request #5718 from Walter0o/double_sleep
fixes issue #5717
2014-07-22 10:56:45 +04:00
Ccomp5950
e942ca258f Mutineers and Loyalist will now show up properly in antagHUD. 2014-07-21 15:36:08 -05:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr
811fc5f65f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-21 16:30:01 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Ccomp5950
df54dea5a8 Merge pull request #5716 from Walter0o/spider_thieves
fixes #5712
2014-07-21 01:42:36 -05:00
Zuhayr
2fd0f24c0d Merge pull request #5708 from Walter0o/pai_lang_fix
adds proper pAI language based translator
2014-07-21 16:00:58 +09:30
Walter0o
48f967bc02 removes second sleeping notification 2014-07-21 07:39:46 +02:00
Walter0o
3777bca3eb fixes #5712 2014-07-21 01:57:49 +02:00
PsiOmega
d02e483110 Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.

Parts of implementation done by porting code from tg-station.
2014-07-20 19:20:24 +02:00
Zuhayr
14b3c87aef Merge pull request #5701 from Walter0o/shameful_dispray
fixes simple_animals using FEA instead of ZAS
2014-07-20 23:51:12 +09:30
Walter0o
a8e30ed1fa makes Siik'tajr understandable but not speakable for pAIs 2014-07-20 09:33:06 +02:00
Walter0o
855fcbae6d forgot removal of this marker 2014-07-20 09:24:59 +02:00
Walter0o
7dff5f117e adds proper pAI language based translator,
reverts UNTRANSLATABLE
2014-07-20 09:05:44 +02:00
Walter0o
9be8f496ae borer detatch fixes 2014-07-20 04:42:14 +02:00
Walter0o
70b1d8dc65 borer detatch fixes 2014-07-20 04:40:58 +02:00
Walter0o
4c6017cfaa fixes borer infest and detatch 2014-07-20 04:37:42 +02:00
Walter0o
fced496980 fixes simple_animals using FEA instead of ZAS
i can't believe after all this time animals still use FEA instead of ZAS.
this should fix the "random" animal deaths.
2014-07-20 04:21:48 +02:00
PsiOmega
eae1b01ca9 Adds support for the AI to store multiple camera locations, up to a given maximum 2014-07-19 11:25:00 +02:00
PsiOmega
73f8c30111 The AI may now store and return to a single position for its eye/camera view. 2014-07-19 02:58:16 +02:00
Mloc-Hibernia
51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl
2014-07-18 13:15:30 +00:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 13:08:12 +00:00
Mloc
ae9d75bd5e Merge pull request #5664 from Zuhayr/pais
Mobile pAIs.
2014-07-18 14:07:11 +01:00
Zuhayr
8e66bfe236 Moving lists from prior commit to a better place. 2014-07-18 22:29:07 +09:30
Zuhayr
ac62b0ec5c Moved pAI lists to globals. 2014-07-18 22:24:51 +09:30
Mloc
6efff01110 Merge pull request #5671 from mwerezak/silicon-lang
Removes Rootspeak from AI and robot languages
2014-07-18 12:55:49 +01:00
Zuhayr
aad7db43ad Added a monkey sprite for pAIs. 2014-07-18 19:46:51 +09:30
Zuhayr
33bff18290 Removed a bit of redundant code, added pull check for mpAIs. 2014-07-18 19:15:48 +09:30
Zuhayr
9401dcf13c Fixes bug with drone Bump() check
They can now use teleporters, hand tele portals and the disposals chute.
2014-07-18 19:13:24 +09:30